@utogether/utils 3.0.0-beta.31 → 3.0.0-beta.32

package/dist/utils.es.js

@@ -1,6 +1,6 @@
-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);
+var j = Object.defineProperty;
+var U = (a, l, o) => l in a ? j(a, l, { enumerable: !0, configurable: !0, writable: !0, value: o }) : a[l] = o;
+var x = (a, l, o) => U(a, typeof l != "symbol" ? l + "" : l, o);
 import { createVNode, resolveComponent, mergeProps, isVNode, ref, shallowRef, unref, getCurrentInstance, onBeforeUnmount, reactive, watchEffect, isRef } from "vue";
 import dayjs from "dayjs";
 import XEUtils, { isArray, findTree, isEmpty, isObject, isPlainObject, isUndefined, isFunction, isString, clone, merge, has } from "xe-utils";
@@ -206,7 +206,7 @@ const VxetableRender = (VXETable, {
       } = t, {
         loading: n = !1,
         multiple: f,
-        mapField: u
+        mapField: b
       } = i, m = useComponent(), s = f ? `_${r.field}` : r.field;
       m.setDefaultValue(i, h, r.field);
       function M(V) {
@@ -222,7 +222,7 @@ const VxetableRender = (VXETable, {
         v != null && v.input && v.input(l, V);
       }
       function A() {
-        m.clear(h, r.field, u, v, "row");
+        m.clear(h, r.field, b, v, "row");
       }
       function k() {
         !e.length && M(""), v != null && v.focus && v.focus(l, r.field);
@@ -266,7 +266,7 @@ const VxetableRender = (VXETable, {
       } = t, {
         loading: n = !1,
         multiple: f,
-        mapField: u
+        mapField: b
       } = i, m = useComponent(), s = f ? `_${r.field}` : r.field;
       m.setDefaultValue(i, h, r.field);
       function M(V) {
@@ -282,7 +282,7 @@ const VxetableRender = (VXETable, {
         v != null && v.input && v.input(l, V);
       }
       function A() {
-        m.clear(h, r.field, u, v, "row");
+        m.clear(h, r.field, b, v, "row");
       }
       function k() {
         !e.length && M(""), v != null && v.focus && v.focus(l, r.field);
@@ -340,7 +340,7 @@ const VxetableRender = (VXETable, {
       } = t, {
         mapField: n,
         multiple: f,
-        loading: u = !1
+        loading: b = !1
       } = i, m = useComponent(), s = f ? `_${r}` : r;
       m.setDefaultValue(i, h, r);
       async function M(V) {
@@ -368,7 +368,7 @@ const VxetableRender = (VXETable, {
         clearable: !0,
         style: "width: 100%",
         placeholder: "请录入关键字搜索",
-        loading: u,
+        loading: b,
         "remote-method": M
       }, i, {
         onFocus: () => k(),
@@ -442,16 +442,16 @@ const VxetableRender = (VXETable, {
       } = t, {
         multiple: n,
         mapField: f
-      } = i, u = useComponent(), m = n ? `_${r.field}` : r.field;
-      u.setDefaultValue(i, h, r.field);
+      } = i, b = useComponent(), m = n ? `_${r.field}` : r.field;
+      b.setDefaultValue(i, h, r.field);
       function s(p) {
-        u.selectChange(p, h, r.field, a, {
+        b.selectChange(p, h, r.field, a, {
           column: r,
           datasource: "row"
         });
       }
       function M() {
-        u.clear(h, r.field, f, v, "row");
+        b.clear(h, r.field, f, v, "row");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[m],
@@ -486,7 +486,7 @@ const VxetableRender = (VXETable, {
         extLabel: n
       } = t, {
         multiple: f,
-        mapField: u
+        mapField: b
       } = i, m = useComponent(), s = f ? `_${r.field}` : r.field;
       m.setDefaultValue(i, h, r.field);
       function M(y) {
@@ -496,7 +496,7 @@ const VxetableRender = (VXETable, {
         });
       }
       function p() {
-        m.clear(h, r.field, u, v, "row");
+        m.clear(h, r.field, b, v, "row");
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
         modelValue: h[s],
@@ -550,8 +550,8 @@ const VxetableRender = (VXETable, {
         value: d = "value"
       } = t, n = useComponent(), {
         mapField: f,
-        multiple: u
-      } = i, m = u ? `_${r}` : r;
+        multiple: b
+      } = i, m = b ? `_${r}` : r;
       n.setDefaultValue(i, h, r);
       function s(p) {
         n.selectChange(p, h, r, a, {
@@ -593,7 +593,7 @@ const VxetableRender = (VXETable, {
       t && (o[h] = t);
       function Z(n, f) {
         const {
-          mapField: u,
+          mapField: b,
           field: m,
           displayName: s,
           multiple: M
@@ -602,8 +602,8 @@ const VxetableRender = (VXETable, {
           if (M) {
             const y = {};
             o[s || m] = n.reduce((A, k) => {
-              for (const V in u)
-                y[V] = A ? y[V] + "," + k[u[V]] : k[u[V]];
+              for (const V in b)
+                y[V] = A ? y[V] + "," + k[b[V]] : k[b[V]];
               return A = A ? A + "," + k[s || m] : k[s || m], A;
             }, ""), Object.assign(o, y);
           }
@@ -611,8 +611,8 @@ const VxetableRender = (VXETable, {
           const y = {
             [s || m]: n[f || s || m]
           };
-          for (const A in u)
-            y[A] = n[u[A]];
+          for (const A in b)
+            y[A] = n[b[A]];
           Object.assign(o, y);
         }
         const p = {
@@ -646,12 +646,12 @@ const VxetableRender = (VXETable, {
         const {
           mapField: n,
           field: f,
-          displayName: u,
+          displayName: b,
           multiple: m
         } = r;
         if (!m) {
           const M = {
-            [u || f]: Z[d || u || f]
+            [b || f]: Z[d || b || f]
           };
           for (const p in n)
             M[p] = Z[n[p]];
@@ -689,12 +689,12 @@ const VxetableRender = (VXETable, {
         const {
           mapField: n,
           field: f,
-          displayName: u,
+          displayName: b,
           multiple: m
         } = r;
         if (!m) {
           const M = {
-            [u || f]: Z[d || u || f]
+            [b || f]: Z[d || b || f]
           };
           for (const p in n)
             M[p] = Z[n[p]];
@@ -1044,7 +1044,7 @@ const VxetableRender = (VXETable, {
         fetchField: d,
         url: n,
         defaultParams: f = {},
-        method: u = "get"
+        method: b = "get"
       } = v, m = getCookieParam(), s = Object.assign({
         pageSize: 20,
         pageNum: 1,
@@ -1056,7 +1056,7 @@ const VxetableRender = (VXETable, {
       if (v.loading) return;
       let M;
       try {
-        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));
+        t.length = 0, v.loading = !0, M = await serviceApi[b](n, s), Z != null && Z.filterMethod ? t.push(...Z.filterMethod(M.list || M)) : M && (M.list ? t.push(...M.list) : t.push(...M));
       } finally {
         v.loading = !1;
       }
@@ -1068,21 +1068,21 @@ const VxetableRender = (VXETable, {
       } = v, {
         options: n,
         props: f,
-        optionProps: u = {},
+        optionProps: b = {},
         events: m
       } = t, s = {
         [d]: e,
         field: i
       };
       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]);
+        const p = n.find((y) => M === y[b == null ? void 0 : b.value]);
         p && !isEmpty(f.mapField) && isObject(f.mapField) && Object.keys(f.mapField).forEach((y) => {
           const A = p[f.mapField[y]], k = e[y] ? e[y].toString() : "";
           e[y] = k && !k.includes(A) ? `${k},${A}` : A;
         }), p && Z.push(p);
       }), Object.assign(s, {
         options: Z
-      })) : (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[i] = f != null && f.multiple ? null : r, Z = n.find((M) => r === M[b == null ? void 0 : b.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
@@ -1174,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, u = 180;
-    Object.assign(n, { width: f, height: u });
+    const n = document.createElement("canvas"), f = 260, b = 180;
+    Object.assign(n, { width: f, height: b });
     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, u)), 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, b)), n.toDataURL("image/png");
   }
   function i(Z = {}) {
     const d = unref(h);
@@ -1193,8 +1193,8 @@ 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: u, clientWidth: m } = f;
-    return i({ str: Z, width: m, height: u, attr: d }), f.appendChild(n), o;
+    const { clientHeight: b, clientWidth: m } = f;
+    return i({ str: Z, width: m, height: b, attr: d }), f.appendChild(n), o;
   };
   function v(Z, d) {
     t(Z, d), addResizeListener(document.documentElement, l), getCurrentInstance() && onBeforeUnmount(() => {
@@ -1217,9 +1217,9 @@ function useAttrs(a = {}) {
   }), r;
 }
 const useRender = () => {
-  const a = { value: "dictCode", label: "dictName" }, l = (c, b) => {
+  const a = { value: "dictCode", label: "dictName" }, l = (c, H) => {
     var N;
-    const H = w(b);
+    const u = w(H);
     let C = {
       clearable: !0,
       disabled: !1,
@@ -1234,19 +1234,19 @@ const useRender = () => {
       options: D,
       props: C,
       defaultValue: L,
-      events: H
+      events: u
     };
-  }, o = (c, b) => {
-    const H = w(b);
+  }, o = (c, H) => {
+    const u = w(H);
     return {
       name: "#SuSelect",
       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
+      events: u
     };
-  }, h = (c, b) => {
-    const H = {
+  }, h = (c, H) => {
+    const u = {
       optionProps: { extLabel: "userName", value: "employeeName" },
       props: {
         attrs: { disabled: c == null ? void 0 : c.disabled },
@@ -1258,9 +1258,9 @@ const useRender = () => {
         fetchField: "employeeName"
       }
     };
-    return o(H, b);
+    return o(u, H);
   }, r = (c) => {
-    const b = {
+    const H = {
       optionProps: { extLabel: "userName", value: "name" },
       props: {
         code: "sys/listUsers",
@@ -1269,9 +1269,9 @@ const useRender = () => {
         mapField: c == null ? void 0 : c.mapField
       }
     };
-    return o(b);
-  }, e = (c, b) => {
-    const H = {
+    return o(H);
+  }, e = (c, H) => {
+    const u = {
       label: "organizationName",
       value: (c == null ? void 0 : c.field) || "organizationName"
     }, C = {
@@ -1286,12 +1286,12 @@ const useRender = () => {
     return Object.assign(C.mapField, L, (c == null ? void 0 : c.mapField) || {}), {
       name: "#SuSelect",
       props: C,
-      optionProps: H,
+      optionProps: u,
       options: [],
-      events: w(b)
+      events: w(H)
     };
-  }, i = (c, b) => {
-    const H = {
+  }, i = (c, H) => {
+    const u = {
       label: "orgName",
       value: (c == null ? void 0 : c.field) || "orgName"
     }, C = {
@@ -1303,42 +1303,46 @@ const useRender = () => {
     return Object.assign(C.mapField, L, (c == null ? void 0 : c.mapField) || {}), {
       name: "#SuSelect",
       props: C,
-      optionProps: H,
+      optionProps: u,
       options: [],
-      events: w(b)
+      events: w(H)
     };
-  }, t = (c, b) => {
-    const H = Object.assign({ disabled: !1 }, c), C = H == null ? void 0 : H.defaultValue;
+  }, t = (c, H) => {
+    const u = Object.assign({ disabled: !1 }, c), C = u == null ? void 0 : u.defaultValue;
     return {
       name: "VxeInput",
-      props: H,
+      props: u,
       defaultValue: C,
-      events: w(b)
+      events: w(H)
     };
-  }, v = (c, b) => {
-    const H = Object.assign({ disabled: !1, rows: 3 }, c), C = H == null ? void 0 : H.defaultValue;
+  }, v = (c, H) => {
+    const u = Object.assign({ disabled: !1, rows: 3 }, c), C = u == null ? void 0 : u.defaultValue;
     return {
       name: "#textarea",
-      props: H,
+      props: u,
       defaultValue: C,
-      events: w(b)
+      events: w(H)
     };
-  }, Z = (c, b) => {
-    const H = "VxeCheckbox", { defaultValue: C, options: L, props: S } = n(c);
-    return { name: H, defaultValue: C, options: L, props: S, events: w(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: w(b) };
+  }, Z = (c, H) => {
+    const u = "VxeCheckboxGroup", { defaultValue: C, options: L, props: S } = n(c);
+    return { name: u, defaultValue: C, options: L, props: S, events: w(H) };
+  }, d = (c, H) => {
+    const u = "VxeRadioGroup", { defaultValue: C, options: L, props: S } = n(c);
+    return { name: u, defaultValue: C, options: L, props: S, events: w(H) };
   }, n = (c) => {
     var I;
-    let b = { disabled: !1 }, H;
+    let H = { disabled: !1 }, u;
     const C = storageLocal.getItem("kLov");
     let L = "";
-    isObject(c) ? (H = c.defaultValue, L = c.code, b = Object.assign(b, c || {})) : isString(c) && (L = c);
+    isObject(c) ? (u = c.defaultValue, L = c.code, c.options ? H = Object.assign(H, c.props || {}) : H = Object.assign(H, 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 = w(b);
+    return {
+      props: H,
+      defaultValue: u,
+      options: isObject(c) && c.options ? c.options : S
+    };
+  }, f = (c, H) => {
+    const u = w(H);
     return {
       name: "VxeNumberInput",
       props: Object.assign(
@@ -1346,13 +1350,13 @@ const useRender = () => {
         c || {}
       ),
       defaultValue: c == null ? void 0 : c.defaultValue,
-      events: H
+      events: u
     };
-  }, u = (c, b) => {
-    const H = w(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 = w(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 || {});
+  }, b = (c, H) => {
+    const u = w(H), 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: u };
+  }, m = (c, H) => {
+    const u = w(H), 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,
@@ -1360,13 +1364,13 @@ const useRender = () => {
       startValue: L,
       endValue: S,
       props: T,
-      events: H
+      events: u
     };
-  }, s = (c, b) => {
-    const H = w(b);
-    return { name: "#lov", props: Object.assign({}, c || {}), events: H };
-  }, M = (c, b) => {
-    const H = w(b), C = (c == null ? void 0 : c.optionProps) || {
+  }, s = (c, H) => {
+    const u = w(H);
+    return { name: "#lov", props: Object.assign({}, c || {}), events: u };
+  }, M = (c, H) => {
+    const u = w(H), C = (c == null ? void 0 : c.optionProps) || {
       label: "label",
       value: "value"
     }, L = Object.assign(
@@ -1378,39 +1382,39 @@ const useRender = () => {
       optionProps: C,
       options: (c == null ? void 0 : c.options) || [],
       props: L,
-      events: H
+      events: u
     };
-  }, p = (c, b) => {
-    let H = {
+  }, p = (c, H) => {
+    let u = {
       openLabel: "是",
       closeLabel: "否",
       openValue: "Y",
       closeValue: "N"
     }, 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) ? w(c) : w(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 = {
+    isObject(c) && !isFunction(c) ? (u = Object.assign(u, c || {}), C = c.defaultValue || C) : !isEmpty(c) && isString(c) && (C = c, u = Object.assign(u, { defaultValue: C }));
+    const L = isFunction(c) ? w(c) : w(H);
+    return { name: "VxeSwitch", props: u, defaultValue: C, events: L };
+  }, y = (c, H) => ({ name: "#tag", props: { code: c, tagMap: H } }), A = (c, H) => {
+    const u = {
       openLabel: "启用",
       closeLabel: "禁用",
       openValue: "1",
       closeValue: "0",
       defaultValue: "1"
     };
-    !isFunction(c) && isObject(c) && Object.assign(H, c);
-    const C = isFunction(c) ? c : b;
-    return p(H, C);
-  }, k = () => ({ name: "#iconSelect" }), V = (c = [], b = {}, H) => ({ name: "#treeSelect", sourceData: c, props: b, events: H }), R = (c, b) => {
-    const H = w(b);
+    !isFunction(c) && isObject(c) && Object.assign(u, c);
+    const C = isFunction(c) ? c : H;
+    return p(u, C);
+  }, k = () => ({ name: "#iconSelect" }), V = (c = [], H = {}, u) => ({ name: "#treeSelect", sourceData: c, props: H, events: u }), R = (c, H) => {
+    const u = w(H);
     return {
       name: "#area",
       props: { mapField: (c == null ? void 0 : c.mapField) || ["province", "city", "region"] },
-      events: H
+      events: u
     };
   }, w = (c) => {
-    let b = {};
-    return isObject(c) && !isFunction(c) ? b = {
+    let H = {};
+    return isObject(c) && !isFunction(c) ? H = {
       change: (c == null ? void 0 : c.change) || F,
       blur: (c == null ? void 0 : c.blur) || F,
       focus: (c == null ? void 0 : c.focus) || F,
@@ -1420,15 +1424,15 @@ const useRender = () => {
       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, {
+    } : c && (H = { change: c }), H;
+  }, E = (c, H) => {
+    c = c || { fieldType: "string", mode: "image" };
+    const { singleMode: u, mode: C } = c;
+    return u && Object.assign(c, {
       multiple: !1,
       limitCount: 1,
       autoHiddenButton: !0
-    }), C === "image" && (c.imageTypes = ["jpg", "jpeg", "png", "gif", "apk"]), { name: "#upload", props: c, events: b };
+    }), C === "image" && (c.imageTypes = ["jpg", "jpeg", "png", "gif", "apk"]), { name: "#upload", props: c, events: H };
   };
   function F() {
   }
@@ -1446,7 +1450,7 @@ const useRender = () => {
     renderNumber: f,
     renderLov: s,
     renderSelectLocal: M,
-    renderDate: u,
+    renderDate: b,
     renderRangeDate: m,
     renderSwitch: p,
     renderCellTag: y,
@@ -1564,10 +1568,10 @@ const deviceDetection = () => {
     collapseTagsTooltip: !0,
     multiple: !0
   }, t = o.map((Z, d) => {
-    var n, f, u;
+    var n, f, b;
     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 = Z.itemRender) == null ? void 0 : u.props) || {}
+      ((b = Z.itemRender) == null ? void 0 : b.props) || {}
     )), Z;
   }), 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) {
@@ -2626,9 +2630,9 @@ 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 u = i.getDay();
-    const m = this.nStr1[u];
-    u === 0 && (u = 7);
+    let b = i.getDay();
+    const m = this.nStr1[b];
+    b === 0 && (b = 7);
     const s = t;
     v = this.leapMonth(t);
     let M = !1;
@@ -2640,7 +2644,7 @@ const http = new SuHttp(), lunarCalendar = {
     e >= V && (w = 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;
+    const c = Date.UTC(h, A, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, H = this.toGanZhi(c + e - 1), u = 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,
@@ -2658,14 +2662,14 @@ const http = new SuHttp(), lunarCalendar = {
       cDay: e,
       gzYear: k,
       gzMonth: w,
-      gzDay: b,
+      gzDay: H,
       isToday: f,
       isLeap: M,
-      nWeek: u,
+      nWeek: b,
       ncWeek: "星期" + m,
       isTerm: E,
       Term: F,
-      astro: H
+      astro: u
     };
   },
   /**
@@ -2694,8 +2698,8 @@ const http = new SuHttp(), lunarCalendar = {
     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), u = f.getUTCFullYear(), m = f.getUTCMonth() + 1, s = f.getUTCDate();
-    return this.solar2lunar(u, m, s);
+    const n = Date.UTC(1900, 1, 30, 0, 0, 0), f = new Date((t + o - 31) * 864e5 + n), b = f.getUTCFullYear(), m = f.getUTCMonth() + 1, s = f.getUTCDate();
+    return this.solar2lunar(b, m, s);
   }
 }, dict = storageLocal.getItem("kLov"), formats = {
   formatDate: {