vxe-pc-ui 4.20.32 → 4.20.33

package/dist/all.esm.js

@@ -550,7 +550,7 @@ function checkDynamic() {
 // packages_temp/ui/src/log.ts
 import { VxeUI as VxeUI2 } from "@vxe-ui/core";
 var { log } = VxeUI2;
-var uiVersion = `ui v${"4.20.32"}`;
+var uiVersion = `ui v${"4.20.33"}`;
 function createComponentLog(name) {
   const tableVersion = VxeUI2.tableVersion ? `table v${VxeUI2.tableVersion}` : "";
   const ganttVersion = VxeUI2.ganttVersion ? `gantt v${VxeUI2.ganttVersion}` : "";
@@ -565,7 +565,7 @@ var warnLog = log.create("warn", uiVersion);
 var errLog = log.create("error", uiVersion);
 
 // packages_temp/ui/index.ts
-var version = "4.20.32";
+var version = "4.20.33";
 VxeUI3.uiVersion = version;
 VxeUI3.dynamicApp = dynamicApp;
 function config(options) {
@@ -34374,7 +34374,7 @@ import { VxeUI as VxeUI115 } from "@vxe-ui/core";
 var allActiveModals = [];
 
 // packages_temp/modal/src/modal.ts
-var { getConfig: getConfig45, getIcon: getIcon23, getI18n: getI18n19, globalEvents: globalEvents17, GLOBAL_EVENT_KEYS: GLOBAL_EVENT_KEYS9, createEvent: createEvent49, useFns: useFns38, renderEmptyElement: renderEmptyElement38 } = VxeUI115;
+var { getConfig: getConfig45, getIcon: getIcon23, getI18n: getI18n19, dbUtils, globalEvents: globalEvents17, GLOBAL_EVENT_KEYS: GLOBAL_EVENT_KEYS9, createEvent: createEvent49, useFns: useFns38, renderEmptyElement: renderEmptyElement38 } = VxeUI115;
 var { warnLog: warnLog9, errLog: errLog14 } = createComponentLog("modal");
 function createInternalData16() {
   return {
@@ -34566,6 +34566,10 @@ var modal_default = defineVxeComponent({
       type: Boolean,
       default: () => getConfig45().modal.storage
     },
+    storeDriver: {
+      type: String,
+      default: () => getConfig45().modal.storeDriver
+    },
     storageKey: {
       type: String,
       default: () => getConfig45().modal.storageKey
@@ -34680,7 +34684,9 @@ var modal_default = defineVxeComponent({
       getRefMaps: () => refMaps,
       getComputeMaps: () => computeMaps
     };
-    let modalMethods = {};
+    const posStoreDB = dbUtils.createStore(props.storageKey, {
+      driver: props.storeDriver
+    });
     const getBox = () => {
       const boxElem = refModalBox.value;
       return boxElem;
@@ -34839,44 +34845,37 @@ var modal_default = defineVxeComponent({
         closeModal2(type);
       }
     };
-    const getStorageMap = (key) => {
-      const version2 = getConfig45().version;
-      const rest = XEUtils71.toStringJSON(localStorage.getItem(key) || "");
-      return rest && rest._v === version2 ? rest : { _v: version2 };
+    const getStorageMap = (key, id) => {
+      return posStoreDB.getById(id).then((dbRest) => dbRest ? dbRest.data : "");
     };
-    const hasPosStorage = () => {
-      const { id, storage, storageKey } = props;
-      return !!(id && storage && getStorageMap(storageKey)[id]);
+    const saveStorageMap = (id, posStorage) => {
+      return posStoreDB.updateById(id, posStorage);
     };
-    const restorePosStorage = () => {
-      const { id, storage, storageKey } = props;
-      if (id && storage) {
-        const posStorage = getStorageMap(storageKey)[id];
-        if (posStorage) {
-          const boxElem = getBox();
-          const [left, top, width, height, zoomLeft, zoomTop, zoomWidth, zoomHeight] = posStorage.split(",");
-          if (boxElem) {
-            if (left) {
-              boxElem.style.left = `${left}px`;
-            }
-            if (top) {
-              boxElem.style.top = `${top}px`;
-            }
-            if (width) {
-              boxElem.style.width = `${width}px`;
-            }
-            if (height) {
-              boxElem.style.height = `${height}px`;
-            }
+    const restorePosStorage = (posStorage) => {
+      if (posStorage) {
+        const boxElem = getBox();
+        const [left, top, width, height, zoomLeft, zoomTop, zoomWidth, zoomHeight] = posStorage.split(",");
+        if (boxElem) {
+          if (left) {
+            boxElem.style.left = `${left}px`;
           }
-          if (zoomLeft && zoomTop) {
-            reactData.revertLocat = {
-              left: zoomLeft,
-              top: zoomTop,
-              width: zoomWidth,
-              height: zoomHeight
-            };
+          if (top) {
+            boxElem.style.top = `${top}px`;
+          }
+          if (width) {
+            boxElem.style.width = `${width}px`;
           }
+          if (height) {
+            boxElem.style.height = `${height}px`;
+          }
+        }
+        if (zoomLeft && zoomTop) {
+          reactData.revertLocat = {
+            left: XEUtils71.toNumber(zoomLeft),
+            top: XEUtils71.toNumber(zoomTop),
+            width: XEUtils71.toNumber(zoomWidth),
+            height: XEUtils71.toNumber(zoomHeight)
+          };
         }
       }
     };
@@ -34889,7 +34888,7 @@ var modal_default = defineVxeComponent({
       updateStyle();
     };
     const savePosStorage = () => {
-      const { id, storage, storageKey } = props;
+      const { id, storage } = props;
       const { zoomStatus, revertLocat } = reactData;
       if (zoomStatus) {
         return;
@@ -34899,9 +34898,19 @@ var modal_default = defineVxeComponent({
         if (!boxElem) {
           return;
         }
-        const posStorageMap = getStorageMap(storageKey);
-        posStorageMap[id] = [boxElem.style.left, boxElem.style.top, boxElem.clientWidth, boxElem.clientHeight].concat(revertLocat ? [revertLocat.left, revertLocat.top, revertLocat.width, revertLocat.height] : []).map((val) => val ? XEUtils71.toNumber(val) : "").join(",");
-        localStorage.setItem(storageKey, XEUtils71.toJSONString(posStorageMap));
+        const posStorage = [
+          boxElem.style.left,
+          boxElem.style.top,
+          boxElem.clientWidth,
+          boxElem.clientHeight,
+          ...revertLocat ? [
+            revertLocat.left,
+            revertLocat.top,
+            revertLocat.width,
+            revertLocat.height
+          ] : []
+        ].map((val) => val ? XEUtils71.toNumber(val) : "").join(",");
+        saveStorageMap(id, posStorage);
       }
     };
     const handleMinimize = () => {
@@ -35085,7 +35094,7 @@ var modal_default = defineVxeComponent({
       }
     };
     const openModal2 = () => {
-      const { remember, showFooter, fullscreen } = props;
+      const { storageKey, id, remember, showFooter, fullscreen } = props;
       const { initialized, visible } = reactData;
       const isMsg = computeIsMsg.value;
       const isModal = computeIsModal.value;
@@ -35131,8 +35140,21 @@ var modal_default = defineVxeComponent({
             }
             if (firstOpen) {
               reactData.firstOpen = false;
-              if (hasPosStorage()) {
-                restorePosStorage();
+              if (storageKey && id) {
+                getStorageMap(storageKey, id).then((posStorage) => {
+                  if (posStorage) {
+                    restorePosStorage(posStorage);
+                  } else {
+                    if (isModal && fullscreen) {
+                      nextTick22(() => handleMaximize());
+                    } else {
+                      recalculate();
+                      updatePosition().then(() => {
+                        setTimeout(() => updatePosition(), 20);
+                      });
+                    }
+                  }
+                });
               } else {
                 if (isModal && fullscreen) {
                   nextTick22(() => handleMaximize());
@@ -35536,7 +35558,7 @@ var modal_default = defineVxeComponent({
     const emitModel = (value) => {
       emit("update:modelValue", value);
     };
-    modalMethods = {
+    const modalMethods = {
       dispatchEvent,
       open: openModal2,
       close() {