@utogether/utils 3.0.0-beta.48 → 3.0.0-beta.49

package/dist/utils.es.js

@@ -1,6 +1,6 @@
-var j = Object.defineProperty;
-var z = (l, a, o) => a in l ? j(l, a, { enumerable: !0, configurable: !0, writable: !0, value: o }) : l[a] = o;
-var S = (l, a, o) => z(l, typeof a != "symbol" ? a + "" : a, o);
+var z = Object.defineProperty;
+var j = (l, a, o) => a in l ? z(l, a, { enumerable: !0, configurable: !0, writable: !0, value: o }) : l[a] = o;
+var x = (l, a, o) => j(l, typeof a != "symbol" ? a + "" : a, o);
 import { createVNode, resolveComponent, mergeProps, Fragment, createTextVNode, 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, merge, has } from "xe-utils";
@@ -12,9 +12,9 @@ import NProgress from "nprogress";
 import { default as G } from "nprogress";
 class sessionStorageProxy {
   constructor(a) {
-    S(this, "storage");
-    S(this, "prefix");
-    S(this, "addPrefix", (a) => {
+    x(this, "storage");
+    x(this, "prefix");
+    x(this, "addPrefix", (a) => {
       this.prefix = a;
     });
     this.storage = a;
@@ -46,7 +46,7 @@ class localStorageProxy extends sessionStorageProxy {
 }
 class localforageProxy {
   constructor() {
-    S(this, "storage");
+    x(this, "storage");
     localforage.config({
       name: "uapp",
       storeName: "udb"
@@ -140,8 +140,8 @@ function init(l, a) {
 init({ read: DEFAULT_CODEC.decodeValue, write: DEFAULT_CODEC.encodeValue }, DEFAULT_ATTRIBUTES);
 class Cookies {
   constructor() {
-    S(this, "prefix", null);
-    S(this, "addPrefix", (a) => {
+    x(this, "prefix", null);
+    x(this, "addPrefix", (a) => {
       this.prefix = a;
     });
   }
@@ -204,48 +204,56 @@ const VxetableRender = (VXETable, {
         label: t = "label",
         value: d = "value"
       } = Z, {
-        loading: f = !1,
-        multiple: n
-      } = i, m = useComponent(), M = n ? `_${r.field}` : r.field;
-      m.setDefaultValue(i, h, r.field);
-      function C(u) {
-        m.remote(u, r.field, l);
+        loading: m = !1,
+        multiple: f,
+        isOptionsColumn: b,
+        optionsColumnField: p
+      } = i, s = useComponent(), M = f ? `_${r.field}` : r.field;
+      s.setDefaultValue(i, h, r.field);
+      function n(V) {
+        s.remote(V, r.field, l);
       }
-      function p(u) {
-        m.selectChange(u, h, r.field, l, {
+      function C(V) {
+        s.selectChange(V, h, r.field, l, {
           column: r,
           datasource: "row"
         });
       }
-      function V(u) {
-        c != null && c.input && c.input(a, u);
+      function w(V) {
+        c != null && c.input && c.input(a, V);
       }
-      function s() {
-        m.clear(h, r.field, l, "row");
+      function k() {
+        s.clear(h, r.field, l, "row");
       }
-      function w() {
-        !e.length && C(""), c != null && c.focus && c.focus(a, r.field);
+      function I() {
+        !e.length && n(""), c != null && c.focus && c.focus(a, r.field);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[M],
-        "onUpdate:modelValue": (u) => h[M] = u,
+        "onUpdate:modelValue": (V) => h[M] = V,
         filterable: !0,
         remote: !0,
         clearable: !0,
         placeholder: "请录入关键字搜索",
         style: "width: 100%",
-        "remote-method": C,
-        loading: f
+        "remote-method": n,
+        loading: m
       }, i, {
-        onFocus: () => w(),
-        onChange: (u) => p(u),
-        onClear: () => s(),
-        onInput: (u) => V(u)
-      }), _isSlot(o = e.map((u) => createVNode(resolveComponent("el-option"), {
-        key: u[d],
-        label: u[t],
-        value: u[d]
-      }, null))) ? o : {
+        onFocus: () => I(),
+        onChange: (V) => C(V),
+        onClear: () => k(),
+        onInput: (V) => w(V)
+      }), _isSlot(o = e.map((V) => createVNode(resolveComponent("el-option"), {
+        key: V[d],
+        label: V[t],
+        value: V[d]
+      }, {
+        default: () => [b ? createVNode(Fragment, null, [createVNode("span", {
+          style: "float: left"
+        }, [createTextVNode(" "), V[t], createTextVNode(" ")]), createVNode("span", {
+          style: " float: right; color: var(--el-text-color-secondary); font-size: 13px"
+        }, [V[p] || V[d] || null])]) : null]
+      }))) ? o : {
         default: () => [o]
       })];
     },
@@ -263,48 +271,56 @@ const VxetableRender = (VXETable, {
         label: t = "label",
         value: d = "value"
       } = Z, {
-        loading: f = !1,
-        multiple: n
-      } = i, m = useComponent(), M = n ? `_${r.field}` : r.field;
-      m.setDefaultValue(i, h, r.field);
-      function C(u) {
-        m.remote(u, r.field, l);
+        loading: m = !1,
+        multiple: f,
+        isOptionsColumn: b,
+        optionsColumnField: p
+      } = i, s = useComponent(), M = f ? `_${r.field}` : r.field;
+      s.setDefaultValue(i, h, r.field);
+      function n(V) {
+        s.remote(V, r.field, l);
       }
-      function p(u) {
-        m.selectChange(u, h, r.field, l, {
+      function C(V) {
+        s.selectChange(V, h, r.field, l, {
           column: r,
           datasource: "row"
         });
       }
-      function V(u) {
-        c != null && c.input && c.input(a, u);
+      function w(V) {
+        c != null && c.input && c.input(a, V);
       }
-      function s() {
-        m.clear(h, r.field, l, "row");
+      function k() {
+        s.clear(h, r.field, l, "row");
       }
-      function w() {
-        !e.length && C(""), c != null && c.focus && c.focus(a, r.field);
+      function I() {
+        !e.length && n(""), c != null && c.focus && c.focus(a, r.field);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[M],
-        "onUpdate:modelValue": (u) => h[M] = u,
+        "onUpdate:modelValue": (V) => h[M] = V,
         filterable: !0,
         remote: !0,
         clearable: !0,
         placeholder: "请录入关键字搜索",
         style: "width: 100%",
-        "remote-method": C,
-        loading: f
+        "remote-method": n,
+        loading: m
       }, i, {
-        onFocus: () => w(),
-        onChange: (u) => p(u),
-        onClear: () => s(),
-        onInput: (u) => V(u)
-      }), _isSlot(o = e.map((u) => createVNode(resolveComponent("el-option"), {
-        key: u[d],
-        label: u[t],
-        value: u[d]
-      }, null))) ? o : {
+        onFocus: () => I(),
+        onChange: (V) => C(V),
+        onClear: () => k(),
+        onInput: (V) => w(V)
+      }), _isSlot(o = e.map((V) => createVNode(resolveComponent("el-option"), {
+        key: V[d],
+        label: V[t],
+        value: V[d]
+      }, {
+        default: () => [b ? createVNode(Fragment, null, [createVNode("span", {
+          style: "float: left"
+        }, [createTextVNode(" "), V[t], createTextVNode(" ")]), createVNode("span", {
+          style: " float: right; color: var(--el-text-color-secondary); font-size: 13px"
+        }, [V[p] || V[d] || null])]) : null]
+      }))) ? o : {
         default: () => [o]
       })];
     },
@@ -336,47 +352,55 @@ const VxetableRender = (VXETable, {
         label: t = "label",
         value: d = "value"
       } = Z, {
-        multiple: f,
-        loading: n = !1
-      } = i, m = useComponent(), M = f ? `_${r}` : r;
-      m.setDefaultValue(i, h, r);
-      async function C(u) {
-        m.remote(u, r, l);
+        multiple: m,
+        loading: f = !1,
+        isOptionsColumn: b,
+        optionsColumnField: p
+      } = i, s = useComponent(), M = m ? `_${r}` : r;
+      s.setDefaultValue(i, h, r);
+      async function n(V) {
+        s.remote(V, r, l);
       }
-      function p(u) {
-        m.selectChange(u, h, r, l, {
+      function C(V) {
+        s.selectChange(V, h, r, l, {
           datasource: "data"
         });
       }
-      function V(u) {
-        c != null && c.input && c.input(a, u);
+      function w(V) {
+        c != null && c.input && c.input(a, V);
       }
-      function s() {
-        m.clear(h, r, l, "data");
+      function k() {
+        s.clear(h, r, l, "data");
       }
-      function w() {
-        !e.length && C(""), c != null && c.focus && c.focus(a);
+      function I() {
+        !e.length && n(""), c != null && c.focus && c.focus(a);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[M],
-        "onUpdate:modelValue": (u) => h[M] = u,
+        "onUpdate:modelValue": (V) => h[M] = V,
         filterable: !0,
         remote: !0,
         clearable: !0,
         style: "width: 100%",
         placeholder: "请录入关键字搜索",
-        loading: n,
-        "remote-method": C
+        loading: f,
+        "remote-method": n
       }, i, {
-        onFocus: () => w(),
-        onChange: (u) => p(u),
-        onClear: () => s(),
-        onInput: () => V()
-      }), _isSlot(o = e.map((u) => createVNode(resolveComponent("el-option"), {
-        key: u[d],
-        label: u[t],
-        value: u[d]
-      }, null))) ? o : {
+        onFocus: () => I(),
+        onChange: (V) => C(V),
+        onClear: () => k(),
+        onInput: () => w()
+      }), _isSlot(o = e.map((V) => createVNode(resolveComponent("el-option"), {
+        key: V[d],
+        label: V[t],
+        value: V[d]
+      }, {
+        default: () => [b ? createVNode(Fragment, null, [createVNode("span", {
+          style: "float: left"
+        }, [createTextVNode(" "), V[t], createTextVNode(" ")]), createVNode("span", {
+          style: " float: right; color: var(--el-text-color-secondary); font-size: 13px"
+        }, [V[p] || V[d] || null])]) : null]
+      }))) ? o : {
         default: () => [o]
       })];
     }
@@ -437,39 +461,39 @@ const VxetableRender = (VXETable, {
         value: t = "value"
       } = Z, {
         multiple: d,
-        isOptionsColumn: f,
-        optionsColumnField: n
-      } = i, m = useComponent(), M = d ? `_${r.field}` : r.field;
-      m.setDefaultValue(i, h, r.field);
-      function C(V) {
-        m.selectChange(V, h, r.field, l, {
+        isOptionsColumn: m,
+        optionsColumnField: f
+      } = i, b = useComponent(), p = d ? `_${r.field}` : r.field;
+      b.setDefaultValue(i, h, r.field);
+      function s(n) {
+        b.selectChange(n, h, r.field, l, {
           column: r,
           datasource: "row"
         });
       }
-      function p() {
-        m.clear(h, r.field, l, "row");
+      function M() {
+        b.clear(h, r.field, l, "row");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
-        modelValue: h[M],
-        "onUpdate:modelValue": (V) => h[M] = V,
+        modelValue: h[p],
+        "onUpdate:modelValue": (n) => h[p] = n,
         filterable: !0,
         clearable: !0
       }, i, {
         style: "width: 100%",
         class: "udp-select-wrapper",
-        onChange: (V) => C(V),
-        onClear: () => p()
-      }), _isSlot(o = e.map((V) => createVNode(resolveComponent("el-option"), {
-        key: V[t],
-        label: V[c],
-        value: V[t]
+        onChange: (n) => s(n),
+        onClear: () => M()
+      }), _isSlot(o = e.map((n) => createVNode(resolveComponent("el-option"), {
+        key: n[t],
+        label: n[c],
+        value: n[t]
       }, {
-        default: () => [f ? createVNode(Fragment, null, [createVNode("span", {
+        default: () => [m ? createVNode(Fragment, null, [createVNode("span", {
           style: "float: left"
-        }, [createTextVNode(" "), V[c], createTextVNode(" ")]), createVNode("span", {
+        }, [createTextVNode(" "), n[c], createTextVNode(" ")]), createVNode("span", {
           style: " float: right; color: var(--el-text-color-secondary); font-size: 13px"
-        }, [V[n || t] || null])]) : null]
+        }, [n[f] || n[t] || null])]) : null]
       }))) ? o : {
         default: () => [o]
       })];
@@ -488,39 +512,39 @@ const VxetableRender = (VXETable, {
         value: t = "value",
         extLabel: d
       } = Z, {
-        multiple: f,
-        isOptionsColumn: n,
-        optionsColumnField: m
-      } = i, M = useComponent(), C = f ? `_${r.field}` : r.field;
-      M.setDefaultValue(i, h, r.field);
-      function p(s) {
-        M.selectChange(s, h, r.field, l, {
+        multiple: m,
+        isOptionsColumn: f,
+        optionsColumnField: b
+      } = i, p = useComponent(), s = m ? `_${r.field}` : r.field;
+      p.setDefaultValue(i, h, r.field);
+      function M(C) {
+        p.selectChange(C, h, r.field, l, {
           column: r,
           datasource: "row"
         });
       }
-      function V() {
-        M.clear(h, r.field, l, "row");
+      function n() {
+        p.clear(h, r.field, l, "row");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
-        modelValue: h[C],
-        "onUpdate:modelValue": (s) => h[C] = s,
+        modelValue: h[s],
+        "onUpdate:modelValue": (C) => h[s] = C,
         filterable: !0,
         clearable: !0
       }, i, {
         style: "width: 100%",
-        onChange: (s) => p(s),
-        onClear: () => V()
-      }), _isSlot(o = e.map((s) => createVNode(resolveComponent("el-option"), {
-        key: s[t],
-        label: d && s[d] ? s[t] : s[c],
-        value: s[t]
+        onChange: (C) => M(C),
+        onClear: () => n()
+      }), _isSlot(o = e.map((C) => createVNode(resolveComponent("el-option"), {
+        key: C[t],
+        label: d && C[d] ? C[t] : C[c],
+        value: C[t]
       }, {
-        default: () => [n ? createVNode(Fragment, null, [createVNode("span", {
+        default: () => [f ? createVNode(Fragment, null, [createVNode("span", {
           style: "float: left"
-        }, [createTextVNode(" "), s[c], createTextVNode(" ")]), createVNode("span", {
+        }, [createTextVNode(" "), C[c], createTextVNode(" ")]), createVNode("span", {
           style: " float: right; color: var(--el-text-color-secondary); font-size: 13px"
-        }, [s[m || t] || null])]) : null]
+        }, [C[b] || C[t] || null])]) : null]
       }))) ? o : {
         default: () => [o]
       })];
@@ -558,38 +582,38 @@ const VxetableRender = (VXETable, {
         label: c = "label",
         value: t = "value"
       } = Z, d = useComponent(), {
-        multiple: f,
-        isOptionsColumn: n,
-        optionsColumnField: m
-      } = i, M = f ? `_${r}` : r;
-      f && d.setDefaultValue(i, h, r);
-      function C(V) {
-        d.selectChange(V, h, r, l, {
+        multiple: m,
+        isOptionsColumn: f,
+        optionsColumnField: b
+      } = i, p = m ? `_${r}` : r;
+      m && d.setDefaultValue(i, h, r);
+      function s(n) {
+        d.selectChange(n, h, r, l, {
           datasource: "data"
         });
       }
-      function p() {
+      function M() {
         d.clear(h, r, l, "data");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
-        modelValue: h[M],
-        "onUpdate:modelValue": (V) => h[M] = V,
+        modelValue: h[p],
+        "onUpdate:modelValue": (n) => h[p] = n,
         filterable: !0,
         clearable: !0,
         style: "width: 100%"
       }, i, {
-        onChange: (V) => C(V),
-        onClear: () => p()
-      }), _isSlot(o = e.map((V) => createVNode(resolveComponent("el-option"), {
-        key: V[t],
-        label: V[c],
-        value: V[t]
+        onChange: (n) => s(n),
+        onClear: () => M()
+      }), _isSlot(o = e.map((n) => createVNode(resolveComponent("el-option"), {
+        key: n[t],
+        label: n[c],
+        value: n[t]
       }, {
-        default: () => [n ? createVNode(Fragment, null, [createVNode("span", {
+        default: () => [f ? createVNode(Fragment, null, [createVNode("span", {
           style: "float: left"
-        }, [createTextVNode(" "), V[c], createTextVNode(" ")]), createVNode("span", {
+        }, [createTextVNode(" "), n[c], createTextVNode(" ")]), createVNode("span", {
           style: " float: right; color: var(--el-text-color-secondary); font-size: 13px"
-        }, [V[m || t] || null])]) : null]
+        }, [n[b] || n[t] || null])]) : null]
       }))) ? o : {
         default: () => [o]
       })];
@@ -606,36 +630,36 @@ const VxetableRender = (VXETable, {
         defaultValues: Z
       } = r;
       Z && (o[h] = Z);
-      function c(d, f) {
+      function c(d, m) {
         const {
-          mapField: n,
-          field: m,
-          displayName: M,
-          multiple: C
+          mapField: f,
+          field: b,
+          displayName: p,
+          multiple: s
         } = r;
-        if (C) {
-          if (C) {
-            const V = {};
-            o[M || m] = d.reduce((s, w) => {
-              for (const u in n)
-                V[u] = s ? V[u] + "," + w[n[u]] : w[n[u]];
-              return s = s ? s + "," + w[M || m] : w[M || m], s;
-            }, ""), Object.assign(o, V);
+        if (s) {
+          if (s) {
+            const n = {};
+            o[p || b] = d.reduce((C, w) => {
+              for (const k in f)
+                n[k] = C ? n[k] + "," + w[f[k]] : w[f[k]];
+              return C = C ? C + "," + w[p || b] : w[p || b], C;
+            }, ""), Object.assign(o, n);
           }
         } else {
-          const V = {
-            [M || m]: d[f || M || m]
+          const n = {
+            [p || b]: d[m || p || b]
           };
-          for (const s in n)
-            V[s] = d[n[s]];
-          Object.assign(o, V);
+          for (const C in f)
+            n[C] = d[f[C]];
+          Object.assign(o, n);
         }
-        const p = {
+        const M = {
           data: o,
           options: d,
-          field: m
+          field: b
         };
-        e != null && e.change && e.change(p);
+        e != null && e.change && e.change(M);
       }
       function t() {
         i.clear(o, h, l, "data");
@@ -644,7 +668,7 @@ const VxetableRender = (VXETable, {
         record: o
       }, r, {
         mode: "vxe",
-        onChange: (d, f) => c(d, f),
+        onChange: (d, m) => c(d, m),
         onClear: () => t()
       }), null)];
     },
@@ -659,26 +683,26 @@ const VxetableRender = (VXETable, {
       } = l, i = useComponent();
       function Z(t, d) {
         const {
-          mapField: f,
-          field: n,
-          displayName: m,
-          multiple: M
+          mapField: m,
+          field: f,
+          displayName: b,
+          multiple: p
         } = r;
-        if (!M) {
-          const p = {
-            [m || n]: t[d || m || n]
+        if (!p) {
+          const M = {
+            [b || f]: t[d || b || f]
           };
-          for (const V in f)
-            p[V] = t[f[V]];
-          Object.assign(o, p);
+          for (const n in m)
+            M[n] = t[m[n]];
+          Object.assign(o, M);
         }
-        const C = {
+        const s = {
           row: o,
           options: t,
           field: h.field,
           column: h
         };
-        e != null && e.change && e.change(C);
+        e != null && e.change && e.change(s);
       }
       function c() {
         i.clear(o, h.field, l, "row");
@@ -703,26 +727,26 @@ const VxetableRender = (VXETable, {
       } = l, i = useComponent();
       function Z(t, d) {
         const {
-          mapField: f,
-          field: n,
-          displayName: m,
-          multiple: M
+          mapField: m,
+          field: f,
+          displayName: b,
+          multiple: p
         } = r;
-        if (!M) {
-          const p = {
-            [m || n]: t[d || m || n]
+        if (!p) {
+          const M = {
+            [b || f]: t[d || b || f]
           };
-          for (const V in f)
-            p[V] = t[f[V]];
-          Object.assign(o, p);
+          for (const n in m)
+            M[n] = t[m[n]];
+          Object.assign(o, M);
         }
-        const C = {
+        const s = {
           row: o,
           options: t,
           field: h.field,
           column: h
         };
-        e != null && e.change && e.change(C);
+        e != null && e.change && e.change(s);
       }
       function c() {
         i.clear(o, h.field, l, "row");
@@ -1061,8 +1085,8 @@ const VxetableRender = (VXETable, {
         mapField: d
       } = c;
       if (r[e] = null, c != null && c.multiple && (r[`_${e}`] = []), !isEmpty(d))
-        for (const f in d)
-          r[f] = null;
+        for (const m in d)
+          r[m] = null;
       t != null && t.clear && t.clear({
         [Z]: r,
         field: e
@@ -1075,21 +1099,21 @@ const VxetableRender = (VXETable, {
         events: t
       } = i, {
         fetchField: d,
-        url: f,
-        defaultParams: n = {},
-        method: m = "get"
-      } = c, M = getCookieParam(), C = Object.assign({
+        url: m,
+        defaultParams: f = {},
+        method: b = "get"
+      } = c, p = getCookieParam(), s = Object.assign({
         pageSize: 20,
         pageNum: 1,
-        ...M,
-        ...n
+        ...p,
+        ...f
       }, {
         [d || e]: r
       });
       if (c.loading) return;
-      let p;
+      let M;
       try {
-        Z.length = 0, c.loading = !0, p = await serviceApi[m](f, C), t != null && t.filterMethod ? Z.push(...t.filterMethod(p.list || p)) : p && (p.list ? Z.push(...p.list) : Z.push(...p));
+        Z.length = 0, c.loading = !0, M = await serviceApi[b](m, s), t != null && t.filterMethod ? Z.push(...t.filterMethod(M.list || M)) : M && (M.list ? Z.push(...M.list) : Z.push(...M));
       } finally {
         c.loading = !1;
       }
@@ -1099,29 +1123,29 @@ const VxetableRender = (VXETable, {
       const {
         datasource: d
       } = c, {
-        options: f,
-        props: n,
-        optionProps: m = {},
-        events: M
-      } = Z, C = {
+        options: m,
+        props: f,
+        optionProps: b = {},
+        events: p
+      } = Z, s = {
         [d]: e,
         field: i
       };
-      e[i] = null, !isEmpty(r) && (n != null && n.multiple) ? (e[i] = r.join(","), t = [], r.forEach((p) => {
-        const V = f.find((s) => p === s[m == null ? void 0 : m.value]);
-        V && !isEmpty(n.mapField) && isObject(n.mapField) && Object.keys(n.mapField).forEach((s) => {
-          const w = V[n.mapField[s]], u = e[s] ? e[s].toString() : "";
-          e[s] = u && !u.includes(w) ? `${u},${w}` : w;
-        }), V && t.push(V);
-      }), Object.assign(C, {
+      e[i] = null, !isEmpty(r) && (f != null && f.multiple) ? (e[i] = r.join(","), t = [], r.forEach((M) => {
+        const n = m.find((C) => M === C[b == null ? void 0 : b.value]);
+        n && !isEmpty(f.mapField) && isObject(f.mapField) && Object.keys(f.mapField).forEach((C) => {
+          const w = n[f.mapField[C]], k = e[C] ? e[C].toString() : "";
+          e[C] = k && !k.includes(w) ? `${k},${w}` : w;
+        }), n && t.push(n);
+      }), Object.assign(s, {
         options: t
-      })) : (e[i] = n != null && n.multiple ? null : r, t = f.find((p) => r === p[m == null ? void 0 : m.value]), !isEmpty(n.mapField) && isObject(n.mapField) && Object.keys(n.mapField).forEach((p) => {
-        e[p] = t ? t[n.mapField[p]] : null;
-      }), Object.assign(C, {
+      })) : (e[i] = f != null && f.multiple ? null : r, t = m.find((M) => r === M[b == null ? void 0 : b.value]), !isEmpty(f.mapField) && isObject(f.mapField) && Object.keys(f.mapField).forEach((M) => {
+        e[M] = t ? t[f.mapField[M]] : null;
+      }), Object.assign(s, {
         option: t
-      })), d === "row" && Object.assign(C, {
+      })), d === "row" && Object.assign(s, {
         column: c.column
-      }), M != null && M.change && M.change(C);
+      }), p != null && p.change && p.change(s);
     },
     setDefaultValue: (r, e, i) => {
       var d;
@@ -1129,8 +1153,8 @@ const VxetableRender = (VXETable, {
         multiple: Z,
         defaultValue: c
       } = r, t = Z ? `_${i}` : i;
-      !e[i] && c && (e[i] = c, isPlainObject(c) && Object.keys(c).forEach((n) => {
-        e[n] = e[n] || c[n];
+      !e[i] && c && (e[i] = c, isPlainObject(c) && Object.keys(c).forEach((f) => {
+        e[f] = e[f] || c[f];
       })), !e[t] && e[i] && (e[t] = Z ? (d = e[i]) == null ? void 0 : d.split(",") : e[i]);
     }
   }), onCheckChange = (l, a, o, h) => {
@@ -1198,8 +1222,8 @@ function useWatermark(l = ref(document.body)) {
   const a = useRafThrottle(function() {
     const t = unref(l);
     if (!t) return;
-    const { clientHeight: d, clientWidth: f } = t;
-    i({ height: d, width: f });
+    const { clientHeight: d, clientWidth: m } = t;
+    i({ height: d, width: m });
   }), o = domSymbol.toString(), h = shallowRef(), r = () => {
     const t = unref(h);
     h.value = void 0;
@@ -1207,10 +1231,10 @@ function useWatermark(l = ref(document.body)) {
     d && (t && d.removeChild(t), removeResizeListener(d, a));
   };
   function e(t, d) {
-    const f = document.createElement("canvas"), n = 260, m = 180;
-    Object.assign(f, { width: n, height: m });
-    const M = f.getContext("2d");
-    return M && (M.rotate(-20 * Math.PI / 120), M.font = (d == null ? void 0 : d.font) ?? "15px Reggae One", M.fillStyle = (d == null ? void 0 : d.fillStyle) ?? "rgba(180, 180, 180, 0.75)", M.textAlign = "left", M.textBaseline = "middle", M.fillText(t, n / 20, m)), f.toDataURL("image/png");
+    const m = document.createElement("canvas"), f = 260, b = 180;
+    Object.assign(m, { width: f, height: b });
+    const p = m.getContext("2d");
+    return p && (p.rotate(-20 * Math.PI / 120), p.font = (d == null ? void 0 : d.font) ?? "15px Reggae One", p.fillStyle = (d == null ? void 0 : d.fillStyle) ?? "rgba(180, 180, 180, 0.75)", p.textAlign = "left", p.textBaseline = "middle", p.fillText(t, f / 20, b)), m.toDataURL("image/png");
   }
   function i(t = {}) {
     const d = unref(h);
@@ -1222,12 +1246,12 @@ function useWatermark(l = ref(document.body)) {
   const Z = (t, d) => {
     if (unref(h))
       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 n = unref(l);
-    if (!n) return o;
-    const { clientHeight: m, clientWidth: M } = n;
-    return i({ str: t, width: M, height: m, attr: d }), n.appendChild(f), 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 f = unref(l);
+    if (!f) return o;
+    const { clientHeight: b, clientWidth: p } = f;
+    return i({ str: t, width: p, height: b, attr: d }), f.appendChild(m), o;
   };
   function c(t, d) {
     Z(t, d), addResizeListener(document.documentElement, a), getCurrentInstance() && onBeforeUnmount(() => {
@@ -1250,36 +1274,36 @@ function useAttrs(l = {}) {
   }), r;
 }
 const i18n = window.$i18n, useRender = () => {
-  const l = { value: "dictCode", label: "dictName" }, a = (v, H) => {
-    var D;
-    const b = g(H);
+  const l = { value: "dictCode", label: "dictName" }, a = (v, u) => {
+    var T;
+    const H = g(u);
     let y = {
       clearable: !0,
       disabled: !1,
       showValue: !1,
       placeholder: null
-    }, L, k;
-    isObject(v) ? (y = Object.assign(y, v), L = v.defaultValue, k = v == null ? void 0 : v.code) : k = v;
-    const x = (D = storageLocal.getItem("kLov")[k]) == null ? void 0 : D.children, N = x ? x.filter((E) => E.enabled === "1") : [];
+    }, L, S;
+    isObject(v) ? (y = Object.assign(y, v), L = v.defaultValue, S = v == null ? void 0 : v.code) : S = v;
+    const N = (T = storageLocal.getItem("kLov")[S]) == null ? void 0 : T.children, D = N ? N.filter((E) => E.enabled === "1") : [];
     return {
       name: "#select",
       optionProps: l,
-      options: N,
+      options: D,
       props: y,
       defaultValue: L,
-      events: b
+      events: H
     };
-  }, o = (v, H) => {
-    const b = g(H);
+  }, o = (v, u) => {
+    const H = g(u);
     return {
       name: "#SuSelect",
       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
+      events: H
     };
-  }, h = (v, H) => {
-    const b = {
+  }, h = (v, u) => {
+    const H = {
       optionProps: { extLabel: "userName", value: "employeeName" },
       props: {
         attrs: { disabled: v == null ? void 0 : v.disabled },
@@ -1290,9 +1314,9 @@ const i18n = window.$i18n, useRender = () => {
         fetchField: "employeeName"
       }
     };
-    return o(b, H);
+    return o(H, u);
   }, r = (v) => {
-    const H = {
+    const u = {
       optionProps: { label: "userName", value: "userName" },
       props: {
         code: "sys/listUsers",
@@ -1301,9 +1325,9 @@ const i18n = window.$i18n, useRender = () => {
         mapField: v == null ? void 0 : v.mapField
       }
     };
-    return o(H);
-  }, e = (v, H) => {
-    const b = {
+    return o(u);
+  }, e = (v, u) => {
+    const H = {
       label: "organizationName",
       value: (v == null ? void 0 : v.field) || "organizationName"
     }, y = {
@@ -1319,12 +1343,12 @@ const i18n = window.$i18n, useRender = () => {
     return Object.assign(y.mapField, L, (v == null ? void 0 : v.mapField) || {}), {
       name: "#SuSelect",
       props: y,
-      optionProps: b,
+      optionProps: H,
       options: [],
-      events: g(H)
+      events: g(u)
     };
-  }, i = (v, H) => {
-    const b = {
+  }, i = (v, u) => {
+    const H = {
       label: "orgName",
       value: (v == null ? void 0 : v.field) || "orgName"
     }, y = {
@@ -1337,46 +1361,46 @@ const i18n = window.$i18n, useRender = () => {
     return Object.assign(y.mapField, L, (v == null ? void 0 : v.mapField) || {}), {
       name: "#SuSelect",
       props: y,
-      optionProps: b,
+      optionProps: H,
       options: [],
-      events: g(H)
+      events: g(u)
     };
-  }, Z = (v, H) => {
-    const b = Object.assign({ disabled: !1 }, v), y = b == null ? void 0 : b.defaultValue;
+  }, Z = (v, u) => {
+    const H = Object.assign({ disabled: !1 }, v), y = H == null ? void 0 : H.defaultValue;
     return {
       name: "VxeInput",
-      props: b,
+      props: H,
       defaultValue: y,
-      events: g(H)
+      events: g(u)
     };
-  }, c = (v, H) => {
-    const b = Object.assign({ disabled: !1, rows: 3 }, v), y = b == null ? void 0 : b.defaultValue;
+  }, c = (v, u) => {
+    const H = Object.assign({ disabled: !1, rows: 3 }, v), y = H == null ? void 0 : H.defaultValue;
     return {
       name: "VxeTextarea",
-      props: b,
+      props: H,
       defaultValue: y,
-      events: g(H)
+      events: g(u)
     };
-  }, t = (v, H) => {
-    const b = "VxeCheckboxGroup", { defaultValue: y, options: L, props: k } = f(v);
-    return { name: b, defaultValue: y, options: L, props: k, events: g(H) };
-  }, d = (v, H) => {
-    const b = "VxeRadioGroup", { defaultValue: y, options: L, props: k } = f(v);
-    return { name: b, defaultValue: y, options: L, props: k, events: g(H) };
-  }, f = (v) => {
-    var x;
-    let H = { disabled: !1 }, b;
+  }, t = (v, u) => {
+    const H = "VxeCheckboxGroup", { defaultValue: y, options: L, props: S } = m(v);
+    return { name: H, defaultValue: y, options: L, props: S, events: g(u) };
+  }, d = (v, u) => {
+    const H = "VxeRadioGroup", { defaultValue: y, options: L, props: S } = m(v);
+    return { name: H, defaultValue: y, options: L, props: S, events: g(u) };
+  }, m = (v) => {
+    var N;
+    let u = { disabled: !1 }, H;
     const y = storageLocal.getItem("kLov");
     let L = "";
-    isObject(v) ? (b = v.defaultValue, L = v.code, v.options ? H = Object.assign(H, v.props || {}) : H = Object.assign(H, v || {})) : isString(v) && (L = v);
-    const k = L ? (x = y[L]) == null ? void 0 : x.children.map((N) => ({ label: N.dictName, value: N.dictCode })) : [];
+    isObject(v) ? (H = v.defaultValue, L = v.code, v.options ? u = Object.assign(u, v.props || {}) : u = Object.assign(u, v || {})) : isString(v) && (L = v);
+    const S = L ? (N = y[L]) == null ? void 0 : N.children.map((D) => ({ label: D.dictName, value: D.dictCode })) : [];
     return {
-      props: H,
-      defaultValue: b,
-      options: isObject(v) && v.options ? v.options : k
+      props: u,
+      defaultValue: H,
+      options: isObject(v) && v.options ? v.options : S
     };
-  }, n = (v, H) => {
-    const b = g(H);
+  }, f = (v, u) => {
+    const H = g(u);
     return {
       name: "VxeNumberInput",
       props: Object.assign(
@@ -1384,13 +1408,13 @@ const i18n = window.$i18n, useRender = () => {
         v || {}
       ),
       defaultValue: v == null ? void 0 : v.defaultValue,
-      events: b
+      events: H
     };
-  }, m = (v, H) => {
-    const b = g(H), y = "yyyy-MM-dd HH:mm:ss", L = v == null ? void 0 : v.defaultValue;
-    return { name: "VxeDatePicker", props: Object.assign({ type: "date", valueFormat: y, clearable: !0 }, v || {}), defaultValue: L, events: b };
-  }, M = (v, H) => {
-    const b = g(H), y = "yyyy-MM-dd HH:mm:ss", L = v == null ? void 0 : v.startValue, k = v == null ? void 0 : v.endValue, x = v == null ? void 0 : v.startField, N = v == null ? void 0 : v.endField, D = {
+  }, b = (v, u) => {
+    const H = g(u), y = "yyyy-MM-dd HH:mm:ss", L = v == null ? void 0 : v.defaultValue;
+    return { name: "VxeDatePicker", props: Object.assign({ type: "date", valueFormat: y, clearable: !0 }, v || {}), defaultValue: L, events: H };
+  }, p = (v, u) => {
+    const H = g(u), y = "yyyy-MM-dd HH:mm:ss", L = v == null ? void 0 : v.startValue, S = v == null ? void 0 : v.endValue, N = v == null ? void 0 : v.startField, D = v == null ? void 0 : v.endField, T = {
       type: "date",
       valueFormat: y,
       clearable: !0,
@@ -1427,21 +1451,21 @@ const i18n = window.$i18n, useRender = () => {
           }
         ]
       }
-    }, E = Object.assign(D, v || {});
+    }, E = Object.assign(T, v || {});
     return {
       name: "VxeDateRangePicker",
-      startField: x,
-      endField: N,
+      startField: N,
+      endField: D,
       startValue: L,
-      endValue: k,
+      endValue: S,
       props: E,
-      events: b
+      events: H
     };
-  }, C = (v, H) => {
-    const b = g(H);
-    return { name: "#lov", props: Object.assign({}, v || {}), events: b };
-  }, p = (v, H) => {
-    const b = g(H), y = (v == null ? void 0 : v.optionProps) || {
+  }, s = (v, u) => {
+    const H = g(u);
+    return { name: "#lov", props: Object.assign({}, v || {}), events: H };
+  }, M = (v, u) => {
+    const H = g(u), y = (v == null ? void 0 : v.optionProps) || {
       label: "label",
       value: "value"
     }, L = Object.assign(
@@ -1453,59 +1477,59 @@ const i18n = window.$i18n, useRender = () => {
       optionProps: y,
       options: (v == null ? void 0 : v.options) || [],
       props: L,
-      events: b
+      events: H
     };
-  }, V = (v, H) => {
-    let b = {
+  }, n = (v, u) => {
+    let H = {
       openLabel: "是",
       closeLabel: "否",
       openValue: "Y",
       closeValue: "N"
     }, y = "Y";
-    isObject(v) && !isFunction(v) ? (b = Object.assign(b, v || {}), y = v.defaultValue || y) : !isEmpty(v) && isString(v) && (y = v, b = Object.assign(b, { defaultValue: y }));
-    const L = isFunction(v) ? g(v) : g(H);
-    return { name: "VxeSwitch", props: b, defaultValue: y, events: L };
-  }, s = (v, H) => ({ name: "#tag", props: { code: v, tagMap: H } }), w = (v, H) => {
-    const b = {
+    isObject(v) && !isFunction(v) ? (H = Object.assign(H, v || {}), y = v.defaultValue || y) : !isEmpty(v) && isString(v) && (y = v, H = Object.assign(H, { defaultValue: y }));
+    const L = isFunction(v) ? g(v) : g(u);
+    return { name: "VxeSwitch", props: H, defaultValue: y, events: L };
+  }, C = (v, u) => ({ name: "#tag", props: { code: v, tagMap: u } }), w = (v, u) => {
+    const H = {
       openLabel: "启用",
       closeLabel: "禁用",
       openValue: "1",
       closeValue: "0",
       defaultValue: "1"
     };
-    !isFunction(v) && isObject(v) && Object.assign(b, v);
-    const y = isFunction(v) ? v : H;
-    return V(b, y);
-  }, u = () => ({ name: "#iconSelect" }), T = (v = [], H = {}, b) => ({ name: "#treeSelect", sourceData: v, props: H, events: b }), R = (v, H) => {
-    const b = g(H);
+    !isFunction(v) && isObject(v) && Object.assign(H, v);
+    const y = isFunction(v) ? v : u;
+    return n(H, y);
+  }, k = () => ({ name: "#iconSelect" }), I = (v = [], u = {}, H) => ({ name: "#treeSelect", sourceData: v, props: u, events: H }), V = (v, u) => {
+    const H = g(u);
     return {
       name: "#area",
       props: { mapField: (v == null ? void 0 : v.mapField) || ["province", "city", "region"] },
-      events: b
+      events: H
     };
   }, g = (v) => {
-    let H = {};
-    return isObject(v) && !isFunction(v) ? H = {
-      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,
+    let u = {};
+    return isObject(v) && !isFunction(v) ? u = {
+      change: (v == null ? void 0 : v.change) || F,
+      blur: (v == null ? void 0 : v.blur) || F,
+      focus: (v == null ? void 0 : v.focus) || F,
+      input: (v == null ? void 0 : v.input) || F,
+      clear: (v == null ? void 0 : v.clear) || F,
       searchClick: v == null ? void 0 : v.searchClick,
       suffixClick: v == null ? void 0 : v.suffixClick,
       prefixClick: v == null ? void 0 : v.prefixClick,
       filterMethod: v == null ? void 0 : v.filterMethod
-    } : v && (H = { change: v }), H;
-  }, F = (v, H) => {
+    } : v && (u = { change: v }), u;
+  }, R = (v, u) => {
     v = v || { fieldType: "string", mode: "image" };
-    const { singleMode: b, mode: y } = v;
-    return b && Object.assign(v, {
+    const { singleMode: H, mode: y } = v;
+    return H && Object.assign(v, {
       multiple: !1,
       limitCount: 1,
       autoHiddenButton: !0
-    }), y === "image" && (v.imageTypes = ["jpg", "jpeg", "png", "gif", "apk"]), { name: "#upload", props: v, events: H };
+    }), y === "image" && (v.imageTypes = ["jpg", "jpeg", "png", "gif", "apk"]), { name: "#upload", props: v, events: u };
   };
-  function I() {
+  function F() {
   }
   return {
     renderDict: a,
@@ -1518,18 +1542,18 @@ const i18n = window.$i18n, useRender = () => {
     renderSysUser: r,
     renderInvOrg: e,
     renderBU: i,
-    renderNumber: n,
-    renderLov: C,
-    renderSelectLocal: p,
-    renderDate: m,
-    renderRangeDate: M,
-    renderSwitch: V,
-    renderCellTag: s,
+    renderNumber: f,
+    renderLov: s,
+    renderSelectLocal: M,
+    renderDate: b,
+    renderRangeDate: p,
+    renderSwitch: n,
+    renderCellTag: C,
     renderEnabled: w,
-    renderIconSelect: u,
-    renderTreeSelect: T,
-    renderArea: R,
-    renderUpload: F
+    renderIconSelect: k,
+    renderTreeSelect: I,
+    renderArea: V,
+    renderUpload: R
   };
 }, useGlobal = () => {
   const l = getCurrentInstance();
@@ -1640,10 +1664,10 @@ const deviceDetection = () => {
     collapseTagsTooltip: !0,
     multiple: !0
   }, Z = o.map((t, d) => {
-    var f, n, m;
-    return t.folding = r ? e && d > 1 : e && 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 || (n = (f = t.itemRender) == null ? void 0 : f.props) != null && n.multiple) && (t.itemRender.props = Object.assign(
+    var m, f, b;
+    return t.folding = r ? e && d > 1 : e && 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 || (f = (m = t.itemRender) == null ? void 0 : m.props) != null && f.multiple) && (t.itemRender.props = Object.assign(
       i,
-      ((m = t.itemRender) == null ? void 0 : m.props) || {}
+      ((b = t.itemRender) == null ? void 0 : b.props) || {}
     )), t;
   }), c = clone(formSearchButtons, !0);
   if (c.collapseNode = e, a && c.itemRender.options.length < 3 && (c.itemRender.options.push(a), c.itemRender.events = a.events), e) {
@@ -1750,9 +1774,9 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
   }
 }, A = class A {
   constructor() {
-    S(this, "router");
-    S(this, "baseUrl", null);
-    S(this, "getNetworkError", (a) => a ? {
+    x(this, "router");
+    x(this, "baseUrl", null);
+    x(this, "getNetworkError", (a) => a ? {
       400: "错误的请求",
       401: "服务未授权,请重新登录",
       403: "拒绝访问",
@@ -1856,12 +1880,12 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
           errorMessage(t, { duration: 8e3 }), Z(t);
         }
       }).catch((c) => {
-        var t, d, f;
+        var t, d, m;
         if (c != null && c.code) {
           if (((t = c == null ? void 0 : c.response) == null ? void 0 : t.status) === 401)
             return (d = this.router) == null ? void 0 : d.push({ path: "/login" });
           errorMessage(
-            this.getNetworkError((f = c == null ? void 0 : c.response) == null ? void 0 : f.status) || (c == null ? void 0 : c.message),
+            this.getNetworkError((m = c == null ? void 0 : c.response) == null ? void 0 : m.status) || (c == null ? void 0 : c.message),
             { duration: 8e3 }
           );
         }
@@ -1892,10 +1916,10 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
   }
 };
 /** token过期后，暂存待执行的请求 */
-S(A, "requests", []), /** 防止重复刷新token */
-S(A, "isRefreshing", !1), // 初始化配置对象
-S(A, "initConfig", {}), // 保存当前Axios实例对象
-S(A, "axiosInstance", Axios.create(defaultConfig));
+x(A, "requests", []), /** 防止重复刷新token */
+x(A, "isRefreshing", !1), // 初始化配置对象
+x(A, "initConfig", {}), // 保存当前Axios实例对象
+x(A, "axiosInstance", Axios.create(defaultConfig));
 let SuHttp = A;
 const http = new SuHttp(), lunarCalendar = {
   /**
@@ -2704,49 +2728,49 @@ const http = new SuHttp(), lunarCalendar = {
     for (Z = 1900; Z < 2101 && d > 0; Z++)
       t = this.lYearDays(Z), d -= t;
     d < 0 && (d += t, Z--);
-    const f = /* @__PURE__ */ new Date();
-    let n = !1;
-    f.getFullYear() === h && f.getMonth() + 1 === r && f.getDate() === e && (n = !0);
-    let m = i.getDay();
-    const M = this.nStr1[m];
-    m === 0 && (m = 7);
-    const C = Z;
+    const m = /* @__PURE__ */ new Date();
+    let f = !1;
+    m.getFullYear() === h && m.getMonth() + 1 === r && m.getDate() === e && (f = !0);
+    let b = i.getDay();
+    const p = this.nStr1[b];
+    b === 0 && (b = 7);
+    const s = Z;
     c = this.leapMonth(Z);
-    let p = !1;
+    let M = !1;
     for (Z = 1; Z < 13 && d > 0; Z++)
-      c > 0 && Z === c + 1 && p === !1 ? (--Z, p = !0, t = this.leapDays(C)) : t = this.monthDays(C, Z), p === !0 && Z === c + 1 && (p = !1), d -= t;
-    d === 0 && c > 0 && Z === c + 1 && (p ? p = !1 : (p = !0, --Z)), d < 0 && (d += t, --Z);
-    const V = Z, s = d + 1, w = r - 1, u = this.toGanZhiYear(C), T = this.getTerm(h, r * 2 - 1), R = this.getTerm(h, r * 2);
+      c > 0 && Z === c + 1 && M === !1 ? (--Z, M = !0, t = this.leapDays(s)) : t = this.monthDays(s, Z), M === !0 && Z === c + 1 && (M = !1), d -= t;
+    d === 0 && c > 0 && Z === c + 1 && (M ? M = !1 : (M = !0, --Z)), d < 0 && (d += t, --Z);
+    const n = Z, C = d + 1, w = r - 1, k = this.toGanZhiYear(s), I = this.getTerm(h, r * 2 - 1), V = this.getTerm(h, r * 2);
     let g = this.toGanZhi((h - 1900) * 12 + r + 11);
-    e >= T && (g = this.toGanZhi((h - 1900) * 12 + r + 12));
-    let F = !1, I;
-    T === e && (F = !0, I = this.solarTerm[r * 2 - 2]), R === e && (F = !0, I = this.solarTerm[r * 2 - 1]);
-    const v = Date.UTC(h, w, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, H = this.toGanZhi(v + e - 1), b = this.toAstro(r, e), y = h + "-" + r + "-" + e, L = C + "-" + V + "-" + s, k = this.festival, x = this.lFestival, N = r + "-" + e;
-    let D = V + "-" + s;
-    return V === 12 && s === 29 && this.monthDays(C, V) === 29 && (D = "12-30"), {
+    e >= I && (g = this.toGanZhi((h - 1900) * 12 + r + 12));
+    let R = !1, F;
+    I === e && (R = !0, F = this.solarTerm[r * 2 - 2]), V === e && (R = !0, F = this.solarTerm[r * 2 - 1]);
+    const v = Date.UTC(h, w, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, u = this.toGanZhi(v + e - 1), H = this.toAstro(r, e), y = h + "-" + r + "-" + e, L = s + "-" + n + "-" + C, S = this.festival, N = this.lFestival, D = r + "-" + e;
+    let T = n + "-" + C;
+    return n === 12 && C === 29 && this.monthDays(s, n) === 29 && (T = "12-30"), {
       date: y,
       lunarDate: L,
-      festival: k[N] ? k[N].title : null,
-      lunarFestival: x[D] ? x[D].title : null,
-      lYear: C,
-      lMonth: V,
-      lDay: s,
-      Animal: this.getAnimal(C),
-      IMonthCn: (p ? "闰" : "") + this.toChinaMonth(V),
-      IDayCn: this.toChinaDay(s),
+      festival: S[D] ? S[D].title : null,
+      lunarFestival: N[T] ? N[T].title : null,
+      lYear: s,
+      lMonth: n,
+      lDay: C,
+      Animal: this.getAnimal(s),
+      IMonthCn: (M ? "闰" : "") + this.toChinaMonth(n),
+      IDayCn: this.toChinaDay(C),
       cYear: h,
       cMonth: r,
       cDay: e,
-      gzYear: u,
+      gzYear: k,
       gzMonth: g,
-      gzDay: H,
-      isToday: n,
-      isLeap: p,
-      nWeek: m,
-      ncWeek: "星期" + M,
-      isTerm: F,
-      Term: I,
-      astro: b
+      gzDay: u,
+      isToday: f,
+      isLeap: M,
+      nWeek: b,
+      ncWeek: "星期" + p,
+      isTerm: R,
+      Term: F,
+      astro: H
     };
   },
   /**
@@ -2775,8 +2799,8 @@ const http = new SuHttp(), lunarCalendar = {
     for (c = 1; c < a; c++)
       t = this.leapMonth(l), d || t <= c && t > 0 && (Z += this.leapDays(l), d = !0), Z += this.monthDays(l, c);
     h && (Z += e);
-    const f = Date.UTC(1900, 1, 30, 0, 0, 0), n = new Date((Z + o - 31) * 864e5 + f), m = n.getUTCFullYear(), M = n.getUTCMonth() + 1, C = n.getUTCDate();
-    return this.solar2lunar(m, M, C);
+    const m = Date.UTC(1900, 1, 30, 0, 0, 0), f = new Date((Z + o - 31) * 864e5 + m), b = f.getUTCFullYear(), p = f.getUTCMonth() + 1, s = f.getUTCDate();
+    return this.solar2lunar(b, p, s);
   }
 }, dict = storageLocal.getItem("kLov"), formats = {
   formatDate: {