ele-admin-plus 1.2.1-beta.1 → 1.2.1-beta.3

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

@@ -1,16 +1,16 @@
 import { PropType } from 'vue';
 import { EleModalProps, ElePrinterProps, EleTableProps } from '../../ele-app/plus';
-import { Columns, DataItem, TreeProps } from '../../ele-data-table/types';
-import { TableLocale, ExportDataType, BeforeExport, Datasource, FetchFunction, ColItem, TablePrintOptions } from '../types';
+import { Columns, DataItem, SpanMethod, SummaryMethod, CellStyle, CellClass, HeaderCellStyle, HeaderCellClass, TreeProps } from '../../ele-data-table/types';
+import { TableLocale, ExportDataType, BeforeExport, Datasource, FetchFunction, ColItem, TablePrintOptions, TableExportParams } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
-    /** 提示位置 */
-    placement: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
     /** 表格国际化 */
     locale: {
         type: PropType<TableLocale>;
         required: true;
     };
+    /** 缓存本地的名称 */
+    cacheKey: StringConstructor;
     /** 弹窗参数 */
     modalProps: PropType<EleModalProps>;
     /** 打印组件参数 */
@@ -26,15 +26,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 表格全部数据 */
     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>;
+    spanMethod: PropType<SpanMethod>;
     /** 表格是否有表头 */
     tableHeader: BooleanConstructor;
     /** 是否显示合计行 */
@@ -42,15 +34,15 @@ declare const _default: import('vue').DefineComponent<{
     /** 合计行文本 */
     sumText: StringConstructor;
     /** 合计行自定义方法 */
-    summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
+    summaryMethod: PropType<SummaryMethod>;
     /** 单元格样式 */
-    cellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
+    cellStyle: PropType<CellStyle>;
     /** 单元格类名自定义 */
-    cellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
+    cellClassName: PropType<CellClass>;
     /** 单元格样式 */
-    headerCellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
+    headerCellStyle: PropType<HeaderCellStyle>;
     /** 单元格类名自定义 */
-    headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
+    headerCellClassName: PropType<HeaderCellClass>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
     /** 树表字段名 */
@@ -62,19 +54,28 @@ declare const _default: import('vue').DefineComponent<{
         type: PropType<ExportDataType>;
         default: string;
     };
+    /** 默认是否勾选表尾 */
+    defaultShowFooter: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    /** 默认是否勾选层级序号 */
+    defaultShowTreeIndex: BooleanConstructor;
     /** 打印前的钩子函数 */
     beforePrint: PropType<BeforeExport>;
 }, {
+    ownSlots: string[];
     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;
+        label?: string;
+        checked?: boolean;
+        fixed?: boolean | string;
         children?: any[] | undefined;
-        type?: string | undefined;
+        type?: string;
+        width?: number | string;
     }[]>;
     isCheckAll: import('vue').Ref<boolean>;
     isIndeterminate: import('vue').Ref<boolean>;
@@ -85,21 +86,23 @@ declare const _default: import('vue').DefineComponent<{
     printOptions: TablePrintOptions;
     openModal: () => void;
     closeModal: () => void;
-    onPrintDone: () => void;
+    handlePrintDone: () => void;
     handlePrint: () => void;
-    onCheckedChange: (item?: ColItem, checked?: boolean, type?: string) => void;
-    onSortChange: (items: ColItem[], parent?: ColItem) => void;
-    onCheckAllChange: (checked: boolean) => void;
-    onReset: () => void;
+    handleCheckedChange: (item?: ColItem, checked?: boolean, type?: string) => void;
+    handleSortChange: (items: ColItem[], parent?: ColItem) => void;
+    handleColWidthChange: (item: ColItem, width?: string) => void;
+    handleCheckAllChange: (checked: boolean) => void;
+    handleReset: () => void;
     handleTreeIndexChange: (checked?: boolean | string | number) => void;
+    printData: (params?: TableExportParams) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    /** 提示位置 */
-    placement: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
     /** 表格国际化 */
     locale: {
         type: PropType<TableLocale>;
         required: true;
     };
+    /** 缓存本地的名称 */
+    cacheKey: StringConstructor;
     /** 弹窗参数 */
     modalProps: PropType<EleModalProps>;
     /** 打印组件参数 */
@@ -115,15 +118,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 表格全部数据 */
     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>;
+    spanMethod: PropType<SpanMethod>;
     /** 表格是否有表头 */
     tableHeader: BooleanConstructor;
     /** 是否显示合计行 */
@@ -131,15 +126,15 @@ declare const _default: import('vue').DefineComponent<{
     /** 合计行文本 */
     sumText: StringConstructor;
     /** 合计行自定义方法 */
-    summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
+    summaryMethod: PropType<SummaryMethod>;
     /** 单元格样式 */
-    cellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
+    cellStyle: PropType<CellStyle>;
     /** 单元格类名自定义 */
-    cellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
+    cellClassName: PropType<CellClass>;
     /** 单元格样式 */
-    headerCellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
+    headerCellStyle: PropType<HeaderCellStyle>;
     /** 单元格类名自定义 */
-    headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
+    headerCellClassName: PropType<HeaderCellClass>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
     /** 树表字段名 */
@@ -151,11 +146,20 @@ declare const _default: import('vue').DefineComponent<{
         type: PropType<ExportDataType>;
         default: string;
     };
+    /** 默认是否勾选表尾 */
+    defaultShowFooter: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    /** 默认是否勾选层级序号 */
+    defaultShowTreeIndex: BooleanConstructor;
     /** 打印前的钩子函数 */
     beforePrint: PropType<BeforeExport>;
 }>>, {
     showSummary: boolean;
     tableHeader: boolean;
     defaultDataType: ExportDataType;
+    defaultShowFooter: boolean;
+    defaultShowTreeIndex: boolean;
 }, {}>;
 export default _default;

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

@@ -12,6 +12,10 @@ const EleToolbar = require("../ele-toolbar/index");
 const TableTools = require("./components/table-tools");
 const util$1 = require("./util");
 const props = require("./props");
+const ownSlots = ["default", "toolbar", "tools", "footer"];
+const toolsSlotExcludes = [...ownSlots, "empty", "append"];
+const tableSlotExcludes = [...ownSlots, "printTop", "printBottom"];
+const pageSlotExcludes = [...toolsSlotExcludes, "printTop", "printBottom"];
 const _sfc_main = vue.defineComponent({
   name: "EleProTable",
   components: {
@@ -28,11 +32,19 @@ const _sfc_main = vue.defineComponent({
     const events = util.useEmits(emit);
     const methods = util.useMethods(() => getTableRef());
     const globalProps = receiver.useGlobalProps("table");
+    const userColumns = vue.computed(() => {
+      return core.mapTree(props2.columns, (item) => {
+        if (item.vIf == null || (typeof item.vIf === "function" ? item.vIf() : item.vIf)) {
+          return item;
+        }
+      });
+    });
     const tableState = {
       sorter: props2.defaultSort ?? {},
-      filter: util$1.getDefaultFilter(props2.columns),
+      filter: util$1.getDefaultFilter(userColumns.value),
       where: props2.where ?? {}
     };
+    const tableToolsRef = vue.ref(null);
     const tableViewRef = vue.ref(null);
     const tableData = vue.ref([]);
     const tablePage = vue.ref(
@@ -96,10 +108,11 @@ const _sfc_main = vue.defineComponent({
         style: props2.tableStyle,
         class: "ele-pro-table-view",
         ...events,
-        onSelectionChange,
-        onSortChange,
-        onFilterChange,
-        onCurrentChange
+        onSelectionChange: handleSelectionChange,
+        onSortChange: handleSortChange,
+        onFilterChange: handleFilterChange,
+        onCurrentChange: handleCurrentChange,
+        onHeaderDragend: handleHeaderDragend
       };
     });
     const toolNames = vue.computed(() => {
@@ -109,6 +122,12 @@ const _sfc_main = vue.defineComponent({
       }
       return tools || [];
     });
+    const tableToolbarProps = vue.computed(() => {
+      return util$1.mergeProps(
+        props2.toolbar,
+        globalProps.value.toolbar
+      );
+    });
     const toolExportConfig = vue.computed(() => {
       const globalExportConfig = globalProps.value.exportConfig || {};
       const userExportConfig = props2.exportConfig || {};
@@ -185,7 +204,7 @@ const _sfc_main = vue.defineComponent({
         tableData.value = data;
         tablePage.value = page;
         tableTotal.value = total;
-        onDone({ data, page, total, response: props2.datasource });
+        handleDone({ data, page, total, response: props2.datasource });
         return;
       }
       if (!parent) {
@@ -270,7 +289,7 @@ const _sfc_main = vue.defineComponent({
         total: tableTotal.value,
         response
       };
-      onDone(result, parent);
+      handleDone(result, parent);
     };
     const tableLoad = (row, treeNode, resolve) => {
       if (props2.load) {
@@ -279,7 +298,7 @@ const _sfc_main = vue.defineComponent({
       }
       reload(void 0, row, resolve);
     };
-    const onDone = (result, parent) => {
+    const handleDone = (result, parent) => {
       vue.nextTick(() => {
         if (props2.current != null) {
           methods.setCurrentRowKey(
@@ -294,52 +313,62 @@ const _sfc_main = vue.defineComponent({
       });
       emit("done", result, parent);
     };
-    const onRefresh = () => {
+    const handleRefresh = () => {
       if (isFunctionSource.value) {
         reload();
         return;
       }
       emit("refresh");
     };
-    const onSizeChange = (size) => {
+    const handleSizeChange = (size) => {
       tableSize.value = size;
       emit("sizeChange", size);
     };
-    const onColumnsChange = (columns) => {
+    const handleColumnsChange = (columns, tableColumns) => {
       tableCols.value = columns;
-      emit("columnsChange", columns);
+      emit("columnsChange", columns, tableColumns);
     };
-    const onMaximizedChange = (maximized) => {
+    const handleMaximizedChange = (maximized) => {
       tableMaximized.value = maximized;
       emit("maximizedChange", maximized);
     };
-    const onPageSizeChange = (limit) => {
+    const handlePageSizeChange = (limit) => {
+      if (tableTotal.value !== "*") {
+        const maxPage = Math.ceil(tableTotal.value / limit);
+        if (maxPage && tablePage.value > maxPage) {
+          tablePage.value = maxPage;
+        }
+      }
       tableLimit.value = limit;
       reload();
     };
-    const onPageCurrentChange = (page) => {
+    const handlePageCurrentChange = (page) => {
       tablePage.value = page;
       reload();
     };
-    const onSortChange = (sorter) => {
+    const handleSortChange = (sorter) => {
       if (props2.loadOnChanged) {
         tableState.sorter = sorter;
         reload();
       }
       events.onSortChange(sorter);
     };
-    const onFilterChange = (filter) => {
+    const handleFilterChange = (filter) => {
       if (props2.loadOnChanged) {
         tableState.filter = filter;
         reload();
       }
       events.onFilterChange(filter);
     };
-    const onCurrentChange = (currentRow, oldCurrentRow) => {
+    const handleHeaderDragend = (newWidth, oldWidth, column, event) => {
+      util$1.cacheColWidth(newWidth, column, props2.cacheKey);
+      events.onHeaderDragend(newWidth, oldWidth, column, event);
+    };
+    const handleCurrentChange = (currentRow, oldCurrentRow) => {
       updateCurrent(currentRow);
       events.onCurrentChange(currentRow, oldCurrentRow);
     };
-    const onSelectionChange = (selection) => {
+    const handleSelectionChange = (selection) => {
       updateSelections(selection);
       events.onSelectionChange(selection);
     };
@@ -400,8 +429,28 @@ const _sfc_main = vue.defineComponent({
         filter
       });
     };
+    const openPrintModal = () => {
+      if (tableToolsRef.value) {
+        tableToolsRef.value.openPrintModal();
+      }
+    };
+    const printData = (params) => {
+      if (tableToolsRef.value) {
+        tableToolsRef.value.printData(params);
+      }
+    };
+    const openExportModal = () => {
+      if (tableToolsRef.value) {
+        tableToolsRef.value.openExportModal();
+      }
+    };
+    const exportData = (params) => {
+      if (tableToolsRef.value) {
+        tableToolsRef.value.exportData(params);
+      }
+    };
     vue.watch(
-      () => props2.columns,
+      userColumns,
       (columns) => {
         if (columns) {
           tableCols.value = util$1.getInitCacheColumns(
@@ -413,10 +462,7 @@ const _sfc_main = vue.defineComponent({
           tableCols.value = [];
         }
       },
-      {
-        immediate: true,
-        deep: true
-      }
+      { immediate: true, deep: true }
     );
     vue.watch(
       () => props2.datasource,
@@ -472,7 +518,12 @@ const _sfc_main = vue.defineComponent({
       }
     });
     return {
+      toolsSlotExcludes,
+      tableSlotExcludes,
+      pageSlotExcludes,
       ...methods,
+      userColumns,
+      tableToolsRef,
       tableViewRef,
       tableData,
       tableSize,
@@ -481,22 +532,27 @@ const _sfc_main = vue.defineComponent({
       paginationProps,
       tableProps,
       toolNames,
+      tableToolbarProps,
       toolExportConfig,
       toolPrintConfig,
       loadingProps,
-      onRefresh,
-      onSizeChange,
-      onColumnsChange,
-      onMaximizedChange,
-      onPageSizeChange,
-      onPageCurrentChange,
+      handleRefresh,
+      handleSizeChange,
+      handleColumnsChange,
+      handleMaximizedChange,
+      handlePageSizeChange,
+      handlePageCurrentChange,
       reload,
       reloadTable,
       getTableRef,
       getData,
       setData,
       goPageByRowKey,
-      fetch
+      fetch,
+      openPrintModal,
+      printData,
+      openExportModal,
+      exportData
     };
   }
 });
@@ -516,14 +572,15 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleLoading = vue.resolveComponent("EleLoading");
   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)), {
+      _ctx.tableToolbarProps ? (vue.openBlock(), vue.createBlock(_component_EleToolbar, vue.normalizeProps(vue.mergeProps({ key: 0 }, _ctx.tableToolbarProps === true ? {} : _ctx.tableToolbarProps)), {
         tools: vue.withCtx(() => [
           vue.renderSlot(_ctx.$slots, "tools"),
           _ctx.toolNames && _ctx.toolNames.length ? (vue.openBlock(), vue.createBlock(_component_TableTools, {
             key: 0,
+            ref: "tableToolsRef",
             tools: _ctx.toolNames,
             size: _ctx.tableSize,
-            columns: _ctx.columns,
+            columns: _ctx.userColumns,
             columnSortable: _ctx.columnSortable,
             columnFixed: _ctx.columnFixed,
             maximized: _ctx.tableMaximized,
@@ -545,20 +602,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             fetch: _ctx.fetch,
             exportConfig: _ctx.toolExportConfig,
             printConfig: _ctx.toolPrintConfig,
-            onReload: _ctx.onRefresh,
-            "onUpdate:size": _ctx.onSizeChange,
-            "onUpdate:columns": _ctx.onColumnsChange,
-            "onUpdate:maximized": _ctx.onMaximizedChange
+            onReload: _ctx.handleRefresh,
+            "onUpdate:size": _ctx.handleSizeChange,
+            "onUpdate:columns": _ctx.handleColumnsChange,
+            "onUpdate:maximized": _ctx.handleMaximizedChange
           }, vue.createSlots({ _: 2 }, [
             vue.renderList(Object.keys(_ctx.$slots).filter(
-              (k) => ![
-                "default",
-                "toolbar",
-                "tools",
-                "footer",
-                "empty",
-                "append"
-              ].includes(k)
+              (k) => !_ctx.toolsSlotExcludes.includes(k)
             ), (name) => {
               return {
                 name,
@@ -577,14 +627,7 @@ 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",
-            "printTop",
-            "printBottom"
-          ].includes(k)
+          (k) => !_ctx.tableSlotExcludes.includes(k)
         ), (name) => {
           return {
             name,
@@ -595,14 +638,7 @@ 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",
-            "printTop",
-            "printBottom"
-          ].includes(k)
+          (k) => !_ctx.tableSlotExcludes.includes(k)
         ), (name) => {
           return {
             name,
@@ -619,20 +655,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       }, [
         vue.renderSlot(_ctx.$slots, "footer"),
         _ctx.paginationProps && _ctx.paginationProps.total ? (vue.openBlock(), vue.createBlock(_component_ElePagination, vue.mergeProps({ key: 0 }, _ctx.paginationProps, {
-          "onUpdate:currentPage": _ctx.onPageCurrentChange,
-          "onUpdate:pageSize": _ctx.onPageSizeChange
+          "onUpdate:currentPage": _ctx.handlePageCurrentChange,
+          "onUpdate:pageSize": _ctx.handlePageSizeChange
         }), vue.createSlots({ _: 2 }, [
           vue.renderList(Object.keys(_ctx.$slots).filter(
-            (k) => ![
-              "default",
-              "toolbar",
-              "tools",
-              "footer",
-              "empty",
-              "append",
-              "printTop",
-              "printBottom"
-            ].includes(k)
+            (k) => !_ctx.pageSlotExcludes.includes(k)
           ), (name) => {
             return {
               name,