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

package/lib/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/lib/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/lib/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/lib/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;
   }
 }
 
@@ -58,17 +65,40 @@
 }
 
 /* iframe */
+.ele-admin-iframe-wrap {
+  flex-shrink: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  pointer-events: none;
+  overflow: hidden;
+}
+
 .ele-admin-iframe {
+  flex-shrink: 0;
   width: 100%;
   height: 100%;
-  box-sizing: border-box;
-  display: block;
   border: none;
+  box-sizing: border-box;
+  pointer-events: auto;
 }
 
-.ele-admin-iframe-wrap {
+/* 弹窗容器 */
+.ele-admin-modals {
+  flex-shrink: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
   width: 100%;
   height: 100%;
-  flex-shrink: 0;
-  overflow: hidden;
+  pointer-events: none;
+  z-index: eleVar('layout', 'index');
 }

package/lib/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/lib/ele-pro-layout/style/tabs.scss

@@ -15,6 +15,25 @@
   /* 固定主页页签 */
   &.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;
   }
 }
 
@@ -24,14 +43,3 @@
     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/lib/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';
 
 /**
  * 菜单标题国际化方法

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

@@ -111,14 +111,13 @@ function getMatchedComponents(matched) {
   });
   return components;
 }
-function getRouteTab(current, tabs, homePath, fixedHome, routeTitle) {
+function getRouteTab(current, tabs, homePath, routeTitle) {
   const { path, fullPath, meta, matched } = current;
   const key = meta.tabUnique === false ? fullPath : path;
   const t = findTabByPath(key, tabs);
   const title = (t == null ? void 0 : t.title) || routeTitle;
   const home = isHomeRoute(current, homePath);
-  const isFixedHome = fixedHome && home;
-  const closable = isFixedHome ? false : (t == null ? void 0 : t.closable) ?? meta.closable !== false;
+  const closable = (t == null ? void 0 : t.closable) ?? meta.closable !== false;
   const components = getMatchedComponents(matched);
   return { key, path, fullPath, title, closable, home, components, meta };
 }

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

@@ -58,11 +58,10 @@ export declare function getMatchedComponents(matched: RouteLocationMatched[]): s
  * @param current 路由信息
  * @param tabs 当前页签数据
  * @param homePath 主页地址
- * @param fixedHome 是否固定主页
  * @param repeatableTabs 可重复打开的页签
  * @param routeTitle 路由对应的标题
  */
-export declare function getRouteTab(current: CurrentRoute, tabs: TabItem[], homePath: string, fixedHome?: boolean, routeTitle?: string): TabItem;
+export declare function getRouteTab(current: CurrentRoute, tabs: TabItem[], homePath: string, routeTitle?: string): TabItem;
 /**
  * 获取混合导航布局选中
  * @param matched 路由匹配的菜单层级数据

package/lib/ele-pro-table/components/table-tools.d.ts

@@ -30,7 +30,7 @@ declare const _default: import('vue').DefineComponent<{
     spanMethod: PropType<((data: {
         row: DataItem; /** 提示方向 */
         rowIndex: number;
-        column: import("element-plus/es/components/table/src/table-column/defaults").TableColumnCtx<DataItem>;
+        column: import('element-plus').TableColumnCtx<DataItem>;
         columnIndex: number;
     }) => number[] | {
         rowspan: number;
@@ -41,15 +41,15 @@ declare const _default: import('vue').DefineComponent<{
     /** 合计行文本 */
     sumText: StringConstructor;
     /** 合计行自定义方法 */
-    summaryMethod: PropType<import("element-plus/es/components/table/src/table/defaults").SummaryMethod<DataItem> | undefined>;
+    summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
     /** 单元格样式 */
-    cellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<DataItem> | undefined>;
+    cellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
     /** 单元格类名自定义 */
-    cellClassName: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<DataItem> | undefined>;
+    cellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 单元格样式 */
-    headerCellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<DataItem> | undefined>;
+    headerCellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
     /** 单元格类名自定义 */
-    headerCellClassName: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<DataItem> | undefined>;
+    headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
     /** 表格请求数据方法 */
@@ -65,18 +65,18 @@ declare const _default: import('vue').DefineComponent<{
         required: true;
     };
 }, {
-    lang: import("vue").ComputedRef<TableLocale>;
-    placement: import("vue").ComputedRef<"top" | "bottom">;
+    lang: import('vue').ComputedRef<TableLocale>;
+    placement: import('vue').ComputedRef<"top" | "bottom">;
     reload: () => void;
     updateSize: (size: string) => void;
     updateColumns: (columns: Columns) => void;
     toggleMaximized: () => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     reload: () => true;
     'update:size': (_size: TableSize) => true;
     'update:columns': (_columns: Columns) => true;
     'update:maximized': (_maximized: boolean) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 工具按钮布局 */
     tools: {
         type: PropType<string[]>;
@@ -104,7 +104,7 @@ declare const _default: import('vue').DefineComponent<{
     spanMethod: PropType<((data: {
         row: DataItem; /** 提示方向 */
         rowIndex: number;
-        column: import("element-plus/es/components/table/src/table-column/defaults").TableColumnCtx<DataItem>;
+        column: import('element-plus').TableColumnCtx<DataItem>;
         columnIndex: number;
     }) => number[] | {
         rowspan: number;
@@ -115,15 +115,15 @@ declare const _default: import('vue').DefineComponent<{
     /** 合计行文本 */
     sumText: StringConstructor;
     /** 合计行自定义方法 */
-    summaryMethod: PropType<import("element-plus/es/components/table/src/table/defaults").SummaryMethod<DataItem> | undefined>;
+    summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
     /** 单元格样式 */
-    cellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<DataItem> | undefined>;
+    cellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
     /** 单元格类名自定义 */
-    cellClassName: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<DataItem> | undefined>;
+    cellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 单元格样式 */
-    headerCellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<DataItem> | undefined>;
+    headerCellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
     /** 单元格类名自定义 */
-    headerCellClassName: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<DataItem> | undefined>;
+    headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
     /** 表格请求数据方法 */
@@ -141,7 +141,7 @@ declare const _default: import('vue').DefineComponent<{
 }>> & {
     "onUpdate:columns"?: ((_columns: Columns) => any) | undefined;
     onReload?: (() => any) | undefined;
-    "onUpdate:size"?: ((_size: "" | "default" | "small" | "large" | undefined) => any) | undefined;
+    "onUpdate:size"?: ((_size: "" | "small" | "default" | "large" | undefined) => any) | undefined;
     "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;
 }, {
     showSummary: boolean;

package/lib/ele-pro-table/components/tool-column-list.d.ts

@@ -20,14 +20,14 @@ declare const _default: import('vue').DefineComponent<{
     onChildSortChange: (colItems: ColItem[], parent?: ColItem) => void;
     onChildFixedLeftTooltip: (el: HTMLElement) => void;
     onChildFixedRightTooltip: (el: HTMLElement) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     sortChange: (_colItems: ColItem[], _parent?: ColItem) => true;
     checkedChange: (_item: ColItem, _checked: boolean) => true;
     fixedLeft: (_item: ColItem) => true;
     fixedRight: (_item: ColItem) => true;
     fixedLeftTooltip: (_el: HTMLElement) => true;
     fixedRightTooltip: (_el: HTMLElement) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 列配置数据 */
     data: PropType<ColItem[]>;
     /** 父级数据 */

package/lib/ele-pro-table/components/tool-column.d.ts

@@ -6,7 +6,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 提示文字 */
     title: StringConstructor;
     /** 提示位置 */
-    placement: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
+    placement: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
     /** 全选文字 */
     checkAllText: StringConstructor;
     /** 重置文字 */
@@ -26,17 +26,17 @@ declare const _default: import('vue').DefineComponent<{
     /** 列配置缓存本地的名称 */
     cacheKey: StringConstructor;
 }, {
-    data: import("vue").Ref<{
+    data: import('vue').Ref<{
         uid: string;
         label?: string | undefined;
         checked?: boolean | undefined;
         fixed?: string | boolean | undefined;
         children?: any[] | undefined;
     }[]>;
-    isCheckAll: import("vue").Ref<boolean>;
-    isIndeterminate: import("vue").Ref<boolean>;
-    tooltipContent: import("vue").Ref<string>;
-    virtualRef: import("vue").Ref<any>;
+    isCheckAll: import('vue').Ref<boolean>;
+    isIndeterminate: import('vue').Ref<boolean>;
+    tooltipContent: import('vue').Ref<string>;
+    virtualRef: import('vue').Ref<any>;
     onCheckedChange: (item: ColItem, checked: boolean) => void;
     onCheckAllChange: (checked: boolean) => void;
     onReset: () => void;
@@ -45,13 +45,13 @@ declare const _default: import('vue').DefineComponent<{
     onFixedRight: (colItem: ColItem) => void;
     onFixedLeftTooltip: (el: HTMLElement) => void;
     onFixedRightTooltip: (el: HTMLElement) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     'update:columns': (_columns: Columns) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 提示文字 */
     title: StringConstructor;
     /** 提示位置 */
-    placement: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
+    placement: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
     /** 全选文字 */
     checkAllText: StringConstructor;
     /** 重置文字 */