@aochuang/client-sdk 1.0.310 → 1.0.313

package/common/context-menu/context-menu.vue

@@ -36,16 +36,114 @@
   </div>
 </template>
 <script>
-import UiContextMenuBox from './context-menu-box'
-import UiContextMenuGroup from './context-menu-group'
-import UiContextMenuItem from './context-menu-item'
+import UiContextMenuBox from './context-menu-box'
+import UiContextMenuGroup from './context-menu-group'
+import UiContextMenuItem from './context-menu-item'
+import { isMobile } from '@aochuang/common/utils/browse.js'
 
-import {
-  getOptimalCoordinate,
-  getWindowRect,
-  createRectByXY,
-  getElementRect
-} from './utils.js'
+import {
+  getOptimalCoordinate,
+  getWindowRect,
+  createRectByXY,
+  getElementRect
+} from './utils.js'
+
+let mobileContextMenuMountCount = 0
+let longPressTimer = null
+let longPressStart = null
+let longPressTriggered = false
+
+function clearLongPressTimer () {
+  clearTimeout(longPressTimer)
+  longPressTimer = null
+}
+
+function handleDocumentTouchStart (event) {
+  if (event.touches.length !== 1) {
+    clearLongPressTimer()
+    return
+  }
+  const touch = event.touches[0]
+  longPressStart = {
+    target: event.target,
+    clientX: touch.clientX,
+    clientY: touch.clientY
+  }
+  longPressTriggered = false
+  clearLongPressTimer()
+  longPressTimer = setTimeout(() => {
+    if (!longPressStart || !longPressStart.target) {
+      return
+    }
+    longPressTriggered = true
+    longPressStart.target.dispatchEvent(new MouseEvent('contextmenu', {
+      bubbles: true,
+      cancelable: true,
+      clientX: longPressStart.clientX,
+      clientY: longPressStart.clientY
+    }))
+  }, 500)
+}
+
+function handleDocumentTouchMove (event) {
+  const touch = event.touches[0]
+  if (!longPressStart || !touch) {
+    return
+  }
+  if (Math.abs(touch.clientX - longPressStart.clientX) > 10 || Math.abs(touch.clientY - longPressStart.clientY) > 10) {
+    clearLongPressTimer()
+    longPressStart = null
+  }
+}
+
+function handleDocumentTouchEnd (event) {
+  clearLongPressTimer()
+  longPressStart = null
+  if (longPressTriggered) {
+    event.preventDefault()
+    longPressTriggered = false
+  }
+}
+
+function handleDocumentTouchCancel () {
+  clearLongPressTimer()
+  longPressStart = null
+  longPressTriggered = false
+}
+
+function handleDocumentContextMenu (event) {
+  event.preventDefault()
+}
+
+function addMobileContextMenuListeners () {
+  mobileContextMenuMountCount++
+  if (mobileContextMenuMountCount !== 1) {
+    return
+  }
+  window.document.addEventListener('touchstart', handleDocumentTouchStart, { passive: true })
+  window.document.addEventListener('touchmove', handleDocumentTouchMove, { passive: true })
+  window.document.addEventListener('touchend', handleDocumentTouchEnd, { passive: false })
+  window.document.addEventListener('touchcancel', handleDocumentTouchCancel, { passive: true })
+  window.document.addEventListener('contextmenu', handleDocumentContextMenu)
+  window.document.documentElement.classList.add('ui-context-menu-mobile')
+}
+
+function removeMobileContextMenuListeners () {
+  mobileContextMenuMountCount--
+  if (mobileContextMenuMountCount > 0) {
+    return
+  }
+  mobileContextMenuMountCount = 0
+  clearLongPressTimer()
+  longPressStart = null
+  longPressTriggered = false
+  window.document.removeEventListener('touchstart', handleDocumentTouchStart)
+  window.document.removeEventListener('touchmove', handleDocumentTouchMove)
+  window.document.removeEventListener('touchend', handleDocumentTouchEnd)
+  window.document.removeEventListener('touchcancel', handleDocumentTouchCancel)
+  window.document.removeEventListener('contextmenu', handleDocumentContextMenu)
+  window.document.documentElement.classList.remove('ui-context-menu-mobile')
+}
 
 export default {
   name: 'UiContextMenu',
@@ -93,10 +191,12 @@ export default {
       return this.innerData.filter(v => !v.divided)
     }
   },
-  mounted () {
-    window.document.addEventListener('mousewheel', this.handleDocumentMouseWheel)
-    window.document.addEventListener('mousedown', this.handleDocumentMouseDown)
-    // window.document.addEventListener('contextmenu', this.handleDocumentContextMenu)
+  mounted () {
+    window.document.addEventListener('mousewheel', this.handleDocumentMouseWheel)
+    window.document.addEventListener('mousedown', this.handleDocumentMouseDown)
+    if (isMobile()) {
+      addMobileContextMenuListeners()
+    }
   },
   watch: {
     value: {
@@ -105,9 +205,9 @@ export default {
         val ? this.open(this.left, this.top) : this.close()
       }
     }
-  },
-  methods: {
-    handleGroupClick () {
+  },
+  methods: {
+    handleGroupClick () {
       this.close()
     },
     handleGroupItemClick ({ item }) {
@@ -175,16 +275,21 @@ export default {
       this.activeSubItem = null
       this.$emit('input', false)
     }
-  },
-  beforeUnmount () {
-    window.document.removeEventListener('mousewheel', this.handleDocumentMouseWheel)
-    window.document.removeEventListener('mousedown', this.handleDocumentMouseDown)
-    // window.document.removeEventListener('contextmenu', this.handleDocumentContextMenu)
-  }
-}
+  },
+  beforeDestroy () {
+    window.document.removeEventListener('mousewheel', this.handleDocumentMouseWheel)
+    window.document.removeEventListener('mousedown', this.handleDocumentMouseDown)
+    if (isMobile()) {
+      removeMobileContextMenuListeners()
+    }
+  }
+}
 </script>
-<style>
-.ui-context-menu * {
+<style>
+.ui-context-menu-mobile {
+  -webkit-touch-callout: none;
+}
+.ui-context-menu * {
   box-sizing: content-box;
 }
 .ui-context-menu{

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

@@ -1,5 +1,5 @@
 <template>
-    <ui-tooltip :disabled="!tips" :content="tips">
+    <ui-tooltip :disabled="!tips || isMobile" :content="tips">
         <div class="sdk-chat-editor-button" :class="{'is-active': active}" @click.stop="handleClick">
             <template v-if="loading">
                 <ui-loading size="mini"></ui-loading>
@@ -18,6 +18,7 @@
 </template>
 <script>
 import { Tooltip as UiTooltip, Loading as UiLoading } from '@aochuang/common/components'
+import { isMobile } from '@aochuang/common/utils/browse.js'
 
 export default {
     name: 'SdkChatEditorButton',
@@ -25,6 +26,11 @@ export default {
         UiLoading,
         UiTooltip
     },
+    data () {
+        return {
+            isMobile: isMobile()
+        }
+    },
     props: {
         tips: {
             type: String
@@ -75,4 +81,4 @@ export default {
     height: 100%;
     vertical-align: top;
 }
-</style>
+</style>

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

@@ -1,6 +1,7 @@
 <template>
     <div 
         class="sdk-chat-editor-suggestions"
+        :class="{'is-mobile': isMobile}"
         v-if="isShow"
     >
         <div class="sdk-chat-editor-suggestions__head">
@@ -49,6 +50,7 @@
 </template>
 <script>
 import { Loading as UiLoading } from '@aochuang/common/components'
+import { isMobile } from '@aochuang/common/utils/browse.js'
 
 export default {
     name: 'SdkChatEditorSuggestions',
@@ -73,7 +75,8 @@ export default {
     data () {
         return {
             closed: false,
-            focusId: null
+            focusId: null,
+            isMobile: isMobile()
         }
     },
     computed: {
@@ -227,6 +230,18 @@ export default {
     display: flex;
     flex-direction: column;
 }
+.sdk-chat-editor-suggestions.is-mobile {
+    box-sizing: border-box;
+    width: 100%;
+    min-width: 0;
+    max-width: none;
+}
+.sdk-chat-editor-suggestions.is-mobile .sdk-chat-editor-suggestions__body {
+    overflow-x: hidden;
+}
+.sdk-chat-editor-suggestions.is-mobile .sdk-chat-editor-suggestions__foot {
+    flex-wrap: wrap;
+}
 .sdk-chat-editor-suggestions__head{
     line-height: 24px;
     padding: 4px 12px;

package/package.json

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

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

@@ -83,7 +83,6 @@ export default class ClientChatContacts {
 		*/
 		roomData: [],
 		
-		
 		/**
 		 * {
 		 * 		groupId: [{
@@ -135,12 +134,26 @@ export default class ClientChatContacts {
 		 * 标记通讯录是否修改了
 		 * 如果修改了，比如接收到了分配好友的会话时，一定通讯录变了，变了的时候界面需要根据这个状态刷新通讯录
 		*/
-	    isModify: false
+	    isModify: false,
+
+		/**
+		 * 缓存的好友分组统计数量
+		*/
+		cacheFriendGroupCountMap: {},
+
+		/**
+		 * 缓存的群聊分组统计数量
+		*/
+		cacheRoomGroupCountMap: {}
 	})
 	
 	friendMap = {}
 	
 	roomMap = {}
+
+	_cacheFriendGroupCountMap = {}
+
+	_cacheRoomGroupCountMap = {}
 	
 	loadContactsRoomGroupDataMethod = null
 	
@@ -246,10 +259,18 @@ export default class ClientChatContacts {
 		return this.data.friendGroupData
 	}
 	
+	get cacheFriendGroupCountMap () {
+		return this.data.cacheFriendGroupCountMap
+	}
+
 	get roomGroupData () {
 		return this.data.roomGroupData
 	}
 	
+	get cacheRoomGroupCountMap () {
+		return this.data.cacheRoomGroupCountMap
+	}
+	
 	get isModify () {
 		return this.data.isModify
 	}
@@ -589,10 +610,10 @@ export default class ClientChatContacts {
 				}
 			}
 			const wechatAccountId = this.roomMap[id].wechatAccountId
-			if (wechatAccountId && this.data.accountBindFriendMap[wechatAccountId] && this.data.accountBindFriendMap[wechatAccountId][groupId]) {
-				const bindIndex = this.data.accountBindFriendMap[wechatAccountId][groupId].indexOf(this.roomMap[id])
+			if (wechatAccountId && this.data.accountBindRoomMap[wechatAccountId] && this.data.accountBindRoomMap[wechatAccountId][groupId]) {
+				const bindIndex = this.data.accountBindRoomMap[wechatAccountId][groupId].indexOf(this.roomMap[id])
 				if (bindIndex >= 0) {
-					this.data.accountBindFriendMap[wechatAccountId][groupId].splice(bindIndex, 1)
+					this.data.accountBindRoomMap[wechatAccountId][groupId].splice(bindIndex, 1)
 				}
 			}
 		})
@@ -720,15 +741,20 @@ export default class ClientChatContacts {
 		const { wechatAccountId, ...nextParams } = Object.assign({
 			wechatAccountId: null
 		}, params)
+		const cacheKey = wechatAccountId || 'all'
+		if (!this.data.cacheFriendGroupCountMap) {
+			this.data.cacheFriendGroupCountMap = {}
+		}
 		if (!this._cacheFriendGroupCountMap) {
 			this._cacheFriendGroupCountMap = {}
 		}
-		if (!this._cacheFriendGroupCountMap[wechatAccountId]) {
+		if (!this._cacheFriendGroupCountMap[cacheKey]) {
 			const groupIds =  (this.data.friendGroupData || []).map(v => v.id)
 			groupIds.forEach(id => {
 				Vue.set(this.data.refreshFriendGroupCountLoadingMap, id, true)
 			})
-			this._cacheFriendGroupCountMap[wechatAccountId] = this.getContactsFriendGroupCountMethod(Object.assign({}, nextParams, {
+			Vue.set(this.data.cacheFriendGroupCountMap, cacheKey, true)
+			this._cacheFriendGroupCountMap[cacheKey] = this.getContactsFriendGroupCountMethod(Object.assign({}, nextParams, {
 				wechatAccountIds: wechatAccountId ? [wechatAccountId] : null,
 				groupIds
 			})).finally(() => {
@@ -737,7 +763,7 @@ export default class ClientChatContacts {
 				})
 			})
 		} 
-		this._cacheFriendGroupCountMap[wechatAccountId].then(rs => {
+		this._cacheFriendGroupCountMap[cacheKey].then(rs => {
 			if (!rs || !rs.data || !rs.data.length) {
 				return
 			}
@@ -747,7 +773,21 @@ export default class ClientChatContacts {
 				})
 			})
 		})
-		return this._cacheFriendGroupCountMap[wechatAccountId]
+		return this._cacheFriendGroupCountMap[cacheKey]
+	}
+
+	// 标记所有好友分组修改
+	// 需要清理缓存
+	clearAllFriendGroupCountCache (wechatAccountId) {
+		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')
 	}
 	
 	loadRoomGroupData () {
@@ -773,15 +813,20 @@ export default class ClientChatContacts {
 		const { wechatAccountId, ...nextParams } = Object.assign({
 			wechatAccountId: null
 		}, params)
+		if (!this.data.cacheRoomGroupCountMap) {
+			this.data.cacheRoomGroupCountMap = {}
+		}
 		if (!this._cacheRoomGroupCountMap) {
 			this._cacheRoomGroupCountMap = {}
 		}
-		if (!this._cacheRoomGroupCountMap[wechatAccountId] || refresh === true) {
+		const cacheKey = wechatAccountId || 'all'
+		if (!this._cacheRoomGroupCountMap[cacheKey] || refresh === true) {
 			const groupIds =  (this.data.roomGroupData || []).map(v => v.id)
 			groupIds.forEach(id => {
 				Vue.set(this.data.refreshRoomGroupCountLoadingMap, id, true)
 			})
-			this._cacheRoomGroupCountMap[wechatAccountId] = this.getContactsRoomGroupCountMethod(Object.assign({}, nextParams, {
+			Vue.set(this.data.cacheRoomGroupCountMap, cacheKey, true)
+			this._cacheRoomGroupCountMap[cacheKey] = this.getContactsRoomGroupCountMethod(Object.assign({}, nextParams, {
 				wechatAccountIds: wechatAccountId ? [wechatAccountId] : null,
 				groupIds
 			})).finally(() => {
@@ -790,7 +835,7 @@ export default class ClientChatContacts {
 				})
 			})
 		}
-		this._cacheRoomGroupCountMap[wechatAccountId].then(rs => {
+		this._cacheRoomGroupCountMap[cacheKey].then(rs => {
 			if (!rs || !rs.data || !rs.data.length) {
 				return
 			}
@@ -800,7 +845,19 @@ export default class ClientChatContacts {
 				})
 			})
 		})
-		return this._cacheRoomGroupCountMap[wechatAccountId]
+		return this._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')
 	}
 	
 	getFriend (friendId, refresh) {
@@ -1001,11 +1058,13 @@ export default class ClientChatContacts {
 	}
 	
 	markModify () {
-		this.data.isModify = true
+		// this.data.isModify = true
+		console.warn('[ClientChat]markModify已过期')
 	}
 	
 	unmarkModify () {
-		this.data.isModify = false
+		// this.data.isModify = false
+		console.warn('[ClientChat]markModify已过期')
 	}
 	
 	reset () {
@@ -1022,6 +1081,8 @@ export default class ClientChatContacts {
 		this.data.accountBindRoomMap = {}
 		this.data.refreshRoomGroupCountLoadingMap = {}
 		this.data.refreshFriendGroupCountLoadingMap = {}
+		this.data.cacheFriendGroupCountMap = null
+		this.data.cacheRoomGroupCountMap = null
 		this._cacheFriendGroupCountMap = null
 		this._cacheRoomGroupCountMap = null
 		if (this.cancelConnectRequest) {

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

@@ -747,17 +747,17 @@ class ClientChat {
 				this.socket.doHeartbeat()
 			},
 			onCurrentAccountChange: ({ currentAccount }) => {
-				// 如果群分组数据加载了再去刷成员数量，这样可以做到按需
-				if (this.contacts.friendGroupData && this.contacts.friendGroupData.length) {
-					this.contacts.refreshAllFriendGroupCount({
-						wechatAccountId: currentAccount ? currentAccount.id : null
-					})
-				}
-				if (this.contacts.roomGroupData && this.contacts.roomGroupData.length) {
-					this.contacts.refreshAllRoomGroupCount({
-						wechatAccountId: currentAccount ? currentAccount.id : null
-					})
-				}
+				// // 如果群分组数据加载了再去刷成员数量，这样可以做到按需
+				// if (this.contacts.friendGroupData && this.contacts.friendGroupData.length) {
+				// 	this.contacts.refreshAllFriendGroupCount({
+				// 		wechatAccountId: currentAccount ? currentAccount.id : null
+				// 	})
+				// }
+				// if (this.contacts.roomGroupData && this.contacts.roomGroupData.length) {
+				// 	this.contacts.refreshAllRoomGroupCount({
+				// 		wechatAccountId: currentAccount ? currentAccount.id : null
+				// 	})
+				// }
 			},
 			onUnreadMessageNumChange: ({ accountId, unreadMessageNum }) => {
 				if (unreadMessageNum === 0) {
@@ -876,28 +876,31 @@ class ClientChat {
 									rs[v.wechatAccountId] = true
 									return rs
 								}, {}))
-								if (!wechatAccountIds || !wechatAccountIds.length) {
-									return
+								// 删除changeType为3移除的好友，例如转移的场景
+								if (data.wechatFriendIds && data.wechatFriendIds.length) {
+									data.wechatFriendIds.forEach(friend => {
+										if (friend.changeType === 3) {
+											this.contacts.removeFriend(friend.wechatFriendId)
+										}
+									})
 								}
-								// 统计任务返回的会话数据来按需刷新分组数量
-								// 更新当前微信号分组统计数量
-								return Promise.all([].concat(wechatAccountIds.reduce((rs, v) => {
-									rs.push(
-										this.contacts.refreshAllRoomGroupCount({
-											wechatAccountId: v
-										}, true)
-									)
-									rs.push(
-										this.contacts.refreshAllFriendGroupCount({
-											wechatAccountId: v
-										}, true)
-									)
-									return rs
-								}, [
-									// 刷新一下微信号
-									this.account.reloadData()
-								]))).then(() => {
+								let ps = Promise.resolve()
+								if (wechatAccountIds && wechatAccountIds.length) {
+									// 只要有一个不在现在的accountData里面，就需要重新加载微信号数据
+									if (wechatAccountIds.some(v => !this.account.accountMap[v])) {
+										ps = this.account.reloadData()
+									}
+								}
+								return ps.finally(() => {
+									// 这里应该标记那些工作微信号的通讯录修改了，后面要在界面打个提示，告诉用户通讯录变化了，让手动刷新一下
+									// 同时也将缓存都清理一下，例如工作微信号分组统计数量等
 									this.contacts.markModify() // 标记通讯录修改
+									// 标记工作微信号所有好友分组修改
+									if (data.wechatAccountIds && data.wechatAccountIds) {
+										data.wechatAccountIds.forEach(wechatAccountId => {
+											this.contacts.clearAllFriendGroupCountCache(wechatAccountId)
+										})
+									}
 								})
 							})
 						}
@@ -928,11 +931,41 @@ class ClientChat {
 			onCmdChatroomInfoChanged: ({ data }) => {
 				// 配分群聊
 				if (data.changeType === 4) {
-					// 增量拉取通讯录
-					// this.contacts.refresh().then(() => {
-					// 	// 增量拉取会话
-					// 	this.session.refresh()
-					// })
+					// 增量拉取分配产生的会话
+					return this.session.loadAssignTaskSessionData({
+						taskId: data.taskId
+					}).then((rs) => {
+						const wechatAccountIds = Object.keys((rs || []).reduce((rs, v) => {
+							rs[v.wechatAccountId] = true
+							return rs
+						}, {}))
+						// 删除changeType为3移除的好友，例如转移的场景
+						if (data.wechatChatroomIds && data.wechatChatroomIds.length) {
+							data.wechatChatroomIds.forEach(room => {
+								if (room.changeType === 3) {
+									this.contacts.removeRoom(room.wechatChatroomId)
+								}
+							})
+						}
+						let ps = Promise.resolve()
+						if (wechatAccountIds && wechatAccountIds.length) {
+							// 只要有一个不在现在的accountData里面，就需要重新加载微信号数据
+							if (wechatAccountIds.some(v => !this.account.accountMap[v])) {
+								ps = this.account.reloadData()
+							}
+						}
+						return ps.finally(() => {
+							// 这里应该标记那些工作微信号的通讯录修改了，后面要在界面打个提示，告诉用户通讯录变化了，让手动刷新一下
+							// 同时也将缓存都清理一下，例如工作微信号分组统计数量等
+							this.contacts.markModify() // 标记通讯录修改
+							// 标记工作微信号所有好友分组修改，标记修改后后面不会走缓存
+							if (data.wechatAccountIds && data.wechatAccountIds) {
+								data.wechatAccountIds.forEach(wechatAccountId => {
+									this.contacts.clearAllRoomGroupCountCache(wechatAccountId)
+								})
+							}
+						})
+					})
 				}
 				// 删除群聊
 				else if (data.changeType === 3) {