bichangxiong/ruoyi-plus-vben5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: when multiple pop-ups exist at the same time, clicking will close all (#4548)

Browse Source
This commit is contained in:
Vben
2024-09-29 22:15:43 +08:00
committed by GitHub
parent d1e1256202
commit 3572ce1538
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/@core/ui-kit/popup-ui/src/modal/modal.vue
View File

@@ -1,7 +1,7 @@
<script lang="ts" setup>
import type { ExtendedModalApi, ModalProps } from './modal';
import { computed, nextTick, ref, watch } from 'vue';
import { computed, nextTick, provide, ref, useId, watch } from 'vue';
import {
useIsMobile,
@@ -40,6 +40,10 @@ const dialogRef = ref();
const headerRef = ref();
const footerRef = ref();
const id = useId();
provide('DISMISSABLE_MODAL_ID', id);
const { $t } = useSimpleLocale();
const { isMobile } = useIsMobile();
const state = props.modalApi?.useStore?.();
@@ -141,8 +145,8 @@ function handerOpenAutoFocus(e: Event) {
// pointer-down-outside
function pointerDownOutside(e: Event) {
const target = e.target as HTMLElement;
const isDismissableModal = !!target?.dataset.dismissableModal;
if (!closeOnClickModal.value || !isDismissableModal) {
const isDismissableModal = target?.dataset.dismissableModal;
if (!closeOnClickModal.value || isDismissableModal !== id) {
e.preventDefault();
e.stopPropagation();
}