ele-admin-plus 1.1.9-beta.9 → 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,
@@ -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),
@@ -251,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;
@@ -278,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)
           );
         }
       });
@@ -358,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;
@@ -386,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),
@@ -433,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(
@@ -564,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,
@@ -575,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,
@@ -602,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, 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/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;
   /** 排序方式参数名称 */
@@ -387,6 +398,8 @@ export interface TablePrintOptions extends ExportDataResult {
   hasHeader: boolean;
   /** 是否有表尾 */
   hasFooter: boolean;
+  /** 打印的数据 */
+  data: DataItem[];
 }
 
 /**

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

@@ -1,6 +1,7 @@
-import type { ElePaginationProps } from '../ele-app/plus';
-import type { DataItem, Column, Columns, Sorter, Filter, TableSize, TreeProps, RowKey, SpanMethod, SummaryMethod } from '../ele-data-table/types';
-import type { Orders, Filters, OrderItem, RequestOption, ResponseOption, TablePagination, DatasourceResult, ResponseResult, ReloadDataResult, ColItem, ProProps, ExportDataItem, ExportDataResult } from './types';
+import { Pages, Orders, Filters, OrderItem, RequestOption, ResponseOption, TablePagination, DatasourceResult, ResponseResult, ReloadDataResult, ColItem, ProProps, ExportDataItem, ExportDataResult } from './types';
+import { DataItem, Column, Columns, Sorter, Filter, TableSize, TreeProps, RowKey, SpanMethod, SummaryMethod } from '../ele-data-table/types';
+import { ElePaginationProps } from '../ele-app/plus';
+
 /**
  * 合并复合属性
  * @param props 属性
@@ -26,7 +27,7 @@ export declare function getTableLimit(pagination: boolean | TablePagination | un
  * @param globalPagination 全局配置分页组件属性
  * @param pageProps 分页相关的属性
  */
-export declare function getPaginationProps(size: TableSize, pagination: boolean | TablePagination | undefined, globalPagination: boolean | TablePagination | undefined, pageProps?: Pick<ElePaginationProps, 'total' | 'pageSize' | 'currentPage'>): ElePaginationProps | null;
+export declare function getPaginationProps(size: TableSize, pagination: boolean | TablePagination | undefined, globalPagination: boolean | TablePagination | undefined, pageProps?: Pick<ElePaginationProps, 'total' | 'pageSize' | 'currentPage' | 'hasNext'>): ElePaginationProps | null;
 /**
  * 判断是否开启自动修正页码
  * @param pagination 分页组件属性
@@ -74,6 +75,14 @@ export declare function getRequestOrders(sorter?: Sorter, request?: RequestOptio
  * @param filter 筛选条件
  */
 export declare function getRequestFilters(filter?: Filter): Filters;
+/**
+ * 生成请求的分页参数
+ * @param page 页码
+ * @param limit 每页数量
+ * @param request 请求参数配置
+ * @param globalRequest 全局请求参数配置
+ */
+export declare function getRequestPages(page: number, limit: number, request?: RequestOption, globalRequest?: RequestOption): Pages;
 /**
  * 获取数据源请求结果
  * @param data 数据源请求的原始数据
@@ -108,7 +117,7 @@ export declare function sortData(datasource?: DataItem[], sorter?: Sorter): Data
  * 获取列配置标识
  * @param column 列数据
  */
-export declare function getColId(column?: Column): string | undefined;
+export declare function getColId(column: Column): string | undefined;
 /**
  * 获取初始显示的列数据
  * @param columns 列数据
@@ -130,11 +139,13 @@ export declare function getInitCacheColumns(columns: Columns, cacheKey?: string,
 export declare function getCheckedColumns(columns: Columns | undefined, cols: ColItem[], sortable?: boolean, filter?: (item: Column) => boolean): Columns;
 /**
  * 获取列展示列表数据
- * @param columns 列数据
+ * @param columns 列配置
  * @param untitledText 未命名列文字
- * @param filter 过滤的方法
+ * @param filter 过滤列的方法
+ * @param sortFixed 是否对固定列排序
+ * @param cancelFixed 是否取消固定列
  */
-export declare function getColItems(columns?: Columns, untitledText?: string, filter?: (item: Column) => boolean): ColItem[];
+export declare function getColItems(columns?: Columns, untitledText?: string, filter?: (item: Column) => boolean, sortFixed?: boolean, cancelFixed?: boolean): ColItem[];
 /**
  * 获取列配置
  * @param columns 列数据
@@ -160,23 +171,11 @@ export declare function getSizeCacheKey(cacheKey: string): string;
  * @param cacheKey 缓存的名称
  */
 export declare function getCacheSize(cacheKey?: string): TableSize;
-/**
- * 获取默认 rowKey
- * @param rowKey 自定义 rowKey
- */
-export declare function getDefaultRowKey(rowKey?: RowKey): "_rowKey" | undefined;
 /**
  * 获取 rowKey
  * @param rowKey 自定义 rowKey
  */
-export declare function getRowKey(rowKey?: RowKey): string | ((row: DataItem) => string) | undefined;
-/**
- * 数据添加默认的 rowKey 字段
- * @param data 数据
- * @param rowKey 字段名
- * @param page 页码
- */
-export declare function addDefaultRowKey(data: DataItem[], rowKey: string | undefined, page: number): DataItem[];
+export declare function getRowKey(rowKey?: RowKey): string | ((row: DataItem) => string);
 /**
  * 导出获取单元格文本
  * @param column 列配置
@@ -213,4 +212,9 @@ export declare function exportCSV(fileName: string, headerData: ExportDataItem[]
  * 导出判断列是否显示
  * @param item 列配置
  */
-export declare function exportColumnsfilter(item: Column): boolean;
+export declare function columnsExportFilter(item: Column): boolean;
+/**
+ * 打印判断列是否显示
+ * @param item 列配置
+ */
+export declare function columnsPrintFilter(item: Column): boolean;

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

@@ -1,5 +1,5 @@
 import { omit, eachTree, findTree, uuid, mapTree } from "../utils/core";
-import { getValue } from "../ele-data-table/util";
+import { getValue, getColFixedNumber } from "../ele-data-table/util";
 import { getIndexValue, analyseColumns, getCellSpan, getUserSums, getSumValue } from "../ele-virtual-table/util";
 function mergeProps(props, globalProps) {
   if (props == null) {
@@ -65,6 +65,8 @@ function getDefaultFilter(columns) {
 }
 function getRequestName(globalRequest, request) {
   const defaultRequest = {
+    pageName: "page",
+    limitName: "limit",
     sortName: "sort",
     orderName: "order",
     ascValue: "asc",
@@ -143,6 +145,16 @@ function getRequestFilters(filter) {
   }
   return filters;
 }
+function getRequestPages(page, limit, request, globalRequest) {
+  const pages = {};
+  const { pageName, limitName } = getRequestName(globalRequest, request);
+  if (!pageName || !limitName) {
+    return pages;
+  }
+  pages[pageName] = page;
+  pages[limitName] = limit;
+  return pages;
+}
 function getResponseResult(data, response, globalResponse, lazy, treeOpt) {
   if (!data || Array.isArray(data)) {
     return { data: getResponseData(data, lazy, treeOpt) };
@@ -205,7 +217,10 @@ function sortData(datasource, sorter) {
   return data;
 }
 function getColId(column) {
-  return column ? column.columnKey || column.prop : void 0;
+  if (column.columnKey == null || column.columnKey === "") {
+    return column.prop;
+  }
+  return column.columnKey;
 }
 function getInitColumns(columns) {
   const data = [];
@@ -303,19 +318,25 @@ function getCheckedColumns(columns, cols, sortable, filter) {
   });
   return data;
 }
-function getColItems(columns, untitledText, filter) {
-  return mapTree(columns, (d) => {
+function getColItems(columns, untitledText, filter, sortFixed, cancelFixed) {
+  const temp = columns == null ? [] : [...columns];
+  if (sortFixed) {
+    temp.sort((a, b) => {
+      return getColFixedNumber(a.fixed) - getColFixedNumber(b.fixed);
+    });
+  }
+  return mapTree(temp, (d, _i, parent) => {
     const colId = getColId(d);
-    if (!colId || filter && !filter(d)) {
+    if (colId == null || filter && !filter(d)) {
       return;
     }
     return {
       uid: colId,
-      prop: d.prop,
-      columnKey: d.columnKey,
+      //prop: d.prop,
+      //columnKey: d.columnKey,
       label: d.label || untitledText,
       checked: !d.hideInTable,
-      fixed: d.fixed
+      fixed: cancelFixed ? false : parent == null ? d.fixed : false
     };
   });
 }
@@ -373,21 +394,13 @@ function getCacheSize(cacheKey) {
     }
   }
 }
-function getDefaultRowKey(rowKey) {
-  return rowKey ? void 0 : "_rowKey";
-}
 function getRowKey(rowKey) {
-  return rowKey ?? getDefaultRowKey();
-}
-function addDefaultRowKey(data, rowKey, page) {
-  if (rowKey == null) {
-    return data;
+  if (rowKey != null) {
+    return rowKey;
   }
-  return data.map((d, i) => {
-    const item = { ...d };
-    item[rowKey] = `${page}-${i}`;
-    return item;
-  });
+  return (row) => {
+    return JSON.stringify(row);
+  };
 }
 function getCellText(column, row, index, pageIndex) {
   if (!column) {
@@ -398,7 +411,7 @@ function getCellText(column, row, index, pageIndex) {
   }
   const propValue = getValue(row, column.prop);
   if (typeof column.formatter === "function") {
-    return column.formatter(row, column, propValue, index, "export");
+    return column.formatter(row, column, propValue, index);
   }
   return propValue == null ? "" : String(propValue);
 }
@@ -407,8 +420,7 @@ function getHeaderCellText(column, index) {
     return "";
   }
   if (typeof column.renderHeader === "function") {
-    const params = { column, $index: index, action: "export" };
-    return column.renderHeader(params);
+    return column.renderHeader({ column, $index: index });
   }
   return column.label == null ? "" : String(column.label);
 }
@@ -472,13 +484,22 @@ function exportCSV(fileName, headerData, bodyData, footerData) {
   a.click();
   document.body.removeChild(a);
 }
-function exportColumnsfilter(item) {
+function columnsExportFilter(item) {
+  if (item.hideInExport) {
+    return false;
+  }
+  return !item.type || !["selection", "expand"].includes(item.type);
+}
+function columnsPrintFilter(item) {
+  if (item.hideInPrint) {
+    return false;
+  }
   return !item.type || !["selection", "expand"].includes(item.type);
 }
 export {
-  addDefaultRowKey,
+  columnsExportFilter,
+  columnsPrintFilter,
   exportCSV,
-  exportColumnsfilter,
   getCacheCols,
   getCacheSize,
   getCellText,
@@ -487,7 +508,6 @@ export {
   getColItems,
   getColsCacheKey,
   getDefaultFilter,
-  getDefaultRowKey,
   getExportData,
   getHeaderCellText,
   getInitCacheColumns,
@@ -497,6 +517,7 @@ export {
   getRequestFilters,
   getRequestName,
   getRequestOrders,
+  getRequestPages,
   getResponseData,
   getResponseName,
   getResponseResult,