ele-admin-plus 1.4.1 → 1.5.0-beta.2

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

@@ -3,21 +3,38 @@ import { EleDataTableProps, EleToolbarProps } from '../ele-app/plus';
 import { DataItem, Column, Columns, Sorter, Filter, RowKey } from '../ele-data-table/types';
 import { ReloadFunction, DoneParams, TableTool, FetchFunction, TableViewInstance, ExportConfig, PrintConfig, TableExportParams } from './types';
 
-declare function __VLS_template(): Partial<Record<string, (_: {}) => any>> & Partial<Record<string, (_: {
-    row: DataItem | undefined;
-    column: Column;
-    $index: number | undefined;
-}) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: {
-    row: DataItem | undefined;
-    column: Column;
-    $index: number;
-}) => any>> & {
-    topExtra?(_: {}): any;
-    toolbar?(_: {}): any;
-    tools?(_: {}): any;
-    default?(_: {}): any;
-    footer?(_: {}): any;
-    bottomExtra?(_: {}): any;
+declare function __VLS_template(): Readonly<{
+    [x: string]: (props: Record<string, any>) => any;
+    default(): any;
+    toolbar(): any;
+    tools(): any;
+    footer(): any;
+    empty(): any;
+    append(): any;
+    topExtra(): any;
+    bottomExtra(): any;
+    printTop(props: {
+        data: DataItem[];
+    }): any;
+    printBottom(props: {
+        data: DataItem[];
+    }): any;
+}> & {
+    [x: string]: (props: Record<string, any>) => any;
+    default(): any;
+    toolbar(): any;
+    tools(): any;
+    footer(): any;
+    empty(): any;
+    append(): any;
+    topExtra(): any;
+    bottomExtra(): any;
+    printTop(props: {
+        data: DataItem[];
+    }): any;
+    printBottom(props: {
+        data: DataItem[];
+    }): any;
 };
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     rowKey: {
@@ -60,7 +77,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: boolean;
     };
     maximizedIndex: NumberConstructor;
-    maximizedHeight: (StringConstructor | NumberConstructor)[];
+    maximizedHeight: (NumberConstructor | StringConstructor)[];
     tableStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     pagination: {
@@ -74,8 +91,22 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     locale: import('vue').PropType<Partial<import('./types').TableLocale>>;
     exportConfig: import('vue').PropType<ExportConfig>;
     printConfig: import('vue').PropType<PrintConfig>;
-    width: (NumberConstructor | StringConstructor)[];
+    maximized: BooleanConstructor;
     height: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
+    tableLayout: {
+        type: import('vue').PropType<"fixed" | "auto">;
+        default: string;
+    };
+    width: (NumberConstructor | StringConstructor)[];
+    border: {
+        type: BooleanConstructor;
+        default: null;
+    };
+    columns: {
+        type: import('vue').PropType<Columns>;
+        required: boolean;
+    };
     size: {
         readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
@@ -86,7 +117,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: BooleanConstructor;
         default: boolean;
     };
-    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
@@ -97,10 +127,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: BooleanConstructor;
         default: null;
     };
-    border: {
-        type: BooleanConstructor;
-        default: null;
-    };
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -141,10 +167,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         };
     };
     load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["load"]>;
-    tableLayout: {
-        type: import('vue').PropType<"fixed" | "auto">;
-        default: string;
-    };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
     showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["showOverflowTooltip"]>;
@@ -159,10 +181,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: boolean;
     };
     preserveExpandedContent: BooleanConstructor;
-    columns: {
-        type: import('vue').PropType<Columns>;
-        required: boolean;
-    };
+    nativeScrollbar: BooleanConstructor;
     sticky: BooleanConstructor;
     headerEllipsis: {
         type: BooleanConstructor;
@@ -185,6 +204,15 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     selectedRowKeys: import('vue').PropType<import('../ele-data-table/types').DataKey[]>;
 }>, {
     tableViewRef: Ref<TableViewInstance, TableViewInstance>;
+    reload: ReloadFunction;
+    getData: () => DataItem[];
+    setData: (data: DataItem[]) => void;
+    fetch: FetchFunction;
+    openPrintModal: () => void;
+    printData: (params?: TableExportParams) => void;
+    openExportModal: () => void;
+    exportData: (params?: TableExportParams) => void;
+    getTableRef: () => TableViewInstance | undefined;
     tableData: Ref<{
         [x: string]: any;
         [x: number]: any;
@@ -198,17 +226,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     }[]>;
     tableLoading: Ref<boolean, boolean>;
     tableProps: import('vue').ComputedRef<EleDataTableProps>;
-    reload: ReloadFunction;
     reloadTable: () => void;
-    getTableRef: () => TableViewInstance | undefined;
-    getData: () => DataItem[];
-    setData: (data: DataItem[]) => void;
     goPageByRowKey: (key: unknown) => void;
-    fetch: FetchFunction;
-    openPrintModal: () => void;
-    printData: (params?: TableExportParams) => void;
-    openExportModal: () => void;
-    exportData: (params?: TableExportParams) => void;
     clearSelection: () => void;
     getSelectionRows: () => DataItem[] | undefined;
     toggleRowSelection: (row: DataItem, selected?: boolean, ignoreSelectable?: boolean) => void;
@@ -241,7 +260,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     cellClick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => void;
     cellDblclick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => void;
     cellContextmenu: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => void;
-    rowClick: (_row: DataItem, _column: Column, _e: MouseEvent) => void;
+    rowClick: (_row: DataItem, _column: Column, _e: MouseEvent, _disabled?: boolean | undefined, _selection?: DataItem[] | undefined) => void;
     rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => void;
     rowDblclick: (_row: DataItem, _column: Column, _e: MouseEvent) => void;
     headerClick: (_column: Column, _e: MouseEvent) => void;
@@ -259,6 +278,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     columnsChange: (_columns: Columns, _tableColumns: Columns, _isReset: boolean) => void;
     sizeChange: (_size: "" | "small" | "default" | "large" | undefined) => void;
     maximizedChange: (_maximized: boolean) => void;
+    "update:maximized": (_maximized: boolean) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     rowKey: {
         type: import('vue').PropType<RowKey>;
@@ -300,7 +320,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: boolean;
     };
     maximizedIndex: NumberConstructor;
-    maximizedHeight: (StringConstructor | NumberConstructor)[];
+    maximizedHeight: (NumberConstructor | StringConstructor)[];
     tableStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     pagination: {
@@ -314,8 +334,22 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     locale: import('vue').PropType<Partial<import('./types').TableLocale>>;
     exportConfig: import('vue').PropType<ExportConfig>;
     printConfig: import('vue').PropType<PrintConfig>;
-    width: (NumberConstructor | StringConstructor)[];
+    maximized: BooleanConstructor;
     height: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
+    tableLayout: {
+        type: import('vue').PropType<"fixed" | "auto">;
+        default: string;
+    };
+    width: (NumberConstructor | StringConstructor)[];
+    border: {
+        type: BooleanConstructor;
+        default: null;
+    };
+    columns: {
+        type: import('vue').PropType<Columns>;
+        required: boolean;
+    };
     size: {
         readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
@@ -326,7 +360,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: BooleanConstructor;
         default: boolean;
     };
-    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
@@ -337,10 +370,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: BooleanConstructor;
         default: null;
     };
-    border: {
-        type: BooleanConstructor;
-        default: null;
-    };
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -381,10 +410,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         };
     };
     load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["load"]>;
-    tableLayout: {
-        type: import('vue').PropType<"fixed" | "auto">;
-        default: string;
-    };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
     showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["showOverflowTooltip"]>;
@@ -399,10 +424,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: boolean;
     };
     preserveExpandedContent: BooleanConstructor;
-    columns: {
-        type: import('vue').PropType<Columns>;
-        required: boolean;
-    };
+    nativeScrollbar: BooleanConstructor;
     sticky: BooleanConstructor;
     headerEllipsis: {
         type: BooleanConstructor;
@@ -436,7 +458,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onCellClick?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
     onCellDblclick?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
     onCellContextmenu?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
-    onRowClick?: ((_row: DataItem, _column: Column, _e: MouseEvent) => any) | undefined;
+    onRowClick?: ((_row: DataItem, _column: Column, _e: MouseEvent, _disabled?: boolean | undefined, _selection?: DataItem[] | undefined) => any) | undefined;
     onRowContextmenu?: ((_row: DataItem, _column: Column, _e: MouseEvent) => any) | undefined;
     onRowDblclick?: ((_row: DataItem, _column: Column, _e: MouseEvent) => any) | undefined;
     onHeaderClick?: ((_column: Column, _e: MouseEvent) => any) | undefined;
@@ -454,13 +476,15 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onColumnsChange?: ((_columns: Columns, _tableColumns: Columns, _isReset: boolean) => any) | undefined;
     onSizeChange?: ((_size: "" | "small" | "default" | "large" | undefined) => any) | undefined;
     onMaximizedChange?: ((_maximized: boolean) => any) | undefined;
+    "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;
 }>, {
+    tableLayout: "fixed" | "auto";
+    border: boolean;
     loading: boolean;
     fit: boolean;
     lazy: boolean;
     className: string;
     stripe: boolean;
-    border: boolean;
     showHeader: boolean;
     showSummary: boolean;
     highlightCurrentRow: boolean;
@@ -468,12 +492,14 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     selectOnIndeterminate: boolean;
     indent: number;
     treeProps: import('element-plus/es/components/table/src/table/defaults').TreeProps | undefined;
-    tableLayout: "fixed" | "auto";
     scrollbarAlwaysOn: boolean;
     flexible: boolean;
     scrollbarTabindex: string | number;
     allowDragLastColumn: boolean;
     preserveExpandedContent: boolean;
+    nativeScrollbar: boolean;
+    maximized: boolean;
+    tools: boolean | string[];
     sticky: boolean;
     toolbar: boolean | EleToolbarProps;
     headerEllipsis: boolean;
@@ -481,12 +507,11 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     bottomLine: boolean;
     emptyProps: import('../ele-data-table/types').TableEmptyProps;
     reserveCurrent: boolean;
-    tools: boolean | string[];
+    pagination: boolean | import('./types').TablePagination;
     loadOnCreated: boolean;
     loadOnChanged: boolean;
     columnSortable: boolean;
     columnFixed: boolean;
-    pagination: boolean | import('./types').TablePagination;
     virtual: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;

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

@@ -90,7 +90,9 @@ const proTableProps = {
   /** 导出配置 */
   exportConfig: Object,
   /** 打印配置 */
-  printConfig: Object
+  printConfig: Object,
+  /** 表格是否最大化状态 */
+  maximized: Boolean
 };
 const proTableEmits = {
   ...props$1.virtualTableEmits,
@@ -106,6 +108,8 @@ const proTableEmits = {
   sizeChange: (_size) => true,
   /** 表格最大化切换事件 */
   maximizedChange: (_maximized) => true,
+  /** 表格最大化状态更新 */
+  "update:maximized": (_maximized) => true,
   /** 数组数据源时刷新按钮点击事件 */
   refresh: () => true
 };

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

@@ -67,7 +67,7 @@ export declare const proTableProps: {
     /** 表格全屏时的层级 */
     maximizedIndex: NumberConstructor;
     /** 表格全屏状态的高度 */
-    maximizedHeight: (StringConstructor | NumberConstructor)[];
+    maximizedHeight: (NumberConstructor | StringConstructor)[];
     /** 自定义表格样式 */
     tableStyle: PropType<StyleValue>;
     /** 自定义底部样式 */
@@ -91,9 +91,23 @@ export declare const proTableProps: {
     exportConfig: PropType<ExportConfig>;
     /** 打印配置 */
     printConfig: PropType<PrintConfig>;
-    width: (NumberConstructor | StringConstructor)[];
+    /** 表格是否最大化状态 */
+    maximized: BooleanConstructor;
     height: (NumberConstructor | StringConstructor)[];
-    load: PropType<import('element-plus/es/components/table/index').TableProps<any>["load"]>;
+    maxHeight: (NumberConstructor | StringConstructor)[];
+    tableLayout: {
+        type: PropType<"fixed" | "auto">;
+        default: string;
+    };
+    width: (NumberConstructor | StringConstructor)[];
+    border: {
+        type: BooleanConstructor;
+        default: null;
+    };
+    columns: {
+        type: PropType<Columns>;
+        required: boolean;
+    };
     size: {
         readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
@@ -104,7 +118,6 @@ export declare const proTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
@@ -115,10 +128,6 @@ export declare const proTableProps: {
         type: BooleanConstructor;
         default: null;
     };
-    border: {
-        type: BooleanConstructor;
-        default: null;
-    };
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -158,10 +167,7 @@ export declare const proTableProps: {
             checkStrictly: boolean;
         };
     };
-    tableLayout: {
-        type: PropType<"fixed" | "auto">;
-        default: string;
-    };
+    load: PropType<import('element-plus/es/components/table/index').TableProps<any>["load"]>;
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
     showOverflowTooltip: PropType<import('element-plus/es/components/table/index').TableProps<any>["showOverflowTooltip"]>;
@@ -176,10 +182,7 @@ export declare const proTableProps: {
         default: boolean;
     };
     preserveExpandedContent: BooleanConstructor;
-    columns: {
-        type: PropType<Columns>;
-        required: boolean;
-    };
+    nativeScrollbar: BooleanConstructor;
     sticky: BooleanConstructor;
     headerEllipsis: {
         type: BooleanConstructor;
@@ -218,6 +221,8 @@ export declare const proTableEmits: {
     sizeChange: (_size: TableSize) => boolean;
     /** 表格最大化切换事件 */
     maximizedChange: (_maximized: boolean) => boolean;
+    /** 表格最大化状态更新 */
+    'update:maximized': (_maximized: boolean) => boolean;
     /** 数组数据源时刷新按钮点击事件 */
     refresh: () => boolean;
     endEeached: (_params: any) => boolean;
@@ -233,7 +238,7 @@ export declare const proTableEmits: {
     cellClick: (_row: DataItem, _column: import('./types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellDblclick: (_row: DataItem, _column: import('./types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellContextmenu: (_row: DataItem, _column: import('./types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    rowClick: (_row: DataItem, _column: import('./types').Column, _e: MouseEvent) => boolean;
+    rowClick: (_row: DataItem, _column: import('./types').Column, _e: MouseEvent, _disabled?: boolean, _selection?: DataItem[]) => 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;

package/lib/ele-pro-table/style/css-var.scss

@@ -10,3 +10,33 @@
     @include set-ele-var('tool-column', $var);
   }
 }
+
+/* 高级表格高度铺满 */
+@mixin flex-pro-table() {
+  & > .ele-pro-table {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+
+    & > .ele-pro-table-view {
+      flex: 1;
+      height: 100%;
+      overflow: hidden;
+    }
+  }
+}
+
+@mixin flex-auto-pro-table() {
+  & > .ele-pro-table {
+    flex: auto;
+    display: flex;
+    flex-direction: column;
+
+    & > .ele-pro-table-view {
+      flex: eleVar('pro-table', 'flex');
+      height: eleVar('pro-table', 'min-height');
+      overflow: hidden;
+    }
+  }
+}

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

@@ -8,7 +8,6 @@ require("element-plus/es/components/select/style/index");
 require("element-plus/es/components/option/style/index");
 require("element-plus/es/components/button/style/index");
 require("../../ele-tooltip/style/index");
-require("../../ele-dropdown/style/index");
 require("../../ele-tool/style/index");
 require("../../ele-toolbar/style/index");
 require("../../ele-loading/style/index");

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

@@ -99,7 +99,8 @@
   z-index: eleVar('pro-table', 'full-index');
 
   & > .ele-toolbar.is-plain {
-    padding: 0 16px;
+    padding-left: 16px;
+    padding-right: 16px;
   }
 
   /* 粘性表头顶部距离修改 */

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

@@ -71,6 +71,10 @@ export interface DatasourceParams {
   filter: Filter;
   /** 树表懒加载父级数据 */
   parent?: DataItem;
+  /** 表格的列配置 */
+  columns: Columns;
+  /** 表格的列配置(含未勾选的列) */
+  tableColumns?: Columns;
 }
 
 /**
@@ -263,8 +267,17 @@ export interface ResponseResult {
   data?: DataItem[];
   /** 总数量 */
   total?: number;
+  /** 原始请求结果 */
+  result: DatasourceResult;
 }
 
+/**
+ * 获取数据源返回结果方法
+ */
+export type GetDatasourceResultFunction = (
+  response: DatasourceResult
+) => ResponseResult;
+
 /**
  * 复合属性类型
  */
@@ -368,7 +381,7 @@ export interface BeforeExportParams {
   /** 导出的数据来源类型 */
   dataType: ExportDataType;
   /** 导出的列配置 */
-  columns?: Columns;
+  columns: Columns;
   /** 导出的表头数据封装 */
   headerData: ExportDataItem[][];
   /** 导出的主体数据封装 */
@@ -384,7 +397,7 @@ export interface BeforeExportParams {
   /** 关闭弹窗 */
   closeModal: () => void;
   /** 导出的列配置(含未勾选的列) */
-  tableColumns?: Columns;
+  tableColumns: Columns;
   /** 是否导出表头 */
   showHeader?: boolean;
   /** 是否导出表尾 */
@@ -479,6 +492,8 @@ export interface TableExportParams {
   data?: DataItem[];
   /** 打印的列 */
   columns?: Columns;
+  /** 打印的列配置(含未勾选的列) */
+  tableColumns?: Columns;
   /** 是否打印表头 */
   showHeader?: boolean;
   /** 是否打印表尾 */