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

Merge branch 'fix/File.share_message_execption' into 'release'

Merge of fix/【云文件】修复文件共享消息不正确的问题 to release

See merge request o2oa/o2oa!913

(cherry picked from commit 0a745c1cd666691ff52ca0f282817858ce168734)

1b897c38 修复文件共享消息不正确的问题
fcfead1a 修复文件共享消息不正确的问题
蔡祥熠 5 лет назад
Родитель
Сommit
19e76a5ebc
1 измененных файлов с 6 добавлено и 4 удалено
  1. 6 4
      o2web/source/o2_core/o2/xDesktop/WebSocket.js

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

@@ -370,7 +370,8 @@ MWF.xDesktop.WebSocket = new Class({
     },
 
     receiveFileEditorMessage: function(data){
-        var content = "<font style='color: #ea621f; font-weight: bold'>"+data.person+"</font> "+MWF.LP.desktop.messsage.receiveFileEditor+"“"+data.name+"”. ";
+        debugger;
+        var content = "<font style='color: #ea621f; font-weight: bold'>"+MWF.name.cn(data.body.person)+"</font> "+MWF.LP.desktop.messsage.receiveFileEditor+"“"+data.body.name+"”. ";
         var msg = {
             "subject": MWF.LP.desktop.messsage.fileEditorMessage,
             "content": content
@@ -400,13 +401,14 @@ MWF.xDesktop.WebSocket = new Class({
     },
 
     receiveFileShareMessage: function(data){
-        var content = "<font style='color: #ea621f; font-weight: bold'>"+data.person+"</font> "+MWF.LP.desktop.messsage.receiveFileShare+"“"+data.name+"”. ";
+        debugger;
+        var content = "<font style='color: #ea621f; font-weight: bold'>"+MWF.name.cn(data.body.person)+"</font> "+MWF.LP.desktop.messsage.receiveFileShare+"“"+data.body.name+"”. ";
         var msg = {
             "subject": MWF.LP.desktop.messsage.fileShareMessage,
             "content": content
         };
-        var messageItem = layout.desktop.message.addMessage(msg, ((data.body) ? data.body.startTime : ""));
-        var tooltipItem = layout.desktop.message.addTooltip(msg, ((data.body) ? data.body.startTime : ""));
+        var messageItem = layout.desktop.message.addMessage(msg, ((data.body) ? data.body.createTime : ""));
+        var tooltipItem = layout.desktop.message.addTooltip(msg, ((data.body) ? data.body.createTime : ""));
         tooltipItem.contentNode.addEvent("click", function(e){
             layout.desktop.message.hide();
             layout.desktop.openApplication(e, "File", null, {