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

Merge branch 'feature/add_TeamWork_websocket' into 'develop'

feature/add_TeamWork_websocket into develop 新增团队工作模块的消息处理机制

See merge request o2oa/o2oa!150
胡起 5 лет назад
Родитель
Сommit
503c5a3636
2 измененных файлов с 38 добавлено и 1 удалено
  1. 5 0
      o2web/source/o2_core/o2/lp/zh-cn.js
  2. 33 1
      o2web/source/o2_core/o2/xDesktop/WebSocket.js

+ 5 - 0
o2web/source/o2_core/o2/lp/zh-cn.js

@@ -189,6 +189,11 @@ o2.LP.desktop = {
         "attendanceAppealRejectMessage": "考勤申述未通过",
         "attendanceAppealReject": "{subject}",
 
+        "teamwork":{
+            "executor":"责任人",
+            "creatorPerson":"创建者"
+        },
+
         "customMessageTitle": "消息提醒:",
         "customMessage": "您收到一条消息:"
     },

+ 33 - 1
o2web/source/o2_core/o2/xDesktop/WebSocket.js

@@ -142,6 +142,13 @@ MWF.xDesktop.WebSocket = new Class({
                             case "calendar_alarm":
                                 this.receiveAttendanceAppealRejectMessage(data);
                                 break;
+                            case "teamwork_taskCreate":
+                            case "teamwork_taskUpdate":
+                            case "teamwork_taskDelelte":
+                            case "teamwork_taskOvertime":
+                            case "teamwork_taskChat":
+                                this.receiveTeamWorkMessage(data);
+                                break;
                             case "custom_create":
                                 this.receiveCustomMessage(data);
                                 break;
@@ -565,5 +572,30 @@ MWF.xDesktop.WebSocket = new Class({
             layout.desktop.message.hide();
             layout.desktop.openApplication(e, "Attendance", {"curNaviId":"12"});
         });
-    }
+    },
+    receiveTeamWorkMessage: function(data){
+        debugger;
+        var task = data.body;
+        //var content = MWF.LP.desktop.messsage.receiveTask+"《"+task.title+"》, "+MWF.LP.desktop.messsage.activity+": <font style='color: #ea621f'>"+(task.activityName || "")+"</font>";
+        var content = data.title;
+        //content += "<br/><font style='color: #333; font-weight: bold'>"+MWF.LP.desktop.messsage.teamwork.creatorPerson+": </font><font style='color: #ea621f'>"+task.creatorPerson+"</font>;  "+
+        //    "<font style='color: #333; font-weight: bold'>"+MWF.LP.desktop.messsage.teamwork.executor+": </font><font style='color: #ea621f'>"+task.executor+"</font>";
+        var msg = {
+            "subject": task.name,
+            "content": content
+        };
+        var messageItem = layout.desktop.message.addMessage(msg);
+        var tooltipItem = layout.desktop.message.addTooltip(msg);
+        tooltipItem.contentNode.addEvent("click", function(e){
+            layout.desktop.message.hide();
+            var options = {"taskId": task.id, "projectId": task.project};
+            layout.desktop.openApplication(e, "TeamWork.Task", options);
+        }.bind(this));
+        messageItem.contentNode.addEvent("click", function(e){
+            layout.desktop.message.addUnread(-1);
+            layout.desktop.message.hide();
+            var options = {"taskId": task.id, "projectId": task.project};
+            layout.desktop.openApplication(e, "TeamWork.Task", options);
+        }.bind(this));
+    },
 });