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

package/es/ele-pro-layout/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, shallowRef, computed, watch, unref, provide, resolveComponent, openBlock, createElementBlock, normalizeClass, createVNode, createSlots, renderList, withCtx, renderSlot, normalizeProps, guardReactiveProps, createBlock, createCommentVNode, createElementVNode } from "vue";
+import { defineComponent, ref, shallowRef, computed, watch, unref, shallowReactive, provide, resolveComponent, openBlock, createElementBlock, normalizeClass, createVNode, createSlots, renderList, withCtx, renderSlot, normalizeProps, guardReactiveProps, createBlock, createCommentVNode, createElementVNode } from "vue";
 import { useRouter } from "vue-router";
 import { ElBacktop } from "element-plus";
 import { mapTree, isExternalLink } from "../utils/core";
@@ -35,6 +35,7 @@ const _sfc_main = defineComponent({
       isHover: false
     };
     const contentRef = ref(null);
+    const modalsRef = ref(null);
     const levelData = shallowRef([]);
     const tabData = shallowRef([]);
     const tabActive = ref(getHomePath(props.homePath));
@@ -92,7 +93,7 @@ const _sfc_main = defineComponent({
         // 图标置于顶栏
         { "ele-admin-logo-auto": logoAuto && !mobile.value },
         // 开启页签栏
-        { "ele-admin-open-tab": props.tabBar },
+        { "ele-admin-open-tab": props.tabBar && props.tabBar !== "header" },
         // 卡片风格页签
         { "ele-admin-tab-card": props.tabStyle === "button" },
         // 主体定宽
@@ -110,7 +111,7 @@ const _sfc_main = defineComponent({
         return props.backTopTarget;
       }
       if (props.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";
     });
@@ -193,7 +194,6 @@ const _sfc_main = defineComponent({
         current,
         tabData.value,
         homeMenuPath.value,
-        props.fixedHome,
         title
       );
       isHome.value = t.home;
@@ -701,6 +701,24 @@ const _sfc_main = defineComponent({
       },
       { immediate: true }
     );
+    watch([() => props.tabBar, () => props.keepAlive], () => {
+      layoutProvide.keepAlive = props.tabBar && props.keepAlive;
+    });
+    watch(
+      () => props.responsive,
+      () => {
+        layoutProvide.responsive = props.responsive;
+      }
+    );
+    watch(modalsRef, () => {
+      layoutProvide.modalsEl = modalsRef.value;
+    });
+    const layoutProvide = shallowReactive({
+      keepAlive: props.tabBar && props.keepAlive,
+      responsive: props.responsive,
+      modalsEl: modalsRef.value
+    });
+    provide(LAYOUT_KEY, layoutProvide);
     useWindowListener(
       {
         onEscKeydown: (e) => {
@@ -725,25 +743,9 @@ const _sfc_main = defineComponent({
       },
       props
     );
-    const layoutProvide = computed(() => {
-      const state2 = {
-        mobile: mobile.value,
-        collapse: props.collapse,
-        compact: props.compact,
-        topLayout: topLayout.value,
-        mixSidebar: mixSidebar.value,
-        maximized: props.maximized,
-        expanded: props.expanded,
-        tabBar: props.tabBar,
-        sidebar: sidebar.value,
-        keepAlive: props.tabBar && props.keepAlive,
-        responsive: props.responsive
-      };
-      return state2;
-    });
-    provide(LAYOUT_KEY, layoutProvide);
     return {
       contentRef,
+      modalsRef,
       levelData,
       tabData,
       tabActive,
@@ -794,18 +796,23 @@ const _export_sfc = (sfc, props) => {
   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 = resolveComponent("ProHeader");
   const _component_ProSidebox = resolveComponent("ProSidebox");
   const _component_ProSidebar = resolveComponent("ProSidebar");
   const _component_ProTabs = resolveComponent("ProTabs");
   const _component_ProIframe = resolveComponent("ProIframe");
-  const _component_ReceiverView = resolveComponent("ReceiverView");
   const _component_ElBacktop = resolveComponent("ElBacktop");
+  const _component_ReceiverView = resolveComponent("ReceiverView");
   return openBlock(), createElementBlock("div", {
     class: normalizeClass(_ctx.layoutClass)
   }, [
@@ -827,14 +834,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
     }, createSlots({ _: 2 }, [
       renderList(Object.keys(_ctx.$slots).filter(
         (k) => ![
@@ -843,11 +861,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           "bottom",
           "boxTop",
           "boxBottom",
-          "footer",
-          "tabTitle",
-          "tabContext",
-          "tabExtra",
-          "tabHome"
+          "footer"
         ].includes(k)
       ), (name) => {
         return {
@@ -857,7 +871,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"]),
     createVNode(_component_ReceiverView, {
       class: "ele-admin-main",
       wrapPosition: false
@@ -876,7 +890,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,
@@ -906,7 +919,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"])) : createCommentVNode("", true),
+        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "compact", "collapse", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "menuTextEllipsisTooltip", "onItemClick", "onItemMouseenter", "onMouseEnter", "onMouseLeave"])) : createCommentVNode("", true),
         _ctx.sidebar ? (openBlock(), createBlock(_component_ProSidebar, {
           key: 1,
           menus: _ctx.sidebarData,
@@ -921,7 +934,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,
@@ -952,9 +964,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"])) : createCommentVNode("", true),
+        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "collapse", "uniqueOpened", "defaultOpeneds", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "menuTextEllipsisTooltip", "onOpen", "onClsoe", "onItemClick", "onMouseEnter", "onMouseLeave"])) : createCommentVNode("", true),
         createElementVNode("div", _hoisted_1, [
-          _ctx.tabBar ? (openBlock(), createBlock(_component_ProTabs, {
+          _ctx.tabBar && _ctx.tabBar !== "header" ? (openBlock(), createBlock(_component_ProTabs, {
             key: 0,
             tabs: _ctx.tabData,
             active: _ctx.tabActive,
@@ -982,6 +994,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             })
           ]), 1032, ["tabs", "active", "tabStyle", "fixedHome", "homePath", "isHome", "tabContextMenu", "tabContextMenus", "tabSortable", "onTabClick", "onTabRemove", "onTabContextMenu", "onTabSortChange"])) : createCommentVNode("", true),
           createElementVNode("div", _hoisted_2, [
+            createElementVNode("div", _hoisted_3, [
+              renderSlot(_ctx.$slots, "default"),
+              !_ctx.hideFooter ? renderSlot(_ctx.$slots, "footer", { key: 0 }) : createCommentVNode("", true)
+            ], 512),
             _ctx.tabBar && _ctx.keepAlive ? (openBlock(), createBlock(_component_ProIframe, {
               key: 0,
               keepAlive: _ctx.keepAlive,
@@ -990,9 +1006,15 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               tabData: _ctx.tabData,
               tabActive: _ctx.tabActive
             }, null, 8, ["keepAlive", "transitionName", "transitionDelay", "tabData", "tabActive"])) : createCommentVNode("", true),
-            renderSlot(_ctx.$slots, "default"),
-            !_ctx.hideFooter ? renderSlot(_ctx.$slots, "footer", { key: 1 }) : createCommentVNode("", true)
-          ], 512)
+            _ctx.backTop ? (openBlock(), createBlock(_component_ElBacktop, {
+              key: _ctx.backTopSelector,
+              target: _ctx.backTopSelector,
+              visibilityHeight: _ctx.backTopVisibilityHeight,
+              bottom: _ctx.backTopBottom,
+              right: _ctx.backTopRight
+            }, null, 8, ["target", "visibilityHeight", "bottom", "right"])) : createCommentVNode("", true),
+            createElementVNode("div", _hoisted_4, null, 512)
+          ])
         ])
       ]),
       _: 3
@@ -1000,14 +1022,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     createElementVNode("div", {
       class: "ele-admin-mask",
       onClick: _cache[0] || (_cache[0] = (...args) => _ctx.updateCollapse && _ctx.updateCollapse(...args))
-    }),
-    _ctx.backTop ? (openBlock(), createBlock(_component_ElBacktop, {
-      key: 0,
-      right: _ctx.backTopRight,
-      bottom: _ctx.backTopBottom,
-      visibilityHeight: _ctx.backTopVisibilityHeight,
-      target: _ctx.backTopSelector
-    }, null, 8, ["right", "bottom", "visibilityHeight", "target"])) : createCommentVNode("", true)
+    })
   ], 2);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

package/es/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/es/ele-pro-layout/props.js

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

package/es/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/es/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');

package/es/ele-pro-layout/style/layout-mobile.scss

@@ -30,7 +30,7 @@
     width: 100% !important;
   }
 
-  .ele-admin-tabs {
+  .ele-admin-body > .ele-admin-tabs {
     left: 0 !important;
   }
 
@@ -56,7 +56,7 @@
 
     &.is-dark,
     &.is-primary {
-      box-shadow: eleVar('header-dark', 'shadow');
+      box-shadow: eleVar('header', 'dark-shadow');
     }
   }
 }

package/es/ele-pro-layout/style/layout-style.scss

@@ -8,7 +8,7 @@
     top: 0;
   }
 
-  .ele-admin-tabs {
+  .ele-admin-body > .ele-admin-tabs {
     position: sticky;
     top: eleVar('header', 'height');
   }
@@ -85,6 +85,7 @@
 
   .ele-admin-main,
   .ele-admin-body,
+  .ele-admin-wrapper,
   .ele-admin-content {
     overflow-x: hidden;
     overflow-y: auto;
@@ -95,6 +96,10 @@
   .ele-admin-sidebox {
     height: 100%;
   }
+
+  .ele-admin-wrapper > .el-backtop {
+    z-index: eleVar('layout', 'index');
+  }
 }
 
 /* 内容全屏 */
@@ -102,11 +107,11 @@
   .ele-admin-header,
   .ele-admin-sidebar,
   .ele-admin-sidebox,
-  &.ele-admin-expanded .ele-admin-tabs {
+  &.ele-admin-expanded .ele-admin-body > .ele-admin-tabs {
     display: none;
   }
 
-  &.ele-admin-fixed-header .ele-admin-tabs {
+  &.ele-admin-fixed-header .ele-admin-body > .ele-admin-tabs {
     top: 0;
   }
 

package/es/ele-pro-layout/style/layout-theme.scss

@@ -4,9 +4,9 @@
 /* 暗色顶栏 */
 .ele-admin-header.is-dark,
 .ele-admin-header.is-primary {
-  color: eleVar('menu-dark', 'active-color');
-  background: eleVar('header-dark', 'bg');
-  box-shadow: eleVar('header-dark', 'shadow');
+  color: eleVar('header', 'dark-color');
+  background: eleVar('header', 'dark-bg');
+  box-shadow: eleVar('header', 'dark-shadow');
 
   /* 操作按钮 */
   .ele-admin-tool:hover {
@@ -15,32 +15,63 @@
 
   /* 面包屑 */
   .ele-breadcrumb .el-breadcrumb__item {
-    .el-breadcrumb__inner {
-      color: eleVar('menu-dark', 'color');
-
-      &.is-link:hover {
-        color: eleVar('menu-dark', 'active-color');
-      }
+    .el-breadcrumb__inner,
+    .el-breadcrumb__separator {
+      color: rgba(255, 255, 255, 0.8);
     }
 
+    .el-breadcrumb__inner.is-link:hover,
     &:last-child .el-breadcrumb__inner {
-      color: eleVar('menu-dark', 'active-color');
+      color: eleVar('header', 'dark-color');
     }
+  }
 
-    .el-breadcrumb__separator {
-      color: eleVar('menu-dark', 'color');
-    }
+  /* 页签栏 */
+  & > .ele-admin-tabs.ele-tab-wrap,
+  & > .ele-admin-tabs .ele-tabs {
+    $color: eleVar('header', 'dark-color');
+    $hover-bg: eleVar('header', 'dark-tool-hover-bg');
+    #{eleVarName('tab', 'color')}: #{$color};
+    #{eleVarName('tab', 'hover-color')}: #{$color};
+    #{eleVarName('tab', 'close-color')}: #{$color};
+    #{eleVarName('tab', 'close-hover-color')}: #{$color};
+    #{eleVarName('tab', 'close-hover-bg')}: #{$hover-bg};
+    #{eleVarName('tab', 'tool-color')}: #{$color};
+    #{eleVarName('tab', 'tool-hover-color')}: #{$color};
+    #{eleVarName('tab', 'simple-hover-color')}: #{$color};
+    #{eleVarName('tab', 'simple-hover-bg')}: #{$hover-bg};
+    #{eleVarName('tab', 'simple-active-bg')}: #{elVar('bg-color', 'overlay')};
+    #{eleVarName('tab', 'simple-active-line')}: 0px;
+    #{eleVarName('tab', 'simple-tool-hover-bg')}: transparent;
+    #{eleVarName('tab', 'indicator-dot-color')}: rgba(255, 255, 255, 0.4);
+    #{eleVarName('tab', 'indicator-dot-hover-color')}: rgba(255, 255, 255, 0.6);
+    #{eleVarName('tab', 'button-bg')}: #{$hover-bg};
+    #{eleVarName('tab', 'button-hover-bg')}: rgba(255, 255, 255, 0.2);
+    #{eleVarName('tab', 'button-hover-color')}: #{$color};
   }
 }
 
+.ele-admin-header.is-dark > .ele-admin-tabs.ele-tab-wrap,
+.ele-admin-header.is-dark > .ele-admin-tabs .ele-tabs {
+  $color: eleVar('header', 'dark-color');
+  $hover-bg: eleVar('header', 'dark-tool-hover-bg');
+  #{eleVarName('tab', 'active-close-color')}: #{$color};
+  #{eleVarName('tab', 'active-close-hover-color')}: #{$color};
+  #{eleVarName('tab', 'active-close-hover-bg')}: #{$hover-bg};
+  #{eleVarName('tab', 'simple-active-color')}: #{$color};
+  #{eleVarName('tab', 'simple-active-bg')}: #{elVar('color-primary')};
+  #{eleVarName('tab', 'indicator-dot-active-color')}: #{$color};
+  #{eleVarName('tab', 'button-active-color')}: #{$color};
+  #{eleVarName('tab', 'button-active-bg')}: #{elVar('color-primary')};
+}
+
 /* 主色顶栏 */
 .ele-admin-header.is-primary {
   background: elVar('color-primary');
 
+  /* 菜单 */
   .ele-admin-menus > .ele-menu {
-    $hover-bg: eleVar('header-primary', 'hover-bg');
-    $active-bg: eleVar('header-primary', 'active-bg');
-    #{eleVarName('menu-horizontal', 'dark-hover-bg')}: #{$hover-bg};
+    $active-bg: eleVar('header', 'primary-active-bg');
     #{eleVarName('menu-horizontal', 'dark-active-bg')}: #{$active-bg};
   }
 }
@@ -68,18 +99,12 @@
 
     .ele-admin-sidebox {
       background: eleVar('sidebar', 'dark-bg');
-
-      .ele-admin-menus > .el-scrollbar__wrap > .el-scrollbar__view > .ele-menu {
-        & > .el-sub-menu.is-active > .el-sub-menu__title {
-          background: eleVar('menu-dark', 'active-bg');
-        }
-      }
     }
   }
 
   .ele-admin-sidebox .ele-sidebar-tool,
   &:not(.ele-admin-mix-sidebar) .ele-admin-sidebar .ele-sidebar-tool {
-    color: eleVar('menu-dark', 'active-color');
+    color: eleVar('header', 'dark-color');
 
     &:hover {
       background: eleVar('header', 'dark-tool-hover-bg');