@aochuang/client-sdk 1.0.377 → 1.0.378-wework

package/{uni-components/chat-control/chat-control-config.vue → components/wework-chat-control/wework-chat-control-config.vue}

@@ -1,25 +1,20 @@
-<template>
-	<view class="sdk-wechat-chat-control-config">
-		<slot></slot>
-	</view>
-</template>
 <script>
 export default {
-    name: 'SdkWechatChatControlConfig',
+    name: 'SdkWeworkChatControlConfig',
     provide () {
         return {
-            SdkWechatChatControlConfig: this
+            SdkWeworkChatControlConfig: this
         }
     },
     inject: {
         // 可以继承上级的
-        SdkWechatChatControlConfig: {
+        SdkWeworkChatControlConfig: {
             default: null
         }
-    }, 
+    },
     props: {
         /**
-         * 这个是组件级别的配置，wechatChatPanel是消息级别的配置，后面是消息级别配置覆盖组件级别的配置
+         * 这个是组件级别的配置，weworkChatPanel是消息级别的配置，后面是消息级别配置覆盖组件级别的配置
          * {
          *      1: {
          *          formatter () {
@@ -39,6 +34,9 @@ export default {
             type: Function
         }
     },
+    render () {
+        return this.$slots.default
+    },
     methods: {
         getControlConfig (msgType) {
             if (!this.controlConfig) {
@@ -47,13 +45,18 @@ export default {
             return this.controlConfig[msgType]
         },
         getMessageConfig (msgData) {
+            const controlConfig = this.getControlConfig(msgData.msgType)
             if (!this.messageConfig) {
-                return
+                return controlConfig
             }
-            return this.messageConfig({
+            const messageConfig = this.messageConfig({
                 item: msgData
             })
+            if (!messageConfig) {
+                return controlConfig
+            }
+            return Object.assign({}, controlConfig, messageConfig)
         }
     }
 }
-</script>
+</script>

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

@@ -0,0 +1,73 @@
+<template>
+  <div class="sdk-wework-panel-chat-status">
+    <!-- status: 0 success, 1 sending, 2 failed, 3 timeout -->
+    <template v-if="data.status === 1">
+      <ui-loading size="mini"></ui-loading>
+    </template>
+    <template v-else-if="data.status === 2">
+      <bi-tooltip :text="data.resultMsg || '发送失败'">
+        <span class="sdk-wework-panel-chat-status__error">
+          <svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path d="M512 938.666667C276.352 938.666667 85.333333 747.648 85.333333 512S276.352 85.333333 512 85.333333s426.666667 191.018667 426.666667 426.666667-191.018667 426.666667-426.666667 426.666667z m0-486.997334L391.338667 330.965333 330.965333 391.338667 451.669333 512l-120.704 120.661333 60.373334 60.373334L512 572.330667l120.661333 120.704 60.373334-60.373334L572.330667 512l120.704-120.661333-60.373334-60.373334L512 451.669333z" fill="currentColor"></path></svg>
+        </span>
+      </bi-tooltip>
+    </template>
+    <template v-else-if="data.status === 3">
+      <bi-tooltip :text="data.resultMsg || '发送超时'">
+        <span class="sdk-wework-panel-chat-status__error">
+          <svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path d="M512 938.666667C276.352 938.666667 85.333333 747.648 85.333333 512S276.352 85.333333 512 85.333333s426.666667 191.018667 426.666667 426.666667-191.018667 426.666667-426.666667 426.666667z m42.666667-426.666667V298.666667h-85.333334v298.666666h256v-85.333333h-170.666666z" fill="currentColor"></path></svg>
+        </span>
+      </bi-tooltip>
+    </template>
+    <template v-if="data.recalled">
+      <bi-tooltip text="消息已撤回">
+        <span class="sdk-wework-panel-chat-status__error sdk-wework-panel-chat-status__recalled">
+          <svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path d="M512 0c282.752 0 512 229.248 512 512s-229.248 512-512 512S0 794.752 0 512 229.248 0 512 0z m-50.261333 255.317333c-7.765333-39.338667-39.893333-15.36-39.893334-15.36l-213.76 192c-47.616 34.944-2.730667 60.458667-2.730666 60.458667l211.541333 190.933333c42.410667 33.066667 45.866667-17.749333 45.866667-17.749333v-86.442667c215.125333-70.144 303.36 208.341333 303.36 208.341334 7.936 15.957333 13.824 0 13.824 0C862.933333 368.682667 461.952 348.586667 461.952 348.586667z" fill="currentColor"></path></svg>
+        </span>
+      </bi-tooltip>
+    </template>
+  </div>
+</template>
+
+<script>
+import { Tooltip as BiTooltip } from '@aochuang/common/common'
+import { Loading as UiLoading } from '@aochuang/common/components'
+
+export default {
+  name: 'SdkWeworkPanelChatStatus',
+  components: {
+    BiTooltip,
+    UiLoading
+  },
+  props: {
+    data: {
+      type: Object,
+      required: true
+    },
+    updateChatBoxProp: {
+      type: Function
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.sdk-wework-panel-chat-status__error {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  font-size: 12px;
+  color: #c00;
+  width: 16px;
+  height: 16px;
+  svg {
+    width: 100%;
+    height: 100%;
+  }
+}
+.sdk-wework-panel-chat-status__recalled {
+  opacity: .6;
+}
+.sdk-wework-panel-chat-status {
+  margin: 0 6px;
+}
+</style>

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.377",
+  "version": "1.0.378-wework",
   "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-message.js

@@ -146,6 +146,21 @@ export default class ClientChatMessage {
 			}
 		}
 		if (fireEvent !== false) {
+			// 先执行onAddMessageSuccess再发add-message事件，保证会话的getSession轮询先由这里发起、更新会话的回调排在最前面，
+			// 外部监听add-message后再调getSession只是复用同一个轮询
+			// try/catch是为了避免回调里的异常把add-message事件吞掉（外部的新消息提醒、本地消息缓存都依赖这个事件）
+			try {
+				this.onAddMessageSuccess && this.onAddMessageSuccess({
+					data,
+					lastMessageTime,
+					isBeforeLastMessage
+				})
+			} catch (error) {
+				console.error('[client-chat-message] onAddMessageSuccess error', {
+					messageId: data.id,
+					error
+				})
+			}
 			// 如果消息包含这种情况，就不能往外发送add-message事件
 			// 因为例如群发的消息，他没有会话，导致前端在处理来了新消息通知铃声提醒，获取会话一直获取不到，然后会总是发送请求
 			if (!isBeforeLastMessage && !isAutoReadMessage(data) && !shouldIgnoreSessionByMessage(data) && !isDeletedMsg(data) && !isBlockedMsg(data)) {
@@ -153,11 +168,6 @@ export default class ClientChatMessage {
 					data
 				})	
 			}
-			this.onAddMessageSuccess && this.onAddMessageSuccess({
-				data,
-				lastMessageTime,
-				isBeforeLastMessage
-			})
 		}
 	}