@aochuang/client-sdk 1.0.303 → 1.0.305

package/components/chat-editor/chat-editor.vue

@@ -256,17 +256,25 @@ export default {
                 return
             }
             keyword = this.normalizeSuggestionsKeyword(nearestInfo, keyword)
+            const requestId = (this._suggestionsRequestId || 0) + 1
+            this._suggestionsRequestId = requestId
             this.suggestioning = true
             this.suggestionsKeyword = keyword
+            this.popoverActive = true
             clearTimeout(this._loadSuggestionsTimer)
             return this.fetchSuggestionsMethod({
                 keyword,
                 nearestInfo,
                 isAtContext: !!(nearestInfo && nearestInfo.isAtContext)
             }).then(rs => {
+                if (requestId !== this._suggestionsRequestId) {
+                    return
+                }
                 this.suggestionsData = rs || []
             }).finally(() => {
-                this.suggestioning = false
+                if (requestId === this._suggestionsRequestId) {
+                    this.suggestioning = false
+                }
             })
         },
         normalizeSuggestionsKeyword (nearestInfo, keyword) {
@@ -278,7 +286,17 @@ export default {
                 : nearest.replace(/^\s+/, '')
         },
         closeSuggestions () {
+            clearTimeout(this._loadSuggestionsTimer)
+            this._suggestionsRequestId = (this._suggestionsRequestId || 0) + 1
             this.$refs.suggestions && this.$refs.suggestions.close()
+            this.suggestioning = false
+            this.popoverActive = false
+        },
+        hasCurrentSuggestionsContext () {
+            const inputValue = this.getInputText()
+            const range = this.cacheInputRange || this.getSelectionTextRange()
+            const nearestInfo = getNearestString(inputValue, range.start)
+            return !!this.normalizeSuggestionsKeyword(nearestInfo)
         },
         closeSuggestionsAfterConfirm () {
             this.closeSuggestions()
@@ -846,8 +864,13 @@ export default {
             if (this._skipNextSuggestionsLoad) {
                 this._skipNextSuggestionsLoad = false
             } else {
-                this.popoverActive = true
-                this.delayLoadSuggestions(this.inputValue)
+                if (this.hasCurrentSuggestionsContext()) {
+                    this.popoverActive = false
+                    this.delayLoadSuggestions(this.inputValue)
+                } else {
+                    this.suggestionsNearsetInfo = null
+                    this.closeSuggestions()
+                }
             }
             this.$emit('change', {
                 value: this.inputValue,
@@ -861,14 +884,14 @@ export default {
             if (this.disabled) {
                 return
             }
-            this.popoverActive = true
+            this.popoverActive = this.hasCurrentSuggestionsContext()
             this.focus()
         },
         handleInputFocus () {
             if (this.disabled) {
                 return
             }
-            this.popoverActive = true
+            this.popoverActive = this.hasCurrentSuggestionsContext()
             this.focus()
         },
         clearInput () {

package/components/contacts-group-select/contacts-group-select.vue

@@ -11,6 +11,20 @@
 					<div class="sdk-contacts-group-select__group-head-col is-full">
 						<div class="sdk-contacts-group-select__group-title">好友分组（{{ friendGroupData ? friendGroupData.length : 0 }}）</div>
 					</div>
+					<template v-if="showRefresh">
+						<div class="sdk-contacts-group-select__group-head-col">
+							<ui-tooltip content="刷新数据">
+								<div class="sdk-contacts-group-select__group-addon" @click="handleFriendRefreshClick">
+									<template v-if="friendRefreshing">
+										<ui-loading size="mini"></ui-loading>
+									</template>
+									<template v-else>
+										<ui-icon name="refresh-line"></ui-icon>
+									</template>
+								</div>
+							</ui-tooltip>
+						</div>
+					</template>
 					<div class="sdk-contacts-group-select__group-head-col">
 						<ui-tooltip :content="showFriendFilterPanel ? '关闭筛选' : '展开筛选'">
 							<div class="sdk-contacts-group-select__group-addon" @click="handleFriendAddonClick">
@@ -71,6 +85,20 @@
 					<div class="sdk-contacts-group-select__group-head-col is-full">
 						<div class="sdk-contacts-group-select__group-title">群聊分组（{{ roomGroupData ? roomGroupData.length : 0 }}）</div>
 					</div>
+					<template v-if="showRefresh">
+						<div class="sdk-contacts-group-select__group-head-col">
+							<ui-tooltip content="刷新数据">
+								<div class="sdk-contacts-group-select__group-addon" @click="handleRoomRefreshClick">
+									<template v-if="roomRefreshing">
+										<ui-loading size="mini"></ui-loading>
+									</template>
+									<template v-else>
+										<ui-icon name="refresh-line"></ui-icon>
+									</template>
+								</div>
+							</ui-tooltip>
+						</div>
+					</template>
 					<div class="sdk-contacts-group-select__group-head-col">
 						<ui-tooltip :content="showRoomFilterPanel ? '关闭筛选' : '展开筛选'">
 							<div class="sdk-contacts-group-select__group-addon" @click="handleRoomAddonClick">
@@ -143,6 +171,9 @@ export default {
 		ContactsGroupSelectItem
 	},
     props: {
+		showRefresh: {
+			type: Boolean
+		},
         friendGroupData: {
             type: Array
         },
@@ -151,9 +182,6 @@ export default {
         },
         queryGroupDataMethod: {
             type: Function
-        },
-        queryGroupCountMethod: {
-            type: Function
         },
 		checkGroupLoadingMethod: {
 			type: Function
@@ -168,6 +196,8 @@ export default {
 				roomGroupEmpty: null
 			},
 			loading: false,
+			friendRefreshing: false,
+			roomRefreshing: false,
 			showRoomFilterPanel: false,
 			showFriendFilterPanel: false
 		}
@@ -209,18 +239,30 @@ export default {
 		}
 	},
 	created () {
-		this.loadData()
+		this.loading = true
+		this.loadData().finally(() => {
+			this.loading = false
+		})
 	},
 	methods: {
 		loadData () {
-			this.loading = true
-            this.queryGroupDataMethod().finally(() => {
-				this.loading = false
-            })
+            return this.queryGroupDataMethod()
 		},
 		handleFriendToggleEmptyClick () {
 			this.filters.friendGroupEmpty = !this.filters.friendGroupEmpty
 		},
+		handleFriendRefreshClick () {
+			this.friendRefreshing = true
+			this.loadData().finally(() => {
+				this.friendRefreshing = false
+			})
+		},
+		handleRoomRefreshClick () {
+			this.roomRefreshing = true
+			this.loadData().finally(() => {
+				this.roomRefreshing = false
+			})
+		},
 		handleFriendAddonClick () {
 			this.showFriendFilterPanel = !this.showFriendFilterPanel
 			this.$nextTick(() => {
@@ -354,6 +396,10 @@ export default {
 	text-align: center;
 	line-height: 24px;
 	border-radius: 3px;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
 	cursor: pointer;
 	transition: all .25s;
 	color: #999;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.303",
+  "version": "1.0.305",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -14,9 +14,9 @@
     "access": "public"
   },
   "peerDependencies": {
-    "axios": "^1.3.1",
-    "@aochuang/common": "1.0.126",
-    "x2js": "^3.4.4"
+    "axios": "*",
+    "@aochuang/common": "*",
+    "x2js": "*"
   },
   "author": "",
   "license": "ISC"

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

@@ -839,10 +839,18 @@ export default class ClientChatContacts {
 			throw new Error('群少群id')
 		}
 		if (data && data.length) {
-			Vue.set(this.data.roomBindMemberMap, roomId, data)
+			if (!this.data.roomBindMemberMap[roomId]) {
+				Vue.set(this.data.roomBindMemberMap, roomId, [])
+			} else {
+				this.data.roomBindMemberMap[roomId].length = 0
+			}
+			data.forEach(v => {
+				this.data.roomBindMemberMap[roomId].push(v)
+			})
 		} else {
 			Vue.delete(this.data.roomBindMemberMap, roomId)
 		}
+		return this.data.roomBindMemberMap[roomId]
 	}
 	
 	loadRoomMemberData (roomId, params, refresh) {
@@ -851,8 +859,7 @@ export default class ClientChatContacts {
 		}
 		if (!this.loadRoomMemberDataPromiseMap[roomId] || refresh) {
 			this.loadRoomMemberDataPromiseMap[roomId] = this.loadContactsRoomMemberDataMethod(params).then((rs) => {
-				this.setRoomMemberData(roomId, rs.data)
-				return rs.data
+				return this.setRoomMemberData(roomId, rs.data)
 			})
 		}
 		return this.loadRoomMemberDataPromiseMap[roomId]