ele-admin-plus 1.1.9-beta.8 → 1.1.9

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, watch, onMounted, nextTick, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps as mergeProps$1, renderSlot, createSlots, renderList, createCommentVNode, createElementBlock, normalizeStyle } from "vue";
+import { defineComponent, ref, shallowRef, computed, watch, onMounted, nextTick, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps as mergeProps$1, renderSlot, createSlots, renderList, createCommentVNode, createElementBlock, normalizeStyle } from "vue";
 import { pick } from "../utils/core";
 import { useGlobalProps } from "../ele-config-provider/receiver";
 import EleLoading from "../ele-loading/index";
@@ -9,7 +9,7 @@ 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, getPaginationProps, mergeProps, getRowKey, getInitCacheColumns, reloadData, addDefaultRowKey, getDefaultRowKey, getRequestOrders, getRequestFilters, getResponseResult, getResponseName, isAutoAmend, sortData } from "./util";
+import { getDefaultFilter, getTablePage, getTableLimit, getTableSize, getRowKey, getPaginationProps, mergeProps, getInitCacheColumns, reloadData, getRequestOrders, getRequestPages, getRequestFilters, getResponseResult, getResponseName, isAutoAmend, sortData } from "./util";
 import { proTableProps, proTableEmits } from "./props";
 const _sfc_main = defineComponent({
   name: "EleProTable",
@@ -49,6 +49,7 @@ const _sfc_main = defineComponent({
     const tableMaximized = ref(false);
     const errorText = ref("");
     const cacheData = ref();
+    const tableRowKey = shallowRef(getRowKey(props.rowKey));
     const tableIndex = computed(() => {
       return ((tablePage.value ?? 1) - 1) * (tableLimit.value ?? 0) + 1;
     });
@@ -60,7 +61,8 @@ const _sfc_main = defineComponent({
         {
           total: tableTotal.value,
           pageSize: tableLimit.value,
-          currentPage: tablePage.value
+          currentPage: tablePage.value,
+          hasNext: tableData.value.length >= tableLimit.value
         }
       );
     });
@@ -89,7 +91,7 @@ const _sfc_main = defineComponent({
         pageIndex: tableIndex.value,
         emptyProps: tableEmptyProps.value,
         rowHeight: props.virtual ? props.rowHeight : void 0,
-        rowKey: getRowKey(props.rowKey),
+        rowKey: tableRowKey.value,
         style: props.tableStyle,
         class: "ele-pro-table-view",
         ...events,
@@ -106,9 +108,41 @@ const _sfc_main = defineComponent({
       }
       return tools || [];
     });
-    const rootProps = computed(() => {
+    const toolExportConfig = computed(() => {
+      const globalExportConfig = globalProps.value.exportConfig || {};
+      const userExportConfig = props.exportConfig || {};
+      return {
+        ...globalExportConfig,
+        ...userExportConfig,
+        modalProps: {
+          ...globalExportConfig.modalProps || {},
+          ...userExportConfig.modalProps || {}
+        }
+      };
+    });
+    const toolPrintConfig = computed(() => {
+      const globalPrintConfig = globalProps.value.printConfig || {};
+      const userPrintConfig = props.printConfig || {};
+      return {
+        ...globalPrintConfig,
+        ...userPrintConfig,
+        modalProps: {
+          ...globalPrintConfig.modalProps || {},
+          ...userPrintConfig.modalProps || {}
+        },
+        printerProps: {
+          ...globalPrintConfig.printerProps || {},
+          ...userPrintConfig.printerProps || {}
+        },
+        tableProps: {
+          ...globalPrintConfig.tableProps || {},
+          ...userPrintConfig.tableProps || {}
+        }
+      };
+    });
+    const loadingProps = computed(() => {
       const zIndex = props.maximizedIndex ?? globalProps.value.maximizedIndex;
-      const option = {
+      return {
         ...props.loadingProps || {},
         loading: tableLoading.value,
         class: [
@@ -118,7 +152,6 @@ const _sfc_main = defineComponent({
         ],
         style: tableMaximized.value ? { zIndex } : void 0
       };
-      return option;
     });
     const reload = (option, parent, resolve) => {
       if (option) {
@@ -148,11 +181,7 @@ const _sfc_main = defineComponent({
           tableLimit.value
         );
         cacheData.value = props.datasource;
-        tableData.value = addDefaultRowKey(
-          data,
-          getDefaultRowKey(props.rowKey),
-          tablePage.value
-        );
+        tableData.value = data;
         tablePage.value = page;
         tableTotal.value = total;
         onDone({ data, page, total, response: props.datasource });
@@ -170,6 +199,12 @@ const _sfc_main = defineComponent({
       props.datasource({
         page: tablePage.value,
         limit: tableLimit.value,
+        pages: getRequestPages(
+          tablePage.value,
+          tableLimit.value,
+          props.request,
+          globalProps.value.request
+        ),
         where: Object.assign({}, tableState.where),
         orders,
         filters: getRequestFilters(filter),
@@ -212,7 +247,7 @@ const _sfc_main = defineComponent({
       if (resolve) {
         resolve(data);
       } else {
-        if (isAutoAmend(props.pagination, globalProps.value.pagination) && !data.length && total && tablePage.value && tableLimit.value) {
+        if (isAutoAmend(props.pagination, globalProps.value.pagination) && !data.length && total && "*" !== total && tablePage.value && tableLimit.value) {
           const maxPage = Math.ceil(total / tableLimit.value);
           if (maxPage && tablePage.value > maxPage) {
             tablePage.value = maxPage;
@@ -220,11 +255,7 @@ const _sfc_main = defineComponent({
             return;
           }
         }
-        tableData.value = addDefaultRowKey(
-          data,
-          getDefaultRowKey(props.rowKey),
-          tablePage.value
-        );
+        tableData.value = data;
         tableTotal.value = total || data.length;
       }
       tableLoading.value = false;
@@ -247,12 +278,12 @@ const _sfc_main = defineComponent({
       nextTick(() => {
         if (props.current != null) {
           methods.setCurrentRowKey(
-            getValue(props.current, getRowKey(props.rowKey))
+            getValue(props.current, tableRowKey.value)
           );
         }
         if (props.selections != null && props.selections.length) {
           methods.setSelectedRowKeys(
-            getRowKeys(props.selections, getRowKey(props.rowKey))
+            getRowKeys(props.selections, tableRowKey.value)
           );
         }
       });
@@ -327,17 +358,13 @@ const _sfc_main = defineComponent({
       return tableData.value;
     };
     const setData = (data) => {
-      tableData.value = addDefaultRowKey(
-        data,
-        getDefaultRowKey(props.rowKey),
-        tablePage.value
-      );
+      tableData.value = data;
     };
     const goPageByRowKey = (key) => {
       if (!paginationProps.value || tableLimit.value == null || isFunctionSource.value) {
         return;
       }
-      const rowKey = getRowKey(props.rowKey);
+      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;
@@ -355,6 +382,12 @@ const _sfc_main = defineComponent({
       callback({
         page: tablePage.value,
         limit: tableLimit.value,
+        pages: getRequestPages(
+          tablePage.value,
+          tableLimit.value,
+          props.request,
+          globalProps.value.request
+        ),
         where: Object.assign({}, tableState.where),
         orders,
         filters: getRequestFilters(filter),
@@ -402,15 +435,19 @@ const _sfc_main = defineComponent({
     watch(
       () => props.current,
       (current) => {
-        methods.setCurrentRowKey(getValue(current, getRowKey(props.rowKey)));
+        methods.setCurrentRowKey(getValue(current, tableRowKey.value));
       }
     );
     watch(
       () => props.selections,
       (selections) => {
-        methods.setSelectedRowKeys(
-          getRowKeys(selections, getRowKey(props.rowKey))
-        );
+        methods.setSelectedRowKeys(getRowKeys(selections, tableRowKey.value));
+      }
+    );
+    watch(
+      () => props.rowKey,
+      () => {
+        tableRowKey.value = getRowKey(props.rowKey);
       }
     );
     watch(
@@ -432,13 +469,16 @@ const _sfc_main = defineComponent({
     return {
       ...methods,
       tableViewRef,
+      tableData,
       tableSize,
       tableMaximized,
       tableIndex,
       paginationProps,
       tableProps,
       toolNames,
-      rootProps,
+      toolExportConfig,
+      toolPrintConfig,
+      loadingProps,
       onRefresh,
       onSizeChange,
       onColumnsChange,
@@ -469,21 +509,35 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleDataTable = resolveComponent("EleDataTable");
   const _component_ElePagination = resolveComponent("ElePagination");
   const _component_EleLoading = resolveComponent("EleLoading");
-  return openBlock(), createBlock(_component_EleLoading, normalizeProps(guardReactiveProps(_ctx.rootProps)), {
+  return openBlock(), createBlock(_component_EleLoading, normalizeProps(guardReactiveProps(_ctx.loadingProps)), {
     default: withCtx(() => [
       _ctx.toolbar ? (openBlock(), createBlock(_component_EleToolbar, normalizeProps(mergeProps$1({ key: 0 }, _ctx.toolbar === true ? {} : _ctx.toolbar)), {
         tools: withCtx(() => [
           renderSlot(_ctx.$slots, "tools"),
           _ctx.toolNames && _ctx.toolNames.length ? (openBlock(), createBlock(_component_TableTools, {
             key: 0,
+            tools: _ctx.toolNames,
             size: _ctx.tableSize,
             columns: _ctx.columns,
-            tools: _ctx.toolNames,
             columnSortable: _ctx.columnSortable,
             columnFixed: _ctx.columnFixed,
             maximized: _ctx.tableMaximized,
             cacheKey: _ctx.cacheKey,
             locale: _ctx.locale,
+            selections: _ctx.selections,
+            pageData: _ctx.tableData,
+            spanMethod: _ctx.spanMethod,
+            showSummary: _ctx.showSummary,
+            sumText: _ctx.sumText,
+            summaryMethod: _ctx.summaryMethod,
+            cellStyle: _ctx.cellStyle,
+            cellClassName: _ctx.cellClassName,
+            headerCellStyle: _ctx.headerCellStyle,
+            headerCellClassName: _ctx.headerCellClassName,
+            pageIndex: _ctx.tableIndex,
+            fetch: _ctx.fetch,
+            exportConfig: _ctx.toolExportConfig,
+            printConfig: _ctx.toolPrintConfig,
             onReload: _ctx.onRefresh,
             "onUpdate:size": _ctx.onSizeChange,
             "onUpdate:columns": _ctx.onColumnsChange,
@@ -506,7 +560,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 ])
               };
             })
-          ]), 1032, ["size", "columns", "tools", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "onReload", "onUpdate:size", "onUpdate:columns", "onUpdate:maximized"])) : createCommentVNode("", true)
+          ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "fetch", "exportConfig", "printConfig", "onReload", "onUpdate:size", "onUpdate:columns", "onUpdate:maximized"])) : createCommentVNode("", true)
         ]),
         default: withCtx(() => [
           renderSlot(_ctx.$slots, "toolbar")
@@ -516,7 +570,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       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) => !["default", "toolbar", "tools", "footer"].includes(k)
+          (k) => ![
+            "default",
+            "toolbar",
+            "tools",
+            "footer",
+            "printTop",
+            "printBottom"
+          ].includes(k)
         ), (name) => {
           return {
             name,
@@ -527,7 +588,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         })
       ]), 1040)) : (openBlock(), createBlock(_component_EleDataTable, mergeProps$1({ key: 2 }, _ctx.tableProps, { ref: "tableViewRef" }), createSlots({ _: 2 }, [
         renderList(Object.keys(_ctx.$slots).filter(
-          (k) => !["default", "toolbar", "tools", "footer"].includes(k)
+          (k) => ![
+            "default",
+            "toolbar",
+            "tools",
+            "footer",
+            "printTop",
+            "printBottom"
+          ].includes(k)
         ), (name) => {
           return {
             name,
@@ -554,7 +622,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               "tools",
               "footer",
               "empty",
-              "append"
+              "append",
+              "printTop",
+              "printBottom"
             ].includes(k)
           ), (name) => {
             return {

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

@@ -1,7 +1,8 @@
-import type { PropType, ExtractPropTypes } from 'vue';
-import type { EleLoadingProps, EleToolbarProps } from '../ele-app/plus';
-import type { DataItem, Columns, TableSize } from '../ele-data-table/types';
-import type { Where, Datasource, RequestOption, ResponseOption, ParseData, DoneParams, TablePagination, TableLocale } from './types';
+import { Where, Datasource, RequestOption, ResponseOption, ParseData, DoneParams, TablePagination, TableLocale, ExportConfig, PrintConfig } from './types';
+import { DataItem, Columns, TableSize } from '../ele-data-table/types';
+import { EleLoadingProps, EleToolbarProps } from '../ele-app/plus';
+import { PropType, ExtractPropTypes } from 'vue';
+
 /**
  * 属性
  */
@@ -64,9 +65,9 @@ export declare const proTableProps: {
     /** 表格全屏状态的高度 */
     maximizedHeight: (StringConstructor | NumberConstructor)[];
     /** 自定义表格样式 */
-    tableStyle: PropType<Partial<import("vue").CSSProperties>>;
+    tableStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** 自定义底部样式 */
-    footerStyle: PropType<Partial<import("vue").CSSProperties>>;
+    footerStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** 分页组件 */
     pagination: {
         type: PropType<boolean | TablePagination>;
@@ -78,18 +79,22 @@ export declare const proTableProps: {
     cacheKey: StringConstructor;
     /** 是否虚拟滚动 */
     virtual: BooleanConstructor;
-    /** 行高 */
+    /** 虚拟滚动表格行高 */
     rowHeight: NumberConstructor;
     /** 国际化 */
     locale: PropType<Partial<TableLocale>>;
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
+    /** 导出配置 */
+    exportConfig: PropType<ExportConfig>;
+    /** 打印配置 */
+    printConfig: PropType<PrintConfig>;
     size: {
-        readonly type: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        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;
     };
+    width: (StringConstructor | NumberConstructor)[];
+    height: (StringConstructor | NumberConstructor)[];
     maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
@@ -104,11 +109,8 @@ export declare const proTableProps: {
         type: PropType<Columns>;
         required: boolean;
     };
-    scrollbarAlwaysOn: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    showOverflowTooltip: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    scrollbarAlwaysOn: BooleanConstructor;
+    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     emptyText: StringConstructor;
     indent: {
         type: NumberConstructor;
@@ -128,26 +130,26 @@ export declare const proTableProps: {
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: PropType<import("element-plus/es/components/table/src/table/defaults").SummaryMethod<any> | undefined>;
-    rowClassName: PropType<import("element-plus/es/components/table/src/table/defaults").ColumnCls<any> | undefined>;
-    rowStyle: PropType<import("element-plus/es/components/table/src/table/defaults").ColumnStyle<any> | undefined>;
-    cellClassName: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<any> | undefined>;
-    cellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
-    headerRowClassName: PropType<import("element-plus/es/components/table/src/table/defaults").ColumnCls<any> | undefined>;
-    headerRowStyle: PropType<import("element-plus/es/components/table/src/table/defaults").ColumnStyle<any> | undefined>;
-    headerCellClassName: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<any> | undefined>;
-    headerCellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
+    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>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
     expandRowKeys: PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
+    defaultSort: PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     spanMethod: PropType<((data: {
         row: any;
         rowIndex: number;
-        column: import("element-plus/es/components/table/src/table-column/defaults").TableColumnCtx<any>;
+        column: import('element-plus').TableColumnCtx<any>;
         columnIndex: number;
     }) => number[] | {
         rowspan: number;
@@ -167,9 +169,9 @@ export declare const proTableProps: {
             children: string;
         };
     };
-    load: PropType<((row: any, treeNode: import("element-plus/es/components/table/src/table/defaults").TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
+    load: PropType<((row: any, treeNode: import('element-plus').TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
     tableLayout: {
-        type: PropType<"auto" | "fixed">;
+        type: PropType<"fixed" | "auto">;
         default: string;
     };
     flexible: BooleanConstructor;
@@ -180,19 +182,20 @@ export declare const proTableProps: {
     };
     slotNormalize: {
         type: BooleanConstructor;
-        default: boolean; /** 自定义请求参数名称 */
+        default: boolean;
     };
     bottomLine: {
         type: BooleanConstructor;
+        /** 自定义响应参数名称 */
         default: boolean;
     };
     emptyProps: {
-        type: PropType<import("../ele-data-table/types").TableEmptyProps>;
+        type: PropType<import('../ele-data-table/types').TableEmptyProps>;
         default: () => null;
     };
-    rowClickChecked: PropType<import("../ele-data-table/types").RowClickChecked>;
+    rowClickChecked: PropType<import('../ele-data-table/types').RowClickChecked>;
     reserveCurrent: BooleanConstructor;
-    selectedRowKeys: PropType<import("../ele-data-table/types").DataKey[]>;
+    selectedRowKeys: PropType<import('../ele-data-table/types').DataKey[]>;
 };
 export type ProTableProps = ExtractPropTypes<typeof proTableProps>;
 /**
@@ -216,21 +219,22 @@ export declare const proTableEmits: {
     select: (_selection: DataItem[], _row: DataItem) => boolean;
     selectAll: (_selection: DataItem[]) => boolean;
     selectionChange: (_selection: DataItem[]) => boolean;
-    cellMouseEnter: (_row: DataItem, _column: import("./types").Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    cellMouseLeave: (_row: DataItem, _column: import("./types").Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    cellClick: (_row: DataItem, _column: import("./types").Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    cellDblclick: (_row: DataItem, _column: import("./types").Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    cellContextmenu: (_row: DataItem, _column: import("./types").Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    rowClick: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
-    rowContextmenu: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
-    rowDblclick: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
-    headerClick: (_column: import("./types").Column, _e: MouseEvent) => boolean;
-    headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean;
-    sortChange: (_sorter: import("./types").Sorter) => boolean;
-    filterChange: (_filter: import("./types").Filter) => boolean;
+    cellMouseEnter: (_row: DataItem, _column: import('./types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
+    cellMouseLeave: (_row: DataItem, _column: import('./types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
+    cellClick: (_row: DataItem, _column: import('./types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
+    cellDblclick: (_row: DataItem, _column: import('./types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
+    cellContextmenu: (_row: DataItem, _column: import('./types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
+    rowClick: (_row: DataItem, _column: import('./types').Column, _e: MouseEvent) => boolean;
+    rowContextmenu: (_row: DataItem, _column: import('./types').Column, _e: MouseEvent) => boolean;
+    /** 导出配置 */
+    rowDblclick: (_row: DataItem, _column: import('./types').Column, _e: MouseEvent) => boolean;
+    headerClick: (_column: import('./types').Column, _e: MouseEvent) => boolean;
+    headerContextmenu: (_column: import('./types').Column, _e: MouseEvent) => boolean;
+    sortChange: (_sorter: import('./types').Sorter) => boolean;
+    filterChange: (_filter: import('./types').Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
-    headerDragend: (_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => 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 | undefined) => boolean;
-    'update:selectedRowKeys': (_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => boolean;
+    'update:currentRowKey': (_currentRowKey?: import('../ele-data-table/types').DataKey | undefined) => boolean;
+    'update:selectedRowKeys': (_selectedRowKeys?: import('../ele-data-table/types').DataKey[] | undefined) => boolean; /** 数组数据源时刷新按钮点击事件 */
 };

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

@@ -78,10 +78,14 @@ const proTableProps = {
   cacheKey: String,
   /** 是否虚拟滚动 */
   virtual: Boolean,
-  /** 行高 */
+  /** 虚拟滚动表格行高 */
   rowHeight: Number,
   /** 国际化 */
-  locale: Object
+  locale: Object,
+  /** 导出配置 */
+  exportConfig: Object,
+  /** 打印配置 */
+  printConfig: Object
 };
 const proTableEmits = {
   ...dataTableEmits,

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

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

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

@@ -107,7 +107,12 @@
 }
 
 /* 列配置 */
-.ele-tool-column.ele-popover {
+.ele-tool-column-popover.ele-popover {
+  width: eleVar('tool-column', 'width');
+  max-width: 100%;
+}
+
+.ele-tool-column {
   width: eleVar('tool-column', 'width');
   max-width: 100%;
 }
@@ -131,7 +136,8 @@
   }
 }
 
-.ele-tool-column.ele-popover.ele-popper.el-popper {
+.ele-tool-column .ele-tool-column-item .ele-tool-column-item-body,
+.ele-tool-column .ele-tool-column-header .ele-tool-column-label {
   .el-checkbox {
     height: eleVar('tool-column', 'item-height');
     line-height: eleVar('tool-column', 'item-height');
@@ -153,7 +159,7 @@
   box-sizing: border-box;
 }
 
-.ele-popover-body > .ele-tool-column-list {
+.ele-tool-column > .ele-tool-column-list {
   padding: eleVar('tool-column', 'body-padding');
   max-height: eleVar('tool-column', 'max-height');
   box-sizing: border-box;
@@ -182,6 +188,7 @@
 
   &.sortable-chosen {
     background: eleVar('tool-column', 'item-hover-bg');
+    opacity: 1 !important;
 
     & > .ele-tool-column-item-body {
       background: none;
@@ -189,7 +196,7 @@
   }
 
   &.sortable-ghost {
-    opacity: 0;
+    opacity: 0 !important;
   }
 
   & > .ele-tool-column-list {
@@ -230,9 +237,13 @@
     color: eleVar('tool-column', 'btn-active-color');
     background: eleVar('tool-column', 'btn-active-bg');
   }
+
+  & > .el-icon > svg {
+    stroke-width: 5;
+  }
 }
 
-.ele-popover-body.is-sortable {
+.ele-tool-column.is-sortable {
   .ele-tool-column-item-body {
     padding-left: 6px;
   }
@@ -241,3 +252,20 @@
     padding-left: calc(22px - #{eleVar('tool-column', 'item-padding')});
   }
 }
+
+/* 导出和打印的列选择 */
+.ele-tool-export-form,
+.ele-tool-print-form {
+  .ele-tool-column {
+    border: 1px solid elVar('border-color', 'light');
+    border-radius: elVar('border-radius', 'base');
+    line-height: normal;
+    width: 100%;
+  }
+
+  .ele-tool-column-header {
+    background: elVar('fill-color', 'lighter');
+    border-top-left-radius: elVar('border-radius', 'base');
+    border-top-right-radius: elVar('border-radius', 'base');
+  }
+}