@aochuang/client-sdk 1.0.342 → 1.0.344

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

@@ -1,5 +1,5 @@
 <template>
-  <wechat-chat-control-config-msg
+  <wework-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="[0, 1, 2].includes(item.msgType)">
+      <template v-if="item.msgType === MESSAGE_TYPE.TEXT || item.msgType === MESSAGE_TYPE.TEXT_W">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -26,7 +26,7 @@
           </template>
         </sdk-chat-panel-box>
       </template>
-      <template v-else-if="[14, 101].includes(item.msgType)">
+      <template v-else-if="item.msgType === MESSAGE_TYPE.IMAGE">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -45,7 +45,7 @@
           </template>
         </sdk-chat-panel-box>
       </template>
-      <template v-else-if="[22, 23, 103].includes(item.msgType)">
+      <template v-else-if="item.msgType === MESSAGE_TYPE.VIDEO">
         <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">
+      <template v-else-if="item.msgType == MESSAGE_TYPE.URL || item.msgType == MESSAGE_TYPE.URLNew">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -312,29 +312,6 @@
           </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"
@@ -510,7 +487,7 @@
           :content="msgContent"
         ></sdk-chat-control-empty>
       </template>
-      <!-- <template v-else>
+      <template v-else>
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -523,10 +500,10 @@
             :content="msgContent"
           ></sdk-chat-control-unknow>
         </sdk-chat-panel-box>
-      </template> -->
+      </template>
       </div>
     </template>
-  </wechat-chat-control-config-msg>
+  </wework-chat-control-config-msg>
 </template>
 <script>
 import SdkChatPanelBox from '../chat-panel/chat-panel-box'
@@ -564,10 +541,10 @@ import {
   unknow as SdkChatControlUnknow
 } from '../wework-chat-control'
 import { MESSAGE_TYPE } from '../wework-chat-control/util'
-import WechatChatControlConfigMsg from '../wechat-chat-control/wechat-chat-control-config-msg.vue'
+import WeworkChatControlConfigMsg from '../wework-chat-control/wework-chat-control-config-msg.vue'
 
 export default {
-  name: 'SdkWechatPanelItem',
+  name: 'SdkWeworkPanelItem',
   components: {
     SdkChatPanelBox,
     SdkChatControlText,
@@ -601,7 +578,7 @@ export default {
     // SdkChatControlRevokeMeMessage,
     // SdkChatControlRevokeOtherMessage,
     // SdkChatControlRevokeYouMessage,
-    WechatChatControlConfigMsg
+    WeworkChatControlConfigMsg
   },
   props: {
     dir: {
@@ -647,4 +624,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,18 +37,23 @@
     </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
+    ChatPanelItem,
+    ChatPanelChatStatus
   },
   props: {
     mode: {
@@ -59,7 +64,8 @@ export default {
       }
     },
     keyField: {
-      type: String
+      type: String,
+      default: 'id'
     },
     startDate: {
       type: Number
@@ -88,9 +94,6 @@ export default {
       type: Boolean,
       default: true
     },
-    renderControl: {
-      type: Function
-    },
     fetchUserMethod: {
       type: Function
     },
@@ -126,12 +129,33 @@ export default {
     },
     contextChatId: {
       type: String
+    },
+    onBeforeSelectionChange: {
+      type: Function
     }
   },
-  methods: {
-    handleRenderControl ({ item }) {
-      return ChatControls[item.msgType] || ChatControls.unkonw
+  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: {
     handleIsSenderMethod ({ item }) {
       return !!item.send
     },
@@ -148,8 +172,67 @@ 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,9 +1,16 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.342",
+  "version": "1.0.344",
   "description": "",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+  "files": [
+    "common",
+    "components",
+    "services",
+    "utils",
+    "dist"
+  ],
+  "exports": {
+    ".": "./components/index.js"
   },
   "repository": {
     "type": "git",

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

@@ -452,15 +452,9 @@ class ClientChat {
 							}
 						})
 					})
-					} 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 = {
+				} else {
+					this.session.updateSession(sessionId, ({ session }) => {
+						const nextSession = {
 							lastMsgContent: data.content,
 							lastMsgType: data.msgType,
 							lastMsgTime: data.wechatTime,
@@ -468,7 +462,7 @@ class ClientChat {
 							lastUpdateTime: data.updateDate,
 							unreadMsgCount: session.unreadMsgCount
 						}
-							if (!data.isSend && isNewerMessage) {
+						if (!data.isSend) {
 							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId && this.shouldMarkCurrentSessionRead(sessionId, data)) {
 								// 标记已读
 								this.session.setSessionRead(sessionId)
@@ -600,15 +594,9 @@ class ClientChat {
 							}
 						})
 					})
-					} 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 = {
+				} else {
+					this.session.updateSession(sessionId, ({ session }) => {
+						const nextSession = {
 							lastMsgContent: data.content,
 							lastMsgType: data.msgType,
 							lastMsgTime: data.wechatTime,
@@ -616,7 +604,7 @@ class ClientChat {
 							lastUpdateTime: data.updateDate,
 							unreadMsgCount: session.unreadMsgCount
 						}
-							if (!data.isSend && isNewerMessage) {
+						if (!data.isSend) {
 							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId && this.shouldMarkCurrentSessionRead(sessionId, data)) {
 								// 标记已读
 								this.session.setSessionRead(sessionId)

package/services/client-chat/client-chat-wework/client-chat-concats.js

@@ -126,11 +126,7 @@ export default class ClientChatContacts {
 		*/
 		roomBindMemberMap: {},
 		
-		/**
-		 * 标记通讯录是否修改了
-		 * 如果修改了，比如接收到了分配好友的会话时，一定通讯录变了，变了的时候界面需要根据这个状态刷新通讯录
-		*/
-	    isModify: false
+		modifiedAccountMap: {}
 	})
 	
 	friendMap = {}
@@ -237,10 +233,6 @@ export default class ClientChatContacts {
 		return this.data.roomGroupData
 	}
 	
-	get isModify () {
-		return this.data.isModify
-	}
-	
 	setRoomGroup (data) {
 		this.data.roomGroupData = []
 		if (data && data.length) {
@@ -491,10 +483,10 @@ export default class ClientChatContacts {
 				}
 			}
 			const qwAccountId = this.roomMap[id].qwAccountId
-			if (qwAccountId && this.data.accountBindFriendMap[qwAccountId] && this.data.accountBindFriendMap[qwAccountId][groupId]) {
-				const bindIndex = this.data.accountBindFriendMap[qwAccountId][groupId].indexOf(this.roomMap[id])
+			if (qwAccountId && this.data.accountBindRoomMap[qwAccountId] && this.data.accountBindRoomMap[qwAccountId][groupId]) {
+				const bindIndex = this.data.accountBindRoomMap[qwAccountId][groupId].indexOf(this.roomMap[id])
 				if (bindIndex >= 0) {
-					this.data.accountBindFriendMap[qwAccountId][groupId].splice(bindIndex, 1)
+					this.data.accountBindRoomMap[qwAccountId][groupId].splice(bindIndex, 1)
 				}
 			}
 		})
@@ -628,6 +620,37 @@ export default class ClientChatContacts {
 			return rs
 		})
 	}
+
+	/**
+	 * 强制从服务端刷新好友资料，绕过本地缓存。
+	 */
+	refreshFriend (friendId) {
+		if (!friendId) {
+			return Promise.reject('缺少好友id')
+		}
+		if (!this.getContactsFriendMethod) {
+			return Promise.reject(new Error('getContactsFriendMethod未定义'))
+		}
+		return this.getContactsFriendMethod({
+			id: friendId
+		}).then(rs => {
+			if (!rs || !rs.data) {
+				return Promise.reject('未找到好友' + friendId)
+			}
+			if (this.friendMap[friendId]) {
+				const nextKeys = Object.keys(rs.data)
+				Object.keys(this.friendMap[friendId]).forEach(key => {
+					if (!nextKeys.includes(key)) {
+						Vue.delete(this.friendMap[friendId], key)
+					}
+				})
+				this.updateFriend(friendId, rs.data)
+			} else {
+				this.addFriend(rs.data)
+			}
+			return rs
+		})
+	}
 	
 	setRoomMemberData (roomId, data) {
 		if (!roomId) {
@@ -738,12 +761,52 @@ export default class ClientChatContacts {
 		})
 	}
 	
-	markModify () {
-		this.data.isModify = true
+	refreshRoom (id) {
+		if (!id) {
+			return Promise.reject('缺少群id')
+		}
+		if (!this.getContactsRoomMethod) {
+			return Promise.reject(new Error('getContactsRoomMethod未定义'))
+		}
+		return this.getContactsRoomMethod({
+			id
+		}).then(rs => {
+			if (!rs || !rs.data) {
+				return Promise.reject('未找到群' + id)
+			}
+			const localRoom = this.roomMap[id]
+			if (localRoom) {
+				this.removeRoom(id)
+				const nextKeys = Object.keys(rs.data)
+				Object.keys(localRoom).forEach(key => {
+					if (!nextKeys.includes(key)) {
+						Vue.delete(localRoom, key)
+					}
+				})
+				Object.keys(rs.data).forEach(key => {
+					Vue.set(localRoom, key, rs.data[key])
+				})
+			}
+			this.addRoom(localRoom || rs.data)
+			return rs
+		})
+	}
+
+	isModify (qwAccountId) {
+		return !!(qwAccountId && this.data.modifiedAccountMap[qwAccountId])
+	}
+
+	markModify (qwAccountIds) {
+		const ids = Array.isArray(qwAccountIds) ? qwAccountIds : [qwAccountIds]
+		ids.filter(Boolean).forEach(id => {
+			Vue.set(this.data.modifiedAccountMap, id, true)
+		})
 	}
 	
-	unmarkModify () {
-		this.data.isModify = false
+	unmarkModify (qwAccountId) {
+		if (qwAccountId) {
+			Vue.delete(this.data.modifiedAccountMap, qwAccountId)
+		}
 	}
 	
 	reset () {
@@ -758,6 +821,7 @@ export default class ClientChatContacts {
 		this.data.groupBindRoomMap = {}
 		this.data.accountBindFriendMap = {}
 		this.data.accountBindRoomMap = {}
+		this.data.modifiedAccountMap = {}
 		this._cacheFriendGroupCountMap = null
 		this._cacheRoomGroupCountMap = null
 		if (this.cancelConnectRequest) {
@@ -769,4 +833,4 @@ export default class ClientChatContacts {
 			this.cancelRefreshRequest = null
 		}
 	}
-}
+}

package/services/client-chat/client-chat-wework/client-chat-message.js

@@ -74,7 +74,7 @@ export default class ClientChatMessage {
 	 *	     "msgSvrId": "4319123759514541049",
 	 *	     "msgType": 1,
 	 *	     "origin": "0",
-	 *	     "sendStatus": 0,
+	 *	     "status": 0,
 	 *	     "tenantId": "1761952223049924608",
 	 *	     "wechatAccountId": "ad9d9ae2a8be4f27311312cdd4af3549dc8427ef",
 	 *	     "wechatFriendId": "2089efcc7f8f40b00b7f05fa4c6dfd3bb642774d",
@@ -215,11 +215,11 @@ export default class ClientChatMessage {
 		}, data, {
 			cmdType: 'CmdQwSendMessage'
 		})).then(({ data }) => {
-			if (data.sendStatus === 0) {
+			if (data.status === 0) {
 				// 发送成功
-			} else if (data.sendStatus === 2) {
+			} else if (data.status === 2) {
 				// 发送失败
-			} else if (data.sendStatus === 1) {
+			} else if (data.status === 1) {
 				// 发送中
 			}
 			// 如果返回的是对象，证明发送成功了
@@ -277,4 +277,4 @@ export default class ClientChatMessage {
 	reset () {
 		this.data.messageData = {}
 	}
-}
+}

package/services/client-chat/client-chat-wework/client-chat-session.js

@@ -82,7 +82,8 @@ export default class ClientChatSession {
 		/**
 		 * 删除会话
 		*/
-		deleteSessionMethod: null
+		deleteSessionMethod: null,
+		modifiedAccountMap: {}
 	})
 	
 	accountIds = []
@@ -119,6 +120,23 @@ export default class ClientChatSession {
 		return this.data.loading
 	}
 	
+	isModify (qwAccountId) {
+		return !!(qwAccountId && this.data.modifiedAccountMap[qwAccountId])
+	}
+
+	markModify (qwAccountIds) {
+		const ids = Array.isArray(qwAccountIds) ? qwAccountIds : [qwAccountIds]
+		ids.filter(Boolean).forEach(id => {
+			Vue.set(this.data.modifiedAccountMap, id, true)
+		})
+	}
+
+	unmarkModify (qwAccountId) {
+		if (qwAccountId) {
+			Vue.delete(this.data.modifiedAccountMap, qwAccountId)
+		}
+	}
+
 	get loadAssignTaskSessioning () {
 		return this.data.loadAssignTaskSessioning
 	}
@@ -205,6 +223,35 @@ export default class ClientChatSession {
 	getSessionByLocal (sessionId) {
 		return this.sessionMap[sessionId]
 	}
+
+	/**
+	 * 强制从服务端刷新会话，绕过本地缓存。
+	 */
+	refreshSession (sessionId) {
+		if (!sessionId) {
+			return Promise.reject('缺少会话id')
+		}
+		return this.getSessionMethod({
+			id: sessionId
+		}).then(rs => {
+			if (!rs || !rs.data) {
+				return Promise.reject('未找到会话' + sessionId)
+			}
+			// 事件计算出的 sessionId 是本地索引，始终保持与服务端返回对象一致。
+			const serverSession = Object.assign({}, rs.data, {
+				id: sessionId
+			})
+			const localSession = this.getSessionByLocal(sessionId)
+			if (localSession) {
+				this.updateSession(sessionId, serverSession)
+			} else {
+				this.addSession(serverSession)
+			}
+			return Object.assign({}, rs, {
+				data: serverSession
+			})
+		})
+	}
 	
 	findSession (findFn) {
 		let result 
@@ -915,6 +962,7 @@ export default class ClientChatSession {
 		this.data.sessionData = {}
 		this.data.sessionGroupData = {}
 		this.data.sessionMuteMap = {}
+		this.data.modifiedAccountMap = {}
 		// this.data.sessionUnreadCountMap = {}
 		this.sessionMap = {}
 		if (this.cancelLoadDataRequest) {
@@ -926,4 +974,4 @@ export default class ClientChatSession {
 			this.cancelRefreshRequest = null
 		}
 	}
-}
+}

package/services/client-chat/client-chat-wework/client-chat-socket.js

@@ -15,11 +15,14 @@ export default class ClietChatSocket {
 			// 执行回调事件前的方法
 			beforeFireCallback: null, 
 			onCmdQwNewMessage: null,
+			onCmdQwContactInfoChanged: null,
+			onCmdQwRoomInfoChanged: null,
 			onCmdSendMessageResult: null,
 			onCmdFriendInfoChanged: null,
 			onCmdDownloadVideoResult: null,
 			onCmdChatroomInfoChanged: null,
 			onCmdChatroomInfoChangedBatch: null,
+			onHeartbeatSuccess: null,
 			onHeartbeatCheck: null
 		}, options)
 		if (!options.socket) {
@@ -27,6 +30,11 @@ export default class ClietChatSocket {
 		}
 		this.socket = options.socket
 		this.socket.event.on('onCmdQwNewMessage', options.onCmdQwNewMessage)
+		this.socket.event.on('onCmdQwContactInfoChanged', options.onCmdQwContactInfoChanged)
+		this.socket.event.on('onCmdQwRoomInfoChanged', options.onCmdQwRoomInfoChanged)
+		this.socket.event.on('onHeartbeatSuccess', (evt) => {
+			options.onHeartbeatSuccess && options.onHeartbeatSuccess(evt)
+		})
 		this.socket.event.on('onHeartbeatCheck', ({ mergeParams }) => {
 			options.onHeartbeatCheck && options.onHeartbeatCheck({
 				mergeParams
@@ -62,4 +70,4 @@ export default class ClietChatSocket {
 	setUrl (url) {
 		this.socket.setUrl(url)
 	}
-}
+}