From a6fe0572f81818e66084be9c1ebe5163c3c7d477 Mon Sep 17 00:00:00 2001
From: fancy <fancylou@outlook.com>
Date: Fri, 25 Jun 2021 16:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dweb=E7=AB=AFIM=E8=81=8A?=
 =?UTF-8?q?=E5=A4=A9=E7=9A=84=E4=B8=80=E4=B8=AAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jaxrs/im/ActionConversationCreate.java    |  3 +-
 .../x_component_IMV2/$Main/default/style.css  |  3 ++
 o2web/source/x_component_IMV2/Main.js         | 40 ++++++++++---------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/im/ActionConversationCreate.java b/o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/im/ActionConversationCreate.java
index dc7cf080fd..6a092a3fc6 100644
--- a/o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/im/ActionConversationCreate.java
+++ b/o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/im/ActionConversationCreate.java
@@ -83,9 +83,10 @@ public class ActionConversationCreate extends BaseAction {
                 }else {
                     for (int i = 0; i < conversation.getPersonList().size(); i++) {
                         String person = conversation.getPersonList().get(i);
-                        if (i > 3) {
+                        if (i == 3) {
                             title += person.substring(0, person.indexOf("@"));
                             title += "...";
+                            break;
                         }else {
                             title += person.substring(0, person.indexOf("@")) + "、";
                         }
diff --git a/o2web/source/x_component_IMV2/$Main/default/style.css b/o2web/source/x_component_IMV2/$Main/default/style.css
index cf868c66c5..af70d5a906 100644
--- a/o2web/source/x_component_IMV2/$Main/default/style.css
+++ b/o2web/source/x_component_IMV2/$Main/default/style.css
@@ -145,6 +145,9 @@
     float:left; 
     color: rgb(51, 51, 51); 
     overflow:hidden;
+    max-width: 170px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 .o2_im_chat_list .item .body_up .body_time {
     float: right; 
diff --git a/o2web/source/x_component_IMV2/Main.js b/o2web/source/x_component_IMV2/Main.js
index 58408978a4..7a1c45880f 100644
--- a/o2web/source/x_component_IMV2/Main.js
+++ b/o2web/source/x_component_IMV2/Main.js
@@ -883,29 +883,31 @@ MWF.xApplication.IMV2.ConversationItem = new Class({
 	 * @param {*} lastMessage 
 	 */
 	refreshLastMsg: function (lastMessage) {
-		//目前是text 类型的消息
-		var jsonbody = lastMessage.body;
-		var body = JSON.parse(jsonbody);
+		if (lastMessage) {
+			//目前是text 类型的消息
+			var jsonbody = lastMessage.body;
+			var body = JSON.parse(jsonbody);
 
-		if (this.lastMessageNode) {
-			if (body.type == "emoji") { //表情 消息
-				var imgPath = "";
-				for (var i = 0; i < this.main.emojiList.length; i++) {
-					var emoji = this.main.emojiList[i];
-					if (emoji.key == body.body) {
-						imgPath = emoji.path;
+			if (this.lastMessageNode) {
+				if (body.type == "emoji") { //表情 消息
+					var imgPath = "";
+					for (var i = 0; i < this.main.emojiList.length; i++) {
+						var emoji = this.main.emojiList[i];
+						if (emoji.key == body.body) {
+							imgPath = emoji.path;
+						}
 					}
+					this.lastMessageNode.empty();
+					new Element("img", { "src": imgPath, "style": "width: 16px;height: 16px;" }).inject(this.lastMessageNode);
+				} else { //文本消息
+					this.lastMessageNode.empty();
+					this.lastMessageNode.set('text', body.body);
 				}
-				this.lastMessageNode.empty();
-				new Element("img", { "src": imgPath, "style": "width: 16px;height: 16px;" }).inject(this.lastMessageNode);
-			} else { //文本消息
-				this.lastMessageNode.empty();
-				this.lastMessageNode.set('text', body.body);
 			}
-		}
-		var time = this.main._friendlyTime(o2.common.toDate(lastMessage.createTime));
-		if (this.messageTimeNode) {
-			this.messageTimeNode.set("text", time);
+			var time = this.main._friendlyTime(o2.common.toDate(lastMessage.createTime));
+			if (this.messageTimeNode) {
+				this.messageTimeNode.set("text", time);
+			}
 		}
 	},
 	// 更新聊天窗口上的标题 修改标题的时候使用 @Disuse 使用refreshData
-- 
GitLab