@dt-frames/ui 2.0.3 → 2.0.5

package/es/components/curd/src/components/Curd.d.ts

@@ -100,10 +100,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 type: BooleanConstructor;
                 default: boolean;
             };
-            alwaysShowLines: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
             minShowColumn: {
                 type: NumberConstructor;
                 default: number;
@@ -1152,10 +1148,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 type: BooleanConstructor;
                 default: boolean;
             };
-            alwaysShowLines: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
             minShowColumn: {
                 type: NumberConstructor;
                 default: number;

package/es/components/curd/src/props.d.ts

@@ -105,10 +105,6 @@ export declare const basicProps: {
                 type: BooleanConstructor;
                 default: boolean;
             };
-            alwaysShowLines: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
             minShowColumn: {
                 type: NumberConstructor;
                 default: number;

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

@@ -7709,7 +7709,7 @@ declare const DtDrawer: import('../../utils/withInstall').SFCWithInstall<import(
         cancelText?: string;
         footer?: {
             t?: string;
-            name: string;
+            label: string;
             color?: "" | "error" | "warning" | "success";
             type?: "default" | "link" | "dashed" | "text" | "primary" | "ghost";
             class?: string;

package/es/components/drawer/index.js

@@ -1,6 +1,6 @@
 import { Button, FormItem, Col, Drawer } from "ant-design-vue/es";
 import "ant-design-vue/es/drawer/style";
-import { defineComponent, getCurrentInstance as getCurrentInstance$1, ref as ref$1, inject, computed, onUnmounted, h as h$1, provide, onMounted, nextTick as nextTick$1, unref, openBlock, createElementBlock, createElementVNode, normalizeClass, normalizeStyle, createBlock, resolveDynamicComponent, withCtx, renderSlot, createVNode, mergeProps, toDisplayString, watch, resolveDirective, normalizeProps, Fragment, renderList, withDirectives, createCommentVNode, createTextVNode, useAttrs, createSlots, guardReactiveProps, reactive, toRaw as toRaw$1 } from "vue";
+import { defineComponent, getCurrentInstance, ref, inject, computed, onUnmounted, h, provide, onMounted, nextTick as nextTick$1, unref, onBeforeUnmount, openBlock, createElementBlock, createElementVNode, normalizeClass, normalizeStyle, createBlock, resolveDynamicComponent, withCtx, renderSlot, createVNode, mergeProps, toDisplayString, watch, resolveDirective, normalizeProps, Fragment, renderList, withDirectives, createCommentVNode, createTextVNode, useAttrs, toRaw, createSlots, guardReactiveProps, reactive, watchEffect } from "vue";
 import { off, on, useI18n, dispatchResize, isFunction, DtCache, CacheKey, deepMerge, isUnDef, useApp, isObject, error } from "@dt-frames/core";
 import "ant-design-vue/es/col/style";
 import "ant-design-vue/es/form/style";
@@ -73,14 +73,14 @@ const Bar = defineComponent({
     move: Number
   },
   setup(props) {
-    const instance = getCurrentInstance$1();
-    const thumb = ref$1();
+    const instance = getCurrentInstance();
+    const thumb = ref();
     const wrap = inject("scroll-bar-wrap", {});
     const bar = computed(() => {
       return BAR_MAP[props.vertical ? "vertical" : "horizontal"];
     });
-    const barStore = ref$1({});
-    const cursorDown = ref$1();
+    const barStore = ref({});
+    const cursorDown = ref();
     const clickThumbHandler = (e) => {
       if (e.ctrlKey || e.button === 2) {
         return;
@@ -124,13 +124,13 @@ const Bar = defineComponent({
     onUnmounted(() => {
       off(document, "mouseup", mouseUpDocumentHandler);
     });
-    return () => h$1(
+    return () => h(
       "div",
       {
         class: ["scrollbar__bar", "is-" + bar.value.key],
         onMousedown: clickTrackHandler
       },
-      h$1("div", {
+      h("div", {
         ref: thumb,
         class: "scrollbar__thumb",
         onMousedown: clickThumbHandler,
@@ -168,12 +168,12 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const sizeWidth = ref$1("0");
-    const sizeHeight = ref$1("0");
-    const moveX = ref$1(0);
-    const moveY = ref$1(0);
-    const wrap = ref$1();
-    const resize = ref$1();
+    const sizeWidth = ref("0");
+    const sizeHeight = ref("0");
+    const moveX = ref(0);
+    const moveY = ref(0);
+    const wrap = ref();
+    const resize = ref();
     provide("scroll-bar-wrap", wrap);
     const style = computed(() => {
       let rsStyle = {};
@@ -354,7 +354,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: emits }) {
     const props = __props;
     const { t } = useI18n();
-    const advancedRef = ref$1(props.isAdvanced);
+    const advancedRef = ref(props.isAdvanced);
     let key = 0;
     const showAdvanceRef = computed(() => {
       return props.mode === "search" ? props.showAdvancedButton : false;
@@ -423,7 +423,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                   (button.show === void 0 ? true : button.show) ? withDirectives((openBlock(), createBlock(_component_AButton, {
                     type: button.type,
                     class: normalizeClass(button.class),
-                    loading: button.loading?.value,
+                    loading: button.loading,
                     disabled: button.disabled,
                     key: unref(key),
                     onClick: ($event) => handleBtnClick(button)
@@ -434,7 +434,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                       ]) : createCommentVNode("", true)
                     ]),
                     default: withCtx(() => [
-                      createTextVNode(" " + toDisplayString(unref(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)
@@ -492,8 +492,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       if (props.buttons && props.buttons.length)
         return props.buttons;
       let buttonActions = [
-        { t: "\u4FDD\u5B58", name: props.okText || t("SAVE"), preIcon: "mdi:content-save", type: "primary", flag: "OK" },
-        { t: "\u5173\u95ED", name: props.cancelText || t("CLOSE"), preIcon: "mdi:close", flag: "CANCEL" }
+        { t: "\u4FDD\u5B58", label: props.okText || t("SAVE"), preIcon: "mdi:content-save", type: "primary", flag: "OK" },
+        { t: "\u5173\u95ED", label: props.cancelText || t("CLOSE"), preIcon: "mdi:close", flag: "CANCEL" }
       ];
       if (!props.showSave)
         buttonActions = buttonActions.filter((btn) => btn.flag !== "OK");
@@ -572,9 +572,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: emits }) {
     const props = __props;
     const attrs = useAttrs();
-    const propsRef = ref$1(null);
+    const propsRef = ref(null);
     const auths = DtCache.getLocal(CacheKey.AUTHS);
-    const visibleRef = ref$1(false);
+    const visibleRef = ref(false);
     const getMergeProps = computed(() => {
       return deepMerge(toRaw(props), unref(propsRef));
     });
@@ -728,9 +728,9 @@ const orgDialogProp = reactive({});
 const cbTransfer = reactive({});
 const dataTransfer = reactive({});
 function useDrawerOut() {
-  const drawer = ref$1(null);
-  const loaded = ref$1(false);
-  const uid = ref$1("");
+  const drawer = ref(null);
+  const loaded = ref(false);
+  const uid = ref("");
   const { isProd } = useApp();
   function register(drawerMethods, uuid) {
     if (!getCurrentInstance()) {
@@ -765,7 +765,7 @@ function useDrawerOut() {
     },
     openDrawer: (params = null, afterClose) => {
       const id = unref(uid);
-      dataTransfer[id] = isObject(params) ? { ...toRaw$1(params) } : params;
+      dataTransfer[id] = isObject(params) ? { ...toRaw(params) } : params;
       getInstance()?.setDrawerProps({
         defaultFullscreen: false,
         ...orgDialogProp[id],
@@ -784,9 +784,9 @@ function useDrawerOut() {
   return [register, methods];
 }
 function useDrawer(props, setModalData) {
-  const drawerInstanceRef = ref$1(null);
+  const drawerInstanceRef = ref(null);
   const currentInstance = getCurrentInstance();
-  const uidRef = ref$1("");
+  const uidRef = ref("");
   const { isProd } = useApp();
   const getInstance = () => {
     const instance = unref(drawerInstanceRef);
@@ -802,7 +802,7 @@ function useDrawer(props, setModalData) {
     uidRef.value = uuid;
     drawerInstanceRef.value = drawerInstance;
     currentInstance?.emit("register", drawerInstance, uuid);
-    orgDialogProp[uuid] = toRaw$1(props);
+    orgDialogProp[uuid] = toRaw(props);
     drawerInstance.setDrawerProps(props);
   }
   watchEffect(() => {

package/es/components/drawer/src/index.d.ts

@@ -1,4 +1,3 @@
-import { Recordable } from '@dt-frames/core';
 import { DrawerMethods, DrawerProps } from './types/index.type';
 import { CSSProperties } from 'vue';
 declare const _sfc_main: import("vue").DefineComponent<{
@@ -7711,7 +7710,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         cancelText?: string;
         footer?: {
             t?: string;
-            name: string;
+            label: string;
             color?: "" | "error" | "warning" | "success";
             type?: "default" | "link" | "dashed" | "text" | "primary" | "ghost";
             class?: string;
@@ -7895,7 +7894,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             key: number;
             showAdvanceRef: import("vue").ComputedRef<boolean>;
             colOpt: import("vue").ComputedRef<{
-                style: Recordable<any>;
+                style: import("@dt-frames/core").Recordable<any>;
             }>;
             getAdvanceClass: import("vue").ComputedRef<(string | {
                 'basic-arrow--active': boolean;

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

@@ -76,10 +76,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         type: BooleanConstructor;
         default: boolean;
     };
-    alwaysShowLines: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     minShowColumn: {
         type: NumberConstructor;
         default: number;
@@ -212,10 +208,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 type: BooleanConstructor;
                 default: boolean;
             };
-            alwaysShowLines: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
             minShowColumn: {
                 type: NumberConstructor;
                 default: number;
@@ -354,10 +346,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             type: BooleanConstructor;
             default: boolean;
         };
-        alwaysShowLines: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
         minShowColumn: {
             type: NumberConstructor;
             default: number;
@@ -2469,10 +2457,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             type: BooleanConstructor;
             default: boolean;
         };
-        alwaysShowLines: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
         minShowColumn: {
             type: NumberConstructor;
             default: number;
@@ -2603,10 +2587,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             type: BooleanConstructor;
             default: boolean;
         };
-        alwaysShowLines: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
         minShowColumn: {
             type: NumberConstructor;
             default: number;
@@ -2747,10 +2727,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 type: BooleanConstructor;
                 default: boolean;
             };
-            alwaysShowLines: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
             minShowColumn: {
                 type: NumberConstructor;
                 default: number;
@@ -2898,10 +2874,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                         type: BooleanConstructor;
                         default: boolean;
                     };
-                    alwaysShowLines: {
-                        type: BooleanConstructor;
-                        default: boolean;
-                    };
                     minShowColumn: {
                         type: NumberConstructor;
                         default: number;
@@ -3133,10 +3105,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         type: BooleanConstructor;
         default: boolean;
     };
-    alwaysShowLines: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     minShowColumn: {
         type: NumberConstructor;
         default: number;
@@ -3203,7 +3171,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
     compact: boolean;
     schemas: import("./src/types/form.type").FormSchema[];
     autoSearchOnEnter: boolean;
-    alwaysShowLines: boolean;
     minShowColumn: number;
     showAdvancedButton: boolean;
     allowClear: boolean;

package/es/components/form/index.js

@@ -1,12 +1,19 @@
 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 as toRaw$1, 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 { 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";
@@ -19,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) => {
@@ -70,7 +78,8 @@ const defaultThemeConf = {
     menuWidth: 240,
     trigger: true,
     type: MenuType.SIDE,
-    mode: MenuMode.INLINE
+    mode: MenuMode.INLINE,
+    mixSideTrigger: "hover"
   },
   footerOptions: {
     show: false,
@@ -91,7 +100,8 @@ const useThemeStore = defineStore({
   id: "dt-theme",
   state: () => ({
     themeConf: DtCache.getLocal(CacheKey.THEME) ?? defaultThemeConf,
-    pageLoading: false
+    pageLoading: false,
+    mixSiderHasSubMenu: false
   }),
   getters: {
     getThemeConf() {
@@ -111,6 +121,9 @@ const useThemeStore = defineStore({
     },
     getPageLoading() {
       return this.pageLoading;
+    },
+    getMixSiderIsHasMenu() {
+      return this.mixSiderHasSubMenu;
     }
   },
   actions: {
@@ -118,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;
     }
   }
 });
@@ -151,7 +167,7 @@ defineStore({
         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;
@@ -273,8 +289,18 @@ function useMenu() {
   const getIsMixMode = computed(() => {
     return unref(getMenuMode) === MenuMode.INLINE && unref(getMenuType) === MenuType.MIX;
   });
-  const getMenuWidth = computed(() => unref(getIsMixMode) ? Number(getMenuConf.menuWidth) - 40 : getMenuConf.menuWidth);
-  const getLogoWidth = computed(() => getMenuConf.menuWidth);
+  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);
@@ -316,7 +342,9 @@ function useMenu() {
     getRealWidth,
     getCalcContentWidth,
     getIsMixMode,
+    getIsMixSidebar,
     getCanDrag,
+    getMixSideTrigger,
     toggleCollapsed,
     setThemeStore
   };
@@ -325,12 +353,14 @@ 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
@@ -349,12 +379,12 @@ function useHeader() {
     getMenuMode,
     getSplit,
     getIsTopMenu,
-    getIsMixMode
+    getIsMixSidebar
   } = useMenu();
-  const { getShowMultipleTab } = useMultipleTab();
+  const { getShowMultipleTab, getMultipleTabPosIsTop } = useMultipleTab();
   const getHeaderTheme = computed(() => getHeaderConf.theme);
   const getFixed = computed(() => getHeaderConf.fixed);
-  const getShowHeaderLogo = computed(() => unref(getShowLogo) && !unref(getIsSidebarType));
+  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)) {
@@ -372,19 +402,20 @@ function useHeader() {
   const getShowLocale = computed(() => getHeaderConf.showLocaleSwitch);
   const getShowSettingTheme = computed(() => getHeaderConf.showSettingTheme);
   const getShowFullHeaderRef = computed(() => {
-    return !unref(getIsSidebarType) && !unref(getIsTopMenu);
+    return !unref(getIsSidebarType) && !unref(getIsMixSidebar) && !unref(getIsTopMenu);
   });
   const getHeaderHeight = computed(() => {
     let height = 0;
     height += HEADER_HEIGHT;
-    if (unref(getShowMultipleTab) && !unref(getSplit)) {
+    console.log(getMultipleTabPosIsTop);
+    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);
+    return unref(getIsSidebarType) || unref(getIsTopMenu) || unref(getIsMixSidebar);
   });
   const getShowBackToTop = computed(() => getHeaderConf.showBackToTop);
   const getIsZH = computed(() => {
@@ -499,7 +530,7 @@ function useFormValue(props, key = "value", changeEvent = "change", emitData) {
   const setState = (val) => {
     innerState.value = val;
     nextTick(() => {
-      emit?.(changeEvent, val, ...toRaw$1(unref(emitData)) || []);
+      emit?.(changeEvent, val, ...toRaw(unref(emitData)) || []);
     });
   };
   watchEffect(() => {
@@ -514,7 +545,7 @@ function useFormValue(props, key = "value", changeEvent = "change", emitData) {
         return;
       innerState.value = value;
       nextTick(() => {
-        emit?.(changeEvent, value, ...toRaw$1(unref(emitData)) || []);
+        emit?.(changeEvent, value, ...toRaw(unref(emitData)) || []);
       });
     }
   });
@@ -1119,9 +1150,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               (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?.value,
+                    loading: button.loading,
                     disabled: button.disabled,
                     key: unref(key),
                     onClick: ($event) => handleBtnClick(button)
@@ -1132,7 +1163,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                       ]) : createCommentVNode("", true)
                     ]),
                     default: withCtx(() => [
-                      createTextVNode(" " + toDisplayString(unref(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)
@@ -1169,8 +1200,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
 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,
@@ -1186,7 +1217,7 @@ function useFormEvents({
     const formEl = unref(formElRef);
     if (!formEl)
       return {};
-    return handleFormValues(toRaw$1(unref(formModel)));
+    return handleFormValues(toRaw(unref(formModel)));
   }
   function updateSchema(data) {
     let updateItems = [];
@@ -1224,7 +1255,7 @@ function useFormEvents({
       obj[name] = null;
       if (!isNullAndUnDef(it.defaultValue))
         return obj[name] = it.defaultValue;
-      let props = isFunction(it.props) ? it.props(toRaw$1(unref(formModel))) : it.props;
+      let props = isFunction(it.props) ? it.props(toRaw(unref(formModel))) : it.props;
       if (!isNullAndUnDef(props?.defaultValue))
         obj[name] = props.defaultValue;
     });
@@ -1253,7 +1284,7 @@ function useFormEvents({
       formModel[key] = isInput ? defaultValue.value[key] || "" : defaultValue.value[key];
     });
     nextTick(() => clearValidate());
-    emits("reset", toRaw$1(formModel));
+    emits("reset", toRaw(formModel));
   }
   function removeFormByName(names) {
     if (!names)
@@ -1456,23 +1487,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, index) => {
-      if (index > minShowColumn - 1)
-        it.isAdvanced = isAdvanced;
-      t.push(it);
-      return t;
-    }, []);
+    const {
+      schemas,
+      minShowColumn = appConf.ui.form?.minShowColumn || 2,
+      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 {
@@ -1546,10 +1583,6 @@ const BasicProps = {
     type: Boolean,
     default: true
   },
-  alwaysShowLines: {
-    type: Boolean,
-    default: false
-  },
   minShowColumn: {
     type: Number,
     default: 2
@@ -1742,6 +1775,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       setFormValues(null);
       emits("register", formActionMethods);
       initDefault();
+      if (unref(getProps)?.registerInstance) {
+        unref(getProps)?.registerInstance(formActionMethods);
+      }
     });
     watch(
       () => unref(getProps).onSearch,