@utogether/utils 3.0.0-beta.20 → 3.0.0-beta.22

package/dist/utils.es.js

@@ -1,6 +1,6 @@
 var T = Object.defineProperty;
 var j = (a, l, h) => l in a ? T(a, l, { enumerable: !0, configurable: !0, writable: !0, value: h }) : a[l] = h;
-var S = (a, l, h) => j(a, typeof l != "symbol" ? l + "" : l, h);
+var k = (a, l, h) => j(a, typeof l != "symbol" ? l + "" : l, h);
 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";
@@ -12,9 +12,9 @@ import NProgress from "nprogress";
 import { default as W } from "nprogress";
 class sessionStorageProxy {
   constructor(l) {
-    S(this, "storage");
-    S(this, "prefix");
-    S(this, "addPrefix", (l) => {
+    k(this, "storage");
+    k(this, "prefix");
+    k(this, "addPrefix", (l) => {
       this.prefix = l;
     });
     this.storage = l;
@@ -46,7 +46,7 @@ class localStorageProxy extends sessionStorageProxy {
 }
 class localforageProxy {
   constructor() {
-    S(this, "storage");
+    k(this, "storage");
     localforage.config({
       name: "uapp",
       storeName: "udb"
@@ -155,8 +155,8 @@ function init(a, l) {
 init({ read: DEFAULT_CODEC.decodeValue, write: DEFAULT_CODEC.encodeValue }, DEFAULT_ATTRIBUTES);
 class Cookies {
   constructor() {
-    S(this, "prefix", null);
-    S(this, "addPrefix", (l) => {
+    k(this, "prefix", null);
+    k(this, "addPrefix", (l) => {
       this.prefix = l;
     });
   }
@@ -214,54 +214,53 @@ const VxetableRender = (VXETable, {
         options: c,
         props: i,
         optionProps: Z = {},
-        events: t
+        events: e
       } = a, {
-        label: v = "label",
-        value: d = "value",
-        extLabel: f
+        label: t = "label",
+        value: d = "value"
       } = Z, {
-        loading: m = !1,
-        multiple: H,
-        mapField: b
-      } = i, M = useComponent(), n = H ? `_${r.field}` : r.field;
-      M.setDefaultValue(i, o, r.field);
-      function s(y) {
-        M.remote(y, field, a);
+        loading: f = !1,
+        multiple: m,
+        mapField: u
+      } = i, V = useComponent(), p = m ? `_${r.field}` : r.field;
+      V.setDefaultValue(i, o, r.field);
+      function n(H) {
+        V.remote(H, r.field, a);
       }
-      function C(y) {
-        M.selectChange(y, data, r.field, a, {
+      function L(H) {
+        V.selectChange(H, data, r.field, a, {
           column: r,
           datasource: "row"
         });
       }
-      function g(y) {
-        t != null && t.input && t.input(l, y);
+      function C(H) {
+        e != null && e.input && e.input(l, H);
       }
-      function k() {
-        M.clear(o, r.field, b, t, "row");
+      function A() {
+        V.clear(o, r.field, u, e, "row");
       }
-      function L() {
-        !c.length && s(""), t != null && t.focus && t.focus(l, r.field);
+      function w() {
+        !c.length && n(""), e != null && e.focus && e.focus(l, r.field);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
-        modelValue: o[n],
-        "onUpdate:modelValue": (y) => o[n] = y,
+        modelValue: o[p],
+        "onUpdate:modelValue": (H) => o[p] = H,
         filterable: !0,
         remote: !0,
         clearable: !0,
         placeholder: "请录入关键字搜索",
         style: "width: 100%",
-        "remote-method": s,
-        loading: m
+        "remote-method": n,
+        loading: f
       }, i, {
-        onFocus: () => L(),
-        onChange: (y) => C(y),
-        onClear: () => k(),
-        onInput: (y) => g(y)
-      }), _isSlot(h = c.map((y) => createVNode(resolveComponent("el-option"), {
-        key: y[d],
-        label: y[v],
-        value: y[d]
+        onFocus: () => w(),
+        onChange: (H) => L(H),
+        onClear: () => A(),
+        onInput: (H) => C(H)
+      }), _isSlot(h = c.map((H) => createVNode(resolveComponent("el-option"), {
+        key: H[d],
+        label: H[t],
+        value: H[d]
       }, null))) ? h : {
         default: () => [h]
       })];
@@ -284,59 +283,57 @@ const VxetableRender = (VXETable, {
       let h;
       const {
         data: o,
-        property: r,
-        field: c
+        field: r
       } = l, {
-        options: i,
-        props: Z,
-        optionProps: t = {},
-        events: v
+        options: c,
+        props: i,
+        optionProps: Z = {},
+        events: e
       } = a, {
-        label: d = "label",
-        value: f = "value",
-        extLabel: m
-      } = t, {
-        mapField: H,
-        multiple: b,
-        loading: M = !1
-      } = Z, n = useComponent(), s = b ? `_${c}` : c;
-      n.setDefaultValue(Z, o, c);
-      async function C(e) {
-        n.remote(e, c, a);
+        label: t = "label",
+        value: d = "value"
+      } = Z, {
+        mapField: f,
+        multiple: m,
+        loading: u = !1
+      } = i, V = useComponent(), p = m ? `_${r}` : r;
+      V.setDefaultValue(i, o, r);
+      async function n(H) {
+        V.remote(H, r, a);
       }
-      function g(e) {
-        n.selectChange(e, o, c, a, {
+      function L(H) {
+        V.selectChange(H, o, r, a, {
           datasource: "data"
         });
       }
-      function k(e) {
-        v != null && v.input && v.input(l, e);
+      function C(H) {
+        e != null && e.input && e.input(l, H);
       }
-      function L() {
-        n.clear(o, c, H, v, "data");
+      function A() {
+        V.clear(o, r, f, e, "data");
       }
-      function y() {
-        !i.length && C(""), v != null && v.focus && v.focus(l);
+      function w() {
+        !c.length && n(""), e != null && e.focus && e.focus(l);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
-        modelValue: o[s],
-        "onUpdate:modelValue": (e) => o[s] = e,
+        modelValue: o[p],
+        "onUpdate:modelValue": (H) => o[p] = H,
         filterable: !0,
         remote: !0,
         clearable: !0,
         style: "width: 100%",
         placeholder: "请录入关键字搜索",
-        loading: M,
-        "remote-method": C
-      }, Z, {
-        onFocus: () => y(),
-        onChange: (e) => g(e),
-        onClear: () => L(),
-        onInput: () => k()
-      }), _isSlot(h = i.map((e) => createVNode(resolveComponent("el-option"), {
-        key: e[f],
-        label: e[d],
-        value: e[f]
+        loading: u,
+        "remote-method": n
+      }, i, {
+        onFocus: () => w(),
+        onChange: (H) => L(H),
+        onClear: () => A(),
+        onInput: () => C()
+      }), _isSlot(h = c.map((H) => createVNode(resolveComponent("el-option"), {
+        key: H[d],
+        label: H[t],
+        value: H[d]
       }, null))) ? h : {
         default: () => [h]
       })];
@@ -371,10 +368,10 @@ const VxetableRender = (VXETable, {
       }, {
         text: i18n("message.udp.anniversary", !0),
         value: () => [Z(1, "year"), c]
-      }], Z = (t, v) => dayjs().subtract(t, v).add("1", "day").format();
+      }], Z = (e, t) => dayjs().subtract(e, t).add("1", "day").format();
       return [createVNode(resolveComponent("el-date-picker"), mergeProps({
         modelValue: h[o],
-        "onUpdate:modelValue": (t) => h[o] = t,
+        "onUpdate:modelValue": (e) => h[o] = e,
         type: (r == null ? void 0 : r.type) || "daterange",
         shortcuts: i,
         style: "width: 100%",
@@ -393,28 +390,77 @@ const VxetableRender = (VXETable, {
         options: c,
         props: i,
         optionProps: Z = {},
-        events: t
+        events: e
+      } = a, {
+        label: t = "label",
+        value: d = "value",
+        extLabel: f
+      } = Z, {
+        mapField: m
+      } = i, u = useComponent();
+      i.multiple && o[r.field] && !isArray(o[r.field]) && o[r.field].split(",").forEach((n) => {
+        !c.some((C) => C[t] === n) && c.push({
+          [d]: n,
+          [t]: n
+        });
+      });
+      function V(n) {
+        u.selectChange(n, o, r.field, a, {
+          column: r,
+          datasource: "row"
+        });
+      }
+      function p() {
+        u.clear(o, r.field, m, e, "row");
+      }
+      return [createVNode(resolveComponent("el-select"), mergeProps({
+        modelValue: o[r.field],
+        "onUpdate:modelValue": (n) => o[r.field] = n,
+        filterable: !0,
+        clearable: !0
+      }, i, {
+        style: "width: 100%",
+        onChange: (n) => V(n),
+        onClear: () => p()
+      }), _isSlot(h = c.map((n) => createVNode(resolveComponent("el-option"), {
+        key: n[d],
+        label: f && n[f] ? n[d] : n[t],
+        value: n[d]
+      }, null))) ? h : {
+        default: () => [h]
+      })];
+    },
+    renderTableDefault(a, l) {
+      let h;
+      const {
+        row: o,
+        column: r
+      } = l, {
+        options: c,
+        props: i,
+        optionProps: Z = {},
+        events: e
       } = a, {
-        label: v = "label",
+        label: t = "label",
         value: d = "value",
         extLabel: f
       } = Z, {
         mapField: m
-      } = i, H = useComponent();
+      } = i, u = useComponent();
       i.multiple && o[r.field] && !isArray(o[r.field]) && o[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 b(n) {
-        H.selectChange(n, o, r.field, a, {
+      function V(n) {
+        u.selectChange(n, o, r.field, a, {
           column: r,
           datasource: "row"
         });
       }
-      function M() {
-        H.clear(o, r.field, m, t, "row");
+      function p() {
+        u.clear(o, r.field, m, e, "row");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: o[r.field],
@@ -423,11 +469,11 @@ const VxetableRender = (VXETable, {
         clearable: !0
       }, i, {
         style: "width: 100%",
-        onChange: (n) => b(n),
-        onClear: () => M()
+        onChange: (n) => V(n),
+        onClear: () => p()
       }), _isSlot(h = c.map((n) => createVNode(resolveComponent("el-option"), {
         key: n[d],
-        label: f && n[f] ? n[d] : n[v],
+        label: f && n[f] ? n[d] : n[t],
         value: n[d]
       }, null))) ? h : {
         default: () => [h]
@@ -457,42 +503,41 @@ const VxetableRender = (VXETable, {
       let h;
       const {
         data: o,
-        property: r,
-        field: c
+        field: r
       } = l, {
-        options: i,
-        props: Z,
-        optionProps: t = {},
-        events: v
+        options: c,
+        props: i,
+        optionProps: Z = {},
+        events: e
       } = a, {
-        label: d = "label",
-        value: f = "value"
-      } = t, m = useComponent(), {
-        defaultValues: H,
-        mapField: b
-      } = Z;
-      H && (o[c] = H);
-      function M(s) {
-        m.selectChange(s, o, c, a, {
+        label: t = "label",
+        value: d = "value"
+      } = Z, f = useComponent(), {
+        defaultValues: m,
+        mapField: u
+      } = i;
+      m && (o[r] = m);
+      function V(n) {
+        f.selectChange(n, o, r, a, {
           datasource: "data"
         });
       }
-      function n() {
-        m.clear(o, c, b, v, "data");
+      function p() {
+        f.clear(o, r, u, e, "data");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
-        modelValue: o[c],
-        "onUpdate:modelValue": (s) => o[c] = s,
+        modelValue: o[r],
+        "onUpdate:modelValue": (n) => o[r] = n,
         filterable: !0,
         clearable: !0,
         style: "width: 100%"
-      }, Z, {
-        onChange: (s) => M(s),
-        onClear: () => n()
-      }), _isSlot(h = i.map((s) => createVNode(resolveComponent("el-option"), {
-        key: s[f],
-        label: s[d],
-        value: s[f]
+      }, i, {
+        onChange: (n) => V(n),
+        onClear: () => p()
+      }), _isSlot(h = c.map((n) => createVNode(resolveComponent("el-option"), {
+        key: n[d],
+        label: n[t],
+        value: n[d]
       }, null))) ? h : {
         default: () => [h]
       })];
@@ -507,49 +552,49 @@ const VxetableRender = (VXETable, {
         events: c
       } = a, i = useComponent(), {
         defaultValues: Z,
-        mapField: t
+        mapField: e
       } = r;
       Z && (h[o] = Z);
-      function v(f, m) {
+      function t(f, m) {
         const {
-          mapField: H,
-          field: b,
-          displayName: M,
+          mapField: u,
+          field: V,
+          displayName: p,
           multiple: n
         } = r;
         if (n) {
           if (n) {
             const C = {};
-            h[M || b] = f.reduce((g, k) => {
-              for (const L in H)
-                C[L] = g ? C[L] + "," + k[H[L]] : k[H[L]];
-              return g = g ? g + "," + k[M || b] : k[M || b], g;
+            h[p || V] = f.reduce((A, w) => {
+              for (const H in u)
+                C[H] = A ? C[H] + "," + w[u[H]] : w[u[H]];
+              return A = A ? A + "," + w[p || V] : w[p || V], A;
             }, ""), Object.assign(h, C);
           }
         } else {
           const C = {
-            [M || b]: f[m || M || b]
+            [p || V]: f[m || p || V]
           };
-          for (const g in H)
-            C[g] = f[H[g]];
+          for (const A in u)
+            C[A] = f[u[A]];
           Object.assign(h, C);
         }
-        const s = {
+        const L = {
           row: h,
-          property: b,
+          property: V,
           item: f,
-          field: b
+          field: V
         };
-        c != null && c.change && c.change(s);
+        c != null && c.change && c.change(L);
       }
       function d() {
-        i.clear(h, o, t, c, "data");
+        i.clear(h, o, e, c, "data");
       }
       return [createVNode(resolveComponent("ut-lov"), mergeProps({
         record: h
       }, r, {
         mode: "vxe",
-        onChange: (f, m) => v(f, m),
+        onChange: (f, m) => t(f, m),
         onClear: () => d()
       }), null)];
     },
@@ -562,32 +607,32 @@ const VxetableRender = (VXETable, {
         props: r,
         events: c
       } = a, i = useComponent();
-      function Z(v, d) {
+      function Z(t, d) {
         const {
           mapField: f,
           field: m,
-          displayName: H,
-          multiple: b
+          displayName: u,
+          multiple: V
         } = r;
-        if (!b) {
-          const M = {
-            [H || m]: v[d || H || m]
+        if (!V) {
+          const p = {
+            [u || m]: t[d || u || m]
           };
           for (const n in f)
-            M[n] = v[f[n]];
-          Object.assign(h, M);
+            p[n] = t[f[n]];
+          Object.assign(h, p);
         }
-        c != null && c.change && c.change(l, v, h[o.field]);
+        c != null && c.change && c.change(l, t, h[o.field]);
       }
-      function t() {
+      function e() {
         i.clear(h, field, mapField, c, "row");
       }
       return [createVNode(resolveComponent("ut-lov"), mergeProps({
-        record: h
+        record: h,
+        mode: "vxe"
       }, r, {
-        mode: "ele",
-        onChange: (v, d) => Z(v, d),
-        onClear: () => t()
+        onChange: (t, d) => Z(t, d),
+        onClear: () => e()
       }), null)];
     },
     // 单元格默认
@@ -599,32 +644,32 @@ const VxetableRender = (VXETable, {
         props: r,
         events: c
       } = a, i = useComponent();
-      function Z(v, d) {
+      function Z(t, d) {
         const {
           mapField: f,
           field: m,
-          displayName: H,
-          multiple: b
+          displayName: u,
+          multiple: V
         } = r;
-        if (!b) {
-          const M = {
-            [H || m]: v[d || H || m]
+        if (!V) {
+          const p = {
+            [u || m]: t[d || u || m]
           };
           for (const n in f)
-            M[n] = v[f[n]];
-          Object.assign(h, M);
+            p[n] = t[f[n]];
+          Object.assign(h, p);
         }
-        c != null && c.change && c.change(l, v, h[o.field]);
+        c != null && c.change && c.change(l, t, h[o.field]);
       }
-      function t() {
+      function e() {
         i.clear(h, field, mapField, c, "row");
       }
       return [createVNode(resolveComponent("ut-lov"), mergeProps({
-        record: h
+        record: h,
+        mode: "ele"
       }, r, {
-        mode: "ele",
-        onChange: (v, d) => Z(v, d),
-        onClear: () => t()
+        onChange: (t, d) => Z(t, d),
+        onClear: () => e()
       }), null)];
     },
     // 可编辑显示模板
@@ -690,24 +735,24 @@ const VxetableRender = (VXETable, {
         },
         events: Z
       } = a;
-      function t(v) {
+      function e(t) {
         const d = {
           row: h,
           column: o,
-          value: v
+          value: t
         };
         Z != null && Z.change && Z.change(d);
       }
       return [h[o.field] ? createVNode(resolveComponent("el-switch"), mergeProps({
         modelValue: h[o.field],
-        "onUpdate:modelValue": (v) => h[o.field] = v,
+        "onUpdate:modelValue": (t) => h[o.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) => t(v)
+        onChange: (t) => e(t)
       }), null) : null];
     }
   }), VXETable.renderer.add("#iconSelect", {
@@ -760,9 +805,9 @@ const VxetableRender = (VXETable, {
         "check-strictly": !0
       }, r, {
         filterable: !0,
-        onCheckChange: (Z, t, v) => onCheckChange(Z, t, v, i),
-        onNodeClick: (Z, t, v) => onNodeClick(Z, t, v, i),
-        onCurrentChange: (Z, t) => onCurrentChange(Z, t, 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)];
     },
     renderTableCell(a, l) {
@@ -775,10 +820,10 @@ const VxetableRender = (VXETable, {
       } = a, {
         children: i = "children",
         label: Z = "label"
-      } = c, t = findTree(r, (v) => v.value === h[o.field], {
+      } = c, e = findTree(r, (t) => t.value === h[o.field], {
         children: i
       });
-      return t ? [createVNode("span", null, [t.item[Z]])] : null;
+      return e ? [createVNode("span", null, [e.item[Z]])] : null;
     },
     renderItemContent(a, l) {
       const {
@@ -796,86 +841,86 @@ const VxetableRender = (VXETable, {
         "check-strictly": !0
       }, r, {
         filterable: !0,
-        onCheckChange: (Z, t, v) => onCheckChange(Z, t, v, i),
-        onNodeClick: (Z, t, v) => onNodeClick(Z, t, v, i),
-        onCurrentChange: (Z, t) => onCurrentChange(Z, t, 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)];
     }
   });
   const useComponent = () => ({
-    clear: (r, c, i, Z, t) => {
+    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({
-        [t]: r,
+        [e]: r,
         field: c
       });
     },
     remote: async (r, c, i) => {
       const {
         options: Z,
-        props: t,
-        events: v
+        props: e,
+        events: t
       } = i, {
         fetchField: d,
         url: f,
         defaultParams: m = {},
-        method: H = "get"
-      } = t, b = getCookieParam(), M = Object.assign({
+        method: u = "get"
+      } = e, V = getCookieParam(), p = Object.assign({
         pageSize: 20,
         pageNum: 1,
-        ...b,
+        ...V,
         ...m
       }, {
         [d || c]: r
       });
-      if (t.loading) return;
+      if (e.loading) return;
       let n;
       try {
-        Z.length = 0, t.loading = !0, n = await serviceApi[H](f, M), 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 {
-        t.loading = !1;
+        e.loading = !1;
       }
     },
-    selectChange: (r, c, i, Z, t) => {
-      let v = null;
+    selectChange: (r, c, i, Z, e) => {
+      let t = null;
       const {
         datasource: d
-      } = t, {
+      } = e, {
         options: f,
         props: m,
-        optionProps: H = {},
-        events: b
-      } = Z, M = {
+        optionProps: u = {},
+        events: V
+      } = Z, p = {
         [d]: c,
         field: i
       };
-      c[i] = null, !isEmpty(r) && (m != null && m.multiple) ? (c[i] = r.join(","), v = [], r.forEach((n) => {
-        const s = f.find((C) => n === C[H == null ? void 0 : H.value]);
-        s && !isEmpty(m.mapField) && isObject(m.mapField) && Object.keys(m.mapField).forEach((C) => {
-          const g = s[m.mapField[C]], k = c[C] ? c[C].toString() : "";
-          c[C] = k && !k.includes(g) ? `${k},${g}` : g;
-        }), s && v.push(s);
-      }), Object.assign(M, {
-        options: v
-      })) : (c[i] = m != null && m.multiple ? null : r, v = f.find((n) => r === n[H == null ? void 0 : H.value]), !isEmpty(m.mapField) && isObject(m.mapField) && Object.keys(m.mapField).forEach((n) => {
-        c[n] = v ? v[m.mapField[n]] : null;
-      }), Object.assign(M, {
-        option: v
-      })), d === "row" && Object.assign(M, {
-        column: t.column
-      }), b != null && b.change && b.change(M);
+      c[i] = null, !isEmpty(r) && (m != null && m.multiple) ? (c[i] = r.join(","), t = [], r.forEach((n) => {
+        const L = f.find((C) => n === C[u == null ? void 0 : u.value]);
+        L && !isEmpty(m.mapField) && isObject(m.mapField) && Object.keys(m.mapField).forEach((C) => {
+          const A = L[m.mapField[C]], w = c[C] ? c[C].toString() : "";
+          c[C] = w && !w.includes(A) ? `${w},${A}` : A;
+        }), L && t.push(L);
+      }), Object.assign(p, {
+        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: t
+      })), d === "row" && Object.assign(p, {
+        column: e.column
+      }), V != null && V.change && V.change(p);
     },
     setDefaultValue: (r, c, i) => {
       var d;
       const {
         multiple: Z,
-        defaultValue: t
-      } = r, v = Z ? `_${i}` : i;
-      !c[i] && t && (c[i] = t, isPlainObject(t) && Object.keys(t).forEach((m) => {
-        c[m] = c[m] || t[m];
-      })), !c[v] && c[i] && (c[v] = Z ? (d = c[i]) == null ? void 0 : d.split(",") : c[i]);
+        defaultValue: e
+      } = 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, h, o) => {
     console.log(a, l, h), o != null && o.checkChange && (o == null || o.checkChange(a, l, h));
@@ -940,45 +985,45 @@ 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: f } = v;
+    const t = unref(a);
+    if (!t) return;
+    const { clientHeight: d, clientWidth: f } = t;
     i({ height: d, width: f });
   }), h = domSymbol.toString(), o = shallowRef(), r = () => {
-    const v = unref(o);
+    const t = unref(o);
     o.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 f = document.createElement("canvas"), m = 260, H = 180;
-    Object.assign(f, { width: m, height: H });
-    const b = f.getContext("2d");
-    return b && (b.rotate(-20 * Math.PI / 120), b.font = (d == null ? void 0 : d.font) ?? "15px Reggae One", b.fillStyle = (d == null ? void 0 : d.fillStyle) ?? "rgba(180, 180, 180, 0.75)", b.textAlign = "left", b.textBaseline = "middle", b.fillText(v, m / 20, H)), f.toDataURL("image/png");
+  function c(t, d) {
+    const f = document.createElement("canvas"), m = 260, u = 180;
+    Object.assign(f, { width: m, height: u });
+    const V = f.getContext("2d");
+    return V && (V.rotate(-20 * Math.PI / 120), V.font = (d == null ? void 0 : d.font) ?? "15px Reggae One", V.fillStyle = (d == null ? void 0 : d.fillStyle) ?? "rgba(180, 180, 180, 0.75)", V.textAlign = "left", V.textBaseline = "middle", V.fillText(t, m / 20, u)), f.toDataURL("image/png");
   }
-  function i(v = {}) {
+  function i(t = {}) {
     const d = unref(o);
-    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(o))
-      return i({ str: v, attr: d }), h;
+      return i({ str: t, attr: d }), h;
     const f = document.createElement("div");
     o.value = f, f.id = h, 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 h;
-    const { clientHeight: H, clientWidth: b } = m;
-    return i({ str: v, width: b, height: H, attr: d }), m.appendChild(f), h;
+    const { clientHeight: u, clientWidth: V } = m;
+    return i({ str: t, width: V, height: u, attr: d }), m.appendChild(f), h;
   };
-  function t(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();
     });
   }
-  return { setWatermark: t, clear: r };
+  return { setWatermark: e, clear: r };
 }
 const DEFAULT_EXCLUDE_KEYS = ["class", "style"], LISTENER_PREFIX = /^on[A-Z]/;
 function entries(a) {
@@ -989,205 +1034,205 @@ function useAttrs(a = {}) {
   if (!l) return {};
   const { excludeListeners: h = !1, excludeKeys: o = [] } = a, r = shallowRef({}), c = o.concat(DEFAULT_EXCLUDE_KEYS);
   return l.attrs = reactive(l.attrs), watchEffect(() => {
-    const i = entries(l.attrs).reduce((Z, [t, v]) => (!c.includes(t) && !(h && LISTENER_PREFIX.test(t)) && (Z[t] = v), Z), {});
+    const i = entries(l.attrs).reduce((Z, [e, t]) => (!c.includes(e) && !(h && LISTENER_PREFIX.test(e)) && (Z[e] = t), Z), {});
     r.value = i;
   }), r;
 }
 const useRender = () => {
-  const a = { value: "dictCode", label: "dictName" }, l = (e, u) => {
+  const a = { value: "dictCode", label: "dictName" }, l = (v, M) => {
     var E;
-    const V = L(u);
-    let p = {
+    const b = H(M);
+    let s = {
       clearable: !0,
       disabled: !1,
       showValue: !1,
       placeholder: null
-    }, A, x;
-    isObject(e) ? (p = Object.assign(p, e), A = e.defaultValue, x = e == null ? void 0 : e.code) : x = e;
-    const I = (E = storageLocal.getItem("kLov")[x]) == null ? void 0 : E.children, D = I ? I.filter((N) => N.enabled === "1") : [];
+    }, y, S;
+    isObject(v) ? (s = Object.assign(s, v), y = v.defaultValue, S = v == null ? void 0 : v.code) : S = v;
+    const x = (E = storageLocal.getItem("kLov")[S]) == null ? void 0 : E.children, D = x ? x.filter((N) => N.enabled === "1") : [];
     return {
       name: "#select",
       optionProps: a,
       options: D,
-      props: p,
-      defaultValue: A,
-      events: V
+      props: s,
+      defaultValue: y,
+      events: b
     };
-  }, h = (e, u) => {
-    const V = L(u);
+  }, h = (v, M) => {
+    const b = H(M);
     return {
       name: "#SuSelect",
-      optionProps: (e == null ? void 0 : e.optionProps) || { label: "label", value: "value" },
-      props: e == null ? void 0 : e.props,
-      options: (e == null ? void 0 : e.options) || [],
-      events: V
+      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: b
     };
-  }, o = (e, u) => {
-    const V = {
+  }, o = (v, M) => {
+    const b = {
       optionProps: { extLabel: "userName", value: "employeeName" },
       props: {
-        attrs: { disabled: e == null ? void 0 : e.disabled },
-        disabled: e == null ? void 0 : e.disabled,
-        defaultValue: e == null ? void 0 : e.defaultValue,
-        mapField: e == null ? void 0 : e.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 h(V, u);
-  }, r = (e) => {
-    const u = {
+    return h(b, M);
+  }, r = (v) => {
+    const M = {
       optionProps: { extLabel: "userName", value: "name" },
       props: {
         code: "sys/listUsers",
         url: "/uums/user",
         fetchField: "name",
-        mapField: e == null ? void 0 : e.mapField
+        mapField: v == null ? void 0 : v.mapField
       }
     };
-    return h(u);
-  }, c = (e, u) => {
-    const V = {
+    return h(M);
+  }, c = (v, M) => {
+    const b = {
       label: "organizationName",
-      value: (e == null ? void 0 : e.field) || "organizationName"
-    }, p = {
+      value: (v == null ? void 0 : v.field) || "organizationName"
+    }, s = {
       mapField: {},
-      defaultParams: e == null ? void 0 : e.defaultParams,
+      defaultParams: v == null ? void 0 : v.defaultParams,
       url: "/uums/cusOrganization",
       fetchField: "organizationName"
-    }, A = {
+    }, y = {
       organizationId: "id",
       organizationCode: "organizationCode"
     };
-    return Object.assign(p.mapField, A, (e == null ? void 0 : e.mapField) || {}), { name: "#SuSelect", props: p, optionProps: V, options: [], methods: u };
-  }, i = (e, u) => {
-    const V = {
+    return Object.assign(s.mapField, y, (v == null ? void 0 : v.mapField) || {}), { name: "#SuSelect", props: s, optionProps: b, options: [], methods: M };
+  }, i = (v, M) => {
+    const b = {
       label: "orgName",
-      value: (e == null ? void 0 : e.field) || "orgName"
-    }, p = {
+      value: (v == null ? void 0 : v.field) || "orgName"
+    }, s = {
       mapField: {},
-      defaultParams: e == null ? void 0 : e.defaultParams,
+      defaultParams: v == null ? void 0 : v.defaultParams,
       url: "/uums/org",
       fetchField: "orgName"
-    }, A = { orgId: "id", orgCode: "orgCode" };
-    return Object.assign(p.mapField, A, (e == null ? void 0 : e.mapField) || {}), { name: "#SuSelect", props: p, optionProps: V, options: [], methods: u };
-  }, Z = (e, u) => {
-    const V = Object.assign({ disabled: !1 }, e), p = V == null ? void 0 : V.defaultValue;
+    }, y = { orgId: "id", orgCode: "orgCode" };
+    return Object.assign(s.mapField, y, (v == null ? void 0 : v.mapField) || {}), { name: "#SuSelect", props: s, optionProps: b, options: [], methods: M };
+  }, Z = (v, M) => {
+    const b = Object.assign({ disabled: !1 }, v), s = b == null ? void 0 : b.defaultValue;
     return {
       name: "VxeInput",
-      props: V,
-      defaultValue: p,
-      events: L(u)
+      props: b,
+      defaultValue: s,
+      events: H(M)
     };
-  }, t = (e, u) => {
-    const V = Object.assign({ disabled: !1, rows: 3 }, e), p = V == null ? void 0 : V.defaultValue;
+  }, e = (v, M) => {
+    const b = Object.assign({ disabled: !1, rows: 3 }, v), s = b == null ? void 0 : b.defaultValue;
     return {
       name: "VxeTextarea",
-      props: V,
-      defaultValue: p,
-      events: L(u)
+      props: b,
+      defaultValue: s,
+      events: H(M)
     };
-  }, v = (e, u) => {
-    const V = "VxeCheckbox", { defaultValue: p, options: A, props: x } = f(e);
-    return { name: V, defaultValue: p, options: A, props: x, events: L(u) };
-  }, d = (e, u) => {
-    const V = "VxeRadio", { defaultValue: p, options: A, props: x } = f(e);
-    return { name: V, defaultValue: p, options: A, props: x, events: L(u) };
-  }, f = (e) => {
-    var I;
-    let u = { disabled: !1 }, V;
-    const p = storageLocal.getItem("kLov");
-    let A = "";
-    isObject(e) ? (V = e.defaultValue, A = e.code, u = Object.assign(u, e || {})) : isString(e) && (A = e);
-    const x = A ? (I = p[A]) == null ? void 0 : I.children.map((D) => ({ label: D.dictName, value: D.dictCode })) : [];
-    return { props: u, defaultValue: V, options: x };
-  }, m = (e, u) => {
-    const V = L(u);
+  }, t = (v, M) => {
+    const b = "VxeCheckbox", { defaultValue: s, options: y, props: S } = f(v);
+    return { name: b, defaultValue: s, options: y, props: S, events: H(M) };
+  }, d = (v, M) => {
+    const b = "VxeRadio", { defaultValue: s, options: y, props: S } = f(v);
+    return { name: b, defaultValue: s, options: y, props: S, events: H(M) };
+  }, f = (v) => {
+    var x;
+    let M = { disabled: !1 }, b;
+    const s = storageLocal.getItem("kLov");
+    let y = "";
+    isObject(v) ? (b = v.defaultValue, y = v.code, M = Object.assign(M, v || {})) : isString(v) && (y = v);
+    const S = y ? (x = s[y]) == null ? void 0 : x.children.map((D) => ({ label: D.dictName, value: D.dictCode })) : [];
+    return { props: M, defaultValue: b, options: S };
+  }, m = (v, M) => {
+    const b = H(M);
     return {
       name: "VxeInput",
       props: Object.assign(
         { type: "number", clearable: !0, min: 0, controls: !1 },
-        e || {}
+        v || {}
       ),
-      defaultValue: e == null ? void 0 : e.defaultValue,
-      events: V
+      defaultValue: v == null ? void 0 : v.defaultValue,
+      events: b
     };
-  }, H = (e, u) => {
-    const V = L(u), p = "yyyy-MM-dd HH:mm:ss", A = e == null ? void 0 : e.defaultValue;
-    return { name: "VxeInput", props: Object.assign({ type: "date", valueFormat: p, clearable: !0 }, e || {}), defaultValue: A, events: V };
-  }, b = (e, u) => {
-    const V = L(u);
-    return { name: "#lov", props: Object.assign({}, e || {}), events: V };
-  }, M = (e, u) => {
-    const V = L(u), p = (e == null ? void 0 : e.optionProps) || {
+  }, u = (v, M) => {
+    const b = H(M), s = "yyyy-MM-dd HH:mm:ss", y = v == null ? void 0 : v.defaultValue;
+    return { name: "VxeInput", props: Object.assign({ type: "date", valueFormat: s, clearable: !0 }, v || {}), defaultValue: y, events: b };
+  }, V = (v, M) => {
+    const b = H(M);
+    return { name: "#lov", props: Object.assign({}, v || {}), events: b };
+  }, p = (v, M) => {
+    const b = H(M), s = (v == null ? void 0 : v.optionProps) || {
       label: "label",
       value: "value"
-    }, A = Object.assign(
+    }, y = Object.assign(
       { clearable: !0, disabled: !1, showValue: !1 },
-      e || {}
+      v || {}
     );
     return console.log("itemRender"), {
       name: "#select",
-      optionProps: p,
-      options: (e == null ? void 0 : e.options) || [],
-      props: A,
-      events: V
+      optionProps: s,
+      options: (v == null ? void 0 : v.options) || [],
+      props: y,
+      events: b
     };
-  }, n = (e, u) => {
-    let V = {
+  }, n = (v, M) => {
+    let b = {
       openLabel: "是",
       closeLabel: "否",
       openValue: "Y",
       closeValue: "N"
-    }, p = "Y";
-    isObject(e) && !isFunction(e) ? (V = Object.assign(V, e || {}), p = e.defaultValue || p) : !isEmpty(e) && isString(e) && (p = e, V = Object.assign(V, { defaultValue: p }));
-    const A = isFunction(e) ? L(e) : L(u);
-    return { name: "VxeSwitch", props: V, defaultValue: p, events: A };
-  }, s = (e, u) => ({ name: "#tag", props: { code: e, tagMap: u } }), C = (e, u) => {
-    const V = {
+    }, s = "Y";
+    isObject(v) && !isFunction(v) ? (b = Object.assign(b, v || {}), s = v.defaultValue || s) : !isEmpty(v) && isString(v) && (s = v, b = Object.assign(b, { defaultValue: s }));
+    const y = isFunction(v) ? H(v) : H(M);
+    return { name: "VxeSwitch", props: b, defaultValue: s, events: y };
+  }, L = (v, M) => ({ name: "#tag", props: { code: v, tagMap: M } }), C = (v, M) => {
+    const b = {
       openLabel: "启用",
       closeLabel: "禁用",
       openValue: "1",
       closeValue: "0",
       defaultValue: "1"
     };
-    !isFunction(e) && isObject(e) && Object.assign(V, e);
-    const p = isFunction(e) ? e : u;
-    return n(V, p);
-  }, g = () => ({ name: "#iconSelect" }), k = (e = [], u = {}, V) => ({ name: "#treeSelect", sourceData: e, props: u, events: V }), L = (e) => {
-    let u = {};
-    return isObject(e) && !isFunction(e) ? u = {
-      change: (e == null ? void 0 : e.change) || y,
-      blur: (e == null ? void 0 : e.blur) || y,
-      focus: (e == null ? void 0 : e.focus) || y,
-      input: (e == null ? void 0 : e.input) || y,
-      clear: (e == null ? void 0 : e.clear) || y,
-      filterMethod: e == null ? void 0 : e.filterMethod
-    } : e && (u = { change: e }), u;
+    !isFunction(v) && isObject(v) && Object.assign(b, v);
+    const s = isFunction(v) ? v : M;
+    return n(b, s);
+  }, A = () => ({ name: "#iconSelect" }), w = (v = [], M = {}, b) => ({ name: "#treeSelect", sourceData: v, props: M, events: b }), H = (v) => {
+    let M = {};
+    return isObject(v) && !isFunction(v) ? M = {
+      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 && (M = { change: v }), M;
   };
-  function y() {
+  function I() {
   }
   return {
     renderDict: l,
     renderSelect: h,
     renderInput: Z,
-    renderTextarea: t,
-    renderCheckBox: v,
+    renderTextarea: e,
+    renderCheckBox: t,
     renderRadio: d,
     renderUser: o,
     renderSysUser: r,
     renderInvOrg: c,
     renderBU: i,
     renderNumber: m,
-    renderLov: b,
-    renderSelectLocal: M,
-    renderDate: H,
+    renderLov: V,
+    renderSelectLocal: p,
+    renderDate: u,
     renderSwitch: n,
-    renderCellTag: s,
+    renderCellTag: L,
     renderEnabled: C,
-    renderIconSelect: g,
-    renderTreeSelect: k
+    renderIconSelect: A,
+    renderTreeSelect: w
   };
 }, useGlobal = () => {
   const a = getCurrentInstance();
@@ -1255,7 +1300,7 @@ const deviceDetection = () => {
   var i, Z;
   o.title = o.title || `message.${o.field}`, o.span = o.span || h;
   let r = !1;
-  l === "detail" ? r = !0 : r = o.disabled || ((Z = (i = o.itemRender) == null ? void 0 : i.props) == null ? void 0 : Z.disabled);
+  l === "detail" ? (r = !0, o.placeholder = null) : r = o.disabled === !1 ? o.disabled : o.disabled || ((Z = (i = o.itemRender) == null ? void 0 : i.props) == null ? void 0 : Z.disabled);
   let c = {
     name: "VxeInput",
     props: { disabled: r, placeholder: r ? "" : o.placeholder }
@@ -1288,22 +1333,22 @@ const deviceDetection = () => {
     events: null
   }
 }, formatGridItems = (a, l) => {
-  const h = a, o = h.length, r = o > 2 && h.some((v, d) => d < 3 && (v.span > 6 || getDateRange(v))), c = r || o > 3, i = {
+  const h = a, o = h.length, r = o > 2 && h.some((t, d) => d < 3 && (t.span > 6 || getDateRange(t))), c = r || o > 3, i = {
     collapseTags: !0,
     collapseTagsTooltip: !0,
     multiple: !0
-  }, Z = h.map((v, d) => {
-    var f, m, H;
-    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 || (m = (f = v.itemRender) == null ? void 0 : f.props) != null && m.multiple) && (v.itemRender.props = Object.assign(
+  }, Z = h.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,
-      ((H = v.itemRender) == null ? void 0 : H.props) || {}
-    )), v;
-  }), t = clone(formSearchButtons, !0);
-  if (t.collapseNode = c, l && t.itemRender.options.length < 3 && (t.itemRender.options.push(l), t.itemRender.events = l.events), c) {
-    const v = r ? 2 : 3;
-    Z.splice(v, 0, t);
+      ((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 t = r ? 2 : 3;
+    Z.splice(t, 0, e);
   } else
-    Z.push(t);
+    Z.push(e);
   return Z;
 }, getDateRange = (a) => {
   var l, h, o, r, c;
@@ -1397,11 +1442,11 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
     "Content-Type": "application/json",
     "X-Requested-With": "XMLHttpRequest"
   }
-}, w = class w {
+}, g = class g {
   constructor() {
-    S(this, "router");
-    S(this, "baseUrl", null);
-    S(this, "getNetworkError", (l) => l ? {
+    k(this, "router");
+    k(this, "baseUrl", null);
+    k(this, "getNetworkError", (l) => l ? {
       400: "错误的请求",
       401: "服务未授权,请重新登录",
       403: "拒绝访问",
@@ -1424,29 +1469,25 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
   /** 重连原始请求 */
   static retryOriginalRequest(l) {
     return new Promise((h) => {
-      w.requests.push((o) => {
+      g.requests.push((o) => {
         l.headers.Authorization = "Bearer " + o, h(l);
       });
     });
   }
   // 请求拦截
   httpInterceptorsRequest() {
-    w.axiosInstance.interceptors.request.use(
-      (l) => (has(l, "loading") && isRef(l.loading) && (l.loading.value = !0), NProgress.start(), typeof l.beforeRequestCallback == "function" ? (l.beforeRequestCallback(l), l) : w.initConfig.beforeRequestCallback ? (w.initConfig.beforeRequestCallback(l), l) : ["/refreshToken", "/login"].some((o) => l.url.indexOf(o) > -1) ? l : new Promise((o) => {
+    g.axiosInstance.interceptors.request.use(
+      (l) => (has(l, "loading") && isRef(l.loading) && (l.loading.value = !0), NProgress.start(), typeof l.beforeRequestCallback == "function" ? (l.beforeRequestCallback(l), l) : g.initConfig.beforeRequestCallback ? (g.initConfig.beforeRequestCallback(l), l) : ["/refreshToken", "/login"].some((o) => l.url.indexOf(o) > -1) ? l : new Promise((o) => {
         const r = cookies.get(kTOKENKEY);
         if (r) {
           const c = JSON.parse(r), i = (/* @__PURE__ */ new Date()).getTime();
-          if (c.expires - i <= 0) {
-            debugger;
-            w.isRefreshing || (w.isRefreshing = !0, this.get(this.baseUrl + "/uath/refreshToken", {
-              refreshToken: c.refreshToken
-            }).then((t) => {
-              this.setToken(t), l.headers.Authorization = "Bearer " + t.access_token, w.requests.forEach((v) => v(t.access_token)), w.requests = [];
-            }).finally(() => {
-              w.isRefreshing = !1;
-            })), o(w.retryOriginalRequest(l));
-          } else
-            l.headers.Authorization = "Bearer " + c.accessToken, o(l);
+          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((t) => t(e.access_token)), g.requests = [];
+          }).finally(() => {
+            g.isRefreshing = !1;
+          })), o(g.retryOriginalRequest(l))) : (l.headers.Authorization = "Bearer " + c.accessToken, o(l));
         } else {
           const c = cookies.get("kCookies_token");
           c && (l.headers["X-Token"] = c), o(l);
@@ -1465,10 +1506,10 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
   }
   // 响应拦截
   httpInterceptorsResponse() {
-    w.axiosInstance.interceptors.response.use(
+    g.axiosInstance.interceptors.response.use(
       (h) => {
         const o = h.config;
-        return has(o, "loading") && isRef(o.loading) && (o.loading.value = !1), NProgress.done(), typeof o.beforeResponseCallback == "function" ? (o.beforeResponseCallback(h), h.data) : (w.initConfig.beforeResponseCallback && w.initConfig.beforeResponseCallback(h), h.data);
+        return has(o, "loading") && isRef(o.loading) && (o.loading.value = !1), NProgress.done(), typeof o.beforeResponseCallback == "function" ? (o.beforeResponseCallback(h), h.data) : (g.initConfig.beforeResponseCallback && g.initConfig.beforeResponseCallback(h), h.data);
       },
       (h) => {
         var r;
@@ -1492,28 +1533,28 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
       ...r
     });
     return new Promise((i, Z) => {
-      w.axiosInstance.request(c).then((t) => {
-        if (t && (t == null ? void 0 : t.code) === "0")
-          i(t.data);
-        else if (t.code === "500")
-          errorMessage(t.msg, { duration: 8e3 }), c.method === "get" ? i(t) : Z(t.msg);
-        else if ((t == null ? void 0 : t.code) !== "-1")
-          i(t);
+      g.axiosInstance.request(c).then((e) => {
+        if (e && (e == null ? void 0 : e.code) === "0")
+          i(e.data);
+        else if (e.code === "500")
+          errorMessage(e.msg, { duration: 8e3 }), c.method === "get" ? i(e) : Z(e.msg);
+        else if ((e == null ? void 0 : e.code) !== "-1")
+          i(e);
         else {
-          const v = (t == null ? void 0 : t.msg) || "服务异常";
-          errorMessage(v, { duration: 8e3 }), Z(v);
+          const t = (e == null ? void 0 : e.msg) || "服务异常";
+          errorMessage(t, { duration: 8e3 }), Z(t);
         }
-      }).catch((t) => {
-        var v, d, f;
-        if (t != null && t.code) {
-          if (((v = t == null ? void 0 : t.response) == null ? void 0 : v.status) === 401)
+      }).catch((e) => {
+        var t, d, f;
+        if (e != null && e.code) {
+          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((f = t == null ? void 0 : t.response) == null ? void 0 : f.status) || (t == null ? void 0 : t.message),
+            this.getNetworkError((f = e == null ? void 0 : e.response) == null ? void 0 : f.status) || (e == null ? void 0 : e.message),
             { duration: 8e3 }
           );
         }
-        t.config.method === "get" ? i(t) : Z(t);
+        e.config.method === "get" ? i(e) : Z(e);
       });
     });
   }
@@ -1540,11 +1581,11 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
   }
 };
 /** token过期后，暂存待执行的请求 */
-S(w, "requests", []), /** 防止重复刷新token */
-S(w, "isRefreshing", !1), // 初始化配置对象
-S(w, "initConfig", {}), // 保存当前Axios实例对象
-S(w, "axiosInstance", Axios.create(defaultConfig));
-let SuHttp = w;
+k(g, "requests", []), /** 防止重复刷新token */
+k(g, "isRefreshing", !1), // 初始化配置对象
+k(g, "initConfig", {}), // 保存当前Axios实例对象
+k(g, "axiosInstance", Axios.create(defaultConfig));
+let SuHttp = g;
 const http = new SuHttp(), lunarCalendar = {
   /**
    * 农历1900-2100的润大小信息表
@@ -2346,55 +2387,55 @@ const http = new SuHttp(), lunarCalendar = {
       return -1;
     let i;
     o ? i = new Date(o, parseInt(r.toString()) - 1, c) : i = /* @__PURE__ */ new Date();
-    let Z, t = 0, v = 0;
+    let Z, e = 0, t = 0;
     o = 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--);
+      t = this.lYearDays(Z), d -= t;
+    d < 0 && (d += t, Z--);
     const f = /* @__PURE__ */ new Date();
     let m = !1;
     f.getFullYear() === o && f.getMonth() + 1 === r && f.getDate() === c && (m = !0);
-    let H = i.getDay();
-    const b = this.nStr1[H];
-    H === 0 && (H = 7);
-    const M = Z;
-    t = this.leapMonth(Z);
+    let u = i.getDay();
+    const V = this.nStr1[u];
+    u === 0 && (u = 7);
+    const p = Z;
+    e = this.leapMonth(Z);
     let n = !1;
     for (Z = 1; Z < 13 && d > 0; Z++)
-      t > 0 && Z === t + 1 && n === !1 ? (--Z, n = !0, v = this.leapDays(M)) : v = this.monthDays(M, Z), n === !0 && Z === t + 1 && (n = !1), d -= v;
-    d === 0 && t > 0 && Z === t + 1 && (n ? n = !1 : (n = !0, --Z)), d < 0 && (d += v, --Z);
-    const s = Z, C = d + 1, g = r - 1, k = this.toGanZhiYear(M), L = this.getTerm(o, r * 2 - 1), y = this.getTerm(o, r * 2);
-    let e = this.toGanZhi((o - 1900) * 12 + r + 11);
-    c >= L && (e = this.toGanZhi((o - 1900) * 12 + r + 12));
-    let u = !1, V;
-    L === c && (u = !0, V = this.solarTerm[r * 2 - 2]), y === c && (u = !0, V = this.solarTerm[r * 2 - 1]);
-    const p = Date.UTC(o, g, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, A = this.toGanZhi(p + c - 1), x = this.toAstro(r, c), I = o + "-" + r + "-" + c, D = M + "-" + s + "-" + C, E = this.festival, N = this.lFestival, R = r + "-" + c;
-    let F = s + "-" + C;
-    return s === 12 && C === 29 && this.monthDays(M, s) === 29 && (F = "12-30"), {
-      date: I,
+      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 L = Z, C = d + 1, A = r - 1, w = this.toGanZhiYear(p), H = this.getTerm(o, r * 2 - 1), I = this.getTerm(o, r * 2);
+    let v = this.toGanZhi((o - 1900) * 12 + r + 11);
+    c >= H && (v = this.toGanZhi((o - 1900) * 12 + r + 12));
+    let M = !1, b;
+    H === c && (M = !0, b = this.solarTerm[r * 2 - 2]), I === c && (M = !0, b = this.solarTerm[r * 2 - 1]);
+    const s = Date.UTC(o, A, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, y = this.toGanZhi(s + c - 1), S = this.toAstro(r, c), x = o + "-" + r + "-" + c, D = p + "-" + L + "-" + C, E = this.festival, N = this.lFestival, R = r + "-" + c;
+    let F = L + "-" + C;
+    return L === 12 && C === 29 && this.monthDays(p, L) === 29 && (F = "12-30"), {
+      date: x,
       lunarDate: D,
       festival: E[R] ? E[R].title : null,
       lunarFestival: N[F] ? N[F].title : null,
-      lYear: M,
-      lMonth: s,
+      lYear: p,
+      lMonth: L,
       lDay: C,
-      Animal: this.getAnimal(M),
-      IMonthCn: (n ? "闰" : "") + this.toChinaMonth(s),
+      Animal: this.getAnimal(p),
+      IMonthCn: (n ? "闰" : "") + this.toChinaMonth(L),
       IDayCn: this.toChinaDay(C),
       cYear: o,
       cMonth: r,
       cDay: c,
-      gzYear: k,
-      gzMonth: e,
-      gzDay: A,
+      gzYear: w,
+      gzMonth: v,
+      gzDay: y,
       isToday: m,
       isLeap: n,
-      nWeek: H,
-      ncWeek: "星期" + b,
-      isTerm: u,
-      Term: V,
-      astro: x
+      nWeek: u,
+      ncWeek: "星期" + V,
+      isTerm: M,
+      Term: b,
+      astro: S
     };
   },
   /**
@@ -2416,15 +2457,15 @@ const http = new SuHttp(), lunarCalendar = {
     let i = c;
     if (o && (i = this.leapDays(a)), a < 1900 || a > 2100 || h > i)
       return -1;
-    let Z = 0, t;
-    for (t = 1900; t < a; t++)
-      Z += this.lYearDays(t);
-    let v = 0, d = !1;
-    for (t = 1; t < l; t++)
-      v = this.leapMonth(a), d || v <= t && v > 0 && (Z += this.leapDays(a), d = !0), Z += this.monthDays(a, t);
+    let Z = 0, e;
+    for (e = 1900; e < a; e++)
+      Z += this.lYearDays(e);
+    let t = 0, d = !1;
+    for (e = 1; e < l; e++)
+      t = this.leapMonth(a), d || t <= e && t > 0 && (Z += this.leapDays(a), d = !0), Z += this.monthDays(a, e);
     o && (Z += c);
-    const f = Date.UTC(1900, 1, 30, 0, 0, 0), m = new Date((Z + h - 31) * 864e5 + f), H = m.getUTCFullYear(), b = m.getUTCMonth() + 1, M = m.getUTCDate();
-    return this.solar2lunar(H, b, M);
+    const f = Date.UTC(1900, 1, 30, 0, 0, 0), m = new Date((Z + h - 31) * 864e5 + f), u = m.getUTCFullYear(), V = m.getUTCMonth() + 1, p = m.getUTCDate();
+    return this.solar2lunar(u, V, p);
   }
 }, dict = storageLocal.getItem("kLov"), formats = {
   formatDate: {
@@ -2491,7 +2532,7 @@ const http = new SuHttp(), lunarCalendar = {
       const [h, o] = l;
       let r;
       return (c = a[h]) == null || c.split(",").forEach((i) => {
-        const Z = o.find((t) => t.value === i);
+        const Z = o.find((e) => e.value === i);
         r = r ? `${r},${Z == null ? void 0 : Z.label}` : Z == null ? void 0 : Z.label;
       }), r;
     }