@utogether/utils 3.0.0-beta.27 → 3.0.0-beta.28

package/dist/utils.es.js

@@ -1,9 +1,9 @@
 var T = Object.defineProperty;
 var U = (a, l, o) => l in a ? T(a, l, { enumerable: !0, configurable: !0, writable: !0, value: o }) : a[l] = o;
-var k = (a, l, o) => U(a, typeof l != "symbol" ? l + "" : l, o);
+var S = (a, l, o) => U(a, typeof l != "symbol" ? l + "" : l, o);
 import { createVNode, resolveComponent, mergeProps, isVNode, ref, shallowRef, unref, getCurrentInstance, onBeforeUnmount, reactive, watchEffect, isRef } from "vue";
 import dayjs from "dayjs";
-import XEUtils, { isArray, findTree, isEmpty, isObject, isPlainObject, isUndefined, isFunction, isString, clone, has } from "xe-utils";
+import XEUtils, { isArray, findTree, isEmpty, isObject, isPlainObject, isUndefined, isFunction, isString, clone, merge, has } from "xe-utils";
 import localforage from "localforage";
 import ResizeObserver from "resize-observer-polyfill";
 import { VxeUI } from "vxe-pc-ui";
@@ -12,9 +12,9 @@ import NProgress from "nprogress";
 import { default as W } from "nprogress";
 class sessionStorageProxy {
   constructor(l) {
-    k(this, "storage");
-    k(this, "prefix");
-    k(this, "addPrefix", (l) => {
+    S(this, "storage");
+    S(this, "prefix");
+    S(this, "addPrefix", (l) => {
       this.prefix = l;
     });
     this.storage = l;
@@ -46,7 +46,7 @@ class localStorageProxy extends sessionStorageProxy {
 }
 class localforageProxy {
   constructor() {
-    k(this, "storage");
+    S(this, "storage");
     localforage.config({
       name: "uapp",
       storeName: "udb"
@@ -140,8 +140,8 @@ function init(a, l) {
 init({ read: DEFAULT_CODEC.decodeValue, write: DEFAULT_CODEC.encodeValue }, DEFAULT_ATTRIBUTES);
 class Cookies {
   constructor() {
-    k(this, "prefix", null);
-    k(this, "addPrefix", (l) => {
+    S(this, "prefix", null);
+    S(this, "addPrefix", (l) => {
       this.prefix = l;
     });
   }
@@ -201,25 +201,25 @@ const VxetableRender = (VXETable, {
         optionProps: Z = {},
         events: e
       } = a, {
-        label: v = "label",
+        label: t = "label",
         value: d = "value"
       } = Z, {
-        loading: m = !1,
-        multiple: V,
+        loading: f = !1,
+        multiple: m,
         mapField: u
-      } = i, H = useComponent(), p = V ? `_${r.field}` : r.field;
+      } = i, H = useComponent(), p = m ? `_${r.field}` : r.field;
       H.setDefaultValue(i, h, r.field);
-      function n(f) {
-        H.remote(f, r.field, a);
+      function n(V) {
+        H.remote(V, r.field, a);
       }
-      function y(f) {
-        H.selectChange(f, h, r.field, a, {
+      function y(V) {
+        H.selectChange(V, h, r.field, a, {
           column: r,
           datasource: "row"
         });
       }
-      function C(f) {
-        e != null && e.input && e.input(l, f);
+      function C(V) {
+        e != null && e.input && e.input(l, V);
       }
       function A() {
         H.clear(h, r.field, u, e, "row");
@@ -229,23 +229,23 @@ const VxetableRender = (VXETable, {
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[p],
-        "onUpdate:modelValue": (f) => h[p] = f,
+        "onUpdate:modelValue": (V) => h[p] = V,
         filterable: !0,
         remote: !0,
         clearable: !0,
         placeholder: "请录入关键字搜索",
         style: "width: 100%",
         "remote-method": n,
-        loading: m
+        loading: f
       }, i, {
         onFocus: () => w(),
-        onChange: (f) => y(f),
+        onChange: (V) => y(V),
         onClear: () => A(),
-        onInput: (f) => C(f)
-      }), _isSlot(o = c.map((f) => createVNode(resolveComponent("el-option"), {
-        key: f[d],
-        label: f[v],
-        value: f[d]
+        onInput: (V) => C(V)
+      }), _isSlot(o = c.map((V) => createVNode(resolveComponent("el-option"), {
+        key: V[d],
+        label: V[t],
+        value: V[d]
       }, null))) ? o : {
         default: () => [o]
       })];
@@ -261,25 +261,25 @@ const VxetableRender = (VXETable, {
         optionProps: Z = {},
         events: e
       } = a, {
-        label: v = "label",
+        label: t = "label",
         value: d = "value"
       } = Z, {
-        loading: m = !1,
-        multiple: V,
+        loading: f = !1,
+        multiple: m,
         mapField: u
-      } = i, H = useComponent(), p = V ? `_${r.field}` : r.field;
+      } = i, H = useComponent(), p = m ? `_${r.field}` : r.field;
       H.setDefaultValue(i, h, r.field);
-      function n(f) {
-        H.remote(f, r.field, a);
+      function n(V) {
+        H.remote(V, r.field, a);
       }
-      function y(f) {
-        H.selectChange(f, h, r.field, a, {
+      function y(V) {
+        H.selectChange(V, h, r.field, a, {
           column: r,
           datasource: "row"
         });
       }
-      function C(f) {
-        e != null && e.input && e.input(l, f);
+      function C(V) {
+        e != null && e.input && e.input(l, V);
       }
       function A() {
         H.clear(h, r.field, u, e, "row");
@@ -289,23 +289,23 @@ const VxetableRender = (VXETable, {
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[p],
-        "onUpdate:modelValue": (f) => h[p] = f,
+        "onUpdate:modelValue": (V) => h[p] = V,
         filterable: !0,
         remote: !0,
         clearable: !0,
         placeholder: "请录入关键字搜索",
         style: "width: 100%",
         "remote-method": n,
-        loading: m
+        loading: f
       }, i, {
         onFocus: () => w(),
-        onChange: (f) => y(f),
+        onChange: (V) => y(V),
         onClear: () => A(),
-        onInput: (f) => C(f)
-      }), _isSlot(o = c.map((f) => createVNode(resolveComponent("el-option"), {
-        key: f[d],
-        label: f[v],
-        value: f[d]
+        onInput: (V) => C(V)
+      }), _isSlot(o = c.map((V) => createVNode(resolveComponent("el-option"), {
+        key: V[d],
+        label: V[t],
+        value: V[d]
       }, null))) ? o : {
         default: () => [o]
       })];
@@ -335,34 +335,34 @@ const VxetableRender = (VXETable, {
         optionProps: Z = {},
         events: e
       } = a, {
-        label: v = "label",
+        label: t = "label",
         value: d = "value"
       } = Z, {
-        mapField: m,
-        multiple: V,
+        mapField: f,
+        multiple: m,
         loading: u = !1
-      } = i, H = useComponent(), p = V ? `_${r}` : r;
+      } = i, H = useComponent(), p = m ? `_${r}` : r;
       H.setDefaultValue(i, h, r);
-      async function n(f) {
-        H.remote(f, r, a);
+      async function n(V) {
+        H.remote(V, r, a);
       }
-      function y(f) {
-        H.selectChange(f, h, r, a, {
+      function y(V) {
+        H.selectChange(V, h, r, a, {
           datasource: "data"
         });
       }
-      function C(f) {
-        e != null && e.input && e.input(l, f);
+      function C(V) {
+        e != null && e.input && e.input(l, V);
       }
       function A() {
-        H.clear(h, r, m, e, "data");
+        H.clear(h, r, f, e, "data");
       }
       function w() {
         !c.length && n(""), e != null && e.focus && e.focus(l);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[p],
-        "onUpdate:modelValue": (f) => h[p] = f,
+        "onUpdate:modelValue": (V) => h[p] = V,
         filterable: !0,
         remote: !0,
         clearable: !0,
@@ -372,13 +372,13 @@ const VxetableRender = (VXETable, {
         "remote-method": n
       }, i, {
         onFocus: () => w(),
-        onChange: (f) => y(f),
+        onChange: (V) => y(V),
         onClear: () => A(),
         onInput: () => C()
-      }), _isSlot(o = c.map((f) => createVNode(resolveComponent("el-option"), {
-        key: f[d],
-        label: f[v],
-        value: f[d]
+      }), _isSlot(o = c.map((V) => createVNode(resolveComponent("el-option"), {
+        key: V[d],
+        label: V[t],
+        value: V[d]
       }, null))) ? o : {
         default: () => [o]
       })];
@@ -413,7 +413,7 @@ const VxetableRender = (VXETable, {
       }, {
         text: i18n("message.udp.anniversary", !0),
         value: () => [Z(1, "year"), c]
-      }], Z = (e, v) => dayjs().subtract(e, v).add("1", "day").format();
+      }], Z = (e, t) => dayjs().subtract(e, t).add("1", "day").format();
       return [createVNode(resolveComponent("el-date-picker"), mergeProps({
         modelValue: o[h],
         "onUpdate:modelValue": (e) => o[h] = e,
@@ -437,16 +437,16 @@ const VxetableRender = (VXETable, {
         optionProps: Z = {},
         events: e
       } = a, {
-        label: v = "label",
+        label: t = "label",
         value: d = "value",
-        extLabel: m
+        extLabel: f
       } = Z, {
-        mapField: V
+        mapField: m
       } = i, u = useComponent();
       i.multiple && h[r.field] && !isArray(h[r.field]) && h[r.field].split(",").forEach((n) => {
-        !c.some((C) => C[v] === n) && c.push({
+        !c.some((C) => C[t] === n) && c.push({
           [d]: n,
-          [v]: n
+          [t]: n
         });
       });
       function H(n) {
@@ -456,7 +456,7 @@ const VxetableRender = (VXETable, {
         });
       }
       function p() {
-        u.clear(h, r.field, V, e, "row");
+        u.clear(h, r.field, m, e, "row");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[r.field],
@@ -469,7 +469,7 @@ const VxetableRender = (VXETable, {
         onClear: () => p()
       }), _isSlot(o = c.map((n) => createVNode(resolveComponent("el-option"), {
         key: n[d],
-        label: m && n[m] ? n[d] : n[v],
+        label: f && n[f] ? n[d] : n[t],
         value: n[d]
       }, null))) ? o : {
         default: () => [o]
@@ -486,16 +486,16 @@ const VxetableRender = (VXETable, {
         optionProps: Z = {},
         events: e
       } = a, {
-        label: v = "label",
+        label: t = "label",
         value: d = "value",
-        extLabel: m
+        extLabel: f
       } = Z, {
-        mapField: V
+        mapField: m
       } = i, u = useComponent();
       i.multiple && h[r.field] && !isArray(h[r.field]) && h[r.field].split(",").forEach((n) => {
-        !c.some((C) => C[v] === n) && c.push({
+        !c.some((C) => C[t] === n) && c.push({
           [d]: n,
-          [v]: n
+          [t]: n
         });
       });
       function H(n) {
@@ -505,7 +505,7 @@ const VxetableRender = (VXETable, {
         });
       }
       function p() {
-        u.clear(h, r.field, V, e, "row");
+        u.clear(h, r.field, m, e, "row");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[r.field],
@@ -518,7 +518,7 @@ const VxetableRender = (VXETable, {
         onClear: () => p()
       }), _isSlot(o = c.map((n) => createVNode(resolveComponent("el-option"), {
         key: n[d],
-        label: m && n[m] ? n[d] : n[v],
+        label: f && n[f] ? n[d] : n[t],
         value: n[d]
       }, null))) ? o : {
         default: () => [o]
@@ -555,20 +555,20 @@ const VxetableRender = (VXETable, {
         optionProps: Z = {},
         events: e
       } = a, {
-        label: v = "label",
+        label: t = "label",
         value: d = "value"
-      } = Z, m = useComponent(), {
-        defaultValues: V,
+      } = Z, f = useComponent(), {
+        defaultValues: m,
         mapField: u
       } = i;
-      V && (h[r] = V);
+      m && (h[r] = m);
       function H(n) {
-        m.selectChange(n, h, r, a, {
+        f.selectChange(n, h, r, a, {
           datasource: "data"
         });
       }
       function p() {
-        m.clear(h, r, u, e, "data");
+        f.clear(h, r, u, e, "data");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[r],
@@ -581,7 +581,7 @@ const VxetableRender = (VXETable, {
         onClear: () => p()
       }), _isSlot(o = c.map((n) => createVNode(resolveComponent("el-option"), {
         key: n[d],
-        label: n[v],
+        label: n[t],
         value: n[d]
       }, null))) ? o : {
         default: () => [o]
@@ -600,7 +600,7 @@ const VxetableRender = (VXETable, {
         mapField: e
       } = r;
       Z && (o[h] = Z);
-      function v(m, V) {
+      function t(f, m) {
         const {
           mapField: u,
           field: H,
@@ -610,24 +610,23 @@ const VxetableRender = (VXETable, {
         if (n) {
           if (n) {
             const C = {};
-            o[p || H] = m.reduce((A, w) => {
-              for (const f in u)
-                C[f] = A ? C[f] + "," + w[u[f]] : w[u[f]];
+            o[p || H] = f.reduce((A, w) => {
+              for (const V in u)
+                C[V] = A ? C[V] + "," + w[u[V]] : w[u[V]];
               return A = A ? A + "," + w[p || H] : w[p || H], A;
             }, ""), Object.assign(o, C);
           }
         } else {
           const C = {
-            [p || H]: m[V || p || H]
+            [p || H]: f[m || p || H]
           };
           for (const A in u)
-            C[A] = m[u[A]];
+            C[A] = f[u[A]];
           Object.assign(o, C);
         }
         const y = {
-          row: o,
-          property: H,
-          item: m,
+          data: o,
+          options: f,
           field: H
         };
         c != null && c.change && c.change(y);
@@ -639,7 +638,7 @@ const VxetableRender = (VXETable, {
         record: o
       }, r, {
         mode: "vxe",
-        onChange: (m, V) => v(m, V),
+        onChange: (f, m) => t(f, m),
         onClear: () => d()
       }), null)];
     },
@@ -652,22 +651,27 @@ const VxetableRender = (VXETable, {
         props: r,
         events: c
       } = a, i = useComponent();
-      function Z(v, d) {
+      function Z(t, d) {
         const {
-          mapField: m,
-          field: V,
+          mapField: f,
+          field: m,
           displayName: u,
           multiple: H
         } = r;
         if (!H) {
-          const p = {
-            [u || V]: v[d || u || V]
+          const n = {
+            [u || m]: t[d || u || m]
           };
-          for (const n in m)
-            p[n] = v[m[n]];
-          Object.assign(o, p);
+          for (const y in f)
+            n[y] = t[f[y]];
+          Object.assign(o, n);
         }
-        c != null && c.change && c.change(l, v, o[h.field]);
+        const p = {
+          row: o,
+          options: t,
+          field: h.field
+        };
+        c != null && c.change && c.change(p);
       }
       function e() {
         i.clear(o, h.field, mapField, c, "row");
@@ -677,7 +681,7 @@ const VxetableRender = (VXETable, {
         mode: "vxe",
         transfer: !0
       }, r, {
-        onChange: (v, d) => Z(v, d),
+        onChange: (t, d) => Z(t, d),
         onClear: () => e()
       }), null)];
     },
@@ -690,22 +694,27 @@ const VxetableRender = (VXETable, {
         props: r,
         events: c
       } = a, i = useComponent();
-      function Z(v, d) {
+      function Z(t, d) {
         const {
-          mapField: m,
-          field: V,
+          mapField: f,
+          field: m,
           displayName: u,
           multiple: H
         } = r;
         if (!H) {
-          const p = {
-            [u || V]: v[d || u || V]
+          const n = {
+            [u || m]: t[d || u || m]
           };
-          for (const n in m)
-            p[n] = v[m[n]];
-          Object.assign(o, p);
+          for (const y in f)
+            n[y] = t[f[y]];
+          Object.assign(o, n);
         }
-        c != null && c.change && c.change(l, v, o[h.field]);
+        const p = {
+          row: o,
+          options: t,
+          field: h.field
+        };
+        c != null && c.change && c.change(p);
       }
       function e() {
         i.clear(o, h.field, mapField, c, "row");
@@ -714,7 +723,7 @@ const VxetableRender = (VXETable, {
         record: o,
         mode: "ele"
       }, r, {
-        onChange: (v, d) => Z(v, d),
+        onChange: (t, d) => Z(t, d),
         onClear: () => e()
       }), null)];
     },
@@ -781,24 +790,24 @@ const VxetableRender = (VXETable, {
         },
         events: Z
       } = a;
-      function e(v) {
+      function e(t) {
         const d = {
           row: o,
           column: h,
-          value: v
+          value: t
         };
         Z != null && Z.change && Z.change(d);
       }
       return [o[h.field] ? createVNode(resolveComponent("el-switch"), mergeProps({
         modelValue: o[h.field],
-        "onUpdate:modelValue": (v) => o[h.field] = v,
+        "onUpdate:modelValue": (t) => o[h.field] = t,
         "inline-prompt": !0,
         size: "large",
         style: "--el-switch-on-color: #13ce66; --el-switch-off-color: #E6A23C"
       }, a.props, {
         "active-text": getValue(r, c),
         "inactive-text": getValue(r, i),
-        onChange: (v) => e(v)
+        onChange: (t) => e(t)
       }), null) : null];
     }
   }), VXETable.renderer.add("#iconSelect", {
@@ -851,8 +860,8 @@ const VxetableRender = (VXETable, {
         "check-strictly": !0
       }, r, {
         filterable: !0,
-        onCheckChange: (Z, e, v) => onCheckChange(Z, e, v, i),
-        onNodeClick: (Z, e, v) => onNodeClick(Z, e, v, i),
+        onCheckChange: (Z, e, t) => onCheckChange(Z, e, t, i),
+        onNodeClick: (Z, e, t) => onNodeClick(Z, e, t, i),
         onCurrentChange: (Z, e) => onCurrentChange(Z, e, i)
       }), null)];
     },
@@ -866,7 +875,7 @@ const VxetableRender = (VXETable, {
       } = a, {
         children: i = "children",
         label: Z = "label"
-      } = c, e = findTree(r, (v) => v.value === o[h.field], {
+      } = c, e = findTree(r, (t) => t.value === o[h.field], {
         children: i
       });
       return e ? [createVNode("span", null, [e.item[Z]])] : null;
@@ -887,8 +896,8 @@ const VxetableRender = (VXETable, {
         "check-strictly": !0
       }, r, {
         filterable: !0,
-        onCheckChange: (Z, e, v) => onCheckChange(Z, e, v, i),
-        onNodeClick: (Z, e, v) => onNodeClick(Z, e, v, i),
+        onCheckChange: (Z, e, t) => onCheckChange(Z, e, t, i),
+        onNodeClick: (Z, e, t) => onNodeClick(Z, e, t, i),
         onCurrentChange: (Z, e) => onCurrentChange(Z, e, i)
       }), null)];
     }
@@ -896,8 +905,8 @@ const VxetableRender = (VXETable, {
   const useComponent = () => ({
     clear: (r, c, i, Z, e) => {
       if (r[c] = null, !isEmpty(i))
-        for (const v in i)
-          r[v] = null;
+        for (const t in i)
+          r[t] = null;
       Z != null && Z.clear && Z.clear({
         [e]: r,
         field: c
@@ -907,53 +916,53 @@ const VxetableRender = (VXETable, {
       const {
         options: Z,
         props: e,
-        events: v
+        events: t
       } = i, {
         fetchField: d,
-        url: m,
-        defaultParams: V = {},
+        url: f,
+        defaultParams: m = {},
         method: u = "get"
       } = e, H = getCookieParam(), p = Object.assign({
         pageSize: 20,
         pageNum: 1,
         ...H,
-        ...V
+        ...m
       }, {
         [d || c]: r
       });
       if (e.loading) return;
       let n;
       try {
-        Z.length = 0, e.loading = !0, n = await serviceApi[u](m, p), v != null && v.filterMethod ? Z.push(...v.filterMethod(n.list || n)) : n && (n.list ? Z.push(...n.list) : Z.push(...n));
+        Z.length = 0, e.loading = !0, n = await serviceApi[u](f, p), t != null && t.filterMethod ? Z.push(...t.filterMethod(n.list || n)) : n && (n.list ? Z.push(...n.list) : Z.push(...n));
       } finally {
         e.loading = !1;
       }
     },
     selectChange: (r, c, i, Z, e) => {
-      let v = null;
+      let t = null;
       const {
         datasource: d
       } = e, {
-        options: m,
-        props: V,
+        options: f,
+        props: m,
         optionProps: u = {},
         events: H
       } = Z, p = {
         [d]: c,
         field: i
       };
-      c[i] = null, !isEmpty(r) && (V != null && V.multiple) ? (c[i] = r.join(","), v = [], r.forEach((n) => {
-        const y = m.find((C) => n === C[u == null ? void 0 : u.value]);
-        y && !isEmpty(V.mapField) && isObject(V.mapField) && Object.keys(V.mapField).forEach((C) => {
-          const A = y[V.mapField[C]], w = c[C] ? c[C].toString() : "";
+      c[i] = null, !isEmpty(r) && (m != null && m.multiple) ? (c[i] = r.join(","), t = [], r.forEach((n) => {
+        const y = f.find((C) => n === C[u == null ? void 0 : u.value]);
+        y && !isEmpty(m.mapField) && isObject(m.mapField) && Object.keys(m.mapField).forEach((C) => {
+          const A = y[m.mapField[C]], w = c[C] ? c[C].toString() : "";
           c[C] = w && !w.includes(A) ? `${w},${A}` : A;
-        }), y && v.push(y);
+        }), y && t.push(y);
       }), Object.assign(p, {
-        options: v
-      })) : (c[i] = V != null && V.multiple ? null : r, v = m.find((n) => r === n[u == null ? void 0 : u.value]), !isEmpty(V.mapField) && isObject(V.mapField) && Object.keys(V.mapField).forEach((n) => {
-        c[n] = v ? v[V.mapField[n]] : null;
+        options: t
+      })) : (c[i] = m != null && m.multiple ? null : r, t = f.find((n) => r === n[u == null ? void 0 : u.value]), !isEmpty(m.mapField) && isObject(m.mapField) && Object.keys(m.mapField).forEach((n) => {
+        c[n] = t ? t[m.mapField[n]] : null;
       }), Object.assign(p, {
-        option: v
+        option: t
       })), d === "row" && Object.assign(p, {
         column: e.column
       }), H != null && H.change && H.change(p);
@@ -963,10 +972,10 @@ const VxetableRender = (VXETable, {
       const {
         multiple: Z,
         defaultValue: e
-      } = r, v = Z ? `_${i}` : i;
-      !c[i] && e && (c[i] = e, isPlainObject(e) && Object.keys(e).forEach((V) => {
-        c[V] = c[V] || e[V];
-      })), !c[v] && c[i] && (c[v] = Z ? (d = c[i]) == null ? void 0 : d.split(",") : c[i]);
+      } = r, t = Z ? `_${i}` : i;
+      !c[i] && e && (c[i] = e, isPlainObject(e) && Object.keys(e).forEach((m) => {
+        c[m] = c[m] || e[m];
+      })), !c[t] && c[i] && (c[t] = Z ? (d = c[i]) == null ? void 0 : d.split(",") : c[i]);
     }
   }), onCheckChange = (a, l, o, h) => {
     console.log(a, l, o), h != null && h.checkChange && (h == null || h.checkChange(a, l, o));
@@ -1031,41 +1040,41 @@ const openLink = (a) => {
 }, domSymbol = Symbol("watermark-dom");
 function useWatermark(a = ref(document.body)) {
   const l = useRafThrottle(function() {
-    const v = unref(a);
-    if (!v) return;
-    const { clientHeight: d, clientWidth: m } = v;
-    i({ height: d, width: m });
+    const t = unref(a);
+    if (!t) return;
+    const { clientHeight: d, clientWidth: f } = t;
+    i({ height: d, width: f });
   }), o = domSymbol.toString(), h = shallowRef(), r = () => {
-    const v = unref(h);
+    const t = unref(h);
     h.value = void 0;
     const d = unref(a);
-    d && (v && d.removeChild(v), removeResizeListener(d, l));
+    d && (t && d.removeChild(t), removeResizeListener(d, l));
   };
-  function c(v, d) {
-    const m = document.createElement("canvas"), V = 260, u = 180;
-    Object.assign(m, { width: V, height: u });
-    const H = m.getContext("2d");
-    return H && (H.rotate(-20 * Math.PI / 120), H.font = (d == null ? void 0 : d.font) ?? "15px Reggae One", H.fillStyle = (d == null ? void 0 : d.fillStyle) ?? "rgba(180, 180, 180, 0.75)", H.textAlign = "left", H.textBaseline = "middle", H.fillText(v, V / 20, u)), m.toDataURL("image/png");
+  function c(t, d) {
+    const f = document.createElement("canvas"), m = 260, u = 180;
+    Object.assign(f, { width: m, height: u });
+    const H = f.getContext("2d");
+    return H && (H.rotate(-20 * Math.PI / 120), H.font = (d == null ? void 0 : d.font) ?? "15px Reggae One", H.fillStyle = (d == null ? void 0 : d.fillStyle) ?? "rgba(180, 180, 180, 0.75)", H.textAlign = "left", H.textBaseline = "middle", H.fillText(t, m / 20, u)), f.toDataURL("image/png");
   }
-  function i(v = {}) {
+  function i(t = {}) {
     const d = unref(h);
-    d && (isUndefined(v.width) || (d.style.width = `${v.width}px`), isUndefined(v.height) || (d.style.height = `${v.height}px`), isUndefined(v.str) || (d.style.background = `url(${c(
-      v.str,
-      v.attr
+    d && (isUndefined(t.width) || (d.style.width = `${t.width}px`), isUndefined(t.height) || (d.style.height = `${t.height}px`), isUndefined(t.str) || (d.style.background = `url(${c(
+      t.str,
+      t.attr
     )}) left top repeat`));
   }
-  const Z = (v, d) => {
+  const Z = (t, d) => {
     if (unref(h))
-      return i({ str: v, attr: d }), o;
-    const m = document.createElement("div");
-    h.value = m, m.id = o, m.style.pointerEvents = "none", m.style.top = "0px", m.style.left = "0px", m.style.position = "absolute", m.style.zIndex = "100000";
-    const V = unref(a);
-    if (!V) return o;
-    const { clientHeight: u, clientWidth: H } = V;
-    return i({ str: v, width: H, height: u, attr: d }), V.appendChild(m), o;
+      return i({ str: t, attr: d }), o;
+    const f = document.createElement("div");
+    h.value = f, f.id = o, f.style.pointerEvents = "none", f.style.top = "0px", f.style.left = "0px", f.style.position = "absolute", f.style.zIndex = "100000";
+    const m = unref(a);
+    if (!m) return o;
+    const { clientHeight: u, clientWidth: H } = m;
+    return i({ str: t, width: H, height: u, attr: d }), m.appendChild(f), o;
   };
-  function e(v, d) {
-    Z(v, d), addResizeListener(document.documentElement, l), getCurrentInstance() && onBeforeUnmount(() => {
+  function e(t, d) {
+    Z(t, d), addResizeListener(document.documentElement, l), getCurrentInstance() && onBeforeUnmount(() => {
       r();
     });
   }
@@ -1080,182 +1089,189 @@ function useAttrs(a = {}) {
   if (!l) return {};
   const { excludeListeners: o = !1, excludeKeys: h = [] } = a, r = shallowRef({}), c = h.concat(DEFAULT_EXCLUDE_KEYS);
   return l.attrs = reactive(l.attrs), watchEffect(() => {
-    const i = entries(l.attrs).reduce((Z, [e, v]) => (!c.includes(e) && !(o && LISTENER_PREFIX.test(e)) && (Z[e] = v), Z), {});
+    const i = entries(l.attrs).reduce((Z, [e, t]) => (!c.includes(e) && !(o && LISTENER_PREFIX.test(e)) && (Z[e] = t), Z), {});
     r.value = i;
   }), r;
 }
 const useRender = () => {
-  const a = { value: "dictCode", label: "dictName" }, l = (t, M) => {
-    var F;
-    const b = f(M);
+  const a = { value: "dictCode", label: "dictName" }, l = (v, b) => {
+    var N;
+    const M = k(b);
     let s = {
       clearable: !0,
       disabled: !1,
       showValue: !1,
       placeholder: null
-    }, L, S;
-    isObject(t) ? (s = Object.assign(s, t), L = t.defaultValue, S = t == null ? void 0 : t.code) : S = t;
-    const x = (F = storageLocal.getItem("kLov")[S]) == null ? void 0 : F.children, D = x ? x.filter((N) => N.enabled === "1") : [];
+    }, L, x;
+    isObject(v) ? (s = Object.assign(s, v), L = v.defaultValue, x = v == null ? void 0 : v.code) : x = v;
+    const D = (N = storageLocal.getItem("kLov")[x]) == null ? void 0 : N.children, F = D ? D.filter((E) => E.enabled === "1") : [];
     return {
       name: "#select",
       optionProps: a,
-      options: D,
+      options: F,
       props: s,
       defaultValue: L,
-      events: b
+      events: M
     };
-  }, o = (t, M) => {
-    const b = f(M);
+  }, o = (v, b) => {
+    const M = k(b);
     return {
       name: "#SuSelect",
-      optionProps: (t == null ? void 0 : t.optionProps) || { label: "label", value: "value" },
-      props: t == null ? void 0 : t.props,
-      options: (t == null ? void 0 : t.options) || [],
-      events: b
+      optionProps: (v == null ? void 0 : v.optionProps) || { label: "label", value: "value" },
+      props: v == null ? void 0 : v.props,
+      options: (v == null ? void 0 : v.options) || [],
+      events: M
     };
-  }, h = (t, M) => {
-    const b = {
+  }, h = (v, b) => {
+    const M = {
       optionProps: { extLabel: "userName", value: "employeeName" },
       props: {
-        attrs: { disabled: t == null ? void 0 : t.disabled },
-        disabled: t == null ? void 0 : t.disabled,
-        defaultValue: t == null ? void 0 : t.defaultValue,
-        mapField: t == null ? void 0 : t.mapField,
+        attrs: { disabled: v == null ? void 0 : v.disabled },
+        disabled: v == null ? void 0 : v.disabled,
+        defaultValue: v == null ? void 0 : v.defaultValue,
+        mapField: v == null ? void 0 : v.mapField,
         code: "SYS037",
         url: "/uums/employee/listEmployeeIsUser",
         fetchField: "employeeName"
       }
     };
-    return o(b, M);
-  }, r = (t) => {
-    const M = {
+    return o(M, b);
+  }, r = (v) => {
+    const b = {
       optionProps: { extLabel: "userName", value: "name" },
       props: {
         code: "sys/listUsers",
         url: "/uums/user",
         fetchField: "name",
-        mapField: t == null ? void 0 : t.mapField
+        mapField: v == null ? void 0 : v.mapField
       }
     };
-    return o(M);
-  }, c = (t, M) => {
-    const b = {
+    return o(b);
+  }, c = (v, b) => {
+    const M = {
       label: "organizationName",
-      value: (t == null ? void 0 : t.field) || "organizationName"
+      value: (v == null ? void 0 : v.field) || "organizationName"
     }, s = {
       mapField: {},
-      defaultParams: t == null ? void 0 : t.defaultParams,
+      defaultParams: v == null ? void 0 : v.defaultParams,
       url: "/uums/cusOrganization",
       fetchField: "organizationName"
     }, L = {
       organizationId: "id",
       organizationCode: "organizationCode"
     };
-    return Object.assign(s.mapField, L, (t == null ? void 0 : t.mapField) || {}), { name: "#SuSelect", props: s, optionProps: b, options: [], methods: M };
-  }, i = (t, M) => {
-    const b = {
+    return Object.assign(s.mapField, L, (v == null ? void 0 : v.mapField) || {}), { name: "#SuSelect", props: s, optionProps: M, options: [], methods: b };
+  }, i = (v, b) => {
+    const M = {
       label: "orgName",
-      value: (t == null ? void 0 : t.field) || "orgName"
+      value: (v == null ? void 0 : v.field) || "orgName"
     }, s = {
       mapField: {},
-      defaultParams: t == null ? void 0 : t.defaultParams,
+      defaultParams: v == null ? void 0 : v.defaultParams,
       url: "/uums/org",
       fetchField: "orgName"
     }, L = { orgId: "id", orgCode: "orgCode" };
-    return Object.assign(s.mapField, L, (t == null ? void 0 : t.mapField) || {}), { name: "#SuSelect", props: s, optionProps: b, options: [], methods: M };
-  }, Z = (t, M) => {
-    const b = Object.assign({ disabled: !1 }, t), s = b == null ? void 0 : b.defaultValue;
+    return Object.assign(s.mapField, L, (v == null ? void 0 : v.mapField) || {}), { name: "#SuSelect", props: s, optionProps: M, options: [], methods: b };
+  }, Z = (v, b) => {
+    const M = Object.assign({ disabled: !1 }, v), s = M == null ? void 0 : M.defaultValue;
     return {
       name: "VxeInput",
-      props: b,
+      props: M,
       defaultValue: s,
-      events: f(M)
+      events: k(b)
     };
-  }, e = (t, M) => {
-    const b = Object.assign({ disabled: !1, rows: 3 }, t), s = b == null ? void 0 : b.defaultValue;
+  }, e = (v, b) => {
+    const M = Object.assign({ disabled: !1, rows: 3 }, v), s = M == null ? void 0 : M.defaultValue;
     return {
       name: "VxeTextarea",
-      props: b,
+      props: M,
       defaultValue: s,
-      events: f(M)
+      events: k(b)
     };
-  }, v = (t, M) => {
-    const b = "VxeCheckbox", { defaultValue: s, options: L, props: S } = m(t);
-    return { name: b, defaultValue: s, options: L, props: S, events: f(M) };
-  }, d = (t, M) => {
-    const b = "VxeRadio", { defaultValue: s, options: L, props: S } = m(t);
-    return { name: b, defaultValue: s, options: L, props: S, events: f(M) };
-  }, m = (t) => {
-    var x;
-    let M = { disabled: !1 }, b;
+  }, t = (v, b) => {
+    const M = "VxeCheckbox", { defaultValue: s, options: L, props: x } = f(v);
+    return { name: M, defaultValue: s, options: L, props: x, events: k(b) };
+  }, d = (v, b) => {
+    const M = "VxeRadio", { defaultValue: s, options: L, props: x } = f(v);
+    return { name: M, defaultValue: s, options: L, props: x, events: k(b) };
+  }, f = (v) => {
+    var D;
+    let b = { disabled: !1 }, M;
     const s = storageLocal.getItem("kLov");
     let L = "";
-    isObject(t) ? (b = t.defaultValue, L = t.code, M = Object.assign(M, t || {})) : isString(t) && (L = t);
-    const S = L ? (x = s[L]) == null ? void 0 : x.children.map((D) => ({ label: D.dictName, value: D.dictCode })) : [];
-    return { props: M, defaultValue: b, options: S };
-  }, V = (t, M) => {
-    const b = f(M);
+    isObject(v) ? (M = v.defaultValue, L = v.code, b = Object.assign(b, v || {})) : isString(v) && (L = v);
+    const x = L ? (D = s[L]) == null ? void 0 : D.children.map((F) => ({ label: F.dictName, value: F.dictCode })) : [];
+    return { props: b, defaultValue: M, options: x };
+  }, m = (v, b) => {
+    const M = k(b);
     return {
       name: "VxeInput",
       props: Object.assign(
         { type: "number", clearable: !0, min: 0, controls: !1 },
-        t || {}
+        v || {}
       ),
-      defaultValue: t == null ? void 0 : t.defaultValue,
-      events: b
+      defaultValue: v == null ? void 0 : v.defaultValue,
+      events: M
     };
-  }, u = (t, M) => {
-    const b = f(M), s = "yyyy-MM-dd HH:mm:ss", L = t == null ? void 0 : t.defaultValue;
-    return { name: "VxeInput", props: Object.assign({ type: "date", valueFormat: s, clearable: !0 }, t || {}), defaultValue: L, events: b };
-  }, H = (t, M) => {
-    const b = f(M);
-    return { name: "#lov", props: Object.assign({}, t || {}), events: b };
-  }, p = (t, M) => {
-    const b = f(M), s = (t == null ? void 0 : t.optionProps) || {
+  }, u = (v, b) => {
+    const M = k(b), s = "yyyy-MM-dd HH:mm:ss", L = v == null ? void 0 : v.defaultValue;
+    return { name: "VxeInput", props: Object.assign({ type: "date", valueFormat: s, clearable: !0 }, v || {}), defaultValue: L, events: M };
+  }, H = (v, b) => {
+    const M = k(b);
+    return { name: "#lov", props: Object.assign({}, v || {}), events: M };
+  }, p = (v, b) => {
+    const M = k(b), s = (v == null ? void 0 : v.optionProps) || {
       label: "label",
       value: "value"
     }, L = Object.assign(
       { clearable: !0, disabled: !1, showValue: !1 },
-      t || {}
+      v || {}
     );
     return console.log("itemRender"), {
       name: "#select",
       optionProps: s,
-      options: (t == null ? void 0 : t.options) || [],
+      options: (v == null ? void 0 : v.options) || [],
       props: L,
-      events: b
+      events: M
     };
-  }, n = (t, M) => {
-    let b = {
+  }, n = (v, b) => {
+    let M = {
       openLabel: "是",
       closeLabel: "否",
       openValue: "Y",
       closeValue: "N"
     }, s = "Y";
-    isObject(t) && !isFunction(t) ? (b = Object.assign(b, t || {}), s = t.defaultValue || s) : !isEmpty(t) && isString(t) && (s = t, b = Object.assign(b, { defaultValue: s }));
-    const L = isFunction(t) ? f(t) : f(M);
-    return { name: "VxeSwitch", props: b, defaultValue: s, events: L };
-  }, y = (t, M) => ({ name: "#tag", props: { code: t, tagMap: M } }), C = (t, M) => {
-    const b = {
+    isObject(v) && !isFunction(v) ? (M = Object.assign(M, v || {}), s = v.defaultValue || s) : !isEmpty(v) && isString(v) && (s = v, M = Object.assign(M, { defaultValue: s }));
+    const L = isFunction(v) ? k(v) : k(b);
+    return { name: "VxeSwitch", props: M, defaultValue: s, events: L };
+  }, y = (v, b) => ({ name: "#tag", props: { code: v, tagMap: b } }), C = (v, b) => {
+    const M = {
       openLabel: "启用",
       closeLabel: "禁用",
       openValue: "1",
       closeValue: "0",
       defaultValue: "1"
     };
-    !isFunction(t) && isObject(t) && Object.assign(b, t);
-    const s = isFunction(t) ? t : M;
-    return n(b, s);
-  }, A = () => ({ name: "#iconSelect" }), w = (t = [], M = {}, b) => ({ name: "#treeSelect", sourceData: t, props: M, events: b }), f = (t) => {
-    let M = {};
-    return isObject(t) && !isFunction(t) ? M = {
-      change: (t == null ? void 0 : t.change) || I,
-      blur: (t == null ? void 0 : t.blur) || I,
-      focus: (t == null ? void 0 : t.focus) || I,
-      input: (t == null ? void 0 : t.input) || I,
-      clear: (t == null ? void 0 : t.clear) || I,
-      filterMethod: t == null ? void 0 : t.filterMethod
-    } : t && (M = { change: t }), M;
+    !isFunction(v) && isObject(v) && Object.assign(M, v);
+    const s = isFunction(v) ? v : b;
+    return n(M, s);
+  }, A = () => ({ name: "#iconSelect" }), w = (v = [], b = {}, M) => ({ name: "#treeSelect", sourceData: v, props: b, events: M }), V = (v, b) => {
+    const M = k(b);
+    return {
+      name: "#area",
+      props: { mapField: (v == null ? void 0 : v.mapField) || ["province", "city", "region"] },
+      events: M
+    };
+  }, k = (v) => {
+    let b = {};
+    return isObject(v) && !isFunction(v) ? b = {
+      change: (v == null ? void 0 : v.change) || I,
+      blur: (v == null ? void 0 : v.blur) || I,
+      focus: (v == null ? void 0 : v.focus) || I,
+      input: (v == null ? void 0 : v.input) || I,
+      clear: (v == null ? void 0 : v.clear) || I,
+      filterMethod: v == null ? void 0 : v.filterMethod
+    } : v && (b = { change: v }), b;
   };
   function I() {
   }
@@ -1264,13 +1280,13 @@ const useRender = () => {
     renderSelect: o,
     renderInput: Z,
     renderTextarea: e,
-    renderCheckBox: v,
+    renderCheckBox: t,
     renderRadio: d,
     renderUser: h,
     renderSysUser: r,
     renderInvOrg: c,
     renderBU: i,
-    renderNumber: V,
+    renderNumber: m,
     renderLov: H,
     renderSelectLocal: p,
     renderDate: u,
@@ -1278,7 +1294,8 @@ const useRender = () => {
     renderCellTag: y,
     renderEnabled: C,
     renderIconSelect: A,
-    renderTreeSelect: w
+    renderTreeSelect: w,
+    renderArea: V
   };
 }, useGlobal = () => {
   const a = getCurrentInstance();
@@ -1333,21 +1350,21 @@ const deviceDetection = () => {
 }, errorMessage = (a = "操作失败", l = {}) => {
   var o, h;
   return l.type === "alert" ? (o = VxeUI.modal) == null ? void 0 : o.alert({ content: a, ...l, status: "error" }) : (h = VxeUI.modal) == null ? void 0 : h.message({ content: a, ...l, status: "error" });
-}, renderHook = useRender(), i18nColums = (a) => {
-  let l = 0, o = 0;
-  const h = a.length - 1;
-  return a.map((r, c) => {
-    if (o = o + r.width, r.type) return r;
-    r.title = r.title || `message.${r.field}`;
-    const { showOverflow: i, sortable: Z } = r;
-    return r.field !== "operate" && ((r.width > 99 || r.minWidth) && (r.showOverflow = i === !1 ? i : "tooltip"), r.sortable = Z === !1 ? Z : !0), l || (l = r.minWidth), !l && h === c && o < window.innerWidth && (r.minWidth = r.width, r.width = null), r;
+}, renderHook = useRender(), i18nColums = (a, l = !0) => {
+  let o = 0, h = 0;
+  const r = a.length - 1;
+  return a.map((c, i) => {
+    if (h = h + c.width, c.type) return c;
+    c.title = c.title || `message.${c.field}`;
+    const { showOverflow: Z } = c;
+    return c.field !== "operate" && ((c.width > 99 || c.minWidth) && (c.showOverflow = Z === !1 ? Z : "tooltip"), c.sortable = !(l === !1 || c.sortable === !1)), o || (o = c.minWidth), !o && r === i && h < window.innerWidth && (c.minWidth = c.width, c.width = null), c;
   });
 }, formatItems = (a, l, o = 24) => a.length ? a.map((h) => {
   var r, c, i;
   if ((r = h.children) != null && r.length)
     return h.children = formatItems(h.children, l, o), h;
   {
-    h.title = h.title || `message.${h.field}`, h.span = h.span || o, h.collapseNode && (h.title = "", h.titleWidth = 0);
+    h.title = h.title || `message.${h.field}`, h.span = h.span || o, h.type === "collapseNode" && (h.title = "", h.titleWidth = 0);
     let Z = !1;
     l === "detail" ? (Z = !0, h.placeholder = null) : Z = h.disabled === !1 ? h.disabled : h.disabled || ((i = (c = h.itemRender) == null ? void 0 : c.props) == null ? void 0 : i.disabled);
     let e = {
@@ -1383,20 +1400,20 @@ const deviceDetection = () => {
     events: null
   }
 }, formatGridItems = (a, l) => {
-  const o = a, h = o.length, r = h > 2 && o.some((v, d) => d < 3 && (v.span > 6 || getDateRange(v))), c = r || h > 3, i = {
+  const o = a, h = o.length, r = h > 2 && o.some((t, d) => d < 3 && (t.span > 6 || getDateRange(t))), c = r || h > 3, i = {
     collapseTags: !0,
     collapseTagsTooltip: !0,
     multiple: !0
-  }, Z = o.map((v, d) => {
-    var m, V, u;
-    return v.folding = r ? c && d > 1 : c && d > 2, v.span = getDateRange(v) ? 12 : v.span || 6, v.code && !v.itemRender && (v.itemRender = renderHook.renderDict(v.code)), v.itemRender = v.itemRender || { name: "VxeInput" }, v.resetValue = v.itemRender.defaultValue, v.title = v.title || `message.${v.field}`, (v.multiple || (V = (m = v.itemRender) == null ? void 0 : m.props) != null && V.multiple) && (v.itemRender.props = Object.assign(
+  }, Z = o.map((t, d) => {
+    var f, m, u;
+    return t.folding = r ? c && d > 1 : c && d > 2, t.span = getDateRange(t) ? 12 : t.span || 6, t.code && !t.itemRender && (t.itemRender = renderHook.renderDict(t.code)), t.itemRender = t.itemRender || { name: "VxeInput" }, t.resetValue = t.itemRender.defaultValue, t.title = t.title || `message.${t.field}`, (t.multiple || (m = (f = t.itemRender) == null ? void 0 : f.props) != null && m.multiple) && (t.itemRender.props = Object.assign(
       i,
-      ((u = v.itemRender) == null ? void 0 : u.props) || {}
-    )), v;
+      ((u = t.itemRender) == null ? void 0 : u.props) || {}
+    )), t;
   }), e = clone(formSearchButtons, !0);
   if (e.collapseNode = c, l && e.itemRender.options.length < 3 && (e.itemRender.options.push(l), e.itemRender.events = l.events), c) {
-    const v = r ? 2 : 3;
-    Z.splice(v, 0, e);
+    const t = r ? 2 : 3;
+    Z.splice(t, 0, e);
   } else
     Z.push(e);
   return Z;
@@ -1406,12 +1423,16 @@ const deviceDetection = () => {
 }, formatRules = (a, l) => {
   const o = {};
   return a.forEach((h) => {
-    if (h.required) {
-      const { field: r, title: c } = h, i = c == null ? void 0 : c.startsWith("message.");
-      o[r] = [
+    var r;
+    if ((r = h.children) != null && r.length) {
+      const c = formatRules(h.children, l);
+      merge(o, c);
+    } else if (h.required) {
+      const { field: c, title: i } = h, Z = i == null ? void 0 : i.startsWith("message.");
+      o[c] = [
         {
           required: !0,
-          message: `${l("message.required")}${c && i ? l(c) : c || l(`message.${r}`)}`
+          message: `${l("message.required")}${i && Z ? l(i) : i || l(`message.${c}`)}`
         }
       ];
     }
@@ -1494,9 +1515,9 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
   }
 }, g = class g {
   constructor() {
-    k(this, "router");
-    k(this, "baseUrl", null);
-    k(this, "getNetworkError", (l) => l ? {
+    S(this, "router");
+    S(this, "baseUrl", null);
+    S(this, "getNetworkError", (l) => l ? {
       400: "错误的请求",
       401: "服务未授权,请重新登录",
       403: "拒绝访问",
@@ -1534,7 +1555,7 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
           c.expires - i <= 0 ? (g.isRefreshing || (g.isRefreshing = !0, this.get(this.baseUrl + "/uath/refreshToken", {
             refreshToken: c.refreshToken
           }).then((e) => {
-            this.setToken(e), l.headers.Authorization = "Bearer " + e.access_token, g.requests.forEach((v) => v(e.access_token)), g.requests = [];
+            this.setToken(e), l.headers.Authorization = "Bearer " + e.access_token, g.requests.forEach((t) => t(e.access_token)), g.requests = [];
           }).finally(() => {
             g.isRefreshing = !1;
           })), h(g.retryOriginalRequest(l))) : (l.headers.Authorization = "Bearer " + c.accessToken, h(l));
@@ -1591,16 +1612,16 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
         else if ((e == null ? void 0 : e.code) !== "-1")
           i(e);
         else {
-          const v = (e == null ? void 0 : e.msg) || "服务异常";
-          errorMessage(v, { duration: 8e3 }), Z(v);
+          const t = (e == null ? void 0 : e.msg) || "服务异常";
+          errorMessage(t, { duration: 8e3 }), Z(t);
         }
       }).catch((e) => {
-        var v, d, m;
+        var t, d, f;
         if (e != null && e.code) {
-          if (((v = e == null ? void 0 : e.response) == null ? void 0 : v.status) === 401)
+          if (((t = e == null ? void 0 : e.response) == null ? void 0 : t.status) === 401)
             return (d = this.router) == null ? void 0 : d.push({ path: "/login" });
           errorMessage(
-            this.getNetworkError((m = e == null ? void 0 : e.response) == null ? void 0 : m.status) || (e == null ? void 0 : e.message),
+            this.getNetworkError((f = e == null ? void 0 : e.response) == null ? void 0 : f.status) || (e == null ? void 0 : e.message),
             { duration: 8e3 }
           );
         }
@@ -1631,10 +1652,10 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
   }
 };
 /** token过期后，暂存待执行的请求 */
-k(g, "requests", []), /** 防止重复刷新token */
-k(g, "isRefreshing", !1), // 初始化配置对象
-k(g, "initConfig", {}), // 保存当前Axios实例对象
-k(g, "axiosInstance", Axios.create(defaultConfig));
+S(g, "requests", []), /** 防止重复刷新token */
+S(g, "isRefreshing", !1), // 初始化配置对象
+S(g, "initConfig", {}), // 保存当前Axios实例对象
+S(g, "axiosInstance", Axios.create(defaultConfig));
 let SuHttp = g;
 const http = new SuHttp(), lunarCalendar = {
   /**
@@ -2437,15 +2458,15 @@ const http = new SuHttp(), lunarCalendar = {
       return -1;
     let i;
     h ? i = new Date(h, parseInt(r.toString()) - 1, c) : i = /* @__PURE__ */ new Date();
-    let Z, e = 0, v = 0;
+    let Z, e = 0, t = 0;
     h = i.getFullYear(), r = i.getMonth() + 1, c = i.getDate();
     let d = (Date.UTC(i.getFullYear(), i.getMonth(), i.getDate()) - Date.UTC(1900, 0, 31)) / 864e5;
     for (Z = 1900; Z < 2101 && d > 0; Z++)
-      v = this.lYearDays(Z), d -= v;
-    d < 0 && (d += v, Z--);
-    const m = /* @__PURE__ */ new Date();
-    let V = !1;
-    m.getFullYear() === h && m.getMonth() + 1 === r && m.getDate() === c && (V = !0);
+      t = this.lYearDays(Z), d -= t;
+    d < 0 && (d += t, Z--);
+    const f = /* @__PURE__ */ new Date();
+    let m = !1;
+    f.getFullYear() === h && f.getMonth() + 1 === r && f.getDate() === c && (m = !0);
     let u = i.getDay();
     const H = this.nStr1[u];
     u === 0 && (u = 7);
@@ -2453,20 +2474,20 @@ const http = new SuHttp(), lunarCalendar = {
     e = this.leapMonth(Z);
     let n = !1;
     for (Z = 1; Z < 13 && d > 0; Z++)
-      e > 0 && Z === e + 1 && n === !1 ? (--Z, n = !0, v = this.leapDays(p)) : v = this.monthDays(p, Z), n === !0 && Z === e + 1 && (n = !1), d -= v;
-    d === 0 && e > 0 && Z === e + 1 && (n ? n = !1 : (n = !0, --Z)), d < 0 && (d += v, --Z);
-    const y = Z, C = d + 1, A = r - 1, w = this.toGanZhiYear(p), f = this.getTerm(h, r * 2 - 1), I = this.getTerm(h, r * 2);
-    let t = this.toGanZhi((h - 1900) * 12 + r + 11);
-    c >= f && (t = this.toGanZhi((h - 1900) * 12 + r + 12));
-    let M = !1, b;
-    f === c && (M = !0, b = this.solarTerm[r * 2 - 2]), I === c && (M = !0, b = this.solarTerm[r * 2 - 1]);
-    const s = Date.UTC(h, A, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, L = this.toGanZhi(s + c - 1), S = this.toAstro(r, c), x = h + "-" + r + "-" + c, D = p + "-" + y + "-" + C, F = this.festival, N = this.lFestival, R = r + "-" + c;
-    let E = y + "-" + C;
-    return y === 12 && C === 29 && this.monthDays(p, y) === 29 && (E = "12-30"), {
+      e > 0 && Z === e + 1 && n === !1 ? (--Z, n = !0, t = this.leapDays(p)) : t = this.monthDays(p, Z), n === !0 && Z === e + 1 && (n = !1), d -= t;
+    d === 0 && e > 0 && Z === e + 1 && (n ? n = !1 : (n = !0, --Z)), d < 0 && (d += t, --Z);
+    const y = Z, C = d + 1, A = r - 1, w = this.toGanZhiYear(p), V = this.getTerm(h, r * 2 - 1), k = this.getTerm(h, r * 2);
+    let I = this.toGanZhi((h - 1900) * 12 + r + 11);
+    c >= V && (I = this.toGanZhi((h - 1900) * 12 + r + 12));
+    let v = !1, b;
+    V === c && (v = !0, b = this.solarTerm[r * 2 - 2]), k === c && (v = !0, b = this.solarTerm[r * 2 - 1]);
+    const M = Date.UTC(h, A, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, s = this.toGanZhi(M + c - 1), L = this.toAstro(r, c), x = h + "-" + r + "-" + c, D = p + "-" + y + "-" + C, F = this.festival, N = this.lFestival, E = r + "-" + c;
+    let R = y + "-" + C;
+    return y === 12 && C === 29 && this.monthDays(p, y) === 29 && (R = "12-30"), {
       date: x,
       lunarDate: D,
-      festival: F[R] ? F[R].title : null,
-      lunarFestival: N[E] ? N[E].title : null,
+      festival: F[E] ? F[E].title : null,
+      lunarFestival: N[R] ? N[R].title : null,
       lYear: p,
       lMonth: y,
       lDay: C,
@@ -2477,15 +2498,15 @@ const http = new SuHttp(), lunarCalendar = {
       cMonth: r,
       cDay: c,
       gzYear: w,
-      gzMonth: t,
-      gzDay: L,
-      isToday: V,
+      gzMonth: I,
+      gzDay: s,
+      isToday: m,
       isLeap: n,
       nWeek: u,
       ncWeek: "星期" + H,
-      isTerm: M,
+      isTerm: v,
       Term: b,
-      astro: S
+      astro: L
     };
   },
   /**
@@ -2510,11 +2531,11 @@ const http = new SuHttp(), lunarCalendar = {
     let Z = 0, e;
     for (e = 1900; e < a; e++)
       Z += this.lYearDays(e);
-    let v = 0, d = !1;
+    let t = 0, d = !1;
     for (e = 1; e < l; e++)
-      v = this.leapMonth(a), d || v <= e && v > 0 && (Z += this.leapDays(a), d = !0), Z += this.monthDays(a, e);
+      t = this.leapMonth(a), d || t <= e && t > 0 && (Z += this.leapDays(a), d = !0), Z += this.monthDays(a, e);
     h && (Z += c);
-    const m = Date.UTC(1900, 1, 30, 0, 0, 0), V = new Date((Z + o - 31) * 864e5 + m), u = V.getUTCFullYear(), H = V.getUTCMonth() + 1, p = V.getUTCDate();
+    const f = Date.UTC(1900, 1, 30, 0, 0, 0), m = new Date((Z + o - 31) * 864e5 + f), u = m.getUTCFullYear(), H = m.getUTCMonth() + 1, p = m.getUTCDate();
     return this.solar2lunar(u, H, p);
   }
 }, dict = storageLocal.getItem("kLov"), formats = {