@aochuang/client-sdk 1.0.371 → 1.0.373

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,14 +129,35 @@ 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
+      return !!item.isSend
     },
     handleChatsInitLoaded () {
       this.$emit('initloaded')
@@ -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.371",
+  "version": "1.0.373",
   "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-wework/client-chat-account.js

@@ -5,14 +5,20 @@ export default class ClientChatAccount {
 	data = Vue.observable({
 		accountData: [],
 		accountUnreadMessageNumData: [],
+		accountGreetingUnreadMsgCountData: {},
 		currentAccount: null
 	})
 		
 	loadAccountDataMethod = null
 	
 	getAccountUnreadMessageNumMethod = null
+
+	getAccountGreetingUnreadMsgCountMethod = null
 	
 	accountMap = {}
+
+	// 好友请求数量请求合并，key为账号id列表
+	greetingUnreadRequestMap = {}
 	
 	constructor (options) {
 		options = Object.assign({
@@ -21,11 +27,13 @@ export default class ClientChatAccount {
 			getAccountUnreadMessageNumMethod: null,
 			updateAccountMessageReadMethod: null,
 			deleteAccountSessionMethod: null,
+			getAccountGreetingUnreadMsgCountMethod: null,
 			onCurrentAccountChange: null,
 			onAccountAdded: null,
 			onAccountRemoved: null,
 			onUnreadMessageNumChange: null,
-			onDeleteAccountSession: null
+			onDeleteAccountSession: null,
+			onAccountLoaded: null
 		}, options)
 		if (!options.loadAccountDataMethod) {
 			throw new Error('缺少loadAccountDataMethod配置')
@@ -38,10 +46,12 @@ export default class ClientChatAccount {
 		this.getAccountUnreadMessageNumMethod = options.getAccountUnreadMessageNumMethod
 		this.updateAccountMessageReadMethod = options.updateAccountMessageReadMethod
 		this.deleteAccountSessionMethod = options.deleteAccountSessionMethod
+		this.getAccountGreetingUnreadMsgCountMethod = options.getAccountGreetingUnreadMsgCountMethod
 		this.onAccountAdded = options.onAccountAdded
 		this.onAccountRemoved = options.onAccountRemoved,
 		this.onUnreadMessageNumChange = options.onUnreadMessageNumChange
 		this.onDeleteAccountSession = options.onDeleteAccountSession
+		this.onAccountLoaded = options.onAccountLoaded
 	}
 	
 	get accountData () {
@@ -55,6 +65,10 @@ export default class ClientChatAccount {
 	get currentAccount () {
 		return this.data.currentAccount
 	}
+
+	get accountGreetingUnreadMsgCountData () {
+		return this.data.accountGreetingUnreadMsgCountData
+	}
 	
 	setCurrentAccount (accountId) {
 		let account = null
@@ -282,6 +296,9 @@ export default class ClientChatAccount {
 		this._cacheLoadPromise = this.loadAccountDataMethod()
 		this._cacheLoadPromise.then(rs => {
 			this.setAccountData(rs.data)
+			this.onAccountLoaded && this.onAccountLoaded({
+				data: rs.data
+			})
 		})
 		this.cancelConnectRequest = () => {
 			this._cacheLoadPromise.abort()
@@ -298,9 +315,75 @@ export default class ClientChatAccount {
 		return this.loadData()
 	}
 	
+	/**
+	 * 设置指定企微账号的待处理好友请求数量，并重算all
+	*/
+	setAccountGreetingUnreadMsgCount (params) {
+		if (!params || !params.qwAccountId) {
+			throw new Error('缺少必须参数')
+		}
+		Vue.set(this.data.accountGreetingUnreadMsgCountData, params.qwAccountId, params.count || 0)
+		this.updateAllAccountGreetingUnreadMsgCount()
+	}
+
+	updateAllAccountGreetingUnreadMsgCount () {
+		const allCount = Object.keys(this.data.accountGreetingUnreadMsgCountData).reduce((rs, key) => {
+			return key === 'all' ? rs : rs + (this.data.accountGreetingUnreadMsgCountData[key] || 0)
+		}, 0)
+		Vue.set(this.data.accountGreetingUnreadMsgCountData, 'all', allCount)
+	}
+
+	/**
+	 * 获取待处理好友请求数量
+	 * qwAccountIds不传则刷新所有账号；后端数量为0的账号不返回，所以先置0再覆盖
+	*/
+	getAccountGreetingUnreadMsgCount (params) {
+		if (!this.getAccountGreetingUnreadMsgCountMethod) {
+			return Promise.reject(new Error('getAccountGreetingUnreadMsgCountMethod未定义'))
+		}
+		let qwAccountIds = (params || {}).qwAccountIds
+		if (qwAccountIds && !Array.isArray(qwAccountIds)) {
+			qwAccountIds = [qwAccountIds]
+		}
+		qwAccountIds = (qwAccountIds || []).filter((id, index, data) => id && data.indexOf(id) === index).map(String)
+		const isAll = !qwAccountIds.length
+		const requestKey = isAll ? 'all' : qwAccountIds.slice().sort().join(',')
+		if (this.greetingUnreadRequestMap[requestKey]) {
+			return this.greetingUnreadRequestMap[requestKey]
+		}
+		const request = this.getAccountGreetingUnreadMsgCountMethod({
+			qwAccountIds: isAll ? undefined : qwAccountIds
+		}).then(rs => {
+			const targetIds = isAll ? Object.keys(this.accountMap) : qwAccountIds
+			targetIds.forEach(id => {
+				Vue.set(this.data.accountGreetingUnreadMsgCountData, id, 0)
+			})
+			;((rs && rs.data) || []).forEach(item => {
+				if (item && item.qwAccountId) {
+					Vue.set(this.data.accountGreetingUnreadMsgCountData, String(item.qwAccountId), item.count || 0)
+				}
+			})
+			this.updateAllAccountGreetingUnreadMsgCount()
+			return this.data.accountGreetingUnreadMsgCountData
+		}).finally(() => {
+			delete this.greetingUnreadRequestMap[requestKey]
+		})
+		this.greetingUnreadRequestMap[requestKey] = request
+		return request
+	}
+
+	/**
+	 * 刷新所有账号的待处理好友请求数量
+	*/
+	refreshAllAccountGreetingUnreadMsgCount () {
+		return this.getAccountGreetingUnreadMsgCount()
+	}
+	
 	reset () {
 		this.data.accountData = []
 		this.data.accountUnreadMessageNumData = []
+		this.data.accountGreetingUnreadMsgCountData = {}
+		this.greetingUnreadRequestMap = {}
 		if (this.cancelConnectRequest) {
 			this.cancelConnectRequest()
 		}

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

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import Event from '../../../utils/event.js'
 import { unique } from '../../../utils/string.js'
 import { formatDate } from '../../../utils/date.js'
+import { createPromise } from '../../../utils/util'
 
 export default class ClientChatMessage {
 	
@@ -22,6 +23,8 @@ export default class ClientChatMessage {
 	})
 	
 	messageMap = {}
+	tempMessageMap = {}
+	checkMessageSendResultTaskList = []
 	
 	get messageData () {
 		return this.data.messageData
@@ -33,15 +36,18 @@ export default class ClientChatMessage {
 			queryMethod: null,
 			sortField: null, // 排序的字段，必须是唯一的，例如时间
 			groupField: null, // 分组的字段
+			checkMessageSendResultMethod: null,
 			onAddMessageSuccess: null // 新增消息成功回调事件
 		}, options)
 		if (!options.clientChat) {
 			throw new Error('必须将clientChat传递过来')
 		}
+		if (!options.checkMessageSendResultMethod) throw new Error('缺少checkMessageSendResultMethod配置')
 		this.queryMethod = options.queryMethod
 		this.clientChat = options.clientChat
 		this.groupField = options.groupField
 		this.sortField = options.sortField
+		this.checkMessageSendResultMethod = options.checkMessageSendResultMethod
 		this.onAddMessageSuccess = options.onAddMessageSuccess
 		this.event = new Event()
 	}
@@ -74,7 +80,7 @@ export default class ClientChatMessage {
 	 *	     "msgSvrId": "4319123759514541049",
 	 *	     "msgType": 1,
 	 *	     "origin": "0",
-	 *	     "sendStatus": 0,
+	 *	     "status": 0,
 	 *	     "tenantId": "1761952223049924608",
 	 *	     "wechatAccountId": "ad9d9ae2a8be4f27311312cdd4af3549dc8427ef",
 	 *	     "wechatFriendId": "2089efcc7f8f40b00b7f05fa4c6dfd3bb642774d",
@@ -89,6 +95,10 @@ export default class ClientChatMessage {
 		if (this.messageMap[data.id]) {
 			return
 		}
+		if (this.tempMessageMap[data.id]) {
+			Object.assign(data, this.tempMessageMap[data.id])
+			delete this.tempMessageMap[data.id]
+		}
 		const groupField = data[this.groupField]
 		if (!this.data.messageData[groupField]) {
 			Vue.set(this.data.messageData, groupField, {})
@@ -105,6 +115,7 @@ export default class ClientChatMessage {
 		}
 		this.data.messageData[groupField][sortFields.day][sortFields.milliseconds].push(data)
 		this.messageMap[data.id] = data
+		if (data.isSend && data.status === 1 && !data._temp) this.addCheckMessageSendResultTask(data)
 		if (fireEvent !== false) {
 			this.event && this.event.emit('add-message', {
 				data
@@ -119,6 +130,7 @@ export default class ClientChatMessage {
 		if (!id) {
 			return
 		}
+		this.removeCheckMessageSendResultTask(id)
 		const message = this.messageMap[id]
 		if (!message) {
 			return
@@ -154,6 +166,7 @@ export default class ClientChatMessage {
 	updateMessage (id, props) {
 		const message = this.getMessage(id)
 		if (!message) {
+			this.tempMessageMap[id] = props
 			return
 		}
 		if (!props) {
@@ -215,11 +228,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) {
 				// 发送中
 			}
 			// 如果返回的是对象，证明发送成功了
@@ -273,8 +286,35 @@ export default class ClientChatMessage {
 		this.clearMessage()
 		return this.loadMessageData(params)
 	}
+
+	addCheckMessageSendResultTask (message) {
+		if (this.checkMessageSendResultTaskList.some(v => v.id === message.id)) return
+		let timer
+		const task = { id: message.id, promise: createPromise(), check: () => {
+			if (message.status !== 1) return task.promise.resolve()
+			if (Date.now() - (message.createTime || message.sendTime) > 5 * 60 * 1000) return task.promise.resolve({status: 3, resultMsg: '消息发送超时'})
+			timer = setTimeout(() => {
+				Promise.resolve(this.checkMessageSendResultMethod({message})).then(rs => {
+					const data = rs && rs.data
+					if (data && data.status === 1) task.check()
+					else task.promise.resolve(data || {})
+				}, () => task.check())
+			}, 3000)
+		}, cancel: () => { clearTimeout(timer); task.promise.reject('reject') } }
+		this.checkMessageSendResultTaskList.push(task)
+		task.check()
+		task.promise.then(rs => this.updateMessage(message.id, rs || {})).finally(() => this.removeCheckMessageSendResultTask(message.id))
+	}
+
+	removeCheckMessageSendResultTask (id) {
+		const index = this.checkMessageSendResultTaskList.findIndex(v => v.id === id)
+		if (index >= 0) { this.checkMessageSendResultTaskList[index].cancel(); this.checkMessageSendResultTaskList.splice(index, 1) }
+	}
 	
 	reset () {
+		this.checkMessageSendResultTaskList.forEach(task => task.cancel())
+		this.checkMessageSendResultTaskList = []
+		this.tempMessageMap = {}
 		this.data.messageData = {}
 	}
-}
+}