tanxin-ui 1.0.4 → 1.0.6

package/dist/tanxin-ui.es.js

@@ -16403,15 +16403,28 @@ function getModalLevelCount(vm) {
 }
 const zIndex = ref(0);
 const fromIndex = 2e3;
-const useZIndex = () => {
+const closingTag = ref(false);
+const useModal = () => {
   const currentZIndex = computed(() => fromIndex + zIndex.value);
   const nextZIndex = () => {
     zIndex.value++;
     return currentZIndex.value;
   };
+  const addClosingTag = () => {
+    closingTag.value = true;
+  };
+  const removeClosingTag = () => {
+    closingTag.value = false;
+  };
+  const existsClosingTag = () => {
+    return closingTag.value;
+  };
   return {
     currentZIndex,
-    nextZIndex
+    nextZIndex,
+    addClosingTag,
+    removeClosingTag,
+    existsClosingTag
   };
 };
 function _isSlot$f(s2) {
@@ -16543,6 +16556,7 @@ var Modal = defineComponent({
       loading.value = props.loading;
     });
     const modalLevel = ref(0);
+    const modal = useModal();
     watch(() => visible.value, () => {
       if (!isClient)
         return;
@@ -16582,16 +16596,17 @@ var Modal = defineComponent({
       };
     };
     const handleClose2 = () => {
+      if (modal.existsClosingTag())
+        return;
+      modal.addClosingTag();
       visible.value = false;
       emit("update:visible", false);
+      setTimeout(() => modal.removeClosingTag(), 10);
     };
     const handleKeyup = (event) => {
       if (event.code == "Escape") {
-        console.log(`modal modalLevel.value = ${modalLevel.value}, getModalLevelCount(vm) - 1=${getModalLevelCount(vm) - 1}`);
-        if (modalLevel.value == getModalLevelCount(vm) - 1)
-          setTimeout(() => {
-            handleClose2();
-          }, 10);
+        if (visible.value && modalLevel.value == getModalLevelCount(vm) - 1)
+          handleClose2();
       }
     };
     const mouseMoving = ref(false);
@@ -16680,7 +16695,7 @@ var Modal = defineComponent({
     onBeforeMount(() => {
       if (!isClient)
         return;
-      zIndex2.value = useZIndex().nextZIndex();
+      zIndex2.value = modal.nextZIndex();
     });
     onMounted(() => {
       if (!isClient)
@@ -17240,6 +17255,7 @@ var Drawer = defineComponent({
     });
     const vm = getCurrentInstance();
     const modalLevel = ref(0);
+    const modal = useModal();
     watch(() => visible.value, () => {
       if (!visible.value)
         loading.value = false;
@@ -17264,22 +17280,24 @@ var Drawer = defineComponent({
       }
     };
     const handleClose2 = () => {
+      if (modal.existsClosingTag())
+        return;
+      modal.addClosingTag();
       visible.value = false;
       emit("update:visible", false);
+      setTimeout(() => modal.removeClosingTag(), 10);
     };
     const handleKeyup = (event) => {
       if (event.code == "Escape") {
-        if (modalLevel.value == getModalLevelCount(vm) - 1)
-          setTimeout(() => {
-            handleClose2();
-          }, 10);
+        if (visible.value && modalLevel.value == getModalLevelCount(vm) - 1)
+          handleClose2();
       }
     };
     const dialogPosition = ref();
     onBeforeMount(() => {
       if (!isClient)
         return;
-      zIndex2.value = useZIndex().nextZIndex();
+      zIndex2.value = modal.nextZIndex();
     });
     onMounted(() => {
       if (!isClient)
@@ -21361,6 +21379,7 @@ var ImagePreview = defineComponent({
     });
     const vm = getCurrentInstance();
     const modalLevel = ref(0);
+    const modal = useModal();
     const zIndex2 = ref(0);
     const topStyles = computed(() => {
       return {
@@ -21379,17 +21398,18 @@ var ImagePreview = defineComponent({
         removeEventListener();
     });
     const handleClose2 = () => {
+      if (modal.existsClosingTag())
+        return;
+      modal.addClosingTag();
       visible.value = false;
       emit("update:visible", false);
+      setTimeout(() => modal.removeClosingTag(), 200);
     };
     const handleKeydown = (event) => {
       switch (event.code) {
         case "Escape":
-          console.log(`preview modalLevel.value = ${modalLevel.value}, getModalLevelCount(vm) - 1=${getModalLevelCount(vm) - 1}`);
-          if (modalLevel.value == getModalLevelCount(vm) - 1)
-            setTimeout(() => {
-              handleClose2();
-            }, 10);
+          if (visible.value && modalLevel.value == getModalLevelCount(vm) - 1)
+            handleClose2();
           break;
         case "ArrowDown":
           handleScale(event, -1);
@@ -21511,7 +21531,7 @@ var ImagePreview = defineComponent({
     onBeforeMount(() => {
       if (!isClient)
         return;
-      zIndex2.value = useZIndex().nextZIndex();
+      zIndex2.value = modal.nextZIndex();
     });
     const render = () => {
       const maskTransitionProps = getTransitionGroupProps("fade");