@aochuang/client-sdk 1.0.359 → 1.0.360

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/wechat-chat-control/image/image.vue

@@ -92,6 +92,7 @@
 </template>
 <script>
 import { Image as UiImage, Button as UiButton, Icon as UiIcon } from '@aochuang/common/components'
+import { formatOssPath } from '@aochuang/common/utils/oss'
 import { isOriginImage, getNewImageSrc, isNewImage } from './util'
 import BiTooltip from '@aochuang/common/common/tooltip'
 import ImageDragableConfirm from './image-dragable-confirm.vue'
@@ -259,6 +260,12 @@ export default {
     isOriginImage () {
       return isOriginImage(this.src)
     },
+    isPrivateOssImage () {
+      if (!this.src) {
+        return false
+      }
+      return formatOssPath(this.src) !== this.src
+    },
     allowDefrost () {
       return !!this.defrostMethod
     }
@@ -276,14 +283,12 @@ export default {
       this.imageClickMethod && this.imageClickMethod()
     },
     handleImageDragStart (event) {
-      // 先去掉这个逻辑，私有的oss或者大图先不管了，还是以前的逻辑，私有的我这里是可以的，黄哒哒电脑不行，这里逻辑都是和老的一样的，可能和系统有关系吧
-      // 先保持和以前一样的逻辑，不做这样的弹出交互了，客户不接受
-      // if (!(this.enableDragOriginImage && this.isOriginImage)) {
-      //   return
-      // }
-      // event.preventDefault()
-      // event.stopPropagation()
-      // this.showDragOriginConfirm = true
+      if (!(this.enableDragOriginImage && this.isOriginImage) && !this.isPrivateOssImage) {
+        return
+      }
+      event.preventDefault()
+      event.stopPropagation()
+      this.showDragOriginConfirm = true
     },
     handleDragOriginConfirmClosed () {
       this.showDragOriginConfirm = false

package/components/wechat-chat-control/url/url-miniprogram.vue

@@ -13,7 +13,7 @@
             {{title}}
           </div>
           <div class="sdk-chat-panel-control-url-miniprogram__content">
-            <ui-image v-if="cover" :style="{width: '100%', height: '100%'}" :src="cover"></ui-image>
+            <div v-if="cover" :style="{width: '100%', height: '100%', 'background-image': 'url('+ cover +')'}"></div>
           </div>
         </div>
         <div class="sdk-chat-panel-control-url-miniprogram__foot">小程序</div>
@@ -50,15 +50,11 @@
   </div>
 </template>
 <script>
-import { Image as UiImage } from '@aochuang/common/components'
 import { parse, parseXml } from '../../../utils/json'
 import { formatOssPath } from '@aochuang/common/utils/oss'
 
 export default {
   name: 'SdkChatPanelControlUrlMiniprogram',
-  components: {
-    UiImage
-  },
   props: {
     id: {
       type: String

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

@@ -0,0 +1,144 @@
+<template>
+  <div class="sdk-chat-control-channel-card" :class="['sdk-chat-control-channel-card--' + type]">
+    <template v-if="type === 'default' || type === 'thumb'">
+      <div class="sdk-chat-control-channel-card__main">
+        <div class="sdk-chat-control-channel-card__avatar">
+          <sdk-avatar :src="avatar" :radius="false" size="medium"></sdk-avatar>
+        </div>
+        <div class="sdk-chat-control-channel-card__fields">
+          <div class="sdk-chat-control-channel-card__title">{{name}}</div>
+          <div class="sdk-chat-control-channel-card__summary">{{description}}</div>
+        </div>
+      </div>
+      <div class="sdk-chat-control-channel-card__foot">
+        <span class="sdk-chat-control-channel-card__category">视频号名片</span>
+      </div>
+    </template>
+    <template v-else-if="type === 'quote'">
+      <div class="sdk-chat-control-channel-card__icon"></div>
+      <div class="sdk-chat-control-channel-card__title">{{name}}</div>
+      <div class="sdk-chat-control-channel-card__avatar">
+        <sdk-avatar :src="avatar" :radius="false" size="medium"></sdk-avatar>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+import { parse } from '../../../utils/json'
+import SdkAvatar from '../../../common/avatar'
+import { formatOssPath } from '@aochuang/common/utils/oss'
+
+export default {
+  name: 'SdkChatControlChannelCard',
+  components: {
+    SdkAvatar
+  },
+  props: {
+    id: {
+      type: String
+    },
+    content: {
+      type: [String, Object]
+    },
+    type: {
+      type: String,
+      default: 'default',
+      validator (value) {
+        return ['quote', 'default', 'thumb'].includes(value)
+      }
+    },
+    updateChatBoxProp: {
+      type: Function
+    }
+  },
+  computed: {
+    nextContent () {
+      return parse(this.content) || {}
+    },
+    description () {
+      return this.nextContent.desc || ''
+    },
+    name () {
+      return (this.nextContent.title || '').replace(/^\[视频号名片\]\s*/, '')
+    },
+    avatar () {
+      return formatOssPath(this.nextContent.imageUrl)
+    },
+    url () {
+      return this.nextContent.url
+    }
+  },
+  created () {
+    if (this.url && this.updateChatBoxProp) {
+      this.updateChatBoxProp('href', this.url)
+    }
+  }
+}
+</script>
+<style lang="less">
+.sdk-chat-control-channel-card--default,
+.sdk-chat-control-channel-card--thumb{
+  width: 248px;
+  max-width: 100%;
+  line-height: 1.5em;
+  .sdk-chat-control-channel-card__main{
+    display: flex;
+    flex-direction: row;
+    padding: 10px;
+  }
+  .sdk-chat-control-channel-card__fields{
+    flex: 1;
+    min-width: 0;
+    padding-left: 10px;
+  }
+  .sdk-chat-control-channel-card__title{
+    font-size: 14px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .sdk-chat-control-channel-card__summary{
+    color: #888;
+    font-size: 12px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-top: 6px;
+  }
+  .sdk-chat-control-channel-card__foot{
+    border-top: 1px solid #eee;
+    height: 24px;
+    line-height: 24px;
+    padding: 0 10px;
+    box-sizing: content-box;
+  }
+  .sdk-chat-control-channel-card__category{
+    color: #999;
+    font-size: 12px;
+  }
+}
+.sdk-chat-control-channel-card--thumb{
+  border: 1px solid #eee;
+  background-color: #fff;
+  border-radius: 4px;
+}
+.sdk-chat-control-channel-card--quote {
+  display: flex;
+  flex-direction: row;
+  .sdk-chat-control-channel-card__icon {
+    display: inline-block;
+    width: 18px;
+    height: 18px;
+    margin-right: 4px;
+    min-width: 18px;
+    vertical-align: top;
+    margin-top: 2px;
+    color: #999;
+    background: url('../company-card/quote-icon.svg') no-repeat 50% 50%;
+    background-size: cover;
+  }
+  .sdk-chat-control-channel-card__title{
+    margin-right: 6px;
+  }
+}
+</style>

package/components/wework-chat-control/channel-live/channel-live.vue

@@ -78,7 +78,7 @@ export default {
       return formatOssPath(this.nextContent.coverUrl)
     },
     avatar () {
-      return formatOssPath(this.nextContent.avatar)
+      return formatOssPath(this.nextContent.headUrl || this.nextContent.avatar)
     },
     nickname () {
       return this.nextContent.nickname
@@ -104,6 +104,12 @@ export default {
     border-radius: 4px;
   }
 }
+.sdk-chat-wework-panel-control-channel-live__cover {
+  background-color: #000;
+}
+.sdk-chat-wework-panel-control-channel-live--default {
+  width: 248px;
+}
 .sdk-chat-wework-panel-control-channel-live--default,
 .sdk-chat-wework-panel-control-channel-live--thumb {
   max-width: 280px;
@@ -113,7 +119,6 @@ export default {
   }
   .sdk-chat-wework-panel-control-channel-live__cover{
     height: 200px;
-    background-color: #eee;
   }
   .sdk-chat-wework-panel-control-channel-live__row{
     line-height: 1.5em;

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/custom-expression/custom-expression.vue

@@ -21,9 +21,10 @@ export default {
     }
   },
   render (h, c) {
+    const content = parse(c.props.content) || {}
     return h(Image, {
       props: {
-        src: parse(c.props.content).linkUrl,
+        src: content.url,
         width: c.props.type === 'quote' ? '60px' : null,
         height: c.props.type === 'quote' ? '60px' : '120px',
         fit: 'contain'

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,18 +69,17 @@ export default {
   },
   data () {
     return {
-      nextContent: {}
+      nextContent: {},
+      downloading: false
     }
   },
   computed: {
     url () {
-      return this.nextContent.url || this.nextContent.resUrl
+      const url = this.nextContent.resPath || this.nextContent.url || this.nextContent.resUrl
+      return url ? formatOssPath(url) : url
     },
     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
@@ -106,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
@@ -115,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/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

@@ -19,6 +19,9 @@ import jxSysText from './jx-sys-text/jx-sys-text.vue'
 // import textWithAt from './text-with-at/text-with-at.vue'
 import channelVideo from './channel-video/channel-video.vue'
 import channelLive from './channel-live/channel-live.vue'
+import metting from './metting/metting.vue'
+import mergeMessage from './merge-message/merge-message.vue'
+import mergeMessagePanel from './merge-message/merge-message-panel.vue'
 // import channelVideoCard from './channel-video-card/channel-video-card.vue'
 // import music from './music/music.vue'
 // import transfer from './transfer/transfer.vue'
@@ -26,9 +29,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'
@@ -45,8 +48,8 @@ export const chatControls = {
 	[MESSAGE_TYPE.COMPANY_CARD]: companyCard,
 	[MESSAGE_TYPE.VIDEO]: video,
 	[MESSAGE_TYPE.CUSTOM_EXPRESSION]: customExpression,
-	[MESSAGE_TYPE.CUSTOM_EXPRESSION_W]: customExpression,
 	[MESSAGE_TYPE.LOCATION]: location,
+	[MESSAGE_TYPE.URLFile]: fileUrl,
 	[MESSAGE_TYPE.URL]: url,
 	[MESSAGE_TYPE.URLNew]: fileUrl,
 // 	[MESSAGE_TYPE.CALLING]: calling,
@@ -62,6 +65,8 @@ export const chatControls = {
 	[MESSAGE_TYPE.CHANNEL_VIDEO]: channelVideo,
 // 	[MESSAGE_TYPE.CHANNEL_VIDEO_CARD]: channelVideoCard, // 视频号名片
 	[MESSAGE_TYPE.CHANNEL_VIDEO_LIVE]: channelLive, // 视频号直播
+	[MESSAGE_TYPE.MEETING]: metting,
+	[MESSAGE_TYPE.MERGE_MESSAGE]: mergeMessage,
 //  [MESSAGE_TYPE.SYSTEM_BATCH_MESSAGE]: systemBatchMessage,
 //  [MESSAGE_TYPE.REVOKE_ME_MESSAGE]: revokeMeMessage,
 //  [MESSAGE_TYPE.REVOKE_OTHER_MESSAGE]: revokeOtherMessage,
@@ -93,6 +98,9 @@ export {
   channelVideo, // 视频号
 //   channelVideoCard,
   channelLive, // 视频号直播
+  metting,
+  mergeMessage,
+  mergeMessagePanel,
 //   music,
 //   transfer,
   empty,
@@ -100,7 +108,7 @@ export {
 //   revokeMeMessage,
 //   revokeOtherMessage,
 //   revokeYouMessage,
-//   WechatChatControlConfig,
-//   WechatChatControlConfigMsg,
-//   WechatChatControlConfigItem
+  WeworkChatControlConfig,
+  WeworkChatControlConfigMsg,
+  WeworkChatControlConfigItem
 }