@aochuang/client-sdk 1.0.370 → 1.0.372

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"
@@ -16,17 +16,20 @@
           @user-avatar-click="handleUserAvatarClick"
           @user-avatar-contextmenu="handleUserAvatarContextmenu"
           >
-          <sdk-chat-control-text
-            v-bind="configData"
-            :id="item.id"
-            :content="msgContent"
-          ></sdk-chat-control-text>
+          <template slot-scope="{ setFootVnode }">
+            <sdk-chat-control-text
+              v-bind="configData"
+              :id="item.id"
+              :content="msgContent"
+              :set-chat-box-foot-vnode="setFootVnode"
+            ></sdk-chat-control-text>
+          </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="[14, 101].includes(item.msgType)">
+      <template v-else-if="item.msgType === MESSAGE_TYPE.IMAGE">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -45,7 +48,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 +292,7 @@
           </template>
         </sdk-chat-panel-box>
       </template>
-      <template v-else-if="item.msgType == MESSAGE_TYPE.URL">
+      <template v-else-if="item.msgType == MESSAGE_TYPE.URLFile">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -300,19 +303,19 @@
           @user-avatar-contextmenu="handleUserAvatarContextmenu"
           >
           <template slot-scope="{ updateProp }">
-            <sdk-chat-control-url
+            <sdk-chat-control-file-url
               v-bind="configData"
               :id="item.id"
               :content="msgContent"
               :update-chat-box-prop="updateProp"
-            ></sdk-chat-control-url>
+            ></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="[13, 15, 20, 102].includes(item.msgType)">
+      <template v-else-if="item.msgType == MESSAGE_TYPE.URL || item.msgType == MESSAGE_TYPE.URLNew">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -323,12 +326,12 @@
           @user-avatar-contextmenu="handleUserAvatarContextmenu"
           >
           <template slot-scope="{ updateProp }">
-            <sdk-chat-control-file-url
+            <sdk-chat-control-url
               v-bind="configData"
               :id="item.id"
               :content="msgContent"
               :update-chat-box-prop="updateProp"
-            ></sdk-chat-control-file-url>
+            ></sdk-chat-control-url>
           </template>
           <template slot="append" slot-scope="{ updateProp }">
             <slot name="chat-append" :item="item" :update-chat-box-prop="updateProp"></slot>
@@ -353,19 +356,43 @@
           </template>
         </sdk-chat-panel-box>
       </template>
-      <template v-else-if="item.msgType == MESSAGE_TYPE.CUSTOM_EXPRESSION_W">
+      <template v-else-if="item.msgType === MESSAGE_TYPE.MEETING">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
           :fetchUserMethod="fetchUserMethod"
+          :blank="true"
           @user-avatar-click="handleUserAvatarClick"
           @user-avatar-contextmenu="handleUserAvatarContextmenu"
           >
-          <sdk-chat-control-custom-expression
+          <template slot-scope="{ updateProp }">
+            <sdk-chat-control-metting
+              v-bind="configData"
+              :id="item.id"
+              :content="msgContent"
+              :initiator="item.qwAccountName || item.contactName || item.ownerAccountUserName"
+              :update-chat-box-prop="updateProp"
+            ></sdk-chat-control-metting>
+          </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.MERGE_MESSAGE">
+        <sdk-chat-panel-box
+          :dir="dir"
+          :data="item"
+          :fetchUserMethod="fetchUserMethod"
+          :blank="true"
+          @user-avatar-click="handleUserAvatarClick"
+          @user-avatar-contextmenu="handleUserAvatarContextmenu"
+        >
+          <sdk-chat-control-merge-message
             v-bind="configData"
             :id="item.id"
             :content="msgContent"
-          ></sdk-chat-control-custom-expression>
+          ></sdk-chat-control-merge-message>
           <template slot="append" slot-scope="{ updateProp }">
             <slot name="chat-append" :item="item" :update-chat-box-prop="updateProp"></slot>
           </template>
@@ -510,7 +537,7 @@
           :content="msgContent"
         ></sdk-chat-control-empty>
       </template>
-      <!-- <template v-else>
+      <template v-else>
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -523,10 +550,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'
@@ -545,6 +572,8 @@ import {
   channelVideo as SdkChatControlChannelVideo,
   // channelVideoCard as SdkChatControlChannelVideoCard,
   channelLive as SdkChatControlChannelLive,
+  metting as SdkChatControlMetting,
+  mergeMessage as SdkChatControlMergeMessage,
   url as SdkChatControlUrl,
   fileUrl as SdkChatControlFileUrl,
   jxSysText as SdkChatControlJxSysText,
@@ -564,10 +593,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,
@@ -583,6 +612,8 @@ export default {
     SdkChatControlChannelVideo,
     // SdkChatControlChannelVideoCard,
     SdkChatControlChannelLive,
+    SdkChatControlMetting,
+    SdkChatControlMergeMessage,
     SdkChatControlFileUrl,
     // SdkChatControlTextWithAt,
     SdkChatControlUrl,
@@ -601,7 +632,7 @@ export default {
     // SdkChatControlRevokeMeMessage,
     // SdkChatControlRevokeOtherMessage,
     // SdkChatControlRevokeYouMessage,
-    WechatChatControlConfigMsg
+    WeworkChatControlConfigMsg
   },
   props: {
     dir: {
@@ -647,4 +678,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,14 +129,35 @@ 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
+      return !!item.isSend
     },
     handleChatsInitLoaded () {
       this.$emit('initloaded')
@@ -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.370",
+  "version": "1.0.372",
   "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.js

@@ -1279,12 +1279,6 @@ class ClientChat {
 		return readPromise.finally(() => {
 			if (sessionInstances && sessionInstances.length) {
 				sessionInstances[0].markSessionRead(sessionId)
-				sessionInstances.forEach(sessionInstance => {
-					sessionInstance.removeSession(sessionId)
-				})
-			}
-			if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId) {
-				this.sessionManage.setCurrentSession(null)
 			}
 		})
 	}

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

@@ -5,14 +5,20 @@ export default class ClientChatAccount {
 	data = Vue.observable({
 		accountData: [],
 		accountUnreadMessageNumData: [],
+		accountGreetingUnreadMsgCountData: {},
 		currentAccount: null
 	})
 		
 	loadAccountDataMethod = null
 	
 	getAccountUnreadMessageNumMethod = null
+
+	getAccountGreetingUnreadMsgCountMethod = null
 	
 	accountMap = {}
+
+	// 好友请求数量请求合并，key为账号id列表
+	greetingUnreadRequestMap = {}
 	
 	constructor (options) {
 		options = Object.assign({
@@ -21,11 +27,13 @@ export default class ClientChatAccount {
 			getAccountUnreadMessageNumMethod: null,
 			updateAccountMessageReadMethod: null,
 			deleteAccountSessionMethod: null,
+			getAccountGreetingUnreadMsgCountMethod: null,
 			onCurrentAccountChange: null,
 			onAccountAdded: null,
 			onAccountRemoved: null,
 			onUnreadMessageNumChange: null,
-			onDeleteAccountSession: null
+			onDeleteAccountSession: null,
+			onAccountLoaded: null
 		}, options)
 		if (!options.loadAccountDataMethod) {
 			throw new Error('缺少loadAccountDataMethod配置')
@@ -38,10 +46,12 @@ export default class ClientChatAccount {
 		this.getAccountUnreadMessageNumMethod = options.getAccountUnreadMessageNumMethod
 		this.updateAccountMessageReadMethod = options.updateAccountMessageReadMethod
 		this.deleteAccountSessionMethod = options.deleteAccountSessionMethod
+		this.getAccountGreetingUnreadMsgCountMethod = options.getAccountGreetingUnreadMsgCountMethod
 		this.onAccountAdded = options.onAccountAdded
 		this.onAccountRemoved = options.onAccountRemoved,
 		this.onUnreadMessageNumChange = options.onUnreadMessageNumChange
 		this.onDeleteAccountSession = options.onDeleteAccountSession
+		this.onAccountLoaded = options.onAccountLoaded
 	}
 	
 	get accountData () {
@@ -55,6 +65,10 @@ export default class ClientChatAccount {
 	get currentAccount () {
 		return this.data.currentAccount
 	}
+
+	get accountGreetingUnreadMsgCountData () {
+		return this.data.accountGreetingUnreadMsgCountData
+	}
 	
 	setCurrentAccount (accountId) {
 		let account = null
@@ -282,6 +296,9 @@ export default class ClientChatAccount {
 		this._cacheLoadPromise = this.loadAccountDataMethod()
 		this._cacheLoadPromise.then(rs => {
 			this.setAccountData(rs.data)
+			this.onAccountLoaded && this.onAccountLoaded({
+				data: rs.data
+			})
 		})
 		this.cancelConnectRequest = () => {
 			this._cacheLoadPromise.abort()
@@ -298,9 +315,75 @@ export default class ClientChatAccount {
 		return this.loadData()
 	}
 	
+	/**
+	 * 设置指定企微账号的待处理好友请求数量，并重算all
+	*/
+	setAccountGreetingUnreadMsgCount (params) {
+		if (!params || !params.qwAccountId) {
+			throw new Error('缺少必须参数')
+		}
+		Vue.set(this.data.accountGreetingUnreadMsgCountData, params.qwAccountId, params.count || 0)
+		this.updateAllAccountGreetingUnreadMsgCount()
+	}
+
+	updateAllAccountGreetingUnreadMsgCount () {
+		const allCount = Object.keys(this.data.accountGreetingUnreadMsgCountData).reduce((rs, key) => {
+			return key === 'all' ? rs : rs + (this.data.accountGreetingUnreadMsgCountData[key] || 0)
+		}, 0)
+		Vue.set(this.data.accountGreetingUnreadMsgCountData, 'all', allCount)
+	}
+
+	/**
+	 * 获取待处理好友请求数量
+	 * qwAccountIds不传则刷新所有账号；后端数量为0的账号不返回，所以先置0再覆盖
+	*/
+	getAccountGreetingUnreadMsgCount (params) {
+		if (!this.getAccountGreetingUnreadMsgCountMethod) {
+			return Promise.reject(new Error('getAccountGreetingUnreadMsgCountMethod未定义'))
+		}
+		let qwAccountIds = (params || {}).qwAccountIds
+		if (qwAccountIds && !Array.isArray(qwAccountIds)) {
+			qwAccountIds = [qwAccountIds]
+		}
+		qwAccountIds = (qwAccountIds || []).filter((id, index, data) => id && data.indexOf(id) === index).map(String)
+		const isAll = !qwAccountIds.length
+		const requestKey = isAll ? 'all' : qwAccountIds.slice().sort().join(',')
+		if (this.greetingUnreadRequestMap[requestKey]) {
+			return this.greetingUnreadRequestMap[requestKey]
+		}
+		const request = this.getAccountGreetingUnreadMsgCountMethod({
+			qwAccountIds: isAll ? undefined : qwAccountIds
+		}).then(rs => {
+			const targetIds = isAll ? Object.keys(this.accountMap) : qwAccountIds
+			targetIds.forEach(id => {
+				Vue.set(this.data.accountGreetingUnreadMsgCountData, id, 0)
+			})
+			;((rs && rs.data) || []).forEach(item => {
+				if (item && item.qwAccountId) {
+					Vue.set(this.data.accountGreetingUnreadMsgCountData, String(item.qwAccountId), item.count || 0)
+				}
+			})
+			this.updateAllAccountGreetingUnreadMsgCount()
+			return this.data.accountGreetingUnreadMsgCountData
+		}).finally(() => {
+			delete this.greetingUnreadRequestMap[requestKey]
+		})
+		this.greetingUnreadRequestMap[requestKey] = request
+		return request
+	}
+
+	/**
+	 * 刷新所有账号的待处理好友请求数量
+	*/
+	refreshAllAccountGreetingUnreadMsgCount () {
+		return this.getAccountGreetingUnreadMsgCount()
+	}
+	
 	reset () {
 		this.data.accountData = []
 		this.data.accountUnreadMessageNumData = []
+		this.data.accountGreetingUnreadMsgCountData = {}
+		this.greetingUnreadRequestMap = {}
 		if (this.cancelConnectRequest) {
 			this.cancelConnectRequest()
 		}