ele-admin-plus 1.2.1-beta.2 → 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,16 +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;
     /** 是否显示合计行 */
@@ -43,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;
     /** 树表字段名 */
@@ -63,6 +54,13 @@ declare const _default: import('vue').DefineComponent<{
         type: PropType<ExportDataType>;
         default: string;
     };
+    /** 默认是否勾选表尾 */
+    defaultShowFooter: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    /** 默认是否勾选层级序号 */
+    defaultShowTreeIndex: BooleanConstructor;
     /** 打印前的钩子函数 */
     beforePrint: PropType<BeforeExport>;
 }, {
@@ -72,11 +70,12 @@ declare const _default: import('vue').DefineComponent<{
     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>;
@@ -91,17 +90,19 @@ declare const _default: import('vue').DefineComponent<{
     handlePrint: () => 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>;
     /** 打印组件参数 */
@@ -117,16 +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;
     /** 是否显示合计行 */
@@ -134,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;
     /** 树表字段名 */
@@ -154,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

@@ -32,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(
@@ -103,7 +111,8 @@ const _sfc_main = vue.defineComponent({
         onSelectionChange: handleSelectionChange,
         onSortChange: handleSortChange,
         onFilterChange: handleFilterChange,
-        onCurrentChange: handleCurrentChange
+        onCurrentChange: handleCurrentChange,
+        onHeaderDragend: handleHeaderDragend
       };
     });
     const toolNames = vue.computed(() => {
@@ -113,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 || {};
@@ -318,6 +333,12 @@ const _sfc_main = vue.defineComponent({
       emit("maximizedChange", maximized);
     };
     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();
     };
@@ -339,6 +360,10 @@ const _sfc_main = vue.defineComponent({
       }
       events.onFilterChange(filter);
     };
+    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);
@@ -404,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(
@@ -417,10 +462,7 @@ const _sfc_main = vue.defineComponent({
           tableCols.value = [];
         }
       },
-      {
-        immediate: true,
-        deep: true
-      }
+      { immediate: true, deep: true }
     );
     vue.watch(
       () => props2.datasource,
@@ -480,6 +522,8 @@ const _sfc_main = vue.defineComponent({
       tableSlotExcludes,
       pageSlotExcludes,
       ...methods,
+      userColumns,
+      tableToolsRef,
       tableViewRef,
       tableData,
       tableSize,
@@ -488,6 +532,7 @@ const _sfc_main = vue.defineComponent({
       paginationProps,
       tableProps,
       toolNames,
+      tableToolbarProps,
       toolExportConfig,
       toolPrintConfig,
       loadingProps,
@@ -503,7 +548,11 @@ const _sfc_main = vue.defineComponent({
       getData,
       setData,
       goPageByRowKey,
-      fetch
+      fetch,
+      openPrintModal,
+      printData,
+      openExportModal,
+      exportData
     };
   }
 });
@@ -523,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,