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

package/lib/ele-pro-layout/components/pro-header.d.ts

@@ -1,5 +1,6 @@
-import { MenuItem, LevelItem, HeaderStyle, MenuItemTrigger, MenuItemProps } from '../types';
-import { EllipsisProps } from '../../ele-menus/types';
+import { MenuItem, LevelItem, HeaderStyle, MenuItemTrigger, MenuItemProps, TabStyle, TabItem, TabItemEventOption } from '../types';
+import { ContextMenus } from '../../ele-tabs/types';
+import { EleDropdownProps } from '../../ele-app/plus';
 import { BreadcrumbItem } from '../../ele-breadcrumb/types';
 import { PropType } from 'vue';
 
@@ -16,7 +17,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 菜单是否省略多余的子项 */
     ellipsis: BooleanConstructor;
     /** 菜单省略项的属性 */
-    ellipsisProps: PropType<EllipsisProps>;
+    ellipsisProps: PropType<import("../../ele-menus/types").EllipsisProps | undefined>;
     /** 父级菜单展开触发方式 */
     menuTrigger: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
     /** 子菜单项触发模式 */
@@ -43,15 +44,36 @@ declare const _default: import('vue').DefineComponent<{
     /** 当前路由是否是主页 */
     isHome: BooleanConstructor;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: BooleanConstructor;
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import("../../ele-tooltip/props").TooltipProps> | undefined>;
+    /** 页签数据 */
+    tabs: {
+        type: PropType<TabItem[]>;
+        required: true;
+    };
+    /** 页签选中 */
+    tabActive: {
+        type: StringConstructor;
+        required: true;
+    };
+    /** 是否需要固定的主页页签 */
+    fixedHome: BooleanConstructor;
+    /** 页签风格 */
+    tabStyle: PropType<TabStyle>;
+    /** 是否支持右键菜单 */
+    tabContextMenu: PropType<boolean | EleDropdownProps>;
+    /** 右键菜单 */
+    tabContextMenus: PropType<ContextMenus>;
+    /** 是否支持拖动排序 */
+    tabSortable: BooleanConstructor;
+    /** 是否需要页签栏 */
+    tabBar: PropType<boolean | "header">;
 }, {
     levelItems: import("vue").ShallowRef<BreadcrumbItem[]>;
     menuItems: import("vue").ComputedRef<Partial<import("../../ele-menus/types").MenuItem>[]>;
     isDark: import("vue").ComputedRef<boolean>;
     isPrimary: import("vue").ComputedRef<boolean>;
     isIconSeparator: import("vue").ComputedRef<boolean>;
+    hasTab: import("vue").ComputedRef<boolean>;
     onLogoClick: () => void;
     onOpen: (index: string, indexPath: string[]) => void;
     onClose: (index: string, indexPath: string[]) => void;
@@ -60,6 +82,10 @@ declare const _default: import('vue').DefineComponent<{
     onItemMouseleave: (item: MenuItemProps, e: MouseEvent) => void;
     onMouseenter: (e: MouseEvent) => void;
     onMouseleave: (e: MouseEvent) => void;
+    onTabClick: (opt: TabItemEventOption) => void;
+    onTabRemove: (opt: TabItemEventOption) => void;
+    onTabContextMenu: (opt: TabItemEventOption) => void;
+    onTabSortChange: (data: TabItem[]) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     logoClick: () => true;
     open: (_index: string, _indexPath: string[]) => true;
@@ -69,6 +95,10 @@ declare const _default: import('vue').DefineComponent<{
     itemMouseleave: (_item: MenuItemProps, _e: MouseEvent) => true;
     mouseEnter: (_e: MouseEvent) => true;
     mouseLeave: (_e: MouseEvent) => true;
+    tabClick: (_opt: TabItemEventOption) => true;
+    tabRemove: (_opt: TabItemEventOption) => true;
+    tabContextMenu: (_opt: TabItemEventOption) => true;
+    tabSortChange: (_data: TabItem[]) => true;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 菜单数据 */
     menus: {
@@ -82,7 +112,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 菜单是否省略多余的子项 */
     ellipsis: BooleanConstructor;
     /** 菜单省略项的属性 */
-    ellipsisProps: PropType<EllipsisProps>;
+    ellipsisProps: PropType<import("../../ele-menus/types").EllipsisProps | undefined>;
     /** 父级菜单展开触发方式 */
     menuTrigger: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
     /** 子菜单项触发模式 */
@@ -109,13 +139,37 @@ declare const _default: import('vue').DefineComponent<{
     /** 当前路由是否是主页 */
     isHome: BooleanConstructor;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: BooleanConstructor;
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import("../../ele-tooltip/props").TooltipProps> | undefined>;
+    /** 页签数据 */
+    tabs: {
+        type: PropType<TabItem[]>;
+        required: true;
+    };
+    /** 页签选中 */
+    tabActive: {
+        type: StringConstructor;
+        required: true;
+    };
+    /** 是否需要固定的主页页签 */
+    fixedHome: BooleanConstructor;
+    /** 页签风格 */
+    tabStyle: PropType<TabStyle>;
+    /** 是否支持右键菜单 */
+    tabContextMenu: PropType<boolean | EleDropdownProps>;
+    /** 右键菜单 */
+    tabContextMenus: PropType<ContextMenus>;
+    /** 是否支持拖动排序 */
+    tabSortable: BooleanConstructor;
+    /** 是否需要页签栏 */
+    tabBar: PropType<boolean | "header">;
 }>> & {
     onOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
+    onTabClick?: ((_opt: TabItemEventOption) => any) | undefined;
+    onTabRemove?: ((_opt: TabItemEventOption) => any) | undefined;
     onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
+    onTabContextMenu?: ((_opt: TabItemEventOption) => any) | undefined;
+    onTabSortChange?: ((_data: TabItem[]) => any) | undefined;
     onItemMouseenter?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
     onItemMouseleave?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
     onLogoClick?: (() => any) | undefined;
@@ -126,7 +180,8 @@ declare const _default: import('vue').DefineComponent<{
     ellipsis: boolean;
     breadcrumb: boolean;
     sidebar: boolean;
-    menuTextEllipsisTooltip: boolean;
+    fixedHome: boolean;
+    tabSortable: boolean;
     isHome: boolean;
 }, {}>;
 export default _default;

package/lib/ele-pro-layout/components/pro-sidebar.cjs

@@ -33,9 +33,7 @@ const _sfc_main = vue.defineComponent({
     /** 菜单图标插槽名称 */
     iconSlot: String,
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: Boolean,
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: Object
+    menuTextEllipsisTooltip: [Boolean, Object]
   },
   emits: {
     open: (_index, _indexPath) => true,
@@ -120,7 +118,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           popperEffect: _ctx.popperEffect,
           collapseTransition: false,
           textEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
-          textEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
           onOpen: _ctx.onOpen,
           onClose: _ctx.onClose,
           onItemClick: _ctx.onItemClick
@@ -139,7 +136,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ]),
             key: "1"
           } : void 0
-        ]), 1032, ["items", "theme", "colorful", "collapse", "defaultActive", "defaultOpeneds", "uniqueOpened", "popperEffect", "textEllipsisTooltip", "textEllipsisTooltipProps", "onOpen", "onClose", "onItemClick"])) : vue.createCommentVNode("", true)
+        ]), 1032, ["items", "theme", "colorful", "collapse", "defaultActive", "defaultOpeneds", "uniqueOpened", "popperEffect", "textEllipsisTooltip", "onOpen", "onClose", "onItemClick"])) : vue.createCommentVNode("", true)
       ]),
       _: 3
     }, 512),

package/lib/ele-pro-layout/components/pro-sidebar.d.ts

@@ -29,9 +29,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: BooleanConstructor;
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import("../../ele-tooltip/props").TooltipProps> | undefined>;
 }, {
     menusRef: import("vue").Ref<ElScrollbarInstance>;
     menuItems: import("vue").ComputedRef<Partial<import("../../ele-menus/types").MenuItem>[]>;
@@ -73,9 +71,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: BooleanConstructor;
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import("../../ele-tooltip/props").TooltipProps> | undefined>;
 }>> & {
     onOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
@@ -86,6 +82,5 @@ declare const _default: import('vue').DefineComponent<{
     uniqueOpened: boolean;
     collapse: boolean;
     colorfulIcon: boolean;
-    menuTextEllipsisTooltip: boolean;
 }, {}>;
 export default _default;

package/lib/ele-pro-layout/components/pro-sidebox.cjs

@@ -31,9 +31,7 @@ const _sfc_main = vue.defineComponent({
     /** 菜单图标插槽名称 */
     iconSlot: String,
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: Boolean,
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: Object
+    menuTextEllipsisTooltip: [Boolean, Object]
   },
   emits: {
     itemClick: (_item, _e) => true,
@@ -121,7 +119,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           firstPopperClass: "ele-admin-sidebox-popup",
           tooltipDisabled: !_ctx.compact,
           textEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
-          textEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
           onItemClick: _ctx.onItemClick,
           onItemMouseenter: _ctx.onItemMouseenter,
           onItemMouseleave: _ctx.onItemMouseleave
@@ -140,7 +137,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ]),
             key: "1"
           } : void 0
-        ]), 1032, ["items", "theme", "popupColorful", "collapse", "defaultActive", "popperEffect", "tooltipDisabled", "textEllipsisTooltip", "textEllipsisTooltipProps", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : vue.createCommentVNode("", true)
+        ]), 1032, ["items", "theme", "popupColorful", "collapse", "defaultActive", "popperEffect", "tooltipDisabled", "textEllipsisTooltip", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : vue.createCommentVNode("", true)
       ]),
       _: 3
     }, 512),

package/lib/ele-pro-layout/components/pro-sidebox.d.ts

@@ -27,9 +27,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: BooleanConstructor;
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import("../../ele-tooltip/props").TooltipProps> | undefined>;
 }, {
     menusRef: import("vue").Ref<ElScrollbarInstance>;
     menuItems: import("vue").ComputedRef<Partial<import("../../ele-menus/types").MenuItem>[]>;
@@ -69,9 +67,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: BooleanConstructor;
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import("../../ele-tooltip/props").TooltipProps> | undefined>;
 }>> & {
     onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
     onItemMouseenter?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
@@ -82,6 +78,5 @@ declare const _default: import('vue').DefineComponent<{
     collapse: boolean;
     compact: boolean;
     colorfulIcon: boolean;
-    menuTextEllipsisTooltip: boolean;
 }, {}>;
 export default _default;

package/lib/ele-pro-layout/components/tab-dropdown.cjs

@@ -69,7 +69,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         popperOptions: {
           modifiers: [{ name: "offset", options: { offset: [12, 8] } }]
         }
-      }, _ctx.dropdownProps, {
+      }, _ctx.dropdownProps || {}, {
         ref: "dropdownRef",
         items: _ctx.items,
         onCommand: _ctx.onCommand

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

@@ -36,6 +36,7 @@ const _sfc_main = vue.defineComponent({
       isHover: false
     };
     const contentRef = vue.ref(null);
+    const modalsRef = vue.ref(null);
     const levelData = vue.shallowRef([]);
     const tabData = vue.shallowRef([]);
     const tabActive = vue.ref(util.getHomePath(props2.homePath));
@@ -93,7 +94,7 @@ const _sfc_main = vue.defineComponent({
         // 图标置于顶栏
         { "ele-admin-logo-auto": logoAuto && !mobile.value },
         // 开启页签栏
-        { "ele-admin-open-tab": props2.tabBar },
+        { "ele-admin-open-tab": props2.tabBar && props2.tabBar !== "header" },
         // 卡片风格页签
         { "ele-admin-tab-card": props2.tabStyle === "button" },
         // 主体定宽
@@ -111,7 +112,7 @@ const _sfc_main = vue.defineComponent({
         return props2.backTopTarget;
       }
       if (props2.fixedBody) {
-        return ".ele-admin-layout.ele-admin-fixed-body>.ele-admin-main>.ele-admin-body>.ele-admin-content";
+        return ".ele-admin-layout.ele-admin-fixed-body>.ele-admin-main>.ele-admin-body>.ele-admin-wrapper>.ele-admin-content";
       }
       return "body";
     });
@@ -738,13 +739,15 @@ const _sfc_main = vue.defineComponent({
         tabBar: props2.tabBar,
         sidebar: sidebar.value,
         keepAlive: props2.tabBar && props2.keepAlive,
-        responsive: props2.responsive
+        responsive: props2.responsive,
+        modalsEl: modalsRef.value
       };
       return state2;
     });
     vue.provide(receiver.LAYOUT_KEY, layoutProvide);
     return {
       contentRef,
+      modalsRef,
       levelData,
       tabData,
       tabActive,
@@ -795,18 +798,23 @@ const _export_sfc = (sfc, props2) => {
   return target;
 };
 const _hoisted_1 = { class: "ele-admin-body" };
-const _hoisted_2 = {
+const _hoisted_2 = { class: "ele-admin-wrapper" };
+const _hoisted_3 = {
   ref: "contentRef",
   class: "ele-admin-content"
 };
+const _hoisted_4 = {
+  ref: "modalsRef",
+  class: "ele-admin-modals"
+};
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ProHeader = vue.resolveComponent("ProHeader");
   const _component_ProSidebox = vue.resolveComponent("ProSidebox");
   const _component_ProSidebar = vue.resolveComponent("ProSidebar");
   const _component_ProTabs = vue.resolveComponent("ProTabs");
   const _component_ProIframe = vue.resolveComponent("ProIframe");
-  const _component_ReceiverView = vue.resolveComponent("ReceiverView");
   const _component_ElBacktop = vue.resolveComponent("ElBacktop");
+  const _component_ReceiverView = vue.resolveComponent("ReceiverView");
   return vue.openBlock(), vue.createElementBlock("div", {
     class: vue.normalizeClass(_ctx.layoutClass)
   }, [
@@ -828,14 +836,25 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       homePath: _ctx.homeMenuPath,
       isHome: _ctx.isHome,
       menuTextEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
-      menuTextEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
+      tabs: _ctx.tabData,
+      tabActive: _ctx.tabActive,
+      fixedHome: _ctx.fixedHome,
+      tabStyle: _ctx.tabStyle,
+      tabContextMenu: _ctx.tabContextMenu,
+      tabContextMenus: _ctx.tabContextMenus,
+      tabSortable: _ctx.tabSortable,
+      tabBar: _ctx.tabBar,
       onLogoClick: _ctx.onLogoClick,
       onOpen: _ctx.onHeadMenuOpen,
       onClsoe: _ctx.onHeadMenuClose,
       onItemClick: _ctx.onNavItemClick,
       onItemMouseenter: _ctx.onNavItemMouseenter,
       onMouseEnter: _ctx.onNavMouseEnter,
-      onMouseLeave: _ctx.onNavMouseLeave
+      onMouseLeave: _ctx.onNavMouseLeave,
+      onTabClick: _ctx.onTabClick,
+      onTabRemove: _ctx.onTabRemove,
+      onTabContextMenu: _ctx.onTabContextMenu,
+      onTabSortChange: _ctx.onTabSortChange
     }, vue.createSlots({ _: 2 }, [
       vue.renderList(Object.keys(_ctx.$slots).filter(
         (k) => ![
@@ -844,11 +863,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           "bottom",
           "boxTop",
           "boxBottom",
-          "footer",
-          "tabTitle",
-          "tabContext",
-          "tabExtra",
-          "tabHome"
+          "footer"
         ].includes(k)
       ), (name) => {
         return {
@@ -858,7 +873,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           ])
         };
       })
-    ]), 1032, ["menus", "headerStyle", "active", "ellipsis", "ellipsisProps", "menuTrigger", "itemTrigger", "collapse", "sidebar", "titleSlot", "iconSlot", "levels", "breadcrumb", "breadcrumbSeparator", "homePath", "isHome", "menuTextEllipsisTooltip", "menuTextEllipsisTooltipProps", "onLogoClick", "onOpen", "onClsoe", "onItemClick", "onItemMouseenter", "onMouseEnter", "onMouseLeave"]),
+    ]), 1032, ["menus", "headerStyle", "active", "ellipsis", "ellipsisProps", "menuTrigger", "itemTrigger", "collapse", "sidebar", "titleSlot", "iconSlot", "levels", "breadcrumb", "breadcrumbSeparator", "homePath", "isHome", "menuTextEllipsisTooltip", "tabs", "tabActive", "fixedHome", "tabStyle", "tabContextMenu", "tabContextMenus", "tabSortable", "tabBar", "onLogoClick", "onOpen", "onClsoe", "onItemClick", "onItemMouseenter", "onMouseEnter", "onMouseLeave", "onTabClick", "onTabRemove", "onTabContextMenu", "onTabSortChange"]),
     vue.createVNode(_component_ReceiverView, {
       class: "ele-admin-main",
       wrapPosition: false
@@ -877,7 +892,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           titleSlot: _ctx.sideboxTitleSlot,
           iconSlot: _ctx.sideboxIconSlot,
           menuTextEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
-          menuTextEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
           onItemClick: _ctx.onBoxItemClick,
           onItemMouseenter: _ctx.onBoxItemMouseenter,
           onMouseEnter: _ctx.onBoxMouseEnter,
@@ -907,7 +921,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ])
             };
           })
-        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "compact", "collapse", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "menuTextEllipsisTooltip", "menuTextEllipsisTooltipProps", "onItemClick", "onItemMouseenter", "onMouseEnter", "onMouseLeave"])) : vue.createCommentVNode("", true),
+        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "compact", "collapse", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "menuTextEllipsisTooltip", "onItemClick", "onItemMouseenter", "onMouseEnter", "onMouseLeave"])) : vue.createCommentVNode("", true),
         _ctx.sidebar ? (vue.openBlock(), vue.createBlock(_component_ProSidebar, {
           key: 1,
           menus: _ctx.sidebarData,
@@ -922,7 +936,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           titleSlot: _ctx.sidebarTitleSlot,
           iconSlot: _ctx.sidebarIconSlot,
           menuTextEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
-          menuTextEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
           onOpen: _ctx.onSideMenuOpen,
           onClsoe: _ctx.onSideMenuClose,
           onItemClick: _ctx.onMenuItemClick,
@@ -953,9 +966,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ])
             };
           })
-        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "collapse", "uniqueOpened", "defaultOpeneds", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "menuTextEllipsisTooltip", "menuTextEllipsisTooltipProps", "onOpen", "onClsoe", "onItemClick", "onMouseEnter", "onMouseLeave"])) : vue.createCommentVNode("", true),
+        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "collapse", "uniqueOpened", "defaultOpeneds", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "menuTextEllipsisTooltip", "onOpen", "onClsoe", "onItemClick", "onMouseEnter", "onMouseLeave"])) : vue.createCommentVNode("", true),
         vue.createElementVNode("div", _hoisted_1, [
-          _ctx.tabBar ? (vue.openBlock(), vue.createBlock(_component_ProTabs, {
+          _ctx.tabBar && _ctx.tabBar !== "header" ? (vue.openBlock(), vue.createBlock(_component_ProTabs, {
             key: 0,
             tabs: _ctx.tabData,
             active: _ctx.tabActive,
@@ -983,6 +996,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             })
           ]), 1032, ["tabs", "active", "tabStyle", "fixedHome", "homePath", "isHome", "tabContextMenu", "tabContextMenus", "tabSortable", "onTabClick", "onTabRemove", "onTabContextMenu", "onTabSortChange"])) : vue.createCommentVNode("", true),
           vue.createElementVNode("div", _hoisted_2, [
+            vue.createElementVNode("div", _hoisted_3, [
+              vue.renderSlot(_ctx.$slots, "default"),
+              !_ctx.hideFooter ? vue.renderSlot(_ctx.$slots, "footer", { key: 0 }) : vue.createCommentVNode("", true)
+            ], 512),
             _ctx.tabBar && _ctx.keepAlive ? (vue.openBlock(), vue.createBlock(_component_ProIframe, {
               key: 0,
               keepAlive: _ctx.keepAlive,
@@ -991,9 +1008,15 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               tabData: _ctx.tabData,
               tabActive: _ctx.tabActive
             }, null, 8, ["keepAlive", "transitionName", "transitionDelay", "tabData", "tabActive"])) : vue.createCommentVNode("", true),
-            vue.renderSlot(_ctx.$slots, "default"),
-            !_ctx.hideFooter ? vue.renderSlot(_ctx.$slots, "footer", { key: 1 }) : vue.createCommentVNode("", true)
-          ], 512)
+            _ctx.backTop ? (vue.openBlock(), vue.createBlock(_component_ElBacktop, {
+              key: _ctx.backTopSelector,
+              target: _ctx.backTopSelector,
+              visibilityHeight: _ctx.backTopVisibilityHeight,
+              bottom: _ctx.backTopBottom,
+              right: _ctx.backTopRight
+            }, null, 8, ["target", "visibilityHeight", "bottom", "right"])) : vue.createCommentVNode("", true),
+            vue.createElementVNode("div", _hoisted_4, null, 512)
+          ])
         ])
       ]),
       _: 3
@@ -1001,14 +1024,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     vue.createElementVNode("div", {
       class: "ele-admin-mask",
       onClick: _cache[0] || (_cache[0] = (...args) => _ctx.updateCollapse && _ctx.updateCollapse(...args))
-    }),
-    _ctx.backTop ? (vue.openBlock(), vue.createBlock(_component_ElBacktop, {
-      key: 0,
-      right: _ctx.backTopRight,
-      bottom: _ctx.backTopBottom,
-      visibilityHeight: _ctx.backTopVisibilityHeight,
-      target: _ctx.backTopSelector
-    }, null, 8, ["right", "bottom", "visibilityHeight", "target"])) : vue.createCommentVNode("", true)
+    })
   ], 2);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

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

@@ -9,7 +9,7 @@ declare const _default: import('vue').DefineComponent<{
     compact: BooleanConstructor;
     maximized: BooleanConstructor;
     tabBar: {
-        type: BooleanConstructor;
+        type: import("vue").PropType<boolean | "header">;
         default: boolean;
     };
     breadcrumb: {
@@ -41,7 +41,7 @@ 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>;
         default: string;
@@ -68,7 +68,8 @@ declare const _default: import('vue').DefineComponent<{
     };
     fixedHeader: {
         type: BooleanConstructor;
-        default: boolean; /** 菜单数据 */
+        /** 页签选中 */
+        default: boolean;
     };
     fixedSidebar: BooleanConstructor;
     fixedBody: BooleanConstructor;
@@ -83,12 +84,11 @@ declare const _default: import('vue').DefineComponent<{
         default: boolean;
     };
     expanded: BooleanConstructor;
-    compressOnEsc: BooleanConstructor;
-    /** 侧栏一级菜单选中 */
+    compressOnEsc: BooleanConstructor; /** 侧栏一级菜单数据 */
     fixedHome: {
         type: BooleanConstructor;
-        default: boolean; /** 侧栏是否隐藏 */
-    };
+        default: boolean;
+    }; /** 侧栏一级菜单选中 */
     homePath: StringConstructor;
     redirectPath: {
         type: StringConstructor;
@@ -102,12 +102,12 @@ declare const _default: import('vue').DefineComponent<{
     tabSortable: BooleanConstructor;
     autoScrollTop: {
         type: BooleanConstructor;
-        default: boolean;
+        default: boolean; /** 是否混合导航布局 */
     };
     headerTitleSlot: {
         type: StringConstructor;
-        default: string;
-    };
+        default: string; /** 是否双侧栏布局 */
+    }; /** 是否双侧栏布局 */
     headerIconSlot: {
         type: StringConstructor;
         default: string;
@@ -137,8 +137,7 @@ declare const _default: import('vue').DefineComponent<{
         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: {
@@ -151,6 +150,7 @@ declare const _default: import('vue').DefineComponent<{
     };
 }, {
     contentRef: Ref<HTMLElement | null>;
+    modalsRef: Ref<HTMLElement | null>;
     levelData: import("vue").ShallowRef<LevelItem[]>;
     tabData: import("vue").ShallowRef<TabItem[]>;
     tabActive: Ref<string>;
@@ -166,7 +166,7 @@ declare const _default: import('vue').DefineComponent<{
     sidebox: import("vue").ComputedRef<boolean>;
     sidebar: import("vue").ComputedRef<boolean>;
     layoutClass: import("vue").ComputedRef<ClassValues>;
-    backTopSelector: import("vue").ComputedRef<string | undefined>;
+    backTopSelector: import("vue").ComputedRef<string>;
     sidebarCollapse: import("vue").ComputedRef<boolean>;
     sidebarTheme: import("vue").ComputedRef<"light" | "dark">;
     updateCollapse: (val?: boolean | MouseEvent) => void;
@@ -211,7 +211,7 @@ declare const _default: import('vue').DefineComponent<{
     compact: BooleanConstructor;
     maximized: BooleanConstructor;
     tabBar: {
-        type: BooleanConstructor;
+        type: import("vue").PropType<boolean | "header">;
         default: boolean;
     };
     breadcrumb: {
@@ -243,7 +243,7 @@ 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>;
         default: string;
@@ -270,7 +270,8 @@ declare const _default: import('vue').DefineComponent<{
     };
     fixedHeader: {
         type: BooleanConstructor;
-        default: boolean; /** 菜单数据 */
+        /** 页签选中 */
+        default: boolean;
     };
     fixedSidebar: BooleanConstructor;
     fixedBody: BooleanConstructor;
@@ -285,12 +286,11 @@ declare const _default: import('vue').DefineComponent<{
         default: boolean;
     };
     expanded: BooleanConstructor;
-    compressOnEsc: BooleanConstructor;
-    /** 侧栏一级菜单选中 */
+    compressOnEsc: BooleanConstructor; /** 侧栏一级菜单数据 */
     fixedHome: {
         type: BooleanConstructor;
-        default: boolean; /** 侧栏是否隐藏 */
-    };
+        default: boolean;
+    }; /** 侧栏一级菜单选中 */
     homePath: StringConstructor;
     redirectPath: {
         type: StringConstructor;
@@ -304,12 +304,12 @@ declare const _default: import('vue').DefineComponent<{
     tabSortable: BooleanConstructor;
     autoScrollTop: {
         type: BooleanConstructor;
-        default: boolean;
+        default: boolean; /** 是否混合导航布局 */
     };
     headerTitleSlot: {
         type: StringConstructor;
-        default: string;
-    };
+        default: string; /** 是否双侧栏布局 */
+    }; /** 是否双侧栏布局 */
     headerIconSlot: {
         type: StringConstructor;
         default: string;
@@ -339,8 +339,7 @@ declare const _default: import('vue').DefineComponent<{
         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: {
@@ -376,7 +375,7 @@ declare const _default: import('vue').DefineComponent<{
     expanded: boolean;
     compact: boolean;
     maximized: boolean;
-    tabBar: boolean;
+    tabBar: boolean | "header";
     keepAlive: boolean;
     responsive: boolean;
     headerStyle: import("./types").HeaderStyle;
@@ -406,6 +405,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,
   /** 内链切换动画 */