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

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

@@ -28,7 +28,6 @@ const _sfc_main = vue.defineComponent({
     const events = util.useEmits(emit);
     const methods = util.useMethods(() => getTableRef());
     const globalProps = receiver.useGlobalProps("table");
-    const { authenticated } = receiver.useLicense();
     const tableState = {
       sorter: props2.defaultSort ?? {},
       filter: util$1.getDefaultFilter(props2.columns),
@@ -108,9 +107,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: [
@@ -120,13 +151,8 @@ const _sfc_main = vue.defineComponent({
         ],
         style: tableMaximized.value ? { zIndex } : void 0
       };
-      return option;
     });
     const reload = (option, parent, resolve) => {
-      if (!authenticated.value) {
-        errorText.value = receiver.UNAUTHORIZED_TIP;
-        return;
-      }
       if (option) {
         if (option.page) {
           tablePage.value = option.page;
@@ -218,7 +244,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;
@@ -438,13 +464,16 @@ const _sfc_main = vue.defineComponent({
     return {
       ...methods,
       tableViewRef,
+      tableData,
       tableSize,
       tableMaximized,
       tableIndex,
       paginationProps,
       tableProps,
       toolNames,
-      rootProps,
+      toolExportConfig,
+      toolPrintConfig,
+      loadingProps,
       onRefresh,
       onSizeChange,
       onColumnsChange,
@@ -475,21 +504,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,
@@ -512,7 +555,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")

package/lib/ele-pro-table/index.d.ts

@@ -1,7 +1,7 @@
 import type { Ref } from 'vue';
 import type { EleLoadingProps, ElePaginationProps, EleDataTableProps } from '../ele-app/plus';
 import type { DataItem, Columns, Sorter, Filter, TableSize } from '../ele-data-table/types';
-import type { ReloadFunction, DoneParams, FetchCallback, TableViewInstance } from './types';
+import type { ReloadFunction, DoneParams, FetchFunction, TableViewInstance, ExportConfig, PrintConfig } from './types';
 declare const _default: import("vue").DefineComponent<{
     rowKey: {
         type: import("vue").PropType<string | ((row: DataItem) => string) | undefined>;
@@ -55,6 +55,8 @@ declare const _default: import("vue").DefineComponent<{
     virtual: BooleanConstructor;
     rowHeight: NumberConstructor;
     locale: import("vue").PropType<Partial<import("./types").TableLocale>>;
+    exportConfig: import("vue").PropType<ExportConfig>; /** 表格组件 */
+    printConfig: import("vue").PropType<PrintConfig>;
     width: (StringConstructor | NumberConstructor)[];
     height: (StringConstructor | NumberConstructor)[];
     size: {
@@ -146,6 +148,7 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     flexible: BooleanConstructor;
+    sticky: BooleanConstructor;
     headerEllipsis: {
         type: BooleanConstructor;
         default: boolean;
@@ -154,7 +157,6 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    sticky: BooleanConstructor;
     bottomLine: {
         type: BooleanConstructor;
         default: boolean;
@@ -168,13 +170,28 @@ declare const _default: import("vue").DefineComponent<{
     selectedRowKeys: import("vue").PropType<import("../ele-data-table/types").DataKey[]>;
 }, {
     tableViewRef: Ref<TableViewInstance>;
+    tableData: Ref<{
+        [x: string]: any;
+        [x: number]: any;
+        [x: symbol]: any;
+        children?: any[] | undefined;
+        _isMock?: boolean | undefined;
+        _rowKey?: import("../ele-data-table/types").DataKey | null | undefined;
+        _rowIndex?: number | undefined;
+        _rowDisabled?: boolean | undefined;
+        _isExpandRow?: boolean | undefined;
+        _expandParent?: any | undefined;
+        _expandParantIndex?: number | undefined;
+    }[]>;
     tableSize: Ref<"" | "default" | "small" | "large" | undefined>;
     tableMaximized: Ref<boolean>;
     tableIndex: import("vue").ComputedRef<number>;
     paginationProps: import("vue").ComputedRef<ElePaginationProps | null>;
     tableProps: import("vue").ComputedRef<EleDataTableProps>;
     toolNames: import("vue").ComputedRef<string[]>;
-    rootProps: import("vue").ComputedRef<EleLoadingProps>;
+    toolExportConfig: import("vue").ComputedRef<ExportConfig>;
+    toolPrintConfig: import("vue").ComputedRef<PrintConfig>;
+    loadingProps: import("vue").ComputedRef<EleLoadingProps>;
     onRefresh: () => void;
     onSizeChange: (size: TableSize) => void;
     onColumnsChange: (columns: Columns) => void;
@@ -187,7 +204,7 @@ declare const _default: import("vue").DefineComponent<{
     getData: () => DataItem[];
     setData: (data: DataItem[]) => void;
     goPageByRowKey: (key: unknown) => void;
-    fetch: (callback: FetchCallback) => void;
+    fetch: FetchFunction;
     clearSelection: () => void;
     getSelectionRows: () => DataItem[] | undefined;
     toggleRowSelection: (row: DataItem, selected?: boolean | undefined) => void;
@@ -200,15 +217,15 @@ declare const _default: import("vue").DefineComponent<{
     sort: (prop: string, order: string) => void;
     scrollTo: (options: number | ScrollToOptions, yCoord?: number | undefined) => void;
     setScrollTop: (top?: number | undefined) => void;
-    setScrollLeft: (left?: number | undefined) => void;
+    setScrollLeft: (left?: number | undefined) => void; /** 表格组件 */
     setCurrentRowKey: (key?: import("../ele-data-table/types").DataKey | null | undefined) => void;
-    getCurrentRow: () => DataItem | undefined; /** 当前页码 */
+    getCurrentRow: () => DataItem | undefined;
     setSelectedRows: (rows?: DataItem[] | undefined) => void;
     setSelectedRowKeys: (keys?: import("../ele-data-table/types").DataKey[] | undefined, rows?: DataItem[] | undefined) => void;
     toggleRowExpansionAll: (expanded?: boolean | undefined) => void;
     updateSelectedAndChecked: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean; /** 当前页码 */
+    done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean;
     'update:selections': (_selections: DataItem[]) => boolean;
     'update:current': (_current?: DataItem | null | undefined) => boolean;
     columnsChange: (_columns: Columns) => boolean;
@@ -227,12 +244,12 @@ declare const _default: import("vue").DefineComponent<{
     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; /** 当前页码 */
+    headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean;
     sortChange: (_sorter: Sorter) => boolean;
     filterChange: (_filter: Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
     headerDragend: (_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => boolean;
-    expandChange: (_row: DataItem, _expanded: boolean) => 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;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
@@ -288,6 +305,8 @@ declare const _default: import("vue").DefineComponent<{
     virtual: BooleanConstructor;
     rowHeight: NumberConstructor;
     locale: import("vue").PropType<Partial<import("./types").TableLocale>>;
+    exportConfig: import("vue").PropType<ExportConfig>; /** 表格组件 */
+    printConfig: import("vue").PropType<PrintConfig>;
     width: (StringConstructor | NumberConstructor)[];
     height: (StringConstructor | NumberConstructor)[];
     size: {
@@ -379,6 +398,7 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     flexible: BooleanConstructor;
+    sticky: BooleanConstructor;
     headerEllipsis: {
         type: BooleanConstructor;
         default: boolean;
@@ -387,7 +407,6 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    sticky: BooleanConstructor;
     bottomLine: {
         type: BooleanConstructor;
         default: boolean;
@@ -447,13 +466,13 @@ declare const _default: import("vue").DefineComponent<{
     } | undefined;
     tableLayout: "auto" | "fixed";
     flexible: boolean;
+    sticky: boolean;
+    toolbar: boolean | import("../ele-app/plus").EleToolbarProps;
     headerEllipsis: boolean;
     slotNormalize: boolean;
-    sticky: boolean;
     bottomLine: boolean;
     emptyProps: import("../ele-data-table/types").TableEmptyProps;
     reserveCurrent: boolean;
-    toolbar: boolean | import("../ele-app/plus").EleToolbarProps;
     loadOnCreated: boolean;
     loadOnChanged: boolean;
     tools: boolean | string[];

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

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

package/lib/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/lib/ele-pro-table/style/index.cjs

@@ -1,6 +1,12 @@
 "use strict";
 require("element-plus/lib/components/checkbox/style/index");
 require("element-plus/lib/components/icon/style/index");
+require("element-plus/lib/components/form/style/index");
+require("element-plus/lib/components/form-item/style/index");
+require("element-plus/lib/components/input/style/index");
+require("element-plus/lib/components/select/style/index");
+require("element-plus/lib/components/option/style/index");
+require("element-plus/lib/components/button/style/index");
 require("../../ele-tooltip/style/index");
 require("../../ele-dropdown/style/index");
 require("../../ele-tool/style/index");
@@ -9,4 +15,7 @@ require("../../ele-loading/style/index");
 require("../../ele-pagination/style/index");
 require("../../ele-data-table/style/index");
 require("../../ele-virtual-table/style/index");
+require("../../ele-modal/style/index");
+require("../../ele-printer/style/index");
+require("../../ele-table/style/index");
 require("./index.scss");

package/lib/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');
+  }
+}