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

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

@@ -0,0 +1,182 @@
+import { ExportDataType, BeforeExport, Datasource, FetchFunction, ColItem, TablePrintOptions } from '../types';
+import { Columns, DataItem } from '../../ele-data-table/types';
+import { EleModalProps, ElePrinterProps, EleTableProps } from '../../ele-app/plus';
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
+    /** 提示文字 */
+    title: StringConstructor;
+    /** 提示位置 */
+    placement: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
+    /** 全选文字 */
+    checkAllText: StringConstructor;
+    /** 重置文字 */
+    resetText: StringConstructor;
+    /** 无标题列文字 */
+    untitledText: StringConstructor;
+    /** 选择数据文字 */
+    selectDataText: StringConstructor;
+    /** 选择字段文字 */
+    selectColumnText: StringConstructor;
+    /** 当前页数据文字 */
+    dataTypePageText: StringConstructor;
+    /** 选中数据文字 */
+    dataTypeSelectedText: StringConstructor;
+    /** 全部数据文字 */
+    dataTypeAllText: StringConstructor;
+    /** 取消文字 */
+    cancelText: StringConstructor;
+    /** 确定文字 */
+    okText: StringConstructor;
+    /** 弹窗参数 */
+    modalProps: PropType<EleModalProps>;
+    /** 打印组件参数 */
+    printerProps: PropType<ElePrinterProps>;
+    /** 打印表格参数 */
+    tableProps: PropType<EleTableProps>;
+    /** 列数据 */
+    columns: PropType<Columns>;
+    /** 表格选中数据 */
+    selections: PropType<DataItem[]>;
+    /** 表格当前页数据 */
+    pageData: PropType<DataItem[]>;
+    /** 表格全部数据 */
+    datasource: PropType<Datasource>;
+    /** 单元格合并行列方法 */
+    spanMethod: PropType<((data: {
+        row: DataItem;
+        /** 单元格样式 */
+        rowIndex: number;
+        column: import('element-plus').TableColumnCtx<DataItem>;
+        columnIndex: number;
+    }) => number[] | {
+        rowspan: number;
+        colspan: number;
+    } | undefined) | undefined>;
+    /** 是否显示合计行 */
+    showSummary: BooleanConstructor;
+    /** 合计行文本 */
+    sumText: StringConstructor;
+    /** 合计行自定义方法 */
+    summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
+    /** 单元格样式 */
+    cellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
+    /** 单元格类名自定义 */
+    cellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
+    /** 单元格样式 */
+    headerCellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
+    /** 单元格类名自定义 */
+    headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
+    /** 序号列起始索引 */
+    pageIndex: NumberConstructor;
+    /** 表格请求数据方法 */
+    fetch: PropType<FetchFunction>;
+    /** 默认数据类型 */
+    defaultDataType: {
+        type: PropType<ExportDataType>;
+        default: string;
+    };
+    /** 打印前的钩子函数 */
+    beforePrint: PropType<BeforeExport>;
+}, {
+    visible: import('vue').Ref<boolean>;
+    loading: import('vue').Ref<boolean>;
+    dataType: import('vue').Ref<ExportDataType>;
+    colItems: import('vue').Ref<{
+        uid: string;
+        label?: string | undefined;
+        checked?: boolean | undefined;
+        fixed?: string | boolean | undefined;
+        children?: any[] | undefined;
+    }[]>;
+    isCheckAll: import('vue').Ref<boolean>;
+    isIndeterminate: import('vue').Ref<boolean>;
+    printOptions: TablePrintOptions;
+    openModal: () => void;
+    closeModal: () => void;
+    onPrintDone: () => void;
+    handlePrint: () => void;
+    onCheckedChange: (item: ColItem, checked: boolean) => void;
+    onSortChange: (items: ColItem[], parent?: ColItem) => void;
+    onCheckAllChange: (checked: boolean) => void;
+    onReset: () => void;
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+    /** 提示文字 */
+    title: StringConstructor;
+    /** 提示位置 */
+    placement: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
+    /** 全选文字 */
+    checkAllText: StringConstructor;
+    /** 重置文字 */
+    resetText: StringConstructor;
+    /** 无标题列文字 */
+    untitledText: StringConstructor;
+    /** 选择数据文字 */
+    selectDataText: StringConstructor;
+    /** 选择字段文字 */
+    selectColumnText: StringConstructor;
+    /** 当前页数据文字 */
+    dataTypePageText: StringConstructor;
+    /** 选中数据文字 */
+    dataTypeSelectedText: StringConstructor;
+    /** 全部数据文字 */
+    dataTypeAllText: StringConstructor;
+    /** 取消文字 */
+    cancelText: StringConstructor;
+    /** 确定文字 */
+    okText: StringConstructor;
+    /** 弹窗参数 */
+    modalProps: PropType<EleModalProps>;
+    /** 打印组件参数 */
+    printerProps: PropType<ElePrinterProps>;
+    /** 打印表格参数 */
+    tableProps: PropType<EleTableProps>;
+    /** 列数据 */
+    columns: PropType<Columns>;
+    /** 表格选中数据 */
+    selections: PropType<DataItem[]>;
+    /** 表格当前页数据 */
+    pageData: PropType<DataItem[]>;
+    /** 表格全部数据 */
+    datasource: PropType<Datasource>;
+    /** 单元格合并行列方法 */
+    spanMethod: PropType<((data: {
+        row: DataItem;
+        /** 单元格样式 */
+        rowIndex: number;
+        column: import('element-plus').TableColumnCtx<DataItem>;
+        columnIndex: number;
+    }) => number[] | {
+        rowspan: number;
+        colspan: number;
+    } | undefined) | undefined>;
+    /** 是否显示合计行 */
+    showSummary: BooleanConstructor;
+    /** 合计行文本 */
+    sumText: StringConstructor;
+    /** 合计行自定义方法 */
+    summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
+    /** 单元格样式 */
+    cellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
+    /** 单元格类名自定义 */
+    cellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
+    /** 单元格样式 */
+    headerCellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
+    /** 单元格类名自定义 */
+    headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
+    /** 序号列起始索引 */
+    pageIndex: NumberConstructor;
+    /** 表格请求数据方法 */
+    fetch: PropType<FetchFunction>;
+    /** 默认数据类型 */
+    defaultDataType: {
+        type: PropType<ExportDataType>;
+        default: string;
+    };
+    /** 打印前的钩子函数 */
+    beforePrint: PropType<BeforeExport>;
+}>>, {
+    showSummary: boolean;
+    defaultDataType: ExportDataType;
+}, {}>;
+export default _default;

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

@@ -50,6 +50,7 @@ const _sfc_main = vue.defineComponent({
     const tableMaximized = vue.ref(false);
     const errorText = vue.ref("");
     const cacheData = vue.ref();
+    const tableRowKey = vue.shallowRef(util$1.getRowKey(props2.rowKey));
     const tableIndex = vue.computed(() => {
       return ((tablePage.value ?? 1) - 1) * (tableLimit.value ?? 0) + 1;
     });
@@ -61,7 +62,8 @@ const _sfc_main = vue.defineComponent({
         {
           total: tableTotal.value,
           pageSize: tableLimit.value,
-          currentPage: tablePage.value
+          currentPage: tablePage.value,
+          hasNext: tableData.value.length >= tableLimit.value
         }
       );
     });
@@ -90,7 +92,7 @@ const _sfc_main = vue.defineComponent({
         pageIndex: tableIndex.value,
         emptyProps: tableEmptyProps.value,
         rowHeight: props2.virtual ? props2.rowHeight : void 0,
-        rowKey: util$1.getRowKey(props2.rowKey),
+        rowKey: tableRowKey.value,
         style: props2.tableStyle,
         class: "ele-pro-table-view",
         ...events,
@@ -107,9 +109,41 @@ const _sfc_main = vue.defineComponent({
       }
       return tools || [];
     });
-    const rootProps = vue.computed(() => {
+    const toolExportConfig = vue.computed(() => {
+      const globalExportConfig = globalProps.value.exportConfig || {};
+      const userExportConfig = props2.exportConfig || {};
+      return {
+        ...globalExportConfig,
+        ...userExportConfig,
+        modalProps: {
+          ...globalExportConfig.modalProps || {},
+          ...userExportConfig.modalProps || {}
+        }
+      };
+    });
+    const toolPrintConfig = vue.computed(() => {
+      const globalPrintConfig = globalProps.value.printConfig || {};
+      const userPrintConfig = props2.printConfig || {};
+      return {
+        ...globalPrintConfig,
+        ...userPrintConfig,
+        modalProps: {
+          ...globalPrintConfig.modalProps || {},
+          ...userPrintConfig.modalProps || {}
+        },
+        printerProps: {
+          ...globalPrintConfig.printerProps || {},
+          ...userPrintConfig.printerProps || {}
+        },
+        tableProps: {
+          ...globalPrintConfig.tableProps || {},
+          ...userPrintConfig.tableProps || {}
+        }
+      };
+    });
+    const loadingProps = vue.computed(() => {
       const zIndex = props2.maximizedIndex ?? globalProps.value.maximizedIndex;
-      const option = {
+      return {
         ...props2.loadingProps || {},
         loading: tableLoading.value,
         class: [
@@ -119,7 +153,6 @@ const _sfc_main = vue.defineComponent({
         ],
         style: tableMaximized.value ? { zIndex } : void 0
       };
-      return option;
     });
     const reload = (option, parent, resolve) => {
       if (option) {
@@ -149,11 +182,7 @@ const _sfc_main = vue.defineComponent({
           tableLimit.value
         );
         cacheData.value = props2.datasource;
-        tableData.value = util$1.addDefaultRowKey(
-          data,
-          util$1.getDefaultRowKey(props2.rowKey),
-          tablePage.value
-        );
+        tableData.value = data;
         tablePage.value = page;
         tableTotal.value = total;
         onDone({ data, page, total, response: props2.datasource });
@@ -171,6 +200,12 @@ const _sfc_main = vue.defineComponent({
       props2.datasource({
         page: tablePage.value,
         limit: tableLimit.value,
+        pages: util$1.getRequestPages(
+          tablePage.value,
+          tableLimit.value,
+          props2.request,
+          globalProps.value.request
+        ),
         where: Object.assign({}, tableState.where),
         orders,
         filters: util$1.getRequestFilters(filter),
@@ -213,7 +248,7 @@ const _sfc_main = vue.defineComponent({
       if (resolve) {
         resolve(data);
       } else {
-        if (util$1.isAutoAmend(props2.pagination, globalProps.value.pagination) && !data.length && total && tablePage.value && tableLimit.value) {
+        if (util$1.isAutoAmend(props2.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;
@@ -221,11 +256,7 @@ const _sfc_main = vue.defineComponent({
             return;
           }
         }
-        tableData.value = util$1.addDefaultRowKey(
-          data,
-          util$1.getDefaultRowKey(props2.rowKey),
-          tablePage.value
-        );
+        tableData.value = data;
         tableTotal.value = total || data.length;
       }
       tableLoading.value = false;
@@ -248,12 +279,12 @@ const _sfc_main = vue.defineComponent({
       vue.nextTick(() => {
         if (props2.current != null) {
           methods.setCurrentRowKey(
-            util.getValue(props2.current, util$1.getRowKey(props2.rowKey))
+            util.getValue(props2.current, tableRowKey.value)
           );
         }
         if (props2.selections != null && props2.selections.length) {
           methods.setSelectedRowKeys(
-            util.getRowKeys(props2.selections, util$1.getRowKey(props2.rowKey))
+            util.getRowKeys(props2.selections, tableRowKey.value)
           );
         }
       });
@@ -328,17 +359,13 @@ const _sfc_main = vue.defineComponent({
       return tableData.value;
     };
     const setData = (data) => {
-      tableData.value = util$1.addDefaultRowKey(
-        data,
-        util$1.getDefaultRowKey(props2.rowKey),
-        tablePage.value
-      );
+      tableData.value = data;
     };
     const goPageByRowKey = (key) => {
       if (!paginationProps.value || tableLimit.value == null || isFunctionSource.value) {
         return;
       }
-      const rowKey = util$1.getRowKey(props2.rowKey);
+      const rowKey = tableRowKey.value;
       const data = util$1.sortData(props2.datasource, tableState.sorter);
       const index2 = data.findIndex((d) => util.getValue(d, rowKey) === key);
       const page = Math.floor(index2 / tableLimit.value) + 1;
@@ -356,6 +383,12 @@ const _sfc_main = vue.defineComponent({
       callback({
         page: tablePage.value,
         limit: tableLimit.value,
+        pages: util$1.getRequestPages(
+          tablePage.value,
+          tableLimit.value,
+          props2.request,
+          globalProps.value.request
+        ),
         where: Object.assign({}, tableState.where),
         orders,
         filters: util$1.getRequestFilters(filter),
@@ -403,15 +436,19 @@ const _sfc_main = vue.defineComponent({
     vue.watch(
       () => props2.current,
       (current) => {
-        methods.setCurrentRowKey(util.getValue(current, util$1.getRowKey(props2.rowKey)));
+        methods.setCurrentRowKey(util.getValue(current, tableRowKey.value));
       }
     );
     vue.watch(
       () => props2.selections,
       (selections) => {
-        methods.setSelectedRowKeys(
-          util.getRowKeys(selections, util$1.getRowKey(props2.rowKey))
-        );
+        methods.setSelectedRowKeys(util.getRowKeys(selections, tableRowKey.value));
+      }
+    );
+    vue.watch(
+      () => props2.rowKey,
+      () => {
+        tableRowKey.value = util$1.getRowKey(props2.rowKey);
       }
     );
     vue.watch(
@@ -433,13 +470,16 @@ const _sfc_main = vue.defineComponent({
     return {
       ...methods,
       tableViewRef,
+      tableData,
       tableSize,
       tableMaximized,
       tableIndex,
       paginationProps,
       tableProps,
       toolNames,
-      rootProps,
+      toolExportConfig,
+      toolPrintConfig,
+      loadingProps,
       onRefresh,
       onSizeChange,
       onColumnsChange,
@@ -470,21 +510,35 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleDataTable = vue.resolveComponent("EleDataTable");
   const _component_ElePagination = vue.resolveComponent("ElePagination");
   const _component_EleLoading = vue.resolveComponent("EleLoading");
-  return vue.openBlock(), vue.createBlock(_component_EleLoading, vue.normalizeProps(vue.guardReactiveProps(_ctx.rootProps)), {
+  return vue.openBlock(), vue.createBlock(_component_EleLoading, vue.normalizeProps(vue.guardReactiveProps(_ctx.loadingProps)), {
     default: vue.withCtx(() => [
       _ctx.toolbar ? (vue.openBlock(), vue.createBlock(_component_EleToolbar, vue.normalizeProps(vue.mergeProps({ key: 0 }, _ctx.toolbar === true ? {} : _ctx.toolbar)), {
         tools: vue.withCtx(() => [
           vue.renderSlot(_ctx.$slots, "tools"),
           _ctx.toolNames && _ctx.toolNames.length ? (vue.openBlock(), vue.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,
@@ -507,7 +561,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"])) : vue.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"])) : vue.createCommentVNode("", true)
         ]),
         default: vue.withCtx(() => [
           vue.renderSlot(_ctx.$slots, "toolbar")
@@ -517,7 +571,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       vue.renderSlot(_ctx.$slots, "default"),
       _ctx.virtual ? (vue.openBlock(), vue.createBlock(_component_EleVirtualTable, vue.mergeProps({ key: 1 }, _ctx.tableProps, { ref: "tableViewRef" }), vue.createSlots({ _: 2 }, [
         vue.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,
@@ -528,7 +589,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         })
       ]), 1040)) : (vue.openBlock(), vue.createBlock(_component_EleDataTable, vue.mergeProps({ key: 2 }, _ctx.tableProps, { ref: "tableViewRef" }), vue.createSlots({ _: 2 }, [
         vue.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,
@@ -555,7 +623,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               "tools",
               "footer",
               "empty",
-              "append"
+              "append",
+              "printTop",
+              "printBottom"
             ].includes(k)
           ), (name) => {
             return {