@aochuang/client-sdk 1.0.379-wework-5 → 1.0.379-wework-7

package/components/layout/layout.vue

@@ -9,6 +9,7 @@
                 :initialSize="initialSize"
                 :minSize="270"
                 :maxSize="480"
+                :hidePanel="hideAddon"
                 @change="handleSizeChange"
             >
                 <template slot="content">
@@ -41,6 +42,10 @@ export default {
         },
         hideSidebar: {
             type: Boolean
+        },
+        // 隐藏addon区域（包括拖拽条）
+        hideAddon: {
+            type: Boolean
         }
     },
     methods: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.379-wework-5",
+  "version": "1.0.379-wework-7",
   "description": "",
   "files": [
     "common",

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

@@ -95,6 +95,15 @@ export default class ClientChatAccount {
 				this.addAccount(item)
 			})
 		}
+		// 重新加载后账号对象都被替换了，当前账号需要指向新对象，账号已经不存在了就置为null（界面上选择全部企微号）
+		const currentAccount = this.data.currentAccount
+		if (currentAccount) {
+			if (this.accountMap[currentAccount.id]) {
+				this.data.currentAccount = this.accountMap[currentAccount.id]
+			} else {
+				this.setCurrentAccount(null)
+			}
+		}
 	}
 	
 	getAccountData () {

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

@@ -341,20 +341,25 @@ class ClientChat {
 				}
 				const tasks = []
 				const removedTasks = []
-				contacts.forEach(contact => {
-					if (!contact) {
-						return
-					}
-					const changeType = Number(contact.changeType)
-					if (changeType === 1) {
-						tasks.push(this.handleQwContactAdded(contact, data))
-					} else if (changeType === 2) {
-						tasks.push(this.handleQwContactUpdated(contact))
-					} else if (changeType === 3) {
-						removedTasks.push(this.handleQwContactRemoved(contact, data))
-					}
-				})
-				return Promise.all(tasks.concat(removedTasks)).then(results => {
+				const addedAccountIds = contacts
+					.filter(contact => contact && Number(contact.changeType) === 1)
+					.map(contact => contact.qwAccountId || data.qwAccountId)
+				return this.reloadAccountDataIfMissing(addedAccountIds).then(newAccountMap => {
+					contacts.forEach(contact => {
+						if (!contact) {
+							return
+						}
+						const changeType = Number(contact.changeType)
+						if (changeType === 1) {
+							tasks.push(this.handleQwContactAdded(contact, data, newAccountMap))
+						} else if (changeType === 2) {
+							tasks.push(this.handleQwContactUpdated(contact))
+						} else if (changeType === 3) {
+							removedTasks.push(this.handleQwContactRemoved(contact, data))
+						}
+					})
+					return Promise.all(tasks.concat(removedTasks))
+				}).then(results => {
 					const accountUnreadCountMap = {}
 					removedTasks.forEach((task, index) => {
 						const result = results[tasks.length + index]
@@ -383,20 +388,25 @@ class ClientChat {
 				}
 				const tasks = []
 				const removedTasks = []
-				rooms.forEach(room => {
-					if (!room) {
-						return
-					}
-					const changeType = Number(room.changeType)
-					if (changeType === 1) {
-						tasks.push(this.handleQwRoomAdded(room, data))
-					} else if (changeType === 2) {
-						tasks.push(this.handleQwRoomUpdated(room))
-					} else if (changeType === 3) {
-						removedTasks.push(this.handleQwRoomRemoved(room, data))
-					}
-				})
-				return Promise.all(tasks.concat(removedTasks)).then(results => {
+				const addedAccountIds = rooms
+					.filter(room => room && Number(room.changeType) === 1)
+					.map(room => room.qwAccountId || data.qwAccountId)
+				return this.reloadAccountDataIfMissing(addedAccountIds).then(newAccountMap => {
+					rooms.forEach(room => {
+						if (!room) {
+							return
+						}
+						const changeType = Number(room.changeType)
+						if (changeType === 1) {
+							tasks.push(this.handleQwRoomAdded(room, data, newAccountMap))
+						} else if (changeType === 2) {
+							tasks.push(this.handleQwRoomUpdated(room))
+						} else if (changeType === 3) {
+							removedTasks.push(this.handleQwRoomRemoved(room, data))
+						}
+					})
+					return Promise.all(tasks.concat(removedTasks))
+				}).then(results => {
 					return this.updateRemovedSessionUnreadCounts(
 						results.slice(tasks.length)
 					)
@@ -495,7 +505,32 @@ class ClientChat {
 		}))
 	}
 
-	handleQwContactAdded (contact, eventData) {
+	/**
+	 * 新增联系人/群聊所属的企微号不在当前企微号列表里时（例如客服原来一个企微号都没有，后台分配后），需要重新加载企微号列表
+	 * 返回新加载出来的企微号id map，新企微号的未读数会在onAccountAdded里以服务端为准刷新，不需要再本地累加
+	*/
+	reloadAccountDataIfMissing (qwAccountIds) {
+		// 先等正在进行的加载完成，避免reloadData把初始化中的加载请求取消掉
+		return Promise.resolve(this.account._cacheLoadPromise).catch(() => {}).then(() => {
+			const missingAccountIds = (qwAccountIds || []).filter((id, index, data) => {
+				return id && data.indexOf(id) === index && !this.account.accountMap[id]
+			})
+			if (!missingAccountIds.length) {
+				return {}
+			}
+			return this.account.reloadData().then(() => {
+				return missingAccountIds.reduce((rs, id) => {
+					rs[id] = true
+					return rs
+				}, {})
+			})
+		}).catch(error => {
+			console.warn('[client-chat] reload account data failed', error)
+			return {}
+		})
+	}
+
+	handleQwContactAdded (contact, eventData, newAccountMap) {
 		const qwAccountId = contact.qwAccountId || (eventData && eventData.qwAccountId)
 		const corpId = this.getQwAccountCorpId(
 			qwAccountId,
@@ -509,12 +544,12 @@ class ClientChat {
 		}
 		const localSession = this.session.getSessionByLocal(sessionId)
 		const oldUnread = localSession ? (localSession.unreadMsgCount || 0) : 0
-		return this.session.refreshSession(sessionId).then(rs => {
+		return this.session.getSession(sessionId).then(rs => {
 			const serverSession = rs && rs.data
 			const newUnread = serverSession ? (serverSession.unreadMsgCount || 0) : 0
 			const accountId = (serverSession && serverSession.qwAccountId) || qwAccountId
 			const unreadDiff = newUnread - oldUnread
-			if (accountId && unreadDiff) {
+			if (accountId && unreadDiff && !(newAccountMap && newAccountMap[accountId])) {
 				return this.account.updateAccountUnreadMessageNum(accountId, ({ unreadMesasgeNum }) => {
 					return Math.max(0, unreadMesasgeNum + unreadDiff)
 				})
@@ -567,7 +602,7 @@ class ClientChat {
 		})
 	}
 	
-	handleQwRoomAdded (room, eventData) {
+	handleQwRoomAdded (room, eventData, newAccountMap) {
 		if (!room.roomId) {
 			return Promise.resolve()
 		}
@@ -580,11 +615,11 @@ class ClientChat {
 			console.warn('[client-chat] refresh added room failed', error)
 		})]
 		if (sessionId) {
-			tasks.push(this.session.refreshSession(sessionId).then(rs => {
+			tasks.push(this.session.getSession(sessionId).then(rs => {
 				const serverSession = rs && rs.data
 				const unreadDiff = (serverSession ? (serverSession.unreadMsgCount || 0) : 0) - oldUnread
 				const changedAccountId = (serverSession && serverSession.qwAccountId) || qwAccountId
-				if (changedAccountId && unreadDiff) {
+				if (changedAccountId && unreadDiff && !(newAccountMap && newAccountMap[changedAccountId])) {
 					return this.account.updateAccountUnreadMessageNum(changedAccountId, ({ unreadMesasgeNum }) => {
 						return Math.max(0, unreadMesasgeNum + unreadDiff)
 					})