@aochuang/client-sdk 1.0.376 → 1.0.378

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

@@ -19,9 +19,6 @@ 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'
@@ -29,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'
@@ -48,8 +45,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,
@@ -65,8 +62,6 @@ 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,
@@ -98,9 +93,6 @@ export {
   channelVideo, // 视频号
 //   channelVideoCard,
   channelLive, // 视频号直播
-  metting,
-  mergeMessage,
-  mergeMessagePanel,
 //   music,
 //   transfer,
   empty,
@@ -108,7 +100,7 @@ export {
 //   revokeMeMessage,
 //   revokeOtherMessage,
 //   revokeYouMessage,
-  WeworkChatControlConfig,
-  WeworkChatControlConfigMsg,
-  WeworkChatControlConfigItem
+//   WechatChatControlConfig,
+//   WechatChatControlConfigMsg,
+//   WechatChatControlConfigItem
 }

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

@@ -8,11 +8,11 @@
         </div>
         <div class="sdk-chat-wework-control-location__body">
           <div v-if="offline" class="sdk-chat-wework-control-location__offline">
-            <div class="sdk-chat-wework-control-location__offline-label">高德地图经纬度坐标：</div>
+            <div class="sdk-chat-wework-control-location__offline-label">腾讯地图经纬度坐标：</div>
             <div class="sdk-chat-wework-control-location__offline-value">{{longitude}}、{{latitude}}</div>
             <div class="sdk-chat-wework-control-location__offline-tips">提示：离线模式无法显示地图</div>
           </div>
-          <ac-static-map type="amap" :map-key="mapKey" v-else :enable-link="false" width="280" height="160" :lng="longitude" :lat="latitude" @map-created="handleStaticMapCreated"></ac-static-map>
+          <ac-static-map :map-key="mapKey" v-else :enable-link="false" width="280" height="160" :lng="longitude" :lat="latitude" @map-created="handleStaticMapCreated"></ac-static-map>
         </div>
       </div>
     </template>
@@ -22,7 +22,7 @@
           <svg t="1752133896251" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="25831" width="200" height="200"><path d="M512 1012.394667l-271.530667-271.530667a384 384 0 1 1 543.061334 0L512 1012.394667z m211.2-331.861334a298.666667 298.666667 0 1 0-422.4 0L512 891.733333l211.2-211.2zM512 554.666667a85.333333 85.333333 0 1 1 0-170.666667 85.333333 85.333333 0 0 1 0 170.666667z" fill="currentColor" p-id="25832"></path></svg>
         </span>
         <span class="sdk-chat-wework-control-location__title">{{address}}</span>
-        <ac-static-map type="amap" :map-key="mapKey" :enable-link="false" width="52" height="52" :lng="longitude" :lat="latitude" @map-created="handleStaticMapCreated"></ac-static-map>
+        <ac-static-map :map-key="mapKey" :enable-link="false" width="52" height="52" :lng="longitude" :lat="latitude" @map-created="handleStaticMapCreated"></ac-static-map>
       </div>
     </template>
   </div>

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

@@ -63,10 +63,10 @@ export default {
       return parse(this.content) || {}
     },
     title () {
-      return this.nextContent.content
+      return this.nextContent.wish
     },
     description () {
-      return this.nextContent.receiveText
+      return ''
     },
     category () {
       return '微红包'
@@ -105,7 +105,6 @@ 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/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

@@ -1,15 +1,14 @@
 export const MESSAGE_TYPE = {
 	TEXT: 0,
 	TEXT_W: 1,
-	MERGE_MESSAGE: 4,
 	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,
@@ -33,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) {
@@ -68,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
-}
-
 /**
  * 格式化为短消息
 */
@@ -83,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) || {}
@@ -93,9 +85,6 @@ export function formatShortMessage (msgType, msgContent) {
         case MESSAGE_TYPE.IMAGE:
             shortMessage = '[图片消息]'
             break
-        case MESSAGE_TYPE.MERGE_MESSAGE:
-            shortMessage = '[聊天记录]'
-            break
         case MESSAGE_TYPE.VIDEO:
             shortMessage = '[视频消息]'
             break
@@ -116,15 +105,20 @@ 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 = '[链接消息]'
                 }
@@ -166,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 = '[语音通话消息]'
@@ -233,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

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

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>