@aochuang/client-sdk 1.0.330 → 1.0.332

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

@@ -88,6 +88,10 @@ export default {
         },
         sendMessageMethod: {
             type: Function
+        },
+        preventSendButtonBubble: {
+            type: Boolean,
+            default: false
         }
     },
     data () {
@@ -877,8 +881,11 @@ export default {
                 mentions: this.getMentions()
             })
         },
-        handleSendMessageClick () {
-           this.submit()
+        handleSendMessageClick (evt) {
+            if (this.preventSendButtonBubble && evt && evt.stopPropagation) {
+                evt.stopPropagation()
+            }
+            this.submit()
         },
         handleClick () {
             if (this.disabled) {

package/components/wework-chat-control/file-url/file-url.vue

@@ -71,13 +71,10 @@ export default {
   },
   computed: {
     url () {
-      return this.nextContent.url || this.nextContent.resUrl
+      return this.nextContent.resPath || this.nextContent.url || this.nextContent.resUrl
     },
     name () {
-      if (!this.nextContent.title) {
-        return this.url
-      }
-      return this.nextContent.title
+      return this.nextContent.fileName || this.nextContent.title || this.url
     },
     size () {
       return this.nextContent.totalLen

package/components/wework-chat-control/image/image.vue

@@ -198,14 +198,14 @@ export default {
       return this.allowDownload
     },
     showDownloadBox () {
-      return this.type === 'default' && this.innerAllowDownload && this.isDownloadContent && !this.downloaded
+      return this.type === 'default' && this.innerAllowDownload && this.isDownloadContent && !this.nextContent.resPath && !this.downloaded
     },
     src () {
       if (typeof this.nextContent === 'string') {
         return this.nextContent
       }
       if (this.nextContent && typeof this.nextContent === 'object') {
-        return this.nextContent.url || this.nextContent.thumbnailPath || this.nextContent.midThumbnailPath || ''
+        return this.nextContent.resPath || this.nextContent.url || this.nextContent.thumbnailPath || this.nextContent.midThumbnailPath || ''
       }
       return this.content
     },
@@ -285,6 +285,12 @@ export default {
             throw new Error('不支持的更新属性' + prop)
           }
           this.$set(this.nextContent, prop, value)
+        },
+        updateContentProps: (data) => {
+          if (!data || typeof data !== 'object' || Array.isArray(data)) {
+            throw new Error('updateContentProps只支持更新数据对象')
+          }
+          this.nextContent = data
         }
       })
       if (rs && rs.finally) {

package/components/wework-chat-control/text/text.vue

@@ -31,6 +31,21 @@
 import { Popover as UiPopover } from '@aochuang/common/components'
 import { html2Escape } from '../../../utils/string'
 
+function parseTextContent (content) {
+  if (typeof content !== 'string') {
+    return content
+  }
+  try {
+    const data = JSON.parse(content)
+    if (data && typeof data === 'object') {
+      return data
+    }
+  } catch (e) {
+    return content
+  }
+  return content
+}
+
 export default {
   name: 'SdkChatControlText',
   components: {
@@ -63,23 +78,27 @@ export default {
   },
   computed: {
     nextContent () {
-      return this.content
+      return parseTextContent(this.content)
     },
     text () {
+      if (this.nextContent && typeof this.nextContent === 'object') {
+        return this.nextContent.text || ''
+      }
       return this.nextContent
     },
     html () {
-      let content = this.nextContent
+      let content = this.text
       if (this.formatter) {
         content = this.formatter({
           content: this.nextContent
         })
       } else {
-        content = html2Escape(content)
+        content = html2Escape(String(content || ''))
       }
       if (!content) {
         return ''
       }
+      content = String(content)
       content = content.replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig, item => {
         return `<a href="${item}" target='_blank'>${item}</a>`
       })

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

@@ -66,6 +66,14 @@ function toJson (data) {
     return data
 }
 
+function getTextContent (content) {
+    const data = typeof content === 'string' ? toJson(content) : content
+    if (data && typeof data === 'object') {
+        return data.text || ''
+    }
+    return content
+}
+
 /**
  * 格式化为短消息
 */
@@ -73,10 +81,8 @@ export function formatShortMessage (msgType, msgContent) {
     let shortMessage = msgContent
     switch (msgType) {
         case MESSAGE_TYPE.TEXT:
-            shortMessage = msgContent
-            break
         case MESSAGE_TYPE.TEXT_W:
-            shortMessage = msgContent
+            shortMessage = getTextContent(msgContent)
             break
         case MESSAGE_TYPE.TEXT_WITH_AT:
             let {atId, content, text} = toJson(msgContent) || {}
@@ -224,4 +230,4 @@ export function formatShortSessionMessage (session, contextFn) {
         }
     }
     return formatShortMessage(session.lastMsgType, session.lastMsgContent)
-}
+}

package/components/wework-chat-control/video/video.vue

@@ -147,7 +147,9 @@ export default {
       if (typeof this.nextContent === 'string') {
         url = this.nextContent
       } else if (this.nextContent && typeof this.nextContent === 'object') {
-        if (this.nextContent.videoPath) {
+        if (this.nextContent.resPath) {
+          url = this.nextContent.resPath
+        } else if (this.nextContent.videoPath) {
           url = this.nextContent.videoPath
         } else {
           url = this.nextContent.tencentUrl
@@ -163,7 +165,7 @@ export default {
       if (!this.nextContent) {
         return
       }
-      return this.nextContent.previewImgUrl
+      return this.nextContent.resCoverPath || this.nextContent.previewImgUrl
     },
     innerCover () {
       return formatOssPath(this.cover)
@@ -202,6 +204,12 @@ export default {
             throw new Error('不支持的更新属性' + prop)
           }
           this.$set(this.nextContent, prop, value)
+        },
+        updateContentProps: (data) => {
+          if (!data || typeof data !== 'object' || Array.isArray(data)) {
+            throw new Error('updateContentProps只支持更新数据对象')
+          }
+          this.nextContent = data
         }
       })
       if (rs && rs.finally) {

package/components/wework-chat-control/voice/voice.vue

@@ -132,7 +132,7 @@ export default {
       return parse(this.content) || {}
     },
     voiceSrc () {
-      let url = this.nextContent.url || this.nextContent.resUrl
+      let url = this.nextContent.voicePath || this.nextContent.url || this.nextContent.resUrl
       return url
     },
     nextId () {

package/components/wework-chat-control/wework-chat-control-config.vue

@@ -45,12 +45,17 @@ export default {
             return this.controlConfig[msgType]
         },
         getMessageConfig (msgData) {
+            const controlConfig = this.getControlConfig(msgData.msgType)
             if (!this.messageConfig) {
-                return
+                return controlConfig
             }
-            return this.messageConfig({
+            const messageConfig = this.messageConfig({
                 item: msgData
             })
+            if (!messageConfig) {
+                return controlConfig
+            }
+            return Object.assign({}, controlConfig, messageConfig)
         }
     }
 }

package/package.json

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

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

@@ -254,4 +254,4 @@ export default {
 	padding-bottom: calc(constant(safe-area-inset-bottom)); /* window-bottom + 适配 iPhoneX */
 	padding-bottom: calc(env(safe-area-inset-bottom));
 }
-</style>
+</style>