@dt-frames/ui 2.0.10 → 2.0.12

package/es/components/form/index.js

@@ -1,11 +1,11 @@
 import { RadioButton, RadioGroup, Button, FormItem as FormItem$1, Col as Col$1, Row, Form as Form$1 } from "ant-design-vue/es";
 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, toRefs, createVNode, isVNode, ref, watch, resolveDirective, normalizeProps, normalizeStyle, withDirectives, normalizeClass, createCommentVNode, createElementVNode, onMounted, withKeys, createSlots, renderSlot, guardReactiveProps } from "vue";
-import { DtCache, CacheKey, deepMerge, Pages, useGo, useRedo, Language, useAppStore, isNumber, useI18n, isString, useSlots, isArray, isFunction, error, isBoolean, isNull, dispatchResize, isObject, isNullAndUnDef, isEmpty, useTimeoutFn } from "@dt-frames/core";
-import { cloneDeep, merge, isEqual, upperFirst, uniqBy, set } from "lodash-es";
+import { computed, unref, getCurrentInstance, reactive, readonly, watchEffect, nextTick, toRaw, 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 { useAppStore, isNumber, useI18n, isString, isFunction, error, useSlots, isArray, isUnDef, isBoolean, isNull, dispatchResize, isObject, deepMerge, isNullAndUnDef, useTimeoutFn } from "@dt-frames/core";
+import { merge, isEqual, omit, cloneDeep, 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 { useHeader, UiSize } from "../../theme";
 import "ant-design-vue/es/radio/style";
 import "ant-design-vue/es/cascader/style";
 import "ant-design-vue/es/input-number/style";
@@ -17,471 +17,6 @@ import "ant-design-vue/es/date-picker/style";
 import "ant-design-vue/es/col/style";
 import "ant-design-vue/es/button/style";
 import dayjs from "dayjs";
-var Theme = /* @__PURE__ */ ((Theme2) => {
-  Theme2["DARK"] = "dark";
-  Theme2["LIGHT"] = "light";
-  return Theme2;
-})(Theme || {});
-var MenuType = /* @__PURE__ */ ((MenuType2) => {
-  MenuType2["SIDE"] = "sidebar";
-  MenuType2["TOP_MENU"] = "top-menu";
-  MenuType2["MIX"] = "mix";
-  MenuType2["MIX_SIDEBAR"] = "mix-sidebar";
-  return MenuType2;
-})(MenuType || {});
-var MenuMode = /* @__PURE__ */ ((MenuMode2) => {
-  MenuMode2["INLINE"] = "inline";
-  MenuMode2["HORIZONTAL"] = "horizontal";
-  MenuMode2["VERTICAL"] = "vertical";
-  return MenuMode2;
-})(MenuMode || {});
-var ContentMode = /* @__PURE__ */ ((ContentMode2) => {
-  ContentMode2["FULL"] = "full";
-  ContentMode2["FIXED"] = "fixed";
-  return ContentMode2;
-})(ContentMode || {});
-var UiSize = /* @__PURE__ */ ((UiSize2) => {
-  UiSize2["LARGE"] = "large";
-  UiSize2["MIDDLE"] = "middle";
-  UiSize2["SMALL"] = "small";
-  return UiSize2;
-})(UiSize || {});
-const defaultThemeConf = {
-  content: {
-    contentMode: ContentMode.FULL
-  },
-  headOptions: {
-    fixed: true,
-    theme: Theme.LIGHT,
-    showLogo: true,
-    showBackToTop: true,
-    useLockPage: true,
-    size: UiSize.SMALL,
-    showSize: true,
-    showBreadCrumb: true,
-    showFullScreen: true,
-    showSearch: true,
-    showNotice: true,
-    showLocaleSwitch: true,
-    showSettingTheme: true,
-    showLoginOut: true
-  },
-  menuOptions: {
-    fixed: true,
-    theme: Theme.DARK,
-    collapsed: false,
-    collapsedShowTitle: false,
-    canDrag: true,
-    show: true,
-    hidden: false,
-    split: false,
-    menuWidth: 240,
-    trigger: true,
-    type: MenuType.SIDE,
-    mode: MenuMode.INLINE,
-    mixSideTrigger: "hover"
-  },
-  footerOptions: {
-    show: false,
-    height: 48,
-    title: "Copyright(C) 2021 by www.ithinkdt.com. All rights reserved.",
-    subTitle: "Privacy Statement"
-  },
-  routeReuse: {
-    show: true,
-    cache: false,
-    canDrag: true,
-    showQuick: true,
-    showRedo: true,
-    showFold: true
-  }
-};
-const useThemeStore = defineStore({
-  id: "dt-theme",
-  state: () => ({
-    themeConf: DtCache.getLocal(CacheKey.THEME) ?? cloneDeep(defaultThemeConf),
-    pageLoading: false,
-    mixSiderHasSubMenu: false
-  }),
-  getters: {
-    getThemeConf() {
-      return this.themeConf;
-    },
-    getHeaderConf() {
-      return this.themeConf.headOptions;
-    },
-    getMenuConf() {
-      return this.themeConf.menuOptions;
-    },
-    getFooterConf() {
-      return this.themeConf.footerOptions;
-    },
-    getRouteReuseConf() {
-      return this.themeConf.routeReuse;
-    },
-    getPageLoading() {
-      return this.pageLoading;
-    },
-    getMixSiderIsHasMenu() {
-      return this.mixSiderHasSubMenu;
-    }
-  },
-  actions: {
-    setThemeConf(options = {}) {
-      let newThemeConf = deepMerge(this.themeConf, options);
-      this.themeConf = deepMerge(defaultThemeConf, newThemeConf);
-      DtCache.setLocal(CacheKey.THEME, this.themeConf);
-    },
-    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.ROUTE_REUSE) || [],
-    lastDragEndIndex: 0
-  }),
-  getters: {
-    getTabList() {
-      return this.tabList;
-    },
-    getCachedTabList() {
-      return Array.from(this.cacheTabList);
-    },
-    getLastDragEndIndex() {
-      return this.lastDragEndIndex;
-    }
-  },
-  actions: {
-    async addTab(route) {
-      const { path, name, fullPath, params, query, meta } = route;
-      if (path === Pages.NOT_FOUND || path === Pages.LOGIN || path === Pages.BASE_PAGE) {
-        return;
-      }
-      let updateIndex = -1;
-      const tabHasExits = this.tabList.some((tab, index) => {
-        updateIndex = index;
-        return (tab.fullPath || tab.path) === (fullPath || path);
-      });
-      if (tabHasExits) {
-        const curTab = toRaw(this.tabList)[updateIndex];
-        curTab.params = params || curTab.params;
-        curTab.query = query || curTab.query;
-        curTab.fullPath = fullPath || curTab.fullPath;
-        this.tabList.splice(updateIndex, 1, curTab);
-      } else {
-        this.tabList.push(JSON.parse(JSON.stringify(route)));
-      }
-      this.updateCacheTab();
-    },
-    closeTab(route, router) {
-      const go = useGo(router);
-      const index = this.tabList.findIndex((item) => item.path === route.path);
-      let page;
-      if (index === 0) {
-        if (this.tabList.length !== 1) {
-          page = this.tabList[index + 1];
-        }
-      } else {
-        page = this.tabList[index - 1];
-      }
-      this.bulkCloseTabs([route.path]);
-      this.updateCacheTab();
-      route.path === router.currentRoute.value.path && go(page.path);
-    },
-    closeAllTab(currentRoute, router) {
-      const go = useGo(router);
-      let filterTabList = this.tabList.filter((item) => item?.meta?.affix ?? false);
-      const route = filterTabList.length > 0 ? filterTabList[filterTabList.length - 1] : unref(currentRoute);
-      this.tabList = [route];
-      this.updateCacheTab();
-      go(route.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 = [];
-        for (const item of leftTabs) {
-          const affix = item?.meta?.affix ?? false;
-          if (!affix) {
-            pathList.push(item.fullPath);
-          }
-        }
-        this.bulkCloseTabs(pathList);
-      }
-      this.updateCacheTab();
-      handleGotoPage(router);
-    },
-    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 = [];
-        for (const item of rightTabs) {
-          const affix = item?.meta?.affix ?? false;
-          if (!affix) {
-            pathList.push(item.fullPath);
-          }
-        }
-        this.bulkCloseTabs(pathList);
-      }
-      this.updateCacheTab();
-      handleGotoPage(router);
-    },
-    closeOtherTabs(route, router) {
-      const pathList = [];
-      for (let item of this.tabList) {
-        const affix = item?.meta?.affix ?? false;
-        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() {
-      DtCache.setLocal(CacheKey.ROUTE_REUSE, this.tabList);
-      const cacheMap = /* @__PURE__ */ new Set();
-      for (const tab of this.tabList) {
-        if (tab.meta?.hideTab) {
-          continue;
-        }
-        const name = tab.name;
-        cacheMap.add(name);
-      }
-      this.cacheTabList = cacheMap;
-    },
-    async refreshPage(router) {
-      const findTab = this.getCachedTabList.find((item) => item === unref(router.currentRoute).name);
-      if (findTab) {
-        this.cacheTabList.delete(findTab.toString());
-      }
-      const redo = useRedo(router);
-      await redo();
-    },
-    sortTabs(oldIndex, newIndex) {
-      const currentTab = this.tabList[oldIndex];
-      this.tabList.splice(oldIndex, 1);
-      this.tabList.splice(newIndex, 0, currentTab);
-      this.lastDragEndIndex = this.lastDragEndIndex + 1;
-    },
-    resetState() {
-      this.tabList = [];
-      this.updateCacheTab();
-    }
-  }
-});
-function useMenu() {
-  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(() => 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(useThemeStore().getMenuConf.menuWidth) - 40;
-    } else if (unref(getIsMixSidebar)) {
-      return Number(useThemeStore().getMenuConf.menuWidth) - 10;
-    } else {
-      return Number(useThemeStore().getMenuConf.menuWidth);
-    }
-  });
-  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(() => 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({
-    menuOptions: {
-      collapsed: !unref(getCollapsed)
-    }
-  });
-  const getMiniWidthNumber = computed(() => useThemeStore().getMenuConf.collapsedShowTitle ? 80 : 48);
-  const getRealWidth = computed(() => {
-    return unref(getCollapsed) ? unref(getMiniWidthNumber) : unref(getMenuWidth);
-  });
-  const getCalcContentWidth = computed(() => {
-    const width = unref(getIsTopMenu) || !unref(getShowMenu) || unref(getSplit) && unref(getMenuHidden) ? 0 : unref(getRealWidth);
-    return `calc(100% - ${unref(width)}px)`;
-  });
-  return {
-    getCollapsedShowTitle,
-    getIsSidebarType,
-    getMenuFixed,
-    getShowMenu,
-    getShowSidebar,
-    getMenuHidden,
-    getMenuTheme,
-    getTrigger,
-    getMenuWidth,
-    getLogoWidth,
-    getMenuType,
-    getIsTopMenu,
-    getMenuMode,
-    getSplit,
-    getCollapsed,
-    getIsHorizontal,
-    getMiniWidthNumber,
-    getRealWidth,
-    getCalcContentWidth,
-    getIsMixMode,
-    getIsMixSidebar,
-    getCanDrag,
-    getMixSideTrigger,
-    toggleCollapsed,
-    setThemeStore
-  };
-}
-function useMultipleTab() {
-  const { getRouteReuseConf } = useThemeStore();
-  const getShowMultipleTab = computed(() => getRouteReuseConf.show);
-  const getShowQuick = computed(() => getRouteReuseConf.showQuick);
-  const getMultipleTabPosIsTop = computed(() => getRouteReuseConf.position === "top");
-  const getShowRedo = computed(() => getRouteReuseConf.showRedo);
-  const getCanCache = computed(() => getRouteReuseConf.cache);
-  const getCanDrag = computed(() => getRouteReuseConf.canDrag);
-  return {
-    getShowMultipleTab,
-    getShowQuick,
-    getMultipleTabPosIsTop,
-    getShowRedo,
-    getCanCache,
-    getCanDrag
-  };
-}
-function useHeader() {
-  const HEADER_HEIGHT = 48;
-  const TABS_HEIGHT = 33;
-  const { getHeaderConf = {} } = useThemeStore();
-  const {
-    getIsSidebarType,
-    getMenuType,
-    getShowMenu,
-    getMenuHidden,
-    getTrigger,
-    getMenuMode,
-    getSplit,
-    getIsTopMenu,
-    getIsMixSidebar
-  } = useMenu();
-  const { getShowMultipleTab, getMultipleTabPosIsTop } = useMultipleTab();
-  const getHeaderTheme = computed(() => getHeaderConf.theme);
-  const getFixed = computed(() => getHeaderConf.fixed);
-  const getShowHeaderLogo = computed(() => unref(getShowLogo) && !unref(getIsSidebarType) && !unref(getIsMixSidebar));
-  const getShowSearch = computed(() => getHeaderConf.showSearch);
-  const getShowHeaderTrigger = computed(() => {
-    if (unref(getMenuType) === MenuType.TOP_MENU || !unref(getShowMenu) || unref(getMenuHidden)) {
-      return false;
-    }
-    return unref(getTrigger);
-  });
-  const getShowBreadCrumb = computed(() => getHeaderConf.showBreadCrumb);
-  const getShowBread = computed(
-    () => unref(getMenuMode) !== MenuMode.HORIZONTAL && !unref(getSplit) && unref(getShowBreadCrumb)
-  );
-  const getShowTopMenu = computed(() => unref(getMenuMode) === MenuMode.HORIZONTAL || unref(getSplit));
-  const getShowNotice = computed(() => getHeaderConf.showNotice);
-  const getShowFullScreen = computed(() => getHeaderConf.showFullScreen);
-  const getShowLocale = computed(() => getHeaderConf.showLocaleSwitch);
-  const getShowSettingTheme = computed(() => getHeaderConf.showSettingTheme);
-  const getShowFullHeaderRef = computed(() => {
-    return !unref(getIsSidebarType) && !unref(getIsMixSidebar) && !unref(getIsTopMenu);
-  });
-  const getHeaderHeight = computed(() => {
-    let height = 0;
-    height += HEADER_HEIGHT;
-    if (unref(getShowMultipleTab) && !unref(getSplit) && !unref(getMultipleTabPosIsTop)) {
-      height += TABS_HEIGHT;
-    }
-    return height;
-  });
-  const getTabsHeight = computed(() => TABS_HEIGHT);
-  const getShowInsetHeaderRef = computed(() => {
-    return unref(getIsSidebarType) || unref(getIsTopMenu) || unref(getIsMixSidebar);
-  });
-  const getShowBackToTop = computed(() => getHeaderConf.showBackToTop);
-  const getIsZH = computed(() => {
-    let local = DtCache.getLocal(CacheKey.LOCALE);
-    if (!local)
-      return true;
-    return local === Language.ZH;
-  });
-  const getUiSize = computed(() => getHeaderConf?.size ?? UiSize.SMALL);
-  const getShowUiSize = computed(() => getHeaderConf?.showSize);
-  const getShowLogo = computed(() => getHeaderConf.showLogo);
-  const getShowLoginOut = computed(() => getHeaderConf.showLoginOut);
-  const loginOutClick = getHeaderConf.logoutClick;
-  return {
-    getHeaderTheme,
-    getFixed,
-    getShowSearch,
-    getShowHeaderLogo,
-    getShowHeaderTrigger,
-    getShowBread,
-    getShowTopMenu,
-    getShowFullScreen,
-    getShowLocale,
-    getShowSettingTheme,
-    getShowNotice,
-    getShowFullHeaderRef,
-    getHeaderHeight,
-    getTabsHeight,
-    getShowInsetHeaderRef,
-    getShowBackToTop,
-    getIsZH,
-    getUiSize,
-    getShowLogo,
-    getShowLoginOut,
-    getShowUiSize,
-    loginOutClick
-  };
-}
 function useLabelWidth(schemaItemRef, propsRef) {
   const { getIsZH } = useHeader();
   const { appConf } = useAppStore();
@@ -581,7 +116,7 @@ function useFormValue(props, key = "value", changeEvent = "change", emitData) {
   });
   return [state, setState, defaultState];
 }
-const _sfc_main$3 = /* @__PURE__ */ defineComponent({
+const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   __name: "radioButton",
   props: {
     value: {
@@ -632,8 +167,49 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
+const _hoisted_1$1 = { class: "input-with-dialog" };
+const _sfc_main$3 = /* @__PURE__ */ defineComponent({
+  __name: "formInputUseDialog",
+  setup(__props) {
+    const { t } = useI18n("UI");
+    const attrs = useAttrs();
+    const bindProps = computed(() => {
+      return {
+        ...omit(attrs, [
+          "formValues"
+        ]),
+        disabled: true
+      };
+    });
+    function onClickInput() {
+      const { model, schema = {} } = attrs.formValues;
+      if (!schema.openDialog || !isFunction(schema.openDialog)) {
+        error(t("MUSE_FUNCTION"));
+        return;
+      }
+      schema.openDialog(model);
+    }
+    function clearProps() {
+      const { model, schema = {} } = attrs.formValues;
+      [...schema.extraName, schema.name].forEach((it) => model[it] = null);
+    }
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", _hoisted_1$1, [
+        createElementVNode("div", { onClick: onClickInput }, [
+          createVNode(unref(Input), normalizeProps(guardReactiveProps(unref(bindProps))), null, 16)
+        ]),
+        unref(attrs).formValues?.schema?.extraName?.length ? (openBlock(), createElementBlock("i", {
+          key: 0,
+          class: "i mdi:close-circle",
+          onClick: clearProps
+        })) : createCommentVNode("", true)
+      ]);
+    };
+  }
+});
 const components = {
   Input,
+  InputWithDialog: _sfc_main$3,
   InputTextArea: Input.TextArea,
   InputSearch: Input.Search,
   InputGroup: Input.Group,
@@ -642,7 +218,7 @@ const components = {
   TreeSelect,
   Radio,
   RadioGroup: Radio.Group,
-  RadioButtonGroup: _sfc_main$3,
+  RadioButtonGroup: _sfc_main$4,
   Checkbox,
   CheckboxGroup: Checkbox.Group,
   AutoComplete,
@@ -1001,13 +577,35 @@ const _sfc_main$2 = {
         colProps,
         component,
         render,
-        slot
+        slot,
+        span
       } = props.schema;
       const {
         colProps: gColProps,
-        mode
+        mode,
+        span: gSpan
       } = props.formProps;
-      let _colProps = colProps || gColProps || (mode === "search" ? appConf.ui.form.searchColspan : appConf.ui.form.dialogColspan);
+      let _colProps = {};
+      if (component === "InputTextArea") {
+        _colProps = {
+          span: 24
+        };
+      }
+      if (!isUnDef(colProps)) {
+        _colProps = colProps;
+      } else if (!isUnDef(span)) {
+        _colProps = {
+          span
+        };
+      } else if (!isUnDef(gColProps)) {
+        _colProps = gColProps;
+      } else if (!isUnDef(gSpan)) {
+        _colProps = {
+          span: gSpan
+        };
+      } else {
+        _colProps = mode === "search" ? appConf.ui.form.searchColspan : appConf.ui.form.dialogColspan;
+      }
       const values = unref(getValues);
       if (!component) {
         if (!render && !renderCol && !slot && !colSlot) {
@@ -1018,9 +616,9 @@ const _sfc_main$2 = {
       if (component === "Divider") {
         let _slot;
         let cprops = unref(getComponentProps);
-        const span = cprops?.span ?? 24;
+        const span2 = cprops?.span ?? 24;
         return createVNode(Col, {
-          "span": span
+          "span": span2
         }, {
           default: () => [createVNode(Divider, cprops, _isSlot(_slot = renderLabel()) ? _slot : {
             default: () => [_slot]
@@ -1501,7 +1099,7 @@ function useFormActions(opt) {
       schemas,
       minShowColumn = appConf.ui.form?.minShowColumn || 2,
       showAdvancedButton = true
-    } = unref(opt.getProps);
+    } = unref(getProps);
     let schema = [...schemas];
     if (showAdvancedButton) {
       schema = schemas.reduce((t, it, index) => {
@@ -1570,8 +1168,10 @@ const BasicProps = {
     default: () => ({})
   },
   colProps: {
-    type: Object,
-    default: () => ({})
+    type: Object
+  },
+  span: {
+    type: Number
   },
   size: {
     type: String
@@ -1653,14 +1253,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const propsRef = ref();
     const schemaRef = ref(null);
     const getProps = computed(() => {
-      let colProps = props.colProps;
-      if (isEmpty(props.colProps)) {
-        colProps = props.mode === "search" ? getAppConf.ui.form.searchColspan || { span: 8 } : getAppConf.ui.form.dialogColspan || { span: 12 };
-      }
       return {
         ...props,
         ...getAppConf.ui.form,
-        colProps,
         ...unref(propsRef)
       };
     });
@@ -1758,7 +1353,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         buttonList = [...buttons];
       } else if (mode === "search" && !buttons) {
         SEARCH_BTNS.forEach((it) => {
-          it.loading = it.name === SEARCH_BTN_NAME ? loading?.onSearch : loading?.onReset;
+          it.loading = it.label === SEARCH_BTN_NAME ? loading?.onSearch : loading?.onReset;
           buttonList.push(it);
         });
       }
@@ -1939,5 +1534,6 @@ function useForm(props) {
 }
 export {
   _sfc_main as DtForm,
+  _sfc_main$1 as DtFormButtons,
   useForm
 };

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

@@ -66,7 +66,9 @@ declare const _sfc_main: {
                 };
                 colProps: {
                     type: PropType<Partial<import("../types/form.type").ColEx>>;
-                    default: () => {};
+                };
+                span: {
+                    type: NumberConstructor;
                 };
                 size: {
                     type: PropType<"middle" | "small" | "large">;

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

@@ -2,15 +2,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     value: StringConstructor;
     placeholder: StringConstructor;
 }, {
-    t: {
-        (key: string): string;
-        (key: string, locale: string): string;
-        (key: string, locale: string, list: unknown[]): string;
-        (key: string, locale: string, named: Record<string, unknown>): string;
-        (key: string, list: unknown[]): string;
-        (key: string, named: Record<string, unknown>): string;
-    };
-    getUiSize: import("vue").ComputedRef<import("../../../../theme/src/enums").UiSize>;
+    getUiSize: import("vue").ComputedRef<import('../../../../theme').UiSize>;
     iconRef: any;
     props: any;
     state: any;
@@ -457,7 +449,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             inputPrefixCls: StringConstructor;
             enterButton: import("vue-types").VueTypeValidableDef<any>;
             onSearch: {
-                type: import("vue").PropType<(value: string, event?: import("ant-design-vue/lib/_util/EventInterface").ChangeEvent | MouseEvent | KeyboardEvent) => void>;
+                type: import("vue").PropType<(value: string, event?: MouseEvent | import("ant-design-vue/lib/_util/EventInterface").ChangeEvent | KeyboardEvent) => void>;
             };
             id: StringConstructor;
             prefixCls: StringConstructor;
@@ -529,7 +521,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             inputPrefixCls: StringConstructor;
             enterButton: import("vue-types").VueTypeValidableDef<any>;
             onSearch: {
-                type: import("vue").PropType<(value: string, event?: import("ant-design-vue/lib/_util/EventInterface").ChangeEvent | MouseEvent | KeyboardEvent) => void>;
+                type: import("vue").PropType<(value: string, event?: MouseEvent | import("ant-design-vue/lib/_util/EventInterface").ChangeEvent | KeyboardEvent) => void>;
             };
             id: StringConstructor;
             prefixCls: StringConstructor;