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

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

@@ -5,12 +5,14 @@ const receiver = require("../ele-config-provider/receiver");
 const EleLoading = require("../ele-loading/index");
 const ElePagination = require("../ele-pagination/index");
 const props$1 = require("../ele-data-table/props");
-const util = require("../ele-data-table/util");
+const util$1 = require("../ele-data-table/util");
 const EleDataTable = require("../ele-data-table/index");
 const EleVirtualTable = require("../ele-virtual-table/index");
 const EleToolbar = require("../ele-toolbar/index");
 const TableTools = require("./components/table-tools");
-const util$1 = require("./util");
+const ToolExport = require("./components/tool-export");
+const ToolPrint = require("./components/tool-print");
+const util = require("./util");
 const props = require("./props");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{ name: "EleProTable" },
@@ -31,9 +33,20 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const pageSlotExcludes = [...toolsSlotExcludes, "printTop", "printBottom"];
     const props2 = __props;
     const emit = __emit;
-    const events = util.useEmits(emit);
-    const methods = util.useMethods(() => getTableRef());
+    const tableState = {
+      sorter: props2.defaultSort ?? {},
+      filter: util.getDefaultFilter(props2.columns),
+      where: props2.where ?? {},
+      reloadId: null
+    };
     const globalProps = receiver.useGlobalProps("table");
+    const { lang } = receiver.useLocale("table", props2);
+    const tableViewRef = vue.ref(null);
+    const getTableRef = () => {
+      return tableViewRef.value;
+    };
+    const events = util$1.useEmits(emit);
+    const methods = util$1.useMethods(() => getTableRef());
     const virtualTableEvents = {
       onEndEeached: (params) => {
         emit("endEeached", params);
@@ -45,36 +58,31 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         emit("rowsRendered", params);
       }
     };
-    const tableState = {
-      sorter: props2.defaultSort ?? {},
-      filter: util$1.getDefaultFilter(props2.columns),
-      where: props2.where ?? {}
-    };
-    const tableToolsRef = vue.ref(null);
-    const tableViewRef = vue.ref(null);
+    const toolExportRef = vue.ref(null);
+    const toolPrintRef = vue.ref(null);
     const tableData = vue.ref([]);
     const tablePage = vue.ref(
-      util$1.getTablePage(props2.pagination, globalProps.value.pagination)
+      util.getTablePage(props2.pagination, globalProps.value.pagination)
     );
     const tableLimit = vue.ref(
-      util$1.getTableLimit(props2.pagination, globalProps.value.pagination)
+      util.getTableLimit(props2.pagination, globalProps.value.pagination)
     );
     const tableTotal = vue.ref(0);
     const tableLoading = vue.ref(props2.loading);
     const tableCols = vue.ref([]);
     const tableSize = vue.ref(
-      util$1.getTableSize(props2.cacheKey, props2.size, globalProps.value.size)
+      util.getTableSize(props2.cacheKey, props2.size, globalProps.value.size)
     );
-    const tableMaximized = vue.ref(false);
+    const tableMaximized = vue.ref(props2.maximized);
     const errorText = vue.ref("");
     const cacheData = vue.ref();
-    const tableRowKey = vue.shallowRef(util$1.getRowKey(props2.rowKey));
+    const tableRowKey = vue.shallowRef(util.getRowKey(props2.rowKey));
     const tableIndex = vue.computed(() => {
       return ((tablePage.value ?? 1) - 1) * (tableLimit.value ?? 0) + 1;
     });
     const tableCurrentIndex = vue.ref(tableIndex.value);
     const paginationProps = vue.computed(() => {
-      return util$1.getPaginationProps(
+      return util.getPaginationProps(
         tableSize.value,
         props2.pagination,
         globalProps.value.pagination,
@@ -87,7 +95,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       );
     });
     const tableEmptyProps = vue.computed(() => {
-      return util$1.mergeProps(
+      return util.mergeProps(
         props2.emptyProps,
         globalProps.value.emptyProps
       );
@@ -134,10 +142,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       return tools || [];
     });
     const tableToolbarProps = vue.computed(() => {
-      return util$1.mergeProps(
+      const result = util.mergeProps(
         props2.toolbar,
         globalProps.value.toolbar
       );
+      return result === true ? {} : result;
     });
     const toolExportConfig = vue.computed(() => {
       const globalExportConfig = globalProps.value.exportConfig || {};
@@ -171,6 +180,42 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         }
       };
     });
+    const getRequestParams = (parent) => {
+      const { sorter, filter } = tableState;
+      const orders = util.getRequestOrders(
+        sorter,
+        props2.request,
+        globalProps.value.request
+      );
+      return {
+        page: tablePage.value,
+        limit: tableLimit.value,
+        pages: util.getRequestPages(
+          tablePage.value,
+          tableLimit.value,
+          props2.request,
+          globalProps.value.request
+        ),
+        where: Object.assign({}, tableState.where),
+        orders,
+        filters: util.getRequestFilters(filter),
+        sorter,
+        filter,
+        parent,
+        columns: tableCols.value
+      };
+    };
+    const getDatasourceResult = (response) => {
+      const parseData = props2.parseData ?? globalProps.value.parseData;
+      const result = parseData ? parseData(response) : response;
+      return util.getResponseResult(
+        result,
+        props2.response,
+        globalProps.value.response,
+        props2.lazy,
+        props2.treeProps
+      );
+    };
     const reload = (option, parent, resolve) => {
       if (option) {
         if (option.page) {
@@ -192,7 +237,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       errorText.value = "";
       const sorter = tableState.sorter;
       if (!isFunctionSource.value) {
-        const { data, page, total } = util$1.reloadData(
+        const { data, page, total } = util.reloadData(
           props2.datasource,
           sorter,
           paginationProps.value ? tablePage.value : void 0,
@@ -205,43 +250,23 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         handleDone({ data, page, total, response: props2.datasource });
         return;
       }
+      const tempId = common.uuid(8);
+      tableState.reloadId = tempId;
       if (!parent) {
         tableLoading.value = true;
       }
-      const filter = tableState.filter;
-      const orders = util$1.getRequestOrders(
-        sorter,
-        props2.request,
-        globalProps.value.request
-      );
-      props2.datasource({
-        page: tablePage.value,
-        limit: tableLimit.value,
-        pages: util$1.getRequestPages(
-          tablePage.value,
-          tableLimit.value,
-          props2.request,
-          globalProps.value.request
-        ),
-        where: Object.assign({}, tableState.where),
-        orders,
-        filters: util$1.getRequestFilters(filter),
-        sorter,
-        filter,
-        parent
-      }).then((response) => {
-        const parseData = props2.parseData ?? globalProps.value.parseData;
-        const result = parseData ? parseData(response) : response;
-        const { data, total } = util$1.getResponseResult(
-          result,
-          props2.response,
-          globalProps.value.response,
-          props2.lazy,
-          props2.treeProps
-        );
+      const params = getRequestParams(parent);
+      props2.datasource(params).then((response) => {
+        if (tableState.reloadId !== tempId) {
+          return;
+        }
+        const { data, total, result } = getDatasourceResult(response);
         requestCallback(data, total, parent, result, resolve);
       }).catch((e) => {
-        const errorMsg = e == null ? void 0 : e.message;
+        if (tableState.reloadId !== tempId) {
+          return;
+        }
+        const errorMsg = e?.message;
         requestCallback(
           errorMsg == null ? errorMsg : String(errorMsg),
           void 0,
@@ -253,11 +278,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const requestCallback = (data, total, parent, response, resolve) => {
-      var _a, _b;
       if (data == null || !Array.isArray(data)) {
         if (resolve) {
           if (parent != null) {
-            parent[((_a = props2.treeProps) == null ? void 0 : _a.children) || "children"] = [];
+            parent[props2.treeProps?.children || "children"] = [];
           }
           resolve([]);
         } else {
@@ -273,17 +297,17 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           "返回的数据格式与配置的不一致, 返回的数据:",
           response,
           "需要的格式:",
-          util$1.getResponseName(globalProps.value.response, props2.response)
+          util.getResponseName(globalProps.value.response, props2.response)
         );
         return;
       }
       if (resolve) {
         if (parent != null) {
-          parent[((_b = props2.treeProps) == null ? void 0 : _b.children) || "children"] = data;
+          parent[props2.treeProps?.children || "children"] = data;
         }
         resolve(data);
       } else {
-        if (util$1.isAutoAmend(props2.pagination, globalProps.value.pagination) && !data.length && total && "*" !== total && tablePage.value && tableLimit.value) {
+        if (util.isAutoAmend(props2.pagination, globalProps.value.pagination) && !data.length && total && "*" !== total && tablePage.value && tableLimit.value) {
           const maxPage = Math.ceil(total / tableLimit.value);
           if (maxPage && tablePage.value > maxPage) {
             tablePage.value = maxPage;
@@ -318,9 +342,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         }
         if (props2.selections != null && props2.selections.length) {
           methods.setSelectedRowKeys(
-            util.getRowKeys(props2.selections, tableRowKey.value)
+            util$1.getRowKeys(props2.selections, tableRowKey.value)
           );
         }
+        if (getTableRef()) {
+          methods.setScrollTop(0);
+        }
       });
       emit("done", result, parent);
     };
@@ -341,6 +368,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const handleMaximizedChange = (maximized) => {
       tableMaximized.value = maximized;
+      if (props2.maximized !== maximized) {
+        emit("update:maximized", maximized);
+      }
       emit("maximizedChange", maximized);
     };
     const handlePageSizeChange = (limit) => {
@@ -376,7 +406,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       events.onFilterChange(filter);
     };
     const handleHeaderDragend = (newWidth, oldWidth, column, event) => {
-      util$1.cacheColWidth(newWidth, column, props2.cacheKey);
+      util.cacheColWidth(newWidth, column, props2.cacheKey);
       events.onHeaderDragend(newWidth, oldWidth, column, event);
     };
     const handleCurrentChange = (currentRow, oldCurrentRow) => {
@@ -393,7 +423,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     };
     const updateSelections = (selection) => {
-      if (util.arrayIsChanged(selection, props2.selections)) {
+      if (util$1.arrayIsChanged(selection, props2.selections)) {
         emit("update:selections", selection);
       }
     };
@@ -405,9 +435,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const reloadTable = () => {
       methods.doLayout();
     };
-    const getTableRef = () => {
-      return tableViewRef.value;
-    };
     const getData = () => {
       return tableData.value;
     };
@@ -420,7 +447,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         return;
       }
       const rowKey = tableRowKey.value;
-      const data = util$1.sortData(props2.datasource, tableState.sorter);
+      const data = util.sortData(props2.datasource, tableState.sorter);
       const index = data.findIndex((d) => common.getValue(d, rowKey) === key);
       const page = Math.floor(index / tableLimit.value) + 1;
       if (tablePage.value !== page) {
@@ -428,53 +455,33 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     };
     const fetch = (callback) => {
-      const { sorter, filter } = tableState;
-      const orders = util$1.getRequestOrders(
-        sorter,
-        props2.request,
-        globalProps.value.request
-      );
-      callback({
-        page: tablePage.value,
-        limit: tableLimit.value,
-        pages: util$1.getRequestPages(
-          tablePage.value,
-          tableLimit.value,
-          props2.request,
-          globalProps.value.request
-        ),
-        where: Object.assign({}, tableState.where),
-        orders,
-        filters: util$1.getRequestFilters(filter),
-        sorter,
-        filter
-      });
+      callback(getRequestParams());
     };
     const openPrintModal = () => {
-      if (tableToolsRef.value) {
-        tableToolsRef.value.openPrintModal();
+      if (toolPrintRef.value) {
+        toolPrintRef.value.openModal();
       }
     };
     const printData = (params) => {
-      if (tableToolsRef.value) {
-        tableToolsRef.value.printData(params);
+      if (toolPrintRef.value) {
+        toolPrintRef.value.printData(params);
       }
     };
     const openExportModal = () => {
-      if (tableToolsRef.value) {
-        tableToolsRef.value.openExportModal();
+      if (toolExportRef.value) {
+        toolExportRef.value.openModal();
       }
     };
     const exportData = (params) => {
-      if (tableToolsRef.value) {
-        tableToolsRef.value.exportData(params);
+      if (toolExportRef.value) {
+        toolExportRef.value.exportData(params);
       }
     };
     vue.watch(
       () => props2.columns,
       (columns) => {
         if (columns) {
-          tableCols.value = util$1.getInitCacheColumns(
+          tableCols.value = util.getInitCacheColumns(
             columns,
             props2.cacheKey,
             props2.columnSortable
@@ -501,7 +508,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     vue.watch(
       () => props2.size,
       (size) => {
-        tableSize.value = util$1.getTableSize(void 0, size, globalProps.value.size);
+        tableSize.value = util.getTableSize(void 0, size, globalProps.value.size);
       }
     );
     vue.watch(
@@ -513,65 +520,81 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     vue.watch(
       () => props2.selections,
       (selections) => {
-        methods.setSelectedRowKeys(util.getRowKeys(selections, tableRowKey.value));
+        methods.setSelectedRowKeys(util$1.getRowKeys(selections, tableRowKey.value));
       }
     );
     vue.watch(
       () => props2.rowKey,
       () => {
-        tableRowKey.value = util$1.getRowKey(props2.rowKey);
+        tableRowKey.value = util.getRowKey(props2.rowKey);
       }
     );
     vue.watch(
       globalProps,
       (config) => {
-        tableSize.value = util$1.getTableSize(props2.cacheKey, props2.size, config.size);
+        tableSize.value = util.getTableSize(props2.cacheKey, props2.size, config.size);
       },
       { deep: true }
     );
+    vue.watch(
+      () => props2.maximized,
+      (maximized) => {
+        if (tableMaximized.value !== maximized) {
+          handleMaximizedChange(maximized);
+        }
+      }
+    );
     vue.onMounted(() => {
+      if (props2.current != null) {
+        methods.setCurrentRowKey(common.getValue(props2.current, tableRowKey.value));
+      }
+      if (props2.selections?.length) {
+        methods.setSelectedRowKeys(
+          util$1.getRowKeys(props2.selections, tableRowKey.value)
+        );
+      }
       if (props2.loadOnCreated) {
         reload();
       }
     });
     __expose({
       ...methods,
-      tableToolsRef,
       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 vue.openBlock(), vue.createBlock(EleLoading, vue.mergeProps(props2.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 ?? vue.unref(globalProps).maximizedIndex } : void 0
       }), {
         default: vue.withCtx(() => [
           vue.renderSlot(_ctx.$slots, "topExtra"),
-          tableToolbarProps.value ? (vue.openBlock(), vue.createBlock(EleToolbar, vue.normalizeProps(vue.mergeProps({ key: 0 }, tableToolbarProps.value === true ? {} : tableToolbarProps.value)), {
+          tableToolbarProps.value ? (vue.openBlock(), vue.createBlock(EleToolbar, vue.normalizeProps(vue.mergeProps({ key: 0 }, tableToolbarProps.value)), {
             tools: vue.withCtx(() => [
               vue.renderSlot(_ctx.$slots, "tools"),
               toolNames.value && toolNames.value.length ? (vue.openBlock(), vue.createBlock(TableTools, {
                 key: 0,
-                ref_key: "tableToolsRef",
-                ref: tableToolsRef,
                 tools: toolNames.value,
                 size: tableSize.value,
                 columns: _ctx.columns,
@@ -579,28 +602,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 columnFixed: _ctx.columnFixed,
                 maximized: tableMaximized.value,
                 cacheKey: _ctx.cacheKey,
-                locale: _ctx.locale,
-                selections: _ctx.selections,
-                pageData: tableData.value,
-                spanMethod: _ctx.spanMethod,
-                tableHeader: _ctx.showHeader,
-                showSummary: _ctx.showSummary,
-                sumText: _ctx.sumText,
-                summaryMethod: _ctx.summaryMethod,
-                tableStyle: _ctx.tableStyle,
-                cellStyle: _ctx.cellStyle,
-                cellClassName: _ctx.cellClassName,
-                headerCellStyle: _ctx.headerCellStyle,
-                headerCellClassName: _ctx.headerCellClassName,
-                pageIndex: tableIndex.value,
-                treeProps: _ctx.treeProps,
-                fetch,
-                exportConfig: toolExportConfig.value,
-                printConfig: toolPrintConfig.value,
+                lang: vue.unref(lang),
                 onReload: handleRefresh,
                 "onUpdate:size": handleSizeChange,
                 "onUpdate:columns": handleColumnsChange,
-                "onUpdate:maximized": handleMaximizedChange
+                "onUpdate:maximized": handleMaximizedChange,
+                onOpenExportModal: openExportModal,
+                onOpenPrintModal: openPrintModal
               }, vue.createSlots({ _: 2 }, [
                 vue.renderList(Object.keys(_ctx.$slots).filter(
                   (k) => !toolsSlotExcludes.includes(k)
@@ -612,7 +620,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                     ])
                   };
                 })
-              ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "tableStyle", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "treeProps", "exportConfig", "printConfig"])) : vue.createCommentVNode("", true)
+              ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "lang"])) : vue.createCommentVNode("", true)
             ]),
             default: vue.withCtx(() => [
               vue.renderSlot(_ctx.$slots, "toolbar")
@@ -671,7 +679,76 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               })
             ]), 1040)) : vue.createCommentVNode("", true)
           ], 4)) : vue.createCommentVNode("", true),
-          vue.renderSlot(_ctx.$slots, "bottomExtra")
+          vue.renderSlot(_ctx.$slots, "bottomExtra"),
+          vue.createVNode(ToolExport, {
+            ref_key: "toolExportRef",
+            ref: toolExportRef,
+            locale: vue.unref(lang),
+            cacheKey: _ctx.cacheKey,
+            modalProps: toolExportConfig.value.modalProps,
+            columns: toolExportConfig.value.columns || _ctx.columns,
+            selections: _ctx.selections,
+            pageData: tableData.value,
+            datasource: toolExportConfig.value.datasource,
+            spanMethod: _ctx.spanMethod,
+            tableHeader: toolExportConfig.value.showHeader ?? _ctx.showHeader,
+            showSummary: _ctx.showSummary,
+            sumText: _ctx.sumText,
+            summaryMethod: _ctx.summaryMethod,
+            pageIndex: tableIndex.value,
+            treeProps: _ctx.treeProps,
+            fetch,
+            defaultFileName: toolExportConfig.value.fileName,
+            defaultDataType: toolExportConfig.value.dataType,
+            defaultShowFooter: toolExportConfig.value.showFooter,
+            defaultShowTreeIndex: toolExportConfig.value.showTreeIndex,
+            beforeExport: toolExportConfig.value.beforeExport,
+            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"]),
+          vue.createVNode(ToolPrint, {
+            ref_key: "toolPrintRef",
+            ref: toolPrintRef,
+            locale: vue.unref(lang),
+            cacheKey: _ctx.cacheKey,
+            modalProps: toolPrintConfig.value.modalProps,
+            printerProps: toolPrintConfig.value.printerProps,
+            tableProps: toolPrintConfig.value.tableProps,
+            columns: toolPrintConfig.value.columns || _ctx.columns,
+            selections: _ctx.selections,
+            pageData: tableData.value,
+            datasource: toolPrintConfig.value.datasource,
+            spanMethod: _ctx.spanMethod,
+            tableHeader: toolPrintConfig.value.showHeader ?? _ctx.showHeader,
+            showSummary: _ctx.showSummary,
+            sumText: _ctx.sumText,
+            summaryMethod: _ctx.summaryMethod,
+            tableStyle: _ctx.tableStyle,
+            cellStyle: _ctx.cellStyle,
+            cellClassName: _ctx.cellClassName,
+            headerCellStyle: _ctx.headerCellStyle,
+            headerCellClassName: _ctx.headerCellClassName,
+            pageIndex: tableIndex.value,
+            treeProps: _ctx.treeProps,
+            fetch,
+            defaultDataType: toolPrintConfig.value.dataType,
+            defaultShowFooter: toolPrintConfig.value.showFooter,
+            defaultShowTreeIndex: toolPrintConfig.value.showTreeIndex,
+            beforePrint: toolPrintConfig.value.beforePrint,
+            printPlugin: toolPrintConfig.value.printPlugin,
+            getDatasourceResult
+          }, vue.createSlots({ _: 2 }, [
+            vue.renderList(Object.keys(_ctx.$slots).filter(
+              (k) => !toolsSlotExcludes.includes(k)
+            ), (name) => {
+              return {
+                name,
+                fn: vue.withCtx((slotProps) => [
+                  vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
+                ])
+              };
+            })
+          ]), 1032, ["locale", "cacheKey", "modalProps", "printerProps", "tableProps", "columns", "selections", "pageData", "datasource", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "tableStyle", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "treeProps", "defaultDataType", "defaultShowFooter", "defaultShowTreeIndex", "beforePrint", "printPlugin"])
         ]),
         _: 3
       }, 16, ["loading", "class", "style"]);