Просмотр исходного кода

Merge branch 'fix/websocket_file' into 'wrdp'

修复云文件消息点击跳转到老云文件

See merge request o2oa/o2oa!2208
胡起 5 лет назад
Родитель
Сommit
3396bba9ef
1 измененных файлов с 13 добавлено и 6 удалено
  1. 13 6
      o2web/source/o2_core/o2/xDesktop/WebSocket.js

+ 13 - 6
o2web/source/o2_core/o2/xDesktop/WebSocket.js

@@ -447,12 +447,19 @@ MWF.xDesktop.WebSocket = new Class({
         var tooltipItem = layout.desktop.message.addTooltip(msg, ((data.body) ? data.body.createTime : ""));
         var tooltipItem = layout.desktop.message.addTooltip(msg, ((data.body) ? data.body.createTime : ""));
         tooltipItem.contentNode.addEvent("click", function(e){
         tooltipItem.contentNode.addEvent("click", function(e){
             layout.desktop.message.hide();
             layout.desktop.message.hide();
-            layout.desktop.openApplication(e, "File", null, {
-                "status": {
-                    "tab": "share",
-                    "node": data.person
-                }
-            });
+            //应用市场中的云文件,门户cloudFile
+            o2.Actions.load("x_portal_assemble_surface").PortalAction.get("cloudFile", function () {
+                layout.desktop.openApplication(e, "portal.Portal", {
+                    portalId : "cloudFile"
+                });
+            }, function(){
+                layout.desktop.openApplication(e, "File", null, {
+                    "status": {
+                        "tab": "share",
+                        "node": data.person
+                    }
+                });
+            })
         });
         });
 
 
         messageItem.contentNode.addEvent("click", function(e){
         messageItem.contentNode.addEvent("click", function(e){