Merge branch 'fix/websocket_message_time' into 'release'

Merge of fix/websocket_message_time to release 修正websocket消息时间显示问题

See merge request o2oa/o2oa!386

o2web/source/o2_core/o2/xDesktop/Message.js

@@ -153,14 +153,16 @@ MWF.xDesktop.Message = new Class({
 	resize: function(){
 		this.setPosition();
 	},
-	addMessage: function(msg){
-		var item = new MWF.xDesktop.Message.Item(this,msg);
+	addMessage: function(msg, time){
+		var showTime = (time) ? (new Date()).parse(time) : new Date();
+		var item = new MWF.xDesktop.Message.Item(this,msg, showTime);
         this.items.push(item);
 		this.addUnread();
 		return item;
 	},
-    addTooltip: function(msg){
-        var tooltop = new MWF.xDesktop.Message.Tooltip(this,msg);
+    addTooltip: function(msg, time){
+		var showTime = (time) ? (new Date()).parse(time) : new Date();
+        var tooltop = new MWF.xDesktop.Message.Tooltip(this,msg,showTime);
         return tooltop;
     },
 	getUnread: function(){
@@ -191,11 +193,12 @@ MWF.xDesktop.Message = new Class({
 });
 MWF.xDesktop.Message.Item = new Class({
     Implements: [Events],
-	initialize: function(message, msg){
+	initialize: function(message, msg, showTime){
 		this.message = message;
 		this.container = this.message.contentNode;
 		this.css = this.message.css;
 		this.msg = msg;
+		this.showTime = showTime;
 		
 //		msg = {
 //			"subject": "",
@@ -223,7 +226,7 @@ MWF.xDesktop.Message.Item = new Class({
 		this.subjectNode.set({"text": this.msg.subject, "title": this.msg.subject});
 		this.contentNode.set({"html": this.msg.content});
 		this.contentNode.set({"title": this.contentNode.get("text")});
-		this.dateNode.set("text", (new Date()).format("db"));
+		this.dateNode.set("text", this.showTime.format("db"));
 		
 		this.node.inject(this.container, "top");
 		

o2web/source/o2_core/o2/xDesktop/WebSocket.js

@@ -256,8 +256,8 @@ MWF.xDesktop.WebSocket = new Class({
             "subject": MWF.LP.desktop.messsage.taskMessage,
             "content": content
         };
-        var messageItem = layout.desktop.message.addMessage(msg);
-        var tooltipItem = layout.desktop.message.addTooltip(msg);
+        var messageItem = layout.desktop.message.addMessage(msg, data.body.startTime);
+        var tooltipItem = layout.desktop.message.addTooltip(msg, data.body.startTime);
         tooltipItem.contentNode.addEvent("click", function(e){
             layout.desktop.message.hide();
             this.openWork(task.work,e);
@@ -278,8 +278,8 @@ MWF.xDesktop.WebSocket = new Class({
             "subject": MWF.LP.desktop.messsage.readMessage,
             "content": content
         };
-        var messageItem = layout.desktop.message.addMessage(msg);
-        var tooltipItem = layout.desktop.message.addTooltip(msg);
+        var messageItem = layout.desktop.message.addMessage(msg, data.body.startTime);
+        var tooltipItem = layout.desktop.message.addTooltip(msg, data.body.startTime);
         tooltipItem.contentNode.addEvent("click", function(e){
             layout.desktop.message.hide();
             this.openWork(read.work,e);
@@ -312,8 +312,8 @@ MWF.xDesktop.WebSocket = new Class({
             "subject": MWF.LP.desktop.messsage.reviewMessage,
             "content": content
         };
-        var messageItem = layout.desktop.message.addMessage(msg);
-        var tooltipItem = layout.desktop.message.addTooltip(msg);
+        var messageItem = layout.desktop.message.addMessage(msg, data.body.startTime);
+        var tooltipItem = layout.desktop.message.addTooltip(msg, data.body.startTime);
         tooltipItem.contentNode.addEvent("click", function(e){
             layout.desktop.message.hide();
             layout.desktop.openApplication(e, "process.TaskCenter", null, {
@@ -340,8 +340,8 @@ MWF.xDesktop.WebSocket = new Class({
             "subject": MWF.LP.desktop.messsage.fileEditorMessage,
             "content": content
         };
-        var messageItem = layout.desktop.message.addMessage(msg);
-        var tooltipItem = layout.desktop.message.addTooltip(msg);
+        var messageItem = layout.desktop.message.addMessage(msg, ((data.body) ? data.body.startTime : ""));
+        var tooltipItem = layout.desktop.message.addTooltip(msg, ((data.body) ? data.body.startTime : ""));
         tooltipItem.contentNode.addEvent("click", function(e){
             layout.desktop.message.hide();
             layout.desktop.openApplication(e, "File", null, {
@@ -370,8 +370,8 @@ MWF.xDesktop.WebSocket = new Class({
             "subject": MWF.LP.desktop.messsage.fileShareMessage,
             "content": content
         };
-        var messageItem = layout.desktop.message.addMessage(msg);
-        var tooltipItem = layout.desktop.message.addTooltip(msg);
+        var messageItem = layout.desktop.message.addMessage(msg, ((data.body) ? data.body.startTime : ""));
+        var tooltipItem = layout.desktop.message.addTooltip(msg, ((data.body) ? data.body.startTime : ""));
         tooltipItem.contentNode.addEvent("click", function(e){
             layout.desktop.message.hide();
             layout.desktop.openApplication(e, "File", null, {
@@ -432,8 +432,8 @@ MWF.xDesktop.WebSocket = new Class({
                 "subject": MWF.LP.desktop.messsage.meetingInviteMessage,
                 "content": content
             };
-            var messageItem = layout.desktop.message.addMessage(msg);
-            var tooltipItem = layout.desktop.message.addTooltip(msg);
+            var messageItem = layout.desktop.message.addMessage(msg, ((data.body) ? data.body.startTime : ""));
+            var tooltipItem = layout.desktop.message.addTooltip(msg, ((data.body) ? data.body.startTime : ""));
             tooltipItem.contentNode.addEvent("click", function(e){
                 layout.desktop.message.hide();
                 layout.desktop.openApplication(e, "Meeting", null);
@@ -460,8 +460,8 @@ MWF.xDesktop.WebSocket = new Class({
                 "subject": MWF.LP.desktop.messsage.meetingCancelMessage,
                 "content": content
             };
-            var messageItem = layout.desktop.message.addMessage(msg);
-            var tooltipItem = layout.desktop.message.addTooltip(msg);
+            var messageItem = layout.desktop.message.addMessage(msg, ((data.body) ? data.body.startTime : ""));
+            var tooltipItem = layout.desktop.message.addTooltip(msg, ((data.body) ? data.body.startTime : ""));
             tooltipItem.contentNode.addEvent("click", function(e){
                 layout.desktop.message.hide();
                 layout.desktop.openApplication(e, "Meeting", null);
@@ -489,8 +489,8 @@ MWF.xDesktop.WebSocket = new Class({
                 "subject": MWF.LP.desktop.messsage.meetingAcceptMessage,
                 "content": content
             };
-            var messageItem = layout.desktop.message.addMessage(msg);
-            var tooltipItem = layout.desktop.message.addTooltip(msg);
+            var messageItem = layout.desktop.message.addMessage(msg, ((data.body) ? data.body.startTime : ""));
+            var tooltipItem = layout.desktop.message.addTooltip(msg, ((data.body) ? data.body.startTime : ""));
             tooltipItem.contentNode.addEvent("click", function(e){
                 layout.desktop.message.hide();
                 layout.desktop.openApplication(e, "Meeting", null);
@@ -518,8 +518,8 @@ MWF.xDesktop.WebSocket = new Class({
                 "subject": MWF.LP.desktop.messsage.meetingRejectMessage,
                 "content": content
             };
-            var messageItem = layout.desktop.message.addMessage(msg);
-            var tooltipItem = layout.desktop.message.addTooltip(msg);
+            var messageItem = layout.desktop.message.addMessage(msg, ((data.body) ? data.body.startTime : ""));
+            var tooltipItem = layout.desktop.message.addTooltip(msg, ((data.body) ? data.body.startTime : ""));
             tooltipItem.contentNode.addEvent("click", function(e){
                 layout.desktop.message.hide();
                 layout.desktop.openApplication(e, "Meeting", null);