yuang-framework-ui-pc 1.1.3 → 1.1.5

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

@@ -531,17 +531,8 @@ const _sfc_main = defineComponent({
       hideTabs.value = !!meta.hideTabs;
       const navigationIsChanged = updateNavigation();
       const sideNavigationIsChanged = updateSideNavigation();
-      const { active, title, matched, activeOther } = getRouteMatched(
-        route,
-        menuData.value
-      );
-      levelData.value = getMatchedLevels(
-        matched,
-        activeOther,
-        route,
-        menuData.value,
-        tabData.value
-      );
+      const { active, title, matched, activeOther } = getRouteMatched(route, menuData.value);
+      levelData.value = getMatchedLevels(matched, activeOther, route, menuData.value, tabData.value);
       const t = getRouteTab(route, tabData.value, homeMenuPath.value, title);
       isHome.value = t.home;
       tabActive.value = t.key;
@@ -789,20 +780,11 @@ const _sfc_main = defineComponent({
         handleResize();
       });
     });
-    watch(
-      [
-        routeLayout,
-        routeSideType,
-        routeTabBar,
-        routeMaximized,
-        () => props.fluid
-      ],
-      () => {
-        nextTick(() => {
-          handleResize();
-        });
-      }
-    );
+    watch([routeLayout, routeSideType, routeTabBar, routeMaximized, () => props.fluid], () => {
+      nextTick(() => {
+        handleResize();
+      });
+    });
     onMounted(() => {
       handleResize();
     });
@@ -1013,19 +995,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ]),
       key: "5"
     } : void 0,
-    renderList(Object.keys(_ctx.$slots).filter(
-      (k) => ![
-        "default",
-        "logo",
-        "logoTitle",
-        "breadcrumb",
-        "left",
-        "center",
-        "right",
-        "footer",
-        "body"
-      ].includes(k)
-    ), (name) => {
+    renderList(Object.keys(_ctx.$slots).filter((k) => !["default", "logo", "logoTitle", "breadcrumb", "left", "center", "right", "footer", "body"].includes(k)), (name) => {
       return {
         name,
         fn: withCtx((slotProps) => [

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

@@ -14,7 +14,7 @@ declare const _default: import('vue').DefineComponent<{
         type: import('vue').PropType<import('./types').Datasource>;
         required: boolean;
     };
-    where: import('vue').PropType<import('./types').Where>;
+    queryParam: import('vue').PropType<import('./types').QueryParam>;
     request: import('vue').PropType<import('./types').RequestOption>;
     response: import('vue').PropType<import('./types').ResponseOption>;
     parseData: import('vue').PropType<import('./types').ParseData>;
@@ -188,7 +188,7 @@ declare const _default: import('vue').DefineComponent<{
     handleSizeChange: (size: TableSize) => void;
     handleColumnsChange: (columns: Columns, tableColumns: Columns, isReset: boolean) => void;
     handleMaximizedChange: (maximized: boolean) => void;
-    handlePageSizeChange: (limit: number) => void;
+    handlePageSizeChange: (pageSize: number) => void;
     handlePageCurrentChange: (page: number) => void;
     reload: ReloadFunction;
     reloadTable: () => void;
@@ -211,13 +211,13 @@ declare const _default: import('vue').DefineComponent<{
     clearFilter: (columnKeys?: string[]) => void;
     doLayout: () => void;
     sort: (prop: string, order: string) => void;
-    scrollTo: (options: number | ScrollToOptions, yCoord?: number) => void;
+    scrollTo: (options: number | ScrollToOptions, yCoord? /** 表格当前的排序筛选搜索参数 */: number) => void;
     setScrollTop: (top?: number) => void;
     setScrollLeft: (left?: number) => void;
     setCurrentRowKey: (key?: import('../ele-data-table/types').DataKey | null) => void;
     getCurrentRow: () => DataItem | undefined;
     setSelectedRows: (rows?: DataItem[]) => void;
-    setSelectedRowKeys: (keys?: import('../ele-data-table/types').DataKey[], rows?: DataItem[]) => void;
+    setSelectedRowKeys: (keys?: import('../ele-data-table/types').DataKey[], rows? /** 当前页数据 */: DataItem[]) => void;
     toggleRowExpansionAll: (expanded?: boolean) => void;
     updateSelectedAndChecked: () => void;
     toolsSlotExcludes: string[];
@@ -261,7 +261,7 @@ declare const _default: import('vue').DefineComponent<{
         type: import('vue').PropType<import('./types').Datasource>;
         required: boolean;
     };
-    where: import('vue').PropType<import('./types').Where>;
+    queryParam: import('vue').PropType<import('./types').QueryParam>;
     request: import('vue').PropType<import('./types').RequestOption>;
     response: import('vue').PropType<import('./types').ResponseOption>;
     parseData: import('vue').PropType<import('./types').ParseData>;
@@ -415,6 +415,7 @@ declare const _default: import('vue').DefineComponent<{
 }>> & {
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
+    onFilterChange?: ((_filter: Filter) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
     onCellMouseEnter?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
@@ -428,7 +429,6 @@ declare const _default: import('vue').DefineComponent<{
     onHeaderClick?: ((_column: Column, _e: MouseEvent) => any) | undefined;
     onHeaderContextmenu?: ((_column: Column, _e: MouseEvent) => any) | undefined;
     onSortChange?: ((_sorter: Sorter) => any) | undefined;
-    onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: Column, _e: MouseEvent) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: import('../ele-data-table/types').DataKey | undefined) => any) | undefined;
@@ -459,6 +459,7 @@ declare const _default: import('vue').DefineComponent<{
     flexible: boolean;
     sticky: boolean;
     toolbar: boolean | EleToolbarProps;
+    tools: boolean | string[];
     headerEllipsis: boolean;
     slotNormalize: boolean;
     bottomLine: boolean;
@@ -466,7 +467,6 @@ declare const _default: import('vue').DefineComponent<{
     reserveCurrent: boolean;
     loadOnCreated: boolean;
     loadOnChanged: boolean;
-    tools: boolean | string[];
     columnSortable: boolean;
     columnFixed: boolean;
     pagination: boolean | import('./types').TablePagination;

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, shallowRef, computed, watch, onMounted, nextTick, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps as mergeProps$1, renderSlot, createSlots, renderList, createCommentVNode, createElementBlock, normalizeStyle } from "vue";
+import { defineComponent, ref, shallowRef, computed, watch, onMounted, nextTick, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps as mergeProps$1, createSlots, renderSlot, createCommentVNode, renderList, createElementBlock, normalizeStyle } from "vue";
 import { pick, getValue } from "../utils/core";
 import { useGlobalProps } from "../ele-config-provider/receiver";
 import EleLoading from "../ele-loading/index";
@@ -9,7 +9,7 @@ import EleDataTable from "../ele-data-table/index";
 import EleVirtualTable from "../ele-virtual-table/index";
 import EleToolbar from "../ele-toolbar/index";
 import TableTools from "./components/table-tools";
-import { getDefaultFilter, getTablePage, getTableLimit, getTableSize, getRowKey, getPaginationProps, mergeProps, cacheColWidth, getInitCacheColumns, reloadData, getRequestOrders, getRequestPages, getRequestFilters, getResponseResult, getResponseName, isAutoAmend, sortData } from "./util";
+import { getDefaultFilter, getTablePage, getTableLimit, getTableSize, getRowKey, getPaginationProps, mergeProps, cacheColWidth, getInitCacheColumns, reloadData, getRequestOrderParamList, getRequestPageParam, getRequestFilters, getResponseResult, getResponseName, isAutoAmend, sortData } from "./util";
 import { proTableProps, proTableEmits } from "./props";
 const ownSlots = ["default", "toolbar", "tools", "footer"];
 const toolsSlotExcludes = [...ownSlots, "empty", "append"];
@@ -34,23 +34,17 @@ const _sfc_main = defineComponent({
     const tableState = {
       sorter: props.defaultSort ?? {},
       filter: getDefaultFilter(props.columns),
-      where: props.where ?? {}
+      queryParam: props.queryParam ?? {}
     };
     const tableToolsRef = ref(null);
     const tableViewRef = ref(null);
     const tableData = ref([]);
-    const tablePage = ref(
-      getTablePage(props.pagination, globalProps.value.pagination)
-    );
-    const tableLimit = ref(
-      getTableLimit(props.pagination, globalProps.value.pagination)
-    );
+    const tablePage = ref(getTablePage(props.pagination, globalProps.value.pagination));
+    const tableLimit = ref(getTableLimit(props.pagination, globalProps.value.pagination));
     const tableTotal = ref(0);
     const tableLoading = ref(props.loading);
     const tableCols = ref([]);
-    const tableSize = ref(
-      getTableSize(props.cacheKey, props.size, globalProps.value.size)
-    );
+    const tableSize = ref(getTableSize(props.cacheKey, props.size, globalProps.value.size));
     const tableMaximized = ref(false);
     const errorText = ref("");
     const cacheData = ref();
@@ -59,23 +53,15 @@ const _sfc_main = defineComponent({
       return ((tablePage.value ?? 1) - 1) * (tableLimit.value ?? 0) + 1;
     });
     const paginationProps = computed(() => {
-      return getPaginationProps(
-        tableSize.value,
-        props.pagination,
-        globalProps.value.pagination,
-        {
-          total: tableTotal.value,
-          pageSize: tableLimit.value,
-          currentPage: tablePage.value,
-          hasNext: tableData.value.length >= tableLimit.value
-        }
-      );
+      return getPaginationProps(tableSize.value, props.pagination, globalProps.value.pagination, {
+        total: tableTotal.value,
+        pageSize: tableLimit.value,
+        currentPage: tablePage.value,
+        hasNext: tableData.value.length >= tableLimit.value
+      });
     });
     const tableEmptyProps = computed(() => {
-      return mergeProps(
-        props.emptyProps,
-        globalProps.value.emptyProps
-      );
+      return mergeProps(props.emptyProps, globalProps.value.emptyProps);
     });
     const isFunctionSource = computed(() => {
       return typeof props.datasource === "function";
@@ -115,10 +101,7 @@ const _sfc_main = defineComponent({
       return tools || [];
     });
     const tableToolbarProps = computed(() => {
-      return mergeProps(
-        props.toolbar,
-        globalProps.value.toolbar
-      );
+      return mergeProps(props.toolbar, globalProps.value.toolbar);
     });
     const toolExportConfig = computed(() => {
       const globalExportConfig = globalProps.value.exportConfig || {};
@@ -157,24 +140,20 @@ const _sfc_main = defineComponent({
       return {
         ...props.loadingProps || {},
         loading: tableLoading.value,
-        class: [
-          "ele-pro-table",
-          { "is-maximized": tableMaximized.value },
-          { "is-border": tableProps.value.border }
-        ],
+        class: ["ele-pro-table", { "is-maximized": tableMaximized.value }, { "is-border": tableProps.value.border }],
         style: tableMaximized.value ? { zIndex } : void 0
       };
     });
     const reload = (option, parent, resolve) => {
       if (option) {
-        if (option.page) {
-          tablePage.value = option.page;
+        if (option.currentPage) {
+          tablePage.value = option.currentPage;
         }
-        if (option.limit) {
-          tableLimit.value = option.limit;
+        if (option.pageSize) {
+          tableLimit.value = option.pageSize;
         }
-        if (option.where) {
-          tableState.where = option.where;
+        if (option.queryParam) {
+          tableState.queryParam = option.queryParam;
         }
         if (option.sorter) {
           tableState.sorter = option.sorter;
@@ -186,39 +165,25 @@ const _sfc_main = defineComponent({
       errorText.value = "";
       const sorter = tableState.sorter;
       if (!isFunctionSource.value) {
-        const { data, page, total } = reloadData(
-          props.datasource,
-          sorter,
-          paginationProps.value ? tablePage.value : void 0,
-          tableLimit.value
-        );
+        const { records, currentPage, totalCount } = reloadData(props.datasource, sorter, paginationProps.value ? tablePage.value : void 0, tableLimit.value);
         cacheData.value = props.datasource;
         tableData.value = data;
         tablePage.value = page;
-        tableTotal.value = total;
-        handleDone({ data, page, total, response: props.datasource });
+        tableTotal.value = totalCount;
+        handleDone({ records, currentPage, totalCount, response: props.datasource });
         return;
       }
       if (!parent) {
         tableLoading.value = true;
       }
       const filter = tableState.filter;
-      const orders = getRequestOrders(
-        sorter,
-        props.request,
-        globalProps.value.request
-      );
+      const orderParamList = getRequestOrderParamList(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,
+        currentPage: tablePage.value,
+        pageSize: tableLimit.value,
+        pageParam: getRequestPageParam(tablePage.value, tableLimit.value, props.request, globalProps.value.request),
+        queryParam: Object.assign({}, tableState.queryParam),
+        orderParamList,
         filters: getRequestFilters(filter),
         sorter,
         filter,
@@ -226,53 +191,42 @@ const _sfc_main = defineComponent({
       }).then((response) => {
         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
-        );
-        requestCallback(data, total, parent, result, resolve);
+        const { records, totalCount } = getResponseResult(result, props.response, globalProps.value.response, props.lazy, props.treeProps);
+        requestCallback(records, totalCount, parent, result, resolve);
       }).catch((e) => {
         requestCallback(e == null ? void 0 : e.message);
         resolve && console.error(e);
       });
     };
-    const requestCallback = (data, total, parent, response, resolve) => {
+    const requestCallback = (data2, totalCount, parent, response, resolve) => {
       var _a;
-      if (!Array.isArray(data)) {
+      if (!Array.isArray(data2)) {
         tableData.value = [];
         tableLoading.value = false;
-        if (typeof data === "string" && data) {
-          errorText.value = data;
+        if (typeof data2 === "string" && data2) {
+          errorText.value = data2;
           return;
         }
         errorText.value = "获取数据失败";
-        console.error(
-          "返回的数据格式与配置的不一致, 返回的数据:",
-          response,
-          "需要的格式:",
-          getResponseName(globalProps.value.response, props.response)
-        );
+        console.error("返回的数据格式与配置的不一致, 返回的数据:", response, "需要的格式:", getResponseName(globalProps.value.response, props.response));
         return;
       }
       if (resolve) {
         if (parent != null) {
-          parent[((_a = props.treeProps) == null ? void 0 : _a.children) || "children"] = data;
+          parent[((_a = props.treeProps) == null ? void 0 : _a.children) || "children"] = data2;
         }
-        resolve(data);
+        resolve(data2);
       } else {
-        if (isAutoAmend(props.pagination, globalProps.value.pagination) && !data.length && total && "*" !== total && tablePage.value && tableLimit.value) {
-          const maxPage = Math.ceil(total / tableLimit.value);
+        if (isAutoAmend(props.pagination, globalProps.value.pagination) && !data2.length && totalCount && "*" !== totalCount && tablePage.value && tableLimit.value) {
+          const maxPage = Math.ceil(totalCount / tableLimit.value);
           if (maxPage && tablePage.value > maxPage) {
             tablePage.value = maxPage;
             reload();
             return;
           }
         }
-        tableData.value = data;
-        tableTotal.value = total || data.length;
+        tableData.value = data2;
+        tableTotal.value = totalCount || data2.length;
       }
       tableLoading.value = false;
       const result = {
@@ -293,14 +247,10 @@ const _sfc_main = defineComponent({
     const handleDone = (result, parent) => {
       nextTick(() => {
         if (props.current != null) {
-          methods.setCurrentRowKey(
-            getValue(props.current, tableRowKey.value)
-          );
+          methods.setCurrentRowKey(getValue(props.current, tableRowKey.value));
         }
         if (props.selections != null && props.selections.length) {
-          methods.setSelectedRowKeys(
-            getRowKeys(props.selections, tableRowKey.value)
-          );
+          methods.setSelectedRowKeys(getRowKeys(props.selections, tableRowKey.value));
         }
       });
       emit("done", result, parent);
@@ -324,11 +274,11 @@ const _sfc_main = defineComponent({
       tableMaximized.value = maximized;
       emit("maximizedChange", maximized);
     };
-    const handlePageSizeChange = (limit) => {
-      if (tableLimit.value !== limit) {
-        tableLimit.value = limit;
+    const handlePageSizeChange = (pageSize) => {
+      if (tableLimit.value !== pageSize) {
+        tableLimit.value = pageSize;
         if (tableTotal.value !== "*") {
-          const maxPage = Math.ceil(tableTotal.value / limit);
+          const maxPage = Math.ceil(tableTotal.value / pageSize);
           if (maxPage && tablePage.value > maxPage) {
             tablePage.value = maxPage;
           }
@@ -336,9 +286,9 @@ const _sfc_main = defineComponent({
         reload();
       }
     };
-    const handlePageCurrentChange = (page) => {
-      if (tablePage.value !== page) {
-        tablePage.value = page;
+    const handlePageCurrentChange = (page2) => {
+      if (tablePage.value !== page2) {
+        tablePage.value = page2;
         reload();
       }
     };
@@ -387,39 +337,30 @@ const _sfc_main = defineComponent({
     const getData = () => {
       return tableData.value;
     };
-    const setData = (data) => {
-      tableData.value = data;
+    const setData = (data2) => {
+      tableData.value = data2;
     };
     const goPageByRowKey = (key) => {
       if (!paginationProps.value || tableLimit.value == null || isFunctionSource.value) {
         return;
       }
       const rowKey = tableRowKey.value;
-      const data = sortData(props.datasource, tableState.sorter);
-      const index2 = data.findIndex((d) => getValue(d, rowKey) === key);
-      const page = Math.floor(index2 / tableLimit.value) + 1;
-      if (tablePage.value !== page) {
-        reload({ page });
+      const data2 = sortData(props.datasource, tableState.sorter);
+      const index2 = data2.findIndex((d) => getValue(d, rowKey) === key);
+      const page2 = Math.floor(index2 / tableLimit.value) + 1;
+      if (tablePage.value !== page2) {
+        reload({ page: page2 });
       }
     };
     const fetch = (callback) => {
       const { sorter, filter } = tableState;
-      const orders = getRequestOrders(
-        sorter,
-        props.request,
-        globalProps.value.request
-      );
+      const orderParamList = getRequestOrderParamList(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,
+        currentPage: tablePage.value,
+        pageSize: tableLimit.value,
+        pageParam: getRequestPageParam(tablePage.value, tableLimit.value, props.request, globalProps.value.request),
+        queryParam: Object.assign({}, tableState.queryParam),
+        orderParamList,
         filters: getRequestFilters(filter),
         sorter,
         filter
@@ -449,11 +390,7 @@ const _sfc_main = defineComponent({
       () => props.columns,
       (columns) => {
         if (columns) {
-          tableCols.value = getInitCacheColumns(
-            columns,
-            props.cacheKey,
-            props.columnSortable
-          );
+          tableCols.value = getInitCacheColumns(columns, props.cacheKey, props.columnSortable);
         } else if (tableCols.value.length) {
           tableCols.value = [];
         }
@@ -500,11 +437,7 @@ const _sfc_main = defineComponent({
     watch(
       globalProps,
       (config) => {
-        tableSize.value = getTableSize(
-          props.cacheKey,
-          props.size,
-          config.size
-        );
+        tableSize.value = getTableSize(props.cacheKey, props.size, config.size);
       },
       { deep: true }
     );
@@ -559,7 +492,7 @@ const _export_sfc = (sfc, props) => {
   return target;
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_TableTools = resolveComponent("TableTools");
+  resolveComponent("TableTools");
   const _component_EleToolbar = resolveComponent("EleToolbar");
   const _component_EleVirtualTable = resolveComponent("EleVirtualTable");
   const _component_EleDataTable = resolveComponent("EleDataTable");
@@ -567,63 +500,17 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleLoading = resolveComponent("EleLoading");
   return openBlock(), createBlock(_component_EleLoading, normalizeProps(guardReactiveProps(_ctx.loadingProps)), {
     default: withCtx(() => [
-      _ctx.tableToolbarProps ? (openBlock(), createBlock(_component_EleToolbar, normalizeProps(mergeProps$1({ key: 0 }, _ctx.tableToolbarProps === true ? {} : _ctx.tableToolbarProps)), {
-        tools: withCtx(() => [
-          renderSlot(_ctx.$slots, "tools"),
-          _ctx.toolNames && _ctx.toolNames.length ? (openBlock(), createBlock(_component_TableTools, {
-            key: 0,
-            ref: "tableToolsRef",
-            tools: _ctx.toolNames,
-            size: _ctx.tableSize,
-            columns: _ctx.columns,
-            columnSortable: _ctx.columnSortable,
-            columnFixed: _ctx.columnFixed,
-            maximized: _ctx.tableMaximized,
-            cacheKey: _ctx.cacheKey,
-            locale: _ctx.locale,
-            selections: _ctx.selections,
-            pageData: _ctx.tableData,
-            spanMethod: _ctx.spanMethod,
-            tableHeader: _ctx.showHeader,
-            showSummary: _ctx.showSummary,
-            sumText: _ctx.sumText,
-            summaryMethod: _ctx.summaryMethod,
-            cellStyle: _ctx.cellStyle,
-            cellClassName: _ctx.cellClassName,
-            headerCellStyle: _ctx.headerCellStyle,
-            headerCellClassName: _ctx.headerCellClassName,
-            pageIndex: _ctx.tableIndex,
-            treeProps: _ctx.treeProps,
-            fetch: _ctx.fetch,
-            exportConfig: _ctx.toolExportConfig,
-            printConfig: _ctx.toolPrintConfig,
-            onReload: _ctx.handleRefresh,
-            "onUpdate:size": _ctx.handleSizeChange,
-            "onUpdate:columns": _ctx.handleColumnsChange,
-            "onUpdate:maximized": _ctx.handleMaximizedChange
-          }, createSlots({ _: 2 }, [
-            renderList(Object.keys(_ctx.$slots).filter(
-              (k) => !_ctx.toolsSlotExcludes.includes(k)
-            ), (name) => {
-              return {
-                name,
-                fn: withCtx((slotProps) => [
-                  renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-                ])
-              };
-            })
-          ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "treeProps", "fetch", "exportConfig", "printConfig", "onReload", "onUpdate:size", "onUpdate:columns", "onUpdate:maximized"])) : createCommentVNode("", true)
-        ]),
+      _ctx.tableToolbarProps ? (openBlock(), createBlock(_component_EleToolbar, normalizeProps(mergeProps$1({ key: 0 }, _ctx.tableToolbarProps === true ? {} : _ctx.tableToolbarProps)), createSlots({
         default: withCtx(() => [
           renderSlot(_ctx.$slots, "toolbar")
         ]),
-        _: 3
-      }, 16)) : createCommentVNode("", true),
+        _: 2
+      }, [
+        void 0
+      ]), 1040)) : createCommentVNode("", true),
       renderSlot(_ctx.$slots, "default"),
       _ctx.virtual ? (openBlock(), createBlock(_component_EleVirtualTable, mergeProps$1({ key: 1 }, _ctx.tableProps, { ref: "tableViewRef" }), createSlots({ _: 2 }, [
-        renderList(Object.keys(_ctx.$slots).filter(
-          (k) => !_ctx.tableSlotExcludes.includes(k)
-        ), (name) => {
+        renderList(Object.keys(_ctx.$slots).filter((k) => !_ctx.tableSlotExcludes.includes(k)), (name) => {
           return {
             name,
             fn: withCtx((slotProps) => [
@@ -632,9 +519,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           };
         })
       ]), 1040)) : (openBlock(), createBlock(_component_EleDataTable, mergeProps$1({ key: 2 }, _ctx.tableProps, { ref: "tableViewRef" }), createSlots({ _: 2 }, [
-        renderList(Object.keys(_ctx.$slots).filter(
-          (k) => !_ctx.tableSlotExcludes.includes(k)
-        ), (name) => {
+        renderList(Object.keys(_ctx.$slots).filter((k) => !_ctx.tableSlotExcludes.includes(k)), (name) => {
           return {
             name,
             fn: withCtx((slotProps) => [
@@ -653,9 +538,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           "onUpdate:currentPage": _ctx.handlePageCurrentChange,
           "onUpdate:pageSize": _ctx.handlePageSizeChange
         }), createSlots({ _: 2 }, [
-          renderList(Object.keys(_ctx.$slots).filter(
-            (k) => !_ctx.pageSlotExcludes.includes(k)
-          ), (name) => {
+          renderList(Object.keys(_ctx.$slots).filter((k) => !_ctx.pageSlotExcludes.includes(k)), (name) => {
             return {
               name,
               fn: withCtx((slotProps) => [