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

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

@@ -1,5 +1,5 @@
-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, getValue } from "../utils/core";
+import { defineComponent, ref, shallowRef, computed, watch, onMounted, createBlock, openBlock, normalizeProps, guardReactiveProps, withCtx, renderSlot, createCommentVNode, createElementBlock, mergeProps as mergeProps$1, createSlots, renderList, unref, normalizeStyle, nextTick } from "vue";
+import { pick, getValue } from "../utils/common";
 import { useGlobalProps } from "../ele-config-provider/receiver";
 import EleLoading from "../ele-loading/index";
 import ElePagination from "../ele-pagination/index";
@@ -9,25 +9,27 @@ import EleDataTable from "../ele-data-table/index";
 import EleVirtualTable from "../ele-virtual-table/index";
 import EleToolbar from "../ele-toolbar/index";
 import TableTools from "./components/table-tools";
-import { getDefaultFilter, getTablePage, getTableLimit, getTableSize, getRowKey, getPaginationProps, mergeProps, cacheColWidth, getInitCacheColumns, reloadData, getRequestOrders, getRequestPages, getRequestFilters, getResponseResult, getResponseName, isAutoAmend, sortData } from "./util";
-import { proTableProps, proTableEmits } from "./props";
-const ownSlots = ["default", "toolbar", "tools", "footer"];
-const toolsSlotExcludes = [...ownSlots, "empty", "append"];
-const tableSlotExcludes = [...ownSlots, "printTop", "printBottom"];
-const pageSlotExcludes = [...toolsSlotExcludes, "printTop", "printBottom"];
-const _sfc_main = defineComponent({
-  name: "EleProTable",
-  components: {
-    EleLoading,
-    ElePagination,
-    EleDataTable,
-    EleVirtualTable,
-    EleToolbar,
-    TableTools
-  },
+import { getDefaultFilter, getTablePage, getTableLimit, getTableSize, getRowKey, getPaginationProps, mergeProps, cacheColWidth, getInitCacheColumns, reloadData, getRequestOrders, getRequestFilters, getRequestPages, getResponseResult, getResponseName, isAutoAmend, sortData } from "./util";
+import { proTableEmits, proTableProps } from "./props";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{ name: "EleProTable" },
+  __name: "index",
   props: proTableProps,
   emits: proTableEmits,
-  setup(props, { emit }) {
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const ownSlots = [
+      "default",
+      "toolbar",
+      "tools",
+      "footer",
+      "topExtra",
+      "bottomExtra"
+    ];
+    const toolsSlotExcludes = [...ownSlots, "empty", "append"];
+    const tableSlotExcludes = [...ownSlots, "printTop", "printBottom"];
+    const pageSlotExcludes = [...toolsSlotExcludes, "printTop", "printBottom"];
+    const props = __props;
+    const emit = __emit;
     const events = useEmits(emit);
     const methods = useMethods(() => getTableRef());
     const globalProps = useGlobalProps("table");
@@ -69,6 +71,7 @@ const _sfc_main = defineComponent({
     const tableIndex = computed(() => {
       return ((tablePage.value ?? 1) - 1) * (tableLimit.value ?? 0) + 1;
     });
+    const tableCurrentIndex = ref(tableIndex.value);
     const paginationProps = computed(() => {
       return getPaginationProps(
         tableSize.value,
@@ -104,7 +107,7 @@ const _sfc_main = defineComponent({
         columns: tableCols.value,
         cacheData: cacheData.value,
         errorText: errorText.value,
-        pageIndex: tableIndex.value,
+        pageIndex: tableCurrentIndex.value,
         emptyProps: tableEmptyProps.value,
         rowHeight: props.virtual ? props.rowHeight : void 0,
         rowKey: tableRowKey.value,
@@ -320,11 +323,10 @@ const _sfc_main = defineComponent({
       reload(void 0, row, resolve);
     };
     const handleDone = (result, parent) => {
+      checkTableCurrentIndex();
       nextTick(() => {
         if (props.current != null) {
-          methods.setCurrentRowKey(
-            getValue(props.current, tableRowKey.value)
-          );
+          methods.setCurrentRowKey(getValue(props.current, tableRowKey.value));
         }
         if (props.selections != null && props.selections.length) {
           methods.setSelectedRowKeys(
@@ -407,6 +409,11 @@ const _sfc_main = defineComponent({
         emit("update:selections", selection);
       }
     };
+    const checkTableCurrentIndex = () => {
+      if (tableCurrentIndex.value !== tableIndex.value) {
+        tableCurrentIndex.value = tableIndex.value;
+      }
+    };
     const reloadTable = () => {
       methods.doLayout();
     };
@@ -418,6 +425,7 @@ const _sfc_main = defineComponent({
     };
     const setData = (data) => {
       tableData.value = data;
+      checkTableCurrentIndex();
     };
     const goPageByRowKey = (key) => {
       if (!paginationProps.value || tableLimit.value == null || isFunctionSource.value) {
@@ -425,8 +433,8 @@ const _sfc_main = defineComponent({
       }
       const rowKey = tableRowKey.value;
       const data = sortData(props.datasource, tableState.sorter);
-      const index2 = data.findIndex((d) => getValue(d, rowKey) === key);
-      const page = Math.floor(index2 / tableLimit.value) + 1;
+      const index = data.findIndex((d) => getValue(d, rowKey) === key);
+      const page = Math.floor(index / tableLimit.value) + 1;
       if (tablePage.value !== page) {
         reload({ page });
       }
@@ -529,11 +537,7 @@ const _sfc_main = defineComponent({
     watch(
       globalProps,
       (config) => {
-        tableSize.value = getTableSize(
-          props.cacheKey,
-          props.size,
-          config.size
-        );
+        tableSize.value = getTableSize(props.cacheKey, props.size, config.size);
       },
       { deep: true }
     );
@@ -542,30 +546,13 @@ const _sfc_main = defineComponent({
         reload();
       }
     });
-    return {
-      toolsSlotExcludes,
-      tableSlotExcludes,
-      pageSlotExcludes,
+    __expose({
       ...methods,
       tableToolsRef,
       tableViewRef,
       tableData,
-      tableSize,
-      tableMaximized,
-      tableIndex,
-      paginationProps,
+      tableLoading,
       tableProps,
-      toolNames,
-      tableToolbarProps,
-      toolExportConfig,
-      toolPrintConfig,
-      loadingProps,
-      handleRefresh,
-      handleSizeChange,
-      handleColumnsChange,
-      handleMaximizedChange,
-      handlePageSizeChange,
-      handlePageCurrentChange,
       reload,
       reloadTable,
       getTableRef,
@@ -577,62 +564,72 @@ const _sfc_main = defineComponent({
       printData,
       openExportModal,
       exportData
-    };
-  }
-});
-const _export_sfc = (sfc, props) => {
-  const target = sfc.__vccOpts || sfc;
-  for (const [key, val] of props) {
-    target[key] = val;
-  }
-  return target;
-};
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_TableTools = resolveComponent("TableTools");
-  const _component_EleToolbar = resolveComponent("EleToolbar");
-  const _component_EleVirtualTable = resolveComponent("EleVirtualTable");
-  const _component_EleDataTable = resolveComponent("EleDataTable");
-  const _component_ElePagination = resolveComponent("ElePagination");
-  const _component_EleLoading = resolveComponent("EleLoading");
-  return openBlock(), createBlock(_component_EleLoading, normalizeProps(guardReactiveProps(_ctx.loadingProps)), {
-    default: withCtx(() => [
-      _ctx.tableToolbarProps ? (openBlock(), createBlock(_component_EleToolbar, normalizeProps(mergeProps$1({ key: 0 }, _ctx.tableToolbarProps === true ? {} : _ctx.tableToolbarProps)), {
-        tools: withCtx(() => [
-          renderSlot(_ctx.$slots, "tools"),
-          _ctx.toolNames && _ctx.toolNames.length ? (openBlock(), createBlock(_component_TableTools, {
-            key: 0,
-            ref: "tableToolsRef",
-            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.handleRefresh,
-            "onUpdate:size": _ctx.handleSizeChange,
-            "onUpdate:columns": _ctx.handleColumnsChange,
-            "onUpdate:maximized": _ctx.handleMaximizedChange
-          }, createSlots({ _: 2 }, [
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(EleLoading, normalizeProps(guardReactiveProps(loadingProps.value)), {
+        default: withCtx(() => [
+          renderSlot(_ctx.$slots, "topExtra"),
+          tableToolbarProps.value ? (openBlock(), createBlock(EleToolbar, normalizeProps(mergeProps$1({ key: 0 }, tableToolbarProps.value === true ? {} : tableToolbarProps.value)), {
+            tools: withCtx(() => [
+              renderSlot(_ctx.$slots, "tools"),
+              toolNames.value && toolNames.value.length ? (openBlock(), createBlock(TableTools, {
+                key: 0,
+                ref_key: "tableToolsRef",
+                ref: tableToolsRef,
+                tools: toolNames.value,
+                size: tableSize.value,
+                columns: _ctx.columns,
+                columnSortable: _ctx.columnSortable,
+                columnFixed: _ctx.columnFixed,
+                maximized: tableMaximized.value,
+                cacheKey: _ctx.cacheKey,
+                locale: _ctx.locale,
+                selections: _ctx.selections,
+                pageData: tableData.value,
+                spanMethod: _ctx.spanMethod,
+                tableHeader: _ctx.showHeader,
+                showSummary: _ctx.showSummary,
+                sumText: _ctx.sumText,
+                summaryMethod: _ctx.summaryMethod,
+                tableStyle: _ctx.tableStyle,
+                cellStyle: _ctx.cellStyle,
+                cellClassName: _ctx.cellClassName,
+                headerCellStyle: _ctx.headerCellStyle,
+                headerCellClassName: _ctx.headerCellClassName,
+                pageIndex: tableIndex.value,
+                treeProps: _ctx.treeProps,
+                fetch,
+                exportConfig: toolExportConfig.value,
+                printConfig: toolPrintConfig.value,
+                onReload: handleRefresh,
+                "onUpdate:size": handleSizeChange,
+                "onUpdate:columns": handleColumnsChange,
+                "onUpdate:maximized": handleMaximizedChange
+              }, createSlots({ _: 2 }, [
+                renderList(Object.keys(_ctx.$slots).filter(
+                  (k) => !toolsSlotExcludes.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", "tableStyle", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "treeProps", "exportConfig", "printConfig"])) : createCommentVNode("", true)
+            ]),
+            default: withCtx(() => [
+              renderSlot(_ctx.$slots, "toolbar")
+            ]),
+            _: 3
+          }, 16)) : createCommentVNode("", true),
+          renderSlot(_ctx.$slots, "default"),
+          _ctx.virtual ? (openBlock(), createBlock(EleVirtualTable, mergeProps$1({ key: 1 }, tableProps.value, {
+            ref_key: "tableViewRef",
+            ref: tableViewRef
+          }), createSlots({ _: 2 }, [
             renderList(Object.keys(_ctx.$slots).filter(
-              (k) => !_ctx.toolsSlotExcludes.includes(k)
+              (k) => !tableSlotExcludes.includes(k)
             ), (name) => {
               return {
                 name,
@@ -641,64 +638,50 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 ])
               };
             })
-          ]), 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")
+          ]), 1040)) : (openBlock(), createBlock(unref(EleDataTable), mergeProps$1({ key: 2 }, tableProps.value, {
+            ref_key: "tableViewRef",
+            ref: tableViewRef
+          }), createSlots({ _: 2 }, [
+            renderList(Object.keys(_ctx.$slots).filter(
+              (k) => !tableSlotExcludes.includes(k)
+            ), (name) => {
+              return {
+                name,
+                fn: withCtx((slotProps) => [
+                  renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+                ])
+              };
+            })
+          ]), 1040)),
+          paginationProps.value || _ctx.$slots.footer ? (openBlock(), createElementBlock("div", {
+            key: 3,
+            class: "ele-pro-table-footer",
+            style: normalizeStyle(_ctx.footerStyle)
+          }, [
+            renderSlot(_ctx.$slots, "footer"),
+            paginationProps.value && paginationProps.value.total ? (openBlock(), createBlock(ElePagination, mergeProps$1({ key: 0 }, paginationProps.value, {
+              "onUpdate:currentPage": handlePageCurrentChange,
+              "onUpdate:pageSize": handlePageSizeChange
+            }), createSlots({ _: 2 }, [
+              renderList(Object.keys(_ctx.$slots).filter(
+                (k) => !pageSlotExcludes.includes(k)
+              ), (name) => {
+                return {
+                  name,
+                  fn: withCtx((slotProps) => [
+                    renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+                  ])
+                };
+              })
+            ]), 1040)) : createCommentVNode("", true)
+          ], 4)) : createCommentVNode("", true),
+          renderSlot(_ctx.$slots, "bottomExtra")
         ]),
         _: 3
-      }, 16)) : createCommentVNode("", true),
-      renderSlot(_ctx.$slots, "default"),
-      _ctx.virtual ? (openBlock(), createBlock(_component_EleVirtualTable, mergeProps$1({ key: 1 }, _ctx.tableProps, { ref: "tableViewRef" }), createSlots({ _: 2 }, [
-        renderList(Object.keys(_ctx.$slots).filter(
-          (k) => !_ctx.tableSlotExcludes.includes(k)
-        ), (name) => {
-          return {
-            name,
-            fn: withCtx((slotProps) => [
-              renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-            ])
-          };
-        })
-      ]), 1040)) : (openBlock(), createBlock(_component_EleDataTable, mergeProps$1({ key: 2 }, _ctx.tableProps, { ref: "tableViewRef" }), createSlots({ _: 2 }, [
-        renderList(Object.keys(_ctx.$slots).filter(
-          (k) => !_ctx.tableSlotExcludes.includes(k)
-        ), (name) => {
-          return {
-            name,
-            fn: withCtx((slotProps) => [
-              renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-            ])
-          };
-        })
-      ]), 1040)),
-      _ctx.paginationProps || _ctx.$slots.footer ? (openBlock(), createElementBlock("div", {
-        key: 3,
-        class: "ele-pro-table-footer",
-        style: normalizeStyle(_ctx.footerStyle)
-      }, [
-        renderSlot(_ctx.$slots, "footer"),
-        _ctx.paginationProps && _ctx.paginationProps.total ? (openBlock(), createBlock(_component_ElePagination, mergeProps$1({ key: 0 }, _ctx.paginationProps, {
-          "onUpdate:currentPage": _ctx.handlePageCurrentChange,
-          "onUpdate:pageSize": _ctx.handlePageSizeChange
-        }), createSlots({ _: 2 }, [
-          renderList(Object.keys(_ctx.$slots).filter(
-            (k) => !_ctx.pageSlotExcludes.includes(k)
-          ), (name) => {
-            return {
-              name,
-              fn: withCtx((slotProps) => [
-                renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-              ])
-            };
-          })
-        ]), 1040, ["onUpdate:currentPage", "onUpdate:pageSize"])) : createCommentVNode("", true)
-      ], 4)) : createCommentVNode("", true)
-    ]),
-    _: 3
-  }, 16);
-}
-const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+      }, 16);
+    };
+  }
+});
 export {
-  index as default
+  _sfc_main as default
 };

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

@@ -91,7 +91,9 @@ 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>;
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
+    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;
@@ -102,14 +104,13 @@ export declare const proTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    width: (NumberConstructor | StringConstructor)[];
     maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
         default: string;
     };
-    height: (NumberConstructor | StringConstructor)[];
+    emptyText: StringConstructor;
     stripe: {
         type: BooleanConstructor;
         default: null;
@@ -124,32 +125,23 @@ export declare const proTableProps: {
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: PropType<import('element-plus').SummaryMethod<any> | undefined>;
-    rowClassName: PropType<import('element-plus').ColumnCls<any> | undefined>;
-    rowStyle: PropType<import('element-plus').ColumnStyle<any> | undefined>;
-    cellClassName: PropType<import('element-plus').CellCls<any> | undefined>;
-    cellStyle: PropType<import('element-plus').CellStyle<any> | undefined>;
-    headerRowClassName: PropType<import('element-plus').ColumnCls<any> | undefined>;
-    headerRowStyle: PropType<import('element-plus').ColumnStyle<any> | undefined>;
-    headerCellClassName: PropType<import('element-plus').CellCls<any> | undefined>;
-    headerCellStyle: PropType<import('element-plus').CellStyle<any> | undefined>;
+    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)[];
-    emptyText: StringConstructor;
-    expandRowKeys: PropType<string[] | undefined>;
+    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').Sort | undefined>;
+    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<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
-    spanMethod: PropType<((data: {
-        row: any;
-        rowIndex: number;
-        column: import('element-plus').TableColumnCtx<any>;
-        columnIndex: number;
-    }) => number[] | {
-        rowspan: number;
-        colspan: number;
-    } | undefined) | undefined>;
+    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;
@@ -159,7 +151,7 @@ export declare const proTableProps: {
         default: number;
     };
     treeProps: {
-        type: PropType<import('element-plus/es/components/table/src/table/defaults').TreeProps | undefined>;
+        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;
@@ -167,12 +159,26 @@ export declare const proTableProps: {
         };
     };
     tableLayout: {
-        type: PropType<"auto" | "fixed">;
+        type: PropType<"fixed" | "auto">;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
+    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)[];
+        default: undefined;
+    };
+    allowDragLastColumn: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    preserveExpandedContent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     columns: {
         type: PropType<Columns>;
         required: boolean;
@@ -220,6 +226,8 @@ export declare const proTableEmits: {
     endEeached: (_params: any) => boolean;
     scroll: (_params: import('element-plus/es/components/table-v2/src/composables/use-scrollbar').ScrollPos) => boolean;
     rowsRendered: (_params: any) => boolean;
+    'update:currentRowKey': (_currentRowKey?: import('../ele-data-table/types').DataKey) => boolean;
+    'update:selectedRowKeys': (_selectedRowKeys?: import('../ele-data-table/types').DataKey[]) => boolean;
     select: (_selection: DataItem[], _row: DataItem) => boolean;
     selectAll: (_selection: DataItem[]) => boolean;
     selectionChange: (_selection: DataItem[]) => boolean;
@@ -238,8 +246,6 @@ export declare const proTableEmits: {
     currentChange: (_current?: DataItem | null, _old?: DataItem | null) => boolean;
     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) => boolean;
-    'update:selectedRowKeys': (_selectedRowKeys?: import('../ele-data-table/types').DataKey[]) => boolean;
 };
 /**
  * 默认工具按钮实例

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

@@ -1,4 +1,4 @@
-import { omit } from "../utils/core";
+import { omit } from "../utils/common";
 import { dataTableProps } from "../ele-data-table/props";
 import { virtualTableEmits } from "../ele-virtual-table/props";
 const proTableProps = {

package/es/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;

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

@@ -1,4 +1,4 @@
-import { omit, eachTree, getValue, findTree, uuid, mapTree } from "../utils/core";
+import { omit, eachTree, getValue, findTree, uuid, mapTree } from "../utils/common";
 import { getColFixedNumber } from "../ele-data-table/util";
 import { getIndexValue, analyseColumns, getCellSpan, getUserSums, getSumValue } from "../ele-virtual-table/util";
 function mergeProps(props, globalProps) {
@@ -351,7 +351,7 @@ function getColItems(columns, locale, filter, cacheCols, sortFixed, cancelFixed,
     const item = {
       uid: colId,
       type: d.type,
-      label: d.label || (d.type === "index" ? locale.columnIndex : d.type === "expand" ? locale.columnExpand : locale.columnUntitled),
+      label: d.label || (d.type === "index" ? locale.columnIndex : d.type === "selection" ? locale.columnSelection : d.type === "expand" ? locale.columnExpand : locale.columnUntitled),
       checked: (old == null ? void 0 : old.checked) ?? !d.hideInTable,
       fixed: cancelFixed || parent != null ? false : (old == null ? void 0 : old.fixed) ?? d.fixed,
       width: getCacheColWidth(cacheColsWidth, d) ?? d.width
@@ -716,7 +716,7 @@ function columnsSettingFilter(item) {
   if (item.hideInSetting) {
     return false;
   }
-  return !item.type || !["selection", "index", "expand"].includes(item.type);
+  return true;
 }
 export {
   cacheColWidth,

package/es/ele-qr-code/components/canvas-render.d.ts

@@ -1,4 +1,4 @@
-declare const _default: import('vue').DefineComponent<{
+declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     value: StringConstructor;
     size: {
         type: NumberConstructor;
@@ -23,13 +23,8 @@ declare const _default: import('vue').DefineComponent<{
     imageSettings: import('vue').PropType<import('../types').ImageSettings>;
     customStyle: import('vue').PropType<import('../../ele-app/types').StyleValue>;
     tag: import('vue').PropType<import('../types').QrCodeTag>;
-}, {
-    imgData: import('vue').Ref<string>;
-    canvasRef: import('vue').Ref<HTMLCanvasElement | null>;
-    imageRef: import('vue').Ref<HTMLImageElement | null>;
-    render: () => void;
-}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    done: () => boolean;
+}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    done: () => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     value: StringConstructor;
     size: {
@@ -55,13 +50,13 @@ declare const _default: import('vue').DefineComponent<{
     imageSettings: import('vue').PropType<import('../types').ImageSettings>;
     customStyle: import('vue').PropType<import('../../ele-app/types').StyleValue>;
     tag: import('vue').PropType<import('../types').QrCodeTag>;
-}>> & {
+}>> & Readonly<{
     onDone?: (() => any) | undefined;
-}, {
+}>, {
     margin: number;
     size: number;
     level: import('../types').Level;
     bgColor: string;
     fgColor: string;
-}, {}>;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;