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

package/dist/utils.es.js

@@ -1,6 +1,6 @@
-var T = Object.defineProperty;
-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);
+var U = Object.defineProperty;
+var j = (a, l, o) => l in a ? U(a, l, { enumerable: !0, configurable: !0, writable: !0, value: o }) : a[l] = o;
+var x = (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";
@@ -9,12 +9,12 @@ import ResizeObserver from "resize-observer-polyfill";
 import { VxeUI } from "vxe-pc-ui";
 import Axios from "axios";
 import NProgress from "nprogress";
-import { default as W } from "nprogress";
+import { default as G } from "nprogress";
 class sessionStorageProxy {
   constructor(l) {
-    S(this, "storage");
-    S(this, "prefix");
-    S(this, "addPrefix", (l) => {
+    x(this, "storage");
+    x(this, "prefix");
+    x(this, "addPrefix", (l) => {
       this.prefix = l;
     });
     this.storage = l;
@@ -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(a, l) {
 init({ read: DEFAULT_CODEC.decodeValue, write: DEFAULT_CODEC.encodeValue }, DEFAULT_ATTRIBUTES);
 class Cookies {
   constructor() {
-    S(this, "prefix", null);
-    S(this, "addPrefix", (l) => {
+    x(this, "prefix", null);
+    x(this, "addPrefix", (l) => {
       this.prefix = l;
     });
   }
@@ -199,33 +199,33 @@ const VxetableRender = (VXETable, {
         options: e,
         props: i,
         optionProps: t = {},
-        events: c
+        events: v
       } = a, {
         label: Z = "label",
         value: d = "value"
       } = t, {
         loading: n = !1,
         multiple: f,
-        mapField: H
+        mapField: u
       } = i, m = useComponent(), s = f ? `_${r.field}` : r.field;
       m.setDefaultValue(i, h, r.field);
-      function u(V) {
+      function M(V) {
         m.remote(V, r.field, a);
       }
-      function M(V) {
+      function p(V) {
         m.selectChange(V, h, r.field, a, {
           column: r,
           datasource: "row"
         });
       }
-      function C(V) {
-        c != null && c.input && c.input(l, V);
+      function y(V) {
+        v != null && v.input && v.input(l, V);
       }
       function A() {
-        m.clear(h, r.field, H, c, "row");
+        m.clear(h, r.field, u, v, "row");
       }
       function w() {
-        !e.length && u(""), c != null && c.focus && c.focus(l, r.field);
+        !e.length && M(""), v != null && v.focus && v.focus(l, r.field);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[s],
@@ -235,13 +235,13 @@ const VxetableRender = (VXETable, {
         clearable: !0,
         placeholder: "请录入关键字搜索",
         style: "width: 100%",
-        "remote-method": u,
+        "remote-method": M,
         loading: n
       }, i, {
         onFocus: () => w(),
-        onChange: (V) => M(V),
+        onChange: (V) => p(V),
         onClear: () => A(),
-        onInput: (V) => C(V)
+        onInput: (V) => y(V)
       }), _isSlot(o = e.map((V) => createVNode(resolveComponent("el-option"), {
         key: V[d],
         label: V[Z],
@@ -259,33 +259,33 @@ const VxetableRender = (VXETable, {
         options: e,
         props: i,
         optionProps: t = {},
-        events: c
+        events: v
       } = a, {
         label: Z = "label",
         value: d = "value"
       } = t, {
         loading: n = !1,
         multiple: f,
-        mapField: H
+        mapField: u
       } = i, m = useComponent(), s = f ? `_${r.field}` : r.field;
       m.setDefaultValue(i, h, r.field);
-      function u(V) {
+      function M(V) {
         m.remote(V, r.field, a);
       }
-      function M(V) {
+      function p(V) {
         m.selectChange(V, h, r.field, a, {
           column: r,
           datasource: "row"
         });
       }
-      function C(V) {
-        c != null && c.input && c.input(l, V);
+      function y(V) {
+        v != null && v.input && v.input(l, V);
       }
       function A() {
-        m.clear(h, r.field, H, c, "row");
+        m.clear(h, r.field, u, v, "row");
       }
       function w() {
-        !e.length && u(""), c != null && c.focus && c.focus(l, r.field);
+        !e.length && M(""), v != null && v.focus && v.focus(l, r.field);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[s],
@@ -295,13 +295,13 @@ const VxetableRender = (VXETable, {
         clearable: !0,
         placeholder: "请录入关键字搜索",
         style: "width: 100%",
-        "remote-method": u,
+        "remote-method": M,
         loading: n
       }, i, {
         onFocus: () => w(),
-        onChange: (V) => M(V),
+        onChange: (V) => p(V),
         onClear: () => A(),
-        onInput: (V) => C(V)
+        onInput: (V) => y(V)
       }), _isSlot(o = e.map((V) => createVNode(resolveComponent("el-option"), {
         key: V[d],
         label: V[Z],
@@ -333,32 +333,32 @@ const VxetableRender = (VXETable, {
         options: e,
         props: i,
         optionProps: t = {},
-        events: c
+        events: v
       } = a, {
         label: Z = "label",
         value: d = "value"
       } = t, {
         mapField: n,
         multiple: f,
-        loading: H = !1
+        loading: u = !1
       } = i, m = useComponent(), s = f ? `_${r}` : r;
       m.setDefaultValue(i, h, r);
-      async function u(V) {
+      async function M(V) {
         m.remote(V, r, a);
       }
-      function M(V) {
+      function p(V) {
         m.selectChange(V, h, r, a, {
           datasource: "data"
         });
       }
-      function C(V) {
-        c != null && c.input && c.input(l, V);
+      function y(V) {
+        v != null && v.input && v.input(l, V);
       }
       function A() {
-        m.clear(h, r, n, c, "data");
+        m.clear(h, r, n, v, "data");
       }
       function w() {
-        !e.length && u(""), c != null && c.focus && c.focus(l);
+        !e.length && M(""), v != null && v.focus && v.focus(l);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[s],
@@ -368,13 +368,13 @@ const VxetableRender = (VXETable, {
         clearable: !0,
         style: "width: 100%",
         placeholder: "请录入关键字搜索",
-        loading: H,
-        "remote-method": u
+        loading: u,
+        "remote-method": M
       }, i, {
         onFocus: () => w(),
-        onChange: (V) => M(V),
+        onChange: (V) => p(V),
         onClear: () => A(),
-        onInput: () => C()
+        onInput: () => y()
       }), _isSlot(o = e.map((V) => createVNode(resolveComponent("el-option"), {
         key: V[d],
         label: V[Z],
@@ -413,10 +413,10 @@ const VxetableRender = (VXETable, {
       }, {
         text: i18n("message.udp.anniversary", !0),
         value: () => [t(1, "year"), e]
-      }], t = (c, Z) => dayjs().subtract(c, Z).add("1", "day").format();
+      }], t = (v, Z) => dayjs().subtract(v, Z).add("1", "day").format();
       return [createVNode(resolveComponent("el-date-picker"), mergeProps({
         modelValue: o[h],
-        "onUpdate:modelValue": (c) => o[h] = c,
+        "onUpdate:modelValue": (v) => o[h] = v,
         type: (r == null ? void 0 : r.type) || "daterange",
         shortcuts: i,
         style: "width: 100%",
@@ -435,37 +435,37 @@ const VxetableRender = (VXETable, {
         options: e,
         props: i,
         optionProps: t = {},
-        events: c
+        events: v
       } = 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, {
+      } = i, u = useComponent(), m = n ? `_${r.field}` : r.field;
+      u.setDefaultValue(i, h, r.field);
+      function s(p) {
+        u.selectChange(p, h, r.field, a, {
           column: r,
           datasource: "row"
         });
       }
-      function u() {
-        H.clear(h, r.field, f, c, "row");
+      function M() {
+        u.clear(h, r.field, f, v, "row");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[m],
-        "onUpdate:modelValue": (M) => h[m] = M,
+        "onUpdate:modelValue": (p) => h[m] = p,
         filterable: !0,
         clearable: !0
       }, i, {
         style: "width: 100%",
-        onChange: (M) => s(M),
-        onClear: () => u()
-      }), _isSlot(o = e.map((M) => createVNode(resolveComponent("el-option"), {
-        key: M[d],
-        label: M[Z],
-        value: M[d]
+        onChange: (p) => s(p),
+        onClear: () => M()
+      }), _isSlot(o = e.map((p) => createVNode(resolveComponent("el-option"), {
+        key: p[d],
+        label: p[Z],
+        value: p[d]
       }, null))) ? o : {
         default: () => [o]
       })];
@@ -479,38 +479,38 @@ const VxetableRender = (VXETable, {
         options: e,
         props: i,
         optionProps: t = {},
-        events: c
+        events: v
       } = a, {
         label: Z = "label",
         value: d = "value",
         extLabel: n
       } = t, {
         multiple: f,
-        mapField: H
+        mapField: u
       } = 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, {
+      function M(y) {
+        m.selectChange(y, h, r.field, a, {
           column: r,
           datasource: "row"
         });
       }
-      function M() {
-        m.clear(h, r.field, H, c, "row");
+      function p() {
+        m.clear(h, r.field, u, v, "row");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[s],
-        "onUpdate:modelValue": (C) => h[s] = C,
+        "onUpdate:modelValue": (y) => h[s] = y,
         filterable: !0,
         clearable: !0
       }, i, {
         style: "width: 100%",
-        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]
+        onChange: (y) => M(y),
+        onClear: () => p()
+      }), _isSlot(o = e.map((y) => createVNode(resolveComponent("el-option"), {
+        key: y[d],
+        label: n && y[n] ? y[d] : y[Z],
+        value: y[d]
       }, null))) ? o : {
         default: () => [o]
       })];
@@ -544,36 +544,36 @@ const VxetableRender = (VXETable, {
         options: e,
         props: i,
         optionProps: t = {},
-        events: c
+        events: v
       } = a, {
         label: Z = "label",
         value: d = "value"
       } = t, n = useComponent(), {
         mapField: f,
-        multiple: H
-      } = i, m = H ? `_${r}` : r;
+        multiple: u
+      } = i, m = u ? `_${r}` : r;
       n.setDefaultValue(i, h, r);
-      function s(M) {
-        n.selectChange(M, h, r, a, {
+      function s(p) {
+        n.selectChange(p, h, r, a, {
           datasource: "data"
         });
       }
-      function u() {
-        n.clear(h, r, f, c, "data");
+      function M() {
+        n.clear(h, r, f, v, "data");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[m],
-        "onUpdate:modelValue": (M) => h[m] = M,
+        "onUpdate:modelValue": (p) => h[m] = p,
         filterable: !0,
         clearable: !0,
         style: "width: 100%"
       }, i, {
-        onChange: (M) => s(M),
-        onClear: () => u()
-      }), _isSlot(o = e.map((M) => createVNode(resolveComponent("el-option"), {
-        key: M[d],
-        label: M[Z],
-        value: M[d]
+        onChange: (p) => s(p),
+        onClear: () => M()
+      }), _isSlot(o = e.map((p) => createVNode(resolveComponent("el-option"), {
+        key: p[d],
+        label: p[Z],
+        value: p[d]
       }, null))) ? o : {
         default: () => [o]
       })];
@@ -588,42 +588,42 @@ const VxetableRender = (VXETable, {
         events: e
       } = a, i = useComponent(), {
         defaultValues: t,
-        mapField: c
+        mapField: v
       } = r;
       t && (o[h] = t);
       function Z(n, f) {
         const {
-          mapField: H,
+          mapField: u,
           field: m,
           displayName: s,
-          multiple: u
+          multiple: M
         } = r;
-        if (u) {
-          if (u) {
-            const C = {};
+        if (M) {
+          if (M) {
+            const y = {};
             o[s || m] = n.reduce((A, w) => {
-              for (const V in H)
-                C[V] = A ? C[V] + "," + w[H[V]] : w[H[V]];
+              for (const V in u)
+                y[V] = A ? y[V] + "," + w[u[V]] : w[u[V]];
               return A = A ? A + "," + w[s || m] : w[s || m], A;
-            }, ""), Object.assign(o, C);
+            }, ""), Object.assign(o, y);
           }
         } else {
-          const C = {
+          const y = {
             [s || m]: n[f || s || m]
           };
-          for (const A in H)
-            C[A] = n[H[A]];
-          Object.assign(o, C);
+          for (const A in u)
+            y[A] = n[u[A]];
+          Object.assign(o, y);
         }
-        const M = {
+        const p = {
           data: o,
           options: n,
           field: m
         };
-        e != null && e.change && e.change(M);
+        e != null && e.change && e.change(p);
       }
       function d() {
-        i.clear(o, h, c, e, "data");
+        i.clear(o, h, v, e, "data");
       }
       return [createVNode(resolveComponent("ut-lov"), mergeProps({
         record: o
@@ -646,16 +646,16 @@ const VxetableRender = (VXETable, {
         const {
           mapField: n,
           field: f,
-          displayName: H,
+          displayName: u,
           multiple: m
         } = r;
         if (!m) {
-          const u = {
-            [H || f]: Z[d || H || f]
+          const M = {
+            [u || f]: Z[d || u || f]
           };
-          for (const M in n)
-            u[M] = Z[n[M]];
-          Object.assign(o, u);
+          for (const p in n)
+            M[p] = Z[n[p]];
+          Object.assign(o, M);
         }
         const s = {
           row: o,
@@ -664,7 +664,7 @@ const VxetableRender = (VXETable, {
         };
         e != null && e.change && e.change(s);
       }
-      function c() {
+      function v() {
         i.clear(o, h.field, mapField, e, "row");
       }
       return [createVNode(resolveComponent("ut-lov"), mergeProps({
@@ -673,7 +673,7 @@ const VxetableRender = (VXETable, {
         transfer: !0
       }, r, {
         onChange: (Z, d) => t(Z, d),
-        onClear: () => c()
+        onClear: () => v()
       }), null)];
     },
     // 单元格默认
@@ -689,16 +689,16 @@ const VxetableRender = (VXETable, {
         const {
           mapField: n,
           field: f,
-          displayName: H,
+          displayName: u,
           multiple: m
         } = r;
         if (!m) {
-          const u = {
-            [H || f]: Z[d || H || f]
+          const M = {
+            [u || f]: Z[d || u || f]
           };
-          for (const M in n)
-            u[M] = Z[n[M]];
-          Object.assign(o, u);
+          for (const p in n)
+            M[p] = Z[n[p]];
+          Object.assign(o, M);
         }
         const s = {
           row: o,
@@ -707,7 +707,7 @@ const VxetableRender = (VXETable, {
         };
         e != null && e.change && e.change(s);
       }
-      function c() {
+      function v() {
         i.clear(o, h.field, mapField, e, "row");
       }
       return [createVNode(resolveComponent("ut-lov"), mergeProps({
@@ -715,7 +715,7 @@ const VxetableRender = (VXETable, {
         mode: "ele"
       }, r, {
         onChange: (Z, d) => t(Z, d),
-        onClear: () => c()
+        onClear: () => v()
       }), null)];
     },
     // 可编辑显示模板
@@ -726,6 +726,98 @@ const VxetableRender = (VXETable, {
       } = l;
       return [createVNode("span", null, [o[h.field]])];
     }
+  }), VXETable.renderer.add("#textarea", {
+    renderTableEdit(a, l) {
+      const {
+        row: o,
+        column: h
+      } = l, {
+        props: r,
+        events: e
+      } = a, {
+        mapField: i
+      } = r, t = useComponent();
+      function v(d) {
+        t.change(d, o, h.field, a, {
+          column: h,
+          datasource: "row"
+        });
+      }
+      function Z() {
+        t.clear(o, h.field, i, e, "row");
+      }
+      return [createVNode(resolveComponent("vxe-textarea"), mergeProps({
+        modelValue: o[h.field],
+        "onUpdate:modelValue": (d) => o[h.field] = d
+      }, r, {
+        style: "width: 100%",
+        onChange: (d) => v(d),
+        onClear: () => Z()
+      }), null)];
+    },
+    renderTableDefault(a, l) {
+      const {
+        row: o,
+        column: h
+      } = l, {
+        props: r,
+        events: e
+      } = a, {
+        mapField: i
+      } = r, t = useComponent();
+      function v(d) {
+        t.change(d, o, h.field, a, {
+          column: h,
+          datasource: "row"
+        });
+      }
+      function Z() {
+        t.clear(o, h.field, i, e, "row");
+      }
+      return [createVNode(resolveComponent("vxe-textarea"), mergeProps({
+        modelValue: o[h.field],
+        "onUpdate:modelValue": (d) => o[h.field] = d
+      }, r, {
+        onChange: (d) => v(d),
+        onClear: () => Z()
+      }), null)];
+    },
+    // 可编辑显示模板
+    renderTableCell(a, l) {
+      const {
+        row: o,
+        column: h
+      } = l;
+      return o[h.field];
+    },
+    renderItemContent(a, l) {
+      const {
+        data: o,
+        field: h
+      } = l, {
+        props: r,
+        events: e
+      } = a, i = useComponent(), {
+        defaultValue: t,
+        mapField: v
+      } = r;
+      t && (o[h] = t);
+      function Z(n) {
+        i.change(n, o, h, a, {
+          datasource: "data"
+        });
+      }
+      function d() {
+        i.clear(o, h, v, e, "data");
+      }
+      return [createVNode(resolveComponent("vxe-textarea"), mergeProps({
+        modelValue: o[h],
+        "onUpdate:modelValue": (n) => o[h] = n
+      }, r, {
+        onChange: (n) => Z(n),
+        onClear: () => d()
+      }), null)];
+    }
   }), VXETable.renderer.add("#upload", {
     renderTableEdit(a, l) {
       const {
@@ -735,8 +827,8 @@ const VxetableRender = (VXETable, {
         props: r,
         events: e
       } = a;
-      function i(t, c) {
-        o[h.field] = "", e != null && e.remove && (e == null || e.remove(t, c));
+      function i(t, v) {
+        o[h.field] = "", e != null && e.remove && (e == null || e.remove(t, v));
       }
       return [createVNode(resolveComponent("form-upload"), mergeProps({
         record: o,
@@ -745,7 +837,7 @@ const VxetableRender = (VXETable, {
       }, r, {
         "render-mode": "column",
         "data-status": "edit",
-        onRemove: (t, c) => i(t, c)
+        onRemove: (t, v) => i(t, v)
       }), null)];
     },
     // 可编辑显示模板
@@ -774,15 +866,15 @@ const VxetableRender = (VXETable, {
         props: r,
         events: e
       } = a;
-      function i(t, c) {
-        o[h] = "", e != null && e.remove && (e == null || e.remove(t, c));
+      function i(t, v) {
+        o[h] = "", e != null && e.remove && (e == null || e.remove(t, v));
       }
       return [createVNode(resolveComponent("form-upload"), mergeProps({
         record: o,
         field: h,
         mode: "image"
       }, r, {
-        onRemove: (t, c) => i(t, c)
+        onRemove: (t, v) => i(t, v)
       }), null)];
     }
   }), VXETable.renderer.add("#tag", {
@@ -821,7 +913,7 @@ const VxetableRender = (VXETable, {
         },
         events: t
       } = a;
-      function c(Z) {
+      function v(Z) {
         const d = {
           row: o,
           column: h,
@@ -838,7 +930,7 @@ const VxetableRender = (VXETable, {
       }, a.props, {
         "active-text": getValue(r, e),
         "inactive-text": getValue(r, i),
-        onChange: (Z) => c(Z)
+        onChange: (Z) => v(Z)
       }), null) : null];
     }
   }), VXETable.renderer.add("#iconSelect", {
@@ -891,9 +983,9 @@ const VxetableRender = (VXETable, {
         "check-strictly": !0
       }, r, {
         filterable: !0,
-        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)
+        onCheckChange: (t, v, Z) => onCheckChange(t, v, Z, i),
+        onNodeClick: (t, v, Z) => onNodeClick(t, v, Z, i),
+        onCurrentChange: (t, v) => onCurrentChange(t, v, i)
       }), null)];
     },
     renderTableCell(a, l) {
@@ -906,10 +998,10 @@ const VxetableRender = (VXETable, {
       } = a, {
         children: i = "children",
         label: t = "label"
-      } = e, c = findTree(r, (Z) => Z.value === o[h.field], {
+      } = e, v = findTree(r, (Z) => Z.value === o[h.field], {
         children: i
       });
-      return c ? [createVNode("span", null, [c.item[t]])] : null;
+      return v ? [createVNode("span", null, [v.item[t]])] : null;
     },
     renderItemContent(a, l) {
       const {
@@ -927,33 +1019,33 @@ const VxetableRender = (VXETable, {
         "check-strictly": !0
       }, r, {
         filterable: !0,
-        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)
+        onCheckChange: (t, v, Z) => onCheckChange(t, v, Z, i),
+        onNodeClick: (t, v, Z) => onNodeClick(t, v, Z, i),
+        onCurrentChange: (t, v) => onCurrentChange(t, v, i)
       }), null)];
     }
   });
   const useComponent = () => ({
-    clear: (r, e, i, t, c) => {
+    clear: (r, e, i, t, v) => {
       if (r[e] = null, !isEmpty(i))
         for (const Z in i)
           r[Z] = null;
       t != null && t.clear && t.clear({
-        [c]: r,
+        [v]: r,
         field: e
       });
     },
     remote: async (r, e, i) => {
       const {
         options: t,
-        props: c,
+        props: v,
         events: Z
       } = i, {
         fetchField: d,
         url: n,
         defaultParams: f = {},
-        method: H = "get"
-      } = c, m = getCookieParam(), s = Object.assign({
+        method: u = "get"
+      } = v, m = getCookieParam(), s = Object.assign({
         pageSize: 20,
         pageNum: 1,
         ...m,
@@ -961,51 +1053,51 @@ const VxetableRender = (VXETable, {
       }, {
         [d || e]: r
       });
-      if (c.loading) return;
-      let u;
+      if (v.loading) return;
+      let M;
       try {
-        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));
+        t.length = 0, v.loading = !0, M = await serviceApi[u](n, s), Z != null && Z.filterMethod ? t.push(...Z.filterMethod(M.list || M)) : M && (M.list ? t.push(...M.list) : t.push(...M));
       } finally {
-        c.loading = !1;
+        v.loading = !1;
       }
     },
-    selectChange: (r, e, i, t, c) => {
+    selectChange: (r, e, i, t, v) => {
       let Z = null;
       const {
         datasource: d
-      } = c, {
+      } = v, {
         options: n,
         props: f,
-        optionProps: H = {},
+        optionProps: u = {},
         events: m
       } = t, s = {
         [d]: e,
         field: 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);
+      e[i] = null, !isEmpty(r) && (f != null && f.multiple) ? (e[i] = r.join(","), Z = [], r.forEach((M) => {
+        const p = n.find((y) => M === y[u == null ? void 0 : u.value]);
+        p && !isEmpty(f.mapField) && isObject(f.mapField) && Object.keys(f.mapField).forEach((y) => {
+          const A = p[f.mapField[y]], w = e[y] ? e[y].toString() : "";
+          e[y] = w && !w.includes(A) ? `${w},${A}` : A;
+        }), p && Z.push(p);
       }), 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;
+      })) : (e[i] = f != null && f.multiple ? null : r, Z = n.find((M) => r === M[u == null ? void 0 : u.value]), !isEmpty(f.mapField) && isObject(f.mapField) && Object.keys(f.mapField).forEach((M) => {
+        e[M] = Z ? Z[f.mapField[M]] : null;
       }), Object.assign(s, {
         option: Z
       })), d === "row" && Object.assign(s, {
-        column: c.column
+        column: v.column
       }), m != null && m.change && m.change(s);
     },
     setDefaultValue: (r, e, i) => {
       var d;
       const {
         multiple: t,
-        defaultValue: c
+        defaultValue: v
       } = 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[i] && v && (e[i] = v, isPlainObject(v) && Object.keys(v).forEach((f) => {
+        e[f] = e[f] || v[f];
       })), !e[Z] && e[i] && (e[Z] = t ? (d = e[i]) == null ? void 0 : d.split(",") : e[i]);
     }
   }), onCheckChange = (a, l, o, h) => {
@@ -1082,10 +1174,10 @@ function useWatermark(a = ref(document.body)) {
     d && (Z && d.removeChild(Z), removeResizeListener(d, l));
   };
   function e(Z, d) {
-    const n = document.createElement("canvas"), f = 260, H = 180;
-    Object.assign(n, { width: f, height: H });
+    const n = document.createElement("canvas"), f = 260, u = 180;
+    Object.assign(n, { width: f, height: u });
     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");
+    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, u)), n.toDataURL("image/png");
   }
   function i(Z = {}) {
     const d = unref(h);
@@ -1101,15 +1193,15 @@ function useWatermark(a = ref(document.body)) {
     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;
+    const { clientHeight: u, clientWidth: m } = f;
+    return i({ str: Z, width: m, height: u, attr: d }), f.appendChild(n), o;
   };
-  function c(Z, d) {
+  function v(Z, d) {
     t(Z, d), addResizeListener(document.documentElement, l), getCurrentInstance() && onBeforeUnmount(() => {
       r();
     });
   }
-  return { setWatermark: c, clear: r };
+  return { setWatermark: v, clear: r };
 }
 const DEFAULT_EXCLUDE_KEYS = ["class", "style"], LISTENER_PREFIX = /^on[A-Z]/;
 function entries(a) {
@@ -1120,208 +1212,219 @@ function useAttrs(a = {}) {
   if (!l) return {};
   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((t, [c, Z]) => (!e.includes(c) && !(o && LISTENER_PREFIX.test(c)) && (t[c] = Z), t), {});
+    const i = entries(l.attrs).reduce((t, [v, Z]) => (!e.includes(v) && !(o && LISTENER_PREFIX.test(v)) && (t[v] = Z), t), {});
     r.value = i;
   }), r;
 }
 const useRender = () => {
-  const a = { value: "dictCode", label: "dictName" }, l = (v, p) => {
+  const a = { value: "dictCode", label: "dictName" }, l = (c, b) => {
     var N;
-    const b = k(p);
-    let y = {
+    const H = k(b);
+    let C = {
       clearable: !0,
       disabled: !1,
       showValue: !1,
       placeholder: null
-    }, L, x;
-    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") : [];
+    }, L, S;
+    isObject(c) ? (C = Object.assign(C, c), L = c.defaultValue, S = c == null ? void 0 : c.code) : S = c;
+    const I = (N = storageLocal.getItem("kLov")[S]) == null ? void 0 : N.children, D = I ? I.filter((T) => T.enabled === "1") : [];
     return {
       name: "#select",
       optionProps: a,
-      options: F,
-      props: y,
+      options: D,
+      props: C,
       defaultValue: L,
-      events: b
+      events: H
     };
-  }, o = (v, p) => {
-    const b = k(p);
+  }, o = (c, b) => {
+    const H = k(b);
     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
+      optionProps: (c == null ? void 0 : c.optionProps) || { label: "label", value: "value" },
+      props: c == null ? void 0 : c.props,
+      options: (c == null ? void 0 : c.options) || [],
+      events: H
     };
-  }, h = (v, p) => {
-    const b = {
+  }, h = (c, b) => {
+    const H = {
       optionProps: { extLabel: "userName", value: "employeeName" },
       props: {
-        attrs: { disabled: v == null ? void 0 : v.disabled },
-        disabled: v == null ? void 0 : v.disabled,
-        defaultValue: v == null ? void 0 : v.defaultValue,
-        mapField: v == null ? void 0 : v.mapField,
+        attrs: { disabled: c == null ? void 0 : c.disabled },
+        disabled: c == null ? void 0 : c.disabled,
+        defaultValue: c == null ? void 0 : c.defaultValue,
+        mapField: c == null ? void 0 : c.mapField,
         code: "SYS037",
         url: "/uums/employee/listEmployeeIsUser",
         fetchField: "employeeName"
       }
     };
-    return o(b, p);
-  }, r = (v) => {
-    const p = {
+    return o(H, b);
+  }, r = (c) => {
+    const b = {
       optionProps: { extLabel: "userName", value: "name" },
       props: {
         code: "sys/listUsers",
         url: "/uums/user",
         fetchField: "name",
-        mapField: v == null ? void 0 : v.mapField
+        mapField: c == null ? void 0 : c.mapField
       }
     };
-    return o(p);
-  }, e = (v, p) => {
-    const b = {
+    return o(b);
+  }, e = (c, b) => {
+    const H = {
       label: "organizationName",
-      value: (v == null ? void 0 : v.field) || "organizationName"
-    }, y = {
+      value: (c == null ? void 0 : c.field) || "organizationName"
+    }, C = {
       mapField: {},
-      defaultParams: v == null ? void 0 : v.defaultParams,
+      defaultParams: c == null ? void 0 : c.defaultParams,
       url: "/uums/cusOrganization",
       fetchField: "organizationName"
     }, L = {
       organizationId: "id",
       organizationCode: "organizationCode"
     };
-    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 = {
+    return Object.assign(C.mapField, L, (c == null ? void 0 : c.mapField) || {}), { name: "#SuSelect", props: C, optionProps: H, options: [], methods: b };
+  }, i = (c, b) => {
+    const H = {
       label: "orgName",
-      value: (v == null ? void 0 : v.field) || "orgName"
-    }, y = {
+      value: (c == null ? void 0 : c.field) || "orgName"
+    }, C = {
       mapField: {},
-      defaultParams: v == null ? void 0 : v.defaultParams,
+      defaultParams: c == null ? void 0 : c.defaultParams,
       url: "/uums/org",
       fetchField: "orgName"
     }, L = { orgId: "id", orgCode: "orgCode" };
-    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 Object.assign(C.mapField, L, (c == null ? void 0 : c.mapField) || {}), { name: "#SuSelect", props: C, optionProps: H, options: [], methods: b };
+  }, t = (c, b) => {
+    const H = Object.assign({ disabled: !1 }, c), C = H == null ? void 0 : H.defaultValue;
     return {
       name: "VxeInput",
-      props: b,
-      defaultValue: y,
-      events: k(p)
+      props: H,
+      defaultValue: C,
+      events: k(b)
     };
-  }, c = (v, p) => {
-    const b = Object.assign({ disabled: !1, rows: 3 }, v), y = b == null ? void 0 : b.defaultValue;
+  }, v = (c, b) => {
+    const H = Object.assign({ disabled: !1, rows: 3 }, c), C = H == null ? void 0 : H.defaultValue;
     return {
       name: "#textarea",
-      props: b,
-      defaultValue: y,
-      events: k(p)
+      props: H,
+      defaultValue: C,
+      events: k(b)
     };
-  }, 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 p = { disabled: !1 }, b;
-    const y = storageLocal.getItem("kLov");
+  }, Z = (c, b) => {
+    const H = "VxeCheckbox", { defaultValue: C, options: L, props: S } = n(c);
+    return { name: H, defaultValue: C, options: L, props: S, events: k(b) };
+  }, d = (c, b) => {
+    const H = "VxeRadio", { defaultValue: C, options: L, props: S } = n(c);
+    return { name: H, defaultValue: C, options: L, props: S, events: k(b) };
+  }, n = (c) => {
+    var I;
+    let b = { disabled: !1 }, H;
+    const C = storageLocal.getItem("kLov");
     let L = "";
-    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);
+    isObject(c) ? (H = c.defaultValue, L = c.code, b = Object.assign(b, c || {})) : isString(c) && (L = c);
+    const S = L ? (I = C[L]) == null ? void 0 : I.children.map((D) => ({ label: D.dictName, value: D.dictCode })) : [];
+    return { props: b, defaultValue: H, options: S };
+  }, f = (c, b) => {
+    const H = k(b);
     return {
-      name: "VxeInput",
+      name: "VxeNumberInput",
       props: Object.assign(
         { type: "number", clearable: !0, min: 0, controls: !1 },
-        v || {}
+        c || {}
       ),
-      defaultValue: v == null ? void 0 : v.defaultValue,
-      events: b
+      defaultValue: c == null ? void 0 : c.defaultValue,
+      events: H
     };
-  }, 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) || {
+  }, u = (c, b) => {
+    const H = k(b), C = "yyyy-MM-dd HH:mm:ss", L = c == null ? void 0 : c.defaultValue;
+    return { name: "VxeDatePicker", props: Object.assign({ type: "date", valueFormat: C, clearable: !0 }, c || {}), defaultValue: L, events: H };
+  }, m = (c, b) => {
+    const H = k(b), C = "yyyy-MM-dd HH:mm:ss", L = c == null ? void 0 : c.startValue, S = c == null ? void 0 : c.endValue, I = c == null ? void 0 : c.startField, D = c == null ? void 0 : c.endField, T = Object.assign({ type: "date", valueFormat: C, clearable: !0 }, c || {});
+    return {
+      name: "VxeDateRangePicker",
+      startField: I,
+      endField: D,
+      startValue: L,
+      endValue: S,
+      props: T,
+      events: H
+    };
+  }, s = (c, b) => {
+    const H = k(b);
+    return { name: "#lov", props: Object.assign({}, c || {}), events: H };
+  }, M = (c, b) => {
+    const H = k(b), C = (c == null ? void 0 : c.optionProps) || {
       label: "label",
       value: "value"
     }, L = Object.assign(
       { clearable: !0, disabled: !1, showValue: !1 },
-      v || {}
+      c || {}
     );
     return console.log("itemRender"), {
       name: "#select",
-      optionProps: y,
-      options: (v == null ? void 0 : v.options) || [],
+      optionProps: C,
+      options: (c == null ? void 0 : c.options) || [],
       props: L,
-      events: b
+      events: H
     };
-  }, u = (v, p) => {
-    let b = {
+  }, p = (c, b) => {
+    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) ? 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 = {
+    }, C = "Y";
+    isObject(c) && !isFunction(c) ? (H = Object.assign(H, c || {}), C = c.defaultValue || C) : !isEmpty(c) && isString(c) && (C = c, H = Object.assign(H, { defaultValue: C }));
+    const L = isFunction(c) ? k(c) : k(b);
+    return { name: "VxeSwitch", props: H, defaultValue: C, events: L };
+  }, y = (c, b) => ({ name: "#tag", props: { code: c, tagMap: b } }), A = (c, b) => {
+    const H = {
       openLabel: "启用",
       closeLabel: "禁用",
       openValue: "1",
       closeValue: "0",
       defaultValue: "1"
     };
-    !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);
+    !isFunction(c) && isObject(c) && Object.assign(H, c);
+    const C = isFunction(c) ? c : b;
+    return p(H, C);
+  }, w = () => ({ name: "#iconSelect" }), V = (c = [], b = {}, H) => ({ name: "#treeSelect", sourceData: c, props: b, events: H }), R = (c, b) => {
+    const H = k(b);
     return {
       name: "#area",
-      props: { mapField: (v == null ? void 0 : v.mapField) || ["province", "city", "region"] },
-      events: b
+      props: { mapField: (c == null ? void 0 : c.mapField) || ["province", "city", "region"] },
+      events: H
     };
-  }, k = (v) => {
-    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 && (p = { change: v }), p;
-  }, R = (v, p) => {
-    v = v || {};
-    const { singleMode: b, mode: y } = v;
-    return b && Object.assign(v, {
+  }, k = (c) => {
+    let b = {};
+    return isObject(c) && !isFunction(c) ? b = {
+      change: (c == null ? void 0 : c.change) || F,
+      blur: (c == null ? void 0 : c.blur) || F,
+      focus: (c == null ? void 0 : c.focus) || F,
+      input: (c == null ? void 0 : c.input) || F,
+      clear: (c == null ? void 0 : c.clear) || F,
+      searchClick: c == null ? void 0 : c.searchClick,
+      suffixClick: c == null ? void 0 : c.suffixClick,
+      prefixClick: c == null ? void 0 : c.prefixClick,
+      filterMethod: c == null ? void 0 : c.filterMethod
+    } : c && (b = { change: c }), b;
+  }, E = (c, b) => {
+    c = c || { fieldType: "sting", mode: "image" };
+    const { singleMode: H, mode: C } = c;
+    return H && Object.assign(c, {
       multiple: !1,
       limitCount: 1,
       autoHiddenButton: !0
-    }), (!y || y === "image") && (v.imageTypes = ["jpg", "jpeg", "png", "gif", "apk"]), { name: "#upload", props: v, events: p };
+    }), C === "image" && (c.imageTypes = ["jpg", "jpeg", "png", "gif", "apk"]), { name: "#upload", props: c, events: b };
   };
-  function I() {
+  function F() {
   }
   return {
     renderDict: l,
     renderSelect: o,
     renderInput: t,
-    renderTextarea: c,
+    renderTextarea: v,
     renderCheckBox: Z,
     renderRadio: d,
     renderUser: h,
@@ -1329,16 +1432,17 @@ const useRender = () => {
     renderInvOrg: e,
     renderBU: i,
     renderNumber: f,
-    renderLov: m,
-    renderSelectLocal: s,
-    renderDate: H,
-    renderSwitch: u,
-    renderCellTag: M,
-    renderEnabled: C,
-    renderIconSelect: A,
-    renderTreeSelect: w,
-    renderArea: V,
-    renderUpload: R
+    renderLov: s,
+    renderSelectLocal: M,
+    renderDate: u,
+    renderRangeDate: m,
+    renderSwitch: p,
+    renderCellTag: y,
+    renderEnabled: A,
+    renderIconSelect: w,
+    renderTreeSelect: V,
+    renderArea: R,
+    renderUpload: E
   };
 }, useGlobal = () => {
   const a = getCurrentInstance();
@@ -1410,11 +1514,11 @@ const deviceDetection = () => {
     h.title = h.title || `message.${h.field}`, h.span = h.span || o, h.type === "collapseNode" && (h.title = "", h.titleWidth = 0);
     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 = {
+    let v = {
       name: "VxeInput",
       props: { disabled: t, placeholder: t ? "" : h.placeholder }
     };
-    return h.code && !h.itemRender && (c = renderHook.renderDict(h.code)), h.itemRender = h.itemRender || c, h.itemRender.props = Object.assign(h.itemRender.props || {}, {
+    return h.code && !h.itemRender && (v = renderHook.renderDict(h.code)), h.itemRender = h.itemRender || v, h.itemRender.props = Object.assign(h.itemRender.props || {}, {
       disabled: t
     }), h;
   }
@@ -1448,17 +1552,17 @@ const deviceDetection = () => {
     collapseTagsTooltip: !0,
     multiple: !0
   }, t = o.map((Z, d) => {
-    var n, f, H;
+    var n, f, u;
     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,
-      ((H = Z.itemRender) == null ? void 0 : H.props) || {}
+      ((u = Z.itemRender) == null ? void 0 : u.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) {
+  }), v = clone(formSearchButtons, !0);
+  if (v.collapseNode = e, l && v.itemRender.options.length < 3 && (v.itemRender.options.push(l), v.itemRender.events = l.events), e) {
     const Z = r ? 2 : 3;
-    t.splice(Z, 0, c);
+    t.splice(Z, 0, v);
   } else
-    t.push(c);
+    t.push(v);
   return t;
 }, getDateRange = (a) => {
   var l, o, h, r, e;
@@ -1558,9 +1662,9 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
   }
 }, g = class g {
   constructor() {
-    S(this, "router");
-    S(this, "baseUrl", null);
-    S(this, "getNetworkError", (l) => l ? {
+    x(this, "router");
+    x(this, "baseUrl", null);
+    x(this, "getNetworkError", (l) => l ? {
       400: "错误的请求",
       401: "服务未授权,请重新登录",
       403: "拒绝访问",
@@ -1597,8 +1701,8 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
           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 = [];
+          }).then((v) => {
+            this.setToken(v), l.headers.Authorization = "Bearer " + v.access_token, g.requests.forEach((Z) => Z(v.access_token)), g.requests = [];
           }).finally(() => {
             g.isRefreshing = !1;
           })), h(g.retryOriginalRequest(l))) : (l.headers.Authorization = "Bearer " + e.accessToken, h(l));
@@ -1647,28 +1751,28 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
       ...r
     });
     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);
+      g.axiosInstance.request(e).then((v) => {
+        if (v && (v == null ? void 0 : v.code) === "0")
+          i(v.data);
+        else if (v.code === "500")
+          errorMessage(v.msg, { duration: 8e3 }), e.method === "get" ? i(v) : t(v.msg);
+        else if ((v == null ? void 0 : v.code) !== "-1")
+          i(v);
         else {
-          const Z = (c == null ? void 0 : c.msg) || "服务异常";
+          const Z = (v == null ? void 0 : v.msg) || "服务异常";
           errorMessage(Z, { duration: 8e3 }), t(Z);
         }
-      }).catch((c) => {
+      }).catch((v) => {
         var Z, d, n;
-        if (c != null && c.code) {
-          if (((Z = c == null ? void 0 : c.response) == null ? void 0 : Z.status) === 401)
+        if (v != null && v.code) {
+          if (((Z = v == null ? void 0 : v.response) == null ? void 0 : Z.status) === 401)
             return (d = this.router) == null ? void 0 : d.push({ path: "/login" });
           errorMessage(
-            this.getNetworkError((n = c == null ? void 0 : c.response) == null ? void 0 : n.status) || (c == null ? void 0 : c.message),
+            this.getNetworkError((n = v == null ? void 0 : v.response) == null ? void 0 : n.status) || (v == null ? void 0 : v.message),
             { duration: 8e3 }
           );
         }
-        c.config.method === "get" ? i(c) : t(c);
+        v.config.method === "get" ? i(v) : t(v);
       });
     });
   }
@@ -1695,10 +1799,10 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
   }
 };
 /** token过期后，暂存待执行的请求 */
-S(g, "requests", []), /** 防止重复刷新token */
-S(g, "isRefreshing", !1), // 初始化配置对象
-S(g, "initConfig", {}), // 保存当前Axios实例对象
-S(g, "axiosInstance", Axios.create(defaultConfig));
+x(g, "requests", []), /** 防止重复刷新token */
+x(g, "isRefreshing", !1), // 初始化配置对象
+x(g, "initConfig", {}), // 保存当前Axios实例对象
+x(g, "axiosInstance", Axios.create(defaultConfig));
 let SuHttp = g;
 const http = new SuHttp(), lunarCalendar = {
   /**
@@ -2501,7 +2605,7 @@ const http = new SuHttp(), lunarCalendar = {
       return -1;
     let i;
     h ? i = new Date(h, parseInt(r.toString()) - 1, e) : i = /* @__PURE__ */ new Date();
-    let t, c = 0, Z = 0;
+    let t, v = 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 (t = 1900; t < 2101 && d > 0; t++)
@@ -2510,46 +2614,46 @@ const http = new SuHttp(), lunarCalendar = {
     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);
+    let u = i.getDay();
+    const m = this.nStr1[u];
+    u === 0 && (u = 7);
     const s = t;
-    c = this.leapMonth(t);
-    let u = !1;
+    v = this.leapMonth(t);
+    let M = !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,
+      v > 0 && t === v + 1 && M === !1 ? (--t, M = !0, Z = this.leapDays(s)) : Z = this.monthDays(s, t), M === !0 && t === v + 1 && (M = !1), d -= Z;
+    d === 0 && v > 0 && t === v + 1 && (M ? M = !1 : (M = !0, --t)), d < 0 && (d += Z, --t);
+    const p = t, y = d + 1, A = r - 1, w = this.toGanZhiYear(s), V = this.getTerm(h, r * 2 - 1), R = this.getTerm(h, r * 2);
+    let k = this.toGanZhi((h - 1900) * 12 + r + 11);
+    e >= V && (k = this.toGanZhi((h - 1900) * 12 + r + 12));
+    let E = !1, F;
+    V === e && (E = !0, F = this.solarTerm[r * 2 - 2]), R === e && (E = !0, F = this.solarTerm[r * 2 - 1]);
+    const c = Date.UTC(h, A, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, b = this.toGanZhi(c + e - 1), H = this.toAstro(r, e), C = h + "-" + r + "-" + e, L = s + "-" + p + "-" + y, S = this.festival, I = this.lFestival, D = r + "-" + e;
+    let N = p + "-" + y;
+    return p === 12 && y === 29 && this.monthDays(s, p) === 29 && (N = "12-30"), {
+      date: C,
+      lunarDate: L,
+      festival: S[D] ? S[D].title : null,
+      lunarFestival: I[N] ? I[N].title : null,
       lYear: s,
-      lMonth: M,
-      lDay: C,
+      lMonth: p,
+      lDay: y,
       Animal: this.getAnimal(s),
-      IMonthCn: (u ? "闰" : "") + this.toChinaMonth(M),
-      IDayCn: this.toChinaDay(C),
+      IMonthCn: (M ? "闰" : "") + this.toChinaMonth(p),
+      IDayCn: this.toChinaDay(y),
       cYear: h,
       cMonth: r,
       cDay: e,
       gzYear: w,
-      gzMonth: R,
+      gzMonth: k,
       gzDay: b,
       isToday: f,
-      isLeap: u,
-      nWeek: H,
+      isLeap: M,
+      nWeek: u,
       ncWeek: "星期" + m,
-      isTerm: I,
-      Term: v,
-      astro: y
+      isTerm: E,
+      Term: F,
+      astro: H
     };
   },
   /**
@@ -2571,15 +2675,15 @@ const http = new SuHttp(), lunarCalendar = {
     let i = e;
     if (h && (i = this.leapDays(a)), a < 1900 || a > 2100 || o > i)
       return -1;
-    let t = 0, c;
-    for (c = 1900; c < a; c++)
-      t += this.lYearDays(c);
+    let t = 0, v;
+    for (v = 1900; v < a; v++)
+      t += this.lYearDays(v);
     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);
+    for (v = 1; v < l; v++)
+      Z = this.leapMonth(a), d || Z <= v && Z > 0 && (t += this.leapDays(a), d = !0), t += this.monthDays(a, v);
     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);
+    const n = Date.UTC(1900, 1, 30, 0, 0, 0), f = new Date((t + o - 31) * 864e5 + n), u = f.getUTCFullYear(), m = f.getUTCMonth() + 1, s = f.getUTCDate();
+    return this.solar2lunar(u, m, s);
   }
 }, dict = storageLocal.getItem("kLov"), formats = {
   formatDate: {
@@ -2646,7 +2750,7 @@ const http = new SuHttp(), lunarCalendar = {
       const [o, h] = l;
       let r;
       return (e = a[o]) == null || e.split(",").forEach((i) => {
-        const t = h.find((c) => c.value === i);
+        const t = h.find((v) => v.value === i);
         r = r ? `${r},${t == null ? void 0 : t.label}` : t == null ? void 0 : t.label;
       }), r;
     }
@@ -10299,7 +10403,7 @@ const getDictName = (a, l) => {
   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,
+  G as NProgress,
   VxetableRender,
   addClass,
   addResizeListener,