@aochuang/client-sdk 1.0.371 → 1.0.372

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

@@ -1,157 +1,37 @@
 <template>
-  <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>
+  <component
+    :is="contentObject && contentObject.quote ? quoteComponent : defaultComponent"
+    v-bind="componentProps"
+  ></component>
 </template>
 <script>
-import { Popover as UiPopover } from '@aochuang/common/components'
-import { html2Escape } from '../../../utils/string'
+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 }
+}
 
 export default {
   name: 'SdkChatControlText',
-  components: {
-    UiPopover
-  },
+  components: {TextDefault, TextQuote},
+  inheritAttrs: false,
   props: {
-    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
-    }
+    id: {type: String},
+    content: {type: [String, Object]},
+    type: {type: String, default: 'default'},
+    formatter: {type: Function},
+    getQuoteMessage: {type: Function},
+    setChatBoxFootVnode: {type: Function}
   },
   computed: {
-    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
-      })
+    contentObject () { return parseContent(this.content) },
+    defaultComponent () { return TextDefault },
+    quoteComponent () { return TextQuote },
+    componentProps () {
+      return Object.assign({}, this.$attrs, this.$props, {getQuoteMessage: this.getQuoteMessage})
     }
   }
 }
 </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-channel-live.vue

@@ -0,0 +1,53 @@
+<script>
+import { parse } from '../../../utils/json'
+import ChannelLive from '../channel-live/channel-live'
+
+export default {
+  name: 'SdkWeworkControlUrlChannelLive',
+  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) || {}
+    },
+    channelLiveContent () {
+      return {
+        url: this.nextContent.url,
+        coverUrl: this.nextContent.imageUrl,
+        nickname: this.nextContent.desc,
+        desc: (this.nextContent.title || '').replace(/^\[视频号直播\]\s*/, '')
+      }
+    }
+  },
+  created () {
+    if (this.nextContent.url && this.updateChatBoxProp) {
+      this.updateChatBoxProp('href', this.nextContent.url)
+    }
+  },
+  render (h) {
+    return h(ChannelLive, {
+      props: {
+        id: this.id,
+        content: this.channelLiveContent,
+        type: this.type
+      }
+    })
+  }
+}
+</script>

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

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

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

@@ -4,6 +4,24 @@ 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',
@@ -55,7 +73,7 @@ export default {
           beforeLoad: props.beforeLoadMergeMethod
         }
       })
-    } else if (content.type === 2) {
+    } else if (content.contentType === 78) {
       return h(UrlMiniprogram, {
         props: {
           id: props.id,
@@ -88,7 +106,13 @@ export default {
           }
         }
       }
-      return h(UrlLink, {
+      let component = UrlLink
+      if (isChannelCardContent(content)) {
+        component = ChannelCard
+      } else if (isChannelLiveUrl(content && content.url)) {
+        component = UrlChannelLive
+      }
+      return h(component, {
         props: {
           id: props.id,
           content,

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

@@ -1,14 +1,15 @@
 export const MESSAGE_TYPE = {
 	TEXT: 0,
 	TEXT_W: 1,
+	MERGE_MESSAGE: 4,
 	IMAGE: 14,
+	URLFile: 15,
 	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,
@@ -32,7 +33,8 @@ export const MESSAGE_TYPE = {
 	// QUOTE_MESSAGE: 822083633,
 	CHANNEL_VIDEO: 141,
 	// CHANNEL_VIDEO_CARD: 771751985, // 视频号名片
-	CHANNEL_VIDEO_LIVE: 146 // 视频号直播
+	CHANNEL_VIDEO_LIVE: 146, // 视频号直播
+	MEETING: 579
 }
 
 function html2Escape (sHtml) {
@@ -66,6 +68,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 +83,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) || {}
@@ -85,6 +93,9 @@ export function formatShortMessage (msgType, msgContent) {
         case MESSAGE_TYPE.IMAGE:
             shortMessage = '[图片消息]'
             break
+        case MESSAGE_TYPE.MERGE_MESSAGE:
+            shortMessage = '[聊天记录]'
+            break
         case MESSAGE_TYPE.VIDEO:
             shortMessage = '[视频消息]'
             break
@@ -105,20 +116,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 = '[链接消息]'
                 }
@@ -160,6 +166,9 @@ 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 = '[语音通话消息]'
@@ -224,4 +233,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

@@ -53,6 +53,7 @@
 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, // 没有转换
@@ -132,8 +133,14 @@ export default {
       return parse(this.content) || {}
     },
     voiceSrc () {
-      let url = this.nextContent.url || this.nextContent.resUrl
-      return url
+      if (typeof this.nextContent === 'string') {
+        return this.nextContent
+      }
+      const voiceSrc = this.nextContent.resPath
+      if (!voiceSrc) {
+        return
+      }
+      return formatOssPath(voiceSrc) 
     },
     nextId () {
       return this.id || unique()

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>