@aochuang/client-sdk 1.0.298 → 1.0.300

package/components/chat-editor/chat-editor.vue

@@ -243,9 +243,10 @@ export default {
                 const cursorPos = this.cacheInputRange ? this.cacheInputRange.start : 0
                 const nearsetInfo = getNearestString(inputValue, cursorPos)
                 this.suggestionsNearsetInfo = nearsetInfo
-                const nearest = (nearsetInfo.nearest || '').trim()
+                const nearest = this.normalizeSuggestionsKeyword(nearsetInfo)
                 if (!nearest) {
                     this.closeSuggestions()
+                    return
                 }
                 this.loadSuggestions(nearest, nearsetInfo)
             }, 200)
@@ -254,7 +255,7 @@ export default {
             if (!this.fetchSuggestionsMethod) {
                 return
             }
-            keyword = keyword.trim()
+            keyword = this.normalizeSuggestionsKeyword(nearestInfo, keyword)
             this.suggestioning = true
             this.suggestionsKeyword = keyword
             clearTimeout(this._loadSuggestionsTimer)
@@ -268,6 +269,14 @@ export default {
                 this.suggestioning = false
             })
         },
+        normalizeSuggestionsKeyword (nearestInfo, keyword) {
+            const nearest = keyword === undefined
+                ? (nearestInfo && nearestInfo.nearest) || ''
+                : keyword || ''
+            return nearestInfo && nearestInfo.isAtContext
+                ? nearest.trim()
+                : nearest.replace(/^\s+/, '')
+        },
         closeSuggestions () {
             this.$refs.suggestions && this.$refs.suggestions.close()
         },

package/components/chat-editor/utils.js

@@ -38,19 +38,33 @@ export function getNearestString (inputStr, cursorPos) {
         break;
       }
     }
+
+    if (!isAtContext) {
+      let wordCursor = safeCursorPos - 1;
+      while (wordCursor >= 0 && /\s/.test(inputStr[wordCursor])) {
+        wordCursor--;
+      }
+      if (wordCursor < 0) {
+        return { nearest: '', start: safeCursorPos, end: safeCursorPos, isAtContext: false };
+      }
+      let start = wordCursor;
+      while (start > 0 && !/\s/.test(inputStr[start - 1])) {
+        start--;
+      }
+      return {
+        nearest: inputStr.slice(start, safeCursorPos),
+        start,
+        end: safeCursorPos,
+        isAtContext: false
+      };
+    }
     
     // 2. 根据上下文选择拆分模式
     let splitRegex, isSeparator;
     
-    if (isAtContext) {
-      // @ 成员场景：按 @ 字符拆分
-      splitRegex = /(@)/;
-      isSeparator = (part) => part === '@';
-    } else {
-      // 普通输入场景：按空白字符拆分
-      splitRegex = /(\s+)/;
-      isSeparator = (part) => /\s+/.test(part);
-    }
+    // @ 成员场景：按 @ 字符拆分
+    splitRegex = /(@)/;
+    isSeparator = (part) => part === '@';
     
     // 拆分字符串（保留分隔符，用于定位）
     const parts = inputStr.split(splitRegex);
@@ -186,4 +200,4 @@ export function getNearestString (inputStr, cursorPos) {
       }
     }
     return { nearest, start, end, isAtContext };
-  }
+  }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.298",
+  "version": "1.0.300",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/services/client-chat/client-chat-wechat/client-chat-session.js

@@ -394,6 +394,9 @@ export default class ClientChatSession {
 		if (!data.wechatAccountId) {
 			throw new Error('缺少必须参数wechatAccountId')
 		}
+		if (!Array.isArray(data.lastAtMsgContent)) {
+			data.lastAtMsgContent = []
+		}
 		if (this.onBeforeAddSession && this.onBeforeAddSession({
 			data
 		}) === false) {

package/services/client-chat/client-chat-wechat/client-chat.js

@@ -46,6 +46,32 @@ function isAutoReadMessage (data) {
 	return !!(data && data.id && data.id.indexOf('AUTO-READ-') === 0)
 }
 
+function getAtMessageContent (data) {
+	if (!data || data.isSend || !data.content) {
+		return null
+	}
+	try {
+		const content = JSON.parse(data.content)
+		if (!content || (!Array.isArray(content.atIds) || !content.atIds.length) && (!content.text || content.text.indexOf('@所有人') < 0)) {
+			return null
+		}
+		return {
+			id: data.id,
+			content: data.content
+		}
+	} catch (e) {
+		return null
+	}
+}
+
+function appendLastAtMsgContent (lastAtMsgContent, atMessage) {
+	const messages = Array.isArray(lastAtMsgContent) ? lastAtMsgContent : []
+	if (!atMessage || messages.some(item => item && item.id === atMessage.id)) {
+		return messages
+	}
+	return messages.concat(atMessage)
+}
+
 class ClientChat {
 	data = Vue.observable({
 		connectStatus: CONNECT_STATUS.Normal
@@ -252,6 +278,9 @@ class ClientChat {
 				// 还要更新未读消息数量
 			}
 			options.onSessionReadChange = ({ session, oldUnreadMsgCount }) => {
+				instance.updateSession(session.conversationId, {
+					lastAtMsgContent: []
+				})
 				const isMute = session.mute
 				this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
 					// 如果是免打扰的会话
@@ -514,6 +543,7 @@ class ClientChat {
 			onAddMessageSuccess: ({ data }) => {
 				const accountId = options.getLoginAccountIdMethod ? options.getLoginAccountIdMethod() : data.accountId
 				let sessionId = createSessionId(accountId, data.wechatChatroomId)
+				const atMessage = getAtMessageContent(data)
 				// 更新会话
 				if (!sessionId) {
 					return
@@ -550,6 +580,9 @@ class ClientChat {
 							rs.data.lastMsgId = data.id
 							rs.data.lastUpdateTime = data.updateDate
 						}
+						if (rs && rs.data && atMessage && !(this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId)) {
+							rs.data.lastAtMsgContent = appendLastAtMsgContent(rs.data.lastAtMsgContent, atMessage)
+						}
 						return rs
 					}).then((rs) => {
 						// 更新账号未读消息数量
@@ -596,6 +629,9 @@ class ClientChat {
 								this.session.setSessionRead(sessionId)
 							} else {
 								nextSession.unreadMsgCount = session.unreadMsgCount + 1
+								if (atMessage) {
+									nextSession.lastAtMsgContent = appendLastAtMsgContent(session.lastAtMsgContent, atMessage)
+								}
 								// 更新账号未读消息数量
 								this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
 									if (session.mute) {

package/services/client-chat/client-chat-wechat/utils.js

@@ -75,8 +75,9 @@ export function createSessionData (message) {
 		lastMsgType: message.msgType,
 		lastUpdateTime: message.wechatTime,
 		targetId,
+		lastAtMsgContent: [],
 		unreadMsgCount: 0,
 		wechatAccountId: message.wechatAccountId
 	}
 	return nextSession
-}
+}