ele-admin-plus 1.1.9-beta.10 → 1.1.9-beta.12

package/lib/ele-pro-layout/index.d.ts

@@ -1,15 +1,14 @@
 import { MenuItem, TabItem, LevelItem, TabItemEventOption, MenuItemProps } from './types';
 import { ClassValues } from '../ele-app/types';
-import { Ref } from 'vue';
 
 declare const _default: import('vue').DefineComponent<{
-    menus: import("vue").PropType<MenuItem[] | null>;
-    tabs: import("vue").PropType<TabItem[] | null>;
+    menus: import('vue').PropType<MenuItem[] | null>;
+    tabs: import('vue').PropType<TabItem[] | null>;
     collapse: BooleanConstructor;
     compact: BooleanConstructor;
     maximized: BooleanConstructor;
     tabBar: {
-        type: BooleanConstructor;
+        type: import('vue').PropType<boolean | "header">;
         default: boolean;
     };
     breadcrumb: {
@@ -17,7 +16,7 @@ declare const _default: import('vue').DefineComponent<{
         default: boolean;
     };
     breadcrumbSeparator: {
-        type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
+        type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
         default: string;
     };
     backTop: {
@@ -41,42 +40,43 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    ellipsisProps: import("vue").PropType<import("../ele-menus/types").EllipsisProps>;
+    ellipsisProps: import('vue').PropType<import('../ele-menus/types').EllipsisProps | undefined>;
     menuTrigger: {
-        type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
+        type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
         default: string;
     };
     layout: {
-        type: import("vue").PropType<import("./types").Layout>;
+        type: import('vue').PropType<import('./types').Layout>;
         default: string;
     };
     sidebarLayout: {
-        type: import("vue").PropType<import("./types").SidebarLayout>;
+        type: import('vue').PropType<import('./types').SidebarLayout>;
         default: string;
     };
     headerStyle: {
-        type: import("vue").PropType<import("./types").HeaderStyle>;
+        type: import('vue').PropType<import('./types').HeaderStyle>;
         default: string;
     };
     sidebarStyle: {
-        type: import("vue").PropType<import("./types").SidebarStyle>;
-        default: string;
-    };
+        type: import('vue').PropType<import('./types').SidebarStyle>;
+        default: string; /** 面包屑数据 */
+    }; /** 面包屑数据 */
     tabStyle: {
-        type: import("vue").PropType<import("./types").TabStyle>;
+        type: import('vue').PropType<import('./types').TabStyle>;
         default: string;
     };
     fixedHeader: {
         type: BooleanConstructor;
-        default: boolean; /** 菜单数据 */
+        default: boolean;
     };
     fixedSidebar: BooleanConstructor;
     fixedBody: BooleanConstructor;
     fluid: {
-        type: BooleanConstructor;
+        type: BooleanConstructor; /** 顶栏菜单数据 */
         default: boolean;
     };
     logoInHeader: BooleanConstructor;
+    /** 顶栏菜单选中 */
     colorfulIcon: BooleanConstructor;
     uniqueOpened: {
         type: BooleanConstructor;
@@ -84,10 +84,9 @@ declare const _default: import('vue').DefineComponent<{
     };
     expanded: BooleanConstructor;
     compressOnEsc: BooleanConstructor;
-    /** 侧栏一级菜单选中 */
     fixedHome: {
         type: BooleanConstructor;
-        default: boolean; /** 侧栏是否隐藏 */
+        default: boolean;
     };
     homePath: StringConstructor;
     redirectPath: {
@@ -95,13 +94,14 @@ declare const _default: import('vue').DefineComponent<{
         default: string;
     };
     locale: StringConstructor;
-    i18n: import("vue").PropType<import("./types").MenuI18n>;
-    sidebarOpeneds: import("vue").PropType<string[]>;
-    tabContextMenu: import("vue").PropType<boolean | import("../ele-app/plus").EleDropdownProps>;
-    tabContextMenus: import("vue").PropType<import("../ele-tabs/types").ContextMenus>;
+    i18n: import('vue').PropType<import('./types').MenuI18n>;
+    sidebarOpeneds: import('vue').PropType<string[]>;
+    tabContextMenu: import('vue').PropType<boolean | import('../ele-app/plus').EleDropdownProps>;
+    tabContextMenus: import('vue').PropType<import('../ele-tabs/types').ContextMenus>;
     tabSortable: BooleanConstructor;
     autoScrollTop: {
         type: BooleanConstructor;
+        /** 是否混合导航布局 */
         default: boolean;
     };
     headerTitleSlot: {
@@ -110,7 +110,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     headerIconSlot: {
         type: StringConstructor;
-        default: string;
+        default: string; /** 是否显示双侧栏一级 */
     };
     sidebarTitleSlot: {
         type: StringConstructor;
@@ -119,7 +119,7 @@ declare const _default: import('vue').DefineComponent<{
     sidebarIconSlot: {
         type: StringConstructor;
         default: string;
-    };
+    }; /** 是否显示侧栏 */
     sideboxTitleSlot: {
         type: StringConstructor;
         default: string;
@@ -128,17 +128,16 @@ declare const _default: import('vue').DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    tooltipEffect: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
-    navTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
-    boxTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
-    itemTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
-    beforeClick: import("vue").PropType<import("./types").BeforeClick>;
+    tooltipEffect: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    navTrigger: import('vue').PropType<import('./types').MenuItemTrigger>;
+    boxTrigger: import('vue').PropType<import('./types').MenuItemTrigger>;
+    itemTrigger: import('vue').PropType<import('./types').MenuItemTrigger>;
+    beforeClick: import('vue').PropType<import('./types').BeforeClick>;
     menuHoverTimeout: {
         type: NumberConstructor;
         default: number;
     };
-    menuTextEllipsisTooltip: BooleanConstructor;
-    menuTextEllipsisTooltipProps: import("vue").PropType<Partial<import("../ele-tooltip/props").TooltipProps>>;
+    menuTextEllipsisTooltip: import('vue').PropType<boolean | Partial<import('../ele-tooltip/props').TooltipProps> | undefined>;
     keepAlive: BooleanConstructor;
     transitionName: StringConstructor;
     transitionDelay: {
@@ -150,25 +149,26 @@ declare const _default: import('vue').DefineComponent<{
         default: boolean;
     };
 }, {
-    contentRef: Ref<HTMLElement | null>;
-    levelData: import("vue").ShallowRef<LevelItem[]>;
-    tabData: import("vue").ShallowRef<TabItem[]>;
-    tabActive: Ref<string>;
-    headerData: import("vue").ShallowRef<MenuItem[]>;
-    headerActive: Ref<string | undefined>;
-    sidebarData: import("vue").ShallowRef<MenuItem[]>;
-    sidebarActive: Ref<string | undefined>;
-    sideboxData: import("vue").ShallowRef<MenuItem[]>;
-    sideboxActive: Ref<string | undefined>;
-    hideFooter: Ref<boolean>;
-    homeMenuPath: Ref<string>;
-    isHome: Ref<boolean>;
-    sidebox: import("vue").ComputedRef<boolean>;
-    sidebar: import("vue").ComputedRef<boolean>;
-    layoutClass: import("vue").ComputedRef<ClassValues>;
-    backTopSelector: import("vue").ComputedRef<string | undefined>;
-    sidebarCollapse: import("vue").ComputedRef<boolean>;
-    sidebarTheme: import("vue").ComputedRef<"light" | "dark">;
+    contentRef: import('vue').Ref<HTMLElement | null>;
+    modalsRef: import('vue').Ref<HTMLElement | null>;
+    levelData: import('vue').ShallowRef<LevelItem[]>;
+    tabData: import('vue').ShallowRef<TabItem[]>;
+    tabActive: import('vue').Ref<string>;
+    headerData: import('vue').ShallowRef<MenuItem[]>;
+    headerActive: import('vue').Ref<string | undefined>;
+    sidebarData: import('vue').ShallowRef<MenuItem[]>;
+    sidebarActive: import('vue').Ref<string | undefined>;
+    sideboxData: import('vue').ShallowRef<MenuItem[]>;
+    sideboxActive: import('vue').Ref<string | undefined>;
+    hideFooter: import('vue').Ref<boolean>;
+    homeMenuPath: import('vue').Ref<string>;
+    isHome: import('vue').Ref<boolean>;
+    sidebox: import('vue').ComputedRef<boolean>;
+    sidebar: import('vue').ComputedRef<boolean>;
+    layoutClass: import('vue').ComputedRef<ClassValues>;
+    backTopSelector: import('vue').ComputedRef<string>;
+    sidebarCollapse: import('vue').ComputedRef<boolean>;
+    sidebarTheme: import('vue').ComputedRef<"light" | "dark">;
     updateCollapse: (val?: boolean | MouseEvent) => void;
     onTabClick: (option: TabItemEventOption) => void;
     onTabRemove: (option: TabItemEventOption) => void;
@@ -190,7 +190,7 @@ declare const _default: import('vue').DefineComponent<{
     onMenuItemClick: (item: MenuItemProps, e: MouseEvent) => void;
     onSideMouseEnter: () => void;
     onSideMouseLeave: () => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     'update:collapse': (_collapse: boolean) => boolean;
     'update:maximized': (_val: boolean) => boolean;
     tabAdd: (_data: TabItem) => boolean;
@@ -203,15 +203,15 @@ declare const _default: import('vue').DefineComponent<{
     sideMenuClose: (_index: string, _indexPath: string[]) => boolean;
     headMenuOpen: (_index: string, _indexPath: string[]) => boolean;
     headMenuClose: (_index: string, _indexPath: string[]) => boolean;
-    bodySizeChange: (_option: import("./types").BodySizeChangeOption) => boolean;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-    menus: import("vue").PropType<MenuItem[] | null>;
-    tabs: import("vue").PropType<TabItem[] | null>;
+    bodySizeChange: (_option: import('./types').BodySizeChangeOption) => boolean;
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+    menus: import('vue').PropType<MenuItem[] | null>;
+    tabs: import('vue').PropType<TabItem[] | null>;
     collapse: BooleanConstructor;
     compact: BooleanConstructor;
     maximized: BooleanConstructor;
     tabBar: {
-        type: BooleanConstructor;
+        type: import('vue').PropType<boolean | "header">;
         default: boolean;
     };
     breadcrumb: {
@@ -219,7 +219,7 @@ declare const _default: import('vue').DefineComponent<{
         default: boolean;
     };
     breadcrumbSeparator: {
-        type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
+        type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
         default: string;
     };
     backTop: {
@@ -243,42 +243,43 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    ellipsisProps: import("vue").PropType<import("../ele-menus/types").EllipsisProps>;
+    ellipsisProps: import('vue').PropType<import('../ele-menus/types').EllipsisProps | undefined>;
     menuTrigger: {
-        type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
+        type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
         default: string;
     };
     layout: {
-        type: import("vue").PropType<import("./types").Layout>;
+        type: import('vue').PropType<import('./types').Layout>;
         default: string;
     };
     sidebarLayout: {
-        type: import("vue").PropType<import("./types").SidebarLayout>;
+        type: import('vue').PropType<import('./types').SidebarLayout>;
         default: string;
     };
     headerStyle: {
-        type: import("vue").PropType<import("./types").HeaderStyle>;
+        type: import('vue').PropType<import('./types').HeaderStyle>;
         default: string;
     };
     sidebarStyle: {
-        type: import("vue").PropType<import("./types").SidebarStyle>;
-        default: string;
-    };
+        type: import('vue').PropType<import('./types').SidebarStyle>;
+        default: string; /** 面包屑数据 */
+    }; /** 面包屑数据 */
     tabStyle: {
-        type: import("vue").PropType<import("./types").TabStyle>;
+        type: import('vue').PropType<import('./types').TabStyle>;
         default: string;
     };
     fixedHeader: {
         type: BooleanConstructor;
-        default: boolean; /** 菜单数据 */
+        default: boolean;
     };
     fixedSidebar: BooleanConstructor;
     fixedBody: BooleanConstructor;
     fluid: {
-        type: BooleanConstructor;
+        type: BooleanConstructor; /** 顶栏菜单数据 */
         default: boolean;
     };
     logoInHeader: BooleanConstructor;
+    /** 顶栏菜单选中 */
     colorfulIcon: BooleanConstructor;
     uniqueOpened: {
         type: BooleanConstructor;
@@ -286,10 +287,9 @@ declare const _default: import('vue').DefineComponent<{
     };
     expanded: BooleanConstructor;
     compressOnEsc: BooleanConstructor;
-    /** 侧栏一级菜单选中 */
     fixedHome: {
         type: BooleanConstructor;
-        default: boolean; /** 侧栏是否隐藏 */
+        default: boolean;
     };
     homePath: StringConstructor;
     redirectPath: {
@@ -297,13 +297,14 @@ declare const _default: import('vue').DefineComponent<{
         default: string;
     };
     locale: StringConstructor;
-    i18n: import("vue").PropType<import("./types").MenuI18n>;
-    sidebarOpeneds: import("vue").PropType<string[]>;
-    tabContextMenu: import("vue").PropType<boolean | import("../ele-app/plus").EleDropdownProps>;
-    tabContextMenus: import("vue").PropType<import("../ele-tabs/types").ContextMenus>;
+    i18n: import('vue').PropType<import('./types').MenuI18n>;
+    sidebarOpeneds: import('vue').PropType<string[]>;
+    tabContextMenu: import('vue').PropType<boolean | import('../ele-app/plus').EleDropdownProps>;
+    tabContextMenus: import('vue').PropType<import('../ele-tabs/types').ContextMenus>;
     tabSortable: BooleanConstructor;
     autoScrollTop: {
         type: BooleanConstructor;
+        /** 是否混合导航布局 */
         default: boolean;
     };
     headerTitleSlot: {
@@ -312,7 +313,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     headerIconSlot: {
         type: StringConstructor;
-        default: string;
+        default: string; /** 是否显示双侧栏一级 */
     };
     sidebarTitleSlot: {
         type: StringConstructor;
@@ -321,7 +322,7 @@ declare const _default: import('vue').DefineComponent<{
     sidebarIconSlot: {
         type: StringConstructor;
         default: string;
-    };
+    }; /** 是否显示侧栏 */
     sideboxTitleSlot: {
         type: StringConstructor;
         default: string;
@@ -330,17 +331,16 @@ declare const _default: import('vue').DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    tooltipEffect: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
-    navTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
-    boxTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
-    itemTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
-    beforeClick: import("vue").PropType<import("./types").BeforeClick>;
+    tooltipEffect: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    navTrigger: import('vue').PropType<import('./types').MenuItemTrigger>;
+    boxTrigger: import('vue').PropType<import('./types').MenuItemTrigger>;
+    itemTrigger: import('vue').PropType<import('./types').MenuItemTrigger>;
+    beforeClick: import('vue').PropType<import('./types').BeforeClick>;
     menuHoverTimeout: {
         type: NumberConstructor;
         default: number;
     };
-    menuTextEllipsisTooltip: BooleanConstructor;
-    menuTextEllipsisTooltipProps: import("vue").PropType<Partial<import("../ele-tooltip/props").TooltipProps>>;
+    menuTextEllipsisTooltip: import('vue').PropType<boolean | Partial<import('../ele-tooltip/props').TooltipProps> | undefined>;
     keepAlive: BooleanConstructor;
     transitionName: StringConstructor;
     transitionDelay: {
@@ -364,30 +364,30 @@ declare const _default: import('vue').DefineComponent<{
     onSideMenuClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onHeadMenuOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onHeadMenuClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
-    onBodySizeChange?: ((_option: import("./types").BodySizeChangeOption) => any) | undefined;
+    onBodySizeChange?: ((_option: import('./types').BodySizeChangeOption) => any) | undefined;
 }, {
     uniqueOpened: boolean;
-    menuTrigger: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined;
+    menuTrigger: import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined;
     collapse: boolean;
     ellipsis: boolean;
     breadcrumb: boolean;
-    layout: import("./types").Layout;
+    layout: import('./types').Layout;
     transitionDelay: number;
     expanded: boolean;
     compact: boolean;
     maximized: boolean;
-    tabBar: boolean;
-    keepAlive: boolean;
     responsive: boolean;
-    headerStyle: import("./types").HeaderStyle;
-    breadcrumbSeparator: import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>))[], unknown, unknown> | undefined;
+    headerStyle: import('./types').HeaderStyle;
+    keepAlive: boolean;
+    tabBar: boolean | "header";
+    breadcrumbSeparator: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown> | undefined;
     backTop: boolean;
     backTopVisibilityHeight: number;
     backTopRight: number;
     backTopBottom: number;
-    sidebarLayout: import("./types").SidebarLayout;
-    sidebarStyle: import("./types").SidebarStyle;
-    tabStyle: import("./types").TabStyle;
+    sidebarLayout: import('./types').SidebarLayout;
+    sidebarStyle: import('./types').SidebarStyle;
+    tabStyle: import('./types').TabStyle;
     fixedHeader: boolean;
     fixedSidebar: boolean;
     fixedBody: boolean;
@@ -406,6 +406,5 @@ declare const _default: import('vue').DefineComponent<{
     sideboxTitleSlot: string;
     sideboxIconSlot: string;
     menuHoverTimeout: number;
-    menuTextEllipsisTooltip: boolean;
 }, {}>;
 export default _default;

package/lib/ele-pro-layout/props.cjs

@@ -13,7 +13,7 @@ const proLayoutProps = {
   maximized: Boolean,
   /** 是否需要页签栏 */
   tabBar: {
-    type: Boolean,
+    type: [Boolean, String],
     default: true
   },
   /** 是否需要面包屑导航 */
@@ -187,9 +187,7 @@ const proLayoutProps = {
     default: 600
   },
   /** 是否开启菜单文本溢出提示 */
-  menuTextEllipsisTooltip: Boolean,
-  /** 菜单文本溢出提示属性 */
-  menuTextEllipsisTooltipProps: Object,
+  menuTextEllipsisTooltip: [Boolean, Object],
   /** 是否支持内链缓存 */
   keepAlive: Boolean,
   /** 内链切换动画 */

package/lib/ele-pro-layout/props.d.ts

@@ -1,7 +1,6 @@
 import { MenuItem, TabItem, Layout, SidebarLayout, HeaderStyle, SidebarStyle, TabStyle, MenuI18n, TabItemEventOption, BodySizeChangeOption, MenuItemTrigger, BeforeClick } from './types';
 import { EleDropdownProps } from '../ele-app/plus';
 import { ContextMenus } from '../ele-tabs/types';
-import { EllipsisProps } from '../ele-menus/types';
 import { PropType, ExtractPropTypes } from 'vue';
 
 /**
@@ -20,7 +19,7 @@ export declare const proLayoutProps: {
     maximized: BooleanConstructor;
     /** 是否需要页签栏 */
     tabBar: {
-        type: BooleanConstructor;
+        type: PropType<boolean | "header">;
         default: boolean;
     };
     /** 是否需要面包屑导航 */
@@ -30,7 +29,7 @@ export declare const proLayoutProps: {
     };
     /** 面包屑导航分隔符 */
     breadcrumbSeparator: {
-        type: PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
+        type: PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
         default: string;
     };
     /** 是否需要返回顶部 */
@@ -61,7 +60,7 @@ export declare const proLayoutProps: {
         default: boolean;
     };
     /** 顶栏菜单省略项的属性 */
-    ellipsisProps: PropType<EllipsisProps>;
+    ellipsisProps: PropType<import('../ele-menus/types').EllipsisProps | undefined>;
     /** 顶栏子菜单触发方式 */
     menuTrigger: {
         type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
@@ -194,9 +193,7 @@ export declare const proLayoutProps: {
         default: number;
     };
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: BooleanConstructor;
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import('../ele-tooltip/props').TooltipProps> | undefined>;
     /** 是否支持内链缓存 */
     keepAlive: BooleanConstructor;
     /** 内链切换动画 */

package/lib/ele-pro-layout/style/css-var.scss

@@ -9,21 +9,10 @@
   .ele-admin-header,
   .ele-admin-sidebar,
   .ele-admin-sidebox,
-  .ele-admin-tabs,
-  .ele-modal-inner,
-  .ele-drawer-inner {
+  .ele-admin-tabs {
     @include set-ele-var('header', $var);
   }
 
-  .ele-admin-header.is-dark,
-  .ele-admin-header.is-primary {
-    @include set-ele-var('header-dark', $var);
-  }
-
-  .ele-admin-header.is-primary {
-    @include set-ele-var('header-primary', $var);
-  }
-
   .ele-admin-logo {
     @include set-ele-var('logo', $var);
   }
@@ -32,18 +21,14 @@
   .ele-admin-sidebar,
   .ele-admin-sidebox,
   .ele-admin-body,
-  .ele-admin-mask,
-  .ele-modal-inner,
-  .ele-drawer-inner {
+  .ele-admin-mask {
     @include set-ele-var('sidebar', $var);
   }
 
   .ele-admin-header,
   .ele-admin-sidebox,
   .ele-admin-sidebox-popup,
-  .ele-admin-body,
-  .ele-modal-inner,
-  .ele-drawer-inner {
+  .ele-admin-body {
     @include set-ele-var('sidebox', $var);
   }
 }

package/lib/ele-pro-layout/style/header.scss

@@ -13,6 +13,11 @@
   z-index: calc(#{eleVar('layout', 'index')} + 3);
   flex-shrink: 0;
 
+  &.is-ghost {
+    background: hsla(0, 0%, 100%, 0.04);
+    backdrop-filter: blur(8px);
+  }
+
   /* 图标 */
   .ele-admin-logo {
     color: eleVar('logo', 'color');
@@ -41,7 +46,9 @@
 
   /* 面包屑 */
   .ele-admin-breadcrumb {
+    $tool-padding: eleVar('header', 'tool-padding');
     flex-shrink: 0;
+    margin-left: calc(#{eleVar('header', 'tools-padding')} + #{$tool-padding});
   }
 
   /* 菜单 */
@@ -59,21 +66,79 @@
     }
   }
 
-  /* 工具栏 */
-  .ele-admin-tools {
-    height: 100%;
-    flex-shrink: 0;
-    padding: 0 12px;
-    display: flex;
-    align-items: center;
-    box-sizing: border-box;
+  /* 页签栏 */
+  & > .ele-admin-tabs {
+    flex: 1;
+    overflow: hidden;
+    line-height: normal;
+
+    &.ele-tab-wrap {
+      padding-right: 0;
+      background: none;
+      box-shadow: none;
+    }
+
+    & + .ele-admin-tools {
+      padding-left: 0;
+    }
+
+    &.is-simple,
+    &.is-indicator {
+      align-self: flex-end;
+    }
+  }
+
+  & > .ele-admin-tabs.ele-tab-wrap.is-simple,
+  & > .ele-admin-tabs.ele-tab-wrap.is-indicator,
+  & > .ele-tab-wrap .ele-tabs.is-simple,
+  & > .ele-tab-wrap .ele-tabs.is-indicator {
+    $height: eleVar('header', 'height');
+    $tool-height: eleVar('header', 'tool-height');
+    $tab-height: calc(#{$height} - (#{$height} - #{$tool-height}) / 2);
+    #{eleVarName('tab', 'height')}: #{$tab-height};
+  }
+}
+
+/* 工具栏 */
+.ele-admin-tools {
+  display: flex;
+  align-items: center;
+  padding: 0 eleVar('header', 'tools-padding');
+  box-sizing: border-box;
+  flex-shrink: 0;
+  height: 100%;
+
+  & + .ele-admin-breadcrumb {
+    margin-left: 0;
+  }
+
+  & + .ele-admin-tabs {
+    &.ele-tab-wrap,
+    &:not(.is-fixed-home) .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
+      padding-left: 0;
+    }
+  }
+
+  & + .is-simple,
+  & + .is-indicator {
+    &.is-fixed-home,
+    &:not(.is-fixed-home) .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
+      padding-left: eleVar('tab', 'simple-angle-size');
+    }
+  }
+
+  & + .is-button {
+    &.is-fixed-home,
+    &:not(.is-fixed-home) .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
+      padding-left: eleVar('tab', 'button-space');
+    }
   }
 }
 
 /* 操作按钮 */
 .ele-admin-tool {
   height: eleVar('header', 'tool-height');
-  padding: 0 12px;
+  padding: 0 eleVar('header', 'tool-padding');
   display: flex;
   align-items: center;
   border-radius: eleVar('header', 'tool-radius');