@aochuang/client-sdk 1.0.316 → 1.0.317

package/components/wechat-chat-control/image/image-dragable-confirm.vue

@@ -1,14 +1,14 @@
 <template>
   <ui-dialog
     v-model="visible"
-    title="选择缩略图/原图"
+    title="拖拽图片到其他"
     size="mini"
     :closeable="!loading"
     :close-on-click-modal="false"
     @closed="handleClosed"
   >
     <div class="sdk-chat-control-image-dragable-confirm">
-      <div class="sdk-chat-control-image-dragable-confirm__check">
+      <div v-if="isOriginImage" class="sdk-chat-control-image-dragable-confirm__check">
         <ui-radio-group v-model="currentType">
             <ui-radio label="thumb">使用缩略图</ui-radio>
             <ui-radio label="origin">使用原图</ui-radio>
@@ -17,7 +17,7 @@
       <div class="sdk-chat-control-image-dragable-confirm__preview">
         <ui-image :src="previewSrc" width="100%" height="100%" :enable-thumbnail="false"></ui-image>
       </div>
-      <div class="sdk-chat-control-image-dragable-confirm__text">
+      <div v-if="isOriginImage" class="sdk-chat-control-image-dragable-confirm__text">
         <template v-if="currentType === 'thumb'">
             缩略图文件较小，拖拽更快，但显示可能失真。
         </template>
@@ -25,6 +25,9 @@
             原图显示效果更好，但文件较大，加载可能较慢。
         </template>
       </div>
+      <div v-else class="sdk-chat-control-image-dragable-confirm__text">
+        请从此处拖拽图片到其他软件
+      </div>
       <div class="sdk-chat-control-image-dragable-confirm__actions">
         <ui-button :disabled="loading" @click="handleCancelClick">取消</ui-button>
       </div>
@@ -52,6 +55,10 @@ export default {
     loading: {
       type: Boolean,
       default: false
+    },
+    isOriginImage: {
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -65,6 +72,9 @@ export default {
   computed: {
     innerSrc () {
         let src = this.src
+        if (!this.isOriginImage) {
+            return formatOssPath(src)
+        }
         if (this.currentType === 'origin') {
             src = getOriginImageSrc(src)
         } else {

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

@@ -85,12 +85,14 @@
     <image-dragable-confirm
       v-if="showDragOriginConfirm"
       :src="src"
+      :is-origin-image="isOriginImage"
       @closed="handleDragOriginConfirmClosed"
     ></image-dragable-confirm>
   </div>
 </template>
 <script>
 import { Image as UiImage, Button as UiButton, Icon as UiIcon } from '@aochuang/common/components'
+import { formatOssPath } from '@aochuang/common/utils/oss'
 import { isOriginImage, getNewImageSrc, isNewImage } from './util'
 import BiTooltip from '@aochuang/common/common/tooltip'
 import ImageDragableConfirm from './image-dragable-confirm.vue'
@@ -258,6 +260,12 @@ export default {
     isOriginImage () {
       return isOriginImage(this.src)
     },
+    isPrivateOssImage () {
+      if (!this.src) {
+        return false
+      }
+      return formatOssPath(this.src) !== this.src
+    },
     allowDefrost () {
       return !!this.defrostMethod
     }
@@ -275,7 +283,7 @@ export default {
       this.imageClickMethod && this.imageClickMethod()
     },
     handleImageDragStart (event) {
-      if (!this.enableDragOriginImage || !this.isOriginImage) {
+      if (!(this.enableDragOriginImage && this.isOriginImage) && !this.isPrivateOssImage) {
         return
       }
       event.preventDefault()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.316",
+  "version": "1.0.317",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

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

@@ -769,7 +769,7 @@ class ClientChat {
 			},
 			onAccountLoaded: () => {
 				this.socket.doHeartbeat()
-				this.account.refreshAllAccountGreetingUnreadMsgCount().catch(() => {})
+				this.account.refreshAllAccountGreetingUnreadMsgCount()
 			},
 			onCurrentAccountChange: ({ currentAccount }) => {
 				// // 如果群分组数据加载了再去刷成员数量，这样可以做到按需