ele-admin-plus 1.1.9-beta.9 → 1.2.0-beta.1

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,
@@ -179,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 });
@@ -201,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),
@@ -224,6 +228,7 @@ const _sfc_main = defineComponent({
       });
     };
     const requestCallback = (data, total, parent, response, resolve) => {
+      var _a;
       if (!Array.isArray(data)) {
         tableData.value = [];
         tableLoading.value = false;
@@ -241,6 +246,9 @@ const _sfc_main = defineComponent({
         return;
       }
       if (resolve) {
+        if (parent != null) {
+          parent[((_a = props.treeProps) == null ? void 0 : _a.children) || "children"] = data;
+        }
         resolve(data);
       } else {
         if (isAutoAmend(props.pagination, globalProps.value.pagination) && !data.length && total && "*" !== total && tablePage.value && tableLimit.value) {
@@ -251,11 +259,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;
@@ -278,12 +282,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)
           );
         }
       });
@@ -358,17 +362,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;
@@ -386,6 +386,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),
@@ -433,15 +439,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(
@@ -506,56 +516,61 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createBlock(_component_EleLoading, normalizeProps(guardReactiveProps(_ctx.loadingProps)), {
     default: withCtx(() => [
       _ctx.toolbar ? (openBlock(), createBlock(_component_EleToolbar, normalizeProps(mergeProps$1({ key: 0 }, _ctx.toolbar === true ? {} : _ctx.toolbar)), {
-        tools: withCtx(() => [
-          renderSlot(_ctx.$slots, "tools"),
-          _ctx.toolNames && _ctx.toolNames.length ? (openBlock(), createBlock(_component_TableTools, {
-            key: 0,
-            tools: _ctx.toolNames,
-            size: _ctx.tableSize,
-            columns: _ctx.columns,
-            columnSortable: _ctx.columnSortable,
-            columnFixed: _ctx.columnFixed,
-            maximized: _ctx.tableMaximized,
-            cacheKey: _ctx.cacheKey,
-            locale: _ctx.locale,
-            selections: _ctx.selections,
-            pageData: _ctx.tableData,
-            spanMethod: _ctx.spanMethod,
-            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,
-            "onUpdate:maximized": _ctx.onMaximizedChange
-          }, createSlots({ _: 2 }, [
-            renderList(Object.keys(_ctx.$slots).filter(
-              (k) => ![
-                "default",
-                "toolbar",
-                "tools",
-                "footer",
-                "empty",
-                "append"
-              ].includes(k)
-            ), (name) => {
-              return {
-                name,
-                fn: withCtx((slotProps) => [
-                  renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-                ])
-              };
-            })
-          ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "fetch", "exportConfig", "printConfig", "onReload", "onUpdate:size", "onUpdate:columns", "onUpdate:maximized"])) : createCommentVNode("", true)
-        ]),
+        tools: withCtx(() => {
+          var _a;
+          return [
+            renderSlot(_ctx.$slots, "tools"),
+            _ctx.toolNames && _ctx.toolNames.length ? (openBlock(), createBlock(_component_TableTools, {
+              key: 0,
+              tools: _ctx.toolNames,
+              size: _ctx.tableSize,
+              columns: _ctx.columns,
+              columnSortable: _ctx.columnSortable,
+              columnFixed: _ctx.columnFixed,
+              maximized: _ctx.tableMaximized,
+              cacheKey: _ctx.cacheKey,
+              locale: _ctx.locale,
+              selections: _ctx.selections,
+              pageData: _ctx.tableData,
+              spanMethod: _ctx.spanMethod,
+              tableHeader: _ctx.showHeader,
+              showSummary: _ctx.showSummary,
+              sumText: _ctx.sumText,
+              summaryMethod: _ctx.summaryMethod,
+              cellStyle: _ctx.cellStyle,
+              cellClassName: _ctx.cellClassName,
+              headerCellStyle: _ctx.headerCellStyle,
+              headerCellClassName: _ctx.headerCellClassName,
+              pageIndex: _ctx.tableIndex,
+              childrenField: (_a = _ctx.treeProps) == null ? void 0 : _a.children,
+              fetch: _ctx.fetch,
+              exportConfig: _ctx.toolExportConfig,
+              printConfig: _ctx.toolPrintConfig,
+              onReload: _ctx.onRefresh,
+              "onUpdate:size": _ctx.onSizeChange,
+              "onUpdate:columns": _ctx.onColumnsChange,
+              "onUpdate:maximized": _ctx.onMaximizedChange
+            }, createSlots({ _: 2 }, [
+              renderList(Object.keys(_ctx.$slots).filter(
+                (k) => ![
+                  "default",
+                  "toolbar",
+                  "tools",
+                  "footer",
+                  "empty",
+                  "append"
+                ].includes(k)
+              ), (name) => {
+                return {
+                  name,
+                  fn: withCtx((slotProps) => [
+                    renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+                  ])
+                };
+              })
+            ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "childrenField", "fetch", "exportConfig", "printConfig", "onReload", "onUpdate:size", "onUpdate:columns", "onUpdate:maximized"])) : createCommentVNode("", true)
+          ];
+        }),
         default: withCtx(() => [
           renderSlot(_ctx.$slots, "toolbar")
         ]),
@@ -564,7 +579,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,
@@ -575,7 +597,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,
@@ -602,7 +631,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, ExportConfig, PrintConfig } 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>;
@@ -86,14 +87,14 @@ export declare const proTableProps: {
     exportConfig: PropType<ExportConfig>;
     /** 打印配置 */
     printConfig: PropType<PrintConfig>;
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
     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;
@@ -108,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;
@@ -132,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;
@@ -171,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;
@@ -192,12 +190,12 @@ export declare const proTableProps: {
         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>;
 /**
@@ -221,22 +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;
+    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;
+    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/style/index.scss

@@ -269,3 +269,12 @@
     border-top-right-radius: elVar('border-radius', 'base');
   }
 }
+
+.ele-tool-form-options {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+  padding-left: 8px;
+}

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

@@ -29,6 +29,11 @@ export type {
   ResolveFunction
 };
 
+/**
+ * 分页参数
+ */
+export type Pages = Record<string, number>;
+
 /**
  * 搜索参数
  */
@@ -52,6 +57,8 @@ export interface DatasourceParams {
   page?: number;
   /** 每页显示数量 */
   limit?: number;
+  /** 分页参数 */
+  pages: Pages;
   /** 搜索参数 */
   where: Where;
   /** 排序参数 */
@@ -121,6 +128,10 @@ export type OrderValue = string | number | boolean | null | undefined;
  * 请求参数设置
  */
 export interface RequestOption {
+  /** 页码参数名称 */
+  pageName?: string;
+  /** 每页数量参数名称 */
+  limitName?: string;
   /** 排序字段参数名称 */
   sortName?: string;
   /** 排序方式参数名称 */
@@ -216,6 +227,8 @@ export interface ColItem {
   fixed?: boolean | string;
   /** 子级数据 */
   children?: ColItem[];
+  /** 列类型 */
+  type?: string;
 }
 
 /**
@@ -280,6 +293,20 @@ export type TableViewInstance =
  */
 export type ExportDataType = 'selections' | 'pageData' | 'data';
 
+/**
+ * 导出主体数据节点
+ */
+export interface ExportBodyNode {
+  /** 数据 */
+  row: DataItem;
+  /** 索引 */
+  index: number;
+  /** 所处深度 */
+  level: number;
+  /** 子级数量 */
+  childSize: number;
+}
+
 /**
  * 导出的数据每一项
  */
@@ -298,6 +325,16 @@ export interface ExportDataItem {
   colspan?: number;
   /** 所占行数 */
   rowspan?: number;
+  /** 是否是展开行的单元格 */
+  isExpandCell?: boolean;
+  /** 是否是层级序号 */
+  isTreeIndex?: boolean;
+  /** 是否显示树展开图标 */
+  isTreeCell?: boolean;
+  /** 是否是树叶子节点 */
+  isTreeLeaf?: boolean;
+  /** 树层级缩进 */
+  indent?: number;
 }
 
 /**
@@ -387,6 +424,8 @@ export interface TablePrintOptions extends ExportDataResult {
   hasHeader: boolean;
   /** 是否有表尾 */
   hasFooter: boolean;
+  /** 打印的数据 */
+  data: DataItem[];
 }
 
 /**
@@ -405,6 +444,8 @@ export interface TableLocale {
   columnTitle: string;
   columnReset: string;
   columnUntitled: string;
+  columnIndex: string;
+  columnExpand: string;
   columnFixedLeft: string;
   columnFixedRight: string;
   exportOk: string;
@@ -416,4 +457,8 @@ export interface TableLocale {
   exportDataTypePage: string;
   exportDataTypeSelected: string;
   exportDataTypeAll: string;
+  exportOther: string;
+  exportOtherHeader: string;
+  exportOtherFooter: string;
+  exportOtherTreeIndex: string;
 }