1

Signed-off-by: lcw <1324309909@qq.com>

js/Office/Excel/Excel.js

@@ -915,23 +915,12 @@ U.MD.O.E.dataChange.setBorder = function (content, taskId) {
     });
 }
 
-U.MD.O.E.updateSocket = function(wordInfo){
-    U.A.Request(US.SCOKET, ["getWord", "send", JSON.stringify(wordInfo), 1], function (r) { 
-        console.log(r);
-    });
-}
-
-U.MD.O.E.updateFileData = function(wordInfo){
-    U.A.Request(US.Config.pbl + "updateFileData?d=" + wordInfo.messageInfo.data + "&id=" + US.roomid, [], function (res) { //US.userInfo.userid
-        console.log(res);
-    }, [], { "type": "GET", "withCredentials": true });
-}
-
 /*
 * excel保存
 * diskinfo 1473的桌面信息
 */
 U.MD.O.E.Save = function (diskinfo) {
+    debugger;
     if (!top.U.MD.U.L.isLogin(function (userinfo) { U.MD.O.E.userinfo = userinfo; })) {
         var _isftp,
             _isgroupuser,
@@ -950,15 +939,6 @@ U.MD.O.E.Save = function (diskinfo) {
                 //U.MD.O.E.fileinfo.UsOffice = _jsonData;
                 //console.log(U.MD.O.E.fileinfo.UsOffice);
                 U.Alert("保存成功");
-                let wordInfo = U.MD.O.E.wordInfo(
-                    "update",
-                    $("#U_MD_O_H_wordEditor")[0].innerHTML,
-                    "us.word",
-                    US.userInfo.userid,
-                    US.roomid,
-                );
-                U.MD.O.E.updateSocket(wordInfo);
-                U.MD.O.E.updateFileData(wordInfo);
             }, (['', _el])); //保存到数据库
         } else {  /*如果不是数据库的文档(没有存到云盘里)*/
             top.U.MD.DK.VW.chosenSaveFile('ue', _directoryid, _name, function (fileinfo) {

js/Office/Word/Word.js

@@ -308,7 +308,17 @@ U.MD.O.W.isSave = function () {
     return ((_fileid && _fileinfo.UserId && _fileinfo.UserallDirectoryName) && U.MD.O.W.permission.edit); //判断文档是否是已经保存到数据库的文档（判断的依据在于这个文件除了有文件id还有文件名和创建者id） 
 }
 
+U.MD.O.E.updateSocket = function(wordInfo){
+    U.A.Request(US.SCOKET, ["getWord", "send", JSON.stringify(wordInfo), 1], function (r) { 
+        console.log(r);
+    });
+}
 
+U.MD.O.E.updateFileData = function(wordInfo){
+    U.A.Request(US.Config.pbl + "updateFileData?d=" + wordInfo.messageInfo.data + "&id=" + US.roomid, [], function (res) { //US.userInfo.userid
+        console.log(res);
+    }, [], { "type": "GET", "withCredentials": true });
+}
 
 /**
  * 保存Word
@@ -342,6 +352,15 @@ U.MD.O.W.save = function () {
                 top.U.A.Request(US.DISK, ["SaveFileContent", US.userInfo.userid, _fileid, _html, _name, "uw"], function (r) {
                     U.MD.O.W.fileinfo.UsOffice = r.context[1].innerHTML;
                     U.Alert("保存成功");
+                    let wordInfo = U.MD.O.E.wordInfo(
+                        "update",
+                        $("#U_MD_O_H_wordEditor")[0].innerHTML,
+                        "us.word",
+                        US.userInfo.userid,
+                        US.roomid,
+                    );
+                    U.MD.O.E.updateSocket(wordInfo);
+                    U.MD.O.E.updateFileData(wordInfo);
                 }, (['', _el])); //保存到数据库
 
             }