@dt-frames/ui 2.0.6 → 2.0.8

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

@@ -13,7 +13,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         default: () => {};
     };
     layout: {
-        type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
+        type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
         default: string;
     };
     labelWidth: {
@@ -57,7 +57,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         default: () => {};
     };
     size: {
-        type: import("vue").PropType<"small" | "middle" | "large">;
+        type: import("vue").PropType<"middle" | "small" | "large">;
         default: string;
     };
     disabled: {
@@ -100,10 +100,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         type: import("vue").PropType<{
             [key: string]: import("vue").Ref<boolean>;
         }>;
-        default: () => {
-            onSearch: import("vue").Ref<boolean>;
-            onReset: import("vue").Ref<boolean>;
-        };
+        default: () => {};
     };
     onSearch: {
         type: import("vue").PropType<(params: import("@dt-frames/core").Recordable<any>) => void>;
@@ -145,7 +142,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 default: () => {};
             };
             layout: {
-                type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
+                type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
                 default: string;
             };
             labelWidth: {
@@ -189,7 +186,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 default: () => {};
             };
             size: {
-                type: import("vue").PropType<"small" | "middle" | "large">;
+                type: import("vue").PropType<"middle" | "small" | "large">;
                 default: string;
             };
             disabled: {
@@ -232,10 +229,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 type: import("vue").PropType<{
                     [key: string]: import("vue").Ref<boolean>;
                 }>;
-                default: () => {
-                    onSearch: import("vue").Ref<boolean>;
-                    onReset: import("vue").Ref<boolean>;
-                };
+                default: () => {};
             };
             onSearch: {
                 type: import("vue").PropType<(params: import("@dt-frames/core").Recordable<any>) => void>;
@@ -283,7 +277,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             default: () => {};
         };
         layout: {
-            type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
+            type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
             default: string;
         };
         labelWidth: {
@@ -327,7 +321,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             default: () => {};
         };
         size: {
-            type: import("vue").PropType<"small" | "middle" | "large">;
+            type: import("vue").PropType<"middle" | "small" | "large">;
             default: string;
         };
         disabled: {
@@ -370,10 +364,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             type: import("vue").PropType<{
                 [key: string]: import("vue").Ref<boolean>;
             }>;
-            default: () => {
-                onSearch: import("vue").Ref<boolean>;
-                onReset: import("vue").Ref<boolean>;
-            };
+            default: () => {};
         };
         onSearch: {
             type: import("vue").PropType<(params: import("@dt-frames/core").Recordable<any>) => void>;
@@ -2179,8 +2170,8 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                     validator?: (rule: import("ant-design-vue/lib/form").RuleObject, value: any, callback: (error?: string) => void) => void | Promise<void>;
                 } | any;
                 required?: boolean;
-                validator?: (rule: import("ant-design-vue/lib/form").RuleObject, value: any, callback: (error?: string) => void) => void | Promise<void>;
                 trigger?: "blur" | "change" | ("blur" | "change")[];
+                validator?: (rule: import("ant-design-vue/lib/form").RuleObject, value: any, callback: (error?: string) => void) => void | Promise<void>;
                 transform?: (value: any) => any;
                 warningOnly?: boolean;
                 message?: (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
@@ -2218,7 +2209,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 validateTrigger?: string | string[];
             };
             required?: boolean;
-            validator?: (rule: import("ant-design-vue/lib/form").RuleObject, value: any, callback: (error?: string) => void) => void | Promise<void>;
             trigger?: "blur" | "change" | ("blur" & ["change", "blur"]) | ("change" & ["change", "blur"]) | (("blur" | "change")[] & "blur") | (("blur" | "change")[] & "change") | {
                 [x: number]: "blur" | "change";
                 length: 2;
@@ -2290,6 +2280,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 0: "change";
                 1: "blur";
             };
+            validator?: (rule: import("ant-design-vue/lib/form").RuleObject, value: any, callback: (error?: string) => void) => void | Promise<void>;
             transform?: (value: any) => any;
             warningOnly?: boolean;
             message?: (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
@@ -2394,7 +2385,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             default: () => {};
         };
         layout: {
-            type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
+            type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
             default: string;
         };
         labelWidth: {
@@ -2438,7 +2429,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             default: () => {};
         };
         size: {
-            type: import("vue").PropType<"small" | "middle" | "large">;
+            type: import("vue").PropType<"middle" | "small" | "large">;
             default: string;
         };
         disabled: {
@@ -2481,10 +2472,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             type: import("vue").PropType<{
                 [key: string]: import("vue").Ref<boolean>;
             }>;
-            default: () => {
-                onSearch: import("vue").Ref<boolean>;
-                onReset: import("vue").Ref<boolean>;
-            };
+            default: () => {};
         };
         onSearch: {
             type: import("vue").PropType<(params: import("@dt-frames/core").Recordable<any>) => void>;
@@ -2524,7 +2512,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             default: () => {};
         };
         layout: {
-            type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
+            type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
             default: string;
         };
         labelWidth: {
@@ -2568,7 +2556,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             default: () => {};
         };
         size: {
-            type: import("vue").PropType<"small" | "middle" | "large">;
+            type: import("vue").PropType<"middle" | "small" | "large">;
             default: string;
         };
         disabled: {
@@ -2611,10 +2599,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             type: import("vue").PropType<{
                 [key: string]: import("vue").Ref<boolean>;
             }>;
-            default: () => {
-                onSearch: import("vue").Ref<boolean>;
-                onReset: import("vue").Ref<boolean>;
-            };
+            default: () => {};
         };
         onSearch: {
             type: import("vue").PropType<(params: import("@dt-frames/core").Recordable<any>) => void>;
@@ -2647,7 +2632,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
     setFormValues: (values: import("@dt-frames/core").Recordable<any>) => Promise<void>;
     appendFormItems: (schema: import("./src/types/form.type").FormSchema[], prefixName?: string, first?: boolean) => void;
     validate: (nameList: (string | number)[]) => Promise<any>;
-    validateFields: (nameList: (string | number)[]) => Promise<any>;
+    validateFields: (nameList: (string | number)[]) => Promise<void>;
     getFormValues: () => import("@dt-frames/core").Recordable<any>;
     formActionMethods: {
         setProps: (formProps: Partial<import("vue").ExtractPropTypes<{
@@ -2664,7 +2649,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 default: () => {};
             };
             layout: {
-                type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
+                type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
                 default: string;
             };
             labelWidth: {
@@ -2708,7 +2693,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 default: () => {};
             };
             size: {
-                type: import("vue").PropType<"small" | "middle" | "large">;
+                type: import("vue").PropType<"middle" | "small" | "large">;
                 default: string;
             };
             disabled: {
@@ -2751,10 +2736,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 type: import("vue").PropType<{
                     [key: string]: import("vue").Ref<boolean>;
                 }>;
-                default: () => {
-                    onSearch: import("vue").Ref<boolean>;
-                    onReset: import("vue").Ref<boolean>;
-                };
+                default: () => {};
             };
             onSearch: {
                 type: import("vue").PropType<(params: import("@dt-frames/core").Recordable<any>) => void>;
@@ -2783,7 +2765,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         setFormValues: (values: import("@dt-frames/core").Recordable<any>) => Promise<void>;
         appendFormItems: (schema: import("./src/types/form.type").FormSchema[], prefixName?: string, first?: boolean) => void;
         validate: (nameList: (string | number)[]) => Promise<any>;
-        validateFields: (nameList: (string | number)[]) => Promise<any>;
+        validateFields: (nameList: (string | number)[]) => Promise<void>;
         getFormValues: () => import("@dt-frames/core").Recordable<any>;
     };
     getActionsProps: import("vue").ComputedRef<import("@dt-frames/core").Recordable<any>>;
@@ -2811,7 +2793,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                         default: () => {};
                     };
                     layout: {
-                        type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
+                        type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
                         default: string;
                     };
                     labelWidth: {
@@ -2855,7 +2837,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                         default: () => {};
                     };
                     size: {
-                        type: import("vue").PropType<"small" | "middle" | "large">;
+                        type: import("vue").PropType<"middle" | "small" | "large">;
                         default: string;
                     };
                     disabled: {
@@ -2898,10 +2880,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                         type: import("vue").PropType<{
                             [key: string]: import("vue").Ref<boolean>;
                         }>;
-                        default: () => {
-                            onSearch: import("vue").Ref<boolean>;
-                            onReset: import("vue").Ref<boolean>;
-                        };
+                        default: () => {};
                     };
                     onSearch: {
                         type: import("vue").PropType<(params: import("@dt-frames/core").Recordable<any>) => void>;
@@ -3042,7 +3021,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         default: () => {};
     };
     layout: {
-        type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
+        type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
         default: string;
     };
     labelWidth: {
@@ -3086,7 +3065,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         default: () => {};
     };
     size: {
-        type: import("vue").PropType<"small" | "middle" | "large">;
+        type: import("vue").PropType<"middle" | "small" | "large">;
         default: string;
     };
     disabled: {
@@ -3129,10 +3108,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         type: import("vue").PropType<{
             [key: string]: import("vue").Ref<boolean>;
         }>;
-        default: () => {
-            onSearch: import("vue").Ref<boolean>;
-            onReset: import("vue").Ref<boolean>;
-        };
+        default: () => {};
     };
     onSearch: {
         type: import("vue").PropType<(params: import("@dt-frames/core").Recordable<any>) => void>;
@@ -3155,11 +3131,10 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
 }>> & {
     onRegister?: (...args: any[]) => any;
 }, {
-    size: "small" | "middle" | "large";
     mode: "search" | "dialog";
     autoFetch: boolean;
     model: {};
-    layout: "vertical" | "horizontal" | "inline";
+    layout: "vertical" | "inline" | "horizontal";
     labelWidth: string | number;
     enLabelWidth: string | number;
     labelAlign: "left" | "right";
@@ -3167,6 +3142,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
     wrapperCol: {};
     rowProps: {};
     colProps: {};
+    size: "middle" | "small" | "large";
     disabled: boolean;
     compact: boolean;
     schemas: import("./src/types/form.type").FormSchema[];

package/es/components/form/index.js

@@ -3,7 +3,7 @@ import "ant-design-vue/es/form/style";
 import "ant-design-vue/es/row/style";
 import { toRaw, unref, computed, getCurrentInstance, reactive, readonly, watchEffect, nextTick, defineComponent, useAttrs, openBlock, createBlock, mergeProps, isRef, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, createElementVNode, createVNode, normalizeProps, guardReactiveProps, createCommentVNode, toRefs, isVNode, ref, watch, resolveDirective, normalizeStyle, withDirectives, normalizeClass, onMounted, withKeys, createSlots, renderSlot } from "vue";
 import { DtCache, CacheKey, deepMerge, Pages, useGo, useRedo, Language, useAppStore, isNumber, useI18n, isString, isFunction, error, useSlots, isArray, isBoolean, isNull, dispatchResize, isObject, isNullAndUnDef, isEmpty, useTimeoutFn } from "@dt-frames/core";
-import { isEqual, omit, cloneDeep, upperFirst, uniqBy, set } from "lodash-es";
+import { cloneDeep, isEqual, omit, upperFirst, uniqBy, set } from "lodash-es";
 import { Input, Select, TreeSelect, Radio, Checkbox, AutoComplete, Cascader, DatePicker, InputNumber, Switch, TimePicker, Slider, Rate, Divider, Col, Tooltip, Form, FormItem } from "ant-design-vue";
 import { defineStore } from "pinia";
 import "ant-design-vue/es/radio/style";
@@ -89,7 +89,7 @@ const defaultThemeConf = {
   },
   routeReuse: {
     show: true,
-    cache: true,
+    cache: false,
     canDrag: true,
     showQuick: true,
     showRedo: true,
@@ -99,7 +99,7 @@ const defaultThemeConf = {
 const useThemeStore = defineStore({
   id: "dt-theme",
   state: () => ({
-    themeConf: DtCache.getLocal(CacheKey.THEME) ?? defaultThemeConf,
+    themeConf: DtCache.getLocal(CacheKey.THEME) ?? cloneDeep(defaultThemeConf),
     pageLoading: false,
     mixSiderHasSubMenu: false
   }),
@@ -134,14 +134,22 @@ const useThemeStore = defineStore({
     },
     setMixSiderIsHasMenu(val) {
       this.mixSiderHasSubMenu = val;
+    },
+    resetState() {
+      DtCache.removeLocal(CacheKey.THEME);
+      this.themeConf = cloneDeep(defaultThemeConf);
     }
   }
 });
+function handleGotoPage(router) {
+  const go = useGo(router);
+  go(unref(router.currentRoute).path, true);
+}
 defineStore({
   id: "route-reuse",
   state: () => ({
     cacheTabList: /* @__PURE__ */ new Set(),
-    tabList: DtCache.getLocal(CacheKey.THEME)?.routeReuse?.cache ? DtCache.getLocal(CacheKey.ROUTE_REUSE) || [] : [],
+    tabList: DtCache.getLocal(CacheKey.ROUTE_REUSE) || [],
     lastDragEndIndex: 0
   }),
   getters: {
@@ -177,9 +185,9 @@ defineStore({
       }
       this.updateCacheTab();
     },
-    closeTab(path, router) {
+    closeTab(route, router) {
       const go = useGo(router);
-      const index = this.tabList.findIndex((item) => item.path === path);
+      const index = this.tabList.findIndex((item) => item.path === route.path);
       let page;
       if (index === 0) {
         if (this.tabList.length !== 1) {
@@ -188,9 +196,9 @@ defineStore({
       } else {
         page = this.tabList[index - 1];
       }
-      this.bulkCloseTabs([path]);
+      this.bulkCloseTabs([route.path]);
       this.updateCacheTab();
-      path === router.currentRoute.value.path && go(page.path);
+      route.path === router.currentRoute.value.path && go(page.path);
     },
     closeAllTab(currentRoute, router) {
       const go = useGo(router);
@@ -200,8 +208,8 @@ defineStore({
       this.updateCacheTab();
       go(route.path);
     },
-    closeLeftTabs(path) {
-      const index = this.tabList.findIndex((item) => item.path === path);
+    closeLeftTabs(route, router) {
+      const index = this.tabList.findIndex((item) => item.path === route.path);
       if (index > 0) {
         const leftTabs = this.tabList.slice(0, index);
         const pathList = [];
@@ -214,9 +222,10 @@ defineStore({
         this.bulkCloseTabs(pathList);
       }
       this.updateCacheTab();
+      handleGotoPage(router);
     },
-    closeRightTabs(path) {
-      const index = this.tabList.findIndex((item) => item.path === path);
+    closeRightTabs(route, router) {
+      const index = this.tabList.findIndex((item) => item.path === route.path);
       if (index >= 0 && index < this.tabList.length - 1) {
         const rightTabs = this.tabList.slice(index + 1, this.tabList.length);
         const pathList = [];
@@ -229,24 +238,40 @@ defineStore({
         this.bulkCloseTabs(pathList);
       }
       this.updateCacheTab();
+      handleGotoPage(router);
     },
-    closeOtherTabs(path) {
+    closeOtherTabs(route, router) {
       const pathList = [];
       for (let item of this.tabList) {
         const affix = item?.meta?.affix ?? false;
-        if (item.path !== path && !affix) {
+        if (item.path !== route.path && !affix) {
           pathList.push(item.path);
         }
       }
       this.bulkCloseTabs(pathList);
       this.updateCacheTab();
+      handleGotoPage(router);
+    },
+    closeTabByKey(path, router) {
+      const go = useGo(router);
+      const index = this.tabList.findIndex((item) => item.path === path);
+      let page;
+      if (index === 0) {
+        if (this.tabList.length !== 1) {
+          page = this.tabList[index + 1];
+        }
+      } else {
+        page = this.tabList[index - 1];
+      }
+      this.bulkCloseTabs([path]);
+      this.updateCacheTab();
+      path === router.currentRoute.value.path && go(page.path);
     },
     bulkCloseTabs(pathList) {
       this.tabList = this.tabList.filter((item) => !pathList.includes(item.fullPath));
     },
     updateCacheTab() {
-      const cacheTab = DtCache.getLocal(CacheKey.THEME)?.routeReuse?.cache;
-      cacheTab && DtCache.setLocal(CacheKey.ROUTE_REUSE, this.tabList);
+      DtCache.setLocal(CacheKey.ROUTE_REUSE, this.tabList);
       const cacheMap = /* @__PURE__ */ new Set();
       for (const tab of this.tabList) {
         if (tab.meta?.hideTab) {
@@ -270,42 +295,46 @@ defineStore({
       this.tabList.splice(oldIndex, 1);
       this.tabList.splice(newIndex, 0, currentTab);
       this.lastDragEndIndex = this.lastDragEndIndex + 1;
+    },
+    resetState() {
+      this.tabList = [];
+      this.updateCacheTab();
     }
   }
 });
 function useMenu() {
-  const { getMenuConf, setThemeConf } = useThemeStore();
-  const getCollapsedShowTitle = computed(() => getMenuConf.collapsedShowTitle);
-  const getIsSidebarType = computed(() => getMenuConf.type === MenuType.SIDE);
-  const getMenuFixed = computed(() => getMenuConf.fixed);
-  const getShowMenu = computed(() => getMenuConf.show);
+  const { setThemeConf } = useThemeStore();
+  const getCollapsedShowTitle = computed(() => useThemeStore().getMenuConf.collapsedShowTitle);
+  const getIsSidebarType = computed(() => useThemeStore().getMenuConf.type === MenuType.SIDE);
+  const getMenuFixed = computed(() => useThemeStore().getMenuConf.fixed);
+  const getShowMenu = computed(() => useThemeStore().getMenuConf.show);
   const getShowSidebar = computed(() => {
     return unref(getSplit) || unref(getShowMenu) && unref(getMenuMode) !== MenuMode.HORIZONTAL;
   });
-  const getMenuHidden = computed(() => getMenuConf.hidden);
-  const getMenuTheme = computed(() => getMenuConf.theme);
-  const getTrigger = computed(() => getMenuConf.trigger);
-  const getCanDrag = computed(() => getMenuConf.canDrag);
+  const getMenuHidden = computed(() => useThemeStore().getMenuConf.hidden);
+  const getMenuTheme = computed(() => useThemeStore().getMenuConf.theme);
+  const getTrigger = computed(() => useThemeStore().getMenuConf.trigger);
+  const getCanDrag = computed(() => useThemeStore().getMenuConf.canDrag);
   const getIsMixMode = computed(() => {
     return unref(getMenuMode) === MenuMode.INLINE && unref(getMenuType) === MenuType.MIX;
   });
   const getIsMixSidebar = computed(() => unref(getMenuType) === MenuType.MIX_SIDEBAR);
   const getMenuWidth = computed(() => {
     if (unref(getIsMixMode)) {
-      return Number(getMenuConf.menuWidth) - 40;
+      return Number(useThemeStore().getMenuConf.menuWidth) - 40;
     } else if (unref(getIsMixSidebar)) {
-      return Number(getMenuConf.menuWidth) - 10;
+      return Number(useThemeStore().getMenuConf.menuWidth) - 10;
     } else {
-      return Number(getMenuConf.menuWidth);
+      return Number(useThemeStore().getMenuConf.menuWidth);
     }
   });
-  const getMixSideTrigger = computed(() => getMenuConf.mixSideTrigger);
-  const getLogoWidth = computed(() => unref(getIsMixSidebar) ? "80px" : getMenuConf.menuWidth);
-  const getMenuType = computed(() => getMenuConf.type);
+  const getMixSideTrigger = computed(() => useThemeStore().getMenuConf.mixSideTrigger);
+  const getLogoWidth = computed(() => unref(getIsMixSidebar) ? "80px" : useThemeStore().getMenuConf.menuWidth);
+  const getMenuType = computed(() => useThemeStore().getMenuConf.type);
   const getIsTopMenu = computed(() => unref(getMenuType) === MenuType.TOP_MENU);
-  const getMenuMode = computed(() => getMenuConf.mode);
-  const getSplit = computed(() => getMenuConf.split);
-  const getCollapsed = computed(() => getMenuConf.collapsed);
+  const getMenuMode = computed(() => useThemeStore().getMenuConf.mode);
+  const getSplit = computed(() => useThemeStore().getMenuConf.split);
+  const getCollapsed = computed(() => useThemeStore().getMenuConf.collapsed);
   const getIsHorizontal = computed(() => unref(getMenuMode) === MenuMode.HORIZONTAL);
   const setThemeStore = (conf = {}) => setThemeConf(conf);
   const toggleCollapsed = () => setThemeStore({
@@ -313,7 +342,7 @@ function useMenu() {
       collapsed: !unref(getCollapsed)
     }
   });
-  const getMiniWidthNumber = computed(() => getMenuConf.collapsedShowTitle ? 80 : 48);
+  const getMiniWidthNumber = computed(() => useThemeStore().getMenuConf.collapsedShowTitle ? 80 : 48);
   const getRealWidth = computed(() => {
     return unref(getCollapsed) ? unref(getMiniWidthNumber) : unref(getMenuWidth);
   });
@@ -907,9 +936,15 @@ const _sfc_main$2 = {
           _disabled = disabled(unref(getValues).model);
         return _disabled;
       });
+      const getSize = () => {
+        if (component === "Switch" && unref(getUiSize) === UiSize.LARGE) {
+          return "default";
+        }
+        return unref(getUiSize) === UiSize.MIDDLE ? "default" : unref(getUiSize);
+      };
       const itemProps = {
         allowClear: _sProps?.allowClear ?? appConf.ui.form.allowClear,
-        size: unref(getUiSize) === UiSize.MIDDLE ? "default" : unref(getUiSize),
+        size: getSize(),
         ...unref(getComponentProps),
         disabled: unref(getDisable)
       };
@@ -1617,10 +1652,7 @@ const BasicProps = {
   loading: {
     type: Object,
     default: () => {
-      return {
-        onSearch: ref(false),
-        onReset: ref(false)
-      };
+      return {};
     }
   },
   onSearch: {
@@ -1697,7 +1729,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       formModel[key] = value;
       const { validateTrigger } = unref(getBindValue);
       if (!validateTrigger || validateTrigger === "change") {
-        validateFields([key]);
+        validateFields([key]).catch((err) => {
+        });
       }
     }
     function handleEnterPress() {

package/es/components/form/index.less

@@ -37,6 +37,7 @@
 	.ant-btn{
 		display: flex;
 		align-items: center;
+		justify-content: center;
 		font-size: 13px;
 	}
 

package/es/components/form/src/components/FormButtons.d.ts

@@ -79,10 +79,10 @@ declare const _sfc_main: import("vue").DefineComponent<{
     "onHandle-method"?: (...args: any[]) => any;
 }, {
     mode: "search" | "dialog";
-    show: boolean;
-    showAdvancedButton: boolean;
     minShowColumn: number;
-    buttonList: ButtonProps[];
+    showAdvancedButton: boolean;
+    show: boolean;
     isAdvanced: boolean;
+    buttonList: ButtonProps[];
 }>;
 export default _sfc_main;

package/es/components/form/src/components/FormItem.d.ts

@@ -25,7 +25,7 @@ declare const _sfc_main: {
                     default: () => {};
                 };
                 layout: {
-                    type: PropType<"vertical" | "horizontal" | "inline">;
+                    type: PropType<"vertical" | "inline" | "horizontal">;
                     default: string;
                 };
                 labelWidth: {
@@ -50,8 +50,8 @@ declare const _sfc_main: {
                 };
                 rowProps: {
                     type: PropType<Partial<import("vue").ExtractPropTypes<{
-                        align: PropType<"middle" | "top" | "bottom" | "stretch">;
-                        justify: PropType<"center" | "start" | "space-around" | "space-between" | "end">;
+                        align: PropType<"stretch" | "bottom" | "top" | "middle">;
+                        justify: PropType<"space-around" | "space-between" | "center" | "end" | "start">;
                         prefixCls: StringConstructor;
                         gutter: {
                             type: PropType<import("ant-design-vue/lib/grid/Row").Gutter | [import("ant-design-vue/lib/grid/Row").Gutter, import("ant-design-vue/lib/grid/Row").Gutter]>;
@@ -69,7 +69,7 @@ declare const _sfc_main: {
                     default: () => {};
                 };
                 size: {
-                    type: PropType<"small" | "large" | "middle">;
+                    type: PropType<"middle" | "small" | "large">;
                     default: string;
                 };
                 disabled: {
@@ -112,10 +112,7 @@ declare const _sfc_main: {
                     type: PropType<{
                         [key: string]: Ref<boolean>;
                     }>;
-                    default: () => {
-                        onSearch: Ref<boolean>;
-                        onReset: Ref<boolean>;
-                    };
+                    default: () => {};
                 };
                 onSearch: {
                     type: PropType<(params: Recordable<any>) => void>;

package/es/components/form/src/components/formIcon.d.ts

@@ -143,7 +143,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 'onUpdate:value': import("vue").PropType<(val: string) => void>;
                 valueModifiers: ObjectConstructor;
                 hidden: BooleanConstructor;
-            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "value" | "type" | "loading" | "disabled" | "bordered" | "autofocus" | "readonly" | "allowClear" | "lazy" | "hidden">;
+            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "type" | "value" | "disabled" | "allowClear" | "loading" | "hidden" | "readonly" | "autofocus" | "lazy" | "bordered">;
             $attrs: {
                 [x: string]: unknown;
             };
@@ -457,7 +457,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             inputPrefixCls: StringConstructor;
             enterButton: import("vue-types").VueTypeValidableDef<any>;
             onSearch: {
-                type: import("vue").PropType<(value: string, event?: MouseEvent | import("ant-design-vue/lib/_util/EventInterface").ChangeEvent | KeyboardEvent) => void>;
+                type: import("vue").PropType<(value: string, event?: import("ant-design-vue/lib/_util/EventInterface").ChangeEvent | MouseEvent | KeyboardEvent) => void>;
             };
             id: StringConstructor;
             prefixCls: StringConstructor;
@@ -529,7 +529,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             inputPrefixCls: StringConstructor;
             enterButton: import("vue-types").VueTypeValidableDef<any>;
             onSearch: {
-                type: import("vue").PropType<(value: string, event?: MouseEvent | import("ant-design-vue/lib/_util/EventInterface").ChangeEvent | KeyboardEvent) => void>;
+                type: import("vue").PropType<(value: string, event?: import("ant-design-vue/lib/_util/EventInterface").ChangeEvent | MouseEvent | KeyboardEvent) => void>;
             };
             id: StringConstructor;
             prefixCls: StringConstructor;
@@ -1014,7 +1014,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 onMousedown: {
                     type: import("vue").PropType<(event: MouseEvent) => void>;
                 };
-            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "loading" | "disabled" | "htmlType" | "ghost" | "block" | "danger">;
+            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "disabled" | "loading" | "block" | "htmlType" | "ghost" | "danger">;
             $attrs: {
                 [x: string]: unknown;
             };