@aochuang/client-sdk 1.0.306 → 1.0.308

package/components/wechat-chat-control/util.js

@@ -190,45 +190,45 @@ export function formatShortSessionMessage (session, contextFn) {
     if (!session.lastMsgType) {
         return
     }
-    if (session.lastMsgType === MESSAGE_TYPE.TEXT_WITH_AT) {
-        const content = toJson(session.lastMsgContent)
-        if (!contextFn) {
-            throw new Error('缺少上下文函数')
-        }
-        if (content && content.text && content.text.indexOf('@所有人') >= 0) {
-          const contextRs = contextFn()
-          if (contextRs && contextRs.then) {
-            return contextRs.then(rs => {
-              // 有未读消息才需要高亮红色提示
-              if (rs.session && rs.session.unreadMsgCount > 0) {
-                return `<span style="color: #e2544b;">[@所有人]</span>${html2Escape(content.text)}`
-              } else {
-                return formatShortMessage(session.lastMsgType, session.lastMsgContent)
-              }
-            })
-          } else {
-            return formatShortMessage(session.lastMsgType, session.lastMsgContent)
-          }
-        } else if (content && content.atWechatIdsHash && content.atWechatIdsHash.length) {
-            const contextRs = contextFn()
-            if (contextRs && contextRs.then) {
-                return contextRs.then(rs => {
-                    if (!rs.wechatAccount) {
-                        return formatShortMessage(session.lastMsgType, session.lastMsgContent)
-                    }
-                    // 有未读消息才需要高亮红色提示
-                    if (content.atWechatIdsHash.includes(rs.wechatAccount.wechatIdHash) && rs.session && rs.session.unreadMsgCount > 0) {
-                        return `<span style="color: #e2544b;">[有人@我]</span>${html2Escape(content.text)}`
-                    } else {
-                        return formatShortMessage(session.lastMsgType, session.lastMsgContent)
-                    }
-                })
-            } else {
-                return formatShortMessage(session.lastMsgType, session.lastMsgContent)
-            }
-        } else {
-            return formatShortMessage(session.lastMsgType, session.lastMsgContent)
+    const shortMessage = formatShortMessage(session.lastMsgType, session.lastMsgContent)
+    if (!session.unreadMsgCount) {
+        return shortMessage
+    }
+    const atMessages = getUnreadAtMessageContents(session)
+        .map(content => toJson(content))
+        .filter(content => content && content.text)
+    if (!atMessages.length) {
+        return shortMessage
+    }
+    if (atMessages.some(content => content.text.indexOf('@所有人') >= 0)) {
+        return `<span style="color: #e2544b; margin-right: 4px;">[@所有人]</span>${shortMessage}`
+    }
+    const atWechatIdsHash = atMessages.reduce((ids, content) => {
+        return ids.concat(Array.isArray(content.atWechatIdsHash) ? content.atWechatIdsHash : [])
+    }, [])
+    if (!atWechatIdsHash.length || !contextFn) {
+        return shortMessage
+    }
+    const contextRs = contextFn()
+    if (!contextRs || !contextRs.then) {
+        return shortMessage
+    }
+    return contextRs.then(rs => {
+        if (!rs.wechatAccount || !rs.session || !rs.session.unreadMsgCount) {
+            return shortMessage
         }
+        return atWechatIdsHash.includes(rs.wechatAccount.wechatIdHash)
+            ? `<span style="color: #e2544b; margin-right: 4px;">[有人@我]</span>${shortMessage}`
+            : shortMessage
+    })
+}
+
+function getUnreadAtMessageContents (session) {
+    const contents = (Array.isArray(session.lastAtMsgContent) ? session.lastAtMsgContent : [])
+        .map(item => typeof item === 'string' ? item : item && item.content)
+        .filter(Boolean)
+    if (session.lastMsgType === MESSAGE_TYPE.TEXT_WITH_AT && session.lastMsgContent) {
+        contents.push(session.lastMsgContent)
     }
-    return formatShortMessage(session.lastMsgType, session.lastMsgContent)
-}
+    return contents.filter((content, index) => contents.indexOf(content) === index)
+}

package/package.json

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