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

package/dist/utils.es.js

@@ -1,7 +1,7 @@
 var j = Object.defineProperty;
 var z = (l, a, o) => a in l ? j(l, a, { enumerable: !0, configurable: !0, writable: !0, value: o }) : l[a] = o;
 var S = (l, a, o) => z(l, typeof a != "symbol" ? a + "" : a, o);
-import { createVNode, resolveComponent, mergeProps, withDirectives, resolveDirective, isVNode, ref, shallowRef, unref, getCurrentInstance, onBeforeUnmount, reactive, watchEffect, isRef } from "vue";
+import { createVNode, resolveComponent, mergeProps, Fragment, createTextVNode, isVNode, ref, shallowRef, unref, getCurrentInstance, onBeforeUnmount, reactive, watchEffect, isRef } from "vue";
 import dayjs from "dayjs";
 import XEUtils, { isArray, findTree, isEmpty, isObject, isPlainObject, isUndefined, isFunction, isString, clone, merge, has } from "xe-utils";
 import localforage from "localforage";
@@ -465,11 +465,11 @@ const VxetableRender = (VXETable, {
         label: V[c],
         value: V[t]
       }, {
-        default: () => [withDirectives(createVNode("span", {
+        default: () => [f ? createVNode(Fragment, null, [createVNode("span", {
           style: "float: left"
-        }, [V[c]]), [[resolveDirective("if"), f]]), withDirectives(createVNode("span", {
+        }, [createTextVNode(" "), V[c], createTextVNode(" ")]), createVNode("span", {
           style: " float: right; color: var(--el-text-color-secondary); font-size: 13px"
-        }, [V[n || t]]), [[resolveDirective("if"), f]])]
+        }, [V[n || t] || null])]) : null]
       }))) ? o : {
         default: () => [o]
       })];
@@ -516,11 +516,11 @@ const VxetableRender = (VXETable, {
         label: d && s[d] ? s[t] : s[c],
         value: s[t]
       }, {
-        default: () => [withDirectives(createVNode("span", {
+        default: () => [n ? createVNode(Fragment, null, [createVNode("span", {
           style: "float: left"
-        }, [s[c]]), [[resolveDirective("if"), n]]), withDirectives(createVNode("span", {
+        }, [createTextVNode(" "), s[c], createTextVNode(" ")]), createVNode("span", {
           style: " float: right; color: var(--el-text-color-secondary); font-size: 13px"
-        }, [s[m || t]]), [[resolveDirective("if"), n]])]
+        }, [s[m || t] || null])]) : null]
       }))) ? o : {
         default: () => [o]
       })];
@@ -585,11 +585,11 @@ const VxetableRender = (VXETable, {
         label: V[c],
         value: V[t]
       }, {
-        default: () => [withDirectives(createVNode("span", {
+        default: () => [n ? createVNode(Fragment, null, [createVNode("span", {
           style: "float: left"
-        }, [V[c]]), [[resolveDirective("if"), n]]), withDirectives(createVNode("span", {
+        }, [createTextVNode(" "), V[c], createTextVNode(" ")]), createVNode("span", {
           style: " float: right; color: var(--el-text-color-secondary); font-size: 13px"
-        }, [V[m || t]]), [[resolveDirective("if"), n]])]
+        }, [V[m || t] || null])]) : null]
       }))) ? o : {
         default: () => [o]
       })];
@@ -1251,7 +1251,7 @@ function useAttrs(l = {}) {
 }
 const i18n = window.$i18n, useRender = () => {
   const l = { value: "dictCode", label: "dictName" }, a = (v, H) => {
-    var N;
+    var D;
     const b = g(H);
     let y = {
       clearable: !0,
@@ -1260,11 +1260,11 @@ const i18n = window.$i18n, useRender = () => {
       placeholder: null
     }, L, k;
     isObject(v) ? (y = Object.assign(y, v), L = v.defaultValue, k = v == null ? void 0 : v.code) : k = v;
-    const x = (N = storageLocal.getItem("kLov")[k]) == null ? void 0 : N.children, D = x ? x.filter((E) => E.enabled === "1") : [];
+    const x = (D = storageLocal.getItem("kLov")[k]) == null ? void 0 : D.children, N = x ? x.filter((E) => E.enabled === "1") : [];
     return {
       name: "#select",
       optionProps: l,
-      options: D,
+      options: N,
       props: y,
       defaultValue: L,
       events: b
@@ -1369,7 +1369,7 @@ const i18n = window.$i18n, useRender = () => {
     const y = storageLocal.getItem("kLov");
     let L = "";
     isObject(v) ? (b = v.defaultValue, L = v.code, v.options ? H = Object.assign(H, v.props || {}) : H = Object.assign(H, v || {})) : isString(v) && (L = v);
-    const k = L ? (x = y[L]) == null ? void 0 : x.children.map((D) => ({ label: D.dictName, value: D.dictCode })) : [];
+    const k = L ? (x = y[L]) == null ? void 0 : x.children.map((N) => ({ label: N.dictName, value: N.dictCode })) : [];
     return {
       props: H,
       defaultValue: b,
@@ -1390,7 +1390,7 @@ const i18n = window.$i18n, useRender = () => {
     const b = g(H), y = "yyyy-MM-dd HH:mm:ss", L = v == null ? void 0 : v.defaultValue;
     return { name: "VxeDatePicker", props: Object.assign({ type: "date", valueFormat: y, clearable: !0 }, v || {}), defaultValue: L, events: b };
   }, M = (v, H) => {
-    const b = g(H), y = "yyyy-MM-dd HH:mm:ss", L = v == null ? void 0 : v.startValue, k = v == null ? void 0 : v.endValue, x = v == null ? void 0 : v.startField, D = v == null ? void 0 : v.endField, N = {
+    const b = g(H), y = "yyyy-MM-dd HH:mm:ss", L = v == null ? void 0 : v.startValue, k = v == null ? void 0 : v.endValue, x = v == null ? void 0 : v.startField, N = v == null ? void 0 : v.endField, D = {
       type: "date",
       valueFormat: y,
       clearable: !0,
@@ -1427,11 +1427,11 @@ const i18n = window.$i18n, useRender = () => {
           }
         ]
       }
-    }, E = Object.assign(N, v || {});
+    }, E = Object.assign(D, v || {});
     return {
       name: "VxeDateRangePicker",
       startField: x,
-      endField: D,
+      endField: N,
       startValue: L,
       endValue: k,
       props: E,
@@ -1476,7 +1476,7 @@ const i18n = window.$i18n, useRender = () => {
     !isFunction(v) && isObject(v) && Object.assign(b, v);
     const y = isFunction(v) ? v : H;
     return V(b, y);
-  }, u = () => ({ name: "#iconSelect" }), R = (v = [], H = {}, b) => ({ name: "#treeSelect", sourceData: v, props: H, events: b }), T = (v, H) => {
+  }, u = () => ({ name: "#iconSelect" }), T = (v = [], H = {}, b) => ({ name: "#treeSelect", sourceData: v, props: H, events: b }), R = (v, H) => {
     const b = g(H);
     return {
       name: "#area",
@@ -1527,8 +1527,8 @@ const i18n = window.$i18n, useRender = () => {
     renderCellTag: s,
     renderEnabled: w,
     renderIconSelect: u,
-    renderTreeSelect: R,
-    renderArea: T,
+    renderTreeSelect: T,
+    renderArea: R,
     renderUpload: F
   };
 }, useGlobal = () => {
@@ -2716,18 +2716,18 @@ const http = new SuHttp(), lunarCalendar = {
     for (Z = 1; Z < 13 && d > 0; Z++)
       c > 0 && Z === c + 1 && p === !1 ? (--Z, p = !0, t = this.leapDays(C)) : t = this.monthDays(C, Z), p === !0 && Z === c + 1 && (p = !1), d -= t;
     d === 0 && c > 0 && Z === c + 1 && (p ? p = !1 : (p = !0, --Z)), d < 0 && (d += t, --Z);
-    const V = Z, s = d + 1, w = r - 1, u = this.toGanZhiYear(C), R = this.getTerm(h, r * 2 - 1), T = this.getTerm(h, r * 2);
+    const V = Z, s = d + 1, w = r - 1, u = this.toGanZhiYear(C), T = this.getTerm(h, r * 2 - 1), R = this.getTerm(h, r * 2);
     let g = this.toGanZhi((h - 1900) * 12 + r + 11);
-    e >= R && (g = this.toGanZhi((h - 1900) * 12 + r + 12));
+    e >= T && (g = this.toGanZhi((h - 1900) * 12 + r + 12));
     let F = !1, I;
-    R === e && (F = !0, I = this.solarTerm[r * 2 - 2]), T === e && (F = !0, I = this.solarTerm[r * 2 - 1]);
-    const v = Date.UTC(h, w, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, H = this.toGanZhi(v + e - 1), b = this.toAstro(r, e), y = h + "-" + r + "-" + e, L = C + "-" + V + "-" + s, k = this.festival, x = this.lFestival, D = r + "-" + e;
-    let N = V + "-" + s;
-    return V === 12 && s === 29 && this.monthDays(C, V) === 29 && (N = "12-30"), {
+    T === e && (F = !0, I = this.solarTerm[r * 2 - 2]), R === e && (F = !0, I = this.solarTerm[r * 2 - 1]);
+    const v = Date.UTC(h, w, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, H = this.toGanZhi(v + e - 1), b = this.toAstro(r, e), y = h + "-" + r + "-" + e, L = C + "-" + V + "-" + s, k = this.festival, x = this.lFestival, N = r + "-" + e;
+    let D = V + "-" + s;
+    return V === 12 && s === 29 && this.monthDays(C, V) === 29 && (D = "12-30"), {
       date: y,
       lunarDate: L,
-      festival: k[D] ? k[D].title : null,
-      lunarFestival: x[N] ? x[N].title : null,
+      festival: k[N] ? k[N].title : null,
+      lunarFestival: x[D] ? x[D].title : null,
       lYear: C,
       lMonth: V,
       lDay: s,