vft 0.0.239 → 0.0.240

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

@@ -1,20 +1,20 @@
-import { defineComponent as v, computed as h, watch as O, getCurrentInstance as j, provide as q, reactive as z, createElementBlock as S, openBlock as T, normalizeClass as I, renderSlot as M } from "vue";
+import { defineComponent as v, computed as h, watch as x, getCurrentInstance as O, provide as j, reactive as q, createElementBlock as z, openBlock as S, normalizeClass as T, renderSlot as I } from "vue";
 import "@vueuse/core";
-import { isFunction as R } from "@vft/utils";
-import { debugWarn as a } from "../../utils/error.js";
+import { isFunction as M } from "@vft/utils";
+import { debugWarn as n } from "../../utils/error.js";
 import "../../utils/ns-cover.js";
 import "lodash-es";
-import { useNamespace as W } from "../../hooks/use-namespace/index.js";
+import { useNamespace as R } from "../../hooks/use-namespace/index.js";
 import "../../hooks/use-model-toggle/index.js";
 import "@popperjs/core";
 import "../../hooks/use-z-index/index.js";
-import { formContextKey as $ } from "./constants.js";
-import { useFormSize as A } from "./hooks/use-form-common-props.js";
-import { useFormLabelWidth as K, filterFields as d } from "./utils.js";
-const L = v({
+import { formContextKey as W } from "./constants.js";
+import { useFormSize as $ } from "./hooks/use-form-common-props.js";
+import { useFormLabelWidth as A, filterFields as d } from "./utils.js";
+const K = v({
   name: "vft-form"
 }), te = /* @__PURE__ */ v({
-  ...L,
+  ...K,
   props: {
     size: {},
     disabled: { type: Boolean },
@@ -33,108 +33,107 @@ const L = v({
     scrollToError: { type: Boolean }
   },
   emits: ["validate"],
-  setup(o, { expose: y, emit: F }) {
-    const g = F, n = W("form"), i = [], B = A(), w = h(() => [
-      n.b(),
-      n.m(B.value || "default"),
+  setup(o, { expose: y, emit: b }) {
+    const F = b, l = R("form"), r = [], g = $(), B = h(() => [
+      l.b(),
+      l.m(g.value || "default"),
       {
-        [n.m(`label-${o.labelPosition}`)]: o.labelPosition,
-        [n.m("inline")]: o.inline
+        [l.m(`label-${o.labelPosition}`)]: o.labelPosition,
+        [l.m("inline")]: o.inline
       }
-    ]), b = (e) => {
-      i.push(e);
+    ]), w = (e) => {
+      r.push(e);
     }, C = (e) => {
-      e.prop && i.splice(i.indexOf(e), 1);
-    }, u = (e = []) => {
+      e.prop && r.splice(r.indexOf(e), 1);
+    }, f = (e = []) => {
       if (!o.model) {
-        a(n.b(), "model is required for resetFields to work.");
+        n(l.b(), "model is required for resetFields to work.");
         return;
       }
-      d(i, e).forEach((t) => t.resetField());
-    }, m = (e = []) => {
-      d(i, e).forEach((t) => t.clearValidate());
+      d(r, e).forEach((t) => t.resetField());
+    }, u = (e = []) => {
+      d(r, e).forEach((t) => t.clearValidate());
     }, E = h(() => {
       const e = !!o.model;
-      return e || a(n.b(), "model is required for validate to work."), e;
-    }), P = (e) => {
-      if (i.length === 0) return [];
-      const t = d(i, e);
-      return t.length ? t : (a(n.b(), "please pass correct props!"), []);
-    }, c = async (e) => f(void 0, e), V = async (e = []) => {
+      return e || n(l.b(), "model is required for validate to work."), e;
+    }), k = (e) => {
+      if (r.length === 0) return [];
+      const t = d(r, e);
+      return t.length ? t : (n(l.b(), "please pass correct props!"), []);
+    }, m = async (e) => c(void 0, e), P = async (e = []) => {
       if (!E.value) return !1;
-      const t = P(e);
+      const t = k(e);
       if (t.length === 0) return !0;
-      let r = {};
-      for (const s of t)
+      let s = {};
+      for (const i of t)
         try {
-          await s.validate("");
-        } catch (l) {
-          r = {
-            ...r,
-            ...l
+          await i.validate("");
+        } catch (a) {
+          s = {
+            ...s,
+            ...a
           };
         }
-      return Object.keys(r).length === 0 ? !0 : Promise.reject(r);
-    }, f = async (e = [], t) => {
-      const r = !R(t);
+      return Object.keys(s).length === 0 ? !0 : Promise.reject(s);
+    }, c = async (e = [], t) => {
+      const s = !M(t);
       try {
-        const s = await V(e);
-        return s === !0 && (t == null || t(s)), o.model;
-      } catch (s) {
-        if (s instanceof Error) throw s;
-        const l = s;
-        return o.scrollToError && p(Object.keys(l)[0]), t == null || t(!1, l), r && Promise.reject(l);
+        const i = await P(e);
+        return i === !0 && t?.(i), o.model;
+      } catch (i) {
+        if (i instanceof Error) throw i;
+        const a = i;
+        return o.scrollToError && p(Object.keys(a)[0]), t?.(!1, a), s && Promise.reject(a);
       }
     }, p = (e) => {
-      var r;
-      const t = d(i, e)[0];
-      t && ((r = t.$el) == null || r.scrollIntoView());
+      const t = d(r, e)[0];
+      t && t.$el?.scrollIntoView();
     };
-    O(
+    x(
       () => o.rules,
       () => {
-        o.validateOnRuleChange && c().catch((e) => a(e));
+        o.validateOnRuleChange && m().catch((e) => n(e));
       },
       { deep: !0 }
     );
-    const x = j();
-    return q(
-      $,
-      z({
-        ...x.props,
-        emit: g,
-        resetFields: u,
-        clearValidate: m,
-        validateField: f,
-        addField: b,
+    const V = O();
+    return j(
+      W,
+      q({
+        ...V.props,
+        emit: F,
+        resetFields: f,
+        clearValidate: u,
+        validateField: c,
+        addField: w,
         removeField: C,
-        ...K()
+        ...A()
       })
     ), y({
       /**
        * @description Validate the whole form. Receives a callback or returns `Promise`.
        */
-      validate: c,
+      validate: m,
       /**
        * @description Validate specified fields.
        */
-      validateField: f,
+      validateField: c,
       /**
        * @description Reset specified fields and remove validation result.
        */
-      resetFields: u,
+      resetFields: f,
       /**
        * @description Clear validation message for specified fields.
        */
-      clearValidate: m,
+      clearValidate: u,
       /**
        * @description Scroll to the specified fields.
        */
       scrollToField: p
-    }), (e, t) => (T(), S("form", {
-      class: I(w.value)
+    }), (e, t) => (S(), z("form", {
+      class: T(B.value)
     }, [
-      M(e.$slots, "default")
+      I(e.$slots, "default")
     ], 2));
   }
 });

package/es/components/form/hooks/use-form-common-props.d.ts

@@ -1,6 +1,6 @@
 import type { ComponentSize } from 'vft/es/constants';
 import type { MaybeRef } from '@vueuse/core';
-export declare const useFormSize: (fallback?: MaybeRef<ComponentSize | undefined>, ignore?: Partial<Record<'prop' | 'form' | 'formItem' | 'global', boolean>>) => import("vue").ComputedRef<"" | "default" | "small" | "large">;
+export declare const useFormSize: (fallback?: MaybeRef<ComponentSize | undefined>, ignore?: Partial<Record<"prop" | "form" | "formItem" | "global", boolean>>) => import("vue").ComputedRef<"" | "default" | "small" | "large">;
 export declare const useFormDisabled: (fallback?: MaybeRef<boolean | undefined>) => import("vue").ComputedRef<boolean>;
-export declare const useSize: (fallback?: MaybeRef<ComponentSize | undefined>, ignore?: Partial<Record<'prop' | 'form' | 'formItem' | 'global', boolean>>) => import("vue").ComputedRef<"" | "default" | "small" | "large">;
+export declare const useSize: (fallback?: MaybeRef<ComponentSize | undefined>, ignore?: Partial<Record<"prop" | "form" | "formItem" | "global", boolean>>) => import("vue").ComputedRef<"" | "default" | "small" | "large">;
 export declare const useDisabled: (fallback?: MaybeRef<boolean | undefined>) => import("vue").ComputedRef<boolean>;

package/es/components/form/hooks/use-form-common-props.js

@@ -2,23 +2,23 @@ import "@vueuse/core";
 import "@vft/utils";
 import "../../../utils/ns-cover.js";
 import "lodash-es";
-import { ref as u, inject as r, computed as m, unref as p } from "vue";
+import { ref as c, inject as i, computed as r, unref as m } from "vue";
 import "../../config-provider/hooks/use-global-config.js";
 import "../../../hooks/use-model-toggle/index.js";
 import "@popperjs/core";
-import { useGlobalSize as a } from "../../../hooks/use-size/index.js";
+import { useGlobalSize as u } from "../../../hooks/use-size/index.js";
 import "../../../hooks/use-z-index/index.js";
-import { useProp as d } from "@vft/use";
-import { formContextKey as l, formItemContextKey as f } from "../constants.js";
+import { useProp as s } from "@vft/use";
+import { formContextKey as p, formItemContextKey as a } from "../constants.js";
 const v = (t, o = {}) => {
-  const e = u(void 0), n = o.prop ? e : d("size"), c = o.global ? e : a(), i = o.form ? { size: void 0 } : r(l, void 0), s = o.formItem ? { size: void 0 } : r(f, void 0);
-  return m(
-    () => n.value || p(t) || (s == null ? void 0 : s.size) || (i == null ? void 0 : i.size) || c.value || ""
+  const e = c(void 0), f = o.prop ? e : s("size"), d = o.global ? e : u(), l = o.form ? { size: void 0 } : i(p, void 0), n = o.formItem ? { size: void 0 } : i(a, void 0);
+  return r(
+    () => f.value || m(t) || n?.size || l?.size || d.value || ""
   );
 }, z = (t) => {
-  const o = d("disabled"), e = r(l, void 0);
-  return m(
-    () => o.value || p(t) || (e == null ? void 0 : e.disabled) || !1
+  const o = s("disabled"), e = i(p, void 0);
+  return r(
+    () => o.value || m(t) || e?.disabled || !1
   );
 }, R = v, g = z;
 export {

package/es/components/form/hooks/use-form-item.d.ts

@@ -9,10 +9,10 @@ export type IUseFormItemInputCommonProps = {
     label?: string | number | boolean | Record<string, any>;
 };
 export declare const useFormItemInputId: (props: Partial<IUseFormItemInputCommonProps>, { formItemContext, disableIdGeneration, disableIdManagement, }: {
-    formItemContext?: FormItemContext | undefined;
-    disableIdGeneration?: ComputedRef<boolean> | Ref<boolean> | undefined;
-    disableIdManagement?: ComputedRef<boolean> | Ref<boolean> | undefined;
+    formItemContext?: FormItemContext;
+    disableIdGeneration?: ComputedRef<boolean> | Ref<boolean>;
+    disableIdManagement?: ComputedRef<boolean> | Ref<boolean>;
 }) => {
     isLabeledByFormItem: ComputedRef<boolean>;
-    inputId: Ref<string | undefined>;
+    inputId: Ref<string | undefined, string | undefined>;
 };

package/es/components/form/hooks/use-form-item.js

@@ -2,48 +2,45 @@ import "@vueuse/core";
 import "@vft/utils";
 import "../../../utils/ns-cover.js";
 import "lodash-es";
-import { inject as h, ref as l, computed as y, onMounted as F, watch as f, toRef as K, onUnmounted as U } from "vue";
-import { useId as j } from "../../../hooks/use-id/index.js";
+import { inject as d, ref as m, computed as f, onMounted as l, watch as I, toRef as s, onUnmounted as a } from "vue";
+import { useId as h } from "../../../hooks/use-id/index.js";
 import "../../config-provider/hooks/use-global-config.js";
 import "../../../hooks/use-model-toggle/index.js";
 import "@popperjs/core";
 import "../../../hooks/use-z-index/index.js";
-import { formContextKey as B, formItemContextKey as L } from "../constants.js";
-const P = () => {
-  const v = h(B, void 0), u = h(L, void 0);
+import { formContextKey as w, formItemContextKey as y } from "../constants.js";
+const D = () => {
+  const t = d(w, void 0), o = d(y, void 0);
   return {
-    form: v,
-    formItem: u
+    form: t,
+    formItem: o
   };
-}, Q = (v, {
-  formItemContext: u,
-  disableIdGeneration: o,
-  disableIdManagement: i
+}, E = (t, {
+  formItemContext: o,
+  disableIdGeneration: i,
+  disableIdManagement: e
 }) => {
-  o || (o = l(!1)), i || (i = l(!1));
-  const p = l();
-  let d;
-  const w = y(() => {
-    var r;
-    return !!(!v.label && u && u.inputIds && ((r = u.inputIds) == null ? void 0 : r.length) <= 1);
-  });
-  return F(() => {
-    d = f(
-      [K(v, "id"), o],
-      ([r, s]) => {
-        const c = r ?? (s ? void 0 : j().value);
-        c !== p.value && (u != null && u.removeInputId && (p.value && u.removeInputId(p.value), !(i != null && i.value) && !s && c && u.addInputId(c)), p.value = c);
+  i || (i = m(!1)), e || (e = m(!1));
+  const u = m();
+  let p;
+  const n = f(() => !!(!t.label && o && o.inputIds && o.inputIds?.length <= 1));
+  return l(() => {
+    p = I(
+      [s(t, "id"), i],
+      ([c, v]) => {
+        const r = c ?? (v ? void 0 : h().value);
+        r !== u.value && (o?.removeInputId && (u.value && o.removeInputId(u.value), !e?.value && !v && r && o.addInputId(r)), u.value = r);
       },
       { immediate: !0 }
     );
-  }), U(() => {
-    d && d(), u != null && u.removeInputId && p.value && u.removeInputId(p.value);
+  }), a(() => {
+    p && p(), o?.removeInputId && u.value && o.removeInputId(u.value);
   }), {
-    isLabeledByFormItem: w,
-    inputId: p
+    isLabeledByFormItem: n,
+    inputId: u
   };
 };
 export {
-  P as useFormItem,
-  Q as useFormItemInputId
+  D as useFormItem,
+  E as useFormItemInputId
 };