@aochuang/client-sdk 1.0.371 → 1.0.373

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

@@ -23,7 +23,7 @@
                 ></span>
             </div>
         </div>
-        <div class="sdk-chat-editor-suggestions__body" ref="body">
+        <div class="sdk-chat-editor-suggestions__body" ref="body" @scroll="handleBodyScroll">
             <template v-if="data && data.length">
                 <div class="sdk-chat-editor-suggestions__list">
                     <div 
@@ -38,6 +38,9 @@
                         <slot name="item" :data="item"></slot>
                     </div>
                 </div>
+                <div class="sdk-chat-editor-suggestions__more" v-if="loadingMore">
+                    <ui-loading size="mini"></ui-loading>
+                </div>
             </template>
         </div>
         <div class="sdk-chat-editor-suggestions__foot">
@@ -68,6 +71,14 @@ export default {
             type: Boolean,
             default: false
         },
+        loadingMore: {
+            type: Boolean,
+            default: false
+        },
+        hasMore: {
+            type: Boolean,
+            default: false
+        },
         confirmMethod: {
             type: Function
         }
@@ -108,6 +119,15 @@ export default {
         handleCloseClick () {
             this.closed = true
         },
+        handleBodyScroll (evt) {
+            if (!this.hasMore || this.loadingMore) {
+                return
+            }
+            const target = evt.target
+            if (target.scrollHeight - target.scrollTop - target.clientHeight <= 20) {
+                this.$emit('load-more')
+            }
+        },
         handleItemMouseEnter (item) {
             this.focusId = item.id
         },
@@ -180,7 +200,7 @@ export default {
         checkAutoFocus () {
             if (!this.data || !this.data.length) {
                 this.focusId = null
-            } else {
+            } else if (!this.focusId || !this.data.some(item => item.id === this.focusId)) {
                 this.focusId = this.data[0].id
             }
         },
@@ -341,4 +361,10 @@ export default {
 .sdk-chat-editor-suggestions__item.is-focus:after {
     opacity: 1;
 }
+.sdk-chat-editor-suggestions__more {
+    height: 32px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
 </style>

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

@@ -46,9 +46,12 @@
                 ref="suggestions"
                 :keyword="suggestionsKeyword"
                 :loading="suggestioning"
+                :loading-more="suggestionsLoadingMore"
+                :has-more="suggestionsHasMore"
                 :data="suggestionsData"
                 :confirm-method="handleSuggestionsConfirmMethod"
                 @closed="handleSuggestionsClosed"
+                @load-more="handleSuggestionsLoadMore"
             >
                 <template slot="item" slot-scope="scope">
                     <slot name="suggestions-item" v-bind="scope"></slot>
@@ -83,6 +86,9 @@ export default {
         fetchSuggestionsMethod: {
             type: Function
         },
+        fetchMoreSuggestionsMethod: {
+            type: Function
+        },
         confirmSuggestionsMethod: {
             type: Function
         },
@@ -99,6 +105,8 @@ export default {
             sending: false,
             popoverActive: false,
             suggestioning: false,
+            suggestionsLoadingMore: false,
+            suggestionsHasMore: false,
             suggestionsData: [],
             suggestionsKeyword: null,
             inputValue: this.value || ''
@@ -127,6 +135,8 @@ export default {
         },
         handleSuggestionsClosed () {
             this.suggestionsData = []
+            this.suggestionsHasMore = false
+            this.suggestionsLoadingMore = false
         },
         handleSuggestionsConfirmMethod ({ item }) {
             const next = () => {
@@ -263,6 +273,8 @@ export default {
             const requestId = (this._suggestionsRequestId || 0) + 1
             this._suggestionsRequestId = requestId
             this.suggestioning = true
+            this.suggestionsLoadingMore = false
+            this.suggestionsHasMore = false
             this.suggestionsKeyword = keyword
             this.popoverActive = true
             clearTimeout(this._loadSuggestionsTimer)
@@ -274,13 +286,60 @@ export default {
                 if (requestId !== this._suggestionsRequestId) {
                     return
                 }
-                this.suggestionsData = rs || []
+                const result = this.normalizeSuggestionsResult(rs)
+                this.suggestionsData = result.items
+                this.suggestionsHasMore = result.hasMore
             }).finally(() => {
                 if (requestId === this._suggestionsRequestId) {
                     this.suggestioning = false
                 }
             })
         },
+        handleSuggestionsLoadMore () {
+            if (!this.fetchMoreSuggestionsMethod || !this.suggestionsHasMore || this.suggestionsLoadingMore) {
+                return
+            }
+            const requestId = this._suggestionsRequestId
+            const keyword = this.suggestionsKeyword
+            const nearestInfo = this.suggestionsNearsetInfo
+            this.suggestionsLoadingMore = true
+            return Promise.resolve(this.fetchMoreSuggestionsMethod({
+                keyword,
+                nearestInfo,
+                isAtContext: !!(nearestInfo && nearestInfo.isAtContext),
+                data: this.suggestionsData.slice()
+            })).then(rs => {
+                if (requestId !== this._suggestionsRequestId || keyword !== this.suggestionsKeyword) {
+                    return
+                }
+                const result = this.normalizeSuggestionsResult(rs)
+                const ids = new Set(this.suggestionsData.map(item => item && item.id))
+                this.suggestionsData = this.suggestionsData.concat(result.items.filter(item => {
+                    if (!item || ids.has(item.id)) {
+                        return false
+                    }
+                    ids.add(item.id)
+                    return true
+                }))
+                this.suggestionsHasMore = result.hasMore
+            }).finally(() => {
+                if (requestId === this._suggestionsRequestId) {
+                    this.suggestionsLoadingMore = false
+                }
+            })
+        },
+        normalizeSuggestionsResult (result) {
+            if (Array.isArray(result)) {
+                return {
+                    items: result,
+                    hasMore: false
+                }
+            }
+            return {
+                items: result && Array.isArray(result.items) ? result.items : [],
+                hasMore: !!(result && result.hasMore)
+            }
+        },
         normalizeSuggestionsKeyword (nearestInfo, keyword) {
             const nearest = keyword === undefined
                 ? (nearestInfo && nearestInfo.nearest) || ''
@@ -294,6 +353,8 @@ export default {
             this._suggestionsRequestId = (this._suggestionsRequestId || 0) + 1
             this.$refs.suggestions && this.$refs.suggestions.close()
             this.suggestioning = false
+            this.suggestionsLoadingMore = false
+            this.suggestionsHasMore = false
             this.popoverActive = false
         },
         hasCurrentSuggestionsContext () {

package/components/index.js

@@ -11,6 +11,7 @@ import ChatLayout from './chat-layout'
 import ChatFriendProfile from './chat-friend-profile'
 import ChatRoomProfile from './chat-room-profile'
 import { chatControls as WechatChatControls, WechatChatControlConfig, WechatChatControlConfigMsg, WechatChatControlConfigItem } from './wechat-chat-control'
+import { chatControls as WeworkChatControls, WeworkChatControlConfig, WeworkChatControlConfigMsg, WeworkChatControlConfigItem } from './wework-chat-control'
 import { MESSAGE_TYPE, formatShortMessage, formatShortSessionMessage } from './wechat-chat-control/util'
 import { MESSAGE_TYPE as MESSAGE_TYPE_W } from './wework-chat-control/util'
 
@@ -21,6 +22,10 @@ export default {
     WechatChatControlConfig, 
     WechatChatControlConfigMsg,
     WechatChatControlConfigItem,
+    WeworkChatControls,
+    WeworkChatControlConfig,
+    WeworkChatControlConfigMsg,
+    WeworkChatControlConfigItem,
     MESSAGE_TYPE,
     MESSAGE_TYPE_W,
     AccountSelect,
@@ -40,4 +45,4 @@ export default {
     ChatRoomProfile,
     WechatChatPanel,
     WeworkChatPanel
-}
+}

package/components/session-select/session-select-item.vue

@@ -5,14 +5,13 @@
 				<div class="sdk-session-item__avatar-image">
 					<slot name="avatar"></slot>
 				</div>
-				<sdk-badge 
-					class="sdk-session-item__avatar-badge" 
-					:class="{'is-mute': data[muteField]}"
-					v-if="data[unreadMsgCountField]"  
-					:is-dot="data[muteField]"
-					:value="data[unreadMsgCountField]"
-					:max="99"
-				></sdk-badge>
+				<span v-if="data[unreadMsgCountField]" class="sdk-session-item__avatar-badge" :class="{'is-mute': data[muteField]}">
+					<sdk-badge  
+						:is-dot="data[muteField]"
+						:value="data[unreadMsgCountField]"
+						:max="99"
+					></sdk-badge>
+				</span>
 			</div>
 			<div class="sdk-session-item__main">
 				<div class="sdk-session-item__row">
@@ -142,7 +141,7 @@ export default {
 	border-radius: 3px;
 }
 .sdk-session-item__avatar-badge{
-	position: absolute;
+	position: absolute; 
 	&.is-mute {
 		left: calc(~'100% - 7px');
 		top: -6px;

package/components/wework-chat-control/channel-card/channel-card.vue

@@ -0,0 +1,144 @@
+<template>
+  <div class="sdk-chat-control-channel-card" :class="['sdk-chat-control-channel-card--' + type]">
+    <template v-if="type === 'default' || type === 'thumb'">
+      <div class="sdk-chat-control-channel-card__main">
+        <div class="sdk-chat-control-channel-card__avatar">
+          <sdk-avatar :src="avatar" :radius="false" size="medium"></sdk-avatar>
+        </div>
+        <div class="sdk-chat-control-channel-card__fields">
+          <div class="sdk-chat-control-channel-card__title">{{name}}</div>
+          <div class="sdk-chat-control-channel-card__summary">{{description}}</div>
+        </div>
+      </div>
+      <div class="sdk-chat-control-channel-card__foot">
+        <span class="sdk-chat-control-channel-card__category">视频号名片</span>
+      </div>
+    </template>
+    <template v-else-if="type === 'quote'">
+      <div class="sdk-chat-control-channel-card__icon"></div>
+      <div class="sdk-chat-control-channel-card__title">{{name}}</div>
+      <div class="sdk-chat-control-channel-card__avatar">
+        <sdk-avatar :src="avatar" :radius="false" size="medium"></sdk-avatar>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+import { parse } from '../../../utils/json'
+import SdkAvatar from '../../../common/avatar'
+import { formatOssPath } from '@aochuang/common/utils/oss'
+
+export default {
+  name: 'SdkChatControlChannelCard',
+  components: {
+    SdkAvatar
+  },
+  props: {
+    id: {
+      type: String
+    },
+    content: {
+      type: [String, Object]
+    },
+    type: {
+      type: String,
+      default: 'default',
+      validator (value) {
+        return ['quote', 'default', 'thumb'].includes(value)
+      }
+    },
+    updateChatBoxProp: {
+      type: Function
+    }
+  },
+  computed: {
+    nextContent () {
+      return parse(this.content) || {}
+    },
+    description () {
+      return this.nextContent.desc || ''
+    },
+    name () {
+      return (this.nextContent.title || '').replace(/^\[视频号名片\]\s*/, '')
+    },
+    avatar () {
+      return formatOssPath(this.nextContent.imageUrl)
+    },
+    url () {
+      return this.nextContent.url
+    }
+  },
+  created () {
+    if (this.url && this.updateChatBoxProp) {
+      this.updateChatBoxProp('href', this.url)
+    }
+  }
+}
+</script>
+<style lang="less">
+.sdk-chat-control-channel-card--default,
+.sdk-chat-control-channel-card--thumb{
+  width: 248px;
+  max-width: 100%;
+  line-height: 1.5em;
+  .sdk-chat-control-channel-card__main{
+    display: flex;
+    flex-direction: row;
+    padding: 10px;
+  }
+  .sdk-chat-control-channel-card__fields{
+    flex: 1;
+    min-width: 0;
+    padding-left: 10px;
+  }
+  .sdk-chat-control-channel-card__title{
+    font-size: 14px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .sdk-chat-control-channel-card__summary{
+    color: #888;
+    font-size: 12px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-top: 6px;
+  }
+  .sdk-chat-control-channel-card__foot{
+    border-top: 1px solid #eee;
+    height: 24px;
+    line-height: 24px;
+    padding: 0 10px;
+    box-sizing: content-box;
+  }
+  .sdk-chat-control-channel-card__category{
+    color: #999;
+    font-size: 12px;
+  }
+}
+.sdk-chat-control-channel-card--thumb{
+  border: 1px solid #eee;
+  background-color: #fff;
+  border-radius: 4px;
+}
+.sdk-chat-control-channel-card--quote {
+  display: flex;
+  flex-direction: row;
+  .sdk-chat-control-channel-card__icon {
+    display: inline-block;
+    width: 18px;
+    height: 18px;
+    margin-right: 4px;
+    min-width: 18px;
+    vertical-align: top;
+    margin-top: 2px;
+    color: #999;
+    background: url('../company-card/quote-icon.svg') no-repeat 50% 50%;
+    background-size: cover;
+  }
+  .sdk-chat-control-channel-card__title{
+    margin-right: 6px;
+  }
+}
+</style>

package/components/wework-chat-control/channel-live/channel-live.vue

@@ -78,7 +78,7 @@ export default {
       return formatOssPath(this.nextContent.coverUrl)
     },
     avatar () {
-      return formatOssPath(this.nextContent.avatar)
+      return formatOssPath(this.nextContent.headUrl || this.nextContent.avatar)
     },
     nickname () {
       return this.nextContent.nickname
@@ -104,6 +104,12 @@ export default {
     border-radius: 4px;
   }
 }
+.sdk-chat-wework-panel-control-channel-live__cover {
+  background-color: #000;
+}
+.sdk-chat-wework-panel-control-channel-live--default {
+  width: 248px;
+}
 .sdk-chat-wework-panel-control-channel-live--default,
 .sdk-chat-wework-panel-control-channel-live--thumb {
   max-width: 280px;
@@ -113,7 +119,6 @@ export default {
   }
   .sdk-chat-wework-panel-control-channel-live__cover{
     height: 200px;
-    background-color: #eee;
   }
   .sdk-chat-wework-panel-control-channel-live__row{
     line-height: 1.5em;

package/components/wework-chat-control/company-card/company-card.vue

@@ -62,7 +62,7 @@ export default {
       return formatOssPath(this.nextContent.bigheadimgurl)
     },
     category () {
-      return '企业微名片'
+      return '微名片'
     }
   }
 }

package/components/wework-chat-control/custom-expression/custom-expression.vue

@@ -21,9 +21,10 @@ export default {
     }
   },
   render (h, c) {
+    const content = parse(c.props.content) || {}
     return h(Image, {
       props: {
-        src: parse(c.props.content).linkUrl,
+        src: content.url,
         width: c.props.type === 'quote' ? '60px' : null,
         height: c.props.type === 'quote' ? '60px' : '120px',
         fit: 'contain'

package/components/wework-chat-control/file-url/file-url.vue

@@ -7,9 +7,11 @@
         </div>
         <div class="sdk-chat-wework-control-file-url__toolbar">
           <span class="sdk-chat-wework-control-file-url__size" v-if="fileSize">{{fileSize}}</span>
-          <!-- <span class="sdk-chat-wework-control-file-url__download" v-if="innerAllowDownload" @click.stop.prevent>
-            <ui-button type="primary" link :click="handleDownloadClick">下载</ui-button>
-          </span> -->
+          <span class="sdk-chat-wework-control-file-url__download" v-if="canDownload" @click.stop.prevent>
+            <ui-button type="primary" link :loading="downloading" icon="download-line" :click="handleDownloadClick">
+              下载
+            </ui-button>
+          </span>
         </div>
       </span>
       <span v-if="fileIcon" class="sdk-chat-wework-control-file-url__icon">
@@ -28,6 +30,7 @@
 import FileIcon from './icons'
 import { parse } from '../../../utils/json'
 import { formatFileSize } from '../../../utils/file'
+import { formatOssPath } from '@aochuang/common/utils/oss'
 
 export default {
   name: 'SdkChatControlFileUrl',
@@ -66,18 +69,17 @@ export default {
   },
   data () {
     return {
-      nextContent: {}
+      nextContent: {},
+      downloading: false
     }
   },
   computed: {
     url () {
-      return this.nextContent.url || this.nextContent.resUrl
+      const url = this.nextContent.resPath || this.nextContent.url || this.nextContent.resUrl
+      return url ? formatOssPath(url) : url
     },
     name () {
-      if (!this.nextContent.title) {
-        return this.url
-      }
-      return this.nextContent.title
+      return this.nextContent.fileName || this.nextContent.title || this.url
     },
     size () {
       return this.nextContent.totalLen
@@ -106,6 +108,9 @@ export default {
       }
       return this.allowDownload
     },
+    canDownload () {
+      return this.type !== 'quote' && this.innerAllowDownload && typeof this.downloadMethod === 'function'
+    },
     border () {
       if (this.type === 'quote') {
         return false
@@ -115,24 +120,37 @@ export default {
   },
   created () {
     this.nextContent = parse(this.content) || {}
-    if (this.url && this.updateChatBoxProp) {
-      this.updateChatBoxProp('href', this.url)
-    }
   },
   methods: {
     handleDownloadClick () {
-      if (!this.downloadMethod) {
+      if (!this.canDownload || this.downloading) {
         return
       }
-      return this.downloadMethod({
+      const updateContent = data => {
+        if (!data || typeof data !== 'object' || Array.isArray(data)) {
+          throw new Error('updateContentProps只支持更新数据对象')
+        }
+        this.nextContent = data
+        this.$emit('content-update', data)
+      }
+      const result = this.downloadMethod({
         content: this.nextContent,
         updateContentProp: (prop, value) => {
-          if (!['url'].includes(prop)) {
+          if (!['resPath', 'url'].includes(prop)) {
             throw new Error('不支持的更新属性' + prop)
           }
           this.$set(this.nextContent, prop, value)
-        }
+          this.$emit('content-update', this.nextContent)
+        },
+        updateContentProps: updateContent
       })
+      if (result && result.finally) {
+        this.downloading = true
+        result.finally(() => {
+          this.downloading = false
+        })
+      }
+      return result
     }
   },
   beforeDestroy () {