ele-admin-plus 1.3.0 → 1.4.0-beta.1

package/lib/ele-pro-table/components/tool-print.cjs

@@ -1,7 +1,7 @@
 "use strict";
 const vue = require("vue");
 const elementPlus = require("element-plus");
-const core = require("../../utils/core");
+const common = require("../../utils/common");
 const EleModal = require("../../ele-modal/index");
 const ElePrinter = require("../../ele-printer/index");
 const EleTable = require("../../ele-table/index");
@@ -56,6 +56,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     sumText: String,
     /** 合计行自定义方法 */
     summaryMethod: Function,
+    /** 自定义表格样式 */
+    tableStyle: Object,
     /** 单元格样式 */
     cellStyle: [Object, Function],
     /** 单元格类名自定义 */
@@ -154,7 +156,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         printDataValue,
         printColumns,
         props.spanMethod,
-        props.pageIndex,
+        printDataType === "pageData" ? props.pageIndex : void 0,
         isShowFooter,
         props.sumText,
         props.summaryMethod,
@@ -238,7 +240,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleCheckedChange = (item, checked, type) => {
       let checkAll = true;
       let indeterminate = false;
-      core.eachTree(colItems.value, (d) => {
+      common.eachTree(colItems.value, (d) => {
         const flag = item == null ? type === d.type : d.uid === item.uid;
         if (flag) {
           d.checked = checked;
@@ -259,7 +261,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleCheckAllChange = (checked) => {
       isCheckAll.value = checked;
       isIndeterminate.value = false;
-      core.eachTree(colItems.value, (d) => {
+      common.eachTree(colItems.value, (d) => {
         if (d.checked !== checked) {
           d.checked = checked;
         }
@@ -269,7 +271,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (!parent) {
         colItems.value = items;
       } else {
-        core.eachTree(colItems.value, (d) => {
+        common.eachTree(colItems.value, (d) => {
           if (d.uid === parent.uid) {
             d.children = items;
             return false;
@@ -278,7 +280,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     };
     const handleColWidthChange = (item, width) => {
-      core.eachTree(colItems.value, (d) => {
+      common.eachTree(colItems.value, (d) => {
         if (d.uid === item.uid) {
           d.width = width;
           return false;
@@ -304,7 +306,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             var _a, _b, _c;
             return ((_b = d[((_a = props.treeProps) == null ? void 0 : _a.children) || "children"]) == null ? void 0 : _b.length) || d[((_c = props.treeProps) == null ? void 0 : _c.hasChildren) || "hasChildren"];
           }
-        )) && core.findTree(colItems.value, (c) => c.type === "expand") == null;
+        )) && common.findTree(colItems.value, (c) => c.type === "expand") == null;
         showTreeIndex.value = treeIndexDisabled.value ? false : !!props.defaultShowTreeIndex;
         return;
       }
@@ -469,7 +471,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               border: true,
               printSkin: true,
               hasHeader: printOptions.hasHeader,
-              hasFooter: printOptions.hasFooter
+              hasFooter: printOptions.hasFooter,
+              style: __props.tableStyle
             }, __props.tableProps || {}), {
               default: vue.withCtx(() => [
                 vue.createElementVNode("colgroup", null, [
@@ -606,7 +609,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 ])) : vue.createCommentVNode("", true)
               ]),
               _: 3
-            }, 16, ["hasHeader", "hasFooter"]),
+            }, 16, ["hasHeader", "hasFooter", "style"]),
             vue.renderSlot(_ctx.$slots, "printBottom", {
               data: printOptions.data
             })

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

@@ -1,4 +1,5 @@
 import { PropType } from 'vue';
+import { StyleValue } from '../../ele-app/types';
 import { EleModalProps, ElePrinterProps, EleTableProps } from '../../ele-app/plus';
 import { Columns, DataItem, SpanMethod, SummaryMethod, CellStyle, CellClass, HeaderCellStyle, HeaderCellClass, TreeProps } from '../../ele-data-table/types';
 import { TableLocale, ExportDataType, BeforeExport, Datasource, FetchFunction, TableExportParams } from '../types';
@@ -47,6 +48,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     sumText: StringConstructor;
     /** 合计行自定义方法 */
     summaryMethod: PropType<SummaryMethod>;
+    /** 自定义表格样式 */
+    tableStyle: PropType<StyleValue>;
     /** 单元格样式 */
     cellStyle: PropType<CellStyle>;
     /** 单元格类名自定义 */
@@ -111,6 +114,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     sumText: StringConstructor;
     /** 合计行自定义方法 */
     summaryMethod: PropType<SummaryMethod>;
+    /** 自定义表格样式 */
+    tableStyle: PropType<StyleValue>;
     /** 单元格样式 */
     cellStyle: PropType<CellStyle>;
     /** 单元格类名自定义 */

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

@@ -1,6 +1,6 @@
 "use strict";
 const vue = require("vue");
-const core = require("../utils/core");
+const common = require("../utils/common");
 const receiver = require("../ele-config-provider/receiver");
 const EleLoading = require("../ele-loading/index");
 const ElePagination = require("../ele-pagination/index");
@@ -18,7 +18,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   props: props.proTableProps,
   emits: props.proTableEmits,
   setup(__props, { expose: __expose, emit: __emit }) {
-    const ownSlots = ["default", "toolbar", "tools", "footer"];
+    const ownSlots = [
+      "default",
+      "toolbar",
+      "tools",
+      "footer",
+      "topExtra",
+      "bottomExtra"
+    ];
     const toolsSlotExcludes = [...ownSlots, "empty", "append"];
     const tableSlotExcludes = [...ownSlots, "printTop", "printBottom"];
     const pageSlotExcludes = [...toolsSlotExcludes, "printTop", "printBottom"];
@@ -65,6 +72,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const tableIndex = vue.computed(() => {
       return ((tablePage.value ?? 1) - 1) * (tableLimit.value ?? 0) + 1;
     });
+    const tableCurrentIndex = vue.ref(tableIndex.value);
     const paginationProps = vue.computed(() => {
       return util$1.getPaginationProps(
         tableSize.value,
@@ -90,7 +98,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const tableProps = vue.computed(() => {
       const isMaximized = tableMaximized.value && props2.maximizedHeight;
       const options = {
-        ...core.pick(props2, props$1.dataTablePropKeys),
+        ...common.pick(props2, props$1.dataTablePropKeys),
         height: isMaximized ? props2.maximizedHeight : props2.height,
         border: props2.border ?? globalProps.value.border ?? false,
         stripe: props2.stripe ?? globalProps.value.stripe ?? false,
@@ -100,7 +108,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         columns: tableCols.value,
         cacheData: cacheData.value,
         errorText: errorText.value,
-        pageIndex: tableIndex.value,
+        pageIndex: tableCurrentIndex.value,
         emptyProps: tableEmptyProps.value,
         rowHeight: props2.virtual ? props2.rowHeight : void 0,
         rowKey: tableRowKey.value,
@@ -316,9 +324,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       reload(void 0, row, resolve);
     };
     const handleDone = (result, parent) => {
+      checkTableCurrentIndex();
       vue.nextTick(() => {
         if (props2.current != null) {
-          methods.setCurrentRowKey(core.getValue(props2.current, tableRowKey.value));
+          methods.setCurrentRowKey(common.getValue(props2.current, tableRowKey.value));
         }
         if (props2.selections != null && props2.selections.length) {
           methods.setSelectedRowKeys(
@@ -401,6 +410,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         emit("update:selections", selection);
       }
     };
+    const checkTableCurrentIndex = () => {
+      if (tableCurrentIndex.value !== tableIndex.value) {
+        tableCurrentIndex.value = tableIndex.value;
+      }
+    };
     const reloadTable = () => {
       methods.doLayout();
     };
@@ -412,6 +426,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const setData = (data) => {
       tableData.value = data;
+      checkTableCurrentIndex();
     };
     const goPageByRowKey = (key) => {
       if (!paginationProps.value || tableLimit.value == null || isFunctionSource.value) {
@@ -419,7 +434,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
       const rowKey = tableRowKey.value;
       const data = util$1.sortData(props2.datasource, tableState.sorter);
-      const index = data.findIndex((d) => core.getValue(d, rowKey) === key);
+      const index = data.findIndex((d) => common.getValue(d, rowKey) === key);
       const page = Math.floor(index / tableLimit.value) + 1;
       if (tablePage.value !== page) {
         reload({ page });
@@ -505,7 +520,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     vue.watch(
       () => props2.current,
       (current) => {
-        methods.setCurrentRowKey(core.getValue(current, tableRowKey.value));
+        methods.setCurrentRowKey(common.getValue(current, tableRowKey.value));
       }
     );
     vue.watch(
@@ -537,6 +552,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       tableToolsRef,
       tableViewRef,
       tableData,
+      tableLoading,
       tableProps,
       reload,
       reloadTable,
@@ -553,6 +569,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(EleLoading, vue.normalizeProps(vue.guardReactiveProps(loadingProps.value)), {
         default: vue.withCtx(() => [
+          vue.renderSlot(_ctx.$slots, "topExtra"),
           tableToolbarProps.value ? (vue.openBlock(), vue.createBlock(EleToolbar, vue.normalizeProps(vue.mergeProps({ key: 0 }, tableToolbarProps.value === true ? {} : tableToolbarProps.value)), {
             tools: vue.withCtx(() => [
               vue.renderSlot(_ctx.$slots, "tools"),
@@ -575,6 +592,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 showSummary: _ctx.showSummary,
                 sumText: _ctx.sumText,
                 summaryMethod: _ctx.summaryMethod,
+                tableStyle: _ctx.tableStyle,
                 cellStyle: _ctx.cellStyle,
                 cellClassName: _ctx.cellClassName,
                 headerCellStyle: _ctx.headerCellStyle,
@@ -599,7 +617,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                     ])
                   };
                 })
-              ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "treeProps", "exportConfig", "printConfig"])) : vue.createCommentVNode("", true)
+              ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "tableStyle", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "treeProps", "exportConfig", "printConfig"])) : vue.createCommentVNode("", true)
             ]),
             default: vue.withCtx(() => [
               vue.renderSlot(_ctx.$slots, "toolbar")
@@ -657,7 +675,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 };
               })
             ]), 1040)) : vue.createCommentVNode("", true)
-          ], 4)) : vue.createCommentVNode("", true)
+          ], 4)) : vue.createCommentVNode("", true),
+          vue.renderSlot(_ctx.$slots, "bottomExtra")
         ]),
         _: 3
       }, 16);

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

@@ -12,10 +12,12 @@ declare function __VLS_template(): Partial<Record<string, (_: {
     column: Column;
     $index: number | undefined;
 }) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & {
+    topExtra?(_: {}): any;
     toolbar?(_: {}): any;
     tools?(_: {}): any;
     default?(_: {}): any;
     footer?(_: {}): any;
+    bottomExtra?(_: {}): any;
 };
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     rowKey: {
@@ -105,23 +107,23 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    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"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    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"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -131,21 +133,22 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     tableLayout: {
         type: import('vue').PropType<"fixed" | "auto">;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
+    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"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -155,6 +158,10 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: BooleanConstructor;
         default: boolean;
     };
+    preserveExpandedContent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     columns: {
         type: import('vue').PropType<Columns>;
         required: boolean;
@@ -193,6 +200,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         [x: symbol]: any;
         _isMock?: boolean | undefined;
     }[]>;
+    tableLoading: Ref<boolean, boolean>;
     tableProps: import('vue').ComputedRef<EleDataTableProps>;
     reload: ReloadFunction;
     reloadTable: () => void;
@@ -207,7 +215,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     exportData: (params?: TableExportParams) => void;
     clearSelection: () => void;
     getSelectionRows: () => DataItem[] | undefined;
-    toggleRowSelection: (row: DataItem, selected?: boolean) => void;
+    toggleRowSelection: (row: DataItem, selected?: boolean, ignoreSelectable?: boolean) => void;
     toggleAllSelection: () => void;
     toggleRowExpansion: (row: DataItem, expanded?: boolean) => void;
     setCurrentRow: (row?: DataItem | null) => void;
@@ -343,23 +351,23 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    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"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    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"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -369,21 +377,22 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     tableLayout: {
         type: import('vue').PropType<"fixed" | "auto">;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
+    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"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -393,6 +402,10 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: BooleanConstructor;
         default: boolean;
     };
+    preserveExpandedContent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     columns: {
         type: import('vue').PropType<Columns>;
         required: boolean;
@@ -467,6 +480,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     flexible: boolean;
     scrollbarTabindex: string | number;
     allowDragLastColumn: boolean;
+    preserveExpandedContent: boolean;
     sticky: boolean;
     toolbar: boolean | EleToolbarProps;
     headerEllipsis: boolean;

package/lib/ele-pro-table/props.cjs

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const core = require("../utils/core");
+const common = require("../utils/common");
 const props = require("../ele-data-table/props");
 const props$1 = require("../ele-virtual-table/props");
 const proTableProps = {
-  ...core.omit(props.dataTableProps, ["data", "pageIndex", "errorText", "cacheData"]),
+  ...common.omit(props.dataTableProps, ["data", "pageIndex", "errorText", "cacheData"]),
   rowKey: {
     type: [String, Function],
     required: false

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

@@ -93,7 +93,7 @@ export declare const proTableProps: {
     printConfig: PropType<PrintConfig>;
     width: (NumberConstructor | StringConstructor)[];
     height: (NumberConstructor | StringConstructor)[];
-    load: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     size: {
         readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
@@ -125,23 +125,23 @@ export declare const proTableProps: {
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    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"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    defaultSort: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    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"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -151,7 +151,7 @@ export declare const proTableProps: {
         default: number;
     };
     treeProps: {
-        type: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
@@ -164,7 +164,8 @@ export declare const proTableProps: {
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
+    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"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -174,6 +175,10 @@ export declare const proTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
+    preserveExpandedContent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     columns: {
         type: PropType<Columns>;
         required: boolean;

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

@@ -502,6 +502,7 @@ export interface TableLocale {
   columnReset: string;
   columnUntitled: string;
   columnIndex: string;
+  columnSelection: string;
   columnExpand: string;
   columnFixedLeft: string;
   columnFixedRight: string;