@aochuang/client-sdk 1.0.358 → 1.0.360

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

@@ -20,6 +20,8 @@ import jxSysText from './jx-sys-text/jx-sys-text.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'
@@ -64,6 +66,7 @@ export const chatControls = {
 // 	[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,
@@ -96,6 +99,8 @@ export {
 //   channelVideoCard,
   channelLive, // 视频号直播
   metting,
+  mergeMessage,
+  mergeMessagePanel,
 //   music,
 //   transfer,
   empty,

package/components/wework-chat-control/merge-message/merge-message-panel.vue

@@ -0,0 +1,63 @@
+<template>
+  <ui-dialog v-model="innerVisible" :title="title" size="small" :close-on-click-modal="true">
+    <div class="sdk-wework-chat-control-merge-message__dialog">
+      <div v-for="(message, index) in detailMessages" :key="index" class="sdk-wework-chat-control-merge-message__detail-item">
+        <img v-if="message.avatar" class="sdk-wework-chat-control-merge-message__avatar" :src="message.avatar" alt="">
+        <div v-else class="sdk-wework-chat-control-merge-message__avatar sdk-wework-chat-control-merge-message__avatar--empty">{{ message.sender.slice(0, 1) }}</div>
+        <div class="sdk-wework-chat-control-merge-message__detail-main">
+          <div class="sdk-wework-chat-control-merge-message__detail-head">
+            <span class="sdk-wework-chat-control-merge-message__detail-sender">{{ message.sender }}</span>
+            <span v-if="message.corpName" class="sdk-wework-chat-control-merge-message__detail-corp">@{{ message.corpName }}</span>
+            <span class="sdk-wework-chat-control-merge-message__detail-time">{{ message.time }}</span>
+          </div>
+          <ui-image v-if="message.image" :src="message.image" width="160px" height="160px" fit="cover" :previewable="true"></ui-image>
+          <div v-else class="sdk-wework-chat-control-merge-message__detail-content">{{ message.detail }}</div>
+        </div>
+      </div>
+      <div v-if="!detailMessages.length" class="sdk-wework-chat-control-merge-message__dialog-empty">暂无聊天记录</div>
+    </div>
+  </ui-dialog>
+</template>
+
+<script>
+import { Dialog as UiDialog, Image as UiImage } from '@aochuang/common/components'
+import { parse } from '../../../utils/json'
+import { normalizeMergeMessage } from './util'
+
+export default {
+  name: 'SdkWeworkChatControlMergeMessagePanel',
+  components: { UiDialog, UiImage },
+  props: {
+    value: { type: Boolean, default: false },
+    title: { type: String, default: '聊天记录' },
+    messages: { type: [Array, String, Object], default: () => [] }
+  },
+  computed: {
+    innerVisible: {
+      get () { return this.value },
+      set (value) { this.$emit('input', value) }
+    },
+    detailMessages () {
+      let messages = this.messages
+      if (typeof messages === 'string') messages = parse(messages)
+      if (!Array.isArray(messages)) return []
+      return messages.map(message => normalizeMergeMessage(message || {}))
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.sdk-wework-chat-control-merge-message__dialog { max-height: 560px; overflow-y: auto; padding: 0 24px 24px; }
+.sdk-wework-chat-control-merge-message__detail-item { display: flex; padding: 12px 0; border-bottom: 1px solid #eee; }
+.sdk-wework-chat-control-merge-message__detail-item:last-child { border-bottom: 0; }
+.sdk-wework-chat-control-merge-message__avatar { flex: none; width: 36px; height: 36px; margin-right: 10px; border-radius: 5px; object-fit: cover; }
+.sdk-wework-chat-control-merge-message__avatar--empty { background: #eee; color: #888; font-size: 16px; line-height: 36px; text-align: center; }
+.sdk-wework-chat-control-merge-message__detail-main { flex: 1; min-width: 0; }
+.sdk-wework-chat-control-merge-message__detail-head { display: flex; align-items: baseline; min-height: 20px; line-height: 20px; }
+.sdk-wework-chat-control-merge-message__detail-sender { color: #8b8e98; font-size: 13px; }
+.sdk-wework-chat-control-merge-message__detail-corp { color: #f18b32; font-size: 12px; }
+.sdk-wework-chat-control-merge-message__detail-time { margin-left: auto; padding-left: 12px; color: #9699a3; font-size: 12px; white-space: nowrap; }
+.sdk-wework-chat-control-merge-message__detail-content { padding-top: 4px; color: #222; font-size: 14px; line-height: 22px; white-space: pre-wrap; word-break: break-word; }
+.sdk-wework-chat-control-merge-message__dialog-empty { padding: 24px; color: #999; text-align: center; }
+</style>

package/components/wework-chat-control/merge-message/merge-message.vue

@@ -0,0 +1,84 @@
+<template>
+  <div class="sdk-wework-chat-control-merge-message" :class="'sdk-wework-chat-control-merge-message--' + type">
+    <template v-if="type === 'quote'">
+      [聊天记录]{{ title }}
+    </template>
+    <template v-else>
+      <div class="sdk-wework-chat-control-merge-message__card" @click="openDetail">
+        <div class="sdk-wework-chat-control-merge-message__title">{{ title }}</div>
+        <div v-if="messages.length" class="sdk-wework-chat-control-merge-message__list">
+          <div v-for="(message, index) in messages" :key="index" class="sdk-wework-chat-control-merge-message__item">
+            <span class="sdk-wework-chat-control-merge-message__sender">{{ message.sender }}</span>
+            <span class="sdk-wework-chat-control-merge-message__separator">：</span>
+            <span class="sdk-wework-chat-control-merge-message__summary">{{ message.summary }}</span>
+          </div>
+        </div>
+        <div v-else class="sdk-wework-chat-control-merge-message__empty">暂无聊天记录</div>
+        <div class="sdk-wework-chat-control-merge-message__foot">聊天记录</div>
+      </div>
+    </template>
+    <merge-message-panel v-model="dialogVisible" :title="title" :messages="data.messages"></merge-message-panel>
+  </div>
+</template>
+
+<script>
+import { parse } from '../../../utils/json'
+import MergeMessagePanel from './merge-message-panel.vue'
+import { getMessageSummary } from './util'
+
+export default {
+  name: 'SdkWeworkChatControlMergeMessage',
+  components: { MergeMessagePanel },
+  props: {
+    id: { type: String },
+    content: { type: [String, Object] },
+    type: {
+      type: String,
+      default: 'default',
+      validator (value) {
+        return ['quote', 'default', 'thumb'].includes(value)
+      }
+    }
+  },
+  data () {
+    return { dialogVisible: false }
+  },
+  computed: {
+    data () {
+      const value = parse(this.content)
+      return value && typeof value === 'object' ? value : {}
+    },
+    title () {
+      return this.data.title || '聊天记录'
+    },
+    messages () {
+      if (!Array.isArray(this.data.messages)) return []
+      return this.data.messages.map(message => ({
+        sender: message && (message.senderName || message.name || message.sender || '未知联系人'),
+        summary: getMessageSummary(message || {})
+      }))
+    }
+  },
+  methods: {
+    openDetail () {
+      if (this.type !== 'quote') this.dialogVisible = true
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.sdk-wework-chat-control-merge-message { display: inline-block; max-width: 100%; color: #222; }
+.sdk-wework-chat-control-merge-message__card { width: 248px; max-width: 100%; overflow: hidden; border-radius: 6px; background: #f1f1f3; }
+.sdk-wework-chat-control-merge-message__title { padding: 11px 12px 6px; overflow: hidden; font-size: 14px; font-weight: 500; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; }
+.sdk-wework-chat-control-merge-message__list { padding: 0 12px 7px; }
+.sdk-wework-chat-control-merge-message__item { display: flex; min-width: 0; color: #96969b; font-size: 12px; line-height: 18px; }
+.sdk-wework-chat-control-merge-message__sender, .sdk-wework-chat-control-merge-message__separator { flex: none; }
+.sdk-wework-chat-control-merge-message__sender { max-width: 74px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.sdk-wework-chat-control-merge-message__summary { min-width: 0; overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; word-break: break-all; }
+.sdk-wework-chat-control-merge-message__empty { padding: 0 12px 9px; color: #96969b; font-size: 12px; line-height: 18px; }
+.sdk-wework-chat-control-merge-message__foot { height: 27px; padding: 0 12px; border-top: 1px solid rgba(0, 0, 0, .08); color: #999; font-size: 12px; line-height: 27px; }
+.sdk-wework-chat-control-merge-message__card { cursor: pointer; }
+.sdk-wework-chat-control-merge-message--thumb { width: 100%; .sdk-wework-chat-control-merge-message__card { width: 100%; } }
+.sdk-wework-chat-control-merge-message--quote { color: #888; font-size: 12px; }
+</style>

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

@@ -0,0 +1,59 @@
+import { formatOssPath } from '@aochuang/common/utils/oss'
+import { parse } from '../../../utils/json'
+import { MESSAGE_TYPE } from '../util'
+
+export const TYPE_LABELS = {
+  [MESSAGE_TYPE.IMAGE]: '[图片]', [MESSAGE_TYPE.VOICE]: '[语音]', [MESSAGE_TYPE.VIDEO]: '[视频]',
+  [MESSAGE_TYPE.URLFile]: '[文件]', [MESSAGE_TYPE.URL]: '[链接]', [MESSAGE_TYPE.URLNew]: '[文件]',
+  [MESSAGE_TYPE.CUSTOM_EXPRESSION]: '[表情]', [MESSAGE_TYPE.LOCATION]: '[位置]',
+  [MESSAGE_TYPE.CALLING]: '[语音通话]', [MESSAGE_TYPE.RED_ENVELOPES]: '[红包]',
+  [MESSAGE_TYPE.SHARE_CARD]: '[名片]', [MESSAGE_TYPE.CHANNEL_VIDEO]: '[视频号]',
+  [MESSAGE_TYPE.CHANNEL_VIDEO_LIVE]: '[视频号直播]', [MESSAGE_TYPE.MEETING]: '[会议]'
+}
+
+export const MERGED_TYPE_LABELS = {
+  3: '[图片]', 4: '[语音]', 5: '[视频]', 6: '[文件]', 7: '[位置]', 8: '[链接]',
+  9: '[名片]', 10: '[表情]', 11: '[语音通话]', 12: '[视频通话]'
+}
+
+export function parseMessageContent (content) {
+  const parsed = parse(content)
+  if (parsed && typeof parsed === 'object') {
+    const value = parsed.text || parsed.content || parsed.desc || ''
+    return typeof value === 'string' || typeof value === 'number' ? String(value) : ''
+  }
+  return parsed == null ? '' : String(parsed)
+}
+
+export function getMessageSummary (message) {
+  const type = Number(message && message.contentType)
+  const contentText = parseMessageContent(message && message.content)
+  if (type === 0 || type === 1 || type === 2) return contentText || '[文本]'
+  return MERGED_TYPE_LABELS[type] || TYPE_LABELS[type] || contentText || '[未知消息]'
+}
+
+export function formatMessageTime (timestamp) {
+  const date = new Date(timestamp)
+  if (Number.isNaN(date.getTime())) return ''
+  const pad = value => String(value).padStart(2, '0')
+  return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日 ${pad(date.getHours())}:${pad(date.getMinutes())}`
+}
+
+export function normalizeMergeMessage (message) {
+  const item = message || {}
+  const content = parse(item.content)
+  const contentObject = content && typeof content === 'object' ? content : {}
+  const type = Number(item.contentType)
+  const rawTime = item.time || item.sendTime || item.timestamp
+  let timestamp = Number(rawTime)
+  if (timestamp && timestamp < 100000000000) timestamp *= 1000
+  const image = contentObject.imageUrl || contentObject.thumbUrl || contentObject.picUrl || contentObject.resPath
+  return {
+    sender: item.senderName || item.name || item.sender || '未知联系人',
+    corpName: item.corpName || item.corp || '',
+    avatar: item.avatarUrl || item.senderAvatarUrl || item.avatar || '',
+    time: timestamp ? formatMessageTime(timestamp) : '',
+    image: (type === 3 || type === MESSAGE_TYPE.IMAGE) && image ? formatOssPath(image) : '',
+    detail: getMessageSummary(item)
+  }
+}

package/components/wework-chat-control/red-envelopes/red-envelopes.vue

@@ -63,10 +63,10 @@ export default {
       return parse(this.content) || {}
     },
     title () {
-      return this.nextContent.wish
+      return this.nextContent.content
     },
     description () {
-      return ''
+      return this.nextContent.receiveText
     },
     category () {
       return '微红包'
@@ -105,6 +105,7 @@ export default {
     flex: 1;
     min-width: 0;
     line-height: 1.3em;
+    padding-top: 6px;
   }
   .sdk-wework-control-redpacket__title{
     line-height: 22px;

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

@@ -1,6 +1,7 @@
 export const MESSAGE_TYPE = {
 	TEXT: 0,
 	TEXT_W: 1,
+	MERGE_MESSAGE: 4,
 	IMAGE: 14,
 	URLFile: 15,
 	VOICE: 16,
@@ -92,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
@@ -121,6 +125,8 @@ export function formatShortMessage (msgType, msgContent) {
             if (typeof jsonObj === 'object') {
                 if(jsonObj.contentType === 78) {
                     shortMessage = '[小程序消息]'
+                } else {
+                    shortMessage = '[链接消息]'
                 }
             } else {
                 shortMessage = '[链接消息]'

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>
@@ -102,9 +101,6 @@ export default {
       type: Boolean,
       default: true
     },
-    downloadMethod: {
-      type: Function
-    },
     transformVoiceToTextEnable: {
       type: Boolean,
       default: false
@@ -125,7 +121,6 @@ export default {
   },
   data () {
     return {
-      downloadedContent: null,
       transformStatus: typeof this.convertStatus === 'number' ? this.convertStatus : ConvertStatusEnum.NORMAL,
       playRate: 1,
       transforming: false,
@@ -135,13 +130,13 @@ 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 || ''
+      const voiceSrc = this.nextContent.resPath
       if (!voiceSrc) {
         return
       }
@@ -153,9 +148,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 +176,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-item.vue

@@ -379,6 +379,25 @@
           </template>
         </sdk-chat-panel-box>
       </template>
+      <template v-else-if="item.msgType === MESSAGE_TYPE.MERGE_MESSAGE">
+        <sdk-chat-panel-box
+          :dir="dir"
+          :data="item"
+          :fetchUserMethod="fetchUserMethod"
+          :blank="true"
+          @user-avatar-click="handleUserAvatarClick"
+          @user-avatar-contextmenu="handleUserAvatarContextmenu"
+        >
+          <sdk-chat-control-merge-message
+            v-bind="configData"
+            :id="item.id"
+            :content="msgContent"
+          ></sdk-chat-control-merge-message>
+          <template slot="append" slot-scope="{ updateProp }">
+            <slot name="chat-append" :item="item" :update-chat-box-prop="updateProp"></slot>
+          </template>
+        </sdk-chat-panel-box>
+      </template>
       <template v-else-if="item.msgType == MESSAGE_TYPE.CALLING">
         <sdk-chat-panel-box
           :dir="dir"
@@ -554,6 +573,7 @@ import {
   // channelVideoCard as SdkChatControlChannelVideoCard,
   channelLive as SdkChatControlChannelLive,
   metting as SdkChatControlMetting,
+  mergeMessage as SdkChatControlMergeMessage,
   url as SdkChatControlUrl,
   fileUrl as SdkChatControlFileUrl,
   jxSysText as SdkChatControlJxSysText,
@@ -593,6 +613,7 @@ export default {
     // SdkChatControlChannelVideoCard,
     SdkChatControlChannelLive,
     SdkChatControlMetting,
+    SdkChatControlMergeMessage,
     SdkChatControlFileUrl,
     // SdkChatControlTextWithAt,
     SdkChatControlUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.358",
+  "version": "1.0.360",
   "description": "",
   "files": [
     "common",