ele-admin-plus 1.1.3 → 1.1.4-beta.1

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

@@ -1,27 +1,36 @@
-import { defineComponent, ref, computed, watch, onMounted, nextTick, resolveComponent, openBlock, createElementBlock, normalizeClass, normalizeStyle, createBlock, normalizeProps, mergeProps as mergeProps$1, withCtx, renderSlot, createCommentVNode, createSlots, renderList, guardReactiveProps } from "vue";
+import { defineComponent, ref, computed, watch, onMounted, onBeforeUnmount, nextTick, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps as mergeProps$1, renderSlot, createCommentVNode, createSlots, renderList, createElementBlock, normalizeStyle } from "vue";
 import { ElEmpty } from "element-plus";
 import { pick, eachTree } from "../utils/core";
 import { useLicense, useGlobalProps } from "../ele-config-provider/receiver";
 import ElePagination from "../ele-pagination/index";
+import EleLoading from "../ele-loading/index";
 import EleToolbar from "../ele-toolbar/index";
 import TableTools from "./components/table-tools";
 import TableView from "./components/table-view";
-import { useTableMethods, useTableEvents, getTablePage, getTableLimit, getTableSize, getPaginationProps, mergeProps, getInitCacheColumns, getRequestFilters, reloadData, getResponseName, isAutoAmend, getRequestName, getOrderItems, getValue, isDisableRow, selectionIsChange, sortData } from "./util";
+import { useTableMethods, useTableEvents, getDefaultFilter, getTablePage, getTableLimit, getTableSize, getPaginationProps, mergeProps, getInitCacheColumns, getRequestOrders, getRequestFilters, getResponseResult, reloadData, getResponseName, isAutoAmend, getTableState, isDisableRow, getTableFilter, selectionIsChange, getValue, sortData } from "./util";
 import { proTableProps, proTableEmits, tablePropKeys } from "./props";
 const _sfc_main = defineComponent({
   name: "EleProTable",
-  components: { ElEmpty, ElePagination, EleToolbar, TableTools, TableView },
+  components: {
+    ElEmpty,
+    ElePagination,
+    EleLoading,
+    EleToolbar,
+    TableTools,
+    TableView
+  },
   props: proTableProps,
   emits: proTableEmits,
   setup(props, { emit }) {
     const { authenticated } = useLicense();
     const globalProps = useGlobalProps("table");
-    const tableIns = useTableMethods(() => {
-      var _a;
-      return (_a = tableViewRef.value) == null ? void 0 : _a.tableRef;
-    });
+    const tableIns = useTableMethods(() => getTableRef());
     const tableEvents = useTableEvents(emit);
-    const current = { sorter: null, filter: null, where: {} };
+    const current = {
+      sorter: props.defaultSort ?? {},
+      filter: getDefaultFilter(props.columns),
+      where: props.where ?? {}
+    };
     const tableViewRef = ref(null);
     const tableData = ref([]);
     const tablePage = ref(
@@ -64,20 +73,19 @@ const _sfc_main = defineComponent({
         border: props.border ?? globalProps.value.border ?? false,
         size: tableSize.value,
         load: tableLoad,
+        emptyText: errorText.value || props.emptyText,
         columns: tableCols.value,
         pageIndex: tableIndex.value,
-        loading: tableLoading.value,
         headerEllipsis: props.headerEllipsis,
-        emptyText: errorText.value || props.emptyText
+        slotNormalize: props.slotNormalize
       };
       return Object.assign(pick(props, tablePropKeys), opt);
     });
-    const proTableStyle = computed(() => {
+    const tableZIndex = computed(() => {
       if (!tableMaximized.value) {
-        return {};
+        return;
       }
-      const zIndex = props.maximizedIndex ?? globalProps.value.maximizedIndex;
-      return { zIndex };
+      return props.maximizedIndex ?? globalProps.value.maximizedIndex;
     });
     const tableTools = computed(() => {
       const tools = props.tools ?? globalProps.value.tools ?? true;
@@ -92,6 +100,20 @@ const _sfc_main = defineComponent({
         globalProps.value.emptyProps
       );
     });
+    const rootProps = computed(() => {
+      const opt = {
+        ...props.loadingProps || {},
+        loading: tableLoading.value,
+        class: [
+          "ele-pro-table",
+          { "is-sticky": props.sticky },
+          { "is-maximized": tableMaximized.value },
+          { "hide-bottom-line": !props.bottomLine }
+        ],
+        style: { zIndex: tableZIndex.value }
+      };
+      return opt;
+    });
     const reload = (option, parent, resolve) => {
       if (!authenticated.value) {
         return;
@@ -114,17 +136,22 @@ const _sfc_main = defineComponent({
         }
       }
       errorText.value = "";
-      const sorter = current.sorter ?? getDefaultSorter();
+      const sorter = current.sorter;
       if (typeof props.datasource === "function") {
         if (!parent) {
           tableLoading.value = true;
         }
-        const filter = current.filter ?? getDefaultFilter();
+        const filter = current.filter;
+        const orders = getRequestOrders(
+          sorter,
+          props.request,
+          globalProps.value.request
+        );
         props.datasource({
           page: tablePage.value,
           limit: tableLimit.value,
-          where: { ...current.where },
-          orders: getRequestOrders(sorter),
+          where: Object.assign({}, current.where),
+          orders,
           filters: getRequestFilters(filter),
           sorter,
           filter,
@@ -132,7 +159,13 @@ const _sfc_main = defineComponent({
         }).then((response) => {
           const parseData = props.parseData ?? globalProps.value.parseData;
           const result = parseData ? parseData(response) : response;
-          const { data, total } = getResponseResult(result);
+          const { data, total } = getResponseResult(
+            result,
+            props.response,
+            globalProps.value.response,
+            props.lazy,
+            props.treeProps
+          );
           requestCallback(data, total, parent, result, resolve);
         }).catch((e) => {
           requestCallback(e == null ? void 0 : e.message);
@@ -141,7 +174,6 @@ const _sfc_main = defineComponent({
         return;
       }
       if (Array.isArray(props.datasource)) {
-        tableLoading.value = true;
         const { data, page, total } = reloadData(
           props.datasource,
           sorter,
@@ -151,7 +183,6 @@ const _sfc_main = defineComponent({
         tableData.value = data;
         tablePage.value = page;
         tableTotal.value = total;
-        tableLoading.value = false;
         onDone({ data, page, total, response: props.datasource });
       }
     };
@@ -195,68 +226,7 @@ const _sfc_main = defineComponent({
       };
       onDone(result, parent);
     };
-    const getRequestOrders = (sorter) => {
-      const orders = {};
-      const { sortName, orderName, ascValue, descValue } = getRequestName(
-        globalProps.value.request,
-        props.request
-      );
-      if (!sortName || !orderName) {
-        return orders;
-      }
-      const items = getOrderItems(sorter);
-      if (items.length === 1) {
-        orders[sortName] = items[0].field;
-        orders[orderName] = items[0].descend ? descValue : ascValue;
-      } else if (items.length) {
-        orders[sortName] = items.map((d) => [d.field, d.descend ? descValue : ascValue].join(" ")).join(",");
-      }
-      return orders;
-    };
-    const getResponseResult = (data) => {
-      if (!data || Array.isArray(data)) {
-        return { data: getResponseData(data) };
-      }
-      const { dataName, countName } = getResponseName(
-        globalProps.value.response,
-        props.response
-      );
-      if (!dataName) {
-        return {};
-      }
-      return {
-        data: getResponseData(getValue(data, dataName)),
-        total: (countName ? getValue(data, countName) : void 0) ?? 0
-      };
-    };
-    const getResponseData = (data) => {
-      var _a;
-      if (!data || !props.lazy) {
-        return data;
-      }
-      const name = ((_a = props.treeProps) == null ? void 0 : _a.hasChildren) ?? "hasChildren";
-      return data.map((d) => {
-        const temp = { ...d };
-        temp[name] = temp[name] ?? true;
-        return temp;
-      });
-    };
-    const getDefaultSorter = () => {
-      return props.defaultSort ?? {};
-    };
-    const getDefaultFilter = () => {
-      const filter = {};
-      eachTree(props.columns, (d) => {
-        if (typeof d.columnKey === "string" && d.columnKey.length && d.filteredValue) {
-          filter[d.columnKey] = d.filteredValue;
-        }
-      });
-      return filter;
-    };
     const onDone = (result, parent) => {
-      nextTick(() => {
-        tableIns.doLayout();
-      });
       emit("done", result, parent);
     };
     const tableLoad = (row, treeNode, resolve) => {
@@ -275,23 +245,21 @@ const _sfc_main = defineComponent({
     };
     const onSizeChange = (size) => {
       tableSize.value = size;
-      nextTick(() => {
-        tableIns.doLayout();
-      });
       emit("sizeChange", size);
     };
     const onColumnsChange = (columns) => {
-      tableCols.value = columns;
+      const { cols, sorter } = getTableState(columns, current);
+      tableCols.value = cols;
       nextTick(() => {
         tableIns.doLayout();
+        if (sorter) {
+          tableIns.sort(sorter.prop, sorter.order || "ascending");
+        }
       });
       emit("columnsChange", columns);
     };
     const onMaximizedChange = (maximized) => {
       tableMaximized.value = maximized;
-      nextTick(() => {
-        tableIns.doLayout();
-      });
       emit("maximizedChange", maximized);
     };
     const onPageSizeChange = (limit) => {
@@ -320,6 +288,10 @@ const _sfc_main = defineComponent({
       emit("selectionChange", selection);
     };
     const onSortChange = (sorter) => {
+      const temp = current.sorter;
+      if (temp && sorter.prop === temp.prop && sorter.order === temp.order) {
+        return;
+      }
       if (props.loadOnChanged) {
         current.sorter = sorter;
         reload();
@@ -328,17 +300,21 @@ const _sfc_main = defineComponent({
     };
     const onFilterChange = (filter) => {
       if (props.loadOnChanged) {
-        current.filter = filter;
+        const temp = getTableFilter(getTableRef()) ?? filter;
+        current.filter = temp;
         reload();
       }
       emit("filterChange", filter);
     };
     const onCurrentChange = (currentRow, oldCurrentRow) => {
       if (props.current !== currentRow) {
-        emit("update:current", currentRow);
+        updateCurrent(currentRow);
       }
       emit("currentChange", currentRow, oldCurrentRow);
     };
+    const updateCurrent = (currentRow) => {
+      emit("update:current", currentRow);
+    };
     const updateSelections = (selection) => {
       emit("update:selections", selection);
     };
@@ -351,6 +327,10 @@ const _sfc_main = defineComponent({
         });
       });
     };
+    const getTableRef = () => {
+      var _a;
+      return (_a = tableViewRef.value) == null ? void 0 : _a.tableRef;
+    };
     const getData = () => {
       return tableData.value;
     };
@@ -394,8 +374,7 @@ const _sfc_main = defineComponent({
       if (!props.rowKey || !paginationProps.value || tableLimit.value == null || !Array.isArray(props.datasource)) {
         return;
       }
-      const sorter = current.sorter ?? getDefaultSorter();
-      const data = sortData(props.datasource, sorter);
+      const data = sortData(props.datasource, current.sorter);
       const index2 = data.findIndex((d) => getValue(d, props.rowKey) === key);
       const page = Math.floor(index2 / tableLimit.value) + 1;
       if (tablePage.value !== page) {
@@ -403,13 +382,17 @@ const _sfc_main = defineComponent({
       }
     };
     const fetch = (callback) => {
-      const sorter = current.sorter ?? getDefaultSorter();
-      const filter = current.filter ?? getDefaultFilter();
+      const { sorter, filter } = current;
+      const orders = getRequestOrders(
+        sorter,
+        props.request,
+        globalProps.value.request
+      );
       callback({
         page: tablePage.value,
         limit: tableLimit.value,
-        where: { ...current.where },
-        orders: getRequestOrders(sorter),
+        where: Object.assign({}, current.where),
+        orders,
         filters: getRequestFilters(filter),
         sorter,
         filter
@@ -465,9 +448,13 @@ const _sfc_main = defineComponent({
     );
     onMounted(() => {
       if (props.loadOnCreated) {
-        reload({ where: props.where });
+        reload();
       }
     });
+    onBeforeUnmount(() => {
+      updateSelections([]);
+      updateCurrent(null);
+    });
     return {
       ...tableIns,
       tableEvents,
@@ -482,9 +469,10 @@ const _sfc_main = defineComponent({
       tableIndex,
       paginationProps,
       tableProps,
-      proTableStyle,
+      tableZIndex,
       tableTools,
       tableEmptyProps,
+      rootProps,
       tableLoad,
       onRefresh,
       onSizeChange,
@@ -499,6 +487,7 @@ const _sfc_main = defineComponent({
       onCurrentChange,
       reload,
       reloadTable,
+      getTableRef,
       getData,
       setData,
       setSelectedRows,
@@ -522,111 +511,108 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElEmpty = resolveComponent("ElEmpty");
   const _component_TableView = resolveComponent("TableView");
   const _component_ElePagination = resolveComponent("ElePagination");
-  return openBlock(), createElementBlock("div", {
-    class: normalizeClass([
-      "ele-pro-table",
-      { "is-sticky": _ctx.sticky },
-      { "is-maximized": _ctx.tableMaximized }
-    ]),
-    style: normalizeStyle(_ctx.proTableStyle)
-  }, [
-    _ctx.toolbar ? (openBlock(), createBlock(_component_EleToolbar, normalizeProps(mergeProps$1({ key: 0 }, _ctx.toolbar === true ? {} : _ctx.toolbar)), {
-      tools: withCtx(() => [
-        renderSlot(_ctx.$slots, "tools"),
-        _ctx.tableTools && _ctx.tableTools.length ? (openBlock(), createBlock(_component_TableTools, {
-          key: 0,
-          size: _ctx.tableSize,
-          columns: _ctx.columns,
-          tools: _ctx.tableTools,
-          columnSortable: _ctx.columnSortable,
-          columnFixed: _ctx.columnFixed,
-          maximized: _ctx.tableMaximized,
-          cacheKey: _ctx.cacheKey,
-          locale: _ctx.locale,
-          onReload: _ctx.onRefresh,
-          "onUpdate:size": _ctx.onSizeChange,
-          "onUpdate:columns": _ctx.onColumnsChange,
-          "onUpdate:maximized": _ctx.onMaximizedChange
-        }, null, 8, ["size", "columns", "tools", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "onReload", "onUpdate:size", "onUpdate:columns", "onUpdate:maximized"])) : createCommentVNode("", true)
-      ]),
-      default: withCtx(() => [
-        renderSlot(_ctx.$slots, "toolbar")
-      ]),
-      _: 3
-    }, 16)) : createCommentVNode("", true),
-    renderSlot(_ctx.$slots, "default"),
-    !_ctx.destroyed ? (openBlock(), createBlock(_component_TableView, mergeProps$1({ key: 1 }, _ctx.tableProps, {
-      ref: "tableViewRef",
-      style: _ctx.tableStyle,
-      onSelect: _ctx.tableEvents.onSelect,
-      onSelectAll: _ctx.tableEvents.onSelectAll,
-      onCellMouseEnter: _ctx.tableEvents.onCellMouseEnter,
-      onCellMouseLeave: _ctx.tableEvents.onCellMouseLeave,
-      onCellClick: _ctx.tableEvents.onCellClick,
-      onCellDblclick: _ctx.tableEvents.onCellDblclick,
-      onCellContextmenu: _ctx.tableEvents.onCellContextmenu,
-      onRowContextmenu: _ctx.tableEvents.onRowContextmenu,
-      onRowDblclick: _ctx.tableEvents.onRowDblclick,
-      onHeaderClick: _ctx.tableEvents.onHeaderClick,
-      onHeaderContextmenu: _ctx.tableEvents.onHeaderContextmenu,
-      onHeaderDragend: _ctx.tableEvents.onHeaderDragend,
-      onExpandChange: _ctx.tableEvents.onExpandChange,
-      onRowClick: _ctx.onRowClick,
-      onSelectionChange: _ctx.onSelectionChange,
-      onSortChange: _ctx.onSortChange,
-      onFilterChange: _ctx.onFilterChange,
-      onCurrentChange: _ctx.onCurrentChange
-    }), createSlots({ _: 2 }, [
-      renderList(Object.keys(_ctx.$slots).filter(
-        (k) => "default" !== k && "empty" !== k
-      ), (name) => {
-        return {
-          name,
-          fn: withCtx((slotProps) => [
-            renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-          ])
-        };
-      }),
-      _ctx.tableEmptyProps || _ctx.$slots.empty ? {
-        name: "empty",
-        fn: withCtx(() => [
-          renderSlot(_ctx.$slots, "empty", {
-            text: _ctx.emptyText,
-            error: _ctx.errorText
-          }, () => [
-            _ctx.tableEmptyProps ? (openBlock(), createBlock(_component_ElEmpty, mergeProps$1({
-              key: 0,
-              imageSize: 68
-            }, _ctx.tableEmptyProps === true ? {} : _ctx.emptyProps, {
-              class: "ele-table-empty",
-              description: _ctx.errorText || _ctx.emptyText
-            }), null, 16, ["description"])) : createCommentVNode("", true)
-          ])
+  const _component_EleLoading = resolveComponent("EleLoading");
+  return openBlock(), createBlock(_component_EleLoading, normalizeProps(guardReactiveProps(_ctx.rootProps)), {
+    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.tableTools && _ctx.tableTools.length ? (openBlock(), createBlock(_component_TableTools, {
+            key: 0,
+            size: _ctx.tableSize,
+            columns: _ctx.columns,
+            tools: _ctx.tableTools,
+            columnSortable: _ctx.columnSortable,
+            columnFixed: _ctx.columnFixed,
+            maximized: _ctx.tableMaximized,
+            cacheKey: _ctx.cacheKey,
+            locale: _ctx.locale,
+            onReload: _ctx.onRefresh,
+            "onUpdate:size": _ctx.onSizeChange,
+            "onUpdate:columns": _ctx.onColumnsChange,
+            "onUpdate:maximized": _ctx.onMaximizedChange
+          }, null, 8, ["size", "columns", "tools", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "onReload", "onUpdate:size", "onUpdate:columns", "onUpdate:maximized"])) : createCommentVNode("", true)
         ]),
-        key: "0"
-      } : void 0
-    ]), 1040, ["style", "onSelect", "onSelectAll", "onCellMouseEnter", "onCellMouseLeave", "onCellClick", "onCellDblclick", "onCellContextmenu", "onRowContextmenu", "onRowDblclick", "onHeaderClick", "onHeaderContextmenu", "onHeaderDragend", "onExpandChange", "onRowClick", "onSelectionChange", "onSortChange", "onFilterChange", "onCurrentChange"])) : createCommentVNode("", true),
-    _ctx.paginationProps || _ctx.$slots.footer ? (openBlock(), createElementBlock("div", {
-      key: 2,
-      class: "ele-pro-table-footer",
-      style: normalizeStyle(_ctx.footerStyle)
-    }, [
-      renderSlot(_ctx.$slots, "footer"),
-      _ctx.paginationProps && _ctx.paginationProps.total ? (openBlock(), createBlock(_component_ElePagination, mergeProps$1({ key: 0 }, _ctx.paginationProps, {
-        "onUpdate:currentPage": _ctx.onPageCurrentChange,
-        "onUpdate:pageSize": _ctx.onPageSizeChange
+        default: withCtx(() => [
+          renderSlot(_ctx.$slots, "toolbar")
+        ]),
+        _: 3
+      }, 16)) : createCommentVNode("", true),
+      renderSlot(_ctx.$slots, "default"),
+      !_ctx.destroyed ? (openBlock(), createBlock(_component_TableView, mergeProps$1({ key: 1 }, _ctx.tableProps, {
+        ref: "tableViewRef",
+        style: _ctx.tableStyle,
+        onSelect: _ctx.tableEvents.onSelect,
+        onSelectAll: _ctx.tableEvents.onSelectAll,
+        onCellMouseEnter: _ctx.tableEvents.onCellMouseEnter,
+        onCellMouseLeave: _ctx.tableEvents.onCellMouseLeave,
+        onCellClick: _ctx.tableEvents.onCellClick,
+        onCellDblclick: _ctx.tableEvents.onCellDblclick,
+        onCellContextmenu: _ctx.tableEvents.onCellContextmenu,
+        onRowContextmenu: _ctx.tableEvents.onRowContextmenu,
+        onRowDblclick: _ctx.tableEvents.onRowDblclick,
+        onHeaderClick: _ctx.tableEvents.onHeaderClick,
+        onHeaderContextmenu: _ctx.tableEvents.onHeaderContextmenu,
+        onHeaderDragend: _ctx.tableEvents.onHeaderDragend,
+        onExpandChange: _ctx.tableEvents.onExpandChange,
+        onRowClick: _ctx.onRowClick,
+        onSelectionChange: _ctx.onSelectionChange,
+        onSortChange: _ctx.onSortChange,
+        onFilterChange: _ctx.onFilterChange,
+        onCurrentChange: _ctx.onCurrentChange
       }), createSlots({ _: 2 }, [
-        renderList(Object.keys(_ctx.$slots).filter((k) => "default" !== k), (name) => {
+        renderList(Object.keys(_ctx.$slots).filter(
+          (k) => "default" !== k && "empty" !== k
+        ), (name) => {
           return {
             name,
             fn: withCtx((slotProps) => [
               renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
             ])
           };
-        })
-      ]), 1040, ["onUpdate:currentPage", "onUpdate:pageSize"])) : createCommentVNode("", true)
-    ], 4)) : createCommentVNode("", true)
-  ], 6);
+        }),
+        _ctx.tableEmptyProps || _ctx.$slots.empty ? {
+          name: "empty",
+          fn: withCtx(() => [
+            renderSlot(_ctx.$slots, "empty", {
+              text: _ctx.emptyText,
+              error: _ctx.errorText
+            }, () => [
+              _ctx.tableEmptyProps ? (openBlock(), createBlock(_component_ElEmpty, mergeProps$1({
+                key: 0,
+                imageSize: 68
+              }, _ctx.tableEmptyProps === true ? {} : _ctx.emptyProps, {
+                class: "ele-table-empty",
+                description: _ctx.errorText || _ctx.emptyText
+              }), null, 16, ["description"])) : createCommentVNode("", true)
+            ])
+          ]),
+          key: "0"
+        } : void 0
+      ]), 1040, ["style", "onSelect", "onSelectAll", "onCellMouseEnter", "onCellMouseLeave", "onCellClick", "onCellDblclick", "onCellContextmenu", "onRowContextmenu", "onRowDblclick", "onHeaderClick", "onHeaderContextmenu", "onHeaderDragend", "onExpandChange", "onRowClick", "onSelectionChange", "onSortChange", "onFilterChange", "onCurrentChange"])) : createCommentVNode("", true),
+      _ctx.paginationProps || _ctx.$slots.footer ? (openBlock(), createElementBlock("div", {
+        key: 2,
+        class: "ele-pro-table-footer",
+        style: normalizeStyle(_ctx.footerStyle)
+      }, [
+        renderSlot(_ctx.$slots, "footer"),
+        _ctx.paginationProps && _ctx.paginationProps.total ? (openBlock(), createBlock(_component_ElePagination, mergeProps$1({ key: 0 }, _ctx.paginationProps, {
+          "onUpdate:currentPage": _ctx.onPageCurrentChange,
+          "onUpdate:pageSize": _ctx.onPageSizeChange
+        }), createSlots({ _: 2 }, [
+          renderList(Object.keys(_ctx.$slots).filter((k) => "default" !== k), (name) => {
+            return {
+              name,
+              fn: withCtx((slotProps) => [
+                renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+              ])
+            };
+          })
+        ]), 1040, ["onUpdate:currentPage", "onUpdate:pageSize"])) : createCommentVNode("", true)
+      ], 4)) : createCommentVNode("", true)
+    ]),
+    _: 3
+  }, 16);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {

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

@@ -1,11 +1,12 @@
 import type { PropType, ExtractPropTypes } from 'vue';
-import type { StyleValue, ElEmptyProps } from '../ele-app/types';
+import type { ElEmptyProps } from '../ele-app/types';
+import type { LoadingProps } from '../ele-loading/props';
 import type { Column, Columns, DataItem, Where, Datasource, RequestOption, ResponseOption, ParseData, Sorter, Filter, DoneParams, TablePagination, TableToolbar, TableTool, TableSize, RowClickChecked, TableLocale } from './types';
 declare const tableProps: Omit<{
     data: {
         type: PropType<any[]>;
         default: () => never[];
-    }; /** 表格数据请求完成事件 */
+    };
     size: {
         readonly type: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
@@ -21,7 +22,7 @@ declare const tableProps: Omit<{
     };
     stripe: BooleanConstructor;
     border: BooleanConstructor;
-    rowKey: PropType<string | ((row: any) => string) | undefined>;
+    rowKey: PropType<string | ((row: any) => string) | undefined>; /** 表格最大化切换事件 */
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -101,12 +102,15 @@ export declare const tableViewProps: {
         type: PropType<Columns>;
         required: boolean;
     };
-    loading: BooleanConstructor;
     pageIndex: NumberConstructor;
     headerEllipsis: {
         type: BooleanConstructor;
         default: boolean;
     };
+    slotNormalize: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     size: {
         readonly type: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
@@ -206,6 +210,7 @@ export declare const proTableProps: {
         type: BooleanConstructor;
         default: null;
     };
+    loading: BooleanConstructor;
     datasource: {
         type: PropType<Datasource>;
         required: boolean;
@@ -243,8 +248,8 @@ export declare const proTableProps: {
     maximizedIndex: NumberConstructor;
     maximizedHeight: (StringConstructor | NumberConstructor)[];
     rowClickChecked: PropType<RowClickChecked>;
-    tableStyle: PropType<StyleValue>;
-    footerStyle: PropType<StyleValue>;
+    tableStyle: PropType<Partial<import("vue").CSSProperties>>;
+    footerStyle: PropType<Partial<import("vue").CSSProperties>>;
     pagination: {
         type: PropType<boolean | TablePagination>;
         default: () => null;
@@ -254,18 +259,13 @@ export declare const proTableProps: {
         default: () => null;
     };
     sticky: BooleanConstructor;
-    cacheKey: StringConstructor;
-    locale: PropType<Partial<TableLocale>>;
-    columns: {
-        type: PropType<Columns>;
-        required: boolean;
-    };
-    loading: BooleanConstructor;
-    pageIndex: NumberConstructor;
-    headerEllipsis: {
+    loadingProps: PropType<Partial<LoadingProps>>;
+    bottomLine: {
         type: BooleanConstructor;
         default: boolean;
     };
+    cacheKey: StringConstructor;
+    locale: PropType<Partial<TableLocale>>;
     size: {
         readonly type: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
@@ -350,6 +350,18 @@ export declare const proTableProps: {
         default: boolean;
     };
     flexible: BooleanConstructor;
+    columns: {
+        type: PropType<Columns>;
+        required: boolean;
+    };
+    headerEllipsis: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    slotNormalize: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 };
 export type ProTableProps = ExtractPropTypes<typeof proTableProps>;
 export type TableViewProps = ExtractPropTypes<typeof tableViewProps>;