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

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

@@ -1,8 +1,8 @@
-import type { PropType, ExtractPropTypes } from 'vue';
-import type { EllipsisProps } from '../ele-menus/types';
-import type { ContextMenus } from '../ele-tabs/types';
-import type { EleDropdownProps } from '../ele-app/plus';
-import type { MenuItem, TabItem, Layout, SidebarLayout, HeaderStyle, SidebarStyle, TabStyle, MenuI18n, TabItemEventOption, BodySizeChangeOption, MenuItemTrigger, BeforeClick } from './types';
+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 { PropType, ExtractPropTypes } from 'vue';
+
 /**
  * 属性
  */
@@ -19,7 +19,7 @@ export declare const proLayoutProps: {
     maximized: BooleanConstructor;
     /** 是否需要页签栏 */
     tabBar: {
-        type: BooleanConstructor;
+        type: PropType<boolean | "header">;
         default: boolean;
     };
     /** 是否需要面包屑导航 */
@@ -29,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;
     };
     /** 是否需要返回顶部 */
@@ -60,10 +60,10 @@ 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>;
+        type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
         default: string;
     };
     /** 布局类型 */
@@ -178,7 +178,7 @@ export declare const proLayoutProps: {
         default: string;
     };
     /** 菜单 tooltip 主题 */
-    tooltipEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    tooltipEffect: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     /** 顶栏菜单触发模式 */
     navTrigger: PropType<MenuItemTrigger>;
     /** 双侧栏一级菜单触发模式 */
@@ -187,6 +187,13 @@ export declare const proLayoutProps: {
     itemTrigger: PropType<MenuItemTrigger>;
     /** 菜单点击事件前钩子 */
     beforeClick: PropType<BeforeClick>;
+    /** hover模式的菜单切换超时 */
+    menuHoverTimeout: {
+        type: NumberConstructor;
+        default: number;
+    };
+    /** 是否开启菜单文本溢出提示 */
+    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
   },
   /** 是否需要面包屑导航 */
@@ -179,6 +179,13 @@ const proLayoutProps = {
   itemTrigger: String,
   /** 菜单点击事件前钩子 */
   beforeClick: Function,
+  /** hover模式的菜单切换超时 */
+  menuHoverTimeout: {
+    type: Number,
+    default: 600
+  },
+  /** 是否开启菜单文本溢出提示 */
+  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');

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

@@ -19,14 +19,21 @@
     transition: width $ele-transition;
   }
 
-  .ele-admin-content {
+  .ele-admin-wrapper {
     flex: auto;
     display: flex;
     flex-direction: column;
+    position: relative;
+
+    & > .el-backtop {
+      z-index: calc(#{eleVar('layout', 'index')} + 1);
+    }
   }
 
-  & > .el-backtop {
-    z-index: eleVar('layout', 'index');
+  .ele-admin-content {
+    flex: auto;
+    display: flex;
+    flex-direction: column;
   }
 }
 
@@ -72,3 +79,16 @@
   flex-shrink: 0;
   overflow: hidden;
 }
+
+/* 弹窗容器 */
+.ele-admin-modals {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+  z-index: eleVar('layout', 'index');
+}

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

@@ -103,7 +103,6 @@
         }
 
         & > .el-sub-menu.is-active > .el-sub-menu__title {
-          background: eleVar('menu-item', 'active-bg');
           transition: none;
         }
 

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

@@ -15,23 +15,31 @@
   /* 固定主页页签 */
   &.is-fixed-home {
     padding-left: eleVar('page', 'padding');
+
+    &.is-tag .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
+      padding-left: eleVar('tab', 'tag-space');
+    }
+
+    &.is-button .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
+      padding-left: eleVar('tab', 'button-space');
+    }
+  }
+
+  /* 页签风格适配 */
+  &.is-tag {
+    padding-right: eleVar('tab', 'tag-space');
+  }
+
+  &.is-button {
+    padding-right: eleVar('page', 'padding');
+    background: eleVar('layout', 'bg');
+    box-shadow: none;
   }
 }
 
 /* 顶栏阴影改分割线 */
 .ele-admin-open-tab:not(.ele-admin-tab-card) {
-  .ele-admin-header:not(.is-dark, .is-primary) {
+  .ele-admin-header:not(.is-dark):not(.is-primary) {
     box-shadow: 0 -0.8px 0 eleVar('header', 'line-color') inset;
   }
 }
-
-/* 按钮风格页签 */
-.ele-admin-tab-card .ele-admin-tabs {
-  padding-right: eleVar('page', 'padding');
-  background: eleVar('layout', 'bg');
-  box-shadow: none;
-
-  &.is-fixed-home .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
-    padding-left: eleVar('tab-button', 'space');
-  }
-}

package/es/ele-pro-layout/types.d.ts

@@ -117,7 +117,7 @@ export type SidebarStyle = 'light' | 'dark';
 /**
  * 页签风格
  */
-export type TabStyle = 'simple' | 'indicator' | 'button';
+export type TabStyle = 'simple' | 'indicator' | 'button' | 'tag';
 
 /**
  * 菜单标题国际化方法
@@ -230,12 +230,12 @@ export type BreadcrumbSeparator = ElBreadcrumbProps['separatorIcon'];
 /**
  * 混合模式菜单切换模式
  */
-export type MenuItemTrigger = 'route' | 'click';
+export type MenuItemTrigger = 'route' | 'click' | 'hover';
 
 /**
- * 菜单点击前钩子
+ * 子菜单项点击前钩子
  */
-export type BeforeClick = (item: EleMenuItemProps) => boolean;
+export type BeforeClick = (item: EleMenuItemProps, e: MouseEvent) => boolean;
 
 /**
  * 内链数据
@@ -245,9 +245,35 @@ export interface IframeItem {
   id: string;
   /** 地址 */
   src: string;
+  /** 是否是刷新状态 */
+  refresh?: boolean;
 }
 
 /**
  * 标签页标题组件实例
  */
 export type TabTitleInstance = InstanceType<typeof TabTitle> | null;
+
+/**
+ * 顶栏状态数据
+ */
+export interface HeaderState {
+  /** 是否是鼠标进入状态 */
+  hover: boolean;
+  /** 鼠标离开状态定时器 */
+  timer?: number | null;
+}
+
+/**
+ * 状态数据
+ */
+export interface LayoutState {
+  headerActive?: string;
+  sideboxActive?: string;
+  sidebarActive?: string;
+  headerData: MenuItem[];
+  sideboxData: MenuItem[];
+  sidebarData: MenuItem[];
+  menuTimer?: number | null;
+  isHover: boolean;
+}

package/es/ele-pro-layout/util.d.ts

@@ -1,6 +1,7 @@
-import type { RouteLocationMatched } from 'vue-router';
-import type { ProLayoutProps } from './props';
-import type { MenuMeta, MenuItem, TabItem, LevelItem, CurrentRoute, WindowListenerOption, MatchedResult, MixActiveResult } from './types';
+import { MenuMeta, MenuItem, TabItem, LevelItem, CurrentRoute, WindowListenerOption, MatchedResult, MixActiveResult } from './types';
+import { ProLayoutProps } from './props';
+import { RouteLocationMatched } from 'vue-router';
+
 /**
  * 判断路由是否是主页
  * @param route 路由信息
@@ -95,4 +96,4 @@ export declare function useDisableTransition(): {
  * @param menus 菜单数据
  * @param link 是否使用超链接
  */
-export declare function getMenuItems(menus: MenuItem[], link: boolean): Partial<import("../ele-menus/types").MenuItem>[];
+export declare function getMenuItems(menus: MenuItem[], link: boolean): Partial<import('../ele-menus/types').MenuItem>[];