vft 0.0.294 → 0.0.296

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

@@ -30,9 +30,6 @@ export declare const VftButton: import("vft/es/utils").SFCWithInstall<{
         dark: {
             type: import("vue").PropType<boolean>;
         };
-        bg: {
-            type: import("vue").PropType<boolean>;
-        };
         loading: {
             type: import("vue").PropType<boolean>;
         };
@@ -56,6 +53,9 @@ export declare const VftButton: import("vft/es/utils").SFCWithInstall<{
         loadingIcon: {
             type: import("vue").PropType<import("vft/es/vft").IconProps>;
         };
+        bg: {
+            type: import("vue").PropType<boolean>;
+        };
         autoInsertSpace: {
             type: import("vue").PropType<boolean>;
         };
@@ -120,9 +120,6 @@ export declare const VftButton: import("vft/es/utils").SFCWithInstall<{
         dark: {
             type: import("vue").PropType<boolean>;
         };
-        bg: {
-            type: import("vue").PropType<boolean>;
-        };
         loading: {
             type: import("vue").PropType<boolean>;
         };
@@ -146,6 +143,9 @@ export declare const VftButton: import("vft/es/utils").SFCWithInstall<{
         loadingIcon: {
             type: import("vue").PropType<import("vft/es/vft").IconProps>;
         };
+        bg: {
+            type: import("vue").PropType<boolean>;
+        };
         autoInsertSpace: {
             type: import("vue").PropType<boolean>;
         };
@@ -205,9 +205,6 @@ export declare const VftButton: import("vft/es/utils").SFCWithInstall<{
     dark: {
         type: import("vue").PropType<boolean>;
     };
-    bg: {
-        type: import("vue").PropType<boolean>;
-    };
     loading: {
         type: import("vue").PropType<boolean>;
     };
@@ -231,6 +228,9 @@ export declare const VftButton: import("vft/es/utils").SFCWithInstall<{
     loadingIcon: {
         type: import("vue").PropType<import("vft/es/vft").IconProps>;
     };
+    bg: {
+        type: import("vue").PropType<boolean>;
+    };
     autoInsertSpace: {
         type: import("vue").PropType<boolean>;
     };

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

@@ -53,8 +53,8 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     effect: "light" | "dark";
     tabindex: number | string;
     trigger: import("vft/es/components/tooltip").TooltipTriggerType;
-    loop: boolean;
     teleported: boolean;
+    loop: boolean;
     popperClass: string;
     showTimeout: number;
     hideTimeout: number;

package/es/components/menu/menu-item.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent as E, getCurrentInstance as F, useAttrs as O, inject as N, computed as a, reactive as q, onMounted as G, onBeforeUnmount as H, createElementBlock as k, openBlock as o, Fragment as b, createBlock as s, createCommentVNode as m, createElementVNode as p, unref as n, normalizeClass as M, withCtx as $, renderSlot as y, normalizeProps as I, mergeProps as V, createVNode as J } from "vue";
+import { defineComponent as E, getCurrentInstance as F, useAttrs as O, inject as N, computed as a, reactive as q, onMounted as G, onBeforeUnmount as H, createElementBlock as p, openBlock as o, Fragment as k, createBlock as l, createCommentVNode as m, createElementVNode as b, unref as e, normalizeClass as M, withCtx as $, renderSlot as y, normalizeProps as I, mergeProps as V, createVNode as J } from "vue";
 import { singleAttrToObj as K, renderTNode as L, VNode as Q } from "@vft/utils";
 import { VftIcon as h } from "../icon/index.js";
 import { VftDivider as j } from "../divider/index.js";
@@ -30,41 +30,41 @@ const X = ["title"], Y = E({
     reverse: { type: Boolean }
   },
   emits: ["click", "mouseenter", "mouseleave"],
-  setup(e, { emit: S }) {
-    const d = A("menu-item"), c = S, g = F(), T = O(), w = A("menu"), f = A("menu-item"), i = e.isAloneUse ? null : N("rootMenu");
-    !i && !e.isAloneUse && P(d.b(), "can not inject root menu");
+  setup(t, { emit: S }) {
+    const d = A("menu-item"), c = S, g = F(), T = O(), w = A("menu"), f = A("menu-item"), i = t.isAloneUse ? null : N("rootMenu");
+    !i && !t.isAloneUse && P(d.b(), "can not inject root menu");
     const { parentMenu: U, indexPath: B } = W(
       g,
-      a(() => e.index)
-    ), v = e.isAloneUse ? null : N(`subMenu:${U.value.uid}`);
-    !v && !e.isAloneUse && P(d.b(), "can not inject sub menu");
-    const C = a(() => e.index === i?.activeIndex), l = q({
-      index: e.index,
+      a(() => t.index)
+    ), v = t.isAloneUse ? null : N(`subMenu:${U.value.uid}`);
+    !v && !t.isAloneUse && P(d.b(), "can not inject sub menu");
+    const C = a(() => t.index === i?.activeIndex), s = q({
+      index: t.index,
       indexPath: B,
       active: C
     }), x = () => {
-      e.disabled || (i?.handleMenuItemClick({
+      t.disabled || (i?.handleMenuItemClick({
         ...T,
-        index: e.index,
+        index: t.index,
         indexPath: B.value,
-        route: e.route
-      }), c("click", l));
-    }, r = a(() => K(e.icon, "icon")), z = a(() => L(g, "title"));
+        route: t.route
+      }), c("click", s));
+    }, r = a(() => K(t.icon, "icon")), z = a(() => L(g, "title"));
     return G(() => {
-      e.isAloneUse || (v?.addSubMenu(l), i?.addMenuItem(l));
+      t.isAloneUse || (v?.addSubMenu(s), i?.addMenuItem(s));
     }), H(() => {
-      e.isAloneUse || (v?.removeSubMenu(l), i?.removeMenuItem(l));
-    }), (t, u) => (o(), k(b, null, [
-      t.reverse && t.divider ? (o(), s(n(j), {
+      t.isAloneUse || (v?.removeSubMenu(s), i?.removeMenuItem(s));
+    }), (n, u) => (o(), p(k, null, [
+      n.reverse && n.divider ? (o(), l(e(j), {
         key: 0,
         "margin-y": "0"
       })) : m("", !0),
-      p("li", {
+      b("li", {
         class: M([
-          t.className,
-          n(f).b(),
-          n(f).is("active", t.isAloneUse ? !1 : C.value),
-          n(f).is("disabled", t.disabled)
+          n.className,
+          e(f).b(),
+          e(f).is("active", n.isAloneUse ? !1 : C.value),
+          e(f).is("disabled", n.disabled)
         ]),
         onMouseenter: u[0] || (u[0] = (D) => c("mouseenter")),
         onMouseleave: u[1] || (u[1] = (D) => c("mouseleave")),
@@ -72,37 +72,37 @@ const X = ["title"], Y = E({
         tabindex: "-1",
         onClick: x
       }, [
-        n(U)?.type?.name === "vft-menu" && n(i)?.props.collapse && t.$slots.title ? (o(), s(n(R), {
+        e(U)?.type?.name === "vft-menu" && e(i)?.props.collapse && n.$slots.title ? (o(), l(e(R), {
           key: 0,
           placement: "right",
           "fallback-placements": ["left"],
-          persistent: ""
+          persistent: e(i).props.persistent
         }, {
           content: $(() => [
-            y(t.$slots, "title")
+            y(n.$slots, "title")
           ]),
           default: $(() => [
-            p("div", {
-              class: M(n(w).be("tooltip", "trigger"))
+            b("div", {
+              class: M(e(w).be("tooltip", "trigger"))
             }, [
-              r.value?.icon ? (o(), s(n(h), I(V({ key: 0 }, r.value)), null, 16)) : m("", !0),
-              y(t.$slots, "default")
+              r.value?.icon ? (o(), l(e(h), I(V({ key: 0 }, r.value)), null, 16)) : m("", !0),
+              y(n.$slots, "default")
             ], 2)
           ]),
           _: 3
-        })) : (o(), k(b, { key: 1 }, [
-          t.$slots?.default ? y(t.$slots, "default", { key: 0 }) : (o(), k(b, { key: 1 }, [
-            r.value?.icon ? (o(), s(n(h), I(V({ key: 0 }, r.value)), null, 16)) : m("", !0),
-            p("span", {
-              class: M(n(d).e("text")),
-              title: t.title
+        }, 8, ["persistent"])) : (o(), p(k, { key: 1 }, [
+          n.$slots?.default ? y(n.$slots, "default", { key: 0 }) : (o(), p(k, { key: 1 }, [
+            r.value?.icon ? (o(), l(e(h), I(V({ key: 0 }, r.value)), null, 16)) : m("", !0),
+            b("span", {
+              class: M(e(d).e("text")),
+              title: n.title
             }, [
-              J(n(Q), { content: z.value }, null, 8, ["content"])
+              J(e(Q), { content: z.value }, null, 8, ["content"])
             ], 10, X)
           ], 64))
         ], 64))
       ], 34),
-      !t.reverse && t.divider ? (o(), s(n(j), {
+      !n.reverse && n.divider ? (o(), l(e(j), {
         key: 1,
         "margin-y": "0"
       })) : m("", !0)

package/es/components/menu/menu.vue2.js

@@ -28,7 +28,7 @@ const de = A({
     collapseTransition: { type: Boolean, default: !0 },
     ellipsis: { type: Boolean, default: !0 },
     horizontalMenuProps: {},
-    persistent: { type: Boolean }
+    persistent: { type: Boolean, default: !0 }
   },
   emits: ["update:collapse", "sub-menu-click", "select", "close", "open"],
   setup(n, { expose: E, emit: W }) {

package/es/components/menu/sub-menu.vue2.js

@@ -1,8 +1,8 @@
-import { defineComponent as Z, getCurrentInstance as ne, computed as l, inject as D, ref as C, reactive as le, watch as ue, provide as ae, onMounted as se, onBeforeUnmount as re, useSlots as ie, h as s, Fragment as ce, withDirectives as de, vShow as me } from "vue";
-import { singleAttrToObj as g, renderTNode as pe, isMobile as ve } from "@vft/utils";
-import { VftTooltip as fe } from "../tooltip/index.js";
+import { defineComponent as Z, getCurrentInstance as le, computed as l, inject as D, ref as C, reactive as ue, watch as ae, provide as se, onMounted as re, onBeforeUnmount as ie, useSlots as ce, h as s, Fragment as pe, withDirectives as de, vShow as me } from "vue";
+import { singleAttrToObj as g, renderTNode as ve, isMobile as fe } from "@vft/utils";
+import { VftTooltip as Me } from "../tooltip/index.js";
 import { VftIcon as L } from "../icon/index.js";
-import { VftCollapseTransition as Me } from "../collapse-transition/index.js";
+import { VftCollapseTransition as be } from "../collapse-transition/index.js";
 import { useTimeoutFn as H } from "@vueuse/core";
 import { throwError as U } from "../../utils/error.js";
 import "../../utils/ns-cover.js";
@@ -11,13 +11,13 @@ import { useNamespace as w } from "../../hooks/use-namespace/index.js";
 import "../../hooks/use-model-toggle/index.js";
 import "@popperjs/core";
 import "../../hooks/use-z-index/index.js";
-import be from "./use-menu.js";
-import { useMenuCssVar as he } from "./use-menu-css-var.js";
-const Te = Z({
+import he from "./use-menu.js";
+import { useMenuCssVar as Te } from "./use-menu-css-var.js";
+const Ce = Z({
   name: "vft-sub-menu",
   inheritAttrs: !1
-}), $e = /* @__PURE__ */ Z({
-  ...Te,
+}), Oe = /* @__PURE__ */ Z({
+  ...Ce,
   props: {
     index: {},
     showTimeout: {
@@ -56,39 +56,39 @@ const Te = Z({
     expose: q,
     emit: G
   }) {
-    const y = w("sub-menu"), I = G, m = ne(), {
+    const y = w("sub-menu"), I = G, d = le(), {
       indexPath: f,
       parentMenu: k
-    } = be(m, l(() => o.index)), i = w("menu"), u = w("sub-menu"), e = D("rootMenu");
+    } = he(d, l(() => o.index)), i = w("menu"), u = w("sub-menu"), e = D("rootMenu");
     e || U(y.b(), "can not inject root menu");
     const r = D(`subMenu:${k.value.uid}`);
     r || U(y.b(), "can not inject sub menu");
     const S = C({});
     let M;
-    const z = C(!1), J = C(), E = C(null), A = l(() => d.value === "horizontal" && b.value ? "bottom-start" : "right-start"), b = l(() => r.level === 0), x = l(() => o.teleported === void 0 ? b.value : o.teleported), K = l(() => e.props.collapse ? `${i.namespace.value}-zoom-in-left` : `${i.namespace.value}-zoom-in-top`), Q = l(() => d.value === "horizontal" && b.value ? ["bottom-start", "bottom-end", "top-start", "top-end", "right-start", "left-start"] : ["right-start", "left-start", "bottom-start", "bottom-end", "top-start", "top-end"]), c = l(() => e.openedMenus.includes(o.index)), p = l(() => {
+    const z = C(!1), J = C(), E = C(null), A = l(() => p.value === "horizontal" && b.value ? "bottom-start" : "right-start"), b = l(() => r.level === 0), x = l(() => o.teleported === void 0 ? b.value : o.teleported), K = l(() => e.props.collapse ? `${i.namespace.value}-zoom-in-left` : `${i.namespace.value}-zoom-in-top`), Q = l(() => p.value === "horizontal" && b.value ? ["bottom-start", "bottom-end", "top-start", "top-end", "right-start", "left-start"] : ["right-start", "left-start", "bottom-start", "bottom-end", "top-start", "top-end"]), c = l(() => e.openedMenus.includes(o.index)), m = l(() => {
       let t = !1;
       return Object.values(S.value).forEach((a) => {
         a.active && (t = !0);
       }), o.index === e.activeIndex && (t = !0), t;
-    }), B = l(() => e.props.backgroundColor || ""), P = l(() => e.props.activeTextColor || ""), F = l(() => e.props.textColor || ""), d = l(() => e.props.mode), h = le({
+    }), B = l(() => e.props.backgroundColor || ""), P = l(() => e.props.activeTextColor || ""), F = l(() => e.props.textColor || ""), p = l(() => e.props.mode), W = l(() => e.props.persistent), h = ue({
       index: o.index,
       indexPath: f,
-      active: p
-    }), j = he(e.props, r.level + 1), $ = l(() => d.value !== "horizontal" ? {
+      active: m
+    }), j = Te(e.props, r.level + 1), $ = l(() => p.value !== "horizontal" ? {
       color: F.value
     } : {
-      borderBottomColor: p.value ? e.props.activeTextColor ? P.value : "" : "transparent",
-      color: p.value ? P.value : F.value
-    }), W = () => E.value?.popperRef?.popperInstanceRef?.destroy(), X = (t) => {
-      t || W();
+      borderBottomColor: m.value ? e.props.activeTextColor ? P.value : "" : "transparent",
+      color: m.value ? P.value : F.value
+    }), X = () => E.value?.popperRef?.popperInstanceRef?.destroy(), Y = (t) => {
+      t || X();
     }, O = (t) => {
       const a = {
         e: t,
         index: o.index,
         indexPath: f.value,
-        active: p.value
+        active: m.value
       };
-      if (e.props.menuTrigger === "hover" && e.props.mode === "horizontal" && !ve() || e.props.collapse && e.props.mode === "vertical" || o.disabled) {
+      if (e.props.menuTrigger === "hover" && e.props.mode === "horizontal" && !fe() || e.props.collapse && e.props.mode === "vertical" || o.disabled) {
         e.handleSubMenuClick({
           ...a,
           isFirstLevel: !0
@@ -102,11 +102,11 @@ const Te = Z({
       } = H(() => {
         e.openMenu(o.index, f.value);
       }, a), x.value && k.value.vnode.el?.dispatchEvent(new MouseEvent("mouseenter")), I("mouseenter", t)));
-    }, Y = () => {
+    }, _ = () => {
       e.inSubMenuMouseEnterTimer && clearTimeout(e.inSubMenuMouseEnterTimer), e.inSubMenuMouseleaveTimer && clearTimeout(e.inSubMenuMouseleaveTimer), e.inSubMenuMouseEnterTimer = setTimeout(() => {
         e.inSubMenu = !0;
       }, o.showTimeout + 10);
-    }, _ = () => {
+    }, ee = () => {
       e.inSubMenuMouseEnterTimer && clearTimeout(e.inSubMenuMouseEnterTimer), e.inSubMenuMouseleaveTimer && clearTimeout(e.inSubMenuMouseleaveTimer), e.inSubMenuMouseleaveTimer = setTimeout(() => {
         e.inSubMenu = !1;
       }, o.hideTimeout - 10);
@@ -115,16 +115,16 @@ const Te = Z({
         stop: M
       } = H(() => {
         !z.value && e.closeMenu(o.index, f.value);
-      }, o.hideTimeout), x.value && a && m.parent?.type.name === "vft-sub-menu" && r.handleMouseleave?.(t, !0), I("mouseleave", t));
+      }, o.hideTimeout), x.value && a && d.parent?.type.name === "vft-sub-menu" && r.handleMouseleave?.(t, !0), I("mouseleave", t));
     };
-    ue(() => e.props.collapse, (t) => X(!!t));
+    ae(() => e.props.collapse, (t) => Y(!!t));
     {
       const t = (n) => {
         S.value[n.index] = n;
       }, a = (n) => {
         delete S.value[n.index];
       };
-      ae(`subMenu:${m.uid}`, {
+      se(`subMenu:${d.uid}`, {
         addSubMenu: t,
         removeSubMenu: a,
         handleMouseleave: T,
@@ -134,40 +134,40 @@ const Te = Z({
     }
     q({
       opened: c
-    }), se(() => {
-      e.addSubMenu(h), r.addSubMenu(h);
     }), re(() => {
+      e.addSubMenu(h), r.addSubMenu(h);
+    }), ie(() => {
       r.removeSubMenu(h), e.removeSubMenu(h);
     });
-    const V = ie(), N = l(() => g(o.icon, "icon")), ee = l(() => g(o.expandIcon, "icon")), oe = l(() => g(o.collapseIcon, "icon")), te = l(() => d.value === "horizontal" && b.value || d.value === "vertical" && !e.props.collapse ? {
+    const V = ce(), N = l(() => g(o.icon, "icon")), oe = l(() => g(o.expandIcon, "icon")), te = l(() => g(o.collapseIcon, "icon")), ne = l(() => p.value === "horizontal" && b.value || p.value === "vertical" && !e.props.collapse ? {
       icon: "icon-arrow-down",
       size: 20,
-      ...ee.value
+      ...oe.value
     } : {
       icon: "icon-arrow-right",
       size: 18,
-      ...oe.value
-    }), R = l(() => pe(m, "title"));
+      ...te.value
+    }), R = l(() => ve(d, "title"));
     return () => {
       const t = [N.value?.icon ? s(L, {
         ...N.value
       }) : null, s("span", {
         class: [u.e("text"), u.is("arrow", o.showArrow)],
-        title: m.props.title
+        title: d.props.title
       }, R.value), o.showArrow ? s(L, {
         class: u.e("icon-arrow"),
-        ...te.value,
+        ...ne.value,
         style: {
           transform: c.value ? "rotateZ(180deg)" : "none"
         }
-      }) : !1], a = e.isMenuPopup ? s(fe, {
+      }) : !1], a = e.isMenuPopup ? s(Me, {
         ref: E,
         visible: c.value,
         effect: "light",
         pure: !0,
         offset: o.popperOffset,
         showArrow: !1,
-        persistent: !1,
+        persistent: W.value,
         popperClass: o.popperClass,
         placement: A.value,
         teleported: x.value,
@@ -177,7 +177,7 @@ const Te = Z({
         ...o.toolTipCfg
       }, {
         content: () => s("div", {
-          class: [i.m(d.value), i.m("popup-container"), o.popperClass],
+          class: [i.m(p.value), i.m("popup-container"), o.popperClass],
           onMouseenter: (n) => v(n, 100),
           onMouseleave: (n) => T(n, !0),
           onFocus: (n) => v(n, 100)
@@ -196,14 +196,14 @@ const Te = Z({
         }, t)
       }) : (
         // 以下是无需 tooltip 渲染的组件，通常是侧边栏没有折叠的时候
-        s(ce, {}, [R.value ? s("div", {
+        s(pe, {}, [R.value ? s("div", {
           class: u.e("title"),
           style: [$.value, {
             backgroundColor: B.value
           }],
           ref: J,
           onClick: O
-        }, t) : null, s(Me, {}, {
+        }, t) : null, s(be, {}, {
           default: () => de(s("ul", {
             role: "menu",
             class: [i.b(), i.m("inline")],
@@ -212,17 +212,17 @@ const Te = Z({
         })])
       );
       return s("li", {
-        class: [u.b(), u.is("active", p.value), u.e(String(r.level)), u.is("in-popup", r.level !== 0), u.is("opened", c.value), u.is("arrow", !0), u.is("disabled", o.disabled)],
+        class: [u.b(), u.is("active", m.value), u.e(String(r.level)), u.is("in-popup", r.level !== 0), u.is("opened", c.value), u.is("arrow", !0), u.is("disabled", o.disabled)],
         role: "menuitem",
         ariaHaspopup: !0,
         ariaExpanded: c.value,
-        onMouseenter: [Y, (n) => v(n)],
-        onMouseleave: [_, (n) => T(n, !0)],
+        onMouseenter: [_, (n) => v(n)],
+        onMouseleave: [ee, (n) => T(n, !0)],
         onFocus: v
       }, [a]);
     };
   }
 });
 export {
-  $e as default
+  Oe as default
 };

package/es/components/menu/types.d.ts

@@ -33,6 +33,7 @@ export interface MenuProps {
     collapseTransition?: boolean;
     /** 是否省略多余的子项（仅在横向模式生效） */
     ellipsis?: boolean;
+    persistent?: boolean;
 }
 export interface MenuProvider {
     openedMenus: string[];

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

@@ -30,10 +30,6 @@ export declare const VftModal: import("vft/es/utils").SFCWithInstall<{
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        trapFocus: {
-            type: import("vue").PropType<boolean>;
-            default: boolean;
-        };
         closeOnPressEscape: {
             type: import("vue").PropType<boolean>;
             default: boolean;
@@ -90,6 +86,10 @@ export declare const VftModal: import("vft/es/utils").SFCWithInstall<{
         modalClass: {
             type: import("vue").PropType<string>;
         };
+        trapFocus: {
+            type: import("vue").PropType<boolean>;
+            default: boolean;
+        };
         showSubmitButton: {
             type: import("vue").PropType<boolean>;
             default: boolean;
@@ -119,7 +119,6 @@ export declare const VftModal: import("vft/es/utils").SFCWithInstall<{
         fullscreen: boolean;
         draggable: boolean;
         modelValue: boolean;
-        trapFocus: boolean;
         closeOnPressEscape: boolean;
         showClose: boolean;
         customClass: string;
@@ -131,6 +130,7 @@ export declare const VftModal: import("vft/es/utils").SFCWithInstall<{
         modal: boolean;
         openDelay: number;
         closeDelay: number;
+        trapFocus: boolean;
         showSubmitButton: boolean;
         showActionButtonGroup: boolean;
         showCancelButton: boolean;
@@ -171,10 +171,6 @@ export declare const VftModal: import("vft/es/utils").SFCWithInstall<{
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        trapFocus: {
-            type: import("vue").PropType<boolean>;
-            default: boolean;
-        };
         closeOnPressEscape: {
             type: import("vue").PropType<boolean>;
             default: boolean;
@@ -231,6 +227,10 @@ export declare const VftModal: import("vft/es/utils").SFCWithInstall<{
         modalClass: {
             type: import("vue").PropType<string>;
         };
+        trapFocus: {
+            type: import("vue").PropType<boolean>;
+            default: boolean;
+        };
         showSubmitButton: {
             type: import("vue").PropType<boolean>;
             default: boolean;
@@ -260,7 +260,6 @@ export declare const VftModal: import("vft/es/utils").SFCWithInstall<{
         fullscreen: boolean;
         draggable: boolean;
         modelValue: boolean;
-        trapFocus: boolean;
         closeOnPressEscape: boolean;
         showClose: boolean;
         customClass: string;
@@ -272,6 +271,7 @@ export declare const VftModal: import("vft/es/utils").SFCWithInstall<{
         modal: boolean;
         openDelay: number;
         closeDelay: number;
+        trapFocus: boolean;
         showSubmitButton: boolean;
         showActionButtonGroup: boolean;
         showCancelButton: boolean;
@@ -309,10 +309,6 @@ export declare const VftModal: import("vft/es/utils").SFCWithInstall<{
         type: import("vue").PropType<boolean>;
         default: boolean;
     };
-    trapFocus: {
-        type: import("vue").PropType<boolean>;
-        default: boolean;
-    };
     closeOnPressEscape: {
         type: import("vue").PropType<boolean>;
         default: boolean;
@@ -369,6 +365,10 @@ export declare const VftModal: import("vft/es/utils").SFCWithInstall<{
     modalClass: {
         type: import("vue").PropType<string>;
     };
+    trapFocus: {
+        type: import("vue").PropType<boolean>;
+        default: boolean;
+    };
     showSubmitButton: {
         type: import("vue").PropType<boolean>;
         default: boolean;
@@ -398,7 +398,6 @@ export declare const VftModal: import("vft/es/utils").SFCWithInstall<{
     fullscreen: boolean;
     draggable: boolean;
     modelValue: boolean;
-    trapFocus: boolean;
     closeOnPressEscape: boolean;
     showClose: boolean;
     customClass: string;
@@ -410,6 +409,7 @@ export declare const VftModal: import("vft/es/utils").SFCWithInstall<{
     modal: boolean;
     openDelay: number;
     closeDelay: number;
+    trapFocus: boolean;
     showSubmitButton: boolean;
     showActionButtonGroup: boolean;
     showCancelButton: boolean;

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

@@ -57,7 +57,6 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     fullscreen: boolean;
     draggable: boolean;
     modelValue: boolean;
-    trapFocus: boolean;
     closeOnPressEscape: boolean;
     showClose: boolean;
     customClass: string;
@@ -69,6 +68,7 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     modal: boolean;
     openDelay: number;
     closeDelay: number;
+    trapFocus: boolean;
     showSubmitButton: boolean;
     showActionButtonGroup: boolean;
     showCancelButton: boolean;

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

@@ -1,4 +1,5 @@
-import { formatToDate as U, isDef as z, isFunction as j, isString as A, isObject as m, isArray as V, deepMerge as tt, findDifferentValuesForObj as et, isNullOrUndefined as G, isEmpty as nt, isEmptyObject as it } from "@vft/utils";
+import { isDef as U, isFunction as j, isString as A, isObject as w, isArray as V, deepMerge as tt, findDifferentValuesForObj as et, isNullOrUndefined as z, isEmpty as nt, isEmptyObject as it } from "@vft/utils";
+import { formatToDate as G } from "@vft/utils/date";
 import { get as rt, cloneDeep as I, uniqBy as st, isEqual as ct, set as J } from "lodash-es";
 import { unref as r, toRaw as B, nextTick as H } from "vue";
 import { isInput as at, FormCompEnum as x, isDatePicker as ot } from "../component-map.js";
@@ -33,7 +34,7 @@ function ft(p, v = {}) {
     }
   }
 }
-function Ft({
+function Dt({
   emit: p,
   getProps: v,
   formModel: a,
@@ -75,21 +76,21 @@ function Ft({
         if (R(e))
           if (Array.isArray(f)) {
             const F = [];
-            for (const w of f)
-              F.push(w ? U(w) : null);
+            for (const m of f)
+              F.push(m ? G(m) : null);
             r(a)[e] = F;
           } else
-            r(a)[e] = f ? D?.valueFormat ? f : U(f) : null;
+            r(a)[e] = f ? D?.valueFormat ? f : G(f) : null;
         else
           r(a)[e] = f;
         D?.onChange && D?.onChange(f), s.push(e);
       } else
         i.forEach((f) => {
           try {
-            const F = f.split(".").reduce((w, M) => w[M], t);
-            z(F) && (r(a)[f] = r(F), s.push(f));
+            const F = f.split(".").reduce((m, M) => m[M], t);
+            U(F) && (r(a)[f] = r(F), s.push(f));
           } catch {
-            z(y.value[f]) && (r(a)[f] = I(
+            U(y.value[f]) && (r(a)[f] = I(
               r(y.value[f])
             ));
           }
@@ -116,7 +117,7 @@ function Ft({
     }
   }
   async function X(t, n, c = !1) {
-    const i = I(r(d)), s = i.findIndex((o) => o.field === n), e = m(t) ? [t] : t;
+    const i = I(r(d)), s = i.findIndex((o) => o.field === n), e = w(t) ? [t] : t;
     if (!n || s === -1 || c) {
       c ? i.unshift(...e) : i.push(...e), h.value = i, g(t);
       return;
@@ -125,7 +126,7 @@ function Ft({
   }
   async function Y(t) {
     let n = [];
-    if (m(t) && n.push(t), V(t) && (n = [...t]), !n.every(
+    if (w(t) && n.push(t), V(t) && (n = [...t]), !n.every(
       (i) => i.type === x.DIVIDER || Reflect.has(i, "field") && i.field
     )) {
       console.error(
@@ -137,7 +138,7 @@ function Ft({
   }
   async function Z(t) {
     let n = [];
-    if (m(t) && n.push(t), V(t) && (n = [...t]), !n.every(
+    if (w(t) && n.push(t), V(t) && (n = [...t]), !n.every(
       (e) => e.type === x.DIVIDER || Reflect.has(e, "field") && e.field
     )) {
       console.error(
@@ -161,10 +162,10 @@ function Ft({
     if (V(n) && n?.length === 0)
       return;
     let c = [];
-    m(t) && c.push(t), V(t) && (c = [...t]);
+    w(t) && c.push(t), V(t) && (c = [...t]);
     const i = {}, s = T();
     c.forEach((e) => {
-      e.type !== x.DIVIDER && Reflect.has(e, "field") && e.field && !G(e.defaultValue) && (!(e.field in s) || G(s[e.field]) || nt(s[e.field])) && (i[e.field] = e.defaultValue);
+      e.type !== x.DIVIDER && Reflect.has(e, "field") && e.field && !z(e.defaultValue) && (!(e.field in s) || z(s[e.field]) || nt(s[e.field])) && (i[e.field] = e.defaultValue);
     }), it(i) || _(i);
   }
   function T() {
@@ -227,5 +228,5 @@ function Ft({
   };
 }
 export {
-  Ft as useFormEvents
+  Dt as useFormEvents
 };