@aochuang/client-sdk 1.0.315 → 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.315",
+  "version": "1.0.317",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

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

@@ -176,6 +176,7 @@ export default class ClientChatContacts {
 			getContactsRoomMethod: null,
 			getContactsFriendGroupCountMethod: null,
 			getContactsRoomGroupCountMethod: null,
+			onContactsFriendRemoved: null,
 			onContactsRoomRemoved: null,
 			onLoadRoomGroupData: null,
 			onLoadFriendGroupData: null,
@@ -218,6 +219,7 @@ export default class ClientChatContacts {
 		this.getContactsRoomMethod = options.getContactsRoomMethod
 		this.getContactsRoomGroupCountMethod = options.getContactsRoomGroupCountMethod
 		this.getContactsFriendGroupCountMethod = options.getContactsFriendGroupCountMethod
+		this.onContactsFriendRemoved = options.onContactsFriendRemoved
 		this.onContactsRoomRemoved = options.onContactsRoomRemoved
 		this.onLoadRoomGroupData = options.onLoadRoomGroupData
 		this.onLoadFriendGroupData = options.onLoadFriendGroupData
@@ -436,7 +438,8 @@ export default class ClientChatContacts {
 		if (!this.friendMap[id]) {
 			return
 		}
-		const index = this.data.friendData.indexOf(this.friendMap[id])
+		const friend = this.friendMap[id]
+		const index = this.data.friendData.indexOf(friend)
 		if (index >= 0) {
 			this.data.friendData.splice(index, 1)
 		}
@@ -457,6 +460,10 @@ export default class ClientChatContacts {
 			}
 		})
 		delete this.friendMap[id]
+		this.onContactsFriendRemoved && this.onContactsFriendRemoved({
+			friend
+		})
+		return friend
 	}
 	
 	updateFriend (id, props) {

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

@@ -219,7 +219,13 @@ class ClientChat {
 				}
 			}
 			options.onRemoveSession = ({ session }) => {
-				// 移除不做同步，例如未读会话，前端会自己删除已读的会话，这个时候不能做同步，否则会把最近会话也移除了
+				// 未读、星标等实例的局部移除不同步到其他实例，主会话移除时仅同步清理搜索缓存
+				if (instance === this.session) {
+					this.sessionFilter.removeSession(session.conversationId)
+					if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === session.conversationId) {
+						this.sessionManage.setCurrentSession(null)
+					}
+				}
 			}
 			options.onDeleteSession = ({ session }) => {
 				if (!session) {
@@ -687,7 +693,23 @@ class ClientChat {
 			getContactsRoomMethod: options.getContactsRoomMethod,
 			getContactsFriendGroupCountMethod: options.getContactsFriendGroupCountMethod,
 			getContactsRoomGroupCountMethod: options.getContactsRoomGroupCountMethod,
+			onContactsFriendRemoved: ({ friend }) => {
+				this.contactsFilter.removeFriend(friend.id)
+				if (this.sessionManage.currentSession && this.sessionManage.currentSession.type === 0 && this.sessionManage.currentSession.targetId === friend.id) {
+					this.sessionManage.setCurrentSession(null)
+				}
+				const session = this.session.findSession(({ session }) => {
+					return session.targetId === friend.id
+				})
+				if (session) {
+					this.session.removeSession(session.conversationId)
+				}
+			},
 			onContactsRoomRemoved: ({ room }) => {
+				this.contactsFilter.removeRoom(room.id)
+				if (this.sessionManage.currentSession && this.sessionManage.currentSession.type === 1 && this.sessionManage.currentSession.targetId === room.id) {
+					this.sessionManage.setCurrentSession(null)
+				}
 				const accountId = options.getLoginAccountIdMethod ? options.getLoginAccountIdMethod() : room.accountId
 				let sessionId = createSessionId(accountId, room.id)
 				if (sessionId) {
@@ -747,7 +769,7 @@ class ClientChat {
 			},
 			onAccountLoaded: () => {
 				this.socket.doHeartbeat()
-				this.account.refreshAllAccountGreetingUnreadMsgCount().catch(() => {})
+				this.account.refreshAllAccountGreetingUnreadMsgCount()
 			},
 			onCurrentAccountChange: ({ currentAccount }) => {
 				// // 如果群分组数据加载了再去刷成员数量，这样可以做到按需
@@ -883,7 +905,15 @@ class ClientChat {
 								if (data.friends && data.friends.length) {
 									data.friends.forEach(friend => {
 										if (friend.changeType === 3) {
-											this.contacts.removeFriend(friend.wechatFriendId)
+											const removedFriend = this.contacts.removeFriend(friend.wechatFriendId)
+											if (!removedFriend) {
+												const session = this.session.findSession(({ session }) => {
+													return session.targetId === friend.wechatFriendId
+												})
+												if (session) {
+													this.session.removeSession(session.conversationId)
+												}
+											}
 										}
 									})
 								}
@@ -910,15 +940,16 @@ class ClientChat {
 					}
 					// 删除好友
 					else if (data.changeType === 3) {
-						// 删除会话
-						const session = this.session.findSession(({ session }) => {
-							return session.targetId === data.wechatFriendId
-						})
-						if (session) {
-							this.session.removeSession(session.conversationId)
-						}
 						// 删除好友
-						this.contacts.removeFriend(data.wechatFriendId)
+						const removedFriend = this.contacts.removeFriend(data.wechatFriendId)
+						if (!removedFriend) {
+							const session = this.session.findSession(({ session }) => {
+								return session.targetId === data.wechatFriendId
+							})
+							if (session) {
+								this.session.removeSession(session.conversationId)
+							}
+						}
 						// todo 刷新一下微信号，如果微信号一个好友都没了，应该要删除掉的
 						this.contacts.markModify() // 标记通讯录修改
 					}