@utogether/utils 3.0.0-beta.36 → 3.0.0-beta.38

package/dist/pkg/format.d.ts

@@ -29,6 +29,11 @@ export declare const formats: {
             cellValue: any;
         }, dictCode: any): any;
     };
+    formattMultileCode: {
+        tableCellFormatMethod({ cellValue }: {
+            cellValue: any;
+        }, dictCode: any): any;
+    };
     formatRelateField: {
         tableCellFormatMethod({ row, cellValue }: {
             row: any;

package/dist/utils.es.js

@@ -660,7 +660,8 @@ const VxetableRender = (VXETable, {
         const s = {
           row: o,
           options: Z,
-          field: h.field
+          field: h.field,
+          column: h
         };
         e != null && e.change && e.change(s);
       }
@@ -703,7 +704,8 @@ const VxetableRender = (VXETable, {
         const s = {
           row: o,
           options: Z,
-          field: h.field
+          field: h.field,
+          column: h
         };
         e != null && e.change && e.change(s);
       }
@@ -1216,10 +1218,10 @@ function useAttrs(a = {}) {
     r.value = i;
   }), r;
 }
-const useRender = () => {
-  const a = { value: "dictCode", label: "dictName" }, l = (c, H) => {
+const i18n = window.$i18n, useRender = () => {
+  const a = { value: "dictCode", label: "dictName" }, l = (c, u) => {
     var N;
-    const u = w(H);
+    const H = w(u);
     let C = {
       clearable: !0,
       disabled: !1,
@@ -1227,26 +1229,26 @@ const useRender = () => {
       placeholder: null
     }, 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((R) => R.enabled === "1") : [];
+    const I = (N = storageLocal.getItem("kLov")[S]) == null ? void 0 : N.children, D = I ? I.filter((E) => E.enabled === "1") : [];
     return {
       name: "#select",
       optionProps: a,
       options: D,
       props: C,
       defaultValue: L,
-      events: u
+      events: H
     };
-  }, o = (c, H) => {
-    const u = w(H);
+  }, o = (c, u) => {
+    const H = w(u);
     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: u
+      events: H
     };
-  }, h = (c, H) => {
-    const u = {
+  }, h = (c, u) => {
+    const H = {
       optionProps: { extLabel: "userName", value: "employeeName" },
       props: {
         attrs: { disabled: c == null ? void 0 : c.disabled },
@@ -1257,10 +1259,10 @@ const useRender = () => {
         fetchField: "employeeName"
       }
     };
-    return o(u, H);
+    return o(H, u);
   }, r = (c) => {
-    const H = {
-      optionProps: { extLabel: "userName", value: "name" },
+    const u = {
+      optionProps: { label: "userName", value: "userName" },
       props: {
         code: "sys/listUsers",
         url: "/uums/user",
@@ -1268,9 +1270,9 @@ const useRender = () => {
         mapField: c == null ? void 0 : c.mapField
       }
     };
-    return o(H);
-  }, e = (c, H) => {
-    const u = {
+    return o(u);
+  }, e = (c, u) => {
+    const H = {
       label: "organizationName",
       value: (c == null ? void 0 : c.field) || "organizationName"
     }, C = {
@@ -1286,12 +1288,12 @@ const useRender = () => {
     return Object.assign(C.mapField, L, (c == null ? void 0 : c.mapField) || {}), {
       name: "#SuSelect",
       props: C,
-      optionProps: u,
+      optionProps: H,
       options: [],
-      events: w(H)
+      events: w(u)
     };
-  }, i = (c, H) => {
-    const u = {
+  }, i = (c, u) => {
+    const H = {
       label: "orgName",
       value: (c == null ? void 0 : c.field) || "orgName"
     }, C = {
@@ -1304,46 +1306,46 @@ const useRender = () => {
     return Object.assign(C.mapField, L, (c == null ? void 0 : c.mapField) || {}), {
       name: "#SuSelect",
       props: C,
-      optionProps: u,
+      optionProps: H,
       options: [],
-      events: w(H)
+      events: w(u)
     };
-  }, t = (c, H) => {
-    const u = Object.assign({ disabled: !1 }, c), C = u == null ? void 0 : u.defaultValue;
+  }, t = (c, u) => {
+    const H = Object.assign({ disabled: !1 }, c), C = H == null ? void 0 : H.defaultValue;
     return {
       name: "VxeInput",
-      props: u,
+      props: H,
       defaultValue: C,
-      events: w(H)
+      events: w(u)
     };
-  }, v = (c, H) => {
-    const u = Object.assign({ disabled: !1, rows: 3 }, c), C = u == null ? void 0 : u.defaultValue;
+  }, v = (c, u) => {
+    const H = Object.assign({ disabled: !1, rows: 3 }, c), C = H == null ? void 0 : H.defaultValue;
     return {
       name: "VxeTextarea",
-      props: u,
+      props: H,
       defaultValue: C,
-      events: w(H)
+      events: w(u)
     };
-  }, 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) };
+  }, Z = (c, u) => {
+    const H = "VxeCheckboxGroup", { defaultValue: C, options: L, props: S } = n(c);
+    return { name: H, defaultValue: C, options: L, props: S, events: w(u) };
+  }, d = (c, u) => {
+    const H = "VxeRadioGroup", { defaultValue: C, options: L, props: S } = n(c);
+    return { name: H, defaultValue: C, options: L, props: S, events: w(u) };
   }, n = (c) => {
     var I;
-    let H = { disabled: !1 }, u;
+    let u = { disabled: !1 }, H;
     const C = storageLocal.getItem("kLov");
     let L = "";
-    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);
+    isObject(c) ? (H = c.defaultValue, L = c.code, c.options ? u = Object.assign(u, c.props || {}) : u = Object.assign(u, 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: H,
-      defaultValue: u,
+      props: u,
+      defaultValue: H,
       options: isObject(c) && c.options ? c.options : S
     };
-  }, f = (c, H) => {
-    const u = w(H);
+  }, f = (c, u) => {
+    const H = w(u);
     return {
       name: "VxeNumberInput",
       props: Object.assign(
@@ -1351,27 +1353,64 @@ const useRender = () => {
         c || {}
       ),
       defaultValue: c == null ? void 0 : c.defaultValue,
-      events: u
+      events: H
     };
-  }, 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, R = Object.assign({ type: "date", valueFormat: C, clearable: !0 }, c || {});
+  }, b = (c, u) => {
+    const H = w(u), 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, u) => {
+    const H = w(u), 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, N = {
+      type: "date",
+      valueFormat: C,
+      clearable: !0,
+      shortcutConfig: {
+        enabled: !0,
+        options: [
+          {
+            code: "utTodyay",
+            content: i18n ? i18n("message.udp.today") : "今天"
+          },
+          {
+            code: "utYesterDay",
+            content: i18n ? i18n("message.udp.yesterday") : "昨天"
+          },
+          {
+            code: "utRecentWeek",
+            content: i18n ? i18n("message.udp.lastWeek") : "最近一周"
+          },
+          {
+            code: "utRecentMonth",
+            content: i18n ? i18n("message.udp.lastMonth") : "最近一个月"
+          },
+          {
+            code: "utRecentThreeMonth",
+            content: i18n ? i18n("message.udp.threeMonth") : "最近三个月"
+          },
+          {
+            code: "utRecentHalfYear",
+            content: i18n ? i18n("message.udp.halfYear") : "最近半年"
+          },
+          {
+            code: "utRecentYear",
+            content: i18n ? i18n("message.udp.anniversary") : "最近已年"
+          }
+        ]
+      }
+    }, E = Object.assign(N, c || {});
     return {
       name: "VxeDateRangePicker",
       startField: I,
       endField: D,
       startValue: L,
       endValue: S,
-      props: R,
-      events: u
+      props: E,
+      events: H
     };
-  }, 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) || {
+  }, s = (c, u) => {
+    const H = w(u);
+    return { name: "#lov", props: Object.assign({}, c || {}), events: H };
+  }, M = (c, u) => {
+    const H = w(u), C = (c == null ? void 0 : c.optionProps) || {
       label: "label",
       value: "value"
     }, L = Object.assign(
@@ -1383,39 +1422,39 @@ const useRender = () => {
       optionProps: C,
       options: (c == null ? void 0 : c.options) || [],
       props: L,
-      events: u
+      events: H
     };
-  }, p = (c, H) => {
-    let u = {
+  }, p = (c, u) => {
+    let H = {
       openLabel: "是",
       closeLabel: "否",
       openValue: "Y",
       closeValue: "N"
     }, C = "Y";
-    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 = {
+    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(u);
+    return { name: "VxeSwitch", props: H, defaultValue: C, events: L };
+  }, y = (c, u) => ({ name: "#tag", props: { code: c, tagMap: u } }), A = (c, u) => {
+    const H = {
       openLabel: "启用",
       closeLabel: "禁用",
       openValue: "1",
       closeValue: "0",
       defaultValue: "1"
     };
-    !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 }), E = (c, H) => {
-    const u = w(H);
+    !isFunction(c) && isObject(c) && Object.assign(H, c);
+    const C = isFunction(c) ? c : u;
+    return p(H, C);
+  }, k = () => ({ name: "#iconSelect" }), V = (c = [], u = {}, H) => ({ name: "#treeSelect", sourceData: c, props: u, events: H }), T = (c, u) => {
+    const H = w(u);
     return {
       name: "#area",
       props: { mapField: (c == null ? void 0 : c.mapField) || ["province", "city", "region"] },
-      events: u
+      events: H
     };
   }, w = (c) => {
-    let H = {};
-    return isObject(c) && !isFunction(c) ? H = {
+    let u = {};
+    return isObject(c) && !isFunction(c) ? u = {
       change: (c == null ? void 0 : c.change) || F,
       blur: (c == null ? void 0 : c.blur) || F,
       focus: (c == null ? void 0 : c.focus) || F,
@@ -1425,15 +1464,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 && (H = { change: c }), H;
-  }, T = (c, H) => {
+    } : c && (u = { change: c }), u;
+  }, R = (c, u) => {
     c = c || { fieldType: "string", mode: "image" };
-    const { singleMode: u, mode: C } = c;
-    return u && Object.assign(c, {
+    const { singleMode: H, mode: C } = c;
+    return H && Object.assign(c, {
       multiple: !1,
       limitCount: 1,
       autoHiddenButton: !0
-    }), C === "image" && (c.imageTypes = ["jpg", "jpeg", "png", "gif", "apk"]), { name: "#upload", props: c, events: H };
+    }), C === "image" && (c.imageTypes = ["jpg", "jpeg", "png", "gif", "apk"]), { name: "#upload", props: c, events: u };
   };
   function F() {
   }
@@ -1458,8 +1497,8 @@ const useRender = () => {
     renderEnabled: A,
     renderIconSelect: k,
     renderTreeSelect: V,
-    renderArea: E,
-    renderUpload: T
+    renderArea: T,
+    renderUpload: R
   };
 }, useGlobal = () => {
   const a = getCurrentInstance();
@@ -2646,12 +2685,12 @@ 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, k = this.toGanZhiYear(s), V = this.getTerm(h, r * 2 - 1), E = this.getTerm(h, r * 2);
+    const p = t, y = d + 1, A = r - 1, k = this.toGanZhiYear(s), V = this.getTerm(h, r * 2 - 1), T = 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 T = !1, F;
-    V === e && (T = !0, F = this.solarTerm[r * 2 - 2]), E === e && (T = !0, F = this.solarTerm[r * 2 - 1]);
-    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 R = !1, F;
+    V === e && (R = !0, F = this.solarTerm[r * 2 - 2]), T === e && (R = !0, F = this.solarTerm[r * 2 - 1]);
+    const c = Date.UTC(h, A, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, u = 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,
@@ -2669,14 +2708,14 @@ const http = new SuHttp(), lunarCalendar = {
       cDay: e,
       gzYear: k,
       gzMonth: w,
-      gzDay: H,
+      gzDay: u,
       isToday: f,
       isLeap: M,
       nWeek: b,
       ncWeek: "星期" + m,
-      isTerm: T,
+      isTerm: R,
       Term: F,
-      astro: u
+      astro: H
     };
   },
   /**
@@ -2749,6 +2788,18 @@ const http = new SuHttp(), lunarCalendar = {
       return (h == null ? void 0 : h.dictName) || a;
     }
   },
+  formattMultileCode: {
+    tableCellFormatMethod({ cellValue: a }, l) {
+      if (!l || !dict) return a;
+      const o = a == null ? void 0 : a.split(",");
+      let h = "";
+      return o == null || o.forEach((r) => {
+        var i, t;
+        const e = (t = (i = dict[l]) == null ? void 0 : i.children) == null ? void 0 : t.find((v) => v.dictCode === r);
+        h ? h += `,${e.dictName}` : h = e.dictName;
+      }), h;
+    }
+  },
   formatRelateField: {
     // 转换相应的字段值eg: 'display/obj.test.test'
     tableCellFormatMethod({ row, cellValue }, field) {
@@ -10424,6 +10475,9 @@ function isUrl(a) {
 const getDictName = (a, l) => {
   var h, r;
   return !a || !l ? null : (r = (h = storageLocal.getItem("kLov")[a]) == null ? void 0 : h.children.find((e) => l === e.dictCode)) == null ? void 0 : r.dictName;
+}, getDictChildren = (a) => {
+  var o;
+  return a ? (o = storageLocal.getItem("kLov")[a]) == null ? void 0 : o.children : [];
 };
 export {
   G as NProgress,
@@ -10446,6 +10500,7 @@ export {
   formatRules,
   formats,
   getBrowserInfo,
+  getDictChildren,
   getDictName,
   getNodeByUniqueId,
   hasClass,