@aochuang/client-sdk 1.0.376 → 1.0.378

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

@@ -19,11 +19,12 @@
                 <span 
                     class="sdk-chat-editor-suggestions__close" 
                     title="关闭"
-                    @click="handleCloseClick"
+                    @mousedown.prevent.stop
+                    @click.stop="handleCloseClick"
                 ></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 
@@ -39,6 +40,9 @@
                     </div>
                 </div>
             </template>
+            <div v-if="loadingMore" class="sdk-chat-editor-suggestions__load-more">
+                <ui-loading size="mini" text="加载中..."></ui-loading>
+            </div>
         </div>
         <div class="sdk-chat-editor-suggestions__foot">
             <ui-icon name="information-line"></ui-icon> 提示：
@@ -68,8 +72,20 @@ export default {
             type: Boolean,
             default: false
         },
+        loadingMore: {
+            type: Boolean,
+            default: false
+        },
         confirmMethod: {
             type: Function
+        },
+        loadMoreEnabled: {
+            type: Boolean,
+            default: false
+        },
+        hasMore: {
+            type: Boolean,
+            default: false
         }
     },
     data () {
@@ -106,7 +122,16 @@ export default {
     },
     methods: {
         handleCloseClick () {
-            this.closed = true
+            this.$emit('close')
+        },
+        handleBodyScroll (evt) {
+            if (!this.loadMoreEnabled || this.loading || this.loadingMore || !this.hasMore) {
+                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 +205,10 @@ export default {
         checkAutoFocus () {
             if (!this.data || !this.data.length) {
                 this.focusId = null
-            } else {
+                return
+            }
+            const hasFocusedItem = this.data.some(item => item.id === this.focusId)
+            if (!hasFocusedItem) {
                 this.focusId = this.data[0].id
             }
         },
@@ -297,6 +325,14 @@ export default {
     overflow: auto;
     position: relative;
 }
+.sdk-chat-editor-suggestions__load-more {
+    height: 28px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #999;
+    font-size: 12px;
+}
 .sdk-chat-editor-suggestions__foot{
     color: #999;
     line-height: 24px;

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

@@ -46,8 +46,13 @@
                 ref="suggestions"
                 :keyword="suggestionsKeyword"
                 :loading="suggestioning"
+                :loading-more="suggestionsLoadingMore"
                 :data="suggestionsData"
                 :confirm-method="handleSuggestionsConfirmMethod"
+                :load-more-enabled="suggestionsLoadMore"
+                :has-more="suggestionsHasMore"
+                @load-more="handleSuggestionsLoadMore"
+                @close="handleSuggestionsClose"
                 @closed="handleSuggestionsClosed"
             >
                 <template slot="item" slot-scope="scope">
@@ -83,6 +88,14 @@ export default {
         fetchSuggestionsMethod: {
             type: Function
         },
+        suggestionsLoadMore: {
+            type: Boolean,
+            default: false
+        },
+        suggestionsPageSize: {
+            type: Number,
+            default: 20
+        },
         confirmSuggestionsMethod: {
             type: Function
         },
@@ -99,6 +112,8 @@ export default {
             sending: false,
             popoverActive: false,
             suggestioning: false,
+            suggestionsLoadingMore: false,
+            suggestionsHasMore: false,
             suggestionsData: [],
             suggestionsKeyword: null,
             inputValue: this.value || ''
@@ -127,6 +142,30 @@ export default {
         },
         handleSuggestionsClosed () {
             this.suggestionsData = []
+            this.suggestionsLoadingMore = false
+            this.suggestionsHasMore = false
+        },
+        handleSuggestionsClose () {
+            const range = this.cacheInputRange ? Object.assign({}, this.cacheInputRange) : null
+            this.closeSuggestions()
+            this.$nextTick(() => {
+                this.focus()
+                if (range) {
+                    this.setSelectionByTextRange(range.start, range.end)
+                }
+            })
+        },
+        handleSuggestionsLoadMore () {
+            if (!this.suggestionsLoadMore || this.suggestioning || this.suggestionsLoadingMore || !this.suggestionsHasMore) {
+                return
+            }
+            const lastItem = this.suggestionsData.length
+                ? this.suggestionsData[this.suggestionsData.length - 1]
+                : null
+            return this.loadSuggestions(this.suggestionsKeyword, this.suggestionsNearsetInfo, {
+                isLoadMore: true,
+                lastItem
+            })
         },
         handleSuggestionsConfirmMethod ({ item }) {
             const next = () => {
@@ -255,29 +294,58 @@ export default {
                 this.loadSuggestions(nearest, nearsetInfo)
             }, 200)
         },
-        loadSuggestions (keyword, nearestInfo) {
+        loadSuggestions (keyword, nearestInfo, options = {}) {
             if (!this.fetchSuggestionsMethod) {
                 return
             }
+            const isLoadMore = !!options.isLoadMore
             keyword = this.normalizeSuggestionsKeyword(nearestInfo, keyword)
+            if (!isLoadMore) {
+                this.suggestionsHasMore = false
+            }
             const requestId = (this._suggestionsRequestId || 0) + 1
             this._suggestionsRequestId = requestId
-            this.suggestioning = true
+            if (isLoadMore) {
+                this.suggestionsLoadingMore = true
+            } else {
+                this.suggestioning = true
+            }
             this.suggestionsKeyword = keyword
             this.popoverActive = true
             clearTimeout(this._loadSuggestionsTimer)
             return this.fetchSuggestionsMethod({
                 keyword,
                 nearestInfo,
-                isAtContext: !!(nearestInfo && nearestInfo.isAtContext)
+                isAtContext: !!(nearestInfo && nearestInfo.isAtContext),
+                isLoadMore,
+                lastItem: options.lastItem || null
             }).then(rs => {
                 if (requestId !== this._suggestionsRequestId) {
                     return
                 }
-                this.suggestionsData = rs || []
+                const nextData = rs || []
+                if (isLoadMore) {
+                    const ids = new Set(this.suggestionsData.map(item => item.id))
+                    this.suggestionsData = this.suggestionsData.concat(nextData.filter(item => {
+                        if (ids.has(item.id)) {
+                            return false
+                        }
+                        ids.add(item.id)
+                        return true
+                    }))
+                } else {
+                    this.suggestionsData = nextData
+                }
+                this.suggestionsHasMore = this.suggestionsLoadMore &&
+                    this.suggestionsPageSize > 0 &&
+                    nextData.length >= this.suggestionsPageSize
             }).finally(() => {
                 if (requestId === this._suggestionsRequestId) {
-                    this.suggestioning = false
+                    if (isLoadMore) {
+                        this.suggestionsLoadingMore = false
+                    } else {
+                        this.suggestioning = false
+                    }
                 }
             })
         },
@@ -294,6 +362,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,7 +11,6 @@ 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'
 
@@ -22,10 +21,6 @@ export default {
     WechatChatControlConfig, 
     WechatChatControlConfigMsg,
     WechatChatControlConfigItem,
-    WeworkChatControls,
-    WeworkChatControlConfig,
-    WeworkChatControlConfigMsg,
-    WeworkChatControlConfigItem,
     MESSAGE_TYPE,
     MESSAGE_TYPE_W,
     AccountSelect,
@@ -45,4 +40,4 @@ export default {
     ChatRoomProfile,
     WechatChatPanel,
     WeworkChatPanel
-}
+}

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

@@ -5,13 +5,14 @@
 				<div class="sdk-session-item__avatar-image">
 					<slot name="avatar"></slot>
 				</div>
-				<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>
+				<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>
 			</div>
 			<div class="sdk-session-item__main">
 				<div class="sdk-session-item__row">
@@ -141,7 +142,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/wechat-chat-control/location/location.vue

@@ -7,11 +7,11 @@
         </div>
         <div class="sdk-chat-control-location__body">
           <div v-if="offline" class="sdk-chat-control-location__offline">
-            <div class="sdk-chat-control-location__offline-label">腾讯地图经纬度坐标：</div>
+            <div class="sdk-chat-control-location__offline-label">高德地图经纬度坐标：</div>
             <div class="sdk-chat-control-location__offline-value">{{longitude}}、{{latitude}}</div>
             <div class="sdk-chat-control-location__offline-tips">提示：离线模式无法显示地图</div>
           </div>
-          <ac-static-map :map-key="mapKey" v-else :enable-link="false" width="280" height="160" :lng="longitude" :lat="latitude" @map-created="handleStaticMapCreated"></ac-static-map>
+          <ac-static-map type="amap" :map-key="mapKey" v-else :enable-link="false" width="280" height="160" :lng="longitude" :lat="latitude" @map-created="handleStaticMapCreated"></ac-static-map>
         </div>
       </div>
     </template>
@@ -21,7 +21,7 @@
           <svg t="1752133896251" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="25831" width="200" height="200"><path d="M512 1012.394667l-271.530667-271.530667a384 384 0 1 1 543.061334 0L512 1012.394667z m211.2-331.861334a298.666667 298.666667 0 1 0-422.4 0L512 891.733333l211.2-211.2zM512 554.666667a85.333333 85.333333 0 1 1 0-170.666667 85.333333 85.333333 0 0 1 0 170.666667z" fill="currentColor" p-id="25832"></path></svg>
         </span>
         <span class="sdk-chat-control-location__title">{{address}}</span>
-        <ac-static-map :map-key="mapKey" :enable-link="false" width="52" height="52" :lng="longitude" :lat="latitude" @map-created="handleStaticMapCreated"></ac-static-map>
+        <ac-static-map type="amap" :map-key="mapKey" :enable-link="false" width="52" height="52" :lng="longitude" :lat="latitude" @map-created="handleStaticMapCreated"></ac-static-map>
       </div>
     </template>
   </div>

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.headUrl || this.nextContent.avatar)
+      return formatOssPath(this.nextContent.avatar)
     },
     nickname () {
       return this.nextContent.nickname
@@ -104,12 +104,6 @@ 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;
@@ -119,6 +113,7 @@ 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,10 +21,9 @@ export default {
     }
   },
   render (h, c) {
-    const content = parse(c.props.content) || {}
     return h(Image, {
       props: {
-        src: content.url,
+        src: parse(c.props.content).linkUrl,
         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,11 +7,9 @@
         </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="canDownload" @click.stop.prevent>
-            <ui-button type="primary" link :loading="downloading" icon="download-line" :click="handleDownloadClick">
-              下载
-            </ui-button>
-          </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> -->
         </div>
       </span>
       <span v-if="fileIcon" class="sdk-chat-wework-control-file-url__icon">
@@ -30,7 +28,6 @@
 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',
@@ -69,17 +66,18 @@ export default {
   },
   data () {
     return {
-      nextContent: {},
-      downloading: false
+      nextContent: {}
     }
   },
   computed: {
     url () {
-      const url = this.nextContent.resPath || this.nextContent.url || this.nextContent.resUrl
-      return url ? formatOssPath(url) : url
+      return this.nextContent.url || this.nextContent.resUrl
     },
     name () {
-      return this.nextContent.fileName || this.nextContent.title || this.url
+      if (!this.nextContent.title) {
+        return this.url
+      }
+      return this.nextContent.title
     },
     size () {
       return this.nextContent.totalLen
@@ -108,9 +106,6 @@ export default {
       }
       return this.allowDownload
     },
-    canDownload () {
-      return this.type !== 'quote' && this.innerAllowDownload && typeof this.downloadMethod === 'function'
-    },
     border () {
       if (this.type === 'quote') {
         return false
@@ -120,37 +115,24 @@ export default {
   },
   created () {
     this.nextContent = parse(this.content) || {}
+    if (this.url && this.updateChatBoxProp) {
+      this.updateChatBoxProp('href', this.url)
+    }
   },
   methods: {
     handleDownloadClick () {
-      if (!this.canDownload || this.downloading) {
+      if (!this.downloadMethod) {
         return
       }
-      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({
+      return this.downloadMethod({
         content: this.nextContent,
         updateContentProp: (prop, value) => {
-          if (!['resPath', 'url'].includes(prop)) {
+          if (!['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 () {

package/components/wework-chat-control/image/image.vue

@@ -1,24 +1,7 @@
 <template>
   <div class="sdk-chat-control-image" @click="handleClick">
     <div class="sdk-chat-control-image__main" :style="{'height': innerHeight, 'max-height': innerMaxHeight + 'px'}">
-      <template v-if="showDownloadBox">
-        <div class="sdk-chat-control-image__download" :class="{'is-downloading': downloading}" @click.stop="handleDownloadClick">
-          <template v-if="downloading">
-            <div class="sdk-chat-control-image__download-icon">
-              <ui-loading size="mini"></ui-loading>
-            </div>
-            <div class="sdk-chat-control-image__download-text">下载中...</div>
-          </template>
-          <template v-else>
-            <div class="sdk-chat-control-image__download-icon">
-              <ui-icon name="download-line"></ui-icon>
-            </div>
-            <div class="sdk-chat-control-image__download-text">下载</div>
-          </template>
-        </div>
-        <div class="sdk-chat-control-image__download-placeholder"></div>
-      </template>
-      <template v-else-if="allowDefrost">
+      <template v-if="allowDefrost">
         <template v-if="defrostMsg">
           <div class="sdk-chat-control-image__defrost">
             <div class="sdk-chat-control-image__defrost-icon">
@@ -93,7 +76,6 @@
 </template>
 <script>
 import { Image as UiImage, Button as UiButton, Icon as UiIcon, Loading as UiLoading } from '@aochuang/common/components'
-import { parse } from '../../../utils/json'
 import { isOriginImage, getNewImageSrc} from './util'
 
 export default {
@@ -116,17 +98,7 @@ export default {
       }
     },
     content: {
-      type: [String, Object]
-    },
-    allowDownload: {
-      type: [Boolean, Function],
-      default: false
-    },
-    downloadMethod: {
-      type: Function
-    },
-    cancelDownloadMethod: {
-      type: Function
+      type: String
     },
     maxWidth: {
       type: Number,
@@ -178,35 +150,12 @@ export default {
   },
   data () {
     return {
-      downloading: false,
-      downloaded: false,
-      nextContent: null,
       defrostMsg: null,
       errorMsg: null
     }
   },
   computed: {
-    isDownloadContent () {
-      return !!(this.nextContent && typeof this.nextContent === 'object' && !Array.isArray(this.nextContent))
-    },
-    innerAllowDownload () {
-      if (typeof this.allowDownload === 'function') {
-        return this.allowDownload({
-          content: this.nextContent
-        })
-      }
-      return this.allowDownload
-    },
-    showDownloadBox () {
-      return this.type === 'default' && this.innerAllowDownload && this.isDownloadContent && !this.nextContent.resPath && !this.downloaded
-    },
     src () {
-      if (typeof this.nextContent === 'string') {
-        return this.nextContent
-      }
-      if (this.nextContent && typeof this.nextContent === 'object') {
-        return this.nextContent.resPath || this.nextContent.url || this.nextContent.thumbnailPath || this.nextContent.midThumbnailPath || ''
-      }
       return this.content
     },
     innerWidth () {
@@ -261,9 +210,6 @@ export default {
       return !!this.defrostMethod
     }
   },
-  created () {
-    this.syncContentState()
-  },
   methods: {
     handleClick () {
       this.$emit('click')
@@ -271,39 +217,6 @@ export default {
     handleImageClick () {
       this.imageClickMethod && this.imageClickMethod()
     },
-    handleDownloadClick () {
-      if (this.downloading) {
-        return
-      }
-      if (!this.downloadMethod) {
-        return
-      }
-      const rs = this.downloadMethod({
-        content: this.nextContent,
-        updateContentProp: (prop, value) => {
-          if (!['url'].includes(prop)) {
-            throw new Error('不支持的更新属性' + prop)
-          }
-          this.$set(this.nextContent, prop, value)
-        },
-        updateContentProps: (data) => {
-          if (!data || typeof data !== 'object' || Array.isArray(data)) {
-            throw new Error('updateContentProps只支持更新数据对象')
-          }
-          this.nextContent = data
-        }
-      })
-      if (rs && rs.finally) {
-        this.downloading = true
-        rs.then(() => {
-          this.downloaded = true
-        }).finally(() => {
-          this.downloading = false
-        })
-      } else {
-        this.downloaded = true
-      }
-    },
     handleError () {
       if (!this.defrostMethod) {
         return
@@ -323,22 +236,7 @@ export default {
     handleRefreshClick () {
       this.errorMsg = null
       this.defrostMsg = null
-    },
-    syncContentState () {
-      this.nextContent = parse(this.content)
-      this.downloaded = false
-      this.downloading = false
-      this.errorMsg = null
-      this.defrostMsg = null
     }
-  },
-  watch: {
-    content () {
-      this.syncContentState()
-    }
-  },
-  beforeDestroy () {
-    this.cancelDownloadMethod && this.cancelDownloadMethod()
   }
 }
 </script>
@@ -379,39 +277,6 @@ export default {
   display: inline-block;
   line-height: 1em;
   vertical-align: top;
-  position: relative;
-}
-.sdk-chat-control-image__download{
-  position: absolute;
-  left: 0;
-  top: 0;
-  z-index: 10;
-  width: 100%;
-  height: 100%;
-  background: #000;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  color: #ccc;
-  cursor: pointer;
-  &:not(.is-downloading):hover {
-    color: #fff;
-  }
-}
-.sdk-chat-control-image__download.is-downloading{
-  cursor: default;
-}
-.sdk-chat-control-image__download-icon{
-  line-height: 1;
-  margin-bottom: 6px;
-}
-.sdk-chat-control-image__download-text{
-  font-size: 12px;
-}
-.sdk-chat-control-image__download-placeholder{
-  width: 100%;
-  height: 100%;
 }
 .sdk-chat-control-image__hd{
   position: absolute;