ele-admin-plus 1.1.9-beta.7 → 1.1.9-beta.9

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

@@ -1,6 +1,6 @@
 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 { pick } from "../utils/core";
-import { useGlobalProps, useLicense, UNAUTHORIZED_TIP } from "../ele-config-provider/receiver";
+import { useGlobalProps } from "../ele-config-provider/receiver";
 import EleLoading from "../ele-loading/index";
 import ElePagination from "../ele-pagination/index";
 import { dataTablePropKeys } from "../ele-data-table/props";
@@ -27,7 +27,6 @@ const _sfc_main = defineComponent({
     const events = useEmits(emit);
     const methods = useMethods(() => getTableRef());
     const globalProps = useGlobalProps("table");
-    const { authenticated } = useLicense();
     const tableState = {
       sorter: props.defaultSort ?? {},
       filter: getDefaultFilter(props.columns),
@@ -107,9 +106,41 @@ const _sfc_main = defineComponent({
       }
       return tools || [];
     });
-    const rootProps = computed(() => {
+    const toolExportConfig = computed(() => {
+      const globalExportConfig = globalProps.value.exportConfig || {};
+      const userExportConfig = props.exportConfig || {};
+      return {
+        ...globalExportConfig,
+        ...userExportConfig,
+        modalProps: {
+          ...globalExportConfig.modalProps || {},
+          ...userExportConfig.modalProps || {}
+        }
+      };
+    });
+    const toolPrintConfig = computed(() => {
+      const globalPrintConfig = globalProps.value.printConfig || {};
+      const userPrintConfig = props.printConfig || {};
+      return {
+        ...globalPrintConfig,
+        ...userPrintConfig,
+        modalProps: {
+          ...globalPrintConfig.modalProps || {},
+          ...userPrintConfig.modalProps || {}
+        },
+        printerProps: {
+          ...globalPrintConfig.printerProps || {},
+          ...userPrintConfig.printerProps || {}
+        },
+        tableProps: {
+          ...globalPrintConfig.tableProps || {},
+          ...userPrintConfig.tableProps || {}
+        }
+      };
+    });
+    const loadingProps = computed(() => {
       const zIndex = props.maximizedIndex ?? globalProps.value.maximizedIndex;
-      const option = {
+      return {
         ...props.loadingProps || {},
         loading: tableLoading.value,
         class: [
@@ -119,13 +150,8 @@ const _sfc_main = defineComponent({
         ],
         style: tableMaximized.value ? { zIndex } : void 0
       };
-      return option;
     });
     const reload = (option, parent, resolve) => {
-      if (!authenticated.value) {
-        errorText.value = UNAUTHORIZED_TIP;
-        return;
-      }
       if (option) {
         if (option.page) {
           tablePage.value = option.page;
@@ -217,7 +243,7 @@ const _sfc_main = defineComponent({
       if (resolve) {
         resolve(data);
       } else {
-        if (isAutoAmend(props.pagination, globalProps.value.pagination) && !data.length && total && tablePage.value && tableLimit.value) {
+        if (isAutoAmend(props.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;
@@ -437,13 +463,16 @@ const _sfc_main = defineComponent({
     return {
       ...methods,
       tableViewRef,
+      tableData,
       tableSize,
       tableMaximized,
       tableIndex,
       paginationProps,
       tableProps,
       toolNames,
-      rootProps,
+      toolExportConfig,
+      toolPrintConfig,
+      loadingProps,
       onRefresh,
       onSizeChange,
       onColumnsChange,
@@ -474,21 +503,35 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleDataTable = resolveComponent("EleDataTable");
   const _component_ElePagination = resolveComponent("ElePagination");
   const _component_EleLoading = resolveComponent("EleLoading");
-  return openBlock(), createBlock(_component_EleLoading, normalizeProps(guardReactiveProps(_ctx.rootProps)), {
+  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,
-            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,
@@ -511,7 +554,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"])) : 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"])) : createCommentVNode("", true)
         ]),
         default: withCtx(() => [
           renderSlot(_ctx.$slots, "toolbar")

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

@@ -1,7 +1,7 @@
 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 } from './types';
+import type { Where, Datasource, RequestOption, ResponseOption, ParseData, DoneParams, TablePagination, TableLocale, ExportConfig, PrintConfig } from './types';
 /**
  * 属性
  */
@@ -78,10 +78,16 @@ export declare const proTableProps: {
     cacheKey: StringConstructor;
     /** 是否虚拟滚动 */
     virtual: BooleanConstructor;
-    /** 行高 */
+    /** 虚拟滚动表格行高 */
     rowHeight: NumberConstructor;
     /** 国际化 */
     locale: PropType<Partial<TableLocale>>;
+    /** 导出配置 */
+    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 required: false;
@@ -97,13 +103,11 @@ export declare const proTableProps: {
         type: StringConstructor;
         default: string;
     };
-    width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
     columns: {
         type: PropType<Columns>;
         required: boolean;
     };
-    height: (StringConstructor | NumberConstructor)[];
     scrollbarAlwaysOn: {
         type: BooleanConstructor;
         default: boolean;
@@ -173,17 +177,18 @@ export declare const proTableProps: {
         default: string;
     };
     flexible: BooleanConstructor;
+    sticky: BooleanConstructor;
     headerEllipsis: {
         type: BooleanConstructor;
         default: boolean;
     };
     slotNormalize: {
         type: BooleanConstructor;
-        default: boolean; /** 自定义请求参数名称 */
+        default: boolean;
     };
-    sticky: BooleanConstructor;
     bottomLine: {
         type: BooleanConstructor;
+        /** 自定义响应参数名称 */
         default: boolean;
     };
     emptyProps: {
@@ -223,14 +228,15 @@ export declare const proTableEmits: {
     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;
     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:selectedRowKeys': (_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => boolean; /** 数组数据源时刷新按钮点击事件 */
 };

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

@@ -78,10 +78,14 @@ const proTableProps = {
   cacheKey: String,
   /** 是否虚拟滚动 */
   virtual: Boolean,
-  /** 行高 */
+  /** 虚拟滚动表格行高 */
   rowHeight: Number,
   /** 国际化 */
-  locale: Object
+  locale: Object,
+  /** 导出配置 */
+  exportConfig: Object,
+  /** 打印配置 */
+  printConfig: Object
 };
 const proTableEmits = {
   ...dataTableEmits,

package/es/ele-pro-table/style/index.js

@@ -1,5 +1,11 @@
 import 'element-plus/es/components/checkbox/style/index';
 import 'element-plus/es/components/icon/style/index';
+import 'element-plus/es/components/form/style/index';
+import 'element-plus/es/components/form-item/style/index';
+import 'element-plus/es/components/input/style/index';
+import 'element-plus/es/components/select/style/index';
+import 'element-plus/es/components/option/style/index';
+import 'element-plus/es/components/button/style/index';
 import '../../ele-tooltip/style/index';
 import '../../ele-dropdown/style/index';
 import '../../ele-tool/style/index';
@@ -8,4 +14,7 @@ import '../../ele-loading/style/index';
 import '../../ele-pagination/style/index';
 import '../../ele-data-table/style/index';
 import '../../ele-virtual-table/style/index';
+import '../../ele-modal/style/index';
+import '../../ele-printer/style/index';
+import '../../ele-table/style/index';
 import './index.scss';

package/es/ele-pro-table/style/index.scss

@@ -107,7 +107,12 @@
 }
 
 /* 列配置 */
-.ele-tool-column.ele-popover {
+.ele-tool-column-popover.ele-popover {
+  width: eleVar('tool-column', 'width');
+  max-width: 100%;
+}
+
+.ele-tool-column {
   width: eleVar('tool-column', 'width');
   max-width: 100%;
 }
@@ -131,7 +136,8 @@
   }
 }
 
-.ele-tool-column.ele-popover.ele-popper.el-popper {
+.ele-tool-column .ele-tool-column-item .ele-tool-column-item-body,
+.ele-tool-column .ele-tool-column-header .ele-tool-column-label {
   .el-checkbox {
     height: eleVar('tool-column', 'item-height');
     line-height: eleVar('tool-column', 'item-height');
@@ -153,7 +159,7 @@
   box-sizing: border-box;
 }
 
-.ele-popover-body > .ele-tool-column-list {
+.ele-tool-column > .ele-tool-column-list {
   padding: eleVar('tool-column', 'body-padding');
   max-height: eleVar('tool-column', 'max-height');
   box-sizing: border-box;
@@ -182,6 +188,7 @@
 
   &.sortable-chosen {
     background: eleVar('tool-column', 'item-hover-bg');
+    opacity: 1 !important;
 
     & > .ele-tool-column-item-body {
       background: none;
@@ -189,7 +196,7 @@
   }
 
   &.sortable-ghost {
-    opacity: 0;
+    opacity: 0 !important;
   }
 
   & > .ele-tool-column-list {
@@ -230,9 +237,13 @@
     color: eleVar('tool-column', 'btn-active-color');
     background: eleVar('tool-column', 'btn-active-bg');
   }
+
+  & > .el-icon > svg {
+    stroke-width: 5;
+  }
 }
 
-.ele-popover-body.is-sortable {
+.ele-tool-column.is-sortable {
   .ele-tool-column-item-body {
     padding-left: 6px;
   }
@@ -241,3 +252,20 @@
     padding-left: calc(22px - #{eleVar('tool-column', 'item-padding')});
   }
 }
+
+/* 导出和打印的列选择 */
+.ele-tool-export-form,
+.ele-tool-print-form {
+  .ele-tool-column {
+    border: 1px solid elVar('border-color', 'light');
+    border-radius: elVar('border-radius', 'base');
+    line-height: normal;
+    width: 100%;
+  }
+
+  .ele-tool-column-header {
+    background: elVar('fill-color', 'lighter');
+    border-top-left-radius: elVar('border-radius', 'base');
+    border-top-right-radius: elVar('border-radius', 'base');
+  }
+}

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

@@ -1,8 +1,12 @@
 import type {
   EleDataTableInstance,
   EleVirtualTableInstance,
-  ElePaginationProps
+  ElePaginationProps,
+  EleModalProps,
+  ElePrinterProps,
+  EleTableProps
 } from '../ele-app/plus';
+import type { PaginationTotal } from '../ele-pagination/types';
 import type {
   DataItem,
   Column,
@@ -13,6 +17,7 @@ import type {
   TableSize,
   ResolveFunction
 } from '../ele-data-table/types';
+import type { BodyColumns } from '../ele-virtual-table/types';
 export type {
   DataItem,
   Column,
@@ -137,7 +142,7 @@ export interface ResponseOption {
 }
 
 /**
- * 响应数据解析
+ * 响应数据解析方法
  */
 export type ParseData = (data: unknown) => DatasourceResult;
 
@@ -159,10 +164,10 @@ export interface OrderItem {
 export interface DoneParams<T> {
   /** 当前页数据 */
   data: T[];
+  /** 总数量 */
+  total?: PaginationTotal;
   /** 当前页码 */
   page?: number;
-  /** 总数量 */
-  total?: number;
   /** 数据源原始数据 */
   response?: any;
 }
@@ -188,7 +193,14 @@ export interface TablePagination extends ElePaginationProps {
 /**
  * 内置工具按钮
  */
-export type TableTool = 'reload' | 'size' | 'columns' | 'maximized' | string;
+export type TableTool =
+  | 'reload'
+  | 'size'
+  | 'columns'
+  | 'maximized'
+  | 'export'
+  | 'print'
+  | string;
 
 /**
  * 列配置
@@ -211,6 +223,11 @@ export interface ColItem {
  */
 export type FetchCallback = (options: DatasourceParams) => void;
 
+/**
+ * 请求方法
+ */
+export type FetchFunction = (callback: FetchCallback) => void;
+
 /**
  * 前端分页排序方法返回结果
  */
@@ -258,6 +275,120 @@ export type TableViewInstance =
   | EleVirtualTableInstance
   | null;
 
+/**
+ * 导出的数据来源类型
+ */
+export type ExportDataType = 'selections' | 'pageData' | 'data';
+
+/**
+ * 导出的数据每一项
+ */
+export interface ExportDataItem {
+  /** 唯一值 */
+  key?: string;
+  /** 行数据 */
+  row?: DataItem;
+  /** 行索引 */
+  index: number;
+  /** 列配置 */
+  column?: Column;
+  /** 文本 */
+  text?: string;
+  /** 所占列数 */
+  colspan?: number;
+  /** 所占行数 */
+  rowspan?: number;
+}
+
+/**
+ * 导出数据封装返回结果
+ */
+export interface ExportDataResult {
+  /** 表头数据 */
+  headerData: ExportDataItem[][];
+  /** 主体数据 */
+  bodyData: ExportDataItem[][];
+  /** 表尾数据 */
+  footerData: ExportDataItem[][];
+  /** 主体列配置 */
+  bodyCols: BodyColumns;
+}
+
+/**
+ * 导出数据前的钩子函数的参数
+ */
+export interface BeforeExportParams {
+  /** 导出的数据 */
+  data: DataItem[];
+  /** 导出的列配置 */
+  columns?: Columns;
+  /** 导出的表头数据封装 */
+  headerData: ExportDataItem[][];
+  /** 导出的主体数据封装 */
+  bodyData: ExportDataItem[][];
+  /** 导出的页脚数据封装 */
+  footerData: ExportDataItem[][];
+  /** 主体列配置 */
+  bodyCols: BodyColumns;
+  /** 文件名 */
+  fileName?: string;
+  /** 关闭确定按钮的加载状态 */
+  hideLoading: () => void;
+  /** 关闭弹窗 */
+  closeModal: () => void;
+}
+
+/**
+ * 导出数据前的钩子函数
+ */
+export type BeforeExport = (params: BeforeExportParams) => boolean | void;
+
+/**
+ * 导出配置
+ */
+export interface ExportConfig {
+  /** 弹窗参数 */
+  modalProps?: EleModalProps;
+  /** 表格全部数据 */
+  datasource?: Datasource;
+  /** 导出前的钩子函数 */
+  beforeExport?: BeforeExport;
+  /** 默认数据类型 */
+  dataType?: ExportDataType;
+  /** 默认文件名 */
+  fileName?: string;
+}
+
+/**
+ * 打印配置
+ */
+export interface PrintConfig {
+  /** 弹窗参数 */
+  modalProps?: EleModalProps;
+  /** 打印组件参数 */
+  printerProps?: ElePrinterProps;
+  /** 打印表格参数 */
+  tableProps?: EleTableProps;
+  /** 表格全部数据 */
+  datasource?: Datasource;
+  /** 打印前的钩子函数 */
+  beforePrint?: BeforeExport;
+  /** 默认数据类型 */
+  dataType?: ExportDataType;
+}
+
+/**
+ * 打印参数
+ */
+export interface TablePrintOptions extends ExportDataResult {
+  /** 是否开始打印 */
+  printing: boolean;
+  /** 是否有表头 */
+  hasHeader: boolean;
+  /** 是否有表尾 */
+  hasFooter: boolean;
+}
+
 /**
  * 国际化
  */
@@ -266,6 +397,8 @@ export interface TableLocale {
   sizes: string;
   columns: string;
   maximized: string;
+  export: string;
+  print: string;
   sizeLarge: string;
   sizeDefault: string;
   sizeSmall: string;
@@ -274,4 +407,13 @@ export interface TableLocale {
   columnUntitled: string;
   columnFixedLeft: string;
   columnFixedRight: string;
+  exportOk: string;
+  exportCancel: string;
+  exportFileName: string;
+  exportFileNamePlaceholder: string;
+  exportSelectData: string;
+  exportSelectColumn: string;
+  exportDataTypePage: string;
+  exportDataTypeSelected: string;
+  exportDataTypeAll: string;
 }

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

@@ -1,6 +1,6 @@
 import type { ElePaginationProps } from '../ele-app/plus';
-import type { DataItem, Column, Columns, Sorter, Filter, TableSize, TreeProps, RowKey } from '../ele-data-table/types';
-import type { Orders, Filters, OrderItem, RequestOption, ResponseOption, TablePagination, DatasourceResult, ResponseResult, ReloadDataResult, ColItem, ProProps } from './types';
+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';
 /**
  * 合并复合属性
  * @param props 属性
@@ -127,7 +127,14 @@ export declare function getInitCacheColumns(columns: Columns, cacheKey?: string,
  * @param cols 列配置数据
  * @param sortable 是否进行排序
  */
-export declare function getCheckedColumns(columns: Columns | undefined, cols: ColItem[], sortable?: boolean): Columns;
+export declare function getCheckedColumns(columns: Columns | undefined, cols: ColItem[], sortable?: boolean, filter?: (item: Column) => boolean): Columns;
+/**
+ * 获取列展示列表数据
+ * @param columns 列数据
+ * @param untitledText 未命名列文字
+ * @param filter 过滤的方法
+ */
+export declare function getColItems(columns?: Columns, untitledText?: string, filter?: (item: Column) => boolean): ColItem[];
 /**
  * 获取列配置
  * @param columns 列数据
@@ -170,3 +177,40 @@ export declare function getRowKey(rowKey?: RowKey): string | ((row: DataItem) =>
  * @param page 页码
  */
 export declare function addDefaultRowKey(data: DataItem[], rowKey: string | undefined, page: number): DataItem[];
+/**
+ * 导出获取单元格文本
+ * @param column 列配置
+ * @param row 行数据
+ * @param index 行索引
+ * @param pageIndex 序号列起始索引
+ */
+export declare function getCellText(column: Column | undefined, row: DataItem, index: number, pageIndex?: number): string;
+/**
+ * 导出获取表头单元格文本
+ * @param column 列配置
+ * @param index 行索引
+ */
+export declare function getHeaderCellText(column: Column | undefined, index: number): string;
+/**
+ * 获取导出的数据
+ * @param data 元数据
+ * @param columns 列配置
+ * @param spanMethod 单元格合并方法
+ * @param pageIndex 序号列起始索引
+ * @param showSummary 是否显示合计行
+ * @param sumText 合计行文本
+ * @param summaryMethod 合计行自定义方法
+ */
+export declare function getExportData(data: DataItem[], columns: Columns, spanMethod?: SpanMethod, pageIndex?: number, showSummary?: boolean, sumText?: string, summaryMethod?: SummaryMethod): ExportDataResult;
+/**
+ * 导出csv文件
+ * @param fileName 文件名
+ * @param headerData 表头数据
+ * @param bodyData 主体数据
+ */
+export declare function exportCSV(fileName: string, headerData: ExportDataItem[][], bodyData: ExportDataItem[][], footerData: ExportDataItem[][]): void;
+/**
+ * 导出判断列是否显示
+ * @param item 列配置
+ */
+export declare function exportColumnsfilter(item: Column): boolean;