@aochuang/client-sdk 1.0.358 → 1.0.359

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

@@ -1,37 +1,157 @@
 <template>
-  <component
-    :is="contentObject && contentObject.quote ? quoteComponent : defaultComponent"
-    v-bind="componentProps"
-  ></component>
+  <div
+    class="sdk-chat-wework-control-text"
+    :class="['sdk-chat-wework-control-text--' + type]"
+  >
+    <div class="sdk-chat-wework-control-text__main">
+      <template v-if="hasScroll">
+        <ui-popover
+          :value="showPopover"
+          @input="handleShowPopoverChange"
+        >
+          <template slot="reference">
+            <div class="sdk-chat-wework-control-text__content" 
+              v-html="html" 
+              ref="popoverContent"
+            ></div>
+          </template>
+          <div class="sdk-chat-wework-control-text__popover" v-html="html" :style="{'width': popoverWidth}"></div>
+        </ui-popover>
+      </template>
+      <template v-else>
+        <div class="sdk-chat-wework-control-text__content" 
+          v-html="html" 
+          ref="content"
+        ></div>
+      </template>
+    </div>
+  </div>
 </template>
 <script>
-import TextDefault from './text-default.vue'
-import TextQuote from './text-quote.vue'
-
-function parseContent (content) {
-  if (typeof content !== 'string') return content
-  try { return JSON.parse(content) } catch (e) { return content }
-}
+import { Popover as UiPopover } from '@aochuang/common/components'
+import { html2Escape } from '../../../utils/string'
 
 export default {
   name: 'SdkChatControlText',
-  components: {TextDefault, TextQuote},
-  inheritAttrs: false,
+  components: {
+    UiPopover
+  },
   props: {
-    id: {type: String},
-    content: {type: [String, Object]},
-    type: {type: String, default: 'default'},
-    formatter: {type: Function},
-    getQuoteMessage: {type: Function},
-    setChatBoxFootVnode: {type: Function}
+    id: {
+      type: String
+    },
+    content: {
+      type: String
+    },
+    type: {
+      type: String,
+      default: 'default',
+      validator (value) {
+        return ['quote', 'default', 'thumb'].includes(value)
+      }
+    },
+    formatter: {
+      type: Function
+    }
+  },
+  data () {
+    return {
+      hasScroll: false,
+      showPopover: false,
+      popoverWidth: null
+    }
   },
   computed: {
-    contentObject () { return parseContent(this.content) },
-    defaultComponent () { return TextDefault },
-    quoteComponent () { return TextQuote },
-    componentProps () {
-      return Object.assign({}, this.$attrs, this.$props, {getQuoteMessage: this.getQuoteMessage})
+    nextContent () {
+      return this.content
+    },
+    text () {
+      return this.nextContent
+    },
+    html () {
+      let content = this.nextContent
+      if (this.formatter) {
+        content = this.formatter({
+          content: this.nextContent
+        })
+      } else {
+        content = html2Escape(content)
+      }
+      if (!content) {
+        return ''
+      }
+      content = content.replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig, item => {
+        return `<a href="${item}" target='_blank'>${item}</a>`
+      })
+      return content.trim()
+    }
+  },
+  mounted () {
+    if (this.$refs.content) {
+      this.hasScroll = this.$refs.content.scrollHeight > this.$refs.content.clientHeight
+    }
+  },
+  methods: {
+    handleShowPopoverChange (visible) {
+      if (this.$refs.popoverContent && visible) {
+        this.popoverWidth = this.$refs.popoverContent.offsetWidth + 'px'
+      }
+      this.$nextTick(() => {
+        this.showPopover = visible
+      })
     }
   }
 }
 </script>
+<style lang="less">
+.sdk-chat-wework-control-text--default {
+  .sdk-chat-wework-control-text__main{
+    padding: 10px;
+  }
+} 
+.sdk-chat-wework-control-text--quote {
+  .sdk-chat-wework-control-text__content{
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2; /* 限制显示3行 */
+    overflow: hidden;
+    max-width: 420px;
+  }
+}
+.sdk-chat-wework-control-text--thumb {
+  background-color: #fff;
+  border: 1px solid #eee;
+  border-radius: 3px;
+  padding: 6px 10px;
+  .sdk-chat-wework-control-text__content{
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 3; /* 限制显示3行 */
+    overflow: hidden;
+  }
+}
+.sdk-chat-wework-control-text__main{
+  white-space: pre-wrap;
+  line-height: 1.5em;
+  word-break: break-all;
+  img {
+    vertical-align: top;
+  }
+  a {
+    color: #4387ff;
+    &:hover {
+      color: #4387ff;
+      text-decoration: underline;
+    }
+  }
+}
+.sdk-chat-wework-control-text__popover{
+  white-space: pre-wrap;
+  line-height: 1.5em;
+  word-break: break-all;
+  padding: 10px;
+  img {
+    vertical-align: top;
+  }
+}
+</style>

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

@@ -50,7 +50,7 @@
   </div>
 </template>
 <script>
-import { parse } from '../../../utils/json'
+import { parse, parseXml } from '../../../utils/json'
 import { formatOssPath } from '@aochuang/common/utils/oss'
 
 export default {
@@ -76,25 +76,26 @@ export default {
       return parse(this.content)
     },
     miniprogramData () {
+      let data = null
       if (!this.nextContent) {
-        return {}
+        return data
       }
       return this.nextContent
     },
     icon () {
-      return formatOssPath(this.miniprogramData.iconUrl)
+      return this.miniprogramData.weappIconUrl
     },
     title () {
       return this.miniprogramData.title
     },
     url () {
-      return this.miniprogramData.url
+      return this.miniprogramData.msg && this.miniprogramData.msg.appmsg ? this.miniprogramData.msg.appmsg.url  : ''
     },
     desc () {
-      return this.miniprogramData.desc
+      return this.miniprogramData.appName
     },
     cover () {
-      return formatOssPath(this.miniprogramData.resPath || this.miniprogramData.coverUrl)
+      return this.miniprogramData.thumbOssUrl
     },
     border () {
       return !this.SdkChatPanelBox

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

@@ -4,24 +4,6 @@ import UrlMerge from './url-merge'
 import UrlMiniprogram from './url-miniprogram'
 import UrlFile from './url-file'
 import UrlLink from './url-link'
-import UrlChannelLive from './url-channel-live'
-import ChannelCard from '../channel-card/channel-card'
-
-const CHANNEL_CARD_TITLE_PREFIX = '[视频号名片]'
-
-function isChannelLiveUrl (url) {
-  try {
-    return new URL(url).hostname === 'channels.weixin.qq.com'
-  } catch (e) {
-    return false
-  }
-}
-
-function isChannelCardContent (content) {
-  return isChannelLiveUrl(content && content.url) &&
-    typeof content.title === 'string' &&
-    content.title.startsWith(CHANNEL_CARD_TITLE_PREFIX)
-}
 
 export default {
   name: 'SdkChatPanelControlsUrl',
@@ -73,7 +55,7 @@ export default {
           beforeLoad: props.beforeLoadMergeMethod
         }
       })
-    } else if (content.contentType === 78) {
+    } else if (content.type === 2) {
       return h(UrlMiniprogram, {
         props: {
           id: props.id,
@@ -106,13 +88,7 @@ export default {
           }
         }
       }
-      let component = UrlLink
-      if (isChannelCardContent(content)) {
-        component = ChannelCard
-      } else if (isChannelLiveUrl(content && content.url)) {
-        component = UrlChannelLive
-      }
-      return h(component, {
+      return h(UrlLink, {
         props: {
           id: props.id,
           content,

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

@@ -2,13 +2,13 @@ export const MESSAGE_TYPE = {
 	TEXT: 0,
 	TEXT_W: 1,
 	IMAGE: 14,
-	URLFile: 15,
 	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,
@@ -32,8 +32,7 @@ export const MESSAGE_TYPE = {
 	// QUOTE_MESSAGE: 822083633,
 	CHANNEL_VIDEO: 141,
 	// CHANNEL_VIDEO_CARD: 771751985, // 视频号名片
-	CHANNEL_VIDEO_LIVE: 146, // 视频号直播
-	MEETING: 579
+	CHANNEL_VIDEO_LIVE: 146 // 视频号直播
 }
 
 function html2Escape (sHtml) {
@@ -67,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
-}
-
 /**
  * 格式化为短消息
 */
@@ -82,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) || {}
@@ -112,15 +105,22 @@ 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.contentType === 78) {
+                if(jsonObj.type === 'file') {
+                    shortMessage = '[文件消息]'
+                } else if(jsonObj.type === 'link') {
+                    shortMessage = '[链接消息]'
+                } else if(jsonObj.type === 'miniprogram') {
                     shortMessage = '[小程序消息]'
+                } else if (jsonObj.type === 'music') {
+                    shortMessage = '[音乐消息]'
+                } else if (jsonObj.type === 'merged') {
+                    shortMessage = '[合并消息]'
+                } else {
+                    shortMessage = '[链接消息]'
                 }
             } else {
                 shortMessage = '[链接消息]'
@@ -160,9 +160,6 @@ export function formatShortMessage (msgType, msgContent) {
         case MESSAGE_TYPE.CHANNEL_VIDEO_LIVE:
             shortMessage = '[视频号直播]'
             break
-        case MESSAGE_TYPE.MEETING:
-            shortMessage = '[会议消息]'
-            break
         case MESSAGE_TYPE.ROOM_CALLING:
         case MESSAGE_TYPE.CALLING:
             shortMessage = '[语音通话消息]'
@@ -227,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

@@ -20,11 +20,10 @@
             ref="player"
             :id="nextId"
             :url="voiceSrc"
-            :get-url-method="getUrlMethod"
             :enable-convert-to-wav="enableConvertToWav"
             :update-wav-method="updateWavMethod"
             :seconds="voiceDuration"
-            :allow-download="canDownload"
+            :allow-download="allowDownload"
           ></ac-voice-player>
         </div>
       </div>
@@ -54,7 +53,6 @@
 import { parse } from '../../../utils/json'
 import { unique } from '../../../utils/string'
 import AcVoicePlayer from '@aochuang/common/common/voice-player'
-import { formatOssPath } from '@aochuang/common/utils/oss'
 
 const ConvertStatusEnum = {
   NORMAL: -1, // 没有转换
@@ -102,9 +100,6 @@ export default {
       type: Boolean,
       default: true
     },
-    downloadMethod: {
-      type: Function
-    },
     transformVoiceToTextEnable: {
       type: Boolean,
       default: false
@@ -125,7 +120,6 @@ export default {
   },
   data () {
     return {
-      downloadedContent: null,
       transformStatus: typeof this.convertStatus === 'number' ? this.convertStatus : ConvertStatusEnum.NORMAL,
       playRate: 1,
       transforming: false,
@@ -135,17 +129,11 @@ export default {
   },
   computed: {
     nextContent () {
-      return this.downloadedContent || parse(this.content) || {}
+      return parse(this.content) || {}
     },
     voiceSrc () {
-      if (typeof this.nextContent === 'string') {
-        return this.nextContent
-      }
-      const voiceSrc = this.nextContent.resPath || this.nextContent.voicePath || this.nextContent.url || ''
-      if (!voiceSrc) {
-        return
-      }
-      return formatOssPath(voiceSrc) 
+      let url = this.nextContent.url || this.nextContent.resUrl
+      return url
     },
     nextId () {
       return this.id || unique()
@@ -153,9 +141,6 @@ export default {
     voiceDuration () {
       return this.nextContent.durationMs ? this.nextContent.durationMs : null
     },
-    canDownload () {
-      return this.allowDownload && !!this.nextContent.resPath
-    },
     isPlaying () {
       return this.AcVoice.isPlaying(this.id)
     },
@@ -184,46 +169,6 @@ export default {
     }
   },
   methods: {
-    getUrlMethod () {
-      const content = this.nextContent
-      const currentUrl = typeof content === 'string'
-        ? content
-        : content.resPath || content.url
-      if (currentUrl) {
-        return Promise.resolve(currentUrl)
-      }
-      if (!this.downloadMethod) {
-        return Promise.reject(new Error('未找到语音下载方法'))
-      }
-
-      const updateContentProps = (data) => {
-        if (!data || typeof data !== 'object' || Array.isArray(data)) {
-          throw new Error('updateContentProps只支持更新数据对象')
-        }
-        this.downloadedContent = data
-        return data
-      }
-      const result = this.downloadMethod({
-        content,
-        updateContentProp: (prop, value) => updateContentProps(Object.assign({}, this.nextContent, {[prop]: value})),
-        updateContentProps
-      })
-      return Promise.resolve(result).then((data) => {
-        const resultContent = typeof data === 'string' ? {url: data} : data
-        const url = resultContent && (resultContent.resPath || resultContent.url)
-        if (url) {
-          return url
-        }
-        const nextContent = this.nextContent
-        const nextUrl = typeof nextContent === 'string'
-          ? nextContent
-          : nextContent.resPath || nextContent.url
-        if (nextUrl) {
-          return nextUrl
-        }
-        throw new Error('语音下载未返回有效地址')
-      })
-    },
     handleTransformClick () {
       if (this.transformVoiceToTextMethod) {
         this.transforming = true

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
+}