ele-admin-plus 1.2.0-beta.1 → 1.2.0-beta.3

package/lib/ele-virtual-table/components/header-row.d.ts

@@ -1,6 +1,6 @@
-import { VirtualColumn, HeaderColumns, SortBy, CellFilterChangeParams, ColSize } from '../types';
-import { Column, Filter } from '../../ele-data-table/types';
 import { PropType } from 'vue';
+import { Column, Filter } from '../../ele-data-table/types';
+import { VirtualColumn, HeaderColumns, SortBy, CellFilterChangeParams, ColSize } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
     /** 表头行配置 */

package/lib/ele-virtual-table/index.cjs

@@ -29,6 +29,7 @@ const _sfc_main = vue.defineComponent({
     const { wrapWidth, wrapHeight, updateWrapSize } = util$1.useAutoResize(
       () => rootRef.value
     );
+    const { isLayoutFixedHead, isLayoutMaximized } = util.useStickyHeader();
     const tableState = {
       checked: /* @__PURE__ */ new Map(),
       reserveChecked: false,
@@ -382,17 +383,9 @@ const _sfc_main = vue.defineComponent({
         tableScrollLeft.value = scrollLeft;
       }
       if (hasFooter.value && tableRef.value && tableRef.value.$el) {
-        const childs = tableRef.value.$el.children;
-        if (childs) {
-          for (let i = 0; i < childs.length; i++) {
-            const el = childs[i];
-            if (el.classList.contains("el-table-v2__footer")) {
-              if (el.scrollLeft != scrollLeft) {
-                el.scrollLeft = scrollLeft;
-              }
-              break;
-            }
-          }
+        const el = core.queryChild(tableRef.value.$el, "el-table-v2__footer");
+        if (el && el.scrollLeft != scrollLeft) {
+          el.scrollLeft = scrollLeft;
         }
       }
     };
@@ -544,7 +537,7 @@ const _sfc_main = vue.defineComponent({
         checkedRowKeys.value.clear();
         tableState.checked.clear();
         rows.forEach((r) => {
-          const k = util.getValue(r, props2.rowKey);
+          const k = core.getValue(r, props2.rowKey);
           if (k != null) {
             checkedRowKeys.value.add(k);
             tableState.checked.set(k, r);
@@ -639,7 +632,7 @@ const _sfc_main = vue.defineComponent({
       return Array.from(tableState.checked.values());
     };
     const toggleRowSelection = (row, selected) => {
-      const key = util.getValue(row, props2.rowKey);
+      const key = core.getValue(row, props2.rowKey);
       if (key == null || !tableState.reserveChecked && !util$1.getRowByKey(key, tableData.value)) {
         return;
       }
@@ -703,7 +696,7 @@ const _sfc_main = vue.defineComponent({
       events.onExpandChange(row.rowData, spread);
     };
     const setCurrentRow = (row) => {
-      updateSelectedState(util.getValue(row, props2.rowKey), row);
+      updateSelectedState(core.getValue(row, props2.rowKey), row);
     };
     const setCurrentRowKey = (key) => {
       updateSelectedState(key);
@@ -763,8 +756,8 @@ const _sfc_main = vue.defineComponent({
         return;
       }
       const isNumber = typeof options === "number";
-      const top = isNumber ? options : options.top;
-      const left = isNumber ? yCoord : options.left;
+      const left = isNumber ? options : options.left;
+      const top = isNumber ? yCoord : options.top;
       tableRef.value.scrollTo({
         scrollTop: top,
         scrollLeft: left
@@ -803,7 +796,7 @@ const _sfc_main = vue.defineComponent({
       const top = tableState.scrollTop;
       const left = tableScrollLeft.value;
       if (top || left) {
-        scrollTo(top ? top - 1 : 0, left ? left - 1 : 0);
+        scrollTo(left ? left - 1 : 0, top ? top - 1 : 0);
       }
     });
     vue.onDeactivated(() => {
@@ -934,6 +927,8 @@ const _sfc_main = vue.defineComponent({
       tableSumText,
       tableEmptyText,
       tableEmptyProps,
+      isLayoutFixedHead,
+      isLayoutMaximized,
       onTableFilterChange,
       onCellCheckedChange,
       onCellExpandChange,
@@ -1001,6 +996,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       { "is-border": _ctx.border || _ctx.headerRows.length > 1 },
       { "is-stripe": _ctx.stripe },
       { "is-sticky": _ctx.sticky },
+      { "is-layout-fixed-head": _ctx.sticky && _ctx.isLayoutFixedHead },
+      { "is-layout-maximized": _ctx.sticky && _ctx.isLayoutMaximized },
       { "has-footer": _ctx.hasFooter },
       { "hide-header": !_ctx.showHeader },
       { "hide-bottom-line": !_ctx.bottomLine },

package/lib/ele-virtual-table/index.d.ts

@@ -1,7 +1,7 @@
-import { BodyColumn, BodyColumns, HeaderRows, CellFilterChangeParams, SortBy, ScrollStrategy, ScrollPos, ColSize, VirtualRow } from './types';
-import { DataKey, DataItem, Column, Filter, OrderValue } from '../ele-data-table/types';
-import { ElTableV2Instance, ElTableV2Props } from '../ele-app/el';
 import { Ref } from 'vue';
+import { ElTableV2Instance, ElTableV2Props } from '../ele-app/el';
+import { DataKey, DataItem, Column, Filter, OrderValue } from '../ele-data-table/types';
+import { BodyColumn, BodyColumns, HeaderRows, CellFilterChangeParams, SortBy, ScrollStrategy, ScrollPos, ColSize, VirtualRow } from './types';
 
 declare const _default: import('vue').DefineComponent<{
     rowHeight: NumberConstructor;
@@ -50,29 +50,22 @@ declare const _default: import('vue').DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
-        default: boolean;
+        default: boolean; /** 表格是否有展开列 */
     };
+    width: (StringConstructor | NumberConstructor)[];
+    maxHeight: (StringConstructor | NumberConstructor)[];
+    lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
         default: string;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    lazy: BooleanConstructor;
+    height: (StringConstructor | NumberConstructor)[];
     data: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
     };
-    height: (StringConstructor | NumberConstructor)[];
-    scrollbarAlwaysOn: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
-    emptyText: StringConstructor;
-    indent: {
-        type: NumberConstructor;
-        default: number;
-    };
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -90,11 +83,12 @@ declare const _default: import('vue').DefineComponent<{
     headerCellStyle: import('vue').PropType<import('element-plus').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
+    emptyText: StringConstructor;
     expandRowKeys: import('vue').PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import('vue').PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
     spanMethod: import('vue').PropType<((data: {
         row: any;
         rowIndex: number;
@@ -108,6 +102,10 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     treeProps: {
         type: import('vue').PropType<{
             hasChildren?: string | undefined;
@@ -123,7 +121,9 @@ declare const _default: import('vue').DefineComponent<{
         type: import('vue').PropType<"auto" | "fixed">;
         default: string;
     };
+    scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
+    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
 }, {
     rootRef: Ref<HTMLElement | null>;
     tableRef: Ref<ElTableV2Instance>;
@@ -155,6 +155,8 @@ declare const _default: import('vue').DefineComponent<{
     tableSumText: import('vue').ComputedRef<string>;
     tableEmptyText: import('vue').ComputedRef<string>;
     tableEmptyProps: import('vue').ComputedRef<import('../ele-app/el').ElEmptyProps>;
+    isLayoutFixedHead: import('vue').ComputedRef<boolean | undefined>;
+    isLayoutMaximized: import('vue').ComputedRef<boolean | undefined>;
     onTableFilterChange: (params: CellFilterChangeParams) => void;
     onCellCheckedChange: (row: VirtualRow, checked: boolean) => void;
     onCellExpandChange: (row: VirtualRow, expanded: boolean, children?: DataItem[]) => void;
@@ -206,14 +208,14 @@ declare const _default: import('vue').DefineComponent<{
     rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     headerClick: (_column: Column, _e: MouseEvent) => boolean;
-    headerContextmenu: (_column: Column, _e: MouseEvent) => boolean;
+    headerContextmenu: (_column: Column, _e: MouseEvent) => boolean; /** 表格组件 */
     sortChange: (_sorter: import('../ele-data-table/types').Sorter) => boolean;
     filterChange: (_filter: Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
     headerDragend: (_width: number, _old: number, _column: Column, _e: MouseEvent) => boolean;
     expandChange: (_row: DataItem, _expanded: boolean) => boolean;
     'update:currentRowKey': (_currentRowKey?: DataKey | undefined) => boolean;
-    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[] | undefined) => boolean; /** 表格高度 */
+    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[] | undefined) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     rowHeight: NumberConstructor;
     stripe: {
@@ -261,29 +263,22 @@ declare const _default: import('vue').DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
-        default: boolean;
+        default: boolean; /** 表格是否有展开列 */
     };
+    width: (StringConstructor | NumberConstructor)[];
+    maxHeight: (StringConstructor | NumberConstructor)[];
+    lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
         default: string;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    lazy: BooleanConstructor;
+    height: (StringConstructor | NumberConstructor)[];
     data: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
     };
-    height: (StringConstructor | NumberConstructor)[];
-    scrollbarAlwaysOn: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
-    emptyText: StringConstructor;
-    indent: {
-        type: NumberConstructor;
-        default: number;
-    };
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -301,11 +296,12 @@ declare const _default: import('vue').DefineComponent<{
     headerCellStyle: import('vue').PropType<import('element-plus').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
+    emptyText: StringConstructor;
     expandRowKeys: import('vue').PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import('vue').PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
     spanMethod: import('vue').PropType<((data: {
         row: any;
         rowIndex: number;
@@ -319,6 +315,10 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     treeProps: {
         type: import('vue').PropType<{
             hasChildren?: string | undefined;
@@ -334,7 +334,9 @@ declare const _default: import('vue').DefineComponent<{
         type: import('vue').PropType<"auto" | "fixed">;
         default: string;
     };
+    scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
+    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
 }>> & {
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
@@ -358,11 +360,9 @@ declare const _default: import('vue').DefineComponent<{
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: DataKey[] | undefined) => any) | undefined;
 }, {
     fit: boolean;
-    className: string;
     lazy: boolean;
+    className: string;
     data: any[];
-    scrollbarAlwaysOn: boolean;
-    indent: number;
     stripe: boolean;
     border: boolean;
     showHeader: boolean;
@@ -370,11 +370,13 @@ declare const _default: import('vue').DefineComponent<{
     highlightCurrentRow: boolean;
     defaultExpandAll: boolean;
     selectOnIndeterminate: boolean;
+    indent: number;
     treeProps: {
         hasChildren?: string | undefined;
         children?: string | undefined;
     } | undefined;
     tableLayout: "auto" | "fixed";
+    scrollbarAlwaysOn: boolean;
     flexible: boolean;
     sticky: boolean;
     headerEllipsis: boolean;

package/lib/ele-virtual-table/props.d.ts

@@ -47,33 +47,26 @@ export declare const virtualTableProps: {
     cacheData: import('vue').PropType<import('../ele-data-table/types').DataItem[]>;
     width: (StringConstructor | NumberConstructor)[];
     height: (StringConstructor | NumberConstructor)[];
+    data: {
+        type: import('vue').PropType<any[]>;
+        default: () => never[];
+    };
     size: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
+    maxHeight: (StringConstructor | NumberConstructor)[];
+    lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
         default: string;
     };
-    lazy: BooleanConstructor;
-    data: {
-        type: import('vue').PropType<any[]>;
-        default: () => never[];
-    };
-    scrollbarAlwaysOn: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
-    emptyText: StringConstructor;
-    indent: {
-        type: NumberConstructor;
-        default: number;
-    };
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -91,11 +84,12 @@ export declare const virtualTableProps: {
     headerCellStyle: import('vue').PropType<import('element-plus').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
+    emptyText: StringConstructor;
     expandRowKeys: import('vue').PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import('vue').PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
     spanMethod: import('vue').PropType<((data: {
         row: any;
         rowIndex: number;
@@ -109,6 +103,10 @@ export declare const virtualTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     treeProps: {
         type: import('vue').PropType<{
             hasChildren?: string | undefined;
@@ -121,10 +119,12 @@ export declare const virtualTableProps: {
     };
     load: import('vue').PropType<((row: any, treeNode: import('element-plus').TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
     tableLayout: {
-        type: import('vue').PropType<"auto" | "fixed">;
+        type: import('vue').PropType<"fixed" | "auto">;
         default: string;
     };
+    scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
+    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
 };
 export type VirtualTableProps = ExtractPropTypes<typeof virtualTableProps>;
 /**

package/lib/ele-virtual-table/style/css-var.scss

@@ -99,51 +99,3 @@
     border-top-right-radius: $radius;
   }
 }
-
-/* 表头筛选多选样式 */
-@mixin filter-checkbox-style($ele-transition) {
-  .el-checkbox-group {
-    padding: eleVar('table-filter', 'padding');
-    box-sizing: border-box;
-
-    & > .el-checkbox {
-      width: 100%;
-      display: flex;
-      height: eleVar('table-filter', 'item-height');
-      padding: eleVar('table-filter', 'item-padding');
-      border-radius: eleVar('table-filter', 'item-radius');
-      transition: (color $ele-transition, background-color $ele-transition);
-      box-sizing: border-box;
-      margin: 0;
-
-      & > .el-checkbox__label {
-        color: eleVar('table-filter', 'item-color');
-      }
-
-      &:hover {
-        background: eleVar('table-filter', 'item-hover-bg');
-
-        & > .el-checkbox__label {
-          color: eleVar('table-filter', 'item-hover-color');
-        }
-      }
-
-      &.is-checked {
-        background: eleVar('table-filter', 'item-active-bg');
-
-        & > .el-checkbox__label {
-          color: eleVar('table-filter', 'item-active-color');
-          font-weight: eleVar('table-filter', 'item-active-font-weight');
-        }
-
-        &:hover {
-          background: eleVar('table-filter', 'item-active-hover-bg');
-        }
-      }
-
-      & + .el-checkbox {
-        margin-top: eleVar('table-filter', 'item-margin');
-      }
-    }
-  }
-}

package/lib/ele-virtual-table/style/index.cjs

@@ -1,10 +1,10 @@
 "use strict";
-require("element-plus/lib/components/table-v2/style/index");
-require("element-plus/lib/components/checkbox/style/index");
-require("element-plus/lib/components/checkbox-group/style/index");
-require("element-plus/lib/components/empty/style/index");
-require("element-plus/lib/components/icon/style/index");
-require("element-plus/lib/components/scrollbar/style/index");
-require("element-plus/lib/components/button/style/index");
+require("element-plus/es/components/table-v2/style/index");
+require("element-plus/es/components/checkbox/style/index");
+require("element-plus/es/components/checkbox-group/style/index");
+require("element-plus/es/components/empty/style/index");
+require("element-plus/es/components/icon/style/index");
+require("element-plus/es/components/scrollbar/style/index");
+require("element-plus/es/components/button/style/index");
 require("../../ele-tooltip/style/index");
 require("./index.scss");

package/lib/ele-virtual-table/style/index.d.ts

@@ -0,0 +1 @@
+

package/lib/ele-virtual-table/style/index.scss

@@ -78,7 +78,7 @@
     padding-right: 0;
     padding-left: 0;
     border-bottom: 1px solid eleVar('table', 'border-color');
-    transition: background-color $ele-transition;
+    transition: background-color $transition-base;
     position: relative;
     overflow: visible;
 
@@ -230,7 +230,7 @@
       position: absolute;
       top: 0;
       bottom: -1px;
-      transition: box-shadow $ele-transition;
+      transition: box-shadow $transition-base;
       pointer-events: none;
     }
 
@@ -280,11 +280,11 @@
     align-items: center;
     justify-content: center;
     border-radius: eleVar('table', 'icon-radius');
-    transition: (color $ele-transition, background-color $ele-transition);
+    transition: (color $transition-base, background-color $transition-base);
     cursor: pointer;
 
     & > .el-icon {
-      transition: all $ele-transition;
+      transition: all $transition-base;
 
       & > .ele-arrow-down {
         stroke-width: 4.6;
@@ -434,6 +434,18 @@
     }
   }
 
+  &.is-sticky.is-layout-fixed-head > .el-table-v2 {
+    & > .el-table-v2__main > .el-table-v2__header-wrapper {
+      top: eleVar('table', 'fixed-header-sticky-top');
+    }
+  }
+
+  &.is-sticky.is-layout-maximized > .el-table-v2 {
+    & > .el-table-v2__main > .el-table-v2__header-wrapper {
+      top: eleVar('table', 'maximized-sticky-top');
+    }
+  }
+
   /* 圆角 */
   @include virtual-table-radius(eleVar('table', 'radius'));
 
@@ -503,7 +515,7 @@
     width: 0;
     height: 0;
     border: eleVar('table', 'sort-size') solid transparent;
-    transition: border-color $ele-transition;
+    transition: border-color $transition-base;
     box-sizing: border-box;
   }
 
@@ -549,7 +561,7 @@
   margin: eleVar('table', 'filter-margin');
   padding: eleVar('table', 'filter-padding');
   border-radius: eleVar('table', 'icon-radius');
-  transition: (color $ele-transition, background-color $ele-transition);
+  transition: (color $transition-base, background-color $transition-base);
   box-sizing: border-box;
   position: relative;
   cursor: pointer;
@@ -589,7 +601,7 @@
     display: none;
   }
 
-  @include filter-checkbox-style($ele-transition);
+  @include filter-checkbox-style($transition-base);
 
   .ele-table-filter-body > .el-scrollbar__wrap,
   & > .el-scrollbar > .el-scrollbar__wrap {
@@ -627,7 +639,7 @@
     line-height: eleVar('table-filter', 'item-height');
     padding: eleVar('table-filter', 'item-padding');
     border-radius: eleVar('table-filter', 'item-radius');
-    transition: (color $ele-transition, background-color $ele-transition);
+    transition: (color $transition-base, background-color $transition-base);
     box-sizing: border-box;
     cursor: pointer;
 
@@ -665,18 +677,3 @@
     }
   }
 }
-
-/* 粘性表头适配布局风格 */
-.ele-admin-fixed-header:not(.ele-admin-maximized) .ele-virtual-table.is-sticky {
-  & > .el-table-v2 > .el-table-v2__main > .el-table-v2__header-wrapper {
-    top: eleVar('table', 'fixed-header-sticky-top');
-  }
-}
-
-.ele-admin-fixed-header.ele-admin-maximized:not(.ele-admin-expanded) {
-  &:not(.ele-admin-fixed-body) .ele-virtual-table.is-sticky {
-    & > .el-table-v2 > .el-table-v2__main > .el-table-v2__header-wrapper {
-      top: eleVar('table', 'maximized-sticky-top');
-    }
-  }
-}

package/lib/ele-virtual-table/util.cjs

@@ -252,7 +252,7 @@ function transformTableData(data, hasExpandCol, childrenName, hasChildrenName, r
   }
   if (hasExpandCol) {
     return data.map((d, i) => {
-      const key = util.getValue(d, rowKey) ?? i;
+      const key = core.getValue(d, rowKey) ?? i;
       const temp = {
         rowId: "_expand_" + key,
         rowIndex: i,
@@ -274,7 +274,7 @@ function transformTableData(data, hasExpandCol, childrenName, hasChildrenName, r
     (d) => {
       index++;
       return {
-        rowId: util.getValue(d, rowKey) ?? index,
+        rowId: core.getValue(d, rowKey) ?? index,
         rowIndex: index,
         rowData: d,
         isDisabled: !(selectable == null || selectable(d, index) === true),
@@ -288,7 +288,7 @@ function getRowByKey(key, data, rowKey, childrenField) {
   if (rowKey == null) {
     return core.findTree(data, (d) => d.rowId === key && !d.isExpandRow);
   }
-  return core.findTree(data, (d) => util.getValue(d, rowKey) === key, childrenField);
+  return core.findTree(data, (d) => core.getValue(d, rowKey) === key, childrenField);
 }
 function getKeysAndList(data, rowKey, childrenField) {
   const keys = [];
@@ -298,7 +298,7 @@ function getKeysAndList(data, rowKey, childrenField) {
     (d) => {
       const flag = rowKey == null;
       if (!flag || !d.isExpandRow) {
-        keys.push(flag ? d.rowId : util.getValue(d, rowKey));
+        keys.push(flag ? d.rowId : core.getValue(d, rowKey));
         list.push(d);
       }
     },
@@ -311,8 +311,8 @@ function isAutoRowHeight(hasExpandCol, bodyCols, showOverflowTooltip) {
     return true;
   }
   let isAllEllipsis = true;
-  for (let i = 0; i < bodyCols.length; i++) {
-    const col = bodyCols[i].originalCol;
+  for (const bodyCol of bodyCols) {
+    const col = bodyCol.originalCol;
     if (col && col.type !== "selection" && col.type !== "expand") {
       if (col.showOverflowTooltip == null) {
         isAllEllipsis = false;
@@ -401,8 +401,8 @@ function getColFiltered(col, filtered) {
   return filtered[key] ?? col.filteredValue;
 }
 function getSelectableFunction(cols) {
-  for (let i = 0; i < cols.length; i++) {
-    const c = cols[i].originalCol;
+  for (const bodyCol of cols) {
+    const c = bodyCol.originalCol;
     if (c && c.type === "selection") {
       return typeof c.selectable === "function" ? c.selectable : null;
     }
@@ -468,8 +468,8 @@ function getSumValue(data, prop, index, sumText) {
     return "";
   }
   let sum = 0;
-  for (let i = 0; i < data.length; i++) {
-    const val = Number(util.getValue(data[i], prop));
+  for (const item of data) {
+    const val = Number(core.getValue(item, prop));
     if (Number.isNaN(val)) {
       return "";
     }

package/lib/ele-virtual-table/util.d.ts

@@ -1,7 +1,7 @@
-import { VirtualColumn, VirtualColumns, BodyColumns, HeaderColumn, HeaderRows, ColSize, CustomRenderProps, SortBy, TreeTableProps, CellSpan, CellParams, VirtualRow } from './types';
-import { DataKey, DataItem, Column, Columns, Sorter, Filter, FilterValue, OrderValue, TableSize, RowKey, RowSelectable, TreeProps, ShowOverflowTooltip, SpanMethod, ColumnIndex, SummaryMethod } from '../ele-data-table/types';
-import { TableV2SortOrder } from 'element-plus';
 import { SetupContext } from 'vue';
+import { TableV2SortOrder } from 'element-plus';
+import { DataKey, DataItem, Column, Columns, Sorter, Filter, FilterValue, OrderValue, TableSize, RowKey, RowSelectable, TreeProps, ShowOverflowTooltip, SpanMethod, ColumnIndex, SummaryMethod } from '../ele-data-table/types';
+import { VirtualColumn, VirtualColumns, BodyColumns, HeaderColumn, HeaderRows, ColSize, CustomRenderProps, SortBy, TreeTableProps, CellSpan, CellParams, VirtualRow } from './types';
 
 /**
  * 获取行高

package/lib/ele-watermark/props.d.ts

@@ -1,5 +1,5 @@
-import { WatermarkGap, WatermarkOffset, WatermarkFont } from './types';
 import { PropType, ExtractPropTypes } from 'vue';
+import { WatermarkGap, WatermarkOffset, WatermarkFont } from './types';
 
 export declare const watermarkProps: {
     /** 宽度 */

package/lib/ele-watermark/style/index.cjs

@@ -1,2 +1 @@
 "use strict";
-//

package/lib/ele-watermark/util.d.ts

@@ -1,5 +1,5 @@
-import { WatermarkGap, WatermarkFont, MutationOption } from './types';
 import { StyleValue } from '../ele-app/types';
+import { WatermarkGap, WatermarkFont, MutationOption } from './types';
 
 /**
  * 获取文字样式