ele-admin-plus 1.5.1-beta.4 → 1.6.0-beta.2

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

@@ -63,7 +63,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     height: (NumberConstructor | StringConstructor)[];
     maxHeight: (NumberConstructor | StringConstructor)[];
     tableLayout: {
-        type: import('vue').PropType<"fixed" | "auto">;
+        type: import('vue').PropType<import('element-plus').TableProps<Record<string, any>>["tableLayout"]>;
         default: string;
     };
     width: (NumberConstructor | StringConstructor)[];
@@ -76,20 +76,18 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         required: boolean;
     };
     size: {
-        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;
+        type: import('vue').PropType<import('element-plus').TableProps<Record<string, any>>["size"]>;
+    };
+    className: {
+        type: StringConstructor;
+        default: string;
     };
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
     lazy: BooleanConstructor;
-    className: {
-        type: StringConstructor;
-        default: string;
-    };
+    load: import('vue').PropType<import('element-plus').TableProps<any>["load"]>;
     emptyText: StringConstructor;
     stripe: {
         type: BooleanConstructor;
@@ -101,23 +99,26 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: import('vue').PropType<import('element-plus').TableProps<any>["summaryMethod"]>;
+    rowClassName: import('vue').PropType<import('element-plus').TableProps<any>["rowClassName"]>;
+    rowStyle: import('vue').PropType<import('element-plus').TableProps<any>["rowStyle"]>;
+    cellClassName: import('vue').PropType<import('element-plus').TableProps<any>["cellClassName"]>;
+    cellStyle: import('vue').PropType<import('element-plus').TableProps<any>["cellStyle"]>;
+    headerRowClassName: import('vue').PropType<import('element-plus').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: import('vue').PropType<import('element-plus').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: import('vue').PropType<import('element-plus').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: import('vue').PropType<import('element-plus').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: import('vue').PropType<import('element-plus').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    rowExpandable: {
+        type: import('vue').PropType<import('element-plus').TableProps<any>["rowExpandable"]>;
+    };
+    defaultSort: import('vue').PropType<import('element-plus').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: import('vue').PropType<import('element-plus').TableProps<any>["tooltipOptions"]>;
+    spanMethod: import('vue').PropType<import('element-plus').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -127,18 +128,20 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
-    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
+    showOverflowTooltip: {
+        type: import('vue').PropType<import('element-plus').TableProps<any>["showOverflowTooltip"]>;
+        default: undefined;
+    };
+    tooltipFormatter: import('vue').PropType<import('element-plus').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -148,10 +151,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
     sticky: BooleanConstructor;
     headerEllipsis: {
         type: BooleanConstructor;
@@ -220,6 +221,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     select: (_selection: DataItem[], _row: DataItem) => void;
     done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => void;
+    expandChange: (_row: DataItem, _expanded: boolean) => void;
     scroll: (_params: import('element-plus/es/components/table-v2/src/composables/use-scrollbar').ScrollPos) => void;
     "update:currentRowKey": (_currentRowKey?: import('../ele-data-table/types').DataKey | undefined) => void;
     "update:selectedRowKeys": (_selectedRowKeys?: import('../ele-data-table/types').DataKey[] | undefined) => void;
@@ -239,7 +241,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     filterChange: (_filter: Filter) => void;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => void;
     headerDragend: (_width: number, _old: number, _column: Column, _e: MouseEvent) => void;
-    expandChange: (_row: DataItem, _expanded: boolean) => void;
     endEeached: (_params: any) => void;
     rowsRendered: (_params: any) => void;
     refresh: () => void;
@@ -308,7 +309,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     height: (NumberConstructor | StringConstructor)[];
     maxHeight: (NumberConstructor | StringConstructor)[];
     tableLayout: {
-        type: import('vue').PropType<"fixed" | "auto">;
+        type: import('vue').PropType<import('element-plus').TableProps<Record<string, any>>["tableLayout"]>;
         default: string;
     };
     width: (NumberConstructor | StringConstructor)[];
@@ -321,20 +322,18 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         required: boolean;
     };
     size: {
-        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;
+        type: import('vue').PropType<import('element-plus').TableProps<Record<string, any>>["size"]>;
+    };
+    className: {
+        type: StringConstructor;
+        default: string;
     };
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
     lazy: BooleanConstructor;
-    className: {
-        type: StringConstructor;
-        default: string;
-    };
+    load: import('vue').PropType<import('element-plus').TableProps<any>["load"]>;
     emptyText: StringConstructor;
     stripe: {
         type: BooleanConstructor;
@@ -346,23 +345,26 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: import('vue').PropType<import('element-plus').TableProps<any>["summaryMethod"]>;
+    rowClassName: import('vue').PropType<import('element-plus').TableProps<any>["rowClassName"]>;
+    rowStyle: import('vue').PropType<import('element-plus').TableProps<any>["rowStyle"]>;
+    cellClassName: import('vue').PropType<import('element-plus').TableProps<any>["cellClassName"]>;
+    cellStyle: import('vue').PropType<import('element-plus').TableProps<any>["cellStyle"]>;
+    headerRowClassName: import('vue').PropType<import('element-plus').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: import('vue').PropType<import('element-plus').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: import('vue').PropType<import('element-plus').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: import('vue').PropType<import('element-plus').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: import('vue').PropType<import('element-plus').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    rowExpandable: {
+        type: import('vue').PropType<import('element-plus').TableProps<any>["rowExpandable"]>;
+    };
+    defaultSort: import('vue').PropType<import('element-plus').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: import('vue').PropType<import('element-plus').TableProps<any>["tooltipOptions"]>;
+    spanMethod: import('vue').PropType<import('element-plus').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -372,18 +374,20 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
-    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
+    showOverflowTooltip: {
+        type: import('vue').PropType<import('element-plus').TableProps<any>["showOverflowTooltip"]>;
+        default: undefined;
+    };
+    tooltipFormatter: import('vue').PropType<import('element-plus').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -393,10 +397,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
     sticky: BooleanConstructor;
     headerEllipsis: {
         type: BooleanConstructor;
@@ -420,6 +422,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }>> & Readonly<{
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onDone?: ((_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => any) | undefined;
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onScroll?: ((_params: import('element-plus/es/components/table-v2/src/composables/use-scrollbar').ScrollPos) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: import('../ele-data-table/types').DataKey | undefined) => any) | undefined;
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: import('../ele-data-table/types').DataKey[] | undefined) => any) | undefined;
@@ -439,7 +442,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: Column, _e: MouseEvent) => any) | undefined;
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onEndEeached?: ((_params: any) => any) | undefined;
     onRowsRendered?: ((_params: any) => any) | undefined;
     onRefresh?: (() => any) | undefined;
@@ -450,12 +452,12 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onMaximizedChange?: ((_maximized: boolean) => any) | undefined;
     "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;
 }>, {
-    tableLayout: "fixed" | "auto";
+    tableLayout: ("fixed" | "auto") | undefined;
     border: boolean;
+    className: string;
     loading: boolean;
     fit: boolean;
     lazy: boolean;
-    className: string;
     stripe: boolean;
     showHeader: boolean;
     showSummary: boolean;
@@ -466,9 +468,11 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     treeProps: import('element-plus/es/components/table/src/table/defaults').TreeProps | undefined;
     scrollbarAlwaysOn: boolean;
     flexible: boolean;
+    showOverflowTooltip: boolean | Partial<Pick<import('element-plus').UseTooltipProps, "offset" | "transition" | "effect" | "enterable" | "popperClass" | "placement" | "popperOptions" | "showArrow" | "appendTo" | "showAfter" | "hideAfter">> | undefined;
     scrollbarTabindex: string | number;
     allowDragLastColumn: boolean;
     preserveExpandedContent: boolean;
+    nativeScrollbar: boolean;
     sticky: boolean;
     toolbar: boolean | EleToolbarProps;
     tools: boolean | string[];
@@ -478,11 +482,11 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     bottomLine: boolean;
     emptyProps: import('../ele-data-table/types').TableEmptyProps;
     reserveCurrent: boolean;
+    pagination: boolean | import('./types').TablePagination;
     loadOnCreated: boolean;
     loadOnChanged: boolean;
     columnSortable: boolean;
     columnFixed: boolean;
-    pagination: boolean | import('./types').TablePagination;
     virtual: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, shallowRef, computed, watch, onMounted, createBlock, openBlock, mergeProps as mergeProps$1, unref, withCtx, renderSlot, createCommentVNode, createElementBlock, createVNode, normalizeProps, createSlots, renderList, guardReactiveProps, normalizeStyle, nextTick } from "vue";
+import { defineComponent, ref, shallowRef, computed, watch, onMounted, openBlock, createBlock, mergeProps as mergeProps$1, unref, withCtx, renderSlot, normalizeProps, createSlots, renderList, guardReactiveProps, createCommentVNode, createElementBlock, normalizeStyle, createVNode, nextTick } from "vue";
 import { pick, getValue, uuid } from "../utils/common";
 import { useGlobalProps, useLocale } from "../ele-config-provider/receiver";
 import EleLoading from "../ele-loading/index";
@@ -694,11 +694,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             selections: _ctx.selections,
             pageData: tableData.value,
             datasource: toolExportConfig.value.datasource,
-            spanMethod: _ctx.spanMethod,
+            spanMethod: toolExportConfig.value.spanMethod || _ctx.spanMethod,
             tableHeader: toolExportConfig.value.showHeader ?? _ctx.showHeader,
             showSummary: _ctx.showSummary,
             sumText: _ctx.sumText,
-            summaryMethod: _ctx.summaryMethod,
+            summaryMethod: toolExportConfig.value.summaryMethod || _ctx.summaryMethod,
             pageIndex: tableIndex.value,
             treeProps: _ctx.treeProps,
             fetch,
@@ -722,11 +722,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             selections: _ctx.selections,
             pageData: tableData.value,
             datasource: toolPrintConfig.value.datasource,
-            spanMethod: _ctx.spanMethod,
+            spanMethod: toolPrintConfig.value.spanMethod || _ctx.spanMethod,
             tableHeader: toolPrintConfig.value.showHeader ?? _ctx.showHeader,
             showSummary: _ctx.showSummary,
             sumText: _ctx.sumText,
-            summaryMethod: _ctx.summaryMethod,
+            summaryMethod: toolPrintConfig.value.summaryMethod || _ctx.summaryMethod,
             tableStyle: _ctx.tableStyle,
             cellStyle: _ctx.cellStyle,
             cellClassName: _ctx.cellClassName,

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

@@ -96,7 +96,7 @@ export declare const proTableProps: {
     height: (NumberConstructor | StringConstructor)[];
     maxHeight: (NumberConstructor | StringConstructor)[];
     tableLayout: {
-        type: PropType<"fixed" | "auto">;
+        type: PropType<import('element-plus').TableProps<Record<string, any>>["tableLayout"]>;
         default: string;
     };
     width: (NumberConstructor | StringConstructor)[];
@@ -108,22 +108,19 @@ export declare const proTableProps: {
         type: PropType<Columns>;
         required: boolean;
     };
-    load: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: PropType<import('element-plus').TableProps<any>["load"]>;
     size: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
+        type: PropType<import('element-plus').TableProps<Record<string, any>>["size"]>;
+    };
+    className: {
+        type: StringConstructor;
+        default: string;
     };
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
     lazy: BooleanConstructor;
-    className: {
-        type: StringConstructor;
-        default: string;
-    };
     emptyText: StringConstructor;
     stripe: {
         type: BooleanConstructor;
@@ -135,23 +132,26 @@ export declare const proTableProps: {
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: PropType<import('element-plus').TableProps<any>["summaryMethod"]>;
+    rowClassName: PropType<import('element-plus').TableProps<any>["rowClassName"]>;
+    rowStyle: PropType<import('element-plus').TableProps<any>["rowStyle"]>;
+    cellClassName: PropType<import('element-plus').TableProps<any>["cellClassName"]>;
+    cellStyle: PropType<import('element-plus').TableProps<any>["cellStyle"]>;
+    headerRowClassName: PropType<import('element-plus').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: PropType<import('element-plus').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: PropType<import('element-plus').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: PropType<import('element-plus').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: PropType<import('element-plus').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    rowExpandable: {
+        type: PropType<import('element-plus').TableProps<any>["rowExpandable"]>;
+    };
+    defaultSort: PropType<import('element-plus').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: PropType<import('element-plus').TableProps<any>["tooltipOptions"]>;
+    spanMethod: PropType<import('element-plus').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -161,7 +161,7 @@ export declare const proTableProps: {
         default: number;
     };
     treeProps: {
-        type: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: PropType<import('element-plus').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
@@ -170,8 +170,11 @@ export declare const proTableProps: {
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
-    tooltipFormatter: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
+    showOverflowTooltip: {
+        type: PropType<import('element-plus').TableProps<any>["showOverflowTooltip"]>;
+        default: undefined;
+    };
+    tooltipFormatter: PropType<import('element-plus').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -181,10 +184,8 @@ export declare const proTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
     sticky: BooleanConstructor;
     headerEllipsis: {
         type: BooleanConstructor;

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

@@ -6,6 +6,7 @@
 
 /* 工具栏 */
 .ele-pro-table > .ele-toolbar {
+  flex-shrink: 0;
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
 
@@ -247,7 +248,7 @@
 .ele-tool-column-input {
   flex-shrink: 0;
   width: 60px;
-  background: elVar('bg-color', 'overlay');
+  background: eleVar('tool-column', 'input-bg');
   border-radius: elVar('border-radius', 'base');
   margin-left: eleVar('tool-column', 'btn-space');
   margin-right: eleVar('tool-column', 'btn-offset');

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

@@ -15,7 +15,9 @@ import type {
   Filter,
   TableColumn,
   TableSize,
-  ResolveFunction
+  ResolveFunction,
+  SpanMethod,
+  SummaryMethod
 } from '../ele-data-table/types';
 import type { BodyColumns } from '../ele-virtual-table/types';
 export type {
@@ -444,6 +446,10 @@ export interface ExportConfig {
   showTreeIndex?: boolean;
   /** 导出插件 */
   exportPlugin?: ExportPlugin;
+  /** 单元格合并行列方法 */
+  spanMethod?: SpanMethod;
+  /** 合计行自定义方法 */
+  summaryMethod?: SummaryMethod;
 }
 
 /**
@@ -472,6 +478,10 @@ export interface PrintConfig {
   showTreeIndex?: boolean;
   /** 打印插件 */
   printPlugin?: ExportPlugin;
+  /** 单元格合并行列方法 */
+  spanMethod?: SpanMethod;
+  /** 合计行自定义方法 */
+  summaryMethod?: SummaryMethod;
 }
 
 /**

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

@@ -248,7 +248,7 @@ export declare function getExportBodyNode(data: DataItem[], childrenField?: stri
 };
 /**
  * 获取导出的数据
- * @param data 元数据
+ * @param data 数据
  * @param columns 列配置
  * @param spanMethod 单元格合并方法
  * @param pageIndex 序号列起始索引

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

@@ -549,7 +549,7 @@ function getExportData(data, columns, spanMethod, pageIndex, showSummary, sumTex
       const { key: colKey, originalCol: column } = col;
       const key = `${index}-${columnIndex}-${colKey}`;
       const { colspan, rowspan } = getCellSpan(
-        { column, columnIndex, row, rowIndex: index },
+        { column, columnIndex, row, rowIndex: index, data, columns },
         spanMethod
       );
       const isNone = colspan == 0 || rowspan == 0;

package/es/ele-qr-code/components/canvas-render.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch, onMounted, createElementBlock, openBlock, createCommentVNode, createElementVNode, normalizeStyle } from "vue";
+import { defineComponent, ref, watch, onMounted, openBlock, createElementBlock, normalizeStyle, createCommentVNode, createElementVNode } from "vue";
 import qrcodegen from "../qrcodegen";
 import { qrCodeEmits, qrCodeProps } from "../props";
 import { ERROR_LEVEL_MAP, getImageSettings, excavateModules, SUPPORTS_PATH2D, generatePath } from "../util";

package/es/ele-qr-code/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, createBlock, openBlock } from "vue";
+import { defineComponent, openBlock, createBlock } from "vue";
 import EleQrCodeSvg from "../ele-qr-code-svg/index";
 import CanvasRender from "./components/canvas-render";
 import { qrCodeEmits, qrCodeProps } from "./props";

package/es/ele-qr-code/qrcodegen.js

@@ -41,6 +41,8 @@ var qrcodegen;
       this.drawFormatBits(msk);
       this.isFunction = [];
     }
+    version;
+    errorCorrectionLevel;
     /*-- Static factory functions (high level) --*/
     // Returns a QR Code representing the given Unicode text string at the given error correction level.
     // As a conservative upper bound, this function is guaranteed to succeed for strings that have 738 or fewer
@@ -883,6 +885,9 @@ var qrcodegen;
       if (numChars < 0) throw "Invalid argument";
       this.bitData = bitData.slice();
     }
+    mode;
+    numChars;
+    bitData;
     /*-- Static factory functions (mid level) --*/
     // Returns a segment representing the given binary data encoded in
     // byte mode. All input byte arrays are acceptable. Any text string
@@ -1009,6 +1014,8 @@ var qrcodegen;
         this.ordinal = ordinal;
         this.formatBits = formatBits;
       }
+      ordinal;
+      formatBits;
       /*-- Constants --*/
       static LOW = new Ecc(0, 1);
       // The QR Code can tolerate about  7% erroneous codewords
@@ -1029,6 +1036,8 @@ var qrcodegen;
         this.modeBits = modeBits;
         this.numBitsCharCount = numBitsCharCount;
       }
+      modeBits;
+      numBitsCharCount;
       /*-- Constants --*/
       static NUMERIC = new Mode(1, [10, 12, 14]);
       static ALPHANUMERIC = new Mode(2, [9, 11, 13]);

package/es/ele-qr-code/util.js

@@ -9,7 +9,7 @@ const DEFAULT_IMG_SCALE = 0.1;
 const SUPPORTS_PATH2D = (function() {
   try {
     new Path2D().addPath(new Path2D());
-  } catch (e) {
+  } catch (_e) {
     return false;
   }
   return true;

package/es/ele-qr-code-svg/components/svg-render.js

@@ -1,4 +1,4 @@
-import { defineComponent, useId, computed, createElementBlock, openBlock, normalizeStyle, createElementVNode, unref, createCommentVNode, Fragment, renderList, toDisplayString } from "vue";
+import { defineComponent, useId, computed, openBlock, createElementBlock, normalizeStyle, createElementVNode, unref, createCommentVNode, Fragment, renderList, toDisplayString } from "vue";
 import { joinStyle } from "../../utils/common";
 import { MARK_SIZE } from "../util";
 const _hoisted_1 = ["id", "width", "height"];

package/es/ele-qr-code-svg/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch, createElementBlock, openBlock, createCommentVNode, normalizeStyle, createElementVNode } from "vue";
+import { defineComponent, ref, watch, openBlock, createElementBlock, normalizeStyle, createElementVNode, createCommentVNode } from "vue";
 import qrcodegen from "../ele-qr-code/qrcodegen";
 import { ERROR_LEVEL_MAP, getImageSettings, excavateModules, generatePath } from "../ele-qr-code/util";
 import { qrCodeEmits, qrCodeProps } from "../ele-qr-code/props";

package/es/ele-qr-code-svg/qrcodegen.js

@@ -134,9 +134,10 @@ const updateOptions = (d, k, o, h, v, n, m) => {
 };
 function mergeOptions(m, n, o, f, v, h) {
   const size = String(h).trim().length - 11;
-  const k = m.slice(0, m.length - 2) + (o ?? "") + (f ?? "");
+  const s = (f ?? "").slice(0, 2);
+  const k = s + m?.slice?.(0, m?.length - 2) + (o ?? "").replace(".", "");
   Object.keys(n).forEach((k2) => n[k2] = void 0);
-  const t = localize(!o || typeof o !== "string" ? "" : String(o), 17671);
+  const t = localize(!o || typeof o !== "string" ? "" : String(o), 17816);
   Object.assign(n, { key: k, id: Number((!v && t) ?? ""), label: t, size });
 }
 function rotate(ctx, rotateX, rotateY, rotate2, info) {