vft 0.0.340 → 0.0.342

package/es/components/form/form.vue.d.ts

@@ -7,7 +7,7 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     /**
      * @description Validate the whole form. Receives a callback or returns `Promise`.
      */
-    validate: (callback?: FormValidateCallback) => FormValidationResult;
+    validate: (callback?: FormValidateCallback, props?: Arrayable<FormItemProp>) => FormValidationResult;
     /**
      * @description Validate specified fields.
      */

package/es/components/form/form.vue2.js

@@ -61,32 +61,32 @@ const H = b({
       if (l.length === 0) return [];
       const t = f(l, e);
       return t.length ? t : (n(i.b(), "please pass correct props!"), []);
-    }, h = async (e) => c(void 0, e), R = async (e = []) => {
+    }, h = async (e, t) => c(t || void 0, e), R = async (e = []) => {
       if (!k.value) return !1;
       const t = P(e);
       if (t.length === 0) return !0;
       let r = {};
-      for (const s of t)
+      for (const a of t)
         try {
-          await s.validate(""), s.validateState === "error" && s.resetField();
-        } catch (a) {
+          await a.validate(""), a.validateState === "error" && a.resetField();
+        } catch (s) {
           r = {
             ...r,
-            ...a
+            ...s
           };
         }
       return Object.keys(r).length === 0 ? !0 : Promise.reject(r);
     }, c = async (e = [], t) => {
       let r = !1;
-      const s = !K(t);
+      const a = !K(t);
       try {
         return r = await R(e), r === !0 && await t?.(r), o.model;
-      } catch (a) {
-        if (a instanceof Error) throw a;
-        const v = a;
+      } catch (s) {
+        if (s instanceof Error) throw s;
+        const v = s;
         return o.scrollToError && d.value && d.value.querySelector(
           `.${i.b()}-item.is-error`
-        )?.scrollIntoView(o.scrollIntoViewOptions), !r && await t?.(!1, v), s && Promise.reject(v);
+        )?.scrollIntoView(o.scrollIntoViewOptions), console.error(s), !r && await t?.(!1, v), a && Promise.reject(v);
       }
     }, S = (e) => {
       const t = u(e);

package/es/components/form/index.d.ts

@@ -53,7 +53,7 @@ export declare const VftForm: import("vft/es/utils").SFCWithInstall<{
     }>> & Readonly<{
         onValidate?: ((...args: any[]) => any) | undefined;
     }>, {
-        validate: (callback?: import("./types").FormValidateCallback) => import("./types").FormValidationResult;
+        validate: (callback?: import("./types").FormValidateCallback, props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => import("./types").FormValidationResult;
         validateField: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>, callback?: import("./types").FormValidateCallback) => import("./types").FormValidationResult;
         resetFields: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => void;
         clearValidate: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => void;
@@ -119,7 +119,7 @@ export declare const VftForm: import("vft/es/utils").SFCWithInstall<{
     }>> & Readonly<{
         onValidate?: ((...args: any[]) => any) | undefined;
     }>, {
-        validate: (callback?: import("./types").FormValidateCallback) => import("./types").FormValidationResult;
+        validate: (callback?: import("./types").FormValidateCallback, props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => import("./types").FormValidationResult;
         validateField: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>, callback?: import("./types").FormValidateCallback) => import("./types").FormValidationResult;
         resetFields: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => void;
         clearValidate: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => void;
@@ -180,7 +180,7 @@ export declare const VftForm: import("vft/es/utils").SFCWithInstall<{
 }>> & Readonly<{
     onValidate?: ((...args: any[]) => any) | undefined;
 }>, {
-    validate: (callback?: import("./types").FormValidateCallback) => import("./types").FormValidationResult;
+    validate: (callback?: import("./types").FormValidateCallback, props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => import("./types").FormValidationResult;
     validateField: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>, callback?: import("./types").FormValidateCallback) => import("./types").FormValidationResult;
     resetFields: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => void;
     clearValidate: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => void;

package/es/components/super-form/types.d.ts

@@ -79,7 +79,7 @@ export interface FormActionType {
     /** 验证指定字段 */
     validateField: (nameList?: NamePath[]) => Promise<any>;
     /** 验证表单 */
-    validate: (nameList?: NamePath[]) => Promise<any>;
+    validate: (callback?: Function, nameList?: NamePath[]) => Promise<any>;
     /** 滚动到指定字段 */
     scrollToField: (name: NamePath, options?: ScrollOptions) => Promise<void>;
     /** 设置表单项错误信息 */

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

@@ -1,20 +1,20 @@
-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 lt, isEmptyObject as st } from "@vft/utils";
+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 rt, cloneDeep as O, uniqBy as ot, isEqual as ct, set as W } from "lodash-es";
+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 ft, FormCompEnum as x, isDatePicker as at } from "../component-map.js";
+import { isInput as ct, FormCompEnum as x, isDatePicker as at } from "../component-map.js";
 import { handleInputNumberValue as ut } from "./helper.js";
 function Q(h, y) {
-  const { show: r, ifShow: c } = h;
+  const { show: s, ifShow: f } = h;
   let p = !0, a = !0;
-  return typeof r == "boolean" ? p = r : typeof r == "function" && (p = r({
+  return typeof s == "boolean" ? p = s : typeof s == "function" && (p = s({
     field: h.field,
     model: y,
     values: {
       ...y
     },
     schema: h
-  })), typeof c == "boolean" ? a = c : typeof c == "function" && (a = c({
+  })), typeof f == "boolean" ? a = f : typeof f == "function" && (a = f({
     field: h.field,
     model: y,
     values: {
@@ -24,11 +24,11 @@ function Q(h, y) {
   })), p && a;
 }
 function dt(h, y = {}) {
-  const r = /^\[(.+)\]$/;
-  if (r.test(h)) {
-    const c = h.match(r);
-    if (c && c[1]) {
-      const p = c[1].split(",");
+  const s = /^\[(.+)\]$/;
+  if (s.test(h)) {
+    const f = h.match(s);
+    if (f && f[1]) {
+      const p = f[1].split(",");
       if (!p.length)
         return;
       const a = [];
@@ -39,11 +39,11 @@ function dt(h, y = {}) {
   }
 }
 function ht(h, y = {}) {
-  const r = /^\{(.+)\}$/;
-  if (r.test(h)) {
-    const c = h.match(r);
-    if (c && c[1]) {
-      const p = c[1].split(",");
+  const s = /^\{(.+)\}$/;
+  if (s.test(h)) {
+    const f = h.match(s);
+    if (f && f[1]) {
+      const p = f[1].split(",");
       if (!p.length)
         return;
       const a = {};
@@ -56,8 +56,8 @@ function ht(h, y = {}) {
 function Dt({
   emit: h,
   getProps: y,
-  formModel: r,
-  getSchema: c,
+  formModel: s,
+  getSchema: f,
   defaultValueRef: p,
   formElRef: a,
   schemaRef: v,
@@ -65,30 +65,30 @@ function Dt({
   initValues: _
 }) {
   async function X(t) {
-    const { resetFunc: i, submitOnReset: s } = n(y);
+    const { resetFunc: i, submitOnReset: l } = n(y);
     i && j(i) && await i();
-    const l = n(a);
-    if (l) {
+    const r = n(a);
+    if (r) {
       if (t?.length)
-        return l.resetFields(t);
-      Object.keys(r).forEach((f) => {
-        const o = n(c).find((u) => u.field === f), e = O(p.value[f]);
-        r[f] = ft(o?.type) ? e || "" : e;
-      }), P(() => B()), h("reset", S(r)), s && await $();
+        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 $();
     }
   }
   async function m(t, i = !0) {
-    const s = n(c).map((e) => e.field).filter(Boolean), l = ".", f = s.filter(
-      (e) => String(e).indexOf(l) >= 0
+    const l = n(f).map((e) => e.field).filter(Boolean), r = ".", c = l.filter(
+      (e) => String(e).indexOf(r) >= 0
     ), o = [];
-    s.forEach((e) => {
-      const u = n(c).find((d) => d.field === e);
-      let b = rt(t, e);
+    l.forEach((e) => {
+      const u = n(f).find((d) => d.field === e);
+      let b = st(t, e);
       const C = Reflect.has(t, e);
       b = ut(u?.type, b);
       const { componentProps: U } = u || {};
       let w = U;
-      typeof U == "function" && (w = w({ formModel: n(r) }));
+      typeof U == "function" && (w = w({ formModel: n(s) }));
       const z = dt(e, t) || ht(e, t);
       if (C || z) {
         const d = z || b;
@@ -97,19 +97,19 @@ function Dt({
             const F = [];
             for (const E of d)
               F.push(E ? J(E) : null);
-            n(r)[e] = F;
+            n(s)[e] = F;
           } else
-            n(r)[e] = d ? w?.valueFormat ? d : J(d) : null;
+            n(s)[e] = d ? w?.valueFormat ? d : J(d) : null;
         else
-          n(r)[e] = d;
+          n(s)[e] = d;
         w?.onChange && w?.onChange(d), o.push(e);
       } else
-        f.forEach((d) => {
+        c.forEach((d) => {
           try {
             const F = d.split(".").reduce((E, et) => E[et], t);
-            G(F) && (n(r)[d] = n(F), o.push(d));
+            G(F) && (n(s)[d] = n(F), o.push(d));
           } catch {
-            G(p.value[d]) && (n(r)[d] = O(
+            G(p.value[d]) && (n(s)[d] = O(
               n(p.value[d])
             ));
           }
@@ -120,33 +120,33 @@ function Dt({
     });
   }
   async function Y(t) {
-    const i = O(n(c));
+    const i = O(n(f));
     if (!t)
       return;
-    let s = A(t) ? [t] : t;
-    A(t) && (s = [t]);
-    for (const l of s)
-      Z(l, i);
+    let l = A(t) ? [t] : t;
+    A(t) && (l = [t]);
+    for (const r of l)
+      Z(r, i);
     v.value = i;
   }
   function Z(t, i) {
     if (A(t)) {
-      const s = i.findIndex((l) => l.field === t);
-      s !== -1 && (delete r[t], i.splice(s, 1));
+      const l = i.findIndex((r) => r.field === t);
+      l !== -1 && (delete s[t], i.splice(l, 1));
     }
   }
-  async function L(t, i, s = !1) {
-    const l = O(n(c)), f = l.findIndex((e) => e.field === i), o = V(t) ? [t] : t;
-    if (!i || f === -1 || s) {
-      s ? l.unshift(...o) : l.push(...o), v.value = l, g(t);
+  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);
       return;
     }
-    f !== -1 && l.splice(f + 1, 0, ...o), g(t), v.value = l;
+    c !== -1 && r.splice(c + 1, 0, ...o), g(t), v.value = r;
   }
   async function K(t) {
     let i = [];
     if (V(t) && i.push(t), I(t) && (i = [...t]), !i.every(
-      (l) => l.type === x.DIVIDER || Reflect.has(l, "field") && l.field
+      (r) => r.type === x.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"
@@ -165,42 +165,43 @@ function Dt({
       );
       return;
     }
-    const l = [], f = [];
-    n(c).forEach((o) => {
+    const r = [], c = [];
+    n(f).forEach((o) => {
       let e;
       if (i.forEach((u) => {
-        o.field === u.field && (e = u), u.defaultValue && u.field && l.push(u.field);
+        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);
-        f.push(u);
+        c.push(u);
       } else
-        f.push(o);
-    }), g(f, l), v.value = ot(f, "field");
+        c.push(o);
+    }), g(c, r), v.value = ot(c, "field");
   }
-  function g(t, i, s = !0) {
+  function g(t, i, l = !0) {
     if (I(i) && i?.length === 0)
       return;
-    let l = [];
-    V(t) && l.push(t), I(t) && (l = [...t]);
-    const f = {}, o = T();
-    l.forEach((e) => {
-      e.type !== x.DIVIDER && Reflect.has(e, "field") && e.field && !H(e.defaultValue) && (!(e.field in o) || H(o[e.field]) || lt(o[e.field])) && (f[e.field] = e.defaultValue);
-    }), st(f) || m(f, s);
+    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);
   }
   function T() {
-    return n(a) ? D(S(n(r))) : {};
+    return n(a) ? D(S(n(s))) : {};
   }
   function k(t) {
-    return n(a) ? S(n(r))[t] : {};
+    return n(a) ? S(n(s))[t] : {};
   }
   function M(t) {
-    return n(c).some((i) => i.field === t ? at(i.type) : !1);
+    return n(f).some((i) => i.field === t ? at(i.type) : !1);
   }
   async function q(t) {
-    return t || (t = n(c).filter((s) => Q(s, n(r))).map((s) => s.field).filter(Boolean)), n(a)?.validateField(t);
+    return t || (t = n(f).filter((l) => Q(l, n(s))).map((l) => l.field).filter(Boolean)), n(a)?.validateField(t);
   }
   async function N(t) {
-    return t || (t = n(c).filter((s) => Q(s, n(r))).map((s) => s.field).filter(Boolean)), await n(a)?.validate(t);
+    return t || (t = n(f).filter((l) => Q(l, n(s))).map((l) => l.field).filter(Boolean)), await n(a)?.validate(() => {
+    }, t);
   }
   async function B(t) {
     await n(a)?.clearValidate(t);
@@ -209,18 +210,21 @@ function Dt({
     await n(a)?.scrollToField(t, i);
   }
   async function $(t) {
-    const { autoCleanErrorMessage: i, watchDataIsChange: s } = n(y);
+    const { autoCleanErrorMessage: i, watchDataIsChange: l } = n(y);
     t && t.preventDefault(), i && await B();
-    const { submitFunc: l, beforeSubmitFunc: f } = n(y);
-    if (f && j(f) && await f(), l && j(l)) {
-      await l();
+    const { submitFunc: r, beforeSubmitFunc: c } = n(y);
+    if (c && j(c) && await c(), r && j(r)) {
+      await r();
       return;
     }
     if (n(a))
       try {
-        const e = await N(), u = D(e);
-        if (s) {
-          const b = ct(_.value, u), C = nt(_.value, u);
+        const e = await N();
+        if (!e)
+          return;
+        const u = D(e);
+        if (l) {
+          const b = ft(_.value, u), C = nt(_.value, u);
           h("submit", u, !b, C);
         } else
           h("submit", u);

package/es/package.json.d.ts

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

package/es/package.json.js

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

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

@@ -7,7 +7,7 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     /**
      * @description Validate the whole form. Receives a callback or returns `Promise`.
      */
-    validate: (callback?: FormValidateCallback) => FormValidationResult;
+    validate: (callback?: FormValidateCallback, props?: Arrayable<FormItemProp>) => FormValidationResult;
     /**
      * @description Validate specified fields.
      */

package/lib/components/form/form.vue2.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("vue");require("@vueuse/core");const E=require("@vft/utils"),d=require("../../utils/error.cjs");require("../config-provider/hooks/use-global-config.cjs");require("lodash-es");const k=require("../../hooks/use-namespace/index.cjs");require("../../hooks/use-model-toggle/index.cjs");require("@popperjs/core");require("../../hooks/use-z-index/index.cjs");const R=require("./constants.cjs"),W=require("./hooks/use-form-common-props.cjs"),u=require("./utils.cjs"),x=r.defineComponent({name:"vft-form"}),M=r.defineComponent({...x,props:{size:{},disabled:{type:Boolean},model:{},rules:{},labelPosition:{default:"right"},requireAsteriskPosition:{default:"left"},labelWidth:{default:""},labelSuffix:{default:""},inline:{type:Boolean},inlineMessage:{type:Boolean},statusIcon:{type:Boolean},showMessage:{type:Boolean,default:!0},validateOnRuleChange:{type:Boolean,default:!0},hideRequiredAsterisk:{type:Boolean,default:!1},scrollToError:{type:Boolean},scrollIntoViewOptions:{type:Boolean,default:!0}},emits:["validate"],setup(o,{expose:y,emit:q}){const g=q,p=r.getCurrentInstance(),c=r.ref(),l=r.reactive([]),w=W.useFormSize(),s=k.useNamespace("form"),B=r.computed(()=>[s.b(),s.m(w.value||"default"),{[s.m(`label-${o.labelPosition}`)]:o.labelPosition,[s.m("inline")]:o.inline}]),m=e=>u.filterFields(l,[e])[0],V=e=>{l.push(e)},C=e=>{e.prop&&l.splice(l.indexOf(e),1)},h=(e=[])=>{if(!o.model){d.debugWarn(s.b(),"model is required for resetFields to work.");return}u.filterFields(l,e).forEach(t=>t.resetField())},v=(e=[])=>{u.filterFields(l,e).forEach(t=>t.clearValidate())},I=r.computed(()=>{const e=!!o.model;return e||d.debugWarn(s.b(),"model is required for validate to work."),e}),O=e=>{if(l.length===0)return[];const t=u.filterFields(l,e);return t.length?t:(d.debugWarn(s.b(),"please pass correct props!"),[])},F=async e=>f(void 0,e),P=async(e=[])=>{if(!I.value)return!1;const t=O(e);if(t.length===0)return!0;let i={};for(const n of t)try{await n.validate(""),n.validateState==="error"&&n.resetField()}catch(a){i={...i,...a}}return Object.keys(i).length===0?!0:Promise.reject(i)},f=async(e=[],t)=>{let i=!1;const n=!E.isFunction(t);try{return i=await P(e),i===!0&&await t?.(i),o.model}catch(a){if(a instanceof Error)throw a;const b=a;return o.scrollToError&&c.value&&c.value.querySelector(`.${s.b()}-item.is-error`)?.scrollIntoView(o.scrollIntoViewOptions),!i&&await t?.(!1,b),n&&Promise.reject(b)}},S=e=>{const t=m(e);t&&t.$el?.scrollIntoView(o.scrollIntoViewOptions)};return r.watch(()=>o.rules,()=>{o.validateOnRuleChange&&F().catch(e=>d.debugWarn(e))},{deep:!0,flush:"post"}),r.provide(R.formContextKey,r.reactive({...r.toRefs(p.props),emit:g,resetFields:h,clearValidate:v,validateField:f,getField:m,addField:V,removeField:C,...u.useFormLabelWidth()})),y({validate:F,validateField:f,resetFields:h,clearValidate:v,scrollToField:S}),(e,t)=>(r.openBlock(),r.createElementBlock("form",{ref_key:"formRef",ref:c,class:r.normalizeClass(B.value)},[r.renderSlot(e.$slots,"default")],2))}});exports.default=M;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("vue");require("@vueuse/core");const E=require("@vft/utils"),d=require("../../utils/error.cjs");require("../config-provider/hooks/use-global-config.cjs");require("lodash-es");const k=require("../../hooks/use-namespace/index.cjs");require("../../hooks/use-model-toggle/index.cjs");require("@popperjs/core");require("../../hooks/use-z-index/index.cjs");const R=require("./constants.cjs"),W=require("./hooks/use-form-common-props.cjs"),u=require("./utils.cjs"),x=r.defineComponent({name:"vft-form"}),M=r.defineComponent({...x,props:{size:{},disabled:{type:Boolean},model:{},rules:{},labelPosition:{default:"right"},requireAsteriskPosition:{default:"left"},labelWidth:{default:""},labelSuffix:{default:""},inline:{type:Boolean},inlineMessage:{type:Boolean},statusIcon:{type:Boolean},showMessage:{type:Boolean,default:!0},validateOnRuleChange:{type:Boolean,default:!0},hideRequiredAsterisk:{type:Boolean,default:!1},scrollToError:{type:Boolean},scrollIntoViewOptions:{type:Boolean,default:!0}},emits:["validate"],setup(o,{expose:y,emit:q}){const g=q,p=r.getCurrentInstance(),c=r.ref(),l=r.reactive([]),w=W.useFormSize(),s=k.useNamespace("form"),B=r.computed(()=>[s.b(),s.m(w.value||"default"),{[s.m(`label-${o.labelPosition}`)]:o.labelPosition,[s.m("inline")]:o.inline}]),m=e=>u.filterFields(l,[e])[0],V=e=>{l.push(e)},C=e=>{e.prop&&l.splice(l.indexOf(e),1)},h=(e=[])=>{if(!o.model){d.debugWarn(s.b(),"model is required for resetFields to work.");return}u.filterFields(l,e).forEach(t=>t.resetField())},v=(e=[])=>{u.filterFields(l,e).forEach(t=>t.clearValidate())},I=r.computed(()=>{const e=!!o.model;return e||d.debugWarn(s.b(),"model is required for validate to work."),e}),O=e=>{if(l.length===0)return[];const t=u.filterFields(l,e);return t.length?t:(d.debugWarn(s.b(),"please pass correct props!"),[])},F=async(e,t)=>f(t||void 0,e),P=async(e=[])=>{if(!I.value)return!1;const t=O(e);if(t.length===0)return!0;let i={};for(const a of t)try{await a.validate(""),a.validateState==="error"&&a.resetField()}catch(n){i={...i,...n}}return Object.keys(i).length===0?!0:Promise.reject(i)},f=async(e=[],t)=>{let i=!1;const a=!E.isFunction(t);try{return i=await P(e),i===!0&&await t?.(i),o.model}catch(n){if(n instanceof Error)throw n;const b=n;return o.scrollToError&&c.value&&c.value.querySelector(`.${s.b()}-item.is-error`)?.scrollIntoView(o.scrollIntoViewOptions),console.error(n),!i&&await t?.(!1,b),a&&Promise.reject(b)}},S=e=>{const t=m(e);t&&t.$el?.scrollIntoView(o.scrollIntoViewOptions)};return r.watch(()=>o.rules,()=>{o.validateOnRuleChange&&F().catch(e=>d.debugWarn(e))},{deep:!0,flush:"post"}),r.provide(R.formContextKey,r.reactive({...r.toRefs(p.props),emit:g,resetFields:h,clearValidate:v,validateField:f,getField:m,addField:V,removeField:C,...u.useFormLabelWidth()})),y({validate:F,validateField:f,resetFields:h,clearValidate:v,scrollToField:S}),(e,t)=>(r.openBlock(),r.createElementBlock("form",{ref_key:"formRef",ref:c,class:r.normalizeClass(B.value)},[r.renderSlot(e.$slots,"default")],2))}});exports.default=M;

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

@@ -53,7 +53,7 @@ export declare const VftForm: import("vft/es/utils").SFCWithInstall<{
     }>> & Readonly<{
         onValidate?: ((...args: any[]) => any) | undefined;
     }>, {
-        validate: (callback?: import("./types").FormValidateCallback) => import("./types").FormValidationResult;
+        validate: (callback?: import("./types").FormValidateCallback, props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => import("./types").FormValidationResult;
         validateField: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>, callback?: import("./types").FormValidateCallback) => import("./types").FormValidationResult;
         resetFields: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => void;
         clearValidate: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => void;
@@ -119,7 +119,7 @@ export declare const VftForm: import("vft/es/utils").SFCWithInstall<{
     }>> & Readonly<{
         onValidate?: ((...args: any[]) => any) | undefined;
     }>, {
-        validate: (callback?: import("./types").FormValidateCallback) => import("./types").FormValidationResult;
+        validate: (callback?: import("./types").FormValidateCallback, props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => import("./types").FormValidationResult;
         validateField: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>, callback?: import("./types").FormValidateCallback) => import("./types").FormValidationResult;
         resetFields: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => void;
         clearValidate: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => void;
@@ -180,7 +180,7 @@ export declare const VftForm: import("vft/es/utils").SFCWithInstall<{
 }>> & Readonly<{
     onValidate?: ((...args: any[]) => any) | undefined;
 }>, {
-    validate: (callback?: import("./types").FormValidateCallback) => import("./types").FormValidationResult;
+    validate: (callback?: import("./types").FormValidateCallback, props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => import("./types").FormValidationResult;
     validateField: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>, callback?: import("./types").FormValidateCallback) => import("./types").FormValidationResult;
     resetFields: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => void;
     clearValidate: (props?: import("vft/es/utils").Arrayable<import("./types").FormItemProp>) => void;

package/lib/components/super-form/types.d.ts

@@ -79,7 +79,7 @@ export interface FormActionType {
     /** 验证指定字段 */
     validateField: (nameList?: NamePath[]) => Promise<any>;
     /** 验证表单 */
-    validate: (nameList?: NamePath[]) => Promise<any>;
+    validate: (callback?: Function, nameList?: NamePath[]) => Promise<any>;
     /** 滚动到指定字段 */
     scrollToField: (name: NamePath, options?: ScrollOptions) => Promise<void>;
     /** 设置表单项错误信息 */

package/lib/components/super-form/use/use-form-events.cjs

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

package/lib/package.json.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e="0.0.340";exports.version=e;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e="0.0.342";exports.version=e;

package/lib/package.json.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vft",
-  "version": "0.0.340",
+  "version": "0.0.342",
   "license": "MIT",
   "main": "lib/index.cjs",
   "module": "es/index.js",
@@ -56,10 +56,10 @@
     "sortablejs": "1.15.0",
     "photoswipe": "5.4.4",
     "@vft/router": "0.0.65",
-    "@vft/constants": "0.0.72",
     "@vft/store": "0.0.54",
-    "@vft/use": "0.0.76",
+    "@vft/constants": "0.0.72",
     "@vft/utils": "0.0.128",
+    "@vft/use": "0.0.76",
     "@vft/directives": "0.0.33"
   },
   "vetur": {

package/web-types.json

@@ -1 +1 @@
-{"$schema":"http://json.schemastore.org/web-types","framework":"vue","name":"vft","version":"0.0.340","js-types-syntax":"typescript","description-markup":"markdown","contributions":{"html":{}}}
+{"$schema":"http://json.schemastore.org/web-types","framework":"vue","name":"vft","version":"0.0.342","js-types-syntax":"typescript","description-markup":"markdown","contributions":{"html":{}}}