vft 0.0.342 → 0.0.343

package/es/components/super-form/use/use-form-events.js

@@ -1,231 +1,237 @@
-import { isDef as G, isFunction as j, isString as A, isObject as V, isArray as I, deepMerge as it, findDifferentValuesForObj as nt, isNullOrUndefined as H, isEmpty as rt, isEmptyObject as lt } from "@vft/utils";
-import { formatToDate as J } from "@vft/utils/date";
-import { get as st, cloneDeep as O, uniqBy as ot, isEqual as ft, set as W } from "lodash-es";
-import { unref as n, toRaw as S, nextTick as P } from "vue";
-import { isInput as ct, FormCompEnum as x, isDatePicker as at } from "../component-map.js";
+import { isDef as H, isFunction as m, isString as A, isObject as E, isArray as V, deepMerge as it, findDifferentValuesForObj as nt, isNullOrUndefined as J, isEmpty as lt, isEmptyObject as st } from "@vft/utils";
+import { formatToDate as P } from "@vft/utils/date";
+import { get as rt, cloneDeep as I, uniqBy as ot, isEqual as at, set as W } from "lodash-es";
+import { unref as n, toRaw as x, nextTick as Q } from "vue";
+import { isInput as ft, FormCompEnum as S, isDatePicker as ct } from "../component-map.js";
 import { handleInputNumberValue as ut } from "./helper.js";
-function Q(h, y) {
-  const { show: s, ifShow: f } = h;
-  let p = !0, a = !0;
-  return typeof s == "boolean" ? p = s : typeof s == "function" && (p = s({
+function _(h, v) {
+  const { show: o, ifShow: f } = h;
+  let p = !0, c = !0;
+  return typeof o == "boolean" ? p = o : typeof o == "function" && (p = o({
     field: h.field,
-    model: y,
+    model: v,
     values: {
-      ...y
+      ...v
     },
     schema: h
-  })), typeof f == "boolean" ? a = f : typeof f == "function" && (a = f({
+  })), typeof f == "boolean" ? c = f : typeof f == "function" && (c = f({
     field: h.field,
-    model: y,
+    model: v,
     values: {
-      ...y
+      ...v
     },
     schema: h
-  })), p && a;
+  })), p && c;
 }
-function dt(h, y = {}) {
-  const s = /^\[(.+)\]$/;
-  if (s.test(h)) {
-    const f = h.match(s);
+function dt(h, v = {}) {
+  const o = /^\[(.+)\]$/;
+  if (o.test(h)) {
+    const f = h.match(o);
     if (f && f[1]) {
       const p = f[1].split(",");
       if (!p.length)
         return;
-      const a = [];
-      return p.forEach((v, D) => {
-        W(a, D, y[v.trim()]);
-      }), a.filter(Boolean).length ? a : void 0;
+      const c = [];
+      return p.forEach((y, B) => {
+        W(c, B, v[y.trim()]);
+      }), c.filter(Boolean).length ? c : void 0;
     }
   }
 }
-function ht(h, y = {}) {
-  const s = /^\{(.+)\}$/;
-  if (s.test(h)) {
-    const f = h.match(s);
+function ht(h, v = {}) {
+  const o = /^\{(.+)\}$/;
+  if (o.test(h)) {
+    const f = h.match(o);
     if (f && f[1]) {
       const p = f[1].split(",");
       if (!p.length)
         return;
-      const a = {};
-      return p.forEach((v) => {
-        W(a, v.trim(), y[v.trim()]);
-      }), Object.values(a).filter(Boolean).length ? a : void 0;
+      const c = {};
+      return p.forEach((y) => {
+        W(c, y.trim(), v[y.trim()]);
+      }), Object.values(c).filter(Boolean).length ? c : void 0;
     }
   }
 }
-function Dt({
+function wt({
   emit: h,
-  getProps: y,
-  formModel: s,
+  getProps: v,
+  formModel: o,
   getSchema: f,
   defaultValueRef: p,
-  formElRef: a,
-  schemaRef: v,
-  handleFormValues: D,
-  initValues: _
+  formElRef: c,
+  schemaRef: y,
+  handleFormValues: B,
+  initValues: T
 }) {
   async function X(t) {
-    const { resetFunc: i, submitOnReset: l } = n(y);
-    i && j(i) && await i();
-    const r = n(a);
-    if (r) {
+    const { resetFunc: i, submitOnReset: s } = n(v);
+    i && m(i) && await i();
+    const l = n(c);
+    if (l) {
       if (t?.length)
-        return r.resetFields(t);
-      Object.keys(s).forEach((c) => {
-        const o = n(f).find((u) => u.field === c), e = O(p.value[c]);
-        s[c] = ct(o?.type) ? e || "" : e;
-      }), P(() => B()), h("reset", S(s)), l && await $();
+        return l.resetFields(t);
+      Object.keys(o).forEach((a) => {
+        const r = n(f).find((u) => u.field === a), e = I(p.value[a]);
+        o[a] = ft(r?.type) ? e || "" : e;
+      }), Q(() => C()), h("reset", x(o)), s && await U();
     }
   }
-  async function m(t, i = !0) {
-    const l = n(f).map((e) => e.field).filter(Boolean), r = ".", c = l.filter(
-      (e) => String(e).indexOf(r) >= 0
-    ), o = [];
-    l.forEach((e) => {
+  async function q(t, i = !0) {
+    const s = n(f).map((e) => e.field).filter(Boolean), l = ".", a = s.filter(
+      (e) => String(e).indexOf(l) >= 0
+    ), r = [];
+    s.forEach((e) => {
       const u = n(f).find((d) => d.field === e);
-      let b = st(t, e);
-      const C = Reflect.has(t, e);
+      let b = rt(t, e);
+      const j = Reflect.has(t, e);
       b = ut(u?.type, b);
-      const { componentProps: U } = u || {};
-      let w = U;
-      typeof U == "function" && (w = w({ formModel: n(s) }));
-      const z = dt(e, t) || ht(e, t);
-      if (C || z) {
-        const d = z || b;
+      const { componentProps: z } = u || {};
+      let D = z;
+      typeof z == "function" && (D = D({ formModel: n(o) }));
+      const G = dt(e, t) || ht(e, t);
+      if (j || G) {
+        const d = G || b;
         if (M(e))
           if (Array.isArray(d)) {
             const F = [];
-            for (const E of d)
-              F.push(E ? J(E) : null);
-            n(s)[e] = F;
+            for (const w of d)
+              F.push(w ? P(w) : null);
+            n(o)[e] = F;
           } else
-            n(s)[e] = d ? w?.valueFormat ? d : J(d) : null;
+            n(o)[e] = d ? D?.valueFormat ? d : P(d) : null;
         else
-          n(s)[e] = d;
-        w?.onChange && w?.onChange(d), o.push(e);
+          n(o)[e] = d;
+        D?.onChange && D?.onChange(d), r.push(e);
       } else
-        c.forEach((d) => {
+        a.forEach((d) => {
           try {
-            const F = d.split(".").reduce((E, et) => E[et], t);
-            G(F) && (n(s)[d] = n(F), o.push(d));
+            const F = d.split(".").reduce((w, et) => w[et], t);
+            H(F) && (n(o)[d] = n(F), r.push(d));
           } catch {
-            G(p.value[d]) && (n(s)[d] = O(
+            H(p.value[d]) && (n(o)[d] = I(
               n(p.value[d])
             ));
           }
         });
-    }), i && P(async () => {
-      await q(o).catch((e) => {
+    }), i && Q(async () => {
+      await N(r).catch((e) => {
       });
     });
   }
   async function Y(t) {
-    const i = O(n(f));
+    const i = I(n(f));
     if (!t)
       return;
-    let l = A(t) ? [t] : t;
-    A(t) && (l = [t]);
-    for (const r of l)
-      Z(r, i);
-    v.value = i;
+    let s = A(t) ? [t] : t;
+    A(t) && (s = [t]);
+    for (const l of s)
+      Z(l, i);
+    y.value = i;
   }
   function Z(t, i) {
     if (A(t)) {
-      const l = i.findIndex((r) => r.field === t);
-      l !== -1 && (delete s[t], i.splice(l, 1));
+      const s = i.findIndex((l) => l.field === t);
+      s !== -1 && (delete o[t], i.splice(s, 1));
     }
   }
-  async function L(t, i, l = !1) {
-    const r = O(n(f)), c = r.findIndex((e) => e.field === i), o = V(t) ? [t] : t;
-    if (!i || c === -1 || l) {
-      l ? r.unshift(...o) : r.push(...o), v.value = r, g(t);
+  async function L(t, i, s = !1) {
+    const l = I(n(f)), a = l.findIndex((e) => e.field === i), r = E(t) ? [t] : t;
+    if (!i || a === -1 || s) {
+      s ? l.unshift(...r) : l.push(...r), y.value = l, O(t);
       return;
     }
-    c !== -1 && r.splice(c + 1, 0, ...o), g(t), v.value = r;
+    a !== -1 && l.splice(a + 1, 0, ...r), O(t), y.value = l;
   }
   async function K(t) {
     let i = [];
-    if (V(t) && i.push(t), I(t) && (i = [...t]), !i.every(
-      (r) => r.type === x.DIVIDER || Reflect.has(r, "field") && r.field
+    if (E(t) && i.push(t), V(t) && (i = [...t]), !i.every(
+      (l) => l.type === S.DIVIDER || Reflect.has(l, "field") && l.field
     )) {
       console.error(
         "All children of the form Schema array that need to be updated must contain the `field` field"
       );
       return;
     }
-    v.value = i;
+    y.value = i;
   }
   async function R(t) {
     let i = [];
-    if (V(t) && i.push(t), I(t) && (i = [...t]), !i.every(
-      (o) => o.type === x.DIVIDER || Reflect.has(o, "field") && o.field
+    if (E(t) && i.push(t), V(t) && (i = [...t]), !i.every(
+      (r) => r.type === S.DIVIDER || Reflect.has(r, "field") && r.field
     )) {
       console.error(
         "All children of the form Schema array that need to be updated must contain the `field` field"
       );
       return;
     }
-    const r = [], c = [];
-    n(f).forEach((o) => {
+    const l = [], a = [];
+    n(f).forEach((r) => {
       let e;
       if (i.forEach((u) => {
-        o.field === u.field && (e = u), u.defaultValue && u.field && r.push(u.field);
-      }), e !== void 0 && o.field === e.field) {
-        const u = it(o, e);
-        c.push(u);
+        r.field === u.field && (e = u), u.defaultValue && u.field && l.push(u.field);
+      }), e !== void 0 && r.field === e.field) {
+        const u = it(r, e);
+        a.push(u);
       } else
-        c.push(o);
-    }), g(c, r), v.value = ot(c, "field");
+        a.push(r);
+    }), O(a, l), y.value = ot(a, "field");
   }
-  function g(t, i, l = !0) {
-    if (I(i) && i?.length === 0)
+  function O(t, i, s = !0) {
+    if (V(i) && i?.length === 0)
       return;
-    let r = [];
-    V(t) && r.push(t), I(t) && (r = [...t]);
-    const c = {}, o = T();
-    r.forEach((e) => {
-      e.type !== x.DIVIDER && Reflect.has(e, "field") && e.field && !H(e.defaultValue) && (!(e.field in o) || H(o[e.field]) || rt(o[e.field])) && (c[e.field] = e.defaultValue);
-    }), lt(c) || m(c, l);
+    let l = [];
+    E(t) && l.push(t), V(t) && (l = [...t]);
+    const a = {}, r = g();
+    l.forEach((e) => {
+      e.type !== S.DIVIDER && Reflect.has(e, "field") && e.field && !J(e.defaultValue) && (!(e.field in r) || J(r[e.field]) || lt(r[e.field])) && (a[e.field] = e.defaultValue);
+    }), st(a) || q(a, s);
   }
-  function T() {
-    return n(a) ? D(S(n(s))) : {};
+  function g(t = fasle) {
+    if (!n(c)) return {};
+    const s = B(x(n(o)));
+    if (t)
+      return s;
+    const l = n(f).filter((r) => _(r, n(o))).map((r) => r.field).filter(Boolean), a = {};
+    return l.forEach((r) => {
+      r in s && (a[r] = s[r]);
+    }), a;
   }
   function k(t) {
-    return n(a) ? S(n(s))[t] : {};
+    return n(c) ? x(n(o))[t] : {};
   }
   function M(t) {
-    return n(f).some((i) => i.field === t ? at(i.type) : !1);
-  }
-  async function q(t) {
-    return t || (t = n(f).filter((l) => Q(l, n(s))).map((l) => l.field).filter(Boolean)), n(a)?.validateField(t);
+    return n(f).some((i) => i.field === t ? ct(i.type) : !1);
   }
   async function N(t) {
-    return t || (t = n(f).filter((l) => Q(l, n(s))).map((l) => l.field).filter(Boolean)), await n(a)?.validate(() => {
+    return t || (t = n(f).filter((s) => _(s, n(o))).map((s) => s.field).filter(Boolean)), n(c)?.validateField(t);
+  }
+  async function $(t) {
+    return t || (t = n(f).filter((s) => _(s, n(o))).map((s) => s.field).filter(Boolean)), await n(c)?.validate(() => {
     }, t);
   }
-  async function B(t) {
-    await n(a)?.clearValidate(t);
+  async function C(t) {
+    await n(c)?.clearValidate(t);
   }
   async function tt(t, i) {
-    await n(a)?.scrollToField(t, i);
+    await n(c)?.scrollToField(t, i);
   }
-  async function $(t) {
-    const { autoCleanErrorMessage: i, watchDataIsChange: l } = n(y);
-    t && t.preventDefault(), i && await B();
-    const { submitFunc: r, beforeSubmitFunc: c } = n(y);
-    if (c && j(c) && await c(), r && j(r)) {
-      await r();
+  async function U(t) {
+    const { autoCleanErrorMessage: i, watchDataIsChange: s } = n(v);
+    t && t.preventDefault(), i && await C();
+    const { submitFunc: l, beforeSubmitFunc: a } = n(v);
+    if (a && m(a) && await a(), l && m(l)) {
+      await l();
       return;
     }
-    if (n(a))
+    if (n(c))
       try {
-        const e = await N();
-        if (!e)
+        if (!await $())
           return;
-        const u = D(e);
-        if (l) {
-          const b = ft(_.value, u), C = nt(_.value, u);
-          h("submit", u, !b, C);
+        const u = g();
+        if (s) {
+          const b = at(T.value, u), j = nt(T.value, u);
+          h("submit", u, !b, j);
         } else
           h("submit", u);
       } catch (e) {
@@ -235,21 +241,21 @@ function Dt({
       }
   }
   return {
-    handleSubmit: $,
-    clearValidate: B,
-    validate: N,
-    validateField: q,
-    getFieldsValue: T,
+    handleSubmit: U,
+    clearValidate: C,
+    validate: $,
+    validateField: N,
+    getFieldsValue: g,
     updateSchema: R,
     resetSchema: K,
     appendSchemaByField: L,
     removeSchemaByField: Y,
     resetFields: X,
-    setFieldsValue: m,
+    setFieldsValue: q,
     scrollToField: tt,
     getFieldValue: k
   };
 }
 export {
-  Dt as useFormEvents
+  wt as useFormEvents
 };

package/es/package.json.d.ts

@@ -1,6 +1,6 @@
 declare const _default: {
   "name": "vft",
-  "version": "0.0.342",
+  "version": "0.0.343",
   "license": "MIT",
   "main": "lib/index.cjs",
   "module": "es/index.js",

package/es/package.json.js

@@ -1,4 +1,4 @@
-const o = "0.0.342";
+const o = "0.0.343";
 export {
   o as version
 };

package/lib/components/button/index.d.ts

@@ -24,12 +24,12 @@ export declare const VftButton: import("vft/es/utils").SFCWithInstall<{
         size: {
             type: import("vue").PropType<import("../types").ComponentSize>;
         };
-        icon: {
-            type: import("vue").PropType<string | import("vft/es/vft").IconProps>;
-        };
         dark: {
             type: import("vue").PropType<boolean>;
         };
+        icon: {
+            type: import("vue").PropType<string | import("vft/es/vft").IconProps>;
+        };
         loading: {
             type: import("vue").PropType<boolean>;
         };
@@ -114,12 +114,12 @@ export declare const VftButton: import("vft/es/utils").SFCWithInstall<{
         size: {
             type: import("vue").PropType<import("../types").ComponentSize>;
         };
-        icon: {
-            type: import("vue").PropType<string | import("vft/es/vft").IconProps>;
-        };
         dark: {
             type: import("vue").PropType<boolean>;
         };
+        icon: {
+            type: import("vue").PropType<string | import("vft/es/vft").IconProps>;
+        };
         loading: {
             type: import("vue").PropType<boolean>;
         };
@@ -199,12 +199,12 @@ export declare const VftButton: import("vft/es/utils").SFCWithInstall<{
     size: {
         type: import("vue").PropType<import("../types").ComponentSize>;
     };
-    icon: {
-        type: import("vue").PropType<string | import("vft/es/vft").IconProps>;
-    };
     dark: {
         type: import("vue").PropType<boolean>;
     };
+    icon: {
+        type: import("vue").PropType<string | import("vft/es/vft").IconProps>;
+    };
     loading: {
         type: import("vue").PropType<boolean>;
     };

package/lib/components/form/form-item.vue.d.ts

@@ -32,10 +32,10 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
 }>>> & Readonly<{
     "onUpdate:error"?: ((val: string) => any) | undefined;
 }>, {
-    required: boolean;
     labelWidth: string | number;
     inlineMessage: string | boolean;
     showMessage: boolean;
+    required: boolean;
     hideLabel: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;