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

package/dist/utils.es.js

@@ -1,6 +1,6 @@
 var T = Object.defineProperty;
-var U = (a, l, o) => l in a ? T(a, l, { enumerable: !0, configurable: !0, writable: !0, value: o }) : a[l] = o;
-var S = (a, l, o) => U(a, typeof l != "symbol" ? l + "" : l, o);
+var j = (a, l, o) => l in a ? T(a, l, { enumerable: !0, configurable: !0, writable: !0, value: o }) : a[l] = o;
+var S = (a, l, o) => j(a, typeof l != "symbol" ? l + "" : l, o);
 import { createVNode, resolveComponent, mergeProps, isVNode, ref, shallowRef, unref, getCurrentInstance, onBeforeUnmount, reactive, watchEffect, isRef } from "vue";
 import dayjs from "dayjs";
 import XEUtils, { isArray, findTree, isEmpty, isObject, isPlainObject, isUndefined, isFunction, isString, clone, merge, has } from "xe-utils";
@@ -77,11 +77,11 @@ function stringifyAttributes(a) {
 }
 function get(a, l, o) {
   const h = /(?:^|; )([^=]*)=([^;]*)/g, r = {};
-  let c;
-  for (; (c = h.exec(document.cookie)) != null; )
+  let e;
+  for (; (e = h.exec(document.cookie)) != null; )
     try {
-      const i = o(c[1]);
-      if (r[i] = l(c[2], i), a === i)
+      const i = o(e[1]);
+      if (r[i] = l(e[2], i), a === i)
         break;
     } catch {
     }
@@ -111,8 +111,8 @@ function removeCookie(a, l = DEFAULT_ATTRIBUTES) {
 }
 function init(a, l) {
   const o = {
-    set: function(r, c, i) {
-      return setCookie(r, c, Object.assign({}, this.attributes, i), {
+    set: function(r, e, i) {
+      return setCookie(r, e, Object.assign({}, this.attributes, i), {
         encodeValue: this.converter.write
       });
     },
@@ -122,8 +122,8 @@ function init(a, l) {
       if (r != null)
         return getCookie(r, this.converter.read);
     },
-    remove: function(r, c) {
-      removeCookie(r, Object.assign({}, this.attributes, c));
+    remove: function(r, e) {
+      removeCookie(r, Object.assign({}, this.attributes, e));
     },
     withAttributes: function(r) {
       return init(this.converter, Object.assign({}, this.attributes, r));
@@ -196,55 +196,55 @@ const VxetableRender = (VXETable, {
         row: h,
         column: r
       } = l, {
-        options: c,
+        options: e,
         props: i,
-        optionProps: Z = {},
-        events: e
+        optionProps: t = {},
+        events: c
       } = a, {
-        label: t = "label",
+        label: Z = "label",
         value: d = "value"
-      } = Z, {
-        loading: f = !1,
-        multiple: m,
-        mapField: u
-      } = i, H = useComponent(), p = m ? `_${r.field}` : r.field;
-      H.setDefaultValue(i, h, r.field);
-      function n(V) {
-        H.remote(V, r.field, a);
+      } = t, {
+        loading: n = !1,
+        multiple: f,
+        mapField: H
+      } = i, m = useComponent(), s = f ? `_${r.field}` : r.field;
+      m.setDefaultValue(i, h, r.field);
+      function u(V) {
+        m.remote(V, r.field, a);
       }
-      function y(V) {
-        H.selectChange(V, h, r.field, a, {
+      function M(V) {
+        m.selectChange(V, h, r.field, a, {
           column: r,
           datasource: "row"
         });
       }
       function C(V) {
-        e != null && e.input && e.input(l, V);
+        c != null && c.input && c.input(l, V);
       }
       function A() {
-        H.clear(h, r.field, u, e, "row");
+        m.clear(h, r.field, H, c, "row");
       }
       function w() {
-        !c.length && n(""), e != null && e.focus && e.focus(l, r.field);
+        !e.length && u(""), c != null && c.focus && c.focus(l, r.field);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
-        modelValue: h[p],
-        "onUpdate:modelValue": (V) => h[p] = V,
+        modelValue: h[s],
+        "onUpdate:modelValue": (V) => h[s] = V,
         filterable: !0,
         remote: !0,
         clearable: !0,
         placeholder: "请录入关键字搜索",
         style: "width: 100%",
-        "remote-method": n,
-        loading: f
+        "remote-method": u,
+        loading: n
       }, i, {
         onFocus: () => w(),
-        onChange: (V) => y(V),
+        onChange: (V) => M(V),
         onClear: () => A(),
         onInput: (V) => C(V)
-      }), _isSlot(o = c.map((V) => createVNode(resolveComponent("el-option"), {
+      }), _isSlot(o = e.map((V) => createVNode(resolveComponent("el-option"), {
         key: V[d],
-        label: V[t],
+        label: V[Z],
         value: V[d]
       }, null))) ? o : {
         default: () => [o]
@@ -256,55 +256,55 @@ const VxetableRender = (VXETable, {
         row: h,
         column: r
       } = l, {
-        options: c,
+        options: e,
         props: i,
-        optionProps: Z = {},
-        events: e
+        optionProps: t = {},
+        events: c
       } = a, {
-        label: t = "label",
+        label: Z = "label",
         value: d = "value"
-      } = Z, {
-        loading: f = !1,
-        multiple: m,
-        mapField: u
-      } = i, H = useComponent(), p = m ? `_${r.field}` : r.field;
-      H.setDefaultValue(i, h, r.field);
-      function n(V) {
-        H.remote(V, r.field, a);
+      } = t, {
+        loading: n = !1,
+        multiple: f,
+        mapField: H
+      } = i, m = useComponent(), s = f ? `_${r.field}` : r.field;
+      m.setDefaultValue(i, h, r.field);
+      function u(V) {
+        m.remote(V, r.field, a);
       }
-      function y(V) {
-        H.selectChange(V, h, r.field, a, {
+      function M(V) {
+        m.selectChange(V, h, r.field, a, {
           column: r,
           datasource: "row"
         });
       }
       function C(V) {
-        e != null && e.input && e.input(l, V);
+        c != null && c.input && c.input(l, V);
       }
       function A() {
-        H.clear(h, r.field, u, e, "row");
+        m.clear(h, r.field, H, c, "row");
       }
       function w() {
-        !c.length && n(""), e != null && e.focus && e.focus(l, r.field);
+        !e.length && u(""), c != null && c.focus && c.focus(l, r.field);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
-        modelValue: h[p],
-        "onUpdate:modelValue": (V) => h[p] = V,
+        modelValue: h[s],
+        "onUpdate:modelValue": (V) => h[s] = V,
         filterable: !0,
         remote: !0,
         clearable: !0,
         placeholder: "请录入关键字搜索",
         style: "width: 100%",
-        "remote-method": n,
-        loading: f
+        "remote-method": u,
+        loading: n
       }, i, {
         onFocus: () => w(),
-        onChange: (V) => y(V),
+        onChange: (V) => M(V),
         onClear: () => A(),
         onInput: (V) => C(V)
-      }), _isSlot(o = c.map((V) => createVNode(resolveComponent("el-option"), {
+      }), _isSlot(o = e.map((V) => createVNode(resolveComponent("el-option"), {
         key: V[d],
-        label: V[t],
+        label: V[Z],
         value: V[d]
       }, null))) ? o : {
         default: () => [o]
@@ -330,54 +330,54 @@ const VxetableRender = (VXETable, {
         data: h,
         field: r
       } = l, {
-        options: c,
+        options: e,
         props: i,
-        optionProps: Z = {},
-        events: e
+        optionProps: t = {},
+        events: c
       } = a, {
-        label: t = "label",
+        label: Z = "label",
         value: d = "value"
-      } = Z, {
-        mapField: f,
-        multiple: m,
-        loading: u = !1
-      } = i, H = useComponent(), p = m ? `_${r}` : r;
-      H.setDefaultValue(i, h, r);
-      async function n(V) {
-        H.remote(V, r, a);
+      } = t, {
+        mapField: n,
+        multiple: f,
+        loading: H = !1
+      } = i, m = useComponent(), s = f ? `_${r}` : r;
+      m.setDefaultValue(i, h, r);
+      async function u(V) {
+        m.remote(V, r, a);
       }
-      function y(V) {
-        H.selectChange(V, h, r, a, {
+      function M(V) {
+        m.selectChange(V, h, r, a, {
           datasource: "data"
         });
       }
       function C(V) {
-        e != null && e.input && e.input(l, V);
+        c != null && c.input && c.input(l, V);
       }
       function A() {
-        H.clear(h, r, f, e, "data");
+        m.clear(h, r, n, c, "data");
       }
       function w() {
-        !c.length && n(""), e != null && e.focus && e.focus(l);
+        !e.length && u(""), c != null && c.focus && c.focus(l);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
-        modelValue: h[p],
-        "onUpdate:modelValue": (V) => h[p] = V,
+        modelValue: h[s],
+        "onUpdate:modelValue": (V) => h[s] = V,
         filterable: !0,
         remote: !0,
         clearable: !0,
         style: "width: 100%",
         placeholder: "请录入关键字搜索",
-        loading: u,
-        "remote-method": n
+        loading: H,
+        "remote-method": u
       }, i, {
         onFocus: () => w(),
-        onChange: (V) => y(V),
+        onChange: (V) => M(V),
         onClear: () => A(),
         onInput: () => C()
-      }), _isSlot(o = c.map((V) => createVNode(resolveComponent("el-option"), {
+      }), _isSlot(o = e.map((V) => createVNode(resolveComponent("el-option"), {
         key: V[d],
-        label: V[t],
+        label: V[Z],
         value: V[d]
       }, null))) ? o : {
         default: () => [o]
@@ -392,31 +392,31 @@ const VxetableRender = (VXETable, {
         props: r
       } = a;
       r != null && r.defaultValue && !o[h] && (o[h] = r.defaultValue, r.defaultValue = r.required ? r.defaultValue : null);
-      const c = /* @__PURE__ */ new Date(), i = [{
+      const e = /* @__PURE__ */ new Date(), i = [{
         text: i18n("message.udp.today", !0),
-        value: () => [Z(1, "day"), c]
+        value: () => [t(1, "day"), e]
       }, {
         text: i18n("message.udp.yesterday", !0),
-        value: () => [Z(2, "day"), Z(2, "day")]
+        value: () => [t(2, "day"), t(2, "day")]
       }, {
         text: i18n("message.udp.lastWeek", !0),
-        value: () => [Z(7, "day"), c]
+        value: () => [t(7, "day"), e]
       }, {
         text: i18n("message.udp.lastMonth", !0),
-        value: () => [Z(1, "month"), c]
+        value: () => [t(1, "month"), e]
       }, {
         text: i18n("message.udp.threeMonth", !0),
-        value: () => [Z(3, "month"), c]
+        value: () => [t(3, "month"), e]
       }, {
         text: i18n("message.udp.halfYear", !0),
-        value: () => [Z(6, "month"), c]
+        value: () => [t(6, "month"), e]
       }, {
         text: i18n("message.udp.anniversary", !0),
-        value: () => [Z(1, "year"), c]
-      }], Z = (e, t) => dayjs().subtract(e, t).add("1", "day").format();
+        value: () => [t(1, "year"), e]
+      }], t = (c, Z) => dayjs().subtract(c, Z).add("1", "day").format();
       return [createVNode(resolveComponent("el-date-picker"), mergeProps({
         modelValue: o[h],
-        "onUpdate:modelValue": (e) => o[h] = e,
+        "onUpdate:modelValue": (c) => o[h] = c,
         type: (r == null ? void 0 : r.type) || "daterange",
         shortcuts: i,
         style: "width: 100%",
@@ -432,45 +432,40 @@ const VxetableRender = (VXETable, {
         row: h,
         column: r
       } = l, {
-        options: c,
+        options: e,
         props: i,
-        optionProps: Z = {},
-        events: e
+        optionProps: t = {},
+        events: c
       } = a, {
-        label: t = "label",
-        value: d = "value",
-        extLabel: f
-      } = Z, {
-        mapField: m
-      } = i, u = useComponent();
-      i.multiple && h[r.field] && !isArray(h[r.field]) && h[r.field].split(",").forEach((n) => {
-        !c.some((C) => C[t] === n) && c.push({
-          [d]: n,
-          [t]: n
-        });
-      });
-      function H(n) {
-        u.selectChange(n, h, r.field, a, {
+        label: Z = "label",
+        value: d = "value"
+      } = t, {
+        multiple: n,
+        mapField: f
+      } = i, H = useComponent(), m = n ? `_${r.field}` : r.field;
+      H.setDefaultValue(i, h, r.field);
+      function s(M) {
+        H.selectChange(M, h, r.field, a, {
           column: r,
           datasource: "row"
         });
       }
-      function p() {
-        u.clear(h, r.field, m, e, "row");
+      function u() {
+        H.clear(h, r.field, f, c, "row");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
-        modelValue: h[r.field],
-        "onUpdate:modelValue": (n) => h[r.field] = n,
+        modelValue: h[m],
+        "onUpdate:modelValue": (M) => h[m] = M,
         filterable: !0,
         clearable: !0
       }, i, {
         style: "width: 100%",
-        onChange: (n) => H(n),
-        onClear: () => p()
-      }), _isSlot(o = c.map((n) => createVNode(resolveComponent("el-option"), {
-        key: n[d],
-        label: f && n[f] ? n[d] : n[t],
-        value: n[d]
+        onChange: (M) => s(M),
+        onClear: () => u()
+      }), _isSlot(o = e.map((M) => createVNode(resolveComponent("el-option"), {
+        key: M[d],
+        label: M[Z],
+        value: M[d]
       }, null))) ? o : {
         default: () => [o]
       })];
@@ -481,45 +476,41 @@ const VxetableRender = (VXETable, {
         row: h,
         column: r
       } = l, {
-        options: c,
+        options: e,
         props: i,
-        optionProps: Z = {},
-        events: e
+        optionProps: t = {},
+        events: c
       } = a, {
-        label: t = "label",
+        label: Z = "label",
         value: d = "value",
-        extLabel: f
-      } = Z, {
-        mapField: m
-      } = i, u = useComponent();
-      i.multiple && h[r.field] && !isArray(h[r.field]) && h[r.field].split(",").forEach((n) => {
-        !c.some((C) => C[t] === n) && c.push({
-          [d]: n,
-          [t]: n
-        });
-      });
-      function H(n) {
-        u.selectChange(n, h, r.field, a, {
+        extLabel: n
+      } = t, {
+        multiple: f,
+        mapField: H
+      } = i, m = useComponent(), s = f ? `_${r.field}` : r.field;
+      m.setDefaultValue(i, h, r.field);
+      function u(C) {
+        m.selectChange(C, h, r.field, a, {
           column: r,
           datasource: "row"
         });
       }
-      function p() {
-        u.clear(h, r.field, m, e, "row");
+      function M() {
+        m.clear(h, r.field, H, c, "row");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
-        modelValue: h[r.field],
-        "onUpdate:modelValue": (n) => h[r.field] = n,
+        modelValue: h[s],
+        "onUpdate:modelValue": (C) => h[s] = C,
         filterable: !0,
         clearable: !0
       }, i, {
         style: "width: 100%",
-        onChange: (n) => H(n),
-        onClear: () => p()
-      }), _isSlot(o = c.map((n) => createVNode(resolveComponent("el-option"), {
-        key: n[d],
-        label: f && n[f] ? n[d] : n[t],
-        value: n[d]
+        onChange: (C) => u(C),
+        onClear: () => M()
+      }), _isSlot(o = e.map((C) => createVNode(resolveComponent("el-option"), {
+        key: C[d],
+        label: n && C[n] ? C[d] : C[Z],
+        value: C[d]
       }, null))) ? o : {
         default: () => [o]
       })];
@@ -550,39 +541,39 @@ const VxetableRender = (VXETable, {
         data: h,
         field: r
       } = l, {
-        options: c,
+        options: e,
         props: i,
-        optionProps: Z = {},
-        events: e
+        optionProps: t = {},
+        events: c
       } = a, {
-        label: t = "label",
+        label: Z = "label",
         value: d = "value"
-      } = Z, f = useComponent(), {
-        defaultValues: m,
-        mapField: u
-      } = i;
-      m && (h[r] = m);
-      function H(n) {
-        f.selectChange(n, h, r, a, {
+      } = t, n = useComponent(), {
+        mapField: f,
+        multiple: H
+      } = i, m = H ? `_${r}` : r;
+      n.setDefaultValue(i, h, r);
+      function s(M) {
+        n.selectChange(M, h, r, a, {
           datasource: "data"
         });
       }
-      function p() {
-        f.clear(h, r, u, e, "data");
+      function u() {
+        n.clear(h, r, f, c, "data");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
-        modelValue: h[r],
-        "onUpdate:modelValue": (n) => h[r] = n,
+        modelValue: h[m],
+        "onUpdate:modelValue": (M) => h[m] = M,
         filterable: !0,
         clearable: !0,
         style: "width: 100%"
       }, i, {
-        onChange: (n) => H(n),
-        onClear: () => p()
-      }), _isSlot(o = c.map((n) => createVNode(resolveComponent("el-option"), {
-        key: n[d],
-        label: n[t],
-        value: n[d]
+        onChange: (M) => s(M),
+        onClear: () => u()
+      }), _isSlot(o = e.map((M) => createVNode(resolveComponent("el-option"), {
+        key: M[d],
+        label: M[Z],
+        value: M[d]
       }, null))) ? o : {
         default: () => [o]
       })];
@@ -594,51 +585,51 @@ const VxetableRender = (VXETable, {
         field: h
       } = l, {
         props: r,
-        events: c
+        events: e
       } = a, i = useComponent(), {
-        defaultValues: Z,
-        mapField: e
+        defaultValues: t,
+        mapField: c
       } = r;
-      Z && (o[h] = Z);
-      function t(f, m) {
+      t && (o[h] = t);
+      function Z(n, f) {
         const {
-          mapField: u,
-          field: H,
-          displayName: p,
-          multiple: n
+          mapField: H,
+          field: m,
+          displayName: s,
+          multiple: u
         } = r;
-        if (n) {
-          if (n) {
+        if (u) {
+          if (u) {
             const C = {};
-            o[p || H] = f.reduce((A, w) => {
-              for (const V in u)
-                C[V] = A ? C[V] + "," + w[u[V]] : w[u[V]];
-              return A = A ? A + "," + w[p || H] : w[p || H], A;
+            o[s || m] = n.reduce((A, w) => {
+              for (const V in H)
+                C[V] = A ? C[V] + "," + w[H[V]] : w[H[V]];
+              return A = A ? A + "," + w[s || m] : w[s || m], A;
             }, ""), Object.assign(o, C);
           }
         } else {
           const C = {
-            [p || H]: f[m || p || H]
+            [s || m]: n[f || s || m]
           };
-          for (const A in u)
-            C[A] = f[u[A]];
+          for (const A in H)
+            C[A] = n[H[A]];
           Object.assign(o, C);
         }
-        const y = {
+        const M = {
           data: o,
-          options: f,
-          field: H
+          options: n,
+          field: m
         };
-        c != null && c.change && c.change(y);
+        e != null && e.change && e.change(M);
       }
       function d() {
-        i.clear(o, h, e, c, "data");
+        i.clear(o, h, c, e, "data");
       }
       return [createVNode(resolveComponent("ut-lov"), mergeProps({
         record: o
       }, r, {
         mode: "vxe",
-        onChange: (f, m) => t(f, m),
+        onChange: (n, f) => Z(n, f),
         onClear: () => d()
       }), null)];
     },
@@ -649,40 +640,40 @@ const VxetableRender = (VXETable, {
         column: h
       } = l, {
         props: r,
-        events: c
+        events: e
       } = a, i = useComponent();
-      function Z(t, d) {
+      function t(Z, d) {
         const {
-          mapField: f,
-          field: m,
-          displayName: u,
-          multiple: H
+          mapField: n,
+          field: f,
+          displayName: H,
+          multiple: m
         } = r;
-        if (!H) {
-          const n = {
-            [u || m]: t[d || u || m]
+        if (!m) {
+          const u = {
+            [H || f]: Z[d || H || f]
           };
-          for (const y in f)
-            n[y] = t[f[y]];
-          Object.assign(o, n);
+          for (const M in n)
+            u[M] = Z[n[M]];
+          Object.assign(o, u);
         }
-        const p = {
+        const s = {
           row: o,
-          options: t,
+          options: Z,
           field: h.field
         };
-        c != null && c.change && c.change(p);
+        e != null && e.change && e.change(s);
       }
-      function e() {
-        i.clear(o, h.field, mapField, c, "row");
+      function c() {
+        i.clear(o, h.field, mapField, e, "row");
       }
       return [createVNode(resolveComponent("ut-lov"), mergeProps({
         record: o,
         mode: "vxe",
         transfer: !0
       }, r, {
-        onChange: (t, d) => Z(t, d),
-        onClear: () => e()
+        onChange: (Z, d) => t(Z, d),
+        onClear: () => c()
       }), null)];
     },
     // 单元格默认
@@ -692,39 +683,39 @@ const VxetableRender = (VXETable, {
         column: h
       } = l, {
         props: r,
-        events: c
+        events: e
       } = a, i = useComponent();
-      function Z(t, d) {
+      function t(Z, d) {
         const {
-          mapField: f,
-          field: m,
-          displayName: u,
-          multiple: H
+          mapField: n,
+          field: f,
+          displayName: H,
+          multiple: m
         } = r;
-        if (!H) {
-          const n = {
-            [u || m]: t[d || u || m]
+        if (!m) {
+          const u = {
+            [H || f]: Z[d || H || f]
           };
-          for (const y in f)
-            n[y] = t[f[y]];
-          Object.assign(o, n);
+          for (const M in n)
+            u[M] = Z[n[M]];
+          Object.assign(o, u);
         }
-        const p = {
+        const s = {
           row: o,
-          options: t,
+          options: Z,
           field: h.field
         };
-        c != null && c.change && c.change(p);
+        e != null && e.change && e.change(s);
       }
-      function e() {
-        i.clear(o, h.field, mapField, c, "row");
+      function c() {
+        i.clear(o, h.field, mapField, e, "row");
       }
       return [createVNode(resolveComponent("ut-lov"), mergeProps({
         record: o,
         mode: "ele"
       }, r, {
-        onChange: (t, d) => Z(t, d),
-        onClear: () => e()
+        onChange: (Z, d) => t(Z, d),
+        onClear: () => c()
       }), null)];
     },
     // 可编辑显示模板
@@ -736,22 +727,62 @@ const VxetableRender = (VXETable, {
       return [createVNode("span", null, [o[h.field]])];
     }
   }), VXETable.renderer.add("#upload", {
+    renderTableEdit(a, l) {
+      const {
+        row: o,
+        column: h
+      } = l, {
+        props: r,
+        events: e
+      } = a;
+      function i(t, c) {
+        o[h.field] = "", e != null && e.remove && (e == null || e.remove(t, c));
+      }
+      return [createVNode(resolveComponent("form-upload"), mergeProps({
+        record: o,
+        field: h.field,
+        size: "mini"
+      }, r, {
+        "render-mode": "column",
+        "data-status": "edit",
+        onRemove: (t, c) => i(t, c)
+      }), null)];
+    },
+    // 可编辑显示模板
+    renderTableCell(a, l) {
+      const {
+        row: o,
+        column: h
+      } = l, {
+        props: r
+      } = a;
+      return [createVNode(resolveComponent("form-upload"), mergeProps({
+        record: o,
+        field: h.field,
+        size: "mini"
+      }, r, {
+        mode: "image",
+        "render-mode": "column",
+        "data-status": "detail"
+      }), null)];
+    },
     renderItemContent(a, l) {
       const {
         data: o,
         field: h
       } = l, {
         props: r,
-        events: c
+        events: e
       } = a;
-      function i() {
-        o[h] = "", componentHook.clear(o, h, r.mapField, c, "data");
+      function i(t, c) {
+        o[h] = "", e != null && e.remove && (e == null || e.remove(t, c));
       }
       return [createVNode(resolveComponent("form-upload"), mergeProps({
         record: o,
-        field: h
+        field: h,
+        mode: "image"
       }, r, {
-        onClear: () => i()
+        onRemove: (t, c) => i(t, c)
       }), null)];
     }
   }), VXETable.renderer.add("#tag", {
@@ -763,17 +794,17 @@ const VxetableRender = (VXETable, {
         column: r
       } = l, {
         props: {
-          code: c,
+          code: e,
           tagMap: i
         }
       } = a;
-      function Z() {
+      function t() {
         return h[r.field] ? i[h[r.field]] : null;
       }
       return [h[r.field] ? createVNode(resolveComponent("el-tag"), {
         effect: "dark",
-        type: Z()
-      }, _isSlot(o = getValue(c, h[r.field])) ? o : {
+        type: t()
+      }, _isSlot(o = getValue(e, h[r.field])) ? o : {
         default: () => [o]
       }) : null];
     }
@@ -785,29 +816,29 @@ const VxetableRender = (VXETable, {
       } = l, {
         props: {
           code: r,
-          activeValue: c,
+          activeValue: e,
           inactiveValue: i
         },
-        events: Z
+        events: t
       } = a;
-      function e(t) {
+      function c(Z) {
         const d = {
           row: o,
           column: h,
-          value: t
+          value: Z
         };
-        Z != null && Z.change && Z.change(d);
+        t != null && t.change && t.change(d);
       }
       return [o[h.field] ? createVNode(resolveComponent("el-switch"), mergeProps({
         modelValue: o[h.field],
-        "onUpdate:modelValue": (t) => o[h.field] = t,
+        "onUpdate:modelValue": (Z) => o[h.field] = Z,
         "inline-prompt": !0,
         size: "large",
         style: "--el-switch-on-color: #13ce66; --el-switch-off-color: #E6A23C"
       }, a.props, {
-        "active-text": getValue(r, c),
+        "active-text": getValue(r, e),
         "inactive-text": getValue(r, i),
-        onChange: (t) => e(t)
+        onChange: (Z) => c(Z)
       }), null) : null];
     }
   }), VXETable.renderer.add("#iconSelect", {
@@ -850,19 +881,19 @@ const VxetableRender = (VXETable, {
         column: h
       } = l, {
         props: r,
-        sourceData: c,
+        sourceData: e,
         events: i
       } = a;
       return [createVNode(resolveComponent("el-tree-select"), mergeProps({
         modelValue: o[h.field],
-        "onUpdate:modelValue": (Z) => o[h.field] = Z,
-        data: c,
+        "onUpdate:modelValue": (t) => o[h.field] = t,
+        data: e,
         "check-strictly": !0
       }, r, {
         filterable: !0,
-        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)
+        onCheckChange: (t, c, Z) => onCheckChange(t, c, Z, i),
+        onNodeClick: (t, c, Z) => onNodeClick(t, c, Z, i),
+        onCurrentChange: (t, c) => onCurrentChange(t, c, i)
       }), null)];
     },
     renderTableCell(a, l) {
@@ -871,14 +902,14 @@ const VxetableRender = (VXETable, {
         column: h
       } = l, {
         sourceData: r,
-        props: c = {}
+        props: e = {}
       } = a, {
         children: i = "children",
-        label: Z = "label"
-      } = c, e = findTree(r, (t) => t.value === o[h.field], {
+        label: t = "label"
+      } = e, c = findTree(r, (Z) => Z.value === o[h.field], {
         children: i
       });
-      return e ? [createVNode("span", null, [e.item[Z]])] : null;
+      return c ? [createVNode("span", null, [c.item[t]])] : null;
     },
     renderItemContent(a, l) {
       const {
@@ -886,96 +917,96 @@ const VxetableRender = (VXETable, {
         field: h
       } = l, {
         props: r,
-        sourceData: c,
+        sourceData: e,
         events: i
       } = a;
       return [createVNode(resolveComponent("el-tree-select"), mergeProps({
         modelValue: o[h],
-        "onUpdate:modelValue": (Z) => o[h] = Z,
-        data: c,
+        "onUpdate:modelValue": (t) => o[h] = t,
+        data: e,
         "check-strictly": !0
       }, r, {
         filterable: !0,
-        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)
+        onCheckChange: (t, c, Z) => onCheckChange(t, c, Z, i),
+        onNodeClick: (t, c, Z) => onNodeClick(t, c, Z, i),
+        onCurrentChange: (t, c) => onCurrentChange(t, c, i)
       }), null)];
     }
   });
   const useComponent = () => ({
-    clear: (r, c, i, Z, e) => {
-      if (r[c] = null, !isEmpty(i))
-        for (const t in i)
-          r[t] = null;
-      Z != null && Z.clear && Z.clear({
-        [e]: r,
-        field: c
+    clear: (r, e, i, t, c) => {
+      if (r[e] = null, !isEmpty(i))
+        for (const Z in i)
+          r[Z] = null;
+      t != null && t.clear && t.clear({
+        [c]: r,
+        field: e
       });
     },
-    remote: async (r, c, i) => {
+    remote: async (r, e, i) => {
       const {
-        options: Z,
-        props: e,
-        events: t
+        options: t,
+        props: c,
+        events: Z
       } = i, {
         fetchField: d,
-        url: f,
-        defaultParams: m = {},
-        method: u = "get"
-      } = e, H = getCookieParam(), p = Object.assign({
+        url: n,
+        defaultParams: f = {},
+        method: H = "get"
+      } = c, m = getCookieParam(), s = Object.assign({
         pageSize: 20,
         pageNum: 1,
-        ...H,
-        ...m
+        ...m,
+        ...f
       }, {
-        [d || c]: r
+        [d || e]: r
       });
-      if (e.loading) return;
-      let n;
+      if (c.loading) return;
+      let u;
       try {
-        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));
+        t.length = 0, c.loading = !0, u = await serviceApi[H](n, s), Z != null && Z.filterMethod ? t.push(...Z.filterMethod(u.list || u)) : u && (u.list ? t.push(...u.list) : t.push(...u));
       } finally {
-        e.loading = !1;
+        c.loading = !1;
       }
     },
-    selectChange: (r, c, i, Z, e) => {
-      let t = null;
+    selectChange: (r, e, i, t, c) => {
+      let Z = null;
       const {
         datasource: d
-      } = e, {
-        options: f,
-        props: m,
-        optionProps: u = {},
-        events: H
-      } = Z, p = {
-        [d]: c,
+      } = c, {
+        options: n,
+        props: f,
+        optionProps: H = {},
+        events: m
+      } = t, s = {
+        [d]: e,
         field: i
       };
-      c[i] = null, !isEmpty(r) && (m != null && m.multiple) ? (c[i] = r.join(","), t = [], r.forEach((n) => {
-        const y = f.find((C) => n === C[u == null ? void 0 : u.value]);
-        y && !isEmpty(m.mapField) && isObject(m.mapField) && Object.keys(m.mapField).forEach((C) => {
-          const A = y[m.mapField[C]], w = c[C] ? c[C].toString() : "";
-          c[C] = w && !w.includes(A) ? `${w},${A}` : A;
-        }), y && t.push(y);
-      }), 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
-      }), H != null && H.change && H.change(p);
-    },
-    setDefaultValue: (r, c, i) => {
+      e[i] = null, !isEmpty(r) && (f != null && f.multiple) ? (e[i] = r.join(","), Z = [], r.forEach((u) => {
+        const M = n.find((C) => u === C[H == null ? void 0 : H.value]);
+        M && !isEmpty(f.mapField) && isObject(f.mapField) && Object.keys(f.mapField).forEach((C) => {
+          const A = M[f.mapField[C]], w = e[C] ? e[C].toString() : "";
+          e[C] = w && !w.includes(A) ? `${w},${A}` : A;
+        }), M && Z.push(M);
+      }), Object.assign(s, {
+        options: Z
+      })) : (e[i] = f != null && f.multiple ? null : r, Z = n.find((u) => r === u[H == null ? void 0 : H.value]), !isEmpty(f.mapField) && isObject(f.mapField) && Object.keys(f.mapField).forEach((u) => {
+        e[u] = Z ? Z[f.mapField[u]] : null;
+      }), Object.assign(s, {
+        option: Z
+      })), d === "row" && Object.assign(s, {
+        column: c.column
+      }), m != null && m.change && m.change(s);
+    },
+    setDefaultValue: (r, e, i) => {
       var d;
       const {
-        multiple: Z,
-        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]);
+        multiple: t,
+        defaultValue: c
+      } = r, Z = t ? `_${i}` : i;
+      !e[i] && c && (e[i] = c, isPlainObject(c) && Object.keys(c).forEach((f) => {
+        e[f] = e[f] || c[f];
+      })), !e[Z] && e[i] && (e[Z] = t ? (d = e[i]) == null ? void 0 : d.split(",") : e[i]);
     }
   }), onCheckChange = (a, l, o, h) => {
     console.log(a, l, o), h != null && h.checkChange && (h == null || h.checkChange(a, l, o));
@@ -986,7 +1017,7 @@ const VxetableRender = (VXETable, {
   };
   function getValue(a, l) {
     var o, h, r;
-    return !l || !a || !dict ? l : (r = (h = (o = dict[a]) == null ? void 0 : o.children) == null ? void 0 : h.find((c) => c.dictCode === l)) == null ? void 0 : r.dictName;
+    return !l || !a || !dict ? l : (r = (h = (o = dict[a]) == null ? void 0 : o.children) == null ? void 0 : h.find((e) => e.dictCode === l)) == null ? void 0 : r.dictName;
   }
   return VXETable;
 }, getCookieParam = () => {
@@ -1000,12 +1031,12 @@ const VxetableRender = (VXETable, {
 }, removeClass = (a, l, o) => {
   var h, r;
   if (hasClass(a, l)) {
-    const c = new RegExp("(\\s|^)" + l + "(\\s|$)");
-    a.className = (h = a.className) == null ? void 0 : h.replace(c, " ").trim();
+    const e = new RegExp("(\\s|^)" + l + "(\\s|$)");
+    a.className = (h = a.className) == null ? void 0 : h.replace(e, " ").trim();
   }
   if (o && hasClass(a, o)) {
-    const c = new RegExp("(\\s|^)" + o + "(\\s|$)");
-    a.className = (r = a.className) == null ? void 0 : r.replace(c, " ").trim();
+    const e = new RegExp("(\\s|^)" + o + "(\\s|$)");
+    a.className = (r = a.className) == null ? void 0 : r.replace(e, " ").trim();
   }
 }, toggleClass = (a, l, o) => {
   const h = o || document.body;
@@ -1040,45 +1071,45 @@ const openLink = (a) => {
 }, domSymbol = Symbol("watermark-dom");
 function useWatermark(a = ref(document.body)) {
   const l = useRafThrottle(function() {
-    const t = unref(a);
-    if (!t) return;
-    const { clientHeight: d, clientWidth: f } = t;
-    i({ height: d, width: f });
+    const Z = unref(a);
+    if (!Z) return;
+    const { clientHeight: d, clientWidth: n } = Z;
+    i({ height: d, width: n });
   }), o = domSymbol.toString(), h = shallowRef(), r = () => {
-    const t = unref(h);
+    const Z = unref(h);
     h.value = void 0;
     const d = unref(a);
-    d && (t && d.removeChild(t), removeResizeListener(d, l));
+    d && (Z && d.removeChild(Z), removeResizeListener(d, l));
   };
-  function c(t, d) {
-    const f = document.createElement("canvas"), m = 260, u = 180;
-    Object.assign(f, { width: m, height: u });
-    const H = f.getContext("2d");
-    return H && (H.rotate(-20 * Math.PI / 120), H.font = (d == null ? void 0 : d.font) ?? "15px Reggae One", H.fillStyle = (d == null ? void 0 : d.fillStyle) ?? "rgba(180, 180, 180, 0.75)", H.textAlign = "left", H.textBaseline = "middle", H.fillText(t, m / 20, u)), f.toDataURL("image/png");
+  function e(Z, d) {
+    const n = document.createElement("canvas"), f = 260, H = 180;
+    Object.assign(n, { width: f, height: H });
+    const m = n.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(Z, f / 20, H)), n.toDataURL("image/png");
   }
-  function i(t = {}) {
+  function i(Z = {}) {
     const d = unref(h);
-    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
+    d && (isUndefined(Z.width) || (d.style.width = `${Z.width}px`), isUndefined(Z.height) || (d.style.height = `${Z.height}px`), isUndefined(Z.str) || (d.style.background = `url(${e(
+      Z.str,
+      Z.attr
     )}) left top repeat`));
   }
-  const Z = (t, d) => {
+  const t = (Z, 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 m = unref(a);
-    if (!m) return o;
-    const { clientHeight: u, clientWidth: H } = m;
-    return i({ str: t, width: H, height: u, attr: d }), m.appendChild(f), o;
+      return i({ str: Z, attr: d }), o;
+    const n = document.createElement("div");
+    h.value = n, n.id = o, n.style.pointerEvents = "none", n.style.top = "0px", n.style.left = "0px", n.style.position = "absolute", n.style.zIndex = "100000";
+    const f = unref(a);
+    if (!f) return o;
+    const { clientHeight: H, clientWidth: m } = f;
+    return i({ str: Z, width: m, height: H, attr: d }), f.appendChild(n), o;
   };
-  function e(t, d) {
-    Z(t, d), addResizeListener(document.documentElement, l), getCurrentInstance() && onBeforeUnmount(() => {
+  function c(Z, d) {
+    t(Z, d), addResizeListener(document.documentElement, l), getCurrentInstance() && onBeforeUnmount(() => {
       r();
     });
   }
-  return { setWatermark: e, clear: r };
+  return { setWatermark: c, clear: r };
 }
 const DEFAULT_EXCLUDE_KEYS = ["class", "style"], LISTENER_PREFIX = /^on[A-Z]/;
 function entries(a) {
@@ -1087,43 +1118,43 @@ function entries(a) {
 function useAttrs(a = {}) {
   const l = getCurrentInstance();
   if (!l) return {};
-  const { excludeListeners: o = !1, excludeKeys: h = [] } = a, r = shallowRef({}), c = h.concat(DEFAULT_EXCLUDE_KEYS);
+  const { excludeListeners: o = !1, excludeKeys: h = [] } = a, r = shallowRef({}), e = h.concat(DEFAULT_EXCLUDE_KEYS);
   return l.attrs = reactive(l.attrs), watchEffect(() => {
-    const i = entries(l.attrs).reduce((Z, [e, t]) => (!c.includes(e) && !(o && LISTENER_PREFIX.test(e)) && (Z[e] = t), Z), {});
+    const i = entries(l.attrs).reduce((t, [c, Z]) => (!e.includes(c) && !(o && LISTENER_PREFIX.test(c)) && (t[c] = Z), t), {});
     r.value = i;
   }), r;
 }
 const useRender = () => {
-  const a = { value: "dictCode", label: "dictName" }, l = (v, b) => {
+  const a = { value: "dictCode", label: "dictName" }, l = (v, p) => {
     var N;
-    const M = k(b);
-    let s = {
+    const b = k(p);
+    let y = {
       clearable: !0,
       disabled: !1,
       showValue: !1,
       placeholder: null
     }, L, x;
-    isObject(v) ? (s = Object.assign(s, v), L = v.defaultValue, x = v == null ? void 0 : v.code) : x = v;
+    isObject(v) ? (y = Object.assign(y, v), L = v.defaultValue, x = v == null ? void 0 : v.code) : x = v;
     const D = (N = storageLocal.getItem("kLov")[x]) == null ? void 0 : N.children, F = D ? D.filter((E) => E.enabled === "1") : [];
     return {
       name: "#select",
       optionProps: a,
       options: F,
-      props: s,
+      props: y,
       defaultValue: L,
-      events: M
+      events: b
     };
-  }, o = (v, b) => {
-    const M = k(b);
+  }, o = (v, p) => {
+    const b = k(p);
     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: M
+      events: b
     };
-  }, h = (v, b) => {
-    const M = {
+  }, h = (v, p) => {
+    const b = {
       optionProps: { extLabel: "userName", value: "employeeName" },
       props: {
         attrs: { disabled: v == null ? void 0 : v.disabled },
@@ -1135,9 +1166,9 @@ const useRender = () => {
         fetchField: "employeeName"
       }
     };
-    return o(M, b);
+    return o(b, p);
   }, r = (v) => {
-    const b = {
+    const p = {
       optionProps: { extLabel: "userName", value: "name" },
       props: {
         code: "sys/listUsers",
@@ -1146,12 +1177,12 @@ const useRender = () => {
         mapField: v == null ? void 0 : v.mapField
       }
     };
-    return o(b);
-  }, c = (v, b) => {
-    const M = {
+    return o(p);
+  }, e = (v, p) => {
+    const b = {
       label: "organizationName",
       value: (v == null ? void 0 : v.field) || "organizationName"
-    }, s = {
+    }, y = {
       mapField: {},
       defaultParams: v == null ? void 0 : v.defaultParams,
       url: "/uums/cusOrganization",
@@ -1160,50 +1191,50 @@ const useRender = () => {
       organizationId: "id",
       organizationCode: "organizationCode"
     };
-    return Object.assign(s.mapField, L, (v == null ? void 0 : v.mapField) || {}), { name: "#SuSelect", props: s, optionProps: M, options: [], methods: b };
-  }, i = (v, b) => {
-    const M = {
+    return Object.assign(y.mapField, L, (v == null ? void 0 : v.mapField) || {}), { name: "#SuSelect", props: y, optionProps: b, options: [], methods: p };
+  }, i = (v, p) => {
+    const b = {
       label: "orgName",
       value: (v == null ? void 0 : v.field) || "orgName"
-    }, s = {
+    }, y = {
       mapField: {},
       defaultParams: v == null ? void 0 : v.defaultParams,
       url: "/uums/org",
       fetchField: "orgName"
     }, L = { orgId: "id", orgCode: "orgCode" };
-    return Object.assign(s.mapField, L, (v == null ? void 0 : v.mapField) || {}), { name: "#SuSelect", props: s, optionProps: M, options: [], methods: b };
-  }, Z = (v, b) => {
-    const M = Object.assign({ disabled: !1 }, v), s = M == null ? void 0 : M.defaultValue;
+    return Object.assign(y.mapField, L, (v == null ? void 0 : v.mapField) || {}), { name: "#SuSelect", props: y, optionProps: b, options: [], methods: p };
+  }, t = (v, p) => {
+    const b = Object.assign({ disabled: !1 }, v), y = b == null ? void 0 : b.defaultValue;
     return {
       name: "VxeInput",
-      props: M,
-      defaultValue: s,
-      events: k(b)
+      props: b,
+      defaultValue: y,
+      events: k(p)
     };
-  }, e = (v, b) => {
-    const M = Object.assign({ disabled: !1, rows: 3 }, v), s = M == null ? void 0 : M.defaultValue;
+  }, c = (v, p) => {
+    const b = Object.assign({ disabled: !1, rows: 3 }, v), y = b == null ? void 0 : b.defaultValue;
     return {
-      name: "VxeTextarea",
-      props: M,
-      defaultValue: s,
-      events: k(b)
+      name: "#textarea",
+      props: b,
+      defaultValue: y,
+      events: k(p)
     };
-  }, t = (v, b) => {
-    const M = "VxeCheckbox", { defaultValue: s, options: L, props: x } = f(v);
-    return { name: M, defaultValue: s, options: L, props: x, events: k(b) };
-  }, d = (v, b) => {
-    const M = "VxeRadio", { defaultValue: s, options: L, props: x } = f(v);
-    return { name: M, defaultValue: s, options: L, props: x, events: k(b) };
-  }, f = (v) => {
+  }, Z = (v, p) => {
+    const b = "VxeCheckbox", { defaultValue: y, options: L, props: x } = n(v);
+    return { name: b, defaultValue: y, options: L, props: x, events: k(p) };
+  }, d = (v, p) => {
+    const b = "VxeRadio", { defaultValue: y, options: L, props: x } = n(v);
+    return { name: b, defaultValue: y, options: L, props: x, events: k(p) };
+  }, n = (v) => {
     var D;
-    let b = { disabled: !1 }, M;
-    const s = storageLocal.getItem("kLov");
+    let p = { disabled: !1 }, b;
+    const y = storageLocal.getItem("kLov");
     let L = "";
-    isObject(v) ? (M = v.defaultValue, L = v.code, b = Object.assign(b, v || {})) : isString(v) && (L = v);
-    const x = L ? (D = s[L]) == null ? void 0 : D.children.map((F) => ({ label: F.dictName, value: F.dictCode })) : [];
-    return { props: b, defaultValue: M, options: x };
-  }, m = (v, b) => {
-    const M = k(b);
+    isObject(v) ? (b = v.defaultValue, L = v.code, p = Object.assign(p, v || {})) : isString(v) && (L = v);
+    const x = L ? (D = y[L]) == null ? void 0 : D.children.map((F) => ({ label: F.dictName, value: F.dictCode })) : [];
+    return { props: p, defaultValue: b, options: x };
+  }, f = (v, p) => {
+    const b = k(p);
     return {
       name: "VxeInput",
       props: Object.assign(
@@ -1211,16 +1242,16 @@ const useRender = () => {
         v || {}
       ),
       defaultValue: v == null ? void 0 : v.defaultValue,
-      events: M
+      events: b
     };
-  }, u = (v, b) => {
-    const M = k(b), s = "yyyy-MM-dd HH:mm:ss", L = v == null ? void 0 : v.defaultValue;
-    return { name: "VxeInput", props: Object.assign({ type: "date", valueFormat: s, clearable: !0 }, v || {}), defaultValue: L, events: M };
-  }, H = (v, b) => {
-    const M = k(b);
-    return { name: "#lov", props: Object.assign({}, v || {}), events: M };
-  }, p = (v, b) => {
-    const M = k(b), s = (v == null ? void 0 : v.optionProps) || {
+  }, H = (v, p) => {
+    const b = k(p), y = "yyyy-MM-dd HH:mm:ss", L = v == null ? void 0 : v.defaultValue;
+    return { name: "VxeInput", props: Object.assign({ type: "date", valueFormat: y, clearable: !0 }, v || {}), defaultValue: L, events: b };
+  }, m = (v, p) => {
+    const b = k(p);
+    return { name: "#lov", props: Object.assign({}, v || {}), events: b };
+  }, s = (v, p) => {
+    const b = k(p), y = (v == null ? void 0 : v.optionProps) || {
       label: "label",
       value: "value"
     }, L = Object.assign(
@@ -1229,86 +1260,98 @@ const useRender = () => {
     );
     return console.log("itemRender"), {
       name: "#select",
-      optionProps: s,
+      optionProps: y,
       options: (v == null ? void 0 : v.options) || [],
       props: L,
-      events: M
+      events: b
     };
-  }, n = (v, b) => {
-    let M = {
+  }, u = (v, p) => {
+    let b = {
       openLabel: "是",
       closeLabel: "否",
       openValue: "Y",
       closeValue: "N"
-    }, s = "Y";
-    isObject(v) && !isFunction(v) ? (M = Object.assign(M, v || {}), s = v.defaultValue || s) : !isEmpty(v) && isString(v) && (s = v, M = Object.assign(M, { defaultValue: s }));
-    const L = isFunction(v) ? k(v) : k(b);
-    return { name: "VxeSwitch", props: M, defaultValue: s, events: L };
-  }, y = (v, b) => ({ name: "#tag", props: { code: v, tagMap: b } }), C = (v, b) => {
-    const M = {
+    }, 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) ? k(v) : k(p);
+    return { name: "VxeSwitch", props: b, defaultValue: y, events: L };
+  }, M = (v, p) => ({ name: "#tag", props: { code: v, tagMap: p } }), C = (v, p) => {
+    const b = {
       openLabel: "启用",
       closeLabel: "禁用",
       openValue: "1",
       closeValue: "0",
       defaultValue: "1"
     };
-    !isFunction(v) && isObject(v) && Object.assign(M, v);
-    const s = isFunction(v) ? v : b;
-    return n(M, s);
-  }, A = () => ({ name: "#iconSelect" }), w = (v = [], b = {}, M) => ({ name: "#treeSelect", sourceData: v, props: b, events: M }), V = (v, b) => {
-    const M = k(b);
+    !isFunction(v) && isObject(v) && Object.assign(b, v);
+    const y = isFunction(v) ? v : p;
+    return u(b, y);
+  }, A = () => ({ name: "#iconSelect" }), w = (v = [], p = {}, b) => ({ name: "#treeSelect", sourceData: v, props: p, events: b }), V = (v, p) => {
+    const b = k(p);
     return {
       name: "#area",
       props: { mapField: (v == null ? void 0 : v.mapField) || ["province", "city", "region"] },
-      events: M
+      events: b
     };
   }, k = (v) => {
-    let b = {};
-    return isObject(v) && !isFunction(v) ? b = {
+    let p = {};
+    return isObject(v) && !isFunction(v) ? p = {
       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,
+      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 && (b = { change: v }), b;
+    } : v && (p = { change: v }), p;
+  }, R = (v, p) => {
+    v = v || {};
+    const { singleMode: b, mode: y } = v;
+    return b && Object.assign(v, {
+      multiple: !1,
+      limitCount: 1,
+      autoHiddenButton: !0
+    }), (!y || y === "image") && (v.imageTypes = ["jpg", "jpeg", "png", "gif", "apk"]), { name: "#upload", props: v, events: p };
   };
   function I() {
   }
   return {
     renderDict: l,
     renderSelect: o,
-    renderInput: Z,
-    renderTextarea: e,
-    renderCheckBox: t,
+    renderInput: t,
+    renderTextarea: c,
+    renderCheckBox: Z,
     renderRadio: d,
     renderUser: h,
     renderSysUser: r,
-    renderInvOrg: c,
+    renderInvOrg: e,
     renderBU: i,
-    renderNumber: m,
-    renderLov: H,
-    renderSelectLocal: p,
-    renderDate: u,
-    renderSwitch: n,
-    renderCellTag: y,
+    renderNumber: f,
+    renderLov: m,
+    renderSelectLocal: s,
+    renderDate: H,
+    renderSwitch: u,
+    renderCellTag: M,
     renderEnabled: C,
     renderIconSelect: A,
     renderTreeSelect: w,
-    renderArea: V
+    renderArea: V,
+    renderUpload: R
   };
 }, useGlobal = () => {
   const a = getCurrentInstance();
   if (!a) return { $global: {}, $storage: {}, $config: {} };
-  const l = a.appContext.app.config.globalProperties, o = l.$storage, h = l.$config, r = l.$serviceApi, c = l.$hasAuthority, i = l.$printPlugin, Z = l.$mode;
+  const l = a.appContext.app.config.globalProperties, o = l.$storage, h = l.$config, r = l.$serviceApi, e = l.$hasAuthority, i = l.$printPlugin, t = l.$mode;
   return {
     $global: l,
     $storage: o,
     $config: h,
     $serviceApi: r,
-    $hasAuthority: c,
+    $hasAuthority: e,
     $printPlugin: i,
-    $mode: Z
+    $mode: t
   };
 }, hexList = [];
 for (let a = 0; a <= 15; a++)
@@ -1325,8 +1368,8 @@ function buildShortUUID(a = "") {
   return unique++, a + "_" + o + unique + String(l);
 }
 const deviceDetection = () => {
-  const a = navigator.userAgent.toLowerCase(), l = a.match(/iphone os/i) === "iphone os", o = a.match(/midp/i) === "midp", h = a.match(/rv:1.2.3.4/i) === "rv:1.2.3.4", r = a.match(/ucweb/i) === "ucweb", c = a.match(/android/i) === "android", i = a.match(/windows ce/i) === "windows ce", Z = a.match(/windows mobile/i) === "windows mobile";
-  return l || o || h || r || c || i || Z;
+  const a = navigator.userAgent.toLowerCase(), l = a.match(/iphone os/i) === "iphone os", o = a.match(/midp/i) === "midp", h = a.match(/rv:1.2.3.4/i) === "rv:1.2.3.4", r = a.match(/ucweb/i) === "ucweb", e = a.match(/android/i) === "android", i = a.match(/windows ce/i) === "windows ce", t = a.match(/windows mobile/i) === "windows mobile";
+  return l || o || h || r || e || i || t;
 }, getBrowserInfo = () => {
   const a = navigator.userAgent.toLowerCase(), l = /(msie|firefox|chrome|opera|version).*?([\d.]+)/, o = a.match(l);
   return {
@@ -1353,26 +1396,26 @@ const deviceDetection = () => {
 }, renderHook = useRender(), i18nColums = (a, l = !0) => {
   let o = 0, h = 0;
   const r = a.length - 1;
-  return a.map((c, i) => {
-    if (h = h + c.width, c.type) return c;
-    c.title = c.title || `message.${c.field}`;
-    const { showOverflow: Z } = c;
-    return c.field !== "operate" && ((c.width > 99 || c.minWidth) && (c.showOverflow = Z === !1 ? Z : "tooltip"), c.sortable = !(l === !1 || c.sortable === !1)), o || (o = c.minWidth), !o && r === i && h < window.innerWidth && (c.minWidth = c.width, c.width = null), c;
+  return a.map((e, i) => {
+    if (h = h + e.width, e.type) return e;
+    e.title = e.title || `message.${e.field}`;
+    const { showOverflow: t } = e;
+    return e.field !== "operate" && ((e.width > 99 || e.minWidth) && (e.showOverflow = t === !1 ? t : "tooltip"), e.sortable = !(l === !1 || e.sortable === !1)), o || (o = e.minWidth), !o && r === i && h < window.innerWidth && (e.minWidth = e.width, e.width = null), e;
   });
 }, formatItems = (a, l, o = 24) => a.length ? a.map((h) => {
-  var r, c, i;
+  var r, e, i;
   if ((r = h.children) != null && r.length)
     return h.children = formatItems(h.children, l, o), h;
   {
     h.title = h.title || `message.${h.field}`, h.span = h.span || o, h.type === "collapseNode" && (h.title = "", h.titleWidth = 0);
-    let Z = !1;
-    l === "detail" ? (Z = !0, h.placeholder = null) : Z = h.disabled === !1 ? h.disabled : h.disabled || ((i = (c = h.itemRender) == null ? void 0 : c.props) == null ? void 0 : i.disabled);
-    let e = {
+    let t = !1;
+    l === "detail" ? (t = !0, h.placeholder = null) : t = h.disabled === !1 ? h.disabled : h.disabled || ((i = (e = h.itemRender) == null ? void 0 : e.props) == null ? void 0 : i.disabled);
+    let c = {
       name: "VxeInput",
-      props: { disabled: Z, placeholder: Z ? "" : h.placeholder }
+      props: { disabled: t, placeholder: t ? "" : h.placeholder }
     };
-    return h.code && !h.itemRender && (e = renderHook.renderDict(h.code)), h.itemRender = h.itemRender || e, h.itemRender.props = Object.assign(h.itemRender.props || {}, {
-      disabled: Z
+    return h.code && !h.itemRender && (c = renderHook.renderDict(h.code)), h.itemRender = h.itemRender || c, h.itemRender.props = Object.assign(h.itemRender.props || {}, {
+      disabled: t
     }), h;
   }
 }) : a, formSearchButtons = {
@@ -1400,39 +1443,39 @@ const deviceDetection = () => {
     events: null
   }
 }, formatGridItems = (a, l) => {
-  const o = a, h = o.length, r = h > 2 && o.some((t, d) => d < 3 && (t.span > 6 || getDateRange(t))), c = r || h > 3, i = {
+  const o = a, h = o.length, r = h > 2 && o.some((Z, d) => d < 3 && (Z.span > 6 || getDateRange(Z))), e = r || h > 3, i = {
     collapseTags: !0,
     collapseTagsTooltip: !0,
     multiple: !0
-  }, Z = o.map((t, d) => {
-    var f, m, u;
-    return t.folding = r ? c && d > 1 : c && d > 2, t.span = getDateRange(t) ? 12 : t.span || 6, t.code && !t.itemRender && (t.itemRender = renderHook.renderDict(t.code)), t.itemRender = t.itemRender || { name: "VxeInput" }, t.resetValue = t.itemRender.defaultValue, t.title = t.title || `message.${t.field}`, (t.multiple || (m = (f = t.itemRender) == null ? void 0 : f.props) != null && m.multiple) && (t.itemRender.props = Object.assign(
+  }, t = o.map((Z, d) => {
+    var n, f, H;
+    return Z.folding = r ? e && d > 1 : e && d > 2, Z.span = getDateRange(Z) ? 12 : Z.span || 6, Z.code && !Z.itemRender && (Z.itemRender = renderHook.renderDict(Z.code)), Z.itemRender = Z.itemRender || { name: "VxeInput" }, Z.resetValue = Z.itemRender.defaultValue, Z.title = Z.title || `message.${Z.field}`, (Z.multiple || (f = (n = Z.itemRender) == null ? void 0 : n.props) != null && f.multiple) && (Z.itemRender.props = Object.assign(
       i,
-      ((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);
+      ((H = Z.itemRender) == null ? void 0 : H.props) || {}
+    )), Z;
+  }), c = clone(formSearchButtons, !0);
+  if (c.collapseNode = e, l && c.itemRender.options.length < 3 && (c.itemRender.options.push(l), c.itemRender.events = l.events), e) {
+    const Z = r ? 2 : 3;
+    t.splice(Z, 0, c);
   } else
-    Z.push(e);
-  return Z;
+    t.push(c);
+  return t;
 }, getDateRange = (a) => {
-  var l, o, h, r, c;
-  return ((l = a.itemRender) == null ? void 0 : l.name) === "#SuDateRange" ? ((h = (o = a.itemRender) == null ? void 0 : o.props) == null ? void 0 : h.type) === "daterange" || !((c = (r = a.itemRender) == null ? void 0 : r.props) != null && c.type) : !1;
+  var l, o, h, r, e;
+  return ((l = a.itemRender) == null ? void 0 : l.name) === "#SuDateRange" ? ((h = (o = a.itemRender) == null ? void 0 : o.props) == null ? void 0 : h.type) === "daterange" || !((e = (r = a.itemRender) == null ? void 0 : r.props) != null && e.type) : !1;
 }, formatRules = (a, l) => {
   const o = {};
   return a.forEach((h) => {
     var r;
     if ((r = h.children) != null && r.length) {
-      const c = formatRules(h.children, l);
-      merge(o, c);
+      const e = formatRules(h.children, l);
+      merge(o, e);
     } else if (h.required) {
-      const { field: c, title: i } = h, Z = i == null ? void 0 : i.startsWith("message.");
-      o[c] = [
+      const { field: e, title: i } = h, t = i == null ? void 0 : i.startsWith("message.");
+      o[e] = [
         {
           required: !0,
-          message: `${l("message.required")}${i && Z ? l(i) : i || l(`message.${c}`)}`
+          message: `${l("message.required")}${i && t ? l(i) : i || l(`message.${e}`)}`
         }
       ];
     }
@@ -1551,29 +1594,29 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
       (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((h) => l.url.indexOf(h) > -1) ? l : new Promise((h) => {
         const r = cookies.get(kTOKENKEY);
         if (r) {
-          const c = JSON.parse(r), i = (/* @__PURE__ */ new Date()).getTime();
-          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 = [];
+          const e = JSON.parse(r), i = (/* @__PURE__ */ new Date()).getTime();
+          e.expires - i <= 0 ? (g.isRefreshing || (g.isRefreshing = !0, this.get(this.baseUrl + "/uath/refreshToken", {
+            refreshToken: e.refreshToken
+          }).then((c) => {
+            this.setToken(c), l.headers.Authorization = "Bearer " + c.access_token, g.requests.forEach((Z) => Z(c.access_token)), g.requests = [];
           }).finally(() => {
             g.isRefreshing = !1;
-          })), h(g.retryOriginalRequest(l))) : (l.headers.Authorization = "Bearer " + c.accessToken, h(l));
+          })), h(g.retryOriginalRequest(l))) : (l.headers.Authorization = "Bearer " + e.accessToken, h(l));
         } else {
-          const c = cookies.get("kCookies_token");
-          c && (l.headers["X-Token"] = c), h(l);
+          const e = cookies.get("kCookies_token");
+          e && (l.headers["X-Token"] = e), h(l);
         }
       })),
       (l) => Promise.reject(l)
     );
   }
   setToken(l) {
-    const { access_token: o, expires_in: h, refresh_token: r } = l, c = {
+    const { access_token: o, expires_in: h, refresh_token: r } = l, e = {
       accessToken: o,
       refreshToken: r,
       expires: Date.now() + h * 1e3
     };
-    cookies.set(kTOKENKEY, JSON.stringify(c));
+    cookies.set(kTOKENKEY, JSON.stringify(e));
   }
   // 响应拦截
   httpInterceptorsResponse() {
@@ -1590,7 +1633,7 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
     );
   }
   transformConfigByMethod(l, o) {
-    const { method: h } = o, r = ["get"], c = h.toLocaleLowerCase(), i = r.includes(c) ? "params" : "data";
+    const { method: h } = o, r = ["get"], e = h.toLocaleLowerCase(), i = r.includes(e) ? "params" : "data";
     return {
       ...o,
       [i]: l
@@ -1598,34 +1641,34 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
   }
   // 通用请求工具函数
   request(l, o, h, r) {
-    const c = this.transformConfigByMethod(h, {
+    const e = this.transformConfigByMethod(h, {
       method: l,
       url: o,
       ...r
     });
-    return new Promise((i, Z) => {
-      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);
+    return new Promise((i, t) => {
+      g.axiosInstance.request(e).then((c) => {
+        if (c && (c == null ? void 0 : c.code) === "0")
+          i(c.data);
+        else if (c.code === "500")
+          errorMessage(c.msg, { duration: 8e3 }), e.method === "get" ? i(c) : t(c.msg);
+        else if ((c == null ? void 0 : c.code) !== "-1")
+          i(c);
         else {
-          const t = (e == null ? void 0 : e.msg) || "服务异常";
-          errorMessage(t, { duration: 8e3 }), Z(t);
+          const Z = (c == null ? void 0 : c.msg) || "服务异常";
+          errorMessage(Z, { duration: 8e3 }), t(Z);
         }
-      }).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)
+      }).catch((c) => {
+        var Z, d, n;
+        if (c != null && c.code) {
+          if (((Z = c == null ? void 0 : c.response) == null ? void 0 : Z.status) === 401)
             return (d = this.router) == null ? void 0 : d.push({ path: "/login" });
           errorMessage(
-            this.getNetworkError((f = e == null ? void 0 : e.response) == null ? void 0 : f.status) || (e == null ? void 0 : e.message),
+            this.getNetworkError((n = c == null ? void 0 : c.response) == null ? void 0 : n.status) || (c == null ? void 0 : c.message),
             { duration: 8e3 }
           );
         }
-        e.config.method === "get" ? i(e) : Z(e);
+        c.config.method === "get" ? i(c) : t(c);
       });
     });
   }
@@ -2394,8 +2437,8 @@ const http = new SuHttp(), lunarCalendar = {
       return -1;
     const o = this.sTermInfo[a - 1900], h = [];
     for (let r = 0; r < o.length; r += 5) {
-      const c = parseInt("0x" + o.substr(r, 5)).toString();
-      h.push(c[0], c.substr(1, 2), c[3], c.substr(4, 2));
+      const e = parseInt("0x" + o.substr(r, 5)).toString();
+      h.push(e[0], e.substr(1, 2), e[3], e.substr(4, 2));
     }
     return parseInt(h[l - 1]);
   },
@@ -2453,60 +2496,60 @@ const http = new SuHttp(), lunarCalendar = {
    * @eg:console.log(calendar.solar2lunar(1987,11,01));
    */
   solar2lunar: function(a, l, o) {
-    let h = parseInt(a), r = parseInt(l), c = parseInt(o);
-    if (h < 1900 || h > 2100 || h === 1900 && r === 1 && c < 31)
+    let h = parseInt(a), r = parseInt(l), e = parseInt(o);
+    if (h < 1900 || h > 2100 || h === 1900 && r === 1 && e < 31)
       return -1;
     let i;
-    h ? i = new Date(h, parseInt(r.toString()) - 1, c) : i = /* @__PURE__ */ new Date();
-    let Z, e = 0, t = 0;
-    h = i.getFullYear(), r = i.getMonth() + 1, c = i.getDate();
+    h ? i = new Date(h, parseInt(r.toString()) - 1, e) : i = /* @__PURE__ */ new Date();
+    let t, c = 0, Z = 0;
+    h = i.getFullYear(), r = i.getMonth() + 1, e = 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++)
-      t = this.lYearDays(Z), d -= t;
-    d < 0 && (d += t, Z--);
-    const f = /* @__PURE__ */ new Date();
-    let m = !1;
-    f.getFullYear() === h && f.getMonth() + 1 === r && f.getDate() === c && (m = !0);
-    let u = i.getDay();
-    const H = this.nStr1[u];
-    u === 0 && (u = 7);
-    const p = Z;
-    e = this.leapMonth(Z);
-    let n = !1;
-    for (Z = 1; Z < 13 && d > 0; Z++)
-      e > 0 && Z === e + 1 && n === !1 ? (--Z, n = !0, t = this.leapDays(p)) : t = this.monthDays(p, Z), n === !0 && Z === e + 1 && (n = !1), d -= t;
-    d === 0 && e > 0 && Z === e + 1 && (n ? n = !1 : (n = !0, --Z)), d < 0 && (d += t, --Z);
-    const y = Z, C = d + 1, A = r - 1, w = this.toGanZhiYear(p), V = this.getTerm(h, r * 2 - 1), k = this.getTerm(h, r * 2);
-    let I = this.toGanZhi((h - 1900) * 12 + r + 11);
-    c >= V && (I = this.toGanZhi((h - 1900) * 12 + r + 12));
-    let v = !1, b;
-    V === c && (v = !0, b = this.solarTerm[r * 2 - 2]), k === c && (v = !0, b = this.solarTerm[r * 2 - 1]);
-    const M = Date.UTC(h, A, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, s = this.toGanZhi(M + c - 1), L = this.toAstro(r, c), x = h + "-" + r + "-" + c, D = p + "-" + y + "-" + C, F = this.festival, N = this.lFestival, E = r + "-" + c;
-    let R = y + "-" + C;
-    return y === 12 && C === 29 && this.monthDays(p, y) === 29 && (R = "12-30"), {
-      date: x,
-      lunarDate: D,
-      festival: F[E] ? F[E].title : null,
-      lunarFestival: N[R] ? N[R].title : null,
-      lYear: p,
-      lMonth: y,
+    for (t = 1900; t < 2101 && d > 0; t++)
+      Z = this.lYearDays(t), d -= Z;
+    d < 0 && (d += Z, t--);
+    const n = /* @__PURE__ */ new Date();
+    let f = !1;
+    n.getFullYear() === h && n.getMonth() + 1 === r && n.getDate() === e && (f = !0);
+    let H = i.getDay();
+    const m = this.nStr1[H];
+    H === 0 && (H = 7);
+    const s = t;
+    c = this.leapMonth(t);
+    let u = !1;
+    for (t = 1; t < 13 && d > 0; t++)
+      c > 0 && t === c + 1 && u === !1 ? (--t, u = !0, Z = this.leapDays(s)) : Z = this.monthDays(s, t), u === !0 && t === c + 1 && (u = !1), d -= Z;
+    d === 0 && c > 0 && t === c + 1 && (u ? u = !1 : (u = !0, --t)), d < 0 && (d += Z, --t);
+    const M = t, C = d + 1, A = r - 1, w = this.toGanZhiYear(s), V = this.getTerm(h, r * 2 - 1), k = this.getTerm(h, r * 2);
+    let R = this.toGanZhi((h - 1900) * 12 + r + 11);
+    e >= V && (R = this.toGanZhi((h - 1900) * 12 + r + 12));
+    let I = !1, v;
+    V === e && (I = !0, v = this.solarTerm[r * 2 - 2]), k === e && (I = !0, v = this.solarTerm[r * 2 - 1]);
+    const p = Date.UTC(h, A, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, b = this.toGanZhi(p + e - 1), y = this.toAstro(r, e), L = h + "-" + r + "-" + e, x = s + "-" + M + "-" + C, D = this.festival, F = this.lFestival, N = r + "-" + e;
+    let E = M + "-" + C;
+    return M === 12 && C === 29 && this.monthDays(s, M) === 29 && (E = "12-30"), {
+      date: L,
+      lunarDate: x,
+      festival: D[N] ? D[N].title : null,
+      lunarFestival: F[E] ? F[E].title : null,
+      lYear: s,
+      lMonth: M,
       lDay: C,
-      Animal: this.getAnimal(p),
-      IMonthCn: (n ? "闰" : "") + this.toChinaMonth(y),
+      Animal: this.getAnimal(s),
+      IMonthCn: (u ? "闰" : "") + this.toChinaMonth(M),
       IDayCn: this.toChinaDay(C),
       cYear: h,
       cMonth: r,
-      cDay: c,
+      cDay: e,
       gzYear: w,
-      gzMonth: I,
-      gzDay: s,
-      isToday: m,
-      isLeap: n,
-      nWeek: u,
-      ncWeek: "星期" + H,
-      isTerm: v,
-      Term: b,
-      astro: L
+      gzMonth: R,
+      gzDay: b,
+      isToday: f,
+      isLeap: u,
+      nWeek: H,
+      ncWeek: "星期" + m,
+      isTerm: I,
+      Term: v,
+      astro: y
     };
   },
   /**
@@ -2524,19 +2567,19 @@ const http = new SuHttp(), lunarCalendar = {
     const r = this.leapMonth(a);
     if (h && r !== l || a === 2100 && l === 12 && o > 1 || a === 1900 && l === 1 && o < 31)
       return -1;
-    const c = this.monthDays(a, l);
-    let i = c;
+    const e = this.monthDays(a, l);
+    let i = e;
     if (h && (i = this.leapDays(a)), a < 1900 || a > 2100 || o > i)
       return -1;
-    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);
-    h && (Z += c);
-    const f = Date.UTC(1900, 1, 30, 0, 0, 0), m = new Date((Z + o - 31) * 864e5 + f), u = m.getUTCFullYear(), H = m.getUTCMonth() + 1, p = m.getUTCDate();
-    return this.solar2lunar(u, H, p);
+    let t = 0, c;
+    for (c = 1900; c < a; c++)
+      t += this.lYearDays(c);
+    let Z = 0, d = !1;
+    for (c = 1; c < l; c++)
+      Z = this.leapMonth(a), d || Z <= c && Z > 0 && (t += this.leapDays(a), d = !0), t += this.monthDays(a, c);
+    h && (t += e);
+    const n = Date.UTC(1900, 1, 30, 0, 0, 0), f = new Date((t + o - 31) * 864e5 + n), H = f.getUTCFullYear(), m = f.getUTCMonth() + 1, s = f.getUTCDate();
+    return this.solar2lunar(H, m, s);
   }
 }, dict = storageLocal.getItem("kLov"), formats = {
   formatDate: {
@@ -2573,9 +2616,9 @@ const http = new SuHttp(), lunarCalendar = {
   formatDict: {
     // 数据字段转化
     tableCellFormatMethod({ cellValue: a }, l) {
-      var r, c;
+      var r, e;
       if (!l) return a;
-      const o = XEUtils.toValueString(a), h = dict ? (c = (r = dict[l]) == null ? void 0 : r.children) == null ? void 0 : c.find((i) => i.dictCode === o) : a;
+      const o = XEUtils.toValueString(a), h = dict ? (e = (r = dict[l]) == null ? void 0 : r.children) == null ? void 0 : e.find((i) => i.dictCode === o) : a;
       return (h == null ? void 0 : h.dictName) || a;
     }
   },
@@ -2593,18 +2636,18 @@ const http = new SuHttp(), lunarCalendar = {
   },
   formatSelectLocal: {
     tableCellFormatMethod({ cellValue: a }, l) {
-      const [o, h = "value", r = "label"] = l, c = o == null ? void 0 : o.find((i) => i[h] === a);
-      return c ? c[r] : a;
+      const [o, h = "value", r = "label"] = l, e = o == null ? void 0 : o.find((i) => i[h] === a);
+      return e ? e[r] : a;
     }
   },
   formatMultiValue: {
     tableCellFormatMethod({ row: a }, l) {
-      var c;
+      var e;
       const [o, h] = l;
       let r;
-      return (c = a[o]) == null || c.split(",").forEach((i) => {
-        const Z = h.find((e) => e.value === i);
-        r = r ? `${r},${Z == null ? void 0 : Z.label}` : Z == null ? void 0 : Z.label;
+      return (e = a[o]) == null || e.split(",").forEach((i) => {
+        const t = h.find((c) => c.value === i);
+        r = r ? `${r},${t == null ? void 0 : t.label}` : t == null ? void 0 : t.label;
       }), r;
     }
   }
@@ -10253,7 +10296,7 @@ function isUrl(a) {
 }
 const getDictName = (a, l) => {
   var h, r;
-  return !a || !l ? null : (r = (h = storageLocal.getItem("kLov")[a]) == null ? void 0 : h.children.find((c) => l === c.dictCode)) == null ? void 0 : r.dictName;
+  return !a || !l ? null : (r = (h = storageLocal.getItem("kLov")[a]) == null ? void 0 : h.children.find((e) => l === e.dictCode)) == null ? void 0 : r.dictName;
 };
 export {
   W as NProgress,