From 5a5ada7f0185239aa51e1ad074674e963ea6aacd Mon Sep 17 00:00:00 2001
From: bob <312777916@qq.com>
Date: Tue, 25 Feb 2025 22:54:15 +0800
Subject: [PATCH] =?UTF-8?q?sessionList=E4=B8=AD=E5=BD=93=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=8F=B3=E9=94=AE=E9=80=89=E4=B8=AD=E6=9F=90=E4=B8=AAsession?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=89=93=E5=BC=80=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/message/MessageLayout.vue          | 10 +++++++++-
 src/views/message/components/SessionMenu.vue | 21 ++++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/views/message/MessageLayout.vue b/src/views/message/MessageLayout.vue
index f6a147b..64b5ea6 100644
--- a/src/views/message/MessageLayout.vue
+++ b/src/views/message/MessageLayout.vue
@@ -814,6 +814,10 @@ const onOpenSessionMenu = (sessionId) => {
   showMenuSessionId.value = sessionId
 }
 
+const onCloseSessionMenu = () => {
+  showMenuSessionId.value = ''
+}
+
 const onNoneSelected = () => {
   messageData.setSelectedSessionId('')
 }
@@ -969,7 +973,11 @@ const onSendEmoji = (key) => {
           </AddOprMenu>
         </div>
 
-        <SessionMenu :sessionId="showMenuSessionId" @selectMenu="onSelectMenu">
+        <SessionMenu
+          :sessionId="showMenuSessionId"
+          @selectMenu="onSelectMenu"
+          @closeMenu="onCloseSessionMenu"
+        >
           <div class="session-list my-scrollbar" ref="sessionListRef">
             <SessionItem
               :ref="(el) => setSessionItemRef(item.sessionId, el)"
diff --git a/src/views/message/components/SessionMenu.vue b/src/views/message/components/SessionMenu.vue
index 844bd0d..4880145 100644
--- a/src/views/message/components/SessionMenu.vue
+++ b/src/views/message/components/SessionMenu.vue
@@ -4,16 +4,24 @@ import { Top, Bottom, MuteNotification, Bell, CircleClose, Edit } from '@element
 import { messageStore } from '@/stores'
 
 const props = defineProps(['sessionId'])
-const emit = defineEmits(['selectMenu'])
+const emit = defineEmits(['selectMenu', 'closeMenu'])
 
 const messageData = messageStore()
 
 const top = computed(() => {
-  return messageData.sessionList[props.sessionId].top
+  if (props.sessionId) {
+    return messageData.sessionList[props.sessionId].top
+  } else {
+    return undefined
+  }
 })
 
 const dnd = computed(() => {
-  return messageData.sessionList[props.sessionId].dnd
+  if (props.sessionId) {
+    return messageData.sessionList[props.sessionId].dnd
+  } else {
+    return undefined
+  }
 })
 
 const menu = computed(() => {
@@ -62,9 +70,13 @@ onUnmounted(() => {
 })
 
 const handleSessionMenu = (e) => {
+  isShowMenu.value = props.sessionId && true
+  if (!isShowMenu.value) {
+    return
+  }
+
   e.preventDefault() //阻止浏览器默认行为
   e.stopPropagation() // 阻止冒泡
-  isShowMenu.value = true
   x.value = e.clientX
   y.value = e.clientY
 
@@ -84,6 +96,7 @@ const handleEscEvent = (event) => {
 
 const closeMenu = () => {
   isShowMenu.value = false
+  emit('closeMenu')
 }
 
 const handleClick = (item) => {