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

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

@@ -11,7 +11,7 @@ import EleToolbar from "../ele-toolbar/index";
 import TableTools from "./components/table-tools";
 import ToolExport from "./components/tool-export";
 import ToolPrint from "./components/tool-print";
-import { getDefaultFilter, getTablePage, getTableLimit, getTableSize, getRowKey, getPaginationProps, mergeProps, cacheColWidth, getInitCacheColumns, reloadData, getRequestOrders, getRequestFilters, getRequestPages, getResponseResult, getResponseName, isAutoAmend, sortData } from "./util";
+import { getDefaultFilter, getTablePage, getTableLimit, getTableSize, getRowKey, getPaginationProps, mergeProps, cacheColWidth, getInitCacheColumns, getResponseResult, reloadData, getResponseName, isAutoAmend, sortData, getRequestOrders, getRequestFilters, getRequestPages } from "./util";
 import { proTableEmits, proTableProps } from "./props";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "EleProTable" },
@@ -72,7 +72,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const tableSize = ref(
       getTableSize(props.cacheKey, props.size, globalProps.value.size)
     );
-    const tableMaximized = ref(false);
+    const tableMaximized = ref(props.maximized);
     const errorText = ref("");
     const cacheData = ref();
     const tableRowKey = shallowRef(getRowKey(props.rowKey));
@@ -141,10 +141,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return tools || [];
     });
     const tableToolbarProps = computed(() => {
-      return mergeProps(
+      const result = mergeProps(
         props.toolbar,
         globalProps.value.toolbar
       );
+      return result === true ? {} : result;
     });
     const toolExportConfig = computed(() => {
       const globalExportConfig = globalProps.value.exportConfig || {};
@@ -178,6 +179,42 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       };
     });
+    const getRequestParams = (parent) => {
+      const { sorter, filter } = tableState;
+      const orders = getRequestOrders(
+        sorter,
+        props.request,
+        globalProps.value.request
+      );
+      return {
+        page: tablePage.value,
+        limit: tableLimit.value,
+        pages: getRequestPages(
+          tablePage.value,
+          tableLimit.value,
+          props.request,
+          globalProps.value.request
+        ),
+        where: Object.assign({}, tableState.where),
+        orders,
+        filters: getRequestFilters(filter),
+        sorter,
+        filter,
+        parent,
+        columns: tableCols.value
+      };
+    };
+    const getDatasourceResult = (response) => {
+      const parseData = props.parseData ?? globalProps.value.parseData;
+      const result = parseData ? parseData(response) : response;
+      return getResponseResult(
+        result,
+        props.response,
+        globalProps.value.response,
+        props.lazy,
+        props.treeProps
+      );
+    };
     const reload = (option, parent, resolve) => {
       if (option) {
         if (option.page) {
@@ -217,46 +254,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!parent) {
         tableLoading.value = true;
       }
-      const filter = tableState.filter;
-      const orders = getRequestOrders(
-        sorter,
-        props.request,
-        globalProps.value.request
-      );
-      props.datasource({
-        page: tablePage.value,
-        limit: tableLimit.value,
-        pages: getRequestPages(
-          tablePage.value,
-          tableLimit.value,
-          props.request,
-          globalProps.value.request
-        ),
-        where: Object.assign({}, tableState.where),
-        orders,
-        filters: getRequestFilters(filter),
-        sorter,
-        filter,
-        parent
-      }).then((response) => {
+      const params = getRequestParams(parent);
+      props.datasource(params).then((response) => {
         if (tableState.reloadId !== tempId) {
           return;
         }
-        const parseData = props.parseData ?? globalProps.value.parseData;
-        const result = parseData ? parseData(response) : response;
-        const { data, total } = getResponseResult(
-          result,
-          props.response,
-          globalProps.value.response,
-          props.lazy,
-          props.treeProps
-        );
+        const { data, total, result } = getDatasourceResult(response);
         requestCallback(data, total, parent, result, resolve);
       }).catch((e) => {
         if (tableState.reloadId !== tempId) {
           return;
         }
-        const errorMsg = e == null ? void 0 : e.message;
+        const errorMsg = e?.message;
         requestCallback(
           errorMsg == null ? errorMsg : String(errorMsg),
           void 0,
@@ -268,11 +277,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     };
     const requestCallback = (data, total, parent, response, resolve) => {
-      var _a, _b;
       if (data == null || !Array.isArray(data)) {
         if (resolve) {
           if (parent != null) {
-            parent[((_a = props.treeProps) == null ? void 0 : _a.children) || "children"] = [];
+            parent[props.treeProps?.children || "children"] = [];
           }
           resolve([]);
         } else {
@@ -294,7 +302,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       if (resolve) {
         if (parent != null) {
-          parent[((_b = props.treeProps) == null ? void 0 : _b.children) || "children"] = data;
+          parent[props.treeProps?.children || "children"] = data;
         }
         resolve(data);
       } else {
@@ -336,6 +344,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             getRowKeys(props.selections, tableRowKey.value)
           );
         }
+        if (getTableRef()) {
+          methods.setScrollTop(0);
+        }
       });
       emit("done", result, parent);
     };
@@ -356,6 +367,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const handleMaximizedChange = (maximized) => {
       tableMaximized.value = maximized;
+      if (props.maximized !== maximized) {
+        emit("update:maximized", maximized);
+      }
       emit("maximizedChange", maximized);
     };
     const handlePageSizeChange = (limit) => {
@@ -440,27 +454,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     };
     const fetch = (callback) => {
-      const { sorter, filter } = tableState;
-      const orders = getRequestOrders(
-        sorter,
-        props.request,
-        globalProps.value.request
-      );
-      callback({
-        page: tablePage.value,
-        limit: tableLimit.value,
-        pages: getRequestPages(
-          tablePage.value,
-          tableLimit.value,
-          props.request,
-          globalProps.value.request
-        ),
-        where: Object.assign({}, tableState.where),
-        orders,
-        filters: getRequestFilters(filter),
-        sorter,
-        filter
-      });
+      callback(getRequestParams());
     };
     const openPrintModal = () => {
       if (toolPrintRef.value) {
@@ -541,12 +535,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       },
       { deep: true }
     );
+    watch(
+      () => props.maximized,
+      (maximized) => {
+        if (tableMaximized.value !== maximized) {
+          handleMaximizedChange(maximized);
+        }
+      }
+    );
     onMounted(() => {
-      var _a;
       if (props.current != null) {
         methods.setCurrentRowKey(getValue(props.current, tableRowKey.value));
       }
-      if ((_a = props.selections) == null ? void 0 : _a.length) {
+      if (props.selections?.length) {
         methods.setSelectedRowKeys(
           getRowKeys(props.selections, tableRowKey.value)
         );
@@ -558,34 +559,37 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     __expose({
       ...methods,
       tableViewRef,
-      tableData,
-      tableLoading,
-      tableProps,
       reload,
-      reloadTable,
-      getTableRef,
       getData,
       setData,
-      goPageByRowKey,
       fetch,
       openPrintModal,
       printData,
       openExportModal,
-      exportData
+      exportData,
+      getTableRef,
+      // 兼容旧版导出
+      tableData,
+      tableLoading,
+      tableProps,
+      reloadTable,
+      goPageByRowKey
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(EleLoading, mergeProps$1(props.loadingProps || {}, {
         loading: tableLoading.value,
-        class: [
-          "ele-pro-table",
+        class: ["ele-pro-table", [
           { "is-maximized": tableMaximized.value },
-          { "is-border": tableProps.value.border }
-        ],
+          { "is-border": tableProps.value.border },
+          {
+            "is-default-toolbar": tableToolbarProps.value && tableToolbarProps.value.theme === "default"
+          }
+        ]],
         style: tableMaximized.value ? { zIndex: _ctx.maximizedIndex ?? unref(globalProps).maximizedIndex } : void 0
       }), {
         default: withCtx(() => [
           renderSlot(_ctx.$slots, "topExtra"),
-          tableToolbarProps.value ? (openBlock(), createBlock(EleToolbar, normalizeProps(mergeProps$1({ key: 0 }, tableToolbarProps.value === true ? {} : tableToolbarProps.value)), {
+          tableToolbarProps.value ? (openBlock(), createBlock(EleToolbar, normalizeProps(mergeProps$1({ key: 0 }, tableToolbarProps.value)), {
             tools: withCtx(() => [
               renderSlot(_ctx.$slots, "tools"),
               toolNames.value && toolNames.value.length ? (openBlock(), createBlock(TableTools, {
@@ -698,7 +702,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             defaultShowFooter: toolExportConfig.value.showFooter,
             defaultShowTreeIndex: toolExportConfig.value.showTreeIndex,
             beforeExport: toolExportConfig.value.beforeExport,
-            exportPlugin: toolExportConfig.value.exportPlugin
+            exportPlugin: toolExportConfig.value.exportPlugin,
+            getDatasourceResult
           }, null, 8, ["locale", "cacheKey", "modalProps", "columns", "selections", "pageData", "datasource", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "pageIndex", "treeProps", "defaultFileName", "defaultDataType", "defaultShowFooter", "defaultShowTreeIndex", "beforeExport", "exportPlugin"]),
           createVNode(ToolPrint, {
             ref_key: "toolPrintRef",
@@ -729,7 +734,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             defaultShowFooter: toolPrintConfig.value.showFooter,
             defaultShowTreeIndex: toolPrintConfig.value.showTreeIndex,
             beforePrint: toolPrintConfig.value.beforePrint,
-            printPlugin: toolPrintConfig.value.printPlugin
+            printPlugin: toolPrintConfig.value.printPlugin,
+            getDatasourceResult
           }, createSlots({ _: 2 }, [
             renderList(Object.keys(_ctx.$slots).filter(
               (k) => !toolsSlotExcludes.includes(k)

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

@@ -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/es/ele-pro-table/props.js

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

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

@@ -7,7 +7,6 @@ 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";
 import "../../ele-toolbar/style/index";
 import "../../ele-loading/style/index";

package/es/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/es/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;
   /** 是否打印表尾 */

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

@@ -85,13 +85,13 @@ export declare function getRequestFilters(filter?: Filter): Filters;
 export declare function getRequestPages(page: number, limit: number, request?: RequestOption, globalRequest?: RequestOption): Pages;
 /**
  * 获取数据源请求结果
- * @param data 数据源请求的原始数据
+ * @param result 数据源请求的原始数据
  * @param response 响应参数配置
  * @param globalResponse 全局响应参数配置
  * @param lazy 表格是否开启懒加载
  * @param treeOpt 树形表格字段名配置
  */
-export declare function getResponseResult(data: DatasourceResult, response?: ResponseOption, globalResponse?: ResponseOption, lazy?: boolean, treeOpt?: TreeProps): ResponseResult;
+export declare function getResponseResult(result: DatasourceResult, response?: ResponseOption, globalResponse?: ResponseOption, lazy?: boolean, treeOpt?: TreeProps): ResponseResult;
 /**
  * 树形懒加载时数据增加可展开的字段标识
  * @param data 请求数据