@dt-frames/ui 2.0.2 → 2.0.4

package/es/components/form/index.js

@@ -1,14 +1,22 @@
 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 { toRaw as toRaw$1, unref as unref$1, computed as computed$1, getCurrentInstance, reactive as reactive$1, readonly, watchEffect, nextTick as nextTick$1, defineComponent as defineComponent$1, openBlock, createBlock, mergeProps, isRef, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, useAttrs as useAttrs$1, createElementVNode, createVNode, normalizeProps, guardReactiveProps, createCommentVNode, isVNode, resolveDirective, normalizeStyle, withDirectives, normalizeClass, 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, useTimeoutFn } from "@dt-frames/core";
+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 { 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";
+import "ant-design-vue/es/cascader/style";
+import "ant-design-vue/es/input-number/style";
+import "ant-design-vue/es/switch/style";
+import "ant-design-vue/es/tree-select/style";
+import "ant-design-vue/es/slider/style";
+import "ant-design-vue/es/rate/style";
+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";
-const _default = "";
-const index$1 = "";
 var Theme = /* @__PURE__ */ ((Theme2) => {
   Theme2["DARK"] = "dark";
   Theme2["LIGHT"] = "light";
@@ -18,6 +26,7 @@ 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) => {
@@ -69,7 +78,8 @@ const defaultThemeConf = {
     menuWidth: 240,
     trigger: true,
     type: MenuType.SIDE,
-    mode: MenuMode.INLINE
+    mode: MenuMode.INLINE,
+    mixSideTrigger: "hover"
   },
   footerOptions: {
     show: false,
@@ -90,7 +100,8 @@ const useThemeStore = defineStore({
   id: "dt-theme",
   state: () => ({
     themeConf: DtCache.getLocal(CacheKey.THEME) ?? defaultThemeConf,
-    pageLoading: false
+    pageLoading: false,
+    mixSiderHasSubMenu: false
   }),
   getters: {
     getThemeConf() {
@@ -110,6 +121,9 @@ const useThemeStore = defineStore({
     },
     getPageLoading() {
       return this.pageLoading;
+    },
+    getMixSiderIsHasMenu() {
+      return this.mixSiderHasSubMenu;
     }
   },
   actions: {
@@ -117,6 +131,9 @@ const useThemeStore = defineStore({
       let newThemeConf = deepMerge(this.themeConf, options);
       this.themeConf = deepMerge(defaultThemeConf, newThemeConf);
       DtCache.setLocal(CacheKey.THEME, this.themeConf);
+    },
+    setMixSiderIsHasMenu(val) {
+      this.mixSiderHasSubMenu = val;
     }
   }
 });
@@ -145,12 +162,12 @@ defineStore({
         return;
       }
       let updateIndex = -1;
-      const tabHasExits = this.tabList.some((tab, index2) => {
-        updateIndex = index2;
+      const tabHasExits = this.tabList.some((tab, index) => {
+        updateIndex = index;
         return (tab.fullPath || tab.path) === (fullPath || path);
       });
       if (tabHasExits) {
-        const curTab = toRaw$1(this.tabList)[updateIndex];
+        const curTab = toRaw(this.tabList)[updateIndex];
         curTab.params = params || curTab.params;
         curTab.query = query || curTab.query;
         curTab.fullPath = fullPath || curTab.fullPath;
@@ -162,14 +179,14 @@ defineStore({
     },
     closeTab(path, router) {
       const go = useGo(router);
-      const index2 = this.tabList.findIndex((item) => item.path === path);
+      const index = this.tabList.findIndex((item) => item.path === path);
       let page;
-      if (index2 === 0) {
+      if (index === 0) {
         if (this.tabList.length !== 1) {
-          page = this.tabList[index2 + 1];
+          page = this.tabList[index + 1];
         }
       } else {
-        page = this.tabList[index2 - 1];
+        page = this.tabList[index - 1];
       }
       this.bulkCloseTabs([path]);
       this.updateCacheTab();
@@ -178,15 +195,15 @@ defineStore({
     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$1(currentRoute);
+      const route = filterTabList.length > 0 ? filterTabList[filterTabList.length - 1] : unref(currentRoute);
       this.tabList = [route];
       this.updateCacheTab();
       go(route.path);
     },
     closeLeftTabs(path) {
-      const index2 = this.tabList.findIndex((item) => item.path === path);
-      if (index2 > 0) {
-        const leftTabs = this.tabList.slice(0, index2);
+      const index = this.tabList.findIndex((item) => item.path === path);
+      if (index > 0) {
+        const leftTabs = this.tabList.slice(0, index);
         const pathList = [];
         for (const item of leftTabs) {
           const affix = item?.meta?.affix ?? false;
@@ -199,9 +216,9 @@ defineStore({
       this.updateCacheTab();
     },
     closeRightTabs(path) {
-      const index2 = this.tabList.findIndex((item) => item.path === path);
-      if (index2 >= 0 && index2 < this.tabList.length - 1) {
-        const rightTabs = this.tabList.slice(index2 + 1, this.tabList.length);
+      const index = this.tabList.findIndex((item) => item.path === 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;
@@ -241,7 +258,7 @@ defineStore({
       this.cacheTabList = cacheMap;
     },
     async refreshPage(router) {
-      const findTab = this.getCachedTabList.find((item) => item === unref$1(router.currentRoute).name);
+      const findTab = this.getCachedTabList.find((item) => item === unref(router.currentRoute).name);
       if (findTab) {
         this.cacheTabList.delete(findTab.toString());
       }
@@ -258,41 +275,51 @@ defineStore({
 });
 function useMenu() {
   const { getMenuConf, setThemeConf } = useThemeStore();
-  const getCollapsedShowTitle = computed$1(() => getMenuConf.collapsedShowTitle);
-  const getIsSidebarType = computed$1(() => getMenuConf.type === MenuType.SIDE);
-  const getMenuFixed = computed$1(() => getMenuConf.fixed);
-  const getShowMenu = computed$1(() => getMenuConf.show);
-  const getShowSidebar = computed$1(() => {
-    return unref$1(getSplit) || unref$1(getShowMenu) && unref$1(getMenuMode) !== MenuMode.HORIZONTAL;
+  const getCollapsedShowTitle = computed(() => getMenuConf.collapsedShowTitle);
+  const getIsSidebarType = computed(() => getMenuConf.type === MenuType.SIDE);
+  const getMenuFixed = computed(() => getMenuConf.fixed);
+  const getShowMenu = computed(() => getMenuConf.show);
+  const getShowSidebar = computed(() => {
+    return unref(getSplit) || unref(getShowMenu) && unref(getMenuMode) !== MenuMode.HORIZONTAL;
   });
-  const getMenuHidden = computed$1(() => getMenuConf.hidden);
-  const getMenuTheme = computed$1(() => getMenuConf.theme);
-  const getTrigger = computed$1(() => getMenuConf.trigger);
-  const getCanDrag = computed$1(() => getMenuConf.canDrag);
-  const getIsMixMode = computed$1(() => {
-    return unref$1(getMenuMode) === MenuMode.INLINE && unref$1(getMenuType) === MenuType.MIX;
+  const getMenuHidden = computed(() => getMenuConf.hidden);
+  const getMenuTheme = computed(() => getMenuConf.theme);
+  const getTrigger = computed(() => getMenuConf.trigger);
+  const getCanDrag = computed(() => getMenuConf.canDrag);
+  const getIsMixMode = computed(() => {
+    return unref(getMenuMode) === MenuMode.INLINE && unref(getMenuType) === MenuType.MIX;
   });
-  const getMenuWidth = computed$1(() => unref$1(getIsMixMode) ? Number(getMenuConf.menuWidth) - 40 : getMenuConf.menuWidth);
-  const getLogoWidth = computed$1(() => getMenuConf.menuWidth);
-  const getMenuType = computed$1(() => getMenuConf.type);
-  const getIsTopMenu = computed$1(() => unref$1(getMenuType) === MenuType.TOP_MENU);
-  const getMenuMode = computed$1(() => getMenuConf.mode);
-  const getSplit = computed$1(() => getMenuConf.split);
-  const getCollapsed = computed$1(() => getMenuConf.collapsed);
-  const getIsHorizontal = computed$1(() => unref$1(getMenuMode) === MenuMode.HORIZONTAL);
+  const getIsMixSidebar = computed(() => unref(getMenuType) === MenuType.MIX_SIDEBAR);
+  const getMenuWidth = computed(() => {
+    if (unref(getIsMixMode)) {
+      return Number(getMenuConf.menuWidth) - 40;
+    } else if (unref(getIsMixSidebar)) {
+      return Number(getMenuConf.menuWidth) - 10;
+    } else {
+      return Number(getMenuConf.menuWidth);
+    }
+  });
+  const getMixSideTrigger = computed(() => getMenuConf.mixSideTrigger);
+  const getLogoWidth = computed(() => unref(getIsMixSidebar) ? "80px" : getMenuConf.menuWidth);
+  const getMenuType = computed(() => 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 getIsHorizontal = computed(() => unref(getMenuMode) === MenuMode.HORIZONTAL);
   const setThemeStore = (conf = {}) => setThemeConf(conf);
   const toggleCollapsed = () => setThemeStore({
     menuOptions: {
-      collapsed: !unref$1(getCollapsed)
+      collapsed: !unref(getCollapsed)
     }
   });
-  const getMiniWidthNumber = computed$1(() => getMenuConf.collapsedShowTitle ? 80 : 48);
-  const getRealWidth = computed$1(() => {
-    return unref$1(getCollapsed) ? unref$1(getMiniWidthNumber) : unref$1(getMenuWidth);
+  const getMiniWidthNumber = computed(() => getMenuConf.collapsedShowTitle ? 80 : 48);
+  const getRealWidth = computed(() => {
+    return unref(getCollapsed) ? unref(getMiniWidthNumber) : unref(getMenuWidth);
   });
-  const getCalcContentWidth = computed$1(() => {
-    const width = unref$1(getIsTopMenu) || !unref$1(getShowMenu) || unref$1(getSplit) && unref$1(getMenuHidden) ? 0 : unref$1(getRealWidth);
-    return `calc(100% - ${unref$1(width)}px)`;
+  const getCalcContentWidth = computed(() => {
+    const width = unref(getIsTopMenu) || !unref(getShowMenu) || unref(getSplit) && unref(getMenuHidden) ? 0 : unref(getRealWidth);
+    return `calc(100% - ${unref(width)}px)`;
   });
   return {
     getCollapsedShowTitle,
@@ -315,7 +342,9 @@ function useMenu() {
     getRealWidth,
     getCalcContentWidth,
     getIsMixMode,
+    getIsMixSidebar,
     getCanDrag,
+    getMixSideTrigger,
     toggleCollapsed,
     setThemeStore
   };
@@ -348,54 +377,54 @@ function useHeader() {
     getMenuMode,
     getSplit,
     getIsTopMenu,
-    getIsMixMode
+    getIsMixSidebar
   } = useMenu();
   const { getShowMultipleTab } = useMultipleTab();
-  const getHeaderTheme = computed$1(() => getHeaderConf.theme);
-  const getFixed = computed$1(() => getHeaderConf.fixed);
-  const getShowHeaderLogo = computed$1(() => unref$1(getShowLogo) && !unref$1(getIsSidebarType));
-  const getShowSearch = computed$1(() => getHeaderConf.showSearch);
-  const getShowHeaderTrigger = computed$1(() => {
-    if (unref$1(getMenuType) === MenuType.TOP_MENU || !unref$1(getShowMenu) || unref$1(getMenuHidden)) {
+  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$1(getTrigger);
+    return unref(getTrigger);
   });
-  const getShowBreadCrumb = computed$1(() => getHeaderConf.showBreadCrumb);
-  const getShowBread = computed$1(
-    () => unref$1(getMenuMode) !== MenuMode.HORIZONTAL && !unref$1(getSplit) && unref$1(getShowBreadCrumb)
+  const getShowBreadCrumb = computed(() => getHeaderConf.showBreadCrumb);
+  const getShowBread = computed(
+    () => unref(getMenuMode) !== MenuMode.HORIZONTAL && !unref(getSplit) && unref(getShowBreadCrumb)
   );
-  const getShowTopMenu = computed$1(() => unref$1(getMenuMode) === MenuMode.HORIZONTAL || unref$1(getSplit));
-  const getShowNotice = computed$1(() => getHeaderConf.showNotice);
-  const getShowFullScreen = computed$1(() => getHeaderConf.showFullScreen);
-  const getShowLocale = computed$1(() => getHeaderConf.showLocaleSwitch);
-  const getShowSettingTheme = computed$1(() => getHeaderConf.showSettingTheme);
-  const getShowFullHeaderRef = computed$1(() => {
-    return !unref$1(getIsSidebarType) && !unref$1(getIsTopMenu);
+  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$1(() => {
+  const getHeaderHeight = computed(() => {
     let height = 0;
     height += HEADER_HEIGHT;
-    if (unref$1(getShowMultipleTab) && !unref$1(getSplit)) {
+    if (unref(getShowMultipleTab) && !unref(getSplit)) {
       height += TABS_HEIGHT;
     }
     return height;
   });
-  const getTabsHeight = computed$1(() => TABS_HEIGHT);
-  const getShowInsetHeaderRef = computed$1(() => {
-    return unref$1(getIsSidebarType) || unref$1(getIsTopMenu);
+  const getTabsHeight = computed(() => TABS_HEIGHT);
+  const getShowInsetHeaderRef = computed(() => {
+    return unref(getIsSidebarType) || unref(getIsTopMenu) || unref(getIsMixSidebar);
   });
-  const getShowBackToTop = computed$1(() => getHeaderConf.showBackToTop);
-  const getIsZH = computed$1(() => {
+  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$1(() => getHeaderConf?.size ?? UiSize.SMALL);
-  const getShowUiSize = computed$1(() => getHeaderConf?.showSize);
-  const getShowLogo = computed$1(() => getHeaderConf.showLogo);
-  const getShowLoginOut = computed$1(() => getHeaderConf.showLoginOut);
+  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,
@@ -488,24 +517,23 @@ function handleInputNumberValue(component, val) {
   }
   return val;
 }
-const index = "";
 function useFormValue(props, key = "value", changeEvent = "change", emitData) {
   const instance = getCurrentInstance();
   const emit = instance?.emit;
-  const innerState = reactive$1({
+  const innerState = reactive({
     value: props[key]
   });
   const defaultState = readonly(innerState);
   const setState = (val) => {
     innerState.value = val;
-    nextTick$1(() => {
-      emit?.(changeEvent, val, ...toRaw$1(unref$1(emitData)) || []);
+    nextTick(() => {
+      emit?.(changeEvent, val, ...toRaw(unref(emitData)) || []);
     });
   };
   watchEffect(() => {
     innerState.value = props[key];
   });
-  const state = computed$1({
+  const state = computed({
     get() {
       return innerState.value;
     },
@@ -513,14 +541,14 @@ function useFormValue(props, key = "value", changeEvent = "change", emitData) {
       if (isEqual(value, defaultState.value))
         return;
       innerState.value = value;
-      nextTick$1(() => {
-        emit?.(changeEvent, value, ...toRaw$1(unref$1(emitData)) || []);
+      nextTick(() => {
+        emit?.(changeEvent, value, ...toRaw(unref(emitData)) || []);
       });
     }
   });
   return [state, setState, defaultState];
 }
-const _sfc_main$4 = /* @__PURE__ */ defineComponent$1({
+const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   __name: "radioButton",
   props: {
     value: {
@@ -535,7 +563,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent$1({
     const props = __props;
     const attrs = useAttrs();
     const [state] = useFormValue(props);
-    const getOptions = computed$1(() => {
+    const getOptions = computed(() => {
       const { options } = props;
       if (!options || options?.length === 0)
         return [];
@@ -547,13 +575,13 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent$1({
     return (_ctx, _cache) => {
       const _component_ARadioButton = RadioButton;
       const _component_ARadioGroup = RadioGroup;
-      return openBlock(), createBlock(_component_ARadioGroup, mergeProps(unref$1(attrs), {
-        value: unref$1(state),
+      return openBlock(), createBlock(_component_ARadioGroup, mergeProps(unref(attrs), {
+        value: unref(state),
         "onUpdate:value": _cache[0] || (_cache[0] = ($event) => isRef(state) ? state.value = $event : null),
         "button-style": "solid"
       }), {
         default: withCtx(() => [
-          (openBlock(true), createElementBlock(Fragment, null, renderList(unref$1(getOptions), (item) => {
+          (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getOptions), (item) => {
             return openBlock(), createBlock(_component_ARadioButton, {
               key: `${item.value}`,
               value: item.value,
@@ -571,13 +599,21 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent$1({
     };
   }
 });
+const _export_sfc = (sfc, props) => {
+  const target = sfc.__vccOpts || sfc;
+  for (const [key, val] of props) {
+    target[key] = val;
+  }
+  return target;
+};
+const RadioButtonGroup = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/radioButton.vue"]]);
 const _hoisted_1$1 = { class: "input-with-dialog" };
-const _sfc_main$3 = /* @__PURE__ */ defineComponent$1({
+const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   __name: "formInputUseDialog",
   setup(__props) {
     const { t } = useI18n("UI");
-    const attrs = useAttrs$1();
-    const bindProps = computed$1(() => {
+    const attrs = useAttrs();
+    const bindProps = computed(() => {
       return {
         ...omit(attrs, [
           "formValues"
@@ -600,20 +636,21 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent$1({
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$1, [
         createElementVNode("div", { onClick: onClickInput }, [
-          createVNode(unref$1(Input), normalizeProps(guardReactiveProps(unref$1(bindProps))), null, 16)
+          createVNode(unref(Input), normalizeProps(guardReactiveProps(unref(bindProps))), null, 16)
         ]),
-        unref$1(attrs).formValues?.schema?.linkProps?.length ? (openBlock(), createElementBlock("i", {
+        unref(attrs).formValues?.schema?.linkProps?.length ? (openBlock(), createElementBlock("i", {
           key: 0,
           class: "i mdi:close-circle",
           onClick: clearProps
-        })) : createCommentVNode("", true)
+        })) : createCommentVNode("v-if", true)
       ]);
     };
   }
 });
+const DtFormInputDialog = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/formInputUseDialog.vue"]]);
 const components = {
   Input,
-  InputWithDialog: _sfc_main$3,
+  InputWithDialog: DtFormInputDialog,
   InputTextArea: Input.TextArea,
   InputSearch: Input.Search,
   InputGroup: Input.Group,
@@ -622,7 +659,7 @@ const components = {
   TreeSelect,
   Radio,
   RadioGroup: Radio.Group,
-  RadioButtonGroup: _sfc_main$4,
+  RadioButtonGroup,
   Checkbox,
   CheckboxGroup: Checkbox.Group,
   AutoComplete,
@@ -645,7 +682,7 @@ for (let item in components) {
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
-const _sfc_main$2 = defineComponent({
+const _sfc_main$2 = {
   name: "FormItem",
   inheritAttrs: false,
   props: {
@@ -1006,7 +1043,8 @@ const _sfc_main$2 = defineComponent({
       });
     };
   }
-});
+};
+const DtFormItem = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/FormItem.vue"]]);
 const _hoisted_1 = {
   key: 0,
   className: "preIcon pr-1"
@@ -1020,7 +1058,7 @@ const _hoisted_4 = /* @__PURE__ */ createElementVNode("i", { class: "text-2xl i
 const _hoisted_5 = [
   _hoisted_4
 ];
-const _sfc_main$1 = /* @__PURE__ */ defineComponent$1({
+const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "FormButtons",
   props: {
     mode: {
@@ -1107,7 +1145,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent$1({
       const _component_ACol = Col$1;
       const _directive_icon = resolveDirective("icon");
       const _directive_auth = resolveDirective("auth");
-      return __props.show ? (openBlock(), createBlock(_component_ACol, normalizeProps(mergeProps({ key: 0 }, unref$1(colOpt))), {
+      return __props.show ? (openBlock(), createBlock(_component_ACol, normalizeProps(mergeProps({ key: 0 }, unref(colOpt))), {
         default: withCtx(() => [
           createVNode(_component_AFormItem, {
             class: "dt-form-btns",
@@ -1119,58 +1157,60 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent$1({
               (openBlock(true), createElementBlock(Fragment, null, renderList(__props.buttonList, (button) => {
                 return openBlock(), createElementBlock(Fragment, null, [
                   (button.show === void 0 ? true : button.show) ? withDirectives((openBlock(), createBlock(_component_AButton, {
+                    class: normalizeClass(["items-center", button.class]),
                     type: button.type,
-                    class: normalizeClass(button.class),
                     loading: button.loading,
                     disabled: button.disabled,
-                    key: unref$1(key),
+                    key: unref(key),
                     onClick: ($event) => handleBtnClick(button)
                   }, {
                     icon: withCtx(() => [
                       button.preIcon ? withDirectives((openBlock(), createElementBlock("span", _hoisted_1, null, 512)), [
                         [_directive_icon, button.preIcon]
-                      ]) : createCommentVNode("", true)
+                      ]) : createCommentVNode("v-if", true)
                     ]),
                     default: withCtx(() => [
-                      createTextVNode(" " + toDisplayString(unref$1(t)(button.name)) + " ", 1),
+                      createTextVNode(" " + toDisplayString(unref(t)(button.label)) + " ", 1),
                       button.postIcon ? withDirectives((openBlock(), createElementBlock("span", _hoisted_2, null, 512)), [
                         [_directive_icon, button.postIcon]
-                      ]) : createCommentVNode("", true)
+                      ]) : createCommentVNode("v-if", true)
                     ]),
                     _: 2
                   }, 1032, ["type", "class", "loading", "disabled", "onClick"])), [
                     [_directive_auth, button.auth]
-                  ]) : createCommentVNode("", true)
+                  ]) : createCommentVNode("v-if", true)
                 ], 64);
               }), 256)),
-              unref$1(showAdvanceRef) ? (openBlock(), createBlock(_component_AButton, {
+              unref(showAdvanceRef) ? (openBlock(), createBlock(_component_AButton, {
                 key: 0,
                 type: "link",
                 class: "advanced",
                 onClick: toggleAdvanced
               }, {
                 default: withCtx(() => [
-                  createElementVNode("span", _hoisted_3, toDisplayString(unref$1(advancedRef) ? unref$1(t)("UI.ADVANCED") : unref$1(t)("UI.EXPAND")), 1),
+                  createCommentVNode(" \u6536\u8D77 | \u5C55\u5F00 "),
+                  createElementVNode("span", _hoisted_3, toDisplayString(advancedRef.value ? unref(t)("UI.ADVANCED") : unref(t)("UI.EXPAND")), 1),
                   createElementVNode("span", {
-                    class: normalizeClass(unref$1(getAdvanceClass))
+                    class: normalizeClass(unref(getAdvanceClass))
                   }, _hoisted_5, 2)
                 ]),
                 _: 1
-              })) : createCommentVNode("", true)
+              })) : createCommentVNode("v-if", true)
             ]),
             _: 1
           }, 8, ["style"])
         ]),
         _: 1
-      }, 16)) : createCommentVNode("", true);
+      }, 16)) : createCommentVNode("v-if", true);
     };
   }
 });
+const DtFormButtons = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/FormButtons.vue"]]);
 const SEARCH_BTN_NAME = "UI.SEARCH";
 const RESET_BTN_NAME = "UI.RESET";
 const SEARCH_BTNS = [
-  { name: SEARCH_BTN_NAME, preIcon: "mdi:magnify", type: "primary" },
-  { name: RESET_BTN_NAME, preIcon: "mdi:refresh", type: "default" }
+  { label: SEARCH_BTN_NAME, preIcon: "mdi:magnify", type: "primary" },
+  { label: RESET_BTN_NAME, preIcon: "mdi:refresh", type: "default" }
 ];
 function useFormEvents({
   emits,
@@ -1266,22 +1306,22 @@ function useFormEvents({
     schemaRef.value = schemaList;
   }
   function _removeSchemaByName(name, schemaList) {
-    const index2 = schemaList.findIndex((schema) => schema.name === name);
-    if (index2 !== -1) {
+    const index = schemaList.findIndex((schema) => schema.name === name);
+    if (index !== -1) {
       delete formModel[name];
-      schemaList.splice(index2, 1);
+      schemaList.splice(index, 1);
     }
   }
   function appendFormItems(schema, prefixName, first = false) {
     const schemaList = cloneDeep(unref(getSchema));
-    const index2 = schemaList.findIndex((schema2) => schema2.name === prefixName);
-    if (!prefixName || index2 === -1 || first) {
+    const index = schemaList.findIndex((schema2) => schema2.name === prefixName);
+    if (!prefixName || index === -1 || first) {
       first ? schemaList.unshift(...schema) : schemaList.push(...schema);
       schemaRef.value = schemaList;
       return;
     }
-    if (index2 !== -1) {
-      schemaList.splice(index2 + 1, 0, ...schema);
+    if (index !== -1) {
+      schemaList.splice(index + 1, 0, ...schema);
     }
     schemaRef.value = schemaList;
   }
@@ -1355,7 +1395,7 @@ function useFormValues({
 }) {
   const getComMap = () => {
     let comMap = /* @__PURE__ */ new Map();
-    unref$1(getSchema).map((it) => {
+    unref(getSchema).map((it) => {
       if (it.component && it.name) {
         comMap.set(it.name, it);
       }
@@ -1392,7 +1432,7 @@ function useFormValues({
     return vals;
   }
   function initDefault() {
-    const schema = unref$1(getSchema), obj = {};
+    const schema = unref(getSchema), obj = {};
     schema.forEach((item) => {
       const { props = {}, name, component, defaultValue: gDefaultValue, extraName } = item;
       const { defaultValue: itemDefaultValue, mode, format, treeCheckable } = isFunction(props) ? props(formModel) : props;
@@ -1412,7 +1452,7 @@ function useFormValues({
           if (isArray(defaultValue2)) {
             let vals = defaultValue2.map((it) => format ? dayjs(it, format) : dayjs(it));
             if (names.length > 1) {
-              names.map((key, index2) => obj[key] = vals[index2] ?? null);
+              names.map((key, index) => obj[key] = vals[index] ?? null);
             } else {
               obj[names[0]] = vals;
             }
@@ -1421,11 +1461,11 @@ function useFormValues({
           }
         } else {
           if (names.length > 1) {
-            names.forEach((key, index2) => {
-              if (!defaultValue2 || defaultValue2.length - 1 < index2) {
+            names.forEach((key, index) => {
+              if (!defaultValue2 || defaultValue2.length - 1 < index) {
                 obj[key] = null;
               } else {
-                obj[key] = defaultValue2[index2];
+                obj[key] = defaultValue2[index];
               }
             });
           } else {
@@ -1456,23 +1496,29 @@ function useFormActions(opt) {
   const { getProps, defaultValue, updateSchema, getFormValues, setFormValues } = opt;
   const { appConf } = useAppStore();
   function handleAdvanced(isAdvanced) {
-    const { schemas, minShowColumn = appConf.ui.form?.minShowColumn || 2 } = unref(getProps);
-    let schema = schemas.reduce((t, it, index2) => {
-      if (index2 > minShowColumn - 1)
-        it.isAdvanced = isAdvanced;
-      t.push(it);
-      return t;
-    }, []);
+    const {
+      schemas,
+      minShowColumn = appConf.ui.form?.minShowColumn || 2,
+      showAdvancedButton = appConf.ui.form?.showAdvancedButton || true
+    } = unref(getProps);
+    let schema = [...schemas];
+    if (showAdvancedButton) {
+      schema = schemas.reduce((t, it, index) => {
+        if (index > minShowColumn - 1)
+          it.isAdvanced = isAdvanced;
+        t.push(it);
+        return t;
+      }, []);
+    }
     updateSchema(schema);
   }
   function handleMethod(params) {
     const { onSearch, onReset } = unref(getProps);
     if (isBoolean(params)) {
       handleAdvanced(params);
-    } else if (params.name === SEARCH_BTN_NAME) {
-      console.log(getProps);
+    } else if (params.label === SEARCH_BTN_NAME) {
       onSearch(getFormValues());
-    } else if (params.name === RESET_BTN_NAME) {
+    } else if (params.label === RESET_BTN_NAME) {
       setFormValues(toRaw(defaultValue.value));
       onReset(getFormValues());
     } else {
@@ -1492,7 +1538,7 @@ const BasicProps = {
   },
   model: {
     type: Object,
-    default: {}
+    default: () => ({})
   },
   layout: {
     type: String,
@@ -1512,23 +1558,19 @@ const BasicProps = {
   },
   labelCol: {
     type: Object,
-    default: () => {
-    }
+    default: () => ({})
   },
   wrapperCol: {
     type: Object,
-    default: () => {
-    }
+    default: () => ({})
   },
   rowProps: {
     type: Object,
-    default: () => {
-    }
+    default: () => ({})
   },
   colProps: {
     type: Object,
-    default: () => {
-    }
+    default: () => ({})
   },
   size: {
     type: String,
@@ -1550,10 +1592,6 @@ const BasicProps = {
     type: Boolean,
     default: true
   },
-  alwaysShowLines: {
-    type: Boolean,
-    default: false
-  },
   minShowColumn: {
     type: Number,
     default: 2
@@ -1604,7 +1642,7 @@ const BasicProps = {
     type: Function
   }
 };
-const _sfc_main = /* @__PURE__ */ defineComponent$1({
+const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: BasicProps,
   emits: ["register"],
@@ -1618,9 +1656,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent$1({
     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)
       };
     });
@@ -1741,6 +1784,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent$1({
       setFormValues(null);
       emits("register", formActionMethods);
       initDefault();
+      if (unref(getProps)?.registerInstance) {
+        unref(getProps)?.registerInstance(formActionMethods);
+      }
     });
     watch(
       () => unref(getProps).onSearch,
@@ -1769,26 +1815,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent$1({
     return (_ctx, _cache) => {
       const _component_ARow = Row;
       const _component_AForm = Form$1;
-      return openBlock(), createBlock(_component_AForm, mergeProps(unref$1(getBindValue), {
+      return openBlock(), createBlock(_component_AForm, mergeProps(unref(getBindValue), {
         ref_key: "formElRef",
         ref: formElRef,
-        class: unref$1(getFormClass),
-        model: unref$1(formModel),
-        layout: unref$1(getProps).layout,
+        class: unref(getFormClass),
+        model: formModel,
+        layout: unref(getProps).layout,
         onKeypress: withKeys(handleEnterPress, ["enter"])
       }), {
         default: withCtx(() => [
-          createVNode(_component_ARow, mergeProps(unref$1(getProps).rowProps, { style: {
+          createVNode(_component_ARow, mergeProps(unref(getProps).rowProps, { style: {
             margin: 0
           } }), {
             default: withCtx(() => [
-              (openBlock(true), createElementBlock(Fragment, null, renderList(unref$1(getSchema), (schema) => {
-                return openBlock(), createBlock(unref$1(_sfc_main$2), {
+              (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getSchema), (schema) => {
+                return openBlock(), createBlock(unref(DtFormItem), {
                   key: schema.name,
                   schema,
-                  formProps: unref$1(getProps),
-                  formModel: unref$1(formModel),
-                  defaultValues: unref$1(defaultValue),
+                  formProps: unref(getProps),
+                  formModel,
+                  defaultValues: defaultValue.value,
                   setFormModel,
                   formActionType: formActionMethods
                 }, createSlots({ _: 2 }, [
@@ -1802,7 +1848,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent$1({
                   })
                 ]), 1032, ["schema", "formProps", "formModel", "defaultValues"]);
               }), 128)),
-              unref$1(getActionsProps).buttonList?.length ? (openBlock(), createBlock(unref$1(_sfc_main$1), mergeProps({ key: 0 }, unref$1(getActionsProps), { onHandleMethod: unref$1(handleMethod) }), null, 16, ["onHandleMethod"])) : createCommentVNode("", true)
+              unref(getActionsProps).buttonList?.length ? (openBlock(), createBlock(unref(DtFormButtons), mergeProps({ key: 0 }, unref(getActionsProps), { onHandleMethod: unref(handleMethod) }), null, 16, ["onHandleMethod"])) : createCommentVNode("v-if", true)
             ]),
             _: 3
           }, 16)
@@ -1812,6 +1858,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent$1({
     };
   }
 });
+const Forms = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/index.vue"]]);
 function useForm(props) {
   const formRef = ref(null);
   const loadedRef = ref(false);
@@ -1888,7 +1935,7 @@ const withInstall = (comp) => {
   };
   return comp;
 };
-const DtForm = withInstall(_sfc_main);
+const DtForm = withInstall(Forms);
 export {
   DtForm,
   useForm