@aochuang/client-sdk 1.0.340 → 1.0.342

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 }">
@@ -7,7 +7,7 @@
         <template v-if="item.msgType !== '_EMPTY_'">
 			<slot name="chat-prefix" :item="item"></slot>
 		</template>
-      <template v-if="item.msgType === MESSAGE_TYPE.TEXT || item.msgType === MESSAGE_TYPE.TEXT_W">
+      <template v-if="[0, 1, 2].includes(item.msgType)">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -26,7 +26,7 @@
           </template>
         </sdk-chat-panel-box>
       </template>
-      <template v-else-if="item.msgType === MESSAGE_TYPE.IMAGE">
+      <template v-else-if="[14, 101].includes(item.msgType)">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -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"
@@ -289,7 +289,7 @@
           </template>
         </sdk-chat-panel-box>
       </template>
-      <template v-else-if="item.msgType == MESSAGE_TYPE.URL || item.msgType == MESSAGE_TYPE.URLNew">
+      <template v-else-if="item.msgType == MESSAGE_TYPE.URL">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -312,6 +312,29 @@
           </template>
         </sdk-chat-panel-box>
       </template>
+      <template v-else-if="[13, 15, 20, 102].includes(item.msgType)">
+        <sdk-chat-panel-box
+          :dir="dir"
+          :data="item"
+          :fetchUserMethod="fetchUserMethod"
+          bg-color="#fff"
+          br-color="#ddd"
+          @user-avatar-click="handleUserAvatarClick"
+          @user-avatar-contextmenu="handleUserAvatarContextmenu"
+          >
+          <template slot-scope="{ updateProp }">
+            <sdk-chat-control-file-url
+              v-bind="configData"
+              :id="item.id"
+              :content="msgContent"
+              :update-chat-box-prop="updateProp"
+            ></sdk-chat-control-file-url>
+          </template>
+          <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.CUSTOM_EXPRESSION">
         <sdk-chat-panel-box
           :dir="dir"
@@ -487,7 +510,7 @@
           :content="msgContent"
         ></sdk-chat-control-empty>
       </template>
-      <template v-else>
+      <!-- <template v-else>
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -500,10 +523,10 @@
             :content="msgContent"
           ></sdk-chat-control-unknow>
         </sdk-chat-panel-box>
-      </template>
+      </template> -->
       </div>
     </template>
-  </wework-chat-control-config-msg>
+  </wechat-chat-control-config-msg>
 </template>
 <script>
 import SdkChatPanelBox from '../chat-panel/chat-panel-box'
@@ -541,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,
@@ -578,7 +601,7 @@ export default {
     // SdkChatControlRevokeMeMessage,
     // SdkChatControlRevokeOtherMessage,
     // SdkChatControlRevokeYouMessage,
-    WeworkChatControlConfigMsg
+    WechatChatControlConfigMsg
   },
   props: {
     dir: {
@@ -624,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"
@@ -17,12 +17,12 @@
         :fetch-user-method="fetchUserMethod"
         :config="config"
       >
-        <template slot="chat-append" slot-scope="{ item, updateProp }">
+        <!-- <template slot="chat-append" slot-scope="{ item, updateProp }">
           <chat-panel-chat-status
             :data="item"
             :update-chat-box-prop="updateProp"
           ></chat-panel-chat-status>
-        </template>
+        </template> -->
         <template slot="chat-prefix" slot-scope="{ item }">
           <template v-if="selectable && handleFilterSelectMessageMethod(item)">
             <div class="sdk-wechat-chat-panel__checkbox">
@@ -37,23 +37,18 @@
     </template>
     <template slot="main">
       <slot name="main"></slot>
-      <template v-if="selectable">
-        <slot name="selection" :total="checkTotal"></slot>
-      </template>
     </template>
   </sdk-chat-panel>
 </template>
 <script>
 import SdkChatPanel from '../chat-panel'
 import ChatPanelItem from './chat-panel-item.vue'
-import ChatPanelChatStatus from './chat-panel-chat-status/chat-panel-chat-status.vue'
 
 export default {
   name: 'SdkWeworkChatPanel',
   components: {
     SdkChatPanel,
-    ChatPanelItem,
-    ChatPanelChatStatus
+    ChatPanelItem
   },
   props: {
     mode: {
@@ -64,8 +59,7 @@ export default {
       }
     },
     keyField: {
-      type: String,
-      default: 'id'
+      type: String
     },
     startDate: {
       type: Number
@@ -94,6 +88,9 @@ export default {
       type: Boolean,
       default: true
     },
+    renderControl: {
+      type: Function
+    },
     fetchUserMethod: {
       type: Function
     },
@@ -129,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
     },
@@ -172,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.340",
+  "version": "1.0.342",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

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

@@ -452,9 +452,15 @@ class ClientChat {
 							}
 						})
 					})
-				} else {
-					this.session.updateSession(sessionId, ({ session }) => {
-						const nextSession = {
+					} else {
+						this.session.updateSession(sessionId, ({ session }) => {
+							// listChange/getSession may already include this message in unreadMsgCount.
+							// Only count messages newer than the session watermark.
+							const isNewerMessage = data.wechatTime > (session.lastMsgTime || 0)
+							if (!isNewerMessage) {
+								return {}
+							}
+							const nextSession = {
 							lastMsgContent: data.content,
 							lastMsgType: data.msgType,
 							lastMsgTime: data.wechatTime,
@@ -462,7 +468,7 @@ class ClientChat {
 							lastUpdateTime: data.updateDate,
 							unreadMsgCount: session.unreadMsgCount
 						}
-						if (!data.isSend) {
+							if (!data.isSend && isNewerMessage) {
 							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId && this.shouldMarkCurrentSessionRead(sessionId, data)) {
 								// 标记已读
 								this.session.setSessionRead(sessionId)
@@ -594,9 +600,15 @@ class ClientChat {
 							}
 						})
 					})
-				} else {
-					this.session.updateSession(sessionId, ({ session }) => {
-						const nextSession = {
+					} else {
+						this.session.updateSession(sessionId, ({ session }) => {
+							// listChange/getSession may already include this message in unreadMsgCount.
+							// Only count messages newer than the session watermark.
+							const isNewerMessage = data.wechatTime > (session.lastMsgTime || 0)
+							if (!isNewerMessage) {
+								return {}
+							}
+							const nextSession = {
 							lastMsgContent: data.content,
 							lastMsgType: data.msgType,
 							lastMsgTime: data.wechatTime,
@@ -604,7 +616,7 @@ class ClientChat {
 							lastUpdateTime: data.updateDate,
 							unreadMsgCount: session.unreadMsgCount
 						}
-						if (!data.isSend) {
+							if (!data.isSend && isNewerMessage) {
 							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId && this.shouldMarkCurrentSessionRead(sessionId, data)) {
 								// 标记已读
 								this.session.setSessionRead(sessionId)