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

package/dist/pkg/useRender.d.ts

@@ -86,7 +86,7 @@ export declare const useRender: () => {
             value: any;
         };
         options: any[];
-        methods: any;
+        events: any;
     };
     renderBU: (attrs?: any, methods?: any) => {
         name: string;
@@ -101,7 +101,7 @@ export declare const useRender: () => {
             value: any;
         };
         options: any[];
-        methods: any;
+        events: any;
     };
     renderNumber: (attrs?: any, methods?: any) => {
         name: string;

package/dist/utils.es.js

@@ -224,7 +224,7 @@ const VxetableRender = (VXETable, {
       function A() {
         m.clear(h, r.field, u, v, "row");
       }
-      function w() {
+      function k() {
         !e.length && M(""), v != null && v.focus && v.focus(l, r.field);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
@@ -238,7 +238,7 @@ const VxetableRender = (VXETable, {
         "remote-method": M,
         loading: n
       }, i, {
-        onFocus: () => w(),
+        onFocus: () => k(),
         onChange: (V) => p(V),
         onClear: () => A(),
         onInput: (V) => y(V)
@@ -284,7 +284,7 @@ const VxetableRender = (VXETable, {
       function A() {
         m.clear(h, r.field, u, v, "row");
       }
-      function w() {
+      function k() {
         !e.length && M(""), v != null && v.focus && v.focus(l, r.field);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
@@ -298,7 +298,7 @@ const VxetableRender = (VXETable, {
         "remote-method": M,
         loading: n
       }, i, {
-        onFocus: () => w(),
+        onFocus: () => k(),
         onChange: (V) => p(V),
         onClear: () => A(),
         onInput: (V) => y(V)
@@ -357,7 +357,7 @@ const VxetableRender = (VXETable, {
       function A() {
         m.clear(h, r, n, v, "data");
       }
-      function w() {
+      function k() {
         !e.length && M(""), v != null && v.focus && v.focus(l);
       }
       return [createVNode(resolveComponent("el-select"), mergeProps({
@@ -371,7 +371,7 @@ const VxetableRender = (VXETable, {
         loading: u,
         "remote-method": M
       }, i, {
-        onFocus: () => w(),
+        onFocus: () => k(),
         onChange: (V) => p(V),
         onClear: () => A(),
         onInput: () => y()
@@ -601,10 +601,10 @@ const VxetableRender = (VXETable, {
         if (M) {
           if (M) {
             const y = {};
-            o[s || m] = n.reduce((A, w) => {
+            o[s || m] = n.reduce((A, k) => {
               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;
+                y[V] = A ? y[V] + "," + k[u[V]] : k[u[V]];
+              return A = A ? A + "," + k[s || m] : k[s || m], A;
             }, ""), Object.assign(o, y);
           }
         } else {
@@ -665,7 +665,7 @@ const VxetableRender = (VXETable, {
         e != null && e.change && e.change(s);
       }
       function v() {
-        i.clear(o, h.field, mapField, e, "row");
+        i.clear(o, h.field, r.mapField, e, "row");
       }
       return [createVNode(resolveComponent("ut-lov"), mergeProps({
         record: o,
@@ -1077,8 +1077,8 @@ const VxetableRender = (VXETable, {
       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;
+          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
@@ -1219,7 +1219,7 @@ function useAttrs(a = {}) {
 const useRender = () => {
   const a = { value: "dictCode", label: "dictName" }, l = (c, b) => {
     var N;
-    const H = k(b);
+    const H = w(b);
     let C = {
       clearable: !0,
       disabled: !1,
@@ -1237,7 +1237,7 @@ const useRender = () => {
       events: H
     };
   }, o = (c, b) => {
-    const H = k(b);
+    const H = w(b);
     return {
       name: "#SuSelect",
       optionProps: (c == null ? void 0 : c.optionProps) || { label: "label", value: "value" },
@@ -1283,7 +1283,13 @@ const useRender = () => {
       organizationId: "id",
       organizationCode: "organizationCode"
     };
-    return Object.assign(C.mapField, L, (c == null ? void 0 : c.mapField) || {}), { name: "#SuSelect", props: C, optionProps: H, options: [], methods: b };
+    return Object.assign(C.mapField, L, (c == null ? void 0 : c.mapField) || {}), {
+      name: "#SuSelect",
+      props: C,
+      optionProps: H,
+      options: [],
+      events: w(b)
+    };
   }, i = (c, b) => {
     const H = {
       label: "orgName",
@@ -1294,14 +1300,20 @@ const useRender = () => {
       url: "/uums/org",
       fetchField: "orgName"
     }, L = { orgId: "id", orgCode: "orgCode" };
-    return Object.assign(C.mapField, L, (c == null ? void 0 : c.mapField) || {}), { name: "#SuSelect", props: C, optionProps: H, options: [], methods: b };
+    return Object.assign(C.mapField, L, (c == null ? void 0 : c.mapField) || {}), {
+      name: "#SuSelect",
+      props: C,
+      optionProps: H,
+      options: [],
+      events: w(b)
+    };
   }, t = (c, b) => {
     const H = Object.assign({ disabled: !1 }, c), C = H == null ? void 0 : H.defaultValue;
     return {
       name: "VxeInput",
       props: H,
       defaultValue: C,
-      events: k(b)
+      events: w(b)
     };
   }, v = (c, b) => {
     const H = Object.assign({ disabled: !1, rows: 3 }, c), C = H == null ? void 0 : H.defaultValue;
@@ -1309,14 +1321,14 @@ const useRender = () => {
       name: "#textarea",
       props: H,
       defaultValue: C,
-      events: k(b)
+      events: w(b)
     };
   }, 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) };
+    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: k(b) };
+    return { name: H, defaultValue: C, options: L, props: S, events: w(b) };
   }, n = (c) => {
     var I;
     let b = { disabled: !1 }, H;
@@ -1326,7 +1338,7 @@ const useRender = () => {
     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);
+    const H = w(b);
     return {
       name: "VxeNumberInput",
       props: Object.assign(
@@ -1337,10 +1349,10 @@ const useRender = () => {
       events: H
     };
   }, u = (c, b) => {
-    const H = k(b), C = "yyyy-MM-dd HH:mm:ss", L = c == null ? void 0 : c.defaultValue;
+    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 = 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 || {});
+    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 || {});
     return {
       name: "VxeDateRangePicker",
       startField: I,
@@ -1351,10 +1363,10 @@ const useRender = () => {
       events: H
     };
   }, s = (c, b) => {
-    const H = k(b);
+    const H = w(b);
     return { name: "#lov", props: Object.assign({}, c || {}), events: H };
   }, M = (c, b) => {
-    const H = k(b), C = (c == null ? void 0 : c.optionProps) || {
+    const H = w(b), C = (c == null ? void 0 : c.optionProps) || {
       label: "label",
       value: "value"
     }, L = Object.assign(
@@ -1376,7 +1388,7 @@ const useRender = () => {
       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) ? k(c) : k(b);
+    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 = {
@@ -1389,14 +1401,14 @@ const useRender = () => {
     !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);
+  }, k = () => ({ name: "#iconSelect" }), V = (c = [], b = {}, H) => ({ name: "#treeSelect", sourceData: c, props: b, events: H }), R = (c, b) => {
+    const H = w(b);
     return {
       name: "#area",
       props: { mapField: (c == null ? void 0 : c.mapField) || ["province", "city", "region"] },
       events: H
     };
-  }, k = (c) => {
+  }, w = (c) => {
     let b = {};
     return isObject(c) && !isFunction(c) ? b = {
       change: (c == null ? void 0 : c.change) || F,
@@ -1439,7 +1451,7 @@ const useRender = () => {
     renderSwitch: p,
     renderCellTag: y,
     renderEnabled: A,
-    renderIconSelect: w,
+    renderIconSelect: k,
     renderTreeSelect: V,
     renderArea: R,
     renderUpload: E
@@ -2623,9 +2635,9 @@ const http = new SuHttp(), lunarCalendar = {
     for (t = 1; t < 13 && d > 0; t++)
       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));
+    const p = t, y = d + 1, A = r - 1, k = this.toGanZhiYear(s), V = this.getTerm(h, r * 2 - 1), R = this.getTerm(h, r * 2);
+    let w = this.toGanZhi((h - 1900) * 12 + r + 11);
+    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;
@@ -2644,8 +2656,8 @@ const http = new SuHttp(), lunarCalendar = {
       cYear: h,
       cMonth: r,
       cDay: e,
-      gzYear: w,
-      gzMonth: k,
+      gzYear: k,
+      gzMonth: w,
       gzDay: b,
       isToday: f,
       isLeap: M,