@aochuang/client-sdk 1.0.353 → 1.0.355

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

@@ -7,9 +7,11 @@
         </div>
         <div class="sdk-chat-wework-control-file-url__toolbar">
           <span class="sdk-chat-wework-control-file-url__size" v-if="fileSize">{{fileSize}}</span>
-          <!-- <span class="sdk-chat-wework-control-file-url__download" v-if="innerAllowDownload" @click.stop.prevent>
-            <ui-button type="primary" link :click="handleDownloadClick">下载</ui-button>
-          </span> -->
+          <span class="sdk-chat-wework-control-file-url__download" v-if="canDownload" @click.stop.prevent>
+            <ui-button type="primary" link :loading="downloading" icon="download-line" :click="handleDownloadClick">
+              下载
+            </ui-button>
+          </span>
         </div>
       </span>
       <span v-if="fileIcon" class="sdk-chat-wework-control-file-url__icon">
@@ -28,6 +30,7 @@
 import FileIcon from './icons'
 import { parse } from '../../../utils/json'
 import { formatFileSize } from '../../../utils/file'
+import { formatOssPath } from '@aochuang/common/utils/oss'
 
 export default {
   name: 'SdkChatControlFileUrl',
@@ -66,12 +69,14 @@ export default {
   },
   data () {
     return {
-      nextContent: {}
+      nextContent: {},
+      downloading: false
     }
   },
   computed: {
     url () {
-      return this.nextContent.resPath || this.nextContent.url || this.nextContent.resUrl
+      const url = this.nextContent.resPath || this.nextContent.url || this.nextContent.resUrl
+      return url ? formatOssPath(url) : url
     },
     name () {
       return this.nextContent.fileName || this.nextContent.title || this.url
@@ -103,6 +108,9 @@ export default {
       }
       return this.allowDownload
     },
+    canDownload () {
+      return this.type !== 'quote' && this.innerAllowDownload && typeof this.downloadMethod === 'function'
+    },
     border () {
       if (this.type === 'quote') {
         return false
@@ -112,24 +120,37 @@ export default {
   },
   created () {
     this.nextContent = parse(this.content) || {}
-    if (this.url && this.updateChatBoxProp) {
-      this.updateChatBoxProp('href', this.url)
-    }
   },
   methods: {
     handleDownloadClick () {
-      if (!this.downloadMethod) {
+      if (!this.canDownload || this.downloading) {
         return
       }
-      return this.downloadMethod({
+      const updateContent = data => {
+        if (!data || typeof data !== 'object' || Array.isArray(data)) {
+          throw new Error('updateContentProps只支持更新数据对象')
+        }
+        this.nextContent = data
+        this.$emit('content-update', data)
+      }
+      const result = this.downloadMethod({
         content: this.nextContent,
         updateContentProp: (prop, value) => {
-          if (!['url'].includes(prop)) {
+          if (!['resPath', 'url'].includes(prop)) {
             throw new Error('不支持的更新属性' + prop)
           }
           this.$set(this.nextContent, prop, value)
-        }
+          this.$emit('content-update', this.nextContent)
+        },
+        updateContentProps: updateContent
       })
+      if (result && result.finally) {
+        this.downloading = true
+        result.finally(() => {
+          this.downloading = false
+        })
+      }
+      return result
     }
   },
   beforeDestroy () {

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

@@ -47,6 +47,7 @@ export const chatControls = {
 	[MESSAGE_TYPE.VIDEO]: video,
 	[MESSAGE_TYPE.CUSTOM_EXPRESSION]: customExpression,
 	[MESSAGE_TYPE.LOCATION]: location,
+	[MESSAGE_TYPE.URLFile]: fileUrl,
 	[MESSAGE_TYPE.URL]: url,
 	[MESSAGE_TYPE.URLNew]: fileUrl,
 // 	[MESSAGE_TYPE.CALLING]: calling,

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

@@ -2,6 +2,7 @@ export const MESSAGE_TYPE = {
 	TEXT: 0,
 	TEXT_W: 1,
 	IMAGE: 14,
+	URLFile: 15,
 	VOICE: 16,
 	VIDEO: 22,
 	CUSTOM_EXPRESSION: 29,
@@ -111,22 +112,15 @@ export function formatShortMessage (msgType, msgContent) {
         case MESSAGE_TYPE.SYSTEM:
             shortMessage = formatSystemMessage(msgContent)
             break
+        case MESSAGE_TYPE.URLFile:
+            shortMessage = '[文件消息]'
+            break
         case MESSAGE_TYPE.URL:
         case MESSAGE_TYPE.URLNew:
             const jsonObj = toJson(msgContent)
             if (typeof jsonObj === 'object') {
-                if(jsonObj.type === 'file') {
-                    shortMessage = '[文件消息]'
-                } else if(jsonObj.type === 'link') {
-                    shortMessage = '[链接消息]'
-                } else if(jsonObj.type === 'miniprogram') {
+                if(jsonObj.contentType === 78) {
                     shortMessage = '[小程序消息]'
-                } else if (jsonObj.type === 'music') {
-                    shortMessage = '[音乐消息]'
-                } else if (jsonObj.type === 'merged') {
-                    shortMessage = '[合并消息]'
-                } else {
-                    shortMessage = '[链接消息]'
                 }
             } else {
                 shortMessage = '[链接消息]'

package/components/wework-chat-panel/chat-panel-item.vue

@@ -289,6 +289,29 @@
           </template>
         </sdk-chat-panel-box>
       </template>
+      <template v-else-if="item.msgType == MESSAGE_TYPE.URLFile">
+        <sdk-chat-panel-box
+          :dir="dir"
+          :data="item"
+          :fetchUserMethod="fetchUserMethod"
+          bg-color="#fff"
+          br-color="#ddd"
+          @user-avatar-click="handleUserAvatarClick"
+          @user-avatar-contextmenu="handleUserAvatarContextmenu"
+          >
+          <template slot-scope="{ updateProp }">
+            <sdk-chat-control-file-url
+              v-bind="configData"
+              :id="item.id"
+              :content="msgContent"
+              :update-chat-box-prop="updateProp"
+            ></sdk-chat-control-file-url>
+          </template>
+          <template slot="append" slot-scope="{ updateProp }">
+            <slot name="chat-append" :item="item" :update-chat-box-prop="updateProp"></slot>
+          </template>
+        </sdk-chat-panel-box>
+      </template>
       <template v-else-if="item.msgType == MESSAGE_TYPE.URL || item.msgType == MESSAGE_TYPE.URLNew">
         <sdk-chat-panel-box
           :dir="dir"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.353",
+  "version": "1.0.355",
   "description": "",
   "files": [
     "common",