@aochuang/client-sdk 1.0.322 → 1.0.323

package/package.json

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

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

@@ -150,10 +150,6 @@ export default class ClientChatContacts {
 	friendMap = {}
 	
 	roomMap = {}
-
-	_cacheFriendGroupCountMap = {}
-
-	_cacheRoomGroupCountMap = {}
 	
 	loadContactsRoomGroupDataMethod = null
 	
@@ -730,6 +726,19 @@ export default class ClientChatContacts {
 			this.onLoadFriendGroupData && this.onLoadFriendGroupData()
 			return rs
 		})
+		if (!this.data.cacheFriendGroupCountMap) {
+			this.data.cacheFriendGroupCountMap = Vue.observable({})
+		}
+		Vue.set(this.data.cacheFriendGroupCountMap, 'all', this._cacheLoadFriendGroupPromise.then(rs => {
+			return {
+				data: (rs.data || []).map(v => {
+					return {
+						id: v.id,
+						num: v.num
+					}
+				})
+			}
+		}))
 		return this._cacheLoadFriendGroupPromise
 	}
 	
@@ -750,27 +759,24 @@ export default class ClientChatContacts {
 		}, params)
 		const cacheKey = wechatAccountId || 'all'
 		if (!this.data.cacheFriendGroupCountMap) {
-			this.data.cacheFriendGroupCountMap = {}
+			this.data.cacheFriendGroupCountMap = Vue.observable({})
 		}
-		if (!this._cacheFriendGroupCountMap) {
-			this._cacheFriendGroupCountMap = {}
-		}
-		if (!this._cacheFriendGroupCountMap[cacheKey]) {
+		if (!this.data.cacheFriendGroupCountMap[cacheKey]) {
 			const groupIds =  (this.data.friendGroupData || []).map(v => v.id)
 			groupIds.forEach(id => {
 				Vue.set(this.data.refreshFriendGroupCountLoadingMap, id, true)
 			})
-			Vue.set(this.data.cacheFriendGroupCountMap, cacheKey, true)
-			this._cacheFriendGroupCountMap[cacheKey] = this.getContactsFriendGroupCountMethod(Object.assign({}, nextParams, {
+			Vue.set(this.data.cacheFriendGroupCountMap, cacheKey, this.getContactsFriendGroupCountMethod(Object.assign({}, nextParams, {
 				wechatAccountIds: wechatAccountId ? [wechatAccountId] : null,
 				groupIds
 			})).finally(() => {
 				groupIds.forEach(id => {
 					Vue.set(this.data.refreshFriendGroupCountLoadingMap, id, false)
 				})
-			})
+			}))
+			
 		} 
-		this._cacheFriendGroupCountMap[cacheKey].then(rs => {
+		this.data.cacheFriendGroupCountMap[cacheKey].then(rs => {
 			if (!rs || !rs.data || !rs.data.length) {
 				return
 			}
@@ -780,7 +786,7 @@ export default class ClientChatContacts {
 				})
 			})
 		})
-		return this._cacheFriendGroupCountMap[cacheKey]
+		return this.data.cacheFriendGroupCountMap[cacheKey]
 	}
 
 	// 标记所有好友分组修改
@@ -789,10 +795,6 @@ export default class ClientChatContacts {
 		if (!this.data.cacheFriendGroupCountMap) {
 			return
 		}
-		if (this._cacheFriendGroupCountMap) {
-			delete this._cacheFriendGroupCountMap[wechatAccountId]
-			delete this._cacheFriendGroupCountMap.all
-		}
 		Vue.delete(this.data.cacheFriendGroupCountMap, wechatAccountId)
 		Vue.delete(this.data.cacheFriendGroupCountMap, 'all')
 	}
@@ -806,6 +808,19 @@ export default class ClientChatContacts {
 			this.onLoadRoomGroupData && this.onLoadRoomGroupData()
 			return rs
 		})
+		if (!this.data.cacheRoomGroupCountMap) {
+			this.data.cacheRoomGroupCountMap = Vue.observable({})
+		}
+		Vue.set(this.data.cacheRoomGroupCountMap, 'all', this._cacheLoadRoomGroupPromise.then(rs => {
+			return {
+				data: (rs.data || []).map(v => {
+					return {
+						id: v.id,
+						num: v.num
+					}
+				})
+			}
+		}))
 		return this._cacheLoadRoomGroupPromise
 	}
 	
@@ -821,28 +836,24 @@ export default class ClientChatContacts {
 			wechatAccountId: null
 		}, params)
 		if (!this.data.cacheRoomGroupCountMap) {
-			this.data.cacheRoomGroupCountMap = {}
-		}
-		if (!this._cacheRoomGroupCountMap) {
-			this._cacheRoomGroupCountMap = {}
+			this.data.cacheRoomGroupCountMap = Vue.observable({})
 		}
 		const cacheKey = wechatAccountId || 'all'
-		if (!this._cacheRoomGroupCountMap[cacheKey] || refresh === true) {
+		if (!this.data.cacheRoomGroupCountMap[cacheKey] || refresh === true) {
 			const groupIds =  (this.data.roomGroupData || []).map(v => v.id)
 			groupIds.forEach(id => {
 				Vue.set(this.data.refreshRoomGroupCountLoadingMap, id, true)
 			})
-			Vue.set(this.data.cacheRoomGroupCountMap, cacheKey, true)
-			this._cacheRoomGroupCountMap[cacheKey] = this.getContactsRoomGroupCountMethod(Object.assign({}, nextParams, {
+			Vue.set(this.data.cacheRoomGroupCountMap, cacheKey, this.getContactsRoomGroupCountMethod(Object.assign({}, nextParams, {
 				wechatAccountIds: wechatAccountId ? [wechatAccountId] : null,
 				groupIds
 			})).finally(() => {
 				groupIds.forEach(id => {
 					Vue.set(this.data.refreshRoomGroupCountLoadingMap, id, false)
 				})
-			})
+			}))
 		}
-		this._cacheRoomGroupCountMap[cacheKey].then(rs => {
+		this.data.cacheRoomGroupCountMap[cacheKey].then(rs => {
 			if (!rs || !rs.data || !rs.data.length) {
 				return
 			}
@@ -852,17 +863,13 @@ export default class ClientChatContacts {
 				})
 			})
 		})
-		return this._cacheRoomGroupCountMap[cacheKey]
+		return this.data.cacheRoomGroupCountMap[cacheKey]
 	}
 
 	clearAllRoomGroupCountCache (wechatAccountId) {
 		if (!this.data.cacheRoomGroupCountMap) {
 			return
 		}
-		if (this._cacheRoomGroupCountMap) {
-			delete this._cacheRoomGroupCountMap[wechatAccountId]
-			delete this._cacheRoomGroupCountMap.all
-		}
 		Vue.delete(this.data.cacheRoomGroupCountMap, wechatAccountId)
 		Vue.delete(this.data.cacheRoomGroupCountMap, 'all')
 	}
@@ -1090,8 +1097,6 @@ export default class ClientChatContacts {
 		this.data.refreshFriendGroupCountLoadingMap = {}
 		this.data.cacheFriendGroupCountMap = null
 		this.data.cacheRoomGroupCountMap = null
-		this._cacheFriendGroupCountMap = null
-		this._cacheRoomGroupCountMap = null
 		if (this.cancelConnectRequest) {
 			this.cancelConnectRequest()
 			this.cancelConnectRequest = null