@aochuang/client-sdk 1.0.344 → 1.0.345

package/components/index.js

@@ -11,7 +11,6 @@ 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'
 
@@ -22,10 +21,6 @@ export default {
     WechatChatControlConfig, 
     WechatChatControlConfigMsg,
     WechatChatControlConfigItem,
-    WeworkChatControls,
-    WeworkChatControlConfig,
-    WeworkChatControlConfigMsg,
-    WeworkChatControlConfigItem,
     MESSAGE_TYPE,
     MESSAGE_TYPE_W,
     AccountSelect,
@@ -45,4 +40,4 @@ export default {
     ChatRoomProfile,
     WechatChatPanel,
     WeworkChatPanel
-}
+}

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

@@ -5,13 +5,14 @@
 				<div class="sdk-session-item__avatar-image">
 					<slot name="avatar"></slot>
 				</div>
-				<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>
+				<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>
 			</div>
 			<div class="sdk-session-item__main">
 				<div class="sdk-session-item__row">
@@ -141,7 +142,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/calling/calling.vue

@@ -73,6 +73,9 @@ export default {
       type: Boolean,
       default: true
     },
+    downloadMethod: {
+      type: Function
+    },
     transformVoiceToTextEnable: {
       type: Boolean,
       default: false

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

@@ -22,6 +22,7 @@
             :url="voiceSrc"
             :enable-convert-to-wav="enableConvertToWav"
             :update-wav-method="updateWavMethod"
+            :download-method="downloadMethod"
             :seconds="voiceDuration"
             :allow-download="allowDownload"
           ></ac-voice-player>
@@ -100,6 +101,9 @@ export default {
       type: Boolean,
       default: true
     },
+    downloadMethod: {
+      type: Function
+    },
     transformVoiceToTextEnable: {
       type: Boolean,
       default: false

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

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

@@ -1,24 +1,7 @@
 <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="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="allowDefrost">
         <template v-if="defrostMsg">
           <div class="sdk-chat-control-image__defrost">
             <div class="sdk-chat-control-image__defrost-icon">
@@ -93,7 +76,6 @@
 </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 {
@@ -116,17 +98,7 @@ export default {
       }
     },
     content: {
-      type: [String, Object]
-    },
-    allowDownload: {
-      type: [Boolean, Function],
-      default: false
-    },
-    downloadMethod: {
-      type: Function
-    },
-    cancelDownloadMethod: {
-      type: Function
+      type: String
     },
     maxWidth: {
       type: Number,
@@ -178,35 +150,12 @@ 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 () {
@@ -261,9 +210,6 @@ export default {
       return !!this.defrostMethod
     }
   },
-  created () {
-    this.syncContentState()
-  },
   methods: {
     handleClick () {
       this.$emit('click')
@@ -271,39 +217,6 @@ 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
@@ -323,22 +236,7 @@ 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>
@@ -379,39 +277,6 @@ 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 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 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 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,
-  WeworkChatControlConfig,
-  WeworkChatControlConfigMsg,
-  WeworkChatControlConfigItem
+//   WechatChatControlConfig,
+//   WechatChatControlConfigMsg,
+//   WechatChatControlConfigItem
 }

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

@@ -31,21 +31,6 @@
 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: {
@@ -78,27 +63,23 @@ export default {
   },
   computed: {
     nextContent () {
-      return parseTextContent(this.content)
+      return this.content
     },
     text () {
-      if (this.nextContent && typeof this.nextContent === 'object') {
-        return this.nextContent.text || ''
-      }
       return this.nextContent
     },
     html () {
-      let content = this.text
+      let content = this.nextContent
       if (this.formatter) {
         content = this.formatter({
           content: this.nextContent
         })
       } else {
-        content = html2Escape(String(content || ''))
+        content = html2Escape(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: 22,
+	VIDEO: 23,
 	CUSTOM_EXPRESSION: 29,
 	CUSTOM_EXPRESSION_W: 104,
     // MUSIC: 1040187441,
 	// ROOM_CALLING: 64,
-	SHARE_CARD: 31,
+	SHARE_CARD: 41,
 	// COMPANY_CARD: 41,
 	// VIDEO: 43,
 	// CUSTOM_EXPRESSION: 47,
@@ -66,14 +66,6 @@ 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
-}
-
 /**
  * 格式化为短消息
 */
@@ -81,8 +73,10 @@ export function formatShortMessage (msgType, msgContent) {
     let shortMessage = msgContent
     switch (msgType) {
         case MESSAGE_TYPE.TEXT:
+            shortMessage = msgContent
+            break
         case MESSAGE_TYPE.TEXT_W:
-            shortMessage = getTextContent(msgContent)
+            shortMessage = msgContent
             break
         case MESSAGE_TYPE.TEXT_WITH_AT:
             let {atId, content, text} = toJson(msgContent) || {}
@@ -230,4 +224,4 @@ export function formatShortSessionMessage (session, contextFn) {
         }
     }
     return formatShortMessage(session.lastMsgType, session.lastMsgContent)
-}
+}

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

@@ -147,9 +147,7 @@ export default {
       if (typeof this.nextContent === 'string') {
         url = this.nextContent
       } else if (this.nextContent && typeof this.nextContent === 'object') {
-        if (this.nextContent.resPath) {
-          url = this.nextContent.resPath
-        } else if (this.nextContent.videoPath) {
+        if (this.nextContent.videoPath) {
           url = this.nextContent.videoPath
         } else {
           url = this.nextContent.tencentUrl
@@ -165,7 +163,7 @@ export default {
       if (!this.nextContent) {
         return
       }
-      return this.nextContent.resCoverPath || this.nextContent.previewImgUrl
+      return this.nextContent.previewImgUrl
     },
     innerCover () {
       return formatOssPath(this.cover)
@@ -204,12 +202,6 @@ 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.resPath
+      let url = this.nextContent.url || this.nextContent.resUrl
       return url
     },
     nextId () {

package/components/wework-chat-panel/chat-panel-controls/company-card/company-card.vue

@@ -0,0 +1,35 @@
+<script>
+import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
+import { companyCard } from '../../../wework-chat-control'
+
+export default {
+  name: 'SdkWeworkChatPanelControlsCompanyCard',
+  functional: true,
+  props: {
+    dir: {
+      type: String
+    },
+    data: {
+      type: Object,
+      required: true
+    },
+    fetchUserMethod: {
+      type: Function
+    }
+  },
+  render (h, c) {
+    const { props } = c
+    return h(SdkChatPanelBox, {
+      props: {
+        dir: props.dir,
+        data: props.data,
+        fetchUserMethod: props.fetchUserMethod
+      }
+    }, [h(companyCard, {
+      props: {
+        data: props.data
+      }
+    })])
+  }
+}
+</script>

package/components/wework-chat-panel/chat-panel-controls/expression/expression.vue

@@ -0,0 +1,36 @@
+<script>
+import { expression } from '../../../wework-chat-control'
+import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
+
+export default {
+  name: 'SdkWeworkChatPanelControlsExpression',
+  functional: true,
+  props: {
+    dir: {
+      type: String
+    },
+    data: {
+      type: Object,
+      default: () => ({})
+    },
+    fetchUserMethod: {
+      type: Function
+    }
+  },
+  render (h, c) {
+    const { props } = c
+    return h(SdkChatPanelBox, {
+      props: {
+        dir: props.dir,
+        data: props.data,
+        fetchUserMethod: props.fetchUserMethod
+      }
+    }, [h(expression, {
+      props: {
+        data: props.data
+      },
+      key: c.data.key
+    })])
+  }
+}
+</script>

package/components/wework-chat-panel/chat-panel-controls/file-url/file-url.vue

@@ -0,0 +1,35 @@
+<script>
+import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
+import { fileUrl } from '../../../wework-chat-control'
+
+export default {
+  name: 'SdkWeworkChatPanelControlsFileUrl',
+  functional: true,
+  props: {
+    dir: {
+      type: String
+    },
+    data: {
+      type: Object,
+      required: true
+    },
+    fetchUserMethod: {
+      type: Function
+    }
+  },
+  render (h, c) {
+    const { props } = c
+    return h(SdkChatPanelBox, {
+      props: {
+        dir: props.dir,
+        data: props.data,
+        fetchUserMethod: props.fetchUserMethod
+      }
+    }, [h(fileUrl, {
+      props: {
+        content: props.data.content
+      }
+    })])
+  }
+}
+</script>

package/components/wework-chat-panel/chat-panel-controls/image/image.vue

@@ -0,0 +1,36 @@
+<script>
+import { image } from '../../../wework-chat-control'
+import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
+
+export default {
+  name: 'SdkWeworkChatPanelControlsImage',
+  functional: true,
+  props: {
+    dir: {
+      type: String
+    },
+    data: {
+      type: Object,
+      default: () => ({})
+    },
+    fetchUserMethod: {
+      type: Function
+    }
+  },
+  render (h, c) {
+    const { props } = c
+    return h(SdkChatPanelBox, {
+      props: {
+        dir: props.dir,
+        data: props.data,
+        fetchUserMethod: props.fetchUserMethod
+      }
+    }, [h(image, {
+      props: {
+        data: props.data
+      },
+      key: c.data.key
+    })])
+  }
+}
+</script>

package/components/wework-chat-panel/chat-panel-controls/index.js

@@ -0,0 +1,35 @@
+import text from './text/text.vue'
+import link from './link/link.vue'
+import companyCard from './company-card/company-card.vue'
+import video from './video/video.vue'
+import image from './image/image.vue'
+import unkonw from './unkonw/unkonw.vue'
+import expression from './expression/expression.vue'
+import voice from './voice/voice.vue'
+import jxSysText from './jx-sys-text/jx-sys-text.vue'
+import fileUrl from './file-url/file-url.vue'
+import location from './location/location.vue'
+
+export default {
+  0: text,
+  2: text,
+  14: image,
+  101: image,
+  // '49': link,
+  22: video,
+  23: video,
+  103: video,
+  29: expression,
+  104: expression,
+  16: voice,
+  40: voice,
+  1011: jxSysText,
+  1022: jxSysText,
+  41: companyCard,
+  13: fileUrl,
+  15: fileUrl,
+  20: fileUrl,
+  102: fileUrl,
+  6: location,
+  unkonw
+}

package/components/wework-chat-panel/chat-panel-controls/jx-sys-text/jx-sys-text.vue

@@ -0,0 +1,28 @@
+<script>
+import { jxSysText } from '../../../wework-chat-control'
+
+export default {
+  name: 'SdkWeworkChatPanelControlsJxSysText',
+  functional: true,
+  props: {
+    dir: {
+      type: String
+    },
+    data: {
+      type: Object,
+      required: true
+    },
+    fetchUserMethod: {
+      type: Function
+    }
+  },
+  render (h, c) {
+    const { props } = c
+    return h(jxSysText, {
+      props: {
+        content: props.data.content
+      }
+    })
+  }
+}
+</script>