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

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

@@ -1,7 +1,7 @@
-import { ReloadFunction, DoneParams, FetchFunction, TableViewInstance, ExportConfig, PrintConfig } from './types';
-import { DataItem, Columns, Sorter, Filter, TableSize } from '../ele-data-table/types';
-import { EleLoadingProps, ElePaginationProps, EleDataTableProps } from '../ele-app/plus';
 import { Ref } from 'vue';
+import { EleLoadingProps, ElePaginationProps, EleDataTableProps } from '../ele-app/plus';
+import { DataItem, Columns, Sorter, Filter, TableSize } from '../ele-data-table/types';
+import { ReloadFunction, DoneParams, FetchFunction, TableViewInstance, ExportConfig, PrintConfig } from './types';
 
 declare const _default: import('vue').DefineComponent<{
     rowKey: {
@@ -56,37 +56,26 @@ declare const _default: import('vue').DefineComponent<{
     virtual: BooleanConstructor;
     rowHeight: NumberConstructor;
     locale: import('vue').PropType<Partial<import('./types').TableLocale>>;
-    exportConfig: import('vue').PropType<ExportConfig>;
+    exportConfig: import('vue').PropType<ExportConfig>; /** 表格组件 */
     printConfig: import('vue').PropType<PrintConfig>;
     width: (StringConstructor | NumberConstructor)[];
     height: (StringConstructor | NumberConstructor)[];
     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;
-    columns: {
-        type: import('vue').PropType<Columns>;
-        required: boolean;
-    };
-    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;
-    };
     stripe: {
         type: BooleanConstructor;
         default: null;
@@ -112,11 +101,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;
@@ -130,6 +120,10 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     treeProps: {
         type: import('vue').PropType<{
             hasChildren?: string | undefined;
@@ -142,10 +136,16 @@ declare const _default: import('vue').DefineComponent<{
     };
     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>;
+    columns: {
+        type: import('vue').PropType<Columns>;
+        required: boolean;
+    };
     sticky: BooleanConstructor;
     headerEllipsis: {
         type: BooleanConstructor;
@@ -174,7 +174,7 @@ declare const _default: import('vue').DefineComponent<{
         [x: symbol]: any;
         _isMock?: boolean | undefined;
     }[]>;
-    tableSize: Ref<"" | "default" | "small" | "large" | undefined>;
+    tableSize: Ref<"" | "small" | "default" | "large" | undefined>;
     tableMaximized: Ref<boolean>;
     tableIndex: import('vue').ComputedRef<number>;
     paginationProps: import('vue').ComputedRef<ElePaginationProps | null>;
@@ -220,8 +220,8 @@ declare const _default: import('vue').DefineComponent<{
     'update:selections': (_selections: DataItem[]) => boolean;
     'update:current': (_current?: DataItem | null | undefined) => boolean;
     columnsChange: (_columns: Columns) => boolean;
-    sizeChange: (_size: "" | "default" | "small" | "large" | undefined) => boolean; /** 表格列配置 */
-    maximizedChange: (_maximized: boolean) => boolean;
+    sizeChange: (_size: "" | "small" | "default" | "large" | undefined) => boolean;
+    maximizedChange: (_maximized: boolean) => boolean; /** 表格尺寸 */
     refresh: () => boolean;
     select: (_selection: DataItem[], _row: DataItem) => boolean;
     selectAll: (_selection: DataItem[]) => boolean;
@@ -242,7 +242,7 @@ declare const _default: import('vue').DefineComponent<{
     headerDragend: (_width: number, _old: number, _column: import('./types').Column, _e: MouseEvent) => 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>;
@@ -296,37 +296,26 @@ declare const _default: import('vue').DefineComponent<{
     virtual: BooleanConstructor;
     rowHeight: NumberConstructor;
     locale: import('vue').PropType<Partial<import('./types').TableLocale>>;
-    exportConfig: import('vue').PropType<ExportConfig>;
+    exportConfig: import('vue').PropType<ExportConfig>; /** 表格组件 */
     printConfig: import('vue').PropType<PrintConfig>;
     width: (StringConstructor | NumberConstructor)[];
     height: (StringConstructor | NumberConstructor)[];
     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;
-    columns: {
-        type: import('vue').PropType<Columns>;
-        required: boolean;
-    };
-    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;
-    };
     stripe: {
         type: BooleanConstructor;
         default: null;
@@ -352,11 +341,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;
@@ -370,6 +360,10 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     treeProps: {
         type: import('vue').PropType<{
             hasChildren?: string | undefined;
@@ -382,10 +376,16 @@ declare const _default: import('vue').DefineComponent<{
     };
     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>;
+    columns: {
+        type: import('vue').PropType<Columns>;
+        required: boolean;
+    };
     sticky: BooleanConstructor;
     headerEllipsis: {
         type: BooleanConstructor;
@@ -432,15 +432,13 @@ declare const _default: import('vue').DefineComponent<{
     "onUpdate:selections"?: ((_selections: DataItem[]) => any) | undefined;
     "onUpdate:current"?: ((_current?: DataItem | null | undefined) => any) | undefined;
     onColumnsChange?: ((_columns: Columns) => any) | undefined;
-    onSizeChange?: ((_size: "" | "default" | "small" | "large" | undefined) => any) | undefined;
+    onSizeChange?: ((_size: "" | "small" | "default" | "large" | undefined) => any) | undefined;
     onMaximizedChange?: ((_maximized: boolean) => any) | undefined;
 }, {
     loading: boolean;
     fit: boolean;
-    className: string;
     lazy: boolean;
-    scrollbarAlwaysOn: boolean;
-    indent: number;
+    className: string;
     stripe: boolean;
     border: boolean;
     showHeader: boolean;
@@ -448,11 +446,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";
+    tableLayout: "fixed" | "auto";
+    scrollbarAlwaysOn: boolean;
     flexible: boolean;
     sticky: boolean;
     toolbar: boolean | import('../ele-app/plus').EleToolbarProps;

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

@@ -1,10 +1,10 @@
 import { defineComponent, ref, shallowRef, computed, watch, onMounted, nextTick, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps as mergeProps$1, renderSlot, createSlots, renderList, createCommentVNode, createElementBlock, normalizeStyle } from "vue";
-import { pick } from "../utils/core";
+import { pick, getValue } from "../utils/core";
 import { useGlobalProps } from "../ele-config-provider/receiver";
 import EleLoading from "../ele-loading/index";
 import ElePagination from "../ele-pagination/index";
 import { dataTablePropKeys } from "../ele-data-table/props";
-import { useEmits, useMethods, arrayIsChanged, getValue, getRowKeys } from "../ele-data-table/util";
+import { useEmits, useMethods, arrayIsChanged, getRowKeys } from "../ele-data-table/util";
 import EleDataTable from "../ele-data-table/index";
 import EleVirtualTable from "../ele-virtual-table/index";
 import EleToolbar from "../ele-toolbar/index";
@@ -516,61 +516,58 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createBlock(_component_EleLoading, normalizeProps(guardReactiveProps(_ctx.loadingProps)), {
     default: withCtx(() => [
       _ctx.toolbar ? (openBlock(), createBlock(_component_EleToolbar, normalizeProps(mergeProps$1({ key: 0 }, _ctx.toolbar === true ? {} : _ctx.toolbar)), {
-        tools: withCtx(() => {
-          var _a;
-          return [
-            renderSlot(_ctx.$slots, "tools"),
-            _ctx.toolNames && _ctx.toolNames.length ? (openBlock(), createBlock(_component_TableTools, {
-              key: 0,
-              tools: _ctx.toolNames,
-              size: _ctx.tableSize,
-              columns: _ctx.columns,
-              columnSortable: _ctx.columnSortable,
-              columnFixed: _ctx.columnFixed,
-              maximized: _ctx.tableMaximized,
-              cacheKey: _ctx.cacheKey,
-              locale: _ctx.locale,
-              selections: _ctx.selections,
-              pageData: _ctx.tableData,
-              spanMethod: _ctx.spanMethod,
-              tableHeader: _ctx.showHeader,
-              showSummary: _ctx.showSummary,
-              sumText: _ctx.sumText,
-              summaryMethod: _ctx.summaryMethod,
-              cellStyle: _ctx.cellStyle,
-              cellClassName: _ctx.cellClassName,
-              headerCellStyle: _ctx.headerCellStyle,
-              headerCellClassName: _ctx.headerCellClassName,
-              pageIndex: _ctx.tableIndex,
-              childrenField: (_a = _ctx.treeProps) == null ? void 0 : _a.children,
-              fetch: _ctx.fetch,
-              exportConfig: _ctx.toolExportConfig,
-              printConfig: _ctx.toolPrintConfig,
-              onReload: _ctx.onRefresh,
-              "onUpdate:size": _ctx.onSizeChange,
-              "onUpdate:columns": _ctx.onColumnsChange,
-              "onUpdate:maximized": _ctx.onMaximizedChange
-            }, createSlots({ _: 2 }, [
-              renderList(Object.keys(_ctx.$slots).filter(
-                (k) => ![
-                  "default",
-                  "toolbar",
-                  "tools",
-                  "footer",
-                  "empty",
-                  "append"
-                ].includes(k)
-              ), (name) => {
-                return {
-                  name,
-                  fn: withCtx((slotProps) => [
-                    renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-                  ])
-                };
-              })
-            ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "childrenField", "fetch", "exportConfig", "printConfig", "onReload", "onUpdate:size", "onUpdate:columns", "onUpdate:maximized"])) : createCommentVNode("", true)
-          ];
-        }),
+        tools: withCtx(() => [
+          renderSlot(_ctx.$slots, "tools"),
+          _ctx.toolNames && _ctx.toolNames.length ? (openBlock(), createBlock(_component_TableTools, {
+            key: 0,
+            tools: _ctx.toolNames,
+            size: _ctx.tableSize,
+            columns: _ctx.columns,
+            columnSortable: _ctx.columnSortable,
+            columnFixed: _ctx.columnFixed,
+            maximized: _ctx.tableMaximized,
+            cacheKey: _ctx.cacheKey,
+            locale: _ctx.locale,
+            selections: _ctx.selections,
+            pageData: _ctx.tableData,
+            spanMethod: _ctx.spanMethod,
+            tableHeader: _ctx.showHeader,
+            showSummary: _ctx.showSummary,
+            sumText: _ctx.sumText,
+            summaryMethod: _ctx.summaryMethod,
+            cellStyle: _ctx.cellStyle,
+            cellClassName: _ctx.cellClassName,
+            headerCellStyle: _ctx.headerCellStyle,
+            headerCellClassName: _ctx.headerCellClassName,
+            pageIndex: _ctx.tableIndex,
+            treeProps: _ctx.treeProps,
+            fetch: _ctx.fetch,
+            exportConfig: _ctx.toolExportConfig,
+            printConfig: _ctx.toolPrintConfig,
+            onReload: _ctx.onRefresh,
+            "onUpdate:size": _ctx.onSizeChange,
+            "onUpdate:columns": _ctx.onColumnsChange,
+            "onUpdate:maximized": _ctx.onMaximizedChange
+          }, createSlots({ _: 2 }, [
+            renderList(Object.keys(_ctx.$slots).filter(
+              (k) => ![
+                "default",
+                "toolbar",
+                "tools",
+                "footer",
+                "empty",
+                "append"
+              ].includes(k)
+            ), (name) => {
+              return {
+                name,
+                fn: withCtx((slotProps) => [
+                  renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+                ])
+              };
+            })
+          ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "treeProps", "fetch", "exportConfig", "printConfig", "onReload", "onUpdate:size", "onUpdate:columns", "onUpdate:maximized"])) : createCommentVNode("", true)
+        ]),
         default: withCtx(() => [
           renderSlot(_ctx.$slots, "toolbar")
         ]),

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

@@ -1,7 +1,7 @@
-import { Where, Datasource, RequestOption, ResponseOption, ParseData, DoneParams, TablePagination, TableLocale, ExportConfig, PrintConfig } from './types';
-import { DataItem, Columns, TableSize } from '../ele-data-table/types';
-import { EleLoadingProps, EleToolbarProps } from '../ele-app/plus';
 import { PropType, ExtractPropTypes } from 'vue';
+import { EleLoadingProps, EleToolbarProps } from '../ele-app/plus';
+import { DataItem, Columns, TableSize } from '../ele-data-table/types';
+import { Where, Datasource, RequestOption, ResponseOption, ParseData, DoneParams, TablePagination, TableLocale, ExportConfig, PrintConfig } from './types';
 
 /**
  * 属性
@@ -87,35 +87,25 @@ export declare const proTableProps: {
     exportConfig: PropType<ExportConfig>;
     /** 打印配置 */
     printConfig: PropType<PrintConfig>;
+    load: PropType<((row: any, treeNode: import('element-plus').TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
     size: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
+        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
+    width: (StringConstructor | NumberConstructor)[];
+    maxHeight: (StringConstructor | NumberConstructor)[];
+    lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
         default: string;
     };
-    lazy: BooleanConstructor;
-    columns: {
-        type: PropType<Columns>;
-        required: boolean;
-    };
-    scrollbarAlwaysOn: BooleanConstructor;
-    showOverflowTooltip: 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;
-    };
+    height: (StringConstructor | NumberConstructor)[];
     stripe: {
         type: BooleanConstructor;
         default: null;
@@ -141,11 +131,12 @@ export declare const proTableProps: {
     headerCellStyle: PropType<import('element-plus').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
+    emptyText: StringConstructor;
     expandRowKeys: PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
     spanMethod: PropType<((data: {
         row: any;
         rowIndex: number;
@@ -159,6 +150,10 @@ export declare const proTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     treeProps: {
         type: PropType<{
             hasChildren?: string | undefined;
@@ -169,12 +164,17 @@ export declare const proTableProps: {
             children: string;
         };
     };
-    load: PropType<((row: any, treeNode: import('element-plus').TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
     tableLayout: {
-        type: PropType<"fixed" | "auto">;
+        type: PropType<"auto" | "fixed">;
         default: string;
     };
+    scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
+    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    columns: {
+        type: PropType<Columns>;
+        required: boolean;
+    };
     sticky: BooleanConstructor;
     headerEllipsis: {
         type: BooleanConstructor;

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

@@ -0,0 +1 @@
+

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

@@ -1,20 +1,20 @@
-import 'element-plus/es/components/checkbox/style/index';
-import 'element-plus/es/components/icon/style/index';
-import 'element-plus/es/components/form/style/index';
-import 'element-plus/es/components/form-item/style/index';
-import 'element-plus/es/components/input/style/index';
-import 'element-plus/es/components/select/style/index';
-import 'element-plus/es/components/option/style/index';
-import 'element-plus/es/components/button/style/index';
-import '../../ele-tooltip/style/index';
-import '../../ele-dropdown/style/index';
-import '../../ele-tool/style/index';
-import '../../ele-toolbar/style/index';
-import '../../ele-loading/style/index';
-import '../../ele-pagination/style/index';
-import '../../ele-data-table/style/index';
-import '../../ele-virtual-table/style/index';
-import '../../ele-modal/style/index';
-import '../../ele-printer/style/index';
-import '../../ele-table/style/index';
-import './index.scss';
+import "element-plus/es/components/checkbox/style/index";
+import "element-plus/es/components/icon/style/index";
+import "element-plus/es/components/form/style/index";
+import "element-plus/es/components/form-item/style/index";
+import "element-plus/es/components/input/style/index";
+import "element-plus/es/components/select/style/index";
+import "element-plus/es/components/option/style/index";
+import "element-plus/es/components/button/style/index";
+import "../../ele-tooltip/style/index";
+import "../../ele-dropdown/style/index";
+import "../../ele-tool/style/index";
+import "../../ele-toolbar/style/index";
+import "../../ele-loading/style/index";
+import "../../ele-pagination/style/index";
+import "../../ele-data-table/style/index";
+import "../../ele-virtual-table/style/index";
+import "../../ele-modal/style/index";
+import "../../ele-printer/style/index";
+import "../../ele-table/style/index";
+import "./index.scss";

package/es/ele-pro-table/style/index.scss

@@ -27,6 +27,7 @@
 /* 取消表格上边圆角 */
 .ele-pro-table > .ele-toolbar.is-default {
   & + .ele-data-table > .el-table__inner-wrapper > .el-table__header-wrapper,
+  & + .ele-data-table > .el-table__inner-wrapper > .el-table__body-wrapper,
   & + .ele-data-table.el-table--border > .el-table__inner-wrapper::after,
   &
     + .ele-data-table.el-table--border.hide-header
@@ -99,6 +100,19 @@
   & > .ele-toolbar.is-plain {
     padding: 0 16px;
   }
+
+  /* 粘性表头顶部距离修改 */
+  &
+    > .ele-data-table.is-sticky
+    > .el-table__inner-wrapper
+    > .el-table__header-wrapper,
+  &
+    > .ele-virtual-table.is-sticky
+    > .el-table-v2
+    > .el-table-v2__main
+    > .el-table-v2__header-wrapper {
+    top: eleVar('table', 'sticky-top');
+  }
 }
 
 /* 密度设置 */
@@ -128,7 +142,7 @@
 
 .ele-tool-column-link {
   color: elVar('color-primary');
-  transition: color $ele-transition;
+  transition: color $transition-base;
   cursor: pointer;
 
   &:hover {
@@ -171,7 +185,7 @@
   align-items: center;
   padding: 0 eleVar('tool-column', 'item-padding');
   border-radius: eleVar('tool-column', 'item-radius');
-  transition: background-color $ele-transition;
+  transition: background-color $transition-base;
   position: relative;
 
   .el-checkbox {
@@ -224,7 +238,7 @@
   padding: eleVar('tool-column', 'btn-padding');
   margin-left: eleVar('tool-column', 'btn-space');
   border-radius: eleVar('tool-column', 'btn-radius');
-  transition: (color $ele-transition, background-color $ele-transition);
+  transition: (color $transition-base, background-color $transition-base);
   box-sizing: border-box;
   cursor: pointer;
 

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

@@ -327,14 +327,18 @@ export interface ExportDataItem {
   rowspan?: number;
   /** 是否是展开行的单元格 */
   isExpandCell?: boolean;
-  /** 是否是层级序号 */
-  isTreeIndex?: boolean;
   /** 是否显示树展开图标 */
   isTreeCell?: boolean;
   /** 是否是树叶子节点 */
   isTreeLeaf?: boolean;
   /** 树层级缩进 */
   indent?: number;
+  /** 是否是层级序号 */
+  isTreeIndex?: boolean;
+  /** 层级序号是否显示左边框 */
+  hideLeftBorder?: boolean;
+  /** 层级序号是否显示右边框 */
+  hideRightBorder?: boolean;
 }
 
 /**

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

@@ -1,6 +1,6 @@
-import { Pages, Orders, Filters, OrderItem, RequestOption, ResponseOption, TablePagination, DatasourceResult, ResponseResult, ReloadDataResult, ColItem, ProProps, ExportBodyNode, ExportDataItem, ExportDataResult } from './types';
-import { DataItem, Column, Columns, Sorter, Filter, TableSize, TreeProps, RowKey, SpanMethod, SummaryMethod } from '../ele-data-table/types';
 import { ElePaginationProps } from '../ele-app/plus';
+import { DataItem, Column, Columns, Sorter, Filter, TableSize, TreeProps, RowKey, SpanMethod, SummaryMethod } from '../ele-data-table/types';
+import { Pages, Orders, Filters, OrderItem, RequestOption, ResponseOption, TablePagination, DatasourceResult, ResponseResult, ReloadDataResult, ColItem, ProProps, ExportBodyNode, ExportDataItem, ExportDataResult } from './types';
 
 /**
  * 合并复合属性

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

@@ -1,5 +1,5 @@
-import { omit, eachTree, findTree, uuid, mapTree } from "../utils/core";
-import { getValue, getColFixedNumber } from "../ele-data-table/util";
+import { omit, eachTree, getValue, findTree, uuid, mapTree } from "../utils/core";
+import { getColFixedNumber } from "../ele-data-table/util";
 import { getIndexValue, analyseColumns, getCellSpan, getUserSums, getSumValue } from "../ele-virtual-table/util";
 function mergeProps(props, globalProps) {
   if (props == null) {
@@ -57,8 +57,9 @@ function getTableSize(cacheKey, size, globalSize) {
 function getDefaultFilter(columns) {
   const filter = {};
   eachTree(columns, (d) => {
-    if (typeof d.columnKey === "string" && d.columnKey.length && d.filteredValue) {
-      filter[d.columnKey] = d.filteredValue;
+    const prop = d.columnKey ?? d.prop;
+    if (typeof prop === "string" && prop && d.filteredValue) {
+      filter[prop] = d.filteredValue;
     }
   });
   return filter;
@@ -535,7 +536,9 @@ function getExportData(data, columns, spanMethod, pageIndex, showSummary, sumTex
           text: i === node.level ? String(node.index + 1) : void 0,
           colspan,
           rowspan: i === node.level ? node.childSize + 1 : colspan,
-          isTreeIndex: true
+          isTreeIndex: true,
+          hideLeftBorder: i === node.level ? false : true,
+          hideRightBorder: bodyCols.length ? true : false
         });
       }
     }

package/es/ele-qr-code/props.d.ts

@@ -1,5 +1,5 @@
-import { Level, ImageSettings } from './types';
 import { PropType, ExtractPropTypes } from 'vue';
+import { Level, ImageSettings } from './types';
 
 /**
  * 属性