From 28ba0c2c13b7f19152c482d40928e92e18d6dfdf Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Thu, 31 Jul 2025 17:36:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../implatform/service/impl/FileServiceImpl.java   |  6 ++++--
 .../components/long-press-menu/long-press-menu.vue | 14 ++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/FileServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/FileServiceImpl.java
index 171bef7..150bc2c 100644
--- a/im-platform/src/main/java/com/bx/implatform/service/impl/FileServiceImpl.java
+++ b/im-platform/src/main/java/com/bx/implatform/service/impl/FileServiceImpl.java
@@ -106,8 +106,10 @@ public class FileServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> imple
             UploadImageVO vo = new UploadImageVO();
             // 获取图片长度和宽度
             BufferedImage bufferedImage =  ImageIO.read(file.getInputStream());
-            vo.setWidth(bufferedImage.getWidth());
-            vo.setHeight(bufferedImage.getHeight());
+            if(!Objects.isNull(bufferedImage)){
+                vo.setWidth(bufferedImage.getWidth());
+                vo.setHeight(bufferedImage.getHeight());
+            }
             // 如果文件已存在，直接复用
             String md5 = DigestUtils.md5DigestAsHex(file.getInputStream());
             FileInfo fileInfo = findByMd5(md5, FileType.IMAGE.code());
diff --git a/im-uniapp/components/long-press-menu/long-press-menu.vue b/im-uniapp/components/long-press-menu/long-press-menu.vue
index cedf6d2..8760ecd 100644
--- a/im-uniapp/components/long-press-menu/long-press-menu.vue
+++ b/im-uniapp/components/long-press-menu/long-press-menu.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="long-press-menu none-pointer-events">
-		<view @longpress.stop="onLongPress($event)" @touchmove="onTouchMove" @touchend="onTouchEnd">
+		<view @longpress.prevent.stop="onLongPress($event)" @touchmove="onTouchMove" @touchend="onTouchEnd">
 			<slot></slot>
 		</view>
 		<view v-if="isShowMenu" class="menu-mask" @touchstart="onClose()" @contextmenu.prevent=""></view>
@@ -39,9 +39,9 @@ export default {
 					let style = "";
 					/* 因 非H5端不兼容 style 属性绑定 Object ，所以拼接字符 */
 					if (touches.clientY > (res.windowHeight / 2)) {
-						style = `bottom:${res.windowHeight - touches.clientY}px;`;
+						style = `bottom:${res.windowHeight - touches.clientY + 20}px;`;
 					} else {
-						style = `top:${touches.clientY}px;`;
+						style = `top:${touches.clientY + 20}px;`;
 					}
 					if (touches.clientX > (res.windowWidth / 2)) {
 						style += `right:${res.windowWidth - touches.clientX}px;`;
@@ -53,12 +53,18 @@ export default {
 					this.$nextTick(() => {
 						this.isShowMenu = true;
 					});
+					this.menuTouch = touches
 				}
 			})
 		},
 		onTouchMove() {
-			this.onClose();
 			this.isTouchMove = true;
+			let touches = e.touches[0];
+			// 屏幕拖动大于50px时，取消菜单
+			if (Math.abs(touches.clientX - this.menuTouch.clientX) > 50 ||
+				Math.abs(touches.clientY - this.menuTouch.clientY) > 50) {
+				this.onClose();
+			}
 		},
 		onTouchEnd() {
 			this.isTouchMove = false;