diff --git a/src/views/im/home/components/ContextMenu.vue b/src/views/im/home/components/ContextMenu.vue index ae7fb8844..1705c54ac 100644 --- a/src/views/im/home/components/ContextMenu.vue +++ b/src/views/im/home/components/ContextMenu.vue @@ -76,7 +76,8 @@ const adjustedPosition = computed(() => { x = window.innerWidth - menuWidth } } - return { x, y } + // 视口很小 / 菜单项很多时上面减法会算出负值,把菜单顶 / 左边推到 0 兜底 + return { x: Math.max(0, x), y: Math.max(0, y) } }) type MenuItem = (typeof contextMenu.value.items)[number] diff --git a/src/views/im/home/components/user/UserInfo.vue b/src/views/im/home/components/user/UserInfo.vue index 8213bbfd1..b0ae6e3c5 100644 --- a/src/views/im/home/components/user/UserInfo.vue +++ b/src/views/im/home/components/user/UserInfo.vue @@ -386,7 +386,11 @@ async function handleBlock() { return } const target = props.user - await message.confirm(`确定将「${target.nickname || ''}」加入黑名单吗?`, '加入黑名单') + try { + await message.confirm(`确定将「${target.nickname || ''}」加入黑名单吗?`, '加入黑名单') + } catch { + return + } await friendStore.blockFriend(target.id) message.success('已加入黑名单') } diff --git a/src/views/im/home/pages/conversation/components/input/MentionPicker.vue b/src/views/im/home/pages/conversation/components/input/MentionPicker.vue index 3db535771..72e21a4d3 100644 --- a/src/views/im/home/pages/conversation/components/input/MentionPicker.vue +++ b/src/views/im/home/pages/conversation/components/input/MentionPicker.vue @@ -52,8 +52,11 @@ /> - -
+ +
diff --git a/src/views/im/home/pages/conversation/components/message/GroupPinnedMessage.vue b/src/views/im/home/pages/conversation/components/message/GroupPinnedMessage.vue index 9cc2641b0..48e9b1b98 100644 --- a/src/views/im/home/pages/conversation/components/message/GroupPinnedMessage.vue +++ b/src/views/im/home/pages/conversation/components/message/GroupPinnedMessage.vue @@ -60,7 +60,7 @@