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

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,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/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';
 
 /**
  * 菜单标题国际化方法

package/es/ele-pro-table/components/tool-print.js

@@ -129,9 +129,6 @@ const _sfc_main = defineComponent({
     };
     const onPrintDone = () => {
       hideLoading();
-      if (props.printerProps != null && typeof props.printerProps.onDone === "function") {
-        props.printerProps.onDone();
-      }
     };
     const printData = (data) => {
       showLoading();

package/es/ele-pro-table/index.d.ts

@@ -121,7 +121,6 @@ declare const _default: import('vue').DefineComponent<{
         row: any;
         rowIndex: number;
         column: import("element-plus/es/components/table/src/table-column/defaults").TableColumnCtx<any>;
-        /** 请求数据回调 */
         columnIndex: number;
     }) => number[] | {
         rowspan: number;
@@ -222,7 +221,7 @@ declare const _default: import('vue').DefineComponent<{
     'update:current': (_current?: DataItem | null | undefined) => boolean;
     columnsChange: (_columns: Columns) => boolean;
     sizeChange: (_size: "" | "default" | "small" | "large" | undefined) => boolean;
-    maximizedChange: (_maximized: boolean) => boolean;
+    maximizedChange: (_maximized: boolean) => boolean; /** 表格尺寸 */
     refresh: () => boolean;
     select: (_selection: DataItem[], _row: DataItem) => boolean;
     selectAll: (_selection: DataItem[]) => boolean;
@@ -241,9 +240,9 @@ declare const _default: import('vue').DefineComponent<{
     filterChange: (_filter: Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
     headerDragend: (_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => boolean;
-    expandChange: (_row: DataItem, _expanded: boolean) => boolean; /** 数据请求状态 */
+    expandChange: (_row: DataItem, _expanded: boolean) => boolean;
     'update:currentRowKey': (_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => boolean;
-    'update:selectedRowKeys': (_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => boolean;
+    'update:selectedRowKeys': (_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => boolean; /** 表格尺寸 */
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     rowKey: {
         type: import("vue").PropType<string | ((row: DataItem) => string) | undefined>;
@@ -362,7 +361,6 @@ declare const _default: import('vue').DefineComponent<{
         row: any;
         rowIndex: number;
         column: import("element-plus/es/components/table/src/table-column/defaults").TableColumnCtx<any>;
-        /** 请求数据回调 */
         columnIndex: number;
     }) => number[] | {
         rowspan: number;

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

@@ -60,7 +60,8 @@ const _sfc_main = defineComponent({
         {
           total: tableTotal.value,
           pageSize: tableLimit.value,
-          currentPage: tablePage.value
+          currentPage: tablePage.value,
+          hasNext: tableData.value.length >= tableLimit.value
         }
       );
     });

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

@@ -27,7 +27,7 @@ export declare function getTableLimit(pagination: boolean | TablePagination | un
  * @param globalPagination 全局配置分页组件属性
  * @param pageProps 分页相关的属性
  */
-export declare function getPaginationProps(size: TableSize, pagination: boolean | TablePagination | undefined, globalPagination: boolean | TablePagination | undefined, pageProps?: Pick<ElePaginationProps, 'total' | 'pageSize' | 'currentPage'>): ElePaginationProps | null;
+export declare function getPaginationProps(size: TableSize, pagination: boolean | TablePagination | undefined, globalPagination: boolean | TablePagination | undefined, pageProps?: Pick<ElePaginationProps, 'total' | 'pageSize' | 'currentPage' | 'hasNext'>): ElePaginationProps | null;
 /**
  * 判断是否开启自动修正页码
  * @param pagination 分页组件属性

package/es/ele-tab-wrap/index.js

@@ -19,7 +19,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       { "is-large": _ctx.size === "large" },
       { "is-simple": _ctx.type === "simple" },
       { "is-indicator": _ctx.type === "indicator" },
-      { "is-button": _ctx.type === "button" }
+      { "is-button": _ctx.type === "button" },
+      { "is-tag": _ctx.type === "tag" }
     ])
   }, [
     renderSlot(_ctx.$slots, "default")

package/es/ele-table-select/index.d.ts

@@ -1,5 +1,4 @@
-import { DataKey, DataItem, Column } from '../ele-data-table/types';
-import { DoneParams } from '../ele-pro-table/types';
+import { DataKey, DataItem } from '../ele-data-table/types';
 import { SingleValue, SelectValue, SelectedItem } from '../ele-basic-select/types';
 import { EleBasicSelectInstance, EleProTableInstance } from '../ele-app/plus';
 
@@ -22,12 +21,12 @@ declare const _default: import('vue').DefineComponent<{
         default: string;
     };
     initValue: import("vue").PropType<DataItem | DataItem[]>;
-    cacheData: import("vue").PropType<DataItem[]>;
+    cacheData: import("vue").PropType<DataItem[]>; /** 表格组件 */
     tableProps: {
-        type: import("vue").PropType<import("../ele-app/plus").EleProTableProps>;
+        type: import("vue").PropType<import("../ele-app/plus").EleProTableProps>; /** 下拉框是否显示 */
         required: boolean;
     };
-    maxTagCount: NumberConstructor; /** 下拉框是否显示 */
+    maxTagCount: NumberConstructor; /** 选中的标签 */
     maxTagTextLength: NumberConstructor;
     tagType: {
         type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined>;
@@ -85,10 +84,12 @@ declare const _default: import('vue').DefineComponent<{
     onSelectFilter: (keywords: string) => void;
     updateSelectedRowKeys: (rowKeys: DataKey[]) => void;
     updateCurrentRowKey: (rowKey?: DataKey) => void;
-    onTableCurrentChange: (row?: DataItem | null, old?: DataItem | null) => void;
-    onTableSelectionChange: (selection: DataItem[]) => void;
-    onTableRowClick: (row: DataItem, column: Column, e: MouseEvent) => void;
-    onTableDone: (result: DoneParams<DataItem>, parent?: DataItem) => void;
+    onTableCurrentChange: (row?: DataItem | null) => void;
+    onTableSelectionChange: () => void;
+    onTableRowClick: (row: DataItem) => void;
+    onTableSelect: (selection: DataItem[]) => void;
+    onTableSelectAll: (selection: DataItem[]) => void;
+    onTableDone: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:modelValue': (_value: SelectValue) => boolean;
     change: (_value: SelectValue) => boolean;
@@ -118,12 +119,12 @@ declare const _default: import('vue').DefineComponent<{
         default: string;
     };
     initValue: import("vue").PropType<DataItem | DataItem[]>;
-    cacheData: import("vue").PropType<DataItem[]>;
+    cacheData: import("vue").PropType<DataItem[]>; /** 表格组件 */
     tableProps: {
-        type: import("vue").PropType<import("../ele-app/plus").EleProTableProps>;
+        type: import("vue").PropType<import("../ele-app/plus").EleProTableProps>; /** 下拉框是否显示 */
         required: boolean;
     };
-    maxTagCount: NumberConstructor; /** 下拉框是否显示 */
+    maxTagCount: NumberConstructor; /** 选中的标签 */
     maxTagTextLength: NumberConstructor;
     tagType: {
         type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined>;

package/es/ele-table-select/index.js

@@ -228,39 +228,35 @@ const _sfc_main = defineComponent({
         updateModelValue(rowKey);
       }
     };
-    const onTableCurrentChange = (row, old) => {
+    const onTableCurrentChange = (row) => {
       if (!props.multiple && row != null) {
         updateSelectedItems(true);
-        emit("select", row);
-      }
-      if (props.tableProps != null && typeof props.tableProps.onCurrentChange === "function") {
-        props.tableProps.onCurrentChange(row, old);
       }
     };
-    const onTableSelectionChange = (selection) => {
+    const onTableSelectionChange = () => {
       if (props.multiple) {
         updateSelectedItems(true);
-        emit("select", selection);
-      }
-      if (props.tableProps != null && typeof props.tableProps.onSelectionChange === "function") {
-        props.tableProps.onSelectionChange(selection);
       }
     };
-    const onTableRowClick = (row, column, e) => {
+    const onTableRowClick = (row) => {
+      var _a;
       if (!props.multiple) {
         updateVisible(false);
+        emit("select", row);
+      } else if (((_a = props.tableProps) == null ? void 0 : _a.rowClickChecked) && tableRef.value) {
+        emit("select", tableRef.value.getSelectionRows() || []);
       }
-      if (props.tableProps != null && typeof props.tableProps.onRowClick === "function") {
-        props.tableProps.onRowClick(row, column, e);
-      }
     };
-    const onTableDone = (result, parent) => {
+    const onTableSelect = (selection) => {
+      emit("select", selection);
+    };
+    const onTableSelectAll = (selection) => {
+      emit("select", selection);
+    };
+    const onTableDone = () => {
       nextTick(() => {
         updatePopover();
       });
-      if (props.tableProps != null && typeof props.tableProps.onDone === "function") {
-        props.tableProps.onDone(result, parent);
-      }
     };
     watch(
       () => props.modelValue,
@@ -322,6 +318,8 @@ const _sfc_main = defineComponent({
       onTableCurrentChange,
       onTableSelectionChange,
       onTableRowClick,
+      onTableSelect,
+      onTableSelectAll,
       onTableDone
     };
   }
@@ -370,19 +368,22 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   }, createSlots({
     default: withCtx(() => [
       renderSlot(_ctx.$slots, "topExtra"),
-      createVNode(_component_EleProTable, mergeProps(_ctx.tableProps || {}, {
-        ref: "tableRef",
-        rowKey: _ctx.valueKey,
-        reserveCurrent: true,
-        highlightCurrentRow: !_ctx.multiple,
-        currentRowKey: _ctx.currentRowKey,
-        selectedRowKeys: _ctx.selectedRowKeys,
+      createVNode(_component_EleProTable, mergeProps({
         "onUpdate:selectedRowKeys": _ctx.updateSelectedRowKeys,
         "onUpdate:currentRowKey": _ctx.updateCurrentRowKey,
         onSelectionChange: _ctx.onTableSelectionChange,
         onCurrentChange: _ctx.onTableCurrentChange,
         onRowClick: _ctx.onTableRowClick,
+        onSelect: _ctx.onTableSelect,
+        onSelectAll: _ctx.onTableSelectAll,
         onDone: _ctx.onTableDone
+      }, _ctx.tableProps || {}, {
+        ref: "tableRef",
+        rowKey: _ctx.valueKey,
+        reserveCurrent: true,
+        highlightCurrentRow: !_ctx.multiple,
+        currentRowKey: _ctx.currentRowKey,
+        selectedRowKeys: _ctx.selectedRowKeys
       }), createSlots({ _: 2 }, [
         renderList(Object.keys(_ctx.$slots).filter(
           (k) => !["topExtra", "bottomExtra", "maxTagPlaceholder"].includes(k)
@@ -394,7 +395,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ])
           };
         })
-      ]), 1040, ["rowKey", "highlightCurrentRow", "currentRowKey", "selectedRowKeys", "onUpdate:selectedRowKeys", "onUpdate:currentRowKey", "onSelectionChange", "onCurrentChange", "onRowClick", "onDone"]),
+      ]), 1040, ["onUpdate:selectedRowKeys", "onUpdate:currentRowKey", "onSelectionChange", "onCurrentChange", "onRowClick", "onSelect", "onSelectAll", "onDone", "rowKey", "highlightCurrentRow", "currentRowKey", "selectedRowKeys"]),
       renderSlot(_ctx.$slots, "bottomExtra")
     ]),
     _: 2

package/es/ele-tabs/index.js

@@ -217,6 +217,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       { "is-simple": _ctx.type === "simple" },
       { "is-indicator": _ctx.type === "indicator" },
       { "is-button": _ctx.type === "button" },
+      { "is-tag": _ctx.type === "tag" },
       { "is-center": _ctx.center }
     ],
     "onUpdate:modelValue": _ctx.onUpdateModelValue,

package/es/ele-tabs/style/css-var.scss

@@ -3,36 +3,7 @@
 /* 标签页主题变量 */
 @mixin set-tab-var($var) {
   .ele-tabs,
-  .ele-tab-tool,
-  .ele-modal-inner,
-  .ele-drawer-inner {
+  .ele-tab-wrap {
     @include set-ele-var('tab', $var);
   }
-
-  .ele-tabs.is-small,
-  .ele-tab-wrap.is-small .ele-tab-tool {
-    @include set-ele-var('tab-sm', $var);
-  }
-
-  .ele-tabs.is-large,
-  .ele-tab-wrap.is-large .ele-tab-tool {
-    @include set-ele-var('tab-lg', $var);
-  }
-
-  .ele-tabs.is-simple,
-  .ele-tabs.is-indicator,
-  .ele-tab-wrap.is-simple .ele-tab-tool,
-  .ele-tab-wrap.is-indicator .ele-tab-tool {
-    @include set-ele-var('tab-simple', $var);
-  }
-
-  .ele-tabs.is-indicator {
-    @include set-ele-var('tab-indicator', $var);
-  }
-
-  .ele-tabs.is-button,
-  .ele-tab-wrap.is-button .ele-tab-tool,
-  .ele-admin-tab-card .ele-admin-tabs {
-    @include set-ele-var('tab-button', $var);
-  }
 }