@aochuang/client-sdk 1.0.303 → 1.0.304

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/package.json

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

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]