@aochuang/client-sdk 1.0.345 → 1.0.347

package/components/wework-chat-panel/chat-panel-item.vue

@@ -1,5 +1,5 @@
 <template>
-  <wechat-chat-control-config-msg
+  <wework-chat-control-config-msg
     :msgData="item"
   >
     <template slot-scope="{ configData }">
@@ -7,7 +7,7 @@
         <template v-if="item.msgType !== '_EMPTY_'">
 			<slot name="chat-prefix" :item="item"></slot>
 		</template>
-      <template v-if="[0, 1, 2].includes(item.msgType)">
+      <template v-if="item.msgType === MESSAGE_TYPE.TEXT || item.msgType === MESSAGE_TYPE.TEXT_W">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -26,7 +26,7 @@
           </template>
         </sdk-chat-panel-box>
       </template>
-      <template v-else-if="[14, 101].includes(item.msgType)">
+      <template v-else-if="item.msgType === MESSAGE_TYPE.IMAGE">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -45,7 +45,7 @@
           </template>
         </sdk-chat-panel-box>
       </template>
-      <template v-else-if="[22, 23, 103].includes(item.msgType)">
+      <template v-else-if="item.msgType === MESSAGE_TYPE.VIDEO">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -289,7 +289,7 @@
           </template>
         </sdk-chat-panel-box>
       </template>
-      <template v-else-if="item.msgType == MESSAGE_TYPE.URL">
+      <template v-else-if="item.msgType == MESSAGE_TYPE.URL || item.msgType == MESSAGE_TYPE.URLNew">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -312,29 +312,6 @@
           </template>
         </sdk-chat-panel-box>
       </template>
-      <template v-else-if="[13, 15, 20, 102].includes(item.msgType)">
-        <sdk-chat-panel-box
-          :dir="dir"
-          :data="item"
-          :fetchUserMethod="fetchUserMethod"
-          bg-color="#fff"
-          br-color="#ddd"
-          @user-avatar-click="handleUserAvatarClick"
-          @user-avatar-contextmenu="handleUserAvatarContextmenu"
-          >
-          <template slot-scope="{ updateProp }">
-            <sdk-chat-control-file-url
-              v-bind="configData"
-              :id="item.id"
-              :content="msgContent"
-              :update-chat-box-prop="updateProp"
-            ></sdk-chat-control-file-url>
-          </template>
-          <template slot="append" slot-scope="{ updateProp }">
-            <slot name="chat-append" :item="item" :update-chat-box-prop="updateProp"></slot>
-          </template>
-        </sdk-chat-panel-box>
-      </template>
       <template v-else-if="item.msgType == MESSAGE_TYPE.CUSTOM_EXPRESSION">
         <sdk-chat-panel-box
           :dir="dir"
@@ -510,7 +487,7 @@
           :content="msgContent"
         ></sdk-chat-control-empty>
       </template>
-      <!-- <template v-else>
+      <template v-else>
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -523,10 +500,10 @@
             :content="msgContent"
           ></sdk-chat-control-unknow>
         </sdk-chat-panel-box>
-      </template> -->
+      </template>
       </div>
     </template>
-  </wechat-chat-control-config-msg>
+  </wework-chat-control-config-msg>
 </template>
 <script>
 import SdkChatPanelBox from '../chat-panel/chat-panel-box'
@@ -564,10 +541,10 @@ import {
   unknow as SdkChatControlUnknow
 } from '../wework-chat-control'
 import { MESSAGE_TYPE } from '../wework-chat-control/util'
-import WechatChatControlConfigMsg from '../wechat-chat-control/wechat-chat-control-config-msg.vue'
+import WeworkChatControlConfigMsg from '../wework-chat-control/wework-chat-control-config-msg.vue'
 
 export default {
-  name: 'SdkWechatPanelItem',
+  name: 'SdkWeworkPanelItem',
   components: {
     SdkChatPanelBox,
     SdkChatControlText,
@@ -601,7 +578,7 @@ export default {
     // SdkChatControlRevokeMeMessage,
     // SdkChatControlRevokeOtherMessage,
     // SdkChatControlRevokeYouMessage,
-    WechatChatControlConfigMsg
+    WeworkChatControlConfigMsg
   },
   props: {
     dir: {
@@ -647,4 +624,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/components/wework-chat-panel/chat-panel.vue

@@ -1,7 +1,7 @@
 <template>
   <sdk-chat-panel
     ref="panel"
-    v-bind="$props"
+    v-bind="props"
     :is-sender-method="handleIsSenderMethod"
     @initloaded="handleChatsInitLoaded"
     @chat-contextmenu="handleChatContext"
@@ -17,12 +17,12 @@
         :fetch-user-method="fetchUserMethod"
         :config="config"
       >
-        <!-- <template slot="chat-append" slot-scope="{ item, updateProp }">
+        <template slot="chat-append" slot-scope="{ item, updateProp }">
           <chat-panel-chat-status
             :data="item"
             :update-chat-box-prop="updateProp"
           ></chat-panel-chat-status>
-        </template> -->
+        </template>
         <template slot="chat-prefix" slot-scope="{ item }">
           <template v-if="selectable && handleFilterSelectMessageMethod(item)">
             <div class="sdk-wechat-chat-panel__checkbox">
@@ -37,18 +37,23 @@
     </template>
     <template slot="main">
       <slot name="main"></slot>
+      <template v-if="selectable">
+        <slot name="selection" :total="checkTotal"></slot>
+      </template>
     </template>
   </sdk-chat-panel>
 </template>
 <script>
 import SdkChatPanel from '../chat-panel'
 import ChatPanelItem from './chat-panel-item.vue'
+import ChatPanelChatStatus from './chat-panel-chat-status/chat-panel-chat-status.vue'
 
 export default {
   name: 'SdkWeworkChatPanel',
   components: {
     SdkChatPanel,
-    ChatPanelItem
+    ChatPanelItem,
+    ChatPanelChatStatus
   },
   props: {
     mode: {
@@ -59,7 +64,8 @@ export default {
       }
     },
     keyField: {
-      type: String
+      type: String,
+      default: 'id'
     },
     startDate: {
       type: Number
@@ -88,9 +94,6 @@ export default {
       type: Boolean,
       default: true
     },
-    renderControl: {
-      type: Function
-    },
     fetchUserMethod: {
       type: Function
     },
@@ -126,12 +129,33 @@ export default {
     },
     contextChatId: {
       type: String
+    },
+    onBeforeSelectionChange: {
+      type: Function
     }
   },
-  methods: {
-    handleRenderControl ({ item }) {
-      return ChatControls[item.msgType] || ChatControls.unkonw
+  data () {
+    return {
+      checkMsgMap: {}
+    }
+  },
+  computed: {
+    props () {
+      const { config, ...nextProps } = this.$props
+      return nextProps
     },
+    checkTotal () {
+      return Object.keys(this.checkMsgMap).length
+    }
+  },
+  watch: {
+    selectable () {
+      if (!this.selectable) {
+        this.checkMsgMap = {}
+      }
+    }
+  },
+  methods: {
     handleIsSenderMethod ({ item }) {
       return !!item.send
     },
@@ -148,8 +172,67 @@ export default {
       this.currentContextChat = null
       return this.$refs.panel && this.$refs.panel.reload()
     },
+    handleFilterSelectMessageMethod (msg) {
+      if (!this.filterSelectMessageMethod) {
+        return true
+      }
+      return this.filterSelectMessageMethod({
+        item: msg
+      })
+    },
+    handleMsgCheckboxChange (msg, value) {
+      if (value) {
+        this.selectChat(msg)
+      } else {
+        this.unselectChat(msg)
+      }
+    },
+    selectChat (chat) {
+      if (!chat) {
+        return
+      }
+      if (!this.selectable) {
+        console.warn('未开启选择')
+        return
+      }
+      if (this.onBeforeSelectionChange && this.onBeforeSelectionChange({
+        chat,
+        value: true
+      }) === false) {
+        return
+      }
+      this.$set(this.checkMsgMap, chat[this.keyField], chat)
+    },
+    unselectChat (chat) {
+      if (!chat) {
+        return
+      }
+      if (!this.selectable) {
+        console.warn('未开启选择')
+        return
+      }
+      if (this.onBeforeSelectionChange && this.onBeforeSelectionChange({
+        chat,
+        value: false
+      }) === false) {
+        return
+      }
+      this.$delete(this.checkMsgMap, chat[this.keyField])
+    },
+    unselectAllChat () {
+      return Object.keys(this.checkMsgMap).map(key => {
+        return this.unselectChat(this.checkMsgMap[key])
+      })
+    },
+    getSelectChats () {
+      return Object.keys(this.checkMsgMap).map(key => {
+        return this.checkMsgMap[key]
+      })
+    },
     handleChatContext (item, evt) {
-      this.$emit('chat-contextmenu', item, evt)
+      this.$emit('chat-contextmenu', {
+        item
+      }, evt)
     },
     handleChatViewContext ({ item }) {
       this.$emit('chat-view-context', {

package/package.json

@@ -1,9 +1,16 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.345",
+  "version": "1.0.347",
   "description": "",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+  "files": [
+    "common",
+    "components",
+    "services",
+    "utils",
+    "dist"
+  ],
+  "exports": {
+    ".": "./components/index.js"
   },
   "repository": {
     "type": "git",

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

@@ -203,7 +203,7 @@ export default class ClientChatAccount {
 	
 	refreshAccountUnreadMessageNum (params) {
 		const { wechatAccountId, ...nextParams } = params
-		return this.getAccountUnreadMessageNumMethod(Object.assign({
+		this.getAccountUnreadMessageNumMethod(Object.assign({
 			wechatAccountIds: [wechatAccountId]
 		}, nextParams)).then(rs => {
 			if (!rs || !rs.data || !rs.data.length) {

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

@@ -5,39 +5,20 @@ import { createPollRequest } from '../../../utils/util.js'
 
 const ALL_WECHAT_ACCOUNT_ID = 'all'
 
-const ASSIGN_SESSION_LOG_PREFIX = '[client-chat][assign-session]'
-const ASSIGN_SESSION_MERGE_EXCLUDE_FIELDS = [
-	'conversationId',
-	'wechatAccountId',
-	'lastMsgTime',
-	'lastUpdateTime',
-	'stickyOnTop',
-	'mute',
-	'lastAtMsgContent'
-]
-
-const loopLoadAssignSessionData = (fetchFn, params, onPageLoaded) => {
+const loopLoadAssignSessionData = (fetchFn, params) => {
 	let lastPs = null
 	let lastRs = null
 	let result = []
-	let page = 0
 	const loopFn = (params, total) => {
 	  const { taskId, size, ...nextParams } = params
-	  page += 1
 	  lastPs = fetchFn(Object.assign({}, nextParams, {
 		size,
 	    taskId,
 		total
 	  }))
 	  lastRs = lastPs.then(rs => {
-		const pageData = rs.data || []
-		result = result.concat(pageData)
-		onPageLoaded && onPageLoaded({
-			page,
-			pageSize: pageData.length,
-			total: result.length
-		})
-	    if (pageData.length < size) {
+		result = result.concat(rs.data || [])
+	    if (rs.data.length < size) {
 			return result
 	    } else {
 	      return loopFn(params, result.length)
@@ -207,7 +188,7 @@ export default class ClientChatSession {
 	 * @params { Object } data - 会话数据集合
 	 * @params { String } wechatAccountId - 如果传wechatAccountId那么后面addSession的时候如果传wechatAccountId那么才会更新lastUpdateTime或者lastMsgTime，本质的意思是只有通过reload和loadData才刷新lastUpdateTime或者lastMsgTime，避免这个时间乱套了
 	*/
-	setSessionData (data, wechatAccountId, reset = true, context) {
+	setSessionData (data, wechatAccountId, reset = true) {
 		if (reset) {
 			this.sessionMap = {}
 			this.data.sessionGroupData = {}
@@ -219,7 +200,7 @@ export default class ClientChatSession {
 				if (item.isDeleted) {
 					this.removeSession(item.conversationId)
 				} else {
-					this.addSession(item, wechatAccountId, context)
+					this.addSession(item, wechatAccountId)
 				}
 			})
 		}
@@ -247,7 +228,11 @@ export default class ClientChatSession {
 		})
 	}
 
-	getSession (sessionId, serializeMethod) {
+	getSession (sessionId, serializeMethod, callback = null, isCache = true) {
+		if (typeof callback === 'boolean') {
+			isCache = callback
+			callback = null
+		}
 		if (this.sessionMap[sessionId]) {  
 			return Promise.resolve({
 				data: this.sessionMap[sessionId]
@@ -255,7 +240,12 @@ export default class ClientChatSession {
 		}
 		// 这里需要轮询从后端获取会话，后端会话更新和创建是异步的，所以要多轮训请求几次
 		if (this.pollRequestMap[sessionId]) {
-			return this.pollRequestMap[sessionId].ps
+			// 因为有的地方要复用缓存，有的地方不能缓存，比如onAddMessagSuccess的时候不能缓存
+			if (isCache) {
+				return this.pollRequestMap[sessionId].ps
+			} else {
+				this.pollRequestMap[sessionId].stop()
+			}
 		}
 		const pollRequest = createPollRequest(({ done, fail }) => {
 			return this.getSessionMethod({
@@ -272,7 +262,7 @@ export default class ClientChatSession {
 				rs = serializeMethod(rs)
 			}
 			if (rs.data) {
-				this.addSession(rs.data)
+				this.addSession(rs.data, null, callback)
 				return rs
 			} else {
 				return Promise.reject('未找到会话' + sessionId)
@@ -407,7 +397,7 @@ export default class ClientChatSession {
 	 *		"wechatAccountId": "2a39a725814acf07502299ab2285fff8d44377f5"
 	 *	}
 	*/
-	addSession (data, wechatAccountId, context) {
+	addSession (data, wechatAccountId, callback) {
 		if (!data || !data.conversationId) {
 			throw new Error('缺少必须参数conversationId')
 		}
@@ -423,54 +413,11 @@ export default class ClientChatSession {
 			return
 		}
 		let nextData = data
-		let assignMergeLog = null
 		// 如果会话已经存在，那么取已经存在的，以后有需要可以用data更新已经存在的会话，保持引用关系
 		if (this.sessionMap[data.conversationId]) {
 			nextData = this.sessionMap[data.conversationId]
-			const unreadBefore = nextData.unreadMsgCount || 0
-			const muteBefore = !!nextData.mute
-			const changedFields = []
-			Object.keys(data).forEach(key => {
-				if (ASSIGN_SESSION_MERGE_EXCLUDE_FIELDS.indexOf(key) >= 0 || nextData[key] === data[key]) {
-					return
-				}
-				changedFields.push(key)
-				Vue.set(nextData, key, data[key])
-			})
-			if (context && context.source === 'assign-task') {
-				assignMergeLog = {
-					taskId: context.taskId,
-					conversationId: data.conversationId,
-					wechatAccountId: data.wechatAccountId,
-					existed: true,
-					changedFields,
-					unreadBefore,
-					unreadFromServer: data.unreadMsgCount || 0,
-					unreadAfter: nextData.unreadMsgCount || 0,
-					muteBefore,
-					muteFromServer: !!data.mute,
-					muteAfter: !!nextData.mute,
-					preservedFields: ASSIGN_SESSION_MERGE_EXCLUDE_FIELDS.slice()
-				}
-			}
 		} else {
 			this.sessionMap[data.conversationId] = nextData
-			if (context && context.source === 'assign-task') {
-				assignMergeLog = {
-					taskId: context.taskId,
-					conversationId: data.conversationId,
-					wechatAccountId: data.wechatAccountId,
-					existed: false,
-					changedFields: [],
-					unreadBefore: null,
-					unreadFromServer: data.unreadMsgCount || 0,
-					unreadAfter: data.unreadMsgCount || 0,
-					muteBefore: null,
-					muteFromServer: !!data.mute,
-					muteAfter: !!data.mute,
-					preservedFields: []
-				}
-			}
 		}
 		const topField = nextData.stickyOnTop ? 0 : 1 // 置顶
 		if (wechatAccountId && wechatAccountId !== ALL_WECHAT_ACCOUNT_ID && nextData.wechatAccountId !== wechatAccountId) {
@@ -551,12 +498,12 @@ export default class ClientChatSession {
 		if (virtualSessionIndex > -1) {
 			this.data.virtualSessionData.splice(virtualSessionIndex, 1)
 		}
+		callback && callback({
+			session: data
+		})
 		this.onAddSession && this.onAddSession({
-			session: nextData
+			session: data
 		})
-		if (assignMergeLog) {
-			console.info(ASSIGN_SESSION_LOG_PREFIX, 'merge', assignMergeLog)
-		}
 	}
 	
 	removeSession (conversationId) {
@@ -690,9 +637,7 @@ export default class ClientChatSession {
 									return true
 								}
 							})
-							if (index >= 0) {
-								this.data.sessionGroupData[groupId][topField][oldSortFields.day][oldSortFields.milliseconds].splice(index, 1)
-							}
+							this.data.sessionGroupData[groupId][topField][oldSortFields.day][oldSortFields.milliseconds].splice(index, 1)
 						}
 					})
 				})
@@ -752,9 +697,7 @@ export default class ClientChatSession {
 									return true
 								}
 							})
-							if (index >= 0) {
-								this.data.sessionGroupData[groupId][topField][sortFields.day][sortFields.milliseconds].splice(index, 1)
-							}
+							this.data.sessionGroupData[groupId][topField][sortFields.day][sortFields.milliseconds].splice(index, 1)
 						}
 					})
 				})
@@ -899,36 +842,14 @@ export default class ClientChatSession {
 			total: 0 , // 已获取总数
 			size: 50 // 每次获取数量
 		}, params)
-		const taskId = params.taskId
-		console.info(ASSIGN_SESSION_LOG_PREFIX, 'load-start', {
-			taskId,
-			total: params.total,
-			size: params.size
-		})
 		this.data.loadAssignTaskSessioning = true
 		return loopLoadAssignSessionData((nextParams) => {
 			return this.loadAssignTaskSessionDataMethod(nextParams)
-		}, params, pageInfo => {
-			console.info(ASSIGN_SESSION_LOG_PREFIX, 'page-loaded', Object.assign({ taskId }, pageInfo))
-		}).then(rs => {
+		}, params).then(rs => {
 			if (rs && rs.length) {
-				this.setSessionData(rs, null, false, {
-					source: 'assign-task',
-					taskId
-				})
+				this.setSessionData(rs, null, false)
 			}
-			console.info(ASSIGN_SESSION_LOG_PREFIX, 'load-complete', {
-				taskId,
-				sessionCount: rs ? rs.length : 0,
-				wechatAccountIds: Array.from(new Set((rs || []).map(session => session.wechatAccountId)))
-			})
 			return rs
-		}).catch(error => {
-			console.error(ASSIGN_SESSION_LOG_PREFIX, 'load-error', {
-				taskId,
-				message: error && error.message ? error.message : String(error)
-			})
-			throw error
 		}).finally(() => {
 			this.data.loadAssignTaskSessioning = false
 		})