@aochuang/client-sdk 1.0.346 → 1.0.348

package/components/index.js

@@ -11,6 +11,7 @@ import ChatLayout from './chat-layout'
 import ChatFriendProfile from './chat-friend-profile'
 import ChatRoomProfile from './chat-room-profile'
 import { chatControls as WechatChatControls, WechatChatControlConfig, WechatChatControlConfigMsg, WechatChatControlConfigItem } from './wechat-chat-control'
+import { chatControls as WeworkChatControls, WeworkChatControlConfig, WeworkChatControlConfigMsg, WeworkChatControlConfigItem } from './wework-chat-control'
 import { MESSAGE_TYPE, formatShortMessage, formatShortSessionMessage } from './wechat-chat-control/util'
 import { MESSAGE_TYPE as MESSAGE_TYPE_W } from './wework-chat-control/util'
 
@@ -21,6 +22,10 @@ export default {
     WechatChatControlConfig, 
     WechatChatControlConfigMsg,
     WechatChatControlConfigItem,
+    WeworkChatControls,
+    WeworkChatControlConfig,
+    WeworkChatControlConfigMsg,
+    WeworkChatControlConfigItem,
     MESSAGE_TYPE,
     MESSAGE_TYPE_W,
     AccountSelect,
@@ -40,4 +45,4 @@ export default {
     ChatRoomProfile,
     WechatChatPanel,
     WeworkChatPanel
-}
+}

package/components/session-select/session-select-item.vue

@@ -5,14 +5,13 @@
 				<div class="sdk-session-item__avatar-image">
 					<slot name="avatar"></slot>
 				</div>
-				<sdk-badge 
-					class="sdk-session-item__avatar-badge" 
-					:class="{'is-mute': data[muteField]}"
-					v-if="data[unreadMsgCountField]"  
-					:is-dot="data[muteField]"
-					:value="data[unreadMsgCountField]"
-					:max="99"
-				></sdk-badge>
+				<span v-if="data[unreadMsgCountField]" class="sdk-session-item__avatar-badge" :class="{'is-mute': data[muteField]}">
+					<sdk-badge  
+						:is-dot="data[muteField]"
+						:value="data[unreadMsgCountField]"
+						:max="99"
+					></sdk-badge>
+				</span>
 			</div>
 			<div class="sdk-session-item__main">
 				<div class="sdk-session-item__row">
@@ -142,7 +141,7 @@ export default {
 	border-radius: 3px;
 }
 .sdk-session-item__avatar-badge{
-	position: absolute;
+	position: absolute; 
 	&.is-mute {
 		left: calc(~'100% - 7px');
 		top: -6px;

package/components/wework-chat-control/company-card/company-card.vue

@@ -62,7 +62,7 @@ export default {
       return formatOssPath(this.nextContent.bigheadimgurl)
     },
     category () {
-      return '企业微名片'
+      return '微名片'
     }
   }
 }

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

@@ -1,7 +1,24 @@
 <template>
   <div class="sdk-chat-control-image" @click="handleClick">
     <div class="sdk-chat-control-image__main" :style="{'height': innerHeight, 'max-height': innerMaxHeight + 'px'}">
-      <template v-if="allowDefrost">
+      <template v-if="showDownloadBox">
+        <div class="sdk-chat-control-image__download" :class="{'is-downloading': downloading}" @click.stop="handleDownloadClick">
+          <template v-if="downloading">
+            <div class="sdk-chat-control-image__download-icon">
+              <ui-loading size="mini"></ui-loading>
+            </div>
+            <div class="sdk-chat-control-image__download-text">下载中...</div>
+          </template>
+          <template v-else>
+            <div class="sdk-chat-control-image__download-icon">
+              <ui-icon name="download-line"></ui-icon>
+            </div>
+            <div class="sdk-chat-control-image__download-text">下载</div>
+          </template>
+        </div>
+        <div class="sdk-chat-control-image__download-placeholder"></div>
+      </template>
+      <template v-else-if="allowDefrost">
         <template v-if="defrostMsg">
           <div class="sdk-chat-control-image__defrost">
             <div class="sdk-chat-control-image__defrost-icon">
@@ -76,6 +93,7 @@
 </template>
 <script>
 import { Image as UiImage, Button as UiButton, Icon as UiIcon, Loading as UiLoading } from '@aochuang/common/components'
+import { parse } from '../../../utils/json'
 import { isOriginImage, getNewImageSrc} from './util'
 
 export default {
@@ -98,7 +116,17 @@ export default {
       }
     },
     content: {
-      type: String
+      type: [String, Object]
+    },
+    allowDownload: {
+      type: [Boolean, Function],
+      default: false
+    },
+    downloadMethod: {
+      type: Function
+    },
+    cancelDownloadMethod: {
+      type: Function
     },
     maxWidth: {
       type: Number,
@@ -150,12 +178,35 @@ export default {
   },
   data () {
     return {
+      downloading: false,
+      downloaded: false,
+      nextContent: null,
       defrostMsg: null,
       errorMsg: null
     }
   },
   computed: {
+    isDownloadContent () {
+      return !!(this.nextContent && typeof this.nextContent === 'object' && !Array.isArray(this.nextContent))
+    },
+    innerAllowDownload () {
+      if (typeof this.allowDownload === 'function') {
+        return this.allowDownload({
+          content: this.nextContent
+        })
+      }
+      return this.allowDownload
+    },
+    showDownloadBox () {
+      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.resPath || this.nextContent.url || this.nextContent.thumbnailPath || this.nextContent.midThumbnailPath || ''
+      }
       return this.content
     },
     innerWidth () {
@@ -210,6 +261,9 @@ export default {
       return !!this.defrostMethod
     }
   },
+  created () {
+    this.syncContentState()
+  },
   methods: {
     handleClick () {
       this.$emit('click')
@@ -217,6 +271,39 @@ export default {
     handleImageClick () {
       this.imageClickMethod && this.imageClickMethod()
     },
+    handleDownloadClick () {
+      if (this.downloading) {
+        return
+      }
+      if (!this.downloadMethod) {
+        return
+      }
+      const rs = this.downloadMethod({
+        content: this.nextContent,
+        updateContentProp: (prop, value) => {
+          if (!['url'].includes(prop)) {
+            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) {
+        this.downloading = true
+        rs.then(() => {
+          this.downloaded = true
+        }).finally(() => {
+          this.downloading = false
+        })
+      } else {
+        this.downloaded = true
+      }
+    },
     handleError () {
       if (!this.defrostMethod) {
         return
@@ -236,7 +323,22 @@ export default {
     handleRefreshClick () {
       this.errorMsg = null
       this.defrostMsg = null
+    },
+    syncContentState () {
+      this.nextContent = parse(this.content)
+      this.downloaded = false
+      this.downloading = false
+      this.errorMsg = null
+      this.defrostMsg = null
     }
+  },
+  watch: {
+    content () {
+      this.syncContentState()
+    }
+  },
+  beforeDestroy () {
+    this.cancelDownloadMethod && this.cancelDownloadMethod()
   }
 }
 </script>
@@ -277,6 +379,39 @@ export default {
   display: inline-block;
   line-height: 1em;
   vertical-align: top;
+  position: relative;
+}
+.sdk-chat-control-image__download{
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 10;
+  width: 100%;
+  height: 100%;
+  background: #000;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  color: #ccc;
+  cursor: pointer;
+  &:not(.is-downloading):hover {
+    color: #fff;
+  }
+}
+.sdk-chat-control-image__download.is-downloading{
+  cursor: default;
+}
+.sdk-chat-control-image__download-icon{
+  line-height: 1;
+  margin-bottom: 6px;
+}
+.sdk-chat-control-image__download-text{
+  font-size: 12px;
+}
+.sdk-chat-control-image__download-placeholder{
+  width: 100%;
+  height: 100%;
 }
 .sdk-chat-control-image__hd{
   position: absolute;

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

@@ -26,9 +26,9 @@ import url from './url/url.vue'
 // import quoteMessage from './quote-message/quote-message.vue'
 import empty from './empty/empty.vue'
 import unknow from './unknow/unknow.vue'
-// import WechatChatControlConfig from './wechat-chat-control-config.vue'
-// import WechatChatControlConfigMsg from './wechat-chat-control-config-msg.vue'
-// import WechatChatControlConfigItem from './wechat-chat-control-config-item.vue'
+import WeworkChatControlConfig from './wework-chat-control-config.vue'
+import WeworkChatControlConfigMsg from './wework-chat-control-config-msg.vue'
+import WeworkChatControlConfigItem from './wework-chat-control-config-item.vue'
 // import revokeMeMessage from './revoke-me-message/revoke-me-message.vue'
 // import revokeOtherMessage from './revoke-other-message/revoke-other-message.vue'
 // import revokeYouMessage from './revoke-you-message/revoke-you-message.vue'
@@ -100,7 +100,7 @@ export {
 //   revokeMeMessage,
 //   revokeOtherMessage,
 //   revokeYouMessage,
-//   WechatChatControlConfig,
-//   WechatChatControlConfigMsg,
-//   WechatChatControlConfigItem
+  WeworkChatControlConfig,
+  WeworkChatControlConfigMsg,
+  WeworkChatControlConfigItem
 }

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

@@ -3,12 +3,12 @@ export const MESSAGE_TYPE = {
 	TEXT_W: 1,
 	IMAGE: 14,
 	VOICE: 16,
-	VIDEO: 23,
+	VIDEO: 22,
 	CUSTOM_EXPRESSION: 29,
 	CUSTOM_EXPRESSION_W: 104,
     // MUSIC: 1040187441,
 	// ROOM_CALLING: 64,
-	SHARE_CARD: 41,
+	SHARE_CARD: 31,
 	// COMPANY_CARD: 41,
 	// VIDEO: 43,
 	// CUSTOM_EXPRESSION: 47,
@@ -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.resPath
       return url
     },
     nextId () {

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

@@ -0,0 +1,24 @@
+<script>
+export default {
+    name: 'SdkWeworkChatControlConfigItem',
+    functional: true,
+    inject: {
+        SdkWeworkChatControlConfig: {
+            default: null
+        }
+    },
+    props: {
+        /**
+         * 消息类型
+        */
+        msgType: {
+            type: [Number, String]
+        }
+    },
+    render (h, c) {
+        return c.scopedSlots.default({
+            configData: c.injections.SdkWeworkChatControlConfig ? c.injections.SdkWeworkChatControlConfig.getControlConfig(c.props.msgType) : null
+        })
+    }
+}
+</script>

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

@@ -0,0 +1,25 @@
+<script>
+export default {
+    name: 'SdkWeworkChatControlConfigMsg',
+    functional: true,
+    inject: {
+        SdkWeworkChatControlConfig: {
+            default: null
+        }
+    },
+    props: {
+        /**
+         * 标准的企微客户端消息数据
+        */
+        msgData: {
+            type: Object,
+            required: true
+        }
+    },
+    render (h, c) {
+        return c.scopedSlots.default({
+            configData: c.injections.SdkWeworkChatControlConfig ? c.injections.SdkWeworkChatControlConfig.getMessageConfig(c.props.msgData) : null
+        })
+    }
+}
+</script>

package/{uni-components/chat-control/chat-control-config.vue → components/wework-chat-control/wework-chat-control-config.vue}

@@ -1,25 +1,20 @@
-<template>
-	<view class="sdk-wechat-chat-control-config">
-		<slot></slot>
-	</view>
-</template>
 <script>
 export default {
-    name: 'SdkWechatChatControlConfig',
+    name: 'SdkWeworkChatControlConfig',
     provide () {
         return {
-            SdkWechatChatControlConfig: this
+            SdkWeworkChatControlConfig: this
         }
     },
     inject: {
         // 可以继承上级的
-        SdkWechatChatControlConfig: {
+        SdkWeworkChatControlConfig: {
             default: null
         }
-    }, 
+    },
     props: {
         /**
-         * 这个是组件级别的配置，wechatChatPanel是消息级别的配置，后面是消息级别配置覆盖组件级别的配置
+         * 这个是组件级别的配置，weworkChatPanel是消息级别的配置，后面是消息级别配置覆盖组件级别的配置
          * {
          *      1: {
          *          formatter () {
@@ -39,6 +34,9 @@ export default {
             type: Function
         }
     },
+    render () {
+        return this.$slots.default
+    },
     methods: {
         getControlConfig (msgType) {
             if (!this.controlConfig) {
@@ -47,13 +45,18 @@ 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)
         }
     }
 }
-</script>
+</script>

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

@@ -0,0 +1,73 @@
+<template>
+  <div class="sdk-wework-panel-chat-status">
+    <!-- status: 0 success, 1 sending, 2 failed, 3 timeout -->
+    <template v-if="data.status === 1">
+      <ui-loading size="mini"></ui-loading>
+    </template>
+    <template v-else-if="data.status === 2">
+      <bi-tooltip :text="data.resultMsg || '发送失败'">
+        <span class="sdk-wework-panel-chat-status__error">
+          <svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path d="M512 938.666667C276.352 938.666667 85.333333 747.648 85.333333 512S276.352 85.333333 512 85.333333s426.666667 191.018667 426.666667 426.666667-191.018667 426.666667-426.666667 426.666667z m0-486.997334L391.338667 330.965333 330.965333 391.338667 451.669333 512l-120.704 120.661333 60.373334 60.373334L512 572.330667l120.661333 120.704 60.373334-60.373334L572.330667 512l120.704-120.661333-60.373334-60.373334L512 451.669333z" fill="currentColor"></path></svg>
+        </span>
+      </bi-tooltip>
+    </template>
+    <template v-else-if="data.status === 3">
+      <bi-tooltip :text="data.resultMsg || '发送超时'">
+        <span class="sdk-wework-panel-chat-status__error">
+          <svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path d="M512 938.666667C276.352 938.666667 85.333333 747.648 85.333333 512S276.352 85.333333 512 85.333333s426.666667 191.018667 426.666667 426.666667-191.018667 426.666667-426.666667 426.666667z m42.666667-426.666667V298.666667h-85.333334v298.666666h256v-85.333333h-170.666666z" fill="currentColor"></path></svg>
+        </span>
+      </bi-tooltip>
+    </template>
+    <template v-if="data.recalled">
+      <bi-tooltip text="消息已撤回">
+        <span class="sdk-wework-panel-chat-status__error sdk-wework-panel-chat-status__recalled">
+          <svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path d="M512 0c282.752 0 512 229.248 512 512s-229.248 512-512 512S0 794.752 0 512 229.248 0 512 0z m-50.261333 255.317333c-7.765333-39.338667-39.893333-15.36-39.893334-15.36l-213.76 192c-47.616 34.944-2.730667 60.458667-2.730666 60.458667l211.541333 190.933333c42.410667 33.066667 45.866667-17.749333 45.866667-17.749333v-86.442667c215.125333-70.144 303.36 208.341333 303.36 208.341334 7.936 15.957333 13.824 0 13.824 0C862.933333 368.682667 461.952 348.586667 461.952 348.586667z" fill="currentColor"></path></svg>
+        </span>
+      </bi-tooltip>
+    </template>
+  </div>
+</template>
+
+<script>
+import { Tooltip as BiTooltip } from '@aochuang/common/common'
+import { Loading as UiLoading } from '@aochuang/common/components'
+
+export default {
+  name: 'SdkWeworkPanelChatStatus',
+  components: {
+    BiTooltip,
+    UiLoading
+  },
+  props: {
+    data: {
+      type: Object,
+      required: true
+    },
+    updateChatBoxProp: {
+      type: Function
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.sdk-wework-panel-chat-status__error {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  font-size: 12px;
+  color: #c00;
+  width: 16px;
+  height: 16px;
+  svg {
+    width: 100%;
+    height: 100%;
+  }
+}
+.sdk-wework-panel-chat-status__recalled {
+  opacity: .6;
+}
+.sdk-wework-panel-chat-status {
+  margin: 0 6px;
+}
+</style>