@aochuang/client-sdk 1.0.332 → 1.0.333

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/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,7 +3,7 @@ export const MESSAGE_TYPE = {
 	TEXT_W: 1,
 	IMAGE: 14,
 	VOICE: 16,
-	VIDEO: 22,
+	VIDEO: 23,
 	CUSTOM_EXPRESSION: 29,
 	CUSTOM_EXPRESSION_W: 104,
     // MUSIC: 1040187441,
@@ -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.voicePath || this.nextContent.url || this.nextContent.resUrl
+      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>

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

@@ -0,0 +1,35 @@
+<script>
+import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
+import { link } from '../../../wework-chat-control'
+
+export default {
+  name: 'SdkWeworkChatPanelControlsLink',
+  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(link, {
+      props: {
+        data: props.data
+      }
+    })])
+  }
+}
+</script>

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

@@ -0,0 +1,35 @@
+<script>
+import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
+import { location } from '../../../wework-chat-control'
+
+export default {
+  name: 'SdkWeworkChatPanelControlsLocation',
+  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(location, {
+      props: {
+        content: props.data.content
+      }
+    })])
+  }
+}
+</script>

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

@@ -0,0 +1,43 @@
+<script>
+import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
+import { text } from '../../../wework-chat-control'
+
+export default {
+  name: 'SdkWeworkChatPanelControlsText',
+  functional: true,
+  props: {
+    dir: {
+      type: String
+    },
+    data: {
+      type: Object,
+      required: true
+    },
+    fetchUserMethod: {
+      type: Function
+    }
+  },
+  render (h, c) {
+    const { props } = c
+    return h(SdkChatPanelBox, {
+      class: 'sdk-chat-panel-controls-text',
+      props: {
+        dir: props.dir,
+        data: props.data,
+        fetchUserMethod: props.fetchUserMethod
+      }
+    }, [h('div', {
+      class: 'sdk-chat-panel-controls-text__main'
+    }, [h(text, {
+      props: {
+        data: props.data
+      }
+    })])])
+  }
+}
+</script>
+<style>
+.sdk-chat-panel-controls-text__main{
+  padding: 10px;
+}
+</style>

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

@@ -0,0 +1,39 @@
+<template>
+  <sdk-chat-panel-box
+    :data="data"
+    :dir="dir"
+    :fetch-user-method="fetchUserMethod"
+  >
+    <div class="sdk-wework-chat-panel-controls-unkonw__main">
+      未知消息
+    </div>
+  </sdk-chat-panel-box>
+</template>
+<script>
+import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
+
+export default {
+  name: 'SdkWeworkChatPanelControlsUnkonw',
+  components: {
+    SdkChatPanelBox
+  },
+  props: {
+    dir: {
+      type: String
+    },
+    data: {
+      type: Object,
+      required: true
+    },
+    fetchUserMethod: {
+      type: Function
+    }
+  }
+}
+</script>
+<style lang="less">
+.sdk-wework-chat-panel-controls-unkonw__main{
+  padding: 12px;
+  color: #999;
+}
+</style>

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

@@ -0,0 +1,37 @@
+<template>
+  <sdk-chat-panel-box
+    :data="data"
+    :dir="dir"
+    :fetch-user-method="fetchUserMethod"
+  >
+    <sdk-chat-control-video
+      :data="data"
+      width="240px"
+      height="180px"
+    ></sdk-chat-control-video>
+  </sdk-chat-panel-box>
+</template>
+<script>
+import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
+import { video } from '../../../wework-chat-control'
+
+export default {
+  name: 'SdkWeworkChatPanelControlsVideo',
+  components: {
+    SdkChatPanelBox,
+    SdkChatControlVideo: video
+  },
+  props: {
+    dir: {
+      type: String
+    },
+    data: {
+      type: Object,
+      required: true
+    },
+    fetchUserMethod: {
+      type: Function
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,35 @@
+<script>
+import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
+import { voice } from '../../../wework-chat-control'
+
+export default {
+  name: 'SdkWeworkChatPanelControlsVoice',
+  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(voice, {
+      props: {
+        content: props.data.content
+      }
+    })])
+  }
+}
+</script>

package/components/wework-chat-panel/chat-panel-item.vue

@@ -1,5 +1,5 @@
 <template>
-  <wework-chat-control-config-msg
+  <wechat-chat-control-config-msg
     :msgData="item"
   >
     <template slot-scope="{ configData }">
@@ -45,7 +45,7 @@
           </template>
         </sdk-chat-panel-box>
       </template>
-      <template v-else-if="item.msgType === MESSAGE_TYPE.VIDEO">
+      <template v-else-if="[22, 23, 103].includes(item.msgType)">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -526,7 +526,7 @@
       </template> -->
       </div>
     </template>
-  </wework-chat-control-config-msg>
+  </wechat-chat-control-config-msg>
 </template>
 <script>
 import SdkChatPanelBox from '../chat-panel/chat-panel-box'
@@ -564,10 +564,10 @@ import {
   unknow as SdkChatControlUnknow
 } from '../wework-chat-control'
 import { MESSAGE_TYPE } from '../wework-chat-control/util'
-import WeworkChatControlConfigMsg from '../wework-chat-control/wework-chat-control-config-msg.vue'
+import WechatChatControlConfigMsg from '../wechat-chat-control/wechat-chat-control-config-msg.vue'
 
 export default {
-  name: 'SdkWeworkPanelItem',
+  name: 'SdkWechatPanelItem',
   components: {
     SdkChatPanelBox,
     SdkChatControlText,
@@ -601,7 +601,7 @@ export default {
     // SdkChatControlRevokeMeMessage,
     // SdkChatControlRevokeOtherMessage,
     // SdkChatControlRevokeYouMessage,
-    WeworkChatControlConfigMsg
+    WechatChatControlConfigMsg
   },
   props: {
     dir: {
@@ -647,4 +647,4 @@ export default {
     }
   }
 }
-</script>
+</script>

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

@@ -1,7 +1,7 @@
 <template>
   <sdk-chat-panel
     ref="panel"
-    v-bind="props"
+    v-bind="$props"
     :is-sender-method="handleIsSenderMethod"
     @initloaded="handleChatsInitLoaded"
     @chat-contextmenu="handleChatContext"
@@ -37,9 +37,6 @@
     </template>
     <template slot="main">
       <slot name="main"></slot>
-      <template v-if="selectable">
-        <slot name="selection" :total="checkTotal"></slot>
-      </template>
     </template>
   </sdk-chat-panel>
 </template>
@@ -62,8 +59,7 @@ export default {
       }
     },
     keyField: {
-      type: String,
-      default: 'id'
+      type: String
     },
     startDate: {
       type: Number
@@ -92,6 +88,9 @@ export default {
       type: Boolean,
       default: true
     },
+    renderControl: {
+      type: Function
+    },
     fetchUserMethod: {
       type: Function
     },
@@ -127,33 +126,12 @@ export default {
     },
     contextChatId: {
       type: String
-    },
-    onBeforeSelectionChange: {
-      type: Function
-    }
-  },
-  data () {
-    return {
-      checkMsgMap: {}
-    }
-  },
-  computed: {
-    props () {
-      const { config, ...nextProps } = this.$props
-      return nextProps
-    },
-    checkTotal () {
-      return Object.keys(this.checkMsgMap).length
-    }
-  },
-  watch: {
-    selectable () {
-      if (!this.selectable) {
-        this.checkMsgMap = {}
-      }
     }
   },
   methods: {
+    handleRenderControl ({ item }) {
+      return ChatControls[item.msgType] || ChatControls.unkonw
+    },
     handleIsSenderMethod ({ item }) {
       return !!item.send
     },
@@ -170,67 +148,8 @@ export default {
       this.currentContextChat = null
       return this.$refs.panel && this.$refs.panel.reload()
     },
-    handleFilterSelectMessageMethod (msg) {
-      if (!this.filterSelectMessageMethod) {
-        return true
-      }
-      return this.filterSelectMessageMethod({
-        item: msg
-      })
-    },
-    handleMsgCheckboxChange (msg, value) {
-      if (value) {
-        this.selectChat(msg)
-      } else {
-        this.unselectChat(msg)
-      }
-    },
-    selectChat (chat) {
-      if (!chat) {
-        return
-      }
-      if (!this.selectable) {
-        console.warn('未开启选择')
-        return
-      }
-      if (this.onBeforeSelectionChange && this.onBeforeSelectionChange({
-        chat,
-        value: true
-      }) === false) {
-        return
-      }
-      this.$set(this.checkMsgMap, chat[this.keyField], chat)
-    },
-    unselectChat (chat) {
-      if (!chat) {
-        return
-      }
-      if (!this.selectable) {
-        console.warn('未开启选择')
-        return
-      }
-      if (this.onBeforeSelectionChange && this.onBeforeSelectionChange({
-        chat,
-        value: false
-      }) === false) {
-        return
-      }
-      this.$delete(this.checkMsgMap, chat[this.keyField])
-    },
-    unselectAllChat () {
-      return Object.keys(this.checkMsgMap).map(key => {
-        return this.unselectChat(this.checkMsgMap[key])
-      })
-    },
-    getSelectChats () {
-      return Object.keys(this.checkMsgMap).map(key => {
-        return this.checkMsgMap[key]
-      })
-    },
     handleChatContext (item, evt) {
-      this.$emit('chat-contextmenu', {
-        item
-      }, evt)
+      this.$emit('chat-contextmenu', item, evt)
     },
     handleChatViewContext ({ item }) {
       this.$emit('chat-view-context', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.332",
+  "version": "1.0.333",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/services/client-chat/client-chat-wechat/client-chat.js

@@ -92,6 +92,7 @@ class ClientChat {
 			checkMessageSendResultMethod: null,
 			loadLossRoomMessageDataMethod: null,
 			loadLossFriendMessageDataMethod: null,
+			shouldMarkCurrentSessionReadMethod: null,
 			onOverwriteFriendInfoChange: null // 为了兼容1.0拉取会话逻辑加的，1.0暂时不支持根据taskId拉取
 		}, options)
 		if (!options.loadFriendMessageDataMethod) {
@@ -101,6 +102,7 @@ class ClientChat {
 			throw new Error('loadRoomMessageDataMethod不能为空')
 		} 
 		this.onOverwriteFriendInfoChange = options.onOverwriteFriendInfoChange
+		this.shouldMarkCurrentSessionReadMethod = options.shouldMarkCurrentSessionReadMethod
 		this.event = new Event({
 			checkOnMethod: (name) => {
 				if (name === 'ready') {
@@ -461,7 +463,7 @@ class ClientChat {
 							unreadMsgCount: session.unreadMsgCount
 						}
 						if (!data.isSend) {
-							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId) {
+							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId && this.shouldMarkCurrentSessionRead(sessionId, data)) {
 								// 标记已读
 								this.session.setSessionRead(sessionId)
 							} else {
@@ -603,7 +605,7 @@ class ClientChat {
 							unreadMsgCount: session.unreadMsgCount
 						}
 						if (!data.isSend) {
-							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId) {
+							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId && this.shouldMarkCurrentSessionRead(sessionId, data)) {
 								// 标记已读
 								this.session.setSessionRead(sessionId)
 							} else {
@@ -1183,6 +1185,21 @@ class ClientChat {
 		this.event.off('ready')
 	}
 
+	setShouldMarkCurrentSessionReadMethod (method) {
+		this.shouldMarkCurrentSessionReadMethod = method
+	}
+
+	shouldMarkCurrentSessionRead (sessionId, data) {
+		if (typeof this.shouldMarkCurrentSessionReadMethod === 'function') {
+			return this.shouldMarkCurrentSessionReadMethod({
+				sessionId,
+				data,
+				currentSession: this.sessionManage.currentSession
+			}) !== false
+		}
+		return true
+	}
+
 	handleAutoReadMessageSession (sessionId) {
 		if (!sessionId) {
 			return

package/components/wework-chat-control/wework-chat-control-config-item.vue

@@ -1,24 +0,0 @@
-<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

@@ -1,25 +0,0 @@
-<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/components/wework-chat-control/wework-chat-control-config.vue

@@ -1,62 +0,0 @@
-<script>
-export default {
-    name: 'SdkWeworkChatControlConfig',
-    provide () {
-        return {
-            SdkWeworkChatControlConfig: this
-        }
-    },
-    inject: {
-        // 可以继承上级的
-        SdkWeworkChatControlConfig: {
-            default: null
-        }
-    },
-    props: {
-        /**
-         * 这个是组件级别的配置，weworkChatPanel是消息级别的配置，后面是消息级别配置覆盖组件级别的配置
-         * {
-         *      1: {
-         *          formatter () {
-         *              xxx
-         *          }
-         *      }
-         * }
-        */
-        controlConfig: {
-            type: Object
-        },
-        /**
-         * 消息级别配置，消息级别配置会覆盖控件级别配置
-         * 主要是项目里面有几种实用场景，第一种聊天记录，第二种风控，第三种消息预览
-        */
-        messageConfig: {
-            type: Function
-        }
-    },
-    render () {
-        return this.$slots.default
-    },
-    methods: {
-        getControlConfig (msgType) {
-            if (!this.controlConfig) {
-                return
-            }
-            return this.controlConfig[msgType]
-        },
-        getMessageConfig (msgData) {
-            const controlConfig = this.getControlConfig(msgData.msgType)
-            if (!this.messageConfig) {
-                return controlConfig
-            }
-            const messageConfig = this.messageConfig({
-                item: msgData
-            })
-            if (!messageConfig) {
-                return controlConfig
-            }
-            return Object.assign({}, controlConfig, messageConfig)
-        }
-    }
-}
-</script>