diff --git a/src/components/common/SelectSessionDialog.vue b/src/components/common/SelectSessionDialog.vue index a40519a..0198a13 100644 --- a/src/components/common/SelectSessionDialog.vue +++ b/src/components/common/SelectSessionDialog.vue @@ -10,7 +10,7 @@ import { MsgType } from '@/proto/msg' import { ElMessage } from 'element-plus' const props = defineProps(['isShow', 'sessionListSortedKey']) -const emit = defineEmits(['update:isShow', 'showUserCard', 'showGroupCard', 'confirm']) +const emit = defineEmits(['update:isShow', 'showUserCard', 'showGroupCard', 'confirm', 'close']) const userData = useUserStore() const messageData = useMessageStore() @@ -120,13 +120,15 @@ const onOpen = () => { } const onClose = () => { - emit('update:isShow', false) selected.value = [] optionsFromServer.value = {} + emit('update:isShow', false) + emit('close') } const onCancle = () => { emit('update:isShow', false) + emit('close') } const onClearSelected = () => { diff --git a/src/views/message/MessageLayout.vue b/src/views/message/MessageLayout.vue index d227a4c..4efe09e 100644 --- a/src/views/message/MessageLayout.vue +++ b/src/views/message/MessageLayout.vue @@ -1380,13 +1380,17 @@ const handleConfirmForwardMsg = async (sessions) => { } catch (error) { console.error('forward msg error: ', error) } finally { - isShowForwardMsgDialog.value = false - showForwardMsgDialogTitle.value = '' - handleCancleMultiSelect() + handleCloseForwardMsg() loadingInstance.close() } } +const handleCloseForwardMsg = () => { + isShowForwardMsgDialog.value = false + showForwardMsgDialogTitle.value = '' + handleCancleMultiSelect() +} + const showMenuAddOpr = (e) => { addOprMenuRef.value.handleShowMenu(e) } @@ -1774,6 +1778,7 @@ const onShowRecorder = () => { @showUserCard="onShowUserCard" @showGroupCard="onShowGroupCard" @confirm="handleConfirmForwardMsg" + @close="handleCloseForwardMsg" >