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

package/lib/ele-pro-layout/util.cjs

@@ -18,12 +18,11 @@ function findTabByKey(key, tabs) {
   }
 }
 function getMatchedMenus(path, menus, parents) {
-  var _a;
   for (const m of menus) {
     const p = parents ? [...parents, m] : [m];
     if (m.path === path) {
       return p;
-    } else if ((_a = m.children) == null ? void 0 : _a.length) {
+    } else if (m.children?.length) {
       const result = getMatchedMenus(path, m.children, p);
       if (result) {
         return result;
@@ -32,14 +31,13 @@ function getMatchedMenus(path, menus, parents) {
   }
 }
 function getRouteMatched(route, menus) {
-  var _a, _b, _c;
   const { path, fullPath, meta } = route;
-  if (meta == null ? void 0 : meta.active) {
+  if (meta?.active) {
     const m2 = findMenuByPath(fullPath, menus) ?? findMenuByPath(path, menus);
     return {
       active: meta.active,
       activeOther: true,
-      title: ((_a = m2 == null ? void 0 : m2.meta) == null ? void 0 : _a.title) ?? meta.title,
+      title: m2?.meta?.title ?? meta.title,
       matched: getMatchedMenus(meta.active, menus)
     };
   }
@@ -47,25 +45,23 @@ function getRouteMatched(route, menus) {
   if (fm) {
     return {
       active: fullPath,
-      title: ((_b = fm.meta) == null ? void 0 : _b.title) ?? meta.title,
+      title: fm.meta?.title ?? meta.title,
       matched: getMatchedMenus(fullPath, menus)
     };
   }
   const m = findMenuByPath(path, menus);
   return {
     active: path,
-    title: ((_c = m == null ? void 0 : m.meta) == null ? void 0 : _c.title) ?? meta.title,
+    title: m?.meta?.title ?? meta.title,
     matched: getMatchedMenus(path, menus)
   };
 }
 function getMatchedLevels(matched, activeOther, route, menus, tabs) {
-  var _a;
   const levels = [];
   if (matched) {
     matched.forEach((m) => {
-      var _a2;
       if (m.meta && m.meta.title && m.meta.breadcrumb !== false) {
-        const title = ((_a2 = findTabByPath(m.path, tabs)) == null ? void 0 : _a2.title) || m.meta.title;
+        const title = findTabByPath(m.path, tabs)?.title || m.meta.title;
         levels.push({ path: m.path, title });
       }
     });
@@ -76,7 +72,7 @@ function getMatchedLevels(matched, activeOther, route, menus, tabs) {
     if (notIn && meta.title) {
       const m = findMenuByPath(fullPath, menus) ?? findMenuByPath(path, menus);
       const t = findTabByPath(fullPath, tabs) ?? findTabByPath(path, tabs);
-      const title = (t == null ? void 0 : t.title) || ((_a = m == null ? void 0 : m.meta) == null ? void 0 : _a.title) || meta.title;
+      const title = t?.title || m?.meta?.title || meta.title;
       levels.push({ path: fullPath, title });
     }
   }
@@ -85,8 +81,7 @@ function getMatchedLevels(matched, activeOther, route, menus, tabs) {
 function getMatchedComponents(matched) {
   const components = [];
   matched.forEach((m) => {
-    var _a, _b;
-    if ((_b = (_a = m.components) == null ? void 0 : _a.default) == null ? void 0 : _b.name) {
+    if (m.components?.default?.name) {
       components.push(m.components.default.name);
     }
   });
@@ -96,9 +91,9 @@ function getRouteTab(route, tabs, homePath, routeTitle) {
   const { path, fullPath, meta, matched } = route;
   const key = meta.tabUnique === false ? fullPath : path;
   const t = findTabByPath(key, tabs);
-  const title = (t == null ? void 0 : t.title) || routeTitle;
+  const title = t?.title || routeTitle;
   const home = path === homePath || fullPath === homePath;
-  const closable = (t == null ? void 0 : t.closable) ?? meta.closable !== false;
+  const closable = t?.closable ?? meta.closable !== false;
   const components = getMatchedComponents(matched);
   return { key, path, fullPath, title, closable, home, components, meta };
 }

package/lib/ele-pro-table/components/table-tools.cjs

@@ -102,8 +102,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 _: 1
               })
             ]),
-            _: 2
-          }, 1032, ["placement", "title"])) : tool === "export" ? (vue.openBlock(), vue.createBlock(EleTool, {
+            _: 1
+          }, 8, ["placement", "title"])) : tool === "export" ? (vue.openBlock(), vue.createBlock(EleTool, {
             key: index$1 + "-export",
             title: __props.lang.export,
             placement: placement.value,
@@ -111,15 +111,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             onClick: openExportModal
           }, {
             default: vue.withCtx(() => [
-              vue.createVNode(vue.unref(elementPlus.ElIcon), { style: { "transform": "scale(1.1)", "transform-origin": "bottom" } }, {
+              vue.createVNode(vue.unref(elementPlus.ElIcon), { style: { transform: "scale(1.1)", transformOrigin: "bottom" } }, {
                 default: vue.withCtx(() => [
                   vue.createVNode(vue.unref(index.DownloadOutlined))
                 ]),
                 _: 1
               })
             ]),
-            _: 2
-          }, 1032, ["title", "placement"])) : tool === "print" ? (vue.openBlock(), vue.createBlock(EleTool, {
+            _: 1
+          }, 8, ["title", "placement"])) : tool === "print" ? (vue.openBlock(), vue.createBlock(EleTool, {
             key: index$1 + "-print",
             title: __props.lang.print,
             placement: placement.value,
@@ -134,8 +134,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 _: 1
               })
             ]),
-            _: 2
-          }, 1032, ["title", "placement"])) : tool === "size" ? (vue.openBlock(), vue.createBlock(EleTool, {
+            _: 1
+          }, 8, ["title", "placement"])) : tool === "size" ? (vue.openBlock(), vue.createBlock(EleTool, {
             key: index$1 + "-size",
             placement: placement.value,
             title: __props.lang.sizes
@@ -164,8 +164,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 _: 1
               }, 8, ["modelValue", "items"])
             ]),
-            _: 2
-          }, 1032, ["placement", "title"])) : tool === "columns" ? (vue.openBlock(), vue.createBlock(ToolColumn, {
+            _: 1
+          }, 8, ["placement", "title"])) : tool === "columns" ? (vue.openBlock(), vue.createBlock(ToolColumn, {
             key: index$1 + "-columns",
             placement: placement.value,
             locale: __props.lang,
@@ -189,8 +189,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 _: 1
               })
             ]),
-            _: 2
-          }, 1032, ["placement", "title"])) : tool && !ownSlots.includes(tool) && _ctx.$slots[tool] ? vue.renderSlot(_ctx.$slots, tool, { key: 6 }) : vue.createCommentVNode("", true)
+            _: 1
+          }, 8, ["placement", "title"])) : tool && !ownSlots.includes(tool) && _ctx.$slots[tool] ? vue.renderSlot(_ctx.$slots, tool, { key: 6 }) : vue.createCommentVNode("", true)
         ], 64);
       }), 256);
     };

package/lib/ele-pro-table/components/tool-column-list.cjs

@@ -3,6 +3,7 @@ const vue = require("vue");
 const VueDraggable = require("vuedraggable");
 const elementPlus = require("element-plus");
 const index = require("../../icons/index");
+const hook = require("../../utils/hook");
 const _hoisted_1 = { class: "ele-tool-column-item" };
 const _hoisted_2 = { class: "ele-tool-column-item-body" };
 const _hoisted_3 = {
@@ -49,17 +50,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const handleSortChange = (colItems) => {
-      handleChildSortChange(colItems, props.parent);
-    };
-    const handleCheckedChange = (colItem, checked) => {
-      emit("checkedChange", colItem, checked);
-    };
-    const handleFixedLeft = (colItem) => {
-      emit("fixedLeft", colItem);
+    const modalItem = vue.inject(hook.modalItemContextKey, null);
+    const handleChildFixedLeftTooltip = (el) => {
+      emit("fixedLeftTooltip", el);
     };
-    const handleFixedRight = (colItem) => {
-      emit("fixedRight", colItem);
+    const handleChildFixedRightTooltip = (el) => {
+      emit("fixedRightTooltip", el);
     };
     const handleFixedLeftTooltip = (e) => {
       handleChildFixedLeftTooltip(e.currentTarget);
@@ -67,18 +63,32 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleFixedRightTooltip = (e) => {
       handleChildFixedRightTooltip(e.currentTarget);
     };
-    const handleChildSortChange = (colItems, parent) => {
-      emit("sortChange", colItems, parent);
+    const handleFixedLeft = (colItem) => {
+      if (modalItem?.label) {
+        emit("fixedLeft", colItem);
+      }
     };
-    const handleChildFixedLeftTooltip = (el) => {
-      emit("fixedLeftTooltip", el);
+    const handleFixedRight = (colItem) => {
+      if (modalItem?.label) {
+        emit("fixedRight", colItem);
+      }
     };
-    const handleChildFixedRightTooltip = (el) => {
-      emit("fixedRightTooltip", el);
+    const handleChildSortChange = (colItems, parent) => {
+      if (modalItem?.label) {
+        emit("sortChange", colItems, parent);
+      }
+    };
+    const handleCheckedChange = (colItem, checked) => {
+      if (modalItem?.label) {
+        emit("checkedChange", colItem, checked);
+      }
     };
     const handleColWidthChange = (item, width) => {
       emit("colWidthChange", item, width);
     };
+    const handleSortChange = (colItems) => {
+      handleChildSortChange(colItems, props.parent);
+    };
     return (_ctx, _cache) => {
       const _component_ToolColumnList = vue.resolveComponent("ToolColumnList", true);
       return vue.openBlock(), vue.createBlock(vue.unref(VueDraggable), {
@@ -111,10 +121,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               ]),
               __props.allowFixed ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5, [
                 vue.createElementVNode("div", {
-                  class: vue.normalizeClass([
-                    "ele-tool-column-fixed-item",
-                    { "is-active": d.fixed === true || d.fixed === "left" }
-                  ]),
+                  class: vue.normalizeClass(["ele-tool-column-fixed-item", { "is-active": d.fixed === true || d.fixed === "left" }]),
                   onClick: ($event) => handleFixedLeft(d),
                   onMouseover: handleFixedLeftTooltip
                 }, [
@@ -126,10 +133,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   })
                 ], 42, _hoisted_6),
                 vue.createElementVNode("div", {
-                  class: vue.normalizeClass([
-                    "ele-tool-column-fixed-item",
-                    { "is-active": d.fixed === "right" }
-                  ]),
+                  class: vue.normalizeClass(["ele-tool-column-fixed-item", { "is-active": d.fixed === "right" }]),
                   onClick: ($event) => handleFixedRight(d),
                   onMouseover: handleFixedRightTooltip
                 }, [

package/lib/ele-pro-table/components/tool-column.cjs

@@ -194,11 +194,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           }, {
             body: vue.withCtx(() => [
               vue.createElementVNode("div", {
-                class: vue.normalizeClass([
-                  "ele-popover-body",
-                  "ele-tool-column",
-                  { "is-sortable": __props.sortable }
-                ])
+                class: vue.normalizeClass(["ele-popover-body ele-tool-column", { "is-sortable": __props.sortable }])
               }, [
                 vue.createElementVNode("div", _hoisted_1, [
                   vue.createElementVNode("div", _hoisted_2, [

package/lib/ele-pro-table/components/tool-export.cjs

@@ -65,7 +65,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     /** 导出前的钩子函数 */
     beforeExport: Function,
     /** 导出插件 */
-    exportPlugin: Function
+    exportPlugin: Function,
+    /** 获取数据源返回结果方法 */
+    getDatasourceResult: {
+      type: Function,
+      required: true
+    }
   },
   setup(__props, { expose: __expose }) {
     const props = __props;
@@ -104,15 +109,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       visible.value = false;
     };
     const exportData = (params) => {
-      var _a;
       showLoading();
-      const exportFileName = (params == null ? void 0 : params.fileName) ?? form.fileName;
-      const exportDataValue = (params == null ? void 0 : params.data) || [];
-      const isShowHeader = (params == null ? void 0 : params.showHeader) ?? showHeader.value;
-      const isShowFooter = (params == null ? void 0 : params.showFooter) ?? showFooter.value;
-      const isShowTreeIndex = (params == null ? void 0 : params.showTreeIndex) ?? showTreeIndex.value;
-      const exportDataType = (params == null ? void 0 : params.dataType) ?? dataType.value;
-      const exportColumns = (params == null ? void 0 : params.columns) || util.getCheckedColumns(
+      const exportFileName = params?.fileName ?? form.fileName;
+      const exportDataValue = params?.data || [];
+      const isShowHeader = params?.showHeader ?? showHeader.value;
+      const isShowFooter = params?.showFooter ?? showFooter.value;
+      const isShowTreeIndex = params?.showTreeIndex ?? showTreeIndex.value;
+      const exportDataType = params?.dataType ?? dataType.value;
+      const exportColumns = params?.columns || util.getCheckedColumns(
         props.columns,
         colItems.value,
         true,
@@ -121,7 +125,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         false,
         colItems.value
       );
-      const tableColumns = (params == null ? void 0 : params.columns) || util.getCheckedColumns(
+      const tableColumns = params?.tableColumns || params?.columns || util.getCheckedColumns(
         props.columns,
         colItems.value,
         true,
@@ -138,7 +142,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         isShowFooter,
         props.sumText,
         props.summaryMethod,
-        (_a = props.treeProps) == null ? void 0 : _a.children,
+        props.treeProps?.children,
         isShowTreeIndex,
         isShowHeader
       );
@@ -178,8 +182,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const handleExport = () => {
-      var _a, _b;
-      (_b = (_a = formRef.value) == null ? void 0 : _a.validate) == null ? void 0 : _b.call(_a, (valid) => {
+      formRef.value?.validate?.((valid) => {
         if (!valid) {
           return;
         }
@@ -194,15 +197,47 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         if (props.datasource == null || typeof props.datasource !== "function" || typeof props.fetch !== "function") {
           return;
         }
+        const columns = util.getCheckedColumns(
+          props.columns,
+          colItems.value,
+          true,
+          void 0,
+          util.columnsExportFilter,
+          false,
+          colItems.value
+        );
+        const tableColumns = util.getCheckedColumns(
+          props.columns,
+          colItems.value,
+          true,
+          void 0,
+          util.columnsExportFilter,
+          true,
+          colItems.value
+        );
         showLoading();
         props.fetch((params) => {
-          props.datasource(params).then((result) => {
+          props.datasource({
+            ...params,
+            columns,
+            tableColumns
+          }).then((result) => {
             if (result == null) {
               hideLoading();
               closeModal();
               return;
             }
-            exportData({ data: result });
+            if (Array.isArray(result)) {
+              exportData({ data: result });
+              return;
+            }
+            const { data } = props.getDatasourceResult(result);
+            if (data == null) {
+              hideLoading();
+              closeModal();
+              return;
+            }
+            exportData({ data });
           }).catch((e) => {
             console.error(e);
             hideLoading();
@@ -284,7 +319,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     };
     vue.watch(visible, (visible2) => {
-      var _a, _b;
       if (visible2) {
         form.fileName = props.defaultFileName;
         dataType.value = props.defaultDataType;
@@ -292,16 +326,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         showHeader.value = !!props.tableHeader;
         showFooter.value = props.showSummary ? !!props.defaultShowFooter : false;
         treeIndexDisabled.value = !(props.pageData && props.pageData.some(
-          (d) => {
-            var _a2, _b2, _c;
-            return ((_b2 = d[((_a2 = props.treeProps) == null ? void 0 : _a2.children) || "children"]) == null ? void 0 : _b2.length) || d[((_c = props.treeProps) == null ? void 0 : _c.hasChildren) || "hasChildren"];
-          }
+          (d) => d[props.treeProps?.children || "children"]?.length || d[props.treeProps?.hasChildren || "hasChildren"]
         )) && common.findTree(colItems.value, (c) => c.type === "expand") == null;
         showTreeIndex.value = treeIndexDisabled.value ? false : !!props.defaultShowTreeIndex;
         return;
       }
       hideLoading();
-      (_b = (_a = formRef.value) == null ? void 0 : _a.clearValidate) == null ? void 0 : _b.call(_a);
+      formRef.value?.clearValidate?.();
     });
     vue.watch(
       () => props.locale.exportFileNamePlaceholder,

package/lib/ele-pro-table/components/tool-export.d.ts

@@ -1,7 +1,7 @@
 import { PropType } from 'vue';
 import { EleModalProps } from '../../ele-app/plus';
 import { Columns, DataItem, SpanMethod, SummaryMethod, TreeProps } from '../../ele-data-table/types';
-import { TableLocale, ExportDataType, BeforeExport, ExportPlugin, Datasource, FetchFunction, TableExportParams } from '../types';
+import { TableLocale, ExportDataType, BeforeExport, ExportPlugin, Datasource, FetchFunction, TableExportParams, GetDatasourceResultFunction } from '../types';
 
 declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     /** 表格国际化 */
@@ -58,6 +58,11 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     beforeExport: PropType<BeforeExport>;
     /** 导出插件 */
     exportPlugin: PropType<ExportPlugin>;
+    /** 获取数据源返回结果方法 */
+    getDatasourceResult: {
+        type: PropType<GetDatasourceResultFunction>;
+        required: true;
+    };
 }>, {
     openModal: () => void;
     closeModal: () => void;
@@ -117,12 +122,17 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     beforeExport: PropType<BeforeExport>;
     /** 导出插件 */
     exportPlugin: PropType<ExportPlugin>;
+    /** 获取数据源返回结果方法 */
+    getDatasourceResult: {
+        type: PropType<GetDatasourceResultFunction>;
+        required: true;
+    };
 }>> & Readonly<{}>, {
     showSummary: boolean;
     tableHeader: boolean;
-    defaultShowTreeIndex: boolean;
-    defaultFileName: string;
     defaultDataType: ExportDataType;
     defaultShowFooter: boolean;
+    defaultShowTreeIndex: boolean;
+    defaultFileName: string;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/lib/ele-pro-table/components/tool-print-body-cell.cjs

@@ -54,7 +54,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const column = cellParam.value.column;
       if (column) {
         if (column.align) {
-          classes.push("is-align-" + column.align);
+          classes.push(`is-align-${column.align}`);
         }
         if (typeof props.bodyCellClass === "function") {
           const temp = props.bodyCellClass(cellParam.value);
@@ -71,15 +71,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       return classes.join(" ");
     });
     return (_ctx, _cache) => {
-      var _a;
       return vue.openBlock(), vue.createElementBlock("td", {
         colspan: __props.col.colspan,
         rowspan: __props.col.rowspan,
         style: vue.normalizeStyle(cellStyle.value),
         class: vue.normalizeClass(cellClass.value)
       }, [
-        "expand" === ((_a = __props.col.column) == null ? void 0 : _a.type) ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
-          __props.col.text ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
+        "expand" === __props.col.column?.type ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
+          __props.col.text != null && __props.col.text !== "" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
             vue.createTextVNode(vue.toDisplayString(__props.col.text), 1)
           ], 64)) : (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElIcon), {
             key: 1,

package/lib/ele-pro-table/components/tool-print-header-cell.cjs

@@ -52,7 +52,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (column) {
         const align = column.headerAlign || column.align;
         if (align) {
-          classes.push("is-align-" + align);
+          classes.push(`is-align-${align}`);
         }
         if (typeof props.headerCellClass === "function") {
           const temp = props.headerCellClass(cellParam.value);

package/lib/ele-pro-table/components/tool-print.cjs

@@ -87,7 +87,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     /** 打印前的钩子函数 */
     beforePrint: Function,
     /** 打印插件 */
-    printPlugin: Function
+    printPlugin: Function,
+    /** 获取数据源返回结果方法 */
+    getDatasourceResult: {
+      type: Function,
+      required: true
+    }
   },
   setup(__props, { expose: __expose }) {
     const ownSlots = ["printTop", "printBottom"];
@@ -129,14 +134,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       hideLoading();
     };
     const printData = (params) => {
-      var _a;
       showLoading();
-      const printDataValue = (params == null ? void 0 : params.data) || [];
-      const isShowHeader = (params == null ? void 0 : params.showHeader) ?? showHeader.value;
-      const isShowFooter = (params == null ? void 0 : params.showFooter) ?? showFooter.value;
-      const isShowTreeIndex = (params == null ? void 0 : params.showTreeIndex) ?? showTreeIndex.value;
-      const printDataType = (params == null ? void 0 : params.dataType) ?? dataType.value;
-      const printColumns = (params == null ? void 0 : params.columns) || util$1.getCheckedColumns(
+      const printDataValue = params?.data || [];
+      const isShowHeader = params?.showHeader ?? showHeader.value;
+      const isShowFooter = params?.showFooter ?? showFooter.value;
+      const isShowTreeIndex = params?.showTreeIndex ?? showTreeIndex.value;
+      const printDataType = params?.dataType ?? dataType.value;
+      const printColumns = params?.columns || util$1.getCheckedColumns(
         props.columns,
         colItems.value,
         true,
@@ -145,7 +149,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         false,
         colItems.value
       );
-      const tableColumns = (params == null ? void 0 : params.columns) || util$1.getCheckedColumns(
+      const tableColumns = params?.tableColumns || params?.columns || util$1.getCheckedColumns(
         props.columns,
         colItems.value,
         true,
@@ -162,7 +166,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         isShowFooter,
         props.sumText,
         props.summaryMethod,
-        (_a = props.treeProps) == null ? void 0 : _a.children,
+        props.treeProps?.children,
         isShowTreeIndex,
         isShowHeader
       );
@@ -219,15 +223,47 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (props.datasource == null || typeof props.datasource !== "function" || typeof props.fetch !== "function") {
         return;
       }
+      const columns = util$1.getCheckedColumns(
+        props.columns,
+        colItems.value,
+        true,
+        void 0,
+        util$1.columnsPrintFilter,
+        false,
+        colItems.value
+      );
+      const tableColumns = util$1.getCheckedColumns(
+        props.columns,
+        colItems.value,
+        true,
+        void 0,
+        util$1.columnsPrintFilter,
+        true,
+        colItems.value
+      );
       showLoading();
       props.fetch((params) => {
-        props.datasource(params).then((result) => {
+        props.datasource({
+          ...params,
+          columns,
+          tableColumns
+        }).then((result) => {
           if (result == null) {
             hideLoading();
             closeModal();
             return;
           }
-          printData({ data: result });
+          if (Array.isArray(result)) {
+            printData({ data: result });
+            return;
+          }
+          const { data } = props.getDatasourceResult(result);
+          if (data == null) {
+            hideLoading();
+            closeModal();
+            return;
+          }
+          printData({ data });
         }).catch((e) => {
           console.error(e);
           hideLoading();
@@ -314,10 +350,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         showHeader.value = !!props.tableHeader;
         showFooter.value = props.showSummary ? !!props.defaultShowFooter : false;
         treeIndexDisabled.value = !(props.pageData && props.pageData.some(
-          (d) => {
-            var _a, _b, _c;
-            return ((_b = d[((_a = props.treeProps) == null ? void 0 : _a.children) || "children"]) == null ? void 0 : _b.length) || d[((_c = props.treeProps) == null ? void 0 : _c.hasChildren) || "hasChildren"];
-          }
+          (d) => d[props.treeProps?.children || "children"]?.length || d[props.treeProps?.hasChildren || "hasChildren"]
         )) && common.findTree(colItems.value, (c) => c.type === "expand") == null;
         showTreeIndex.value = treeIndexDisabled.value ? false : !!props.defaultShowTreeIndex;
         return;
@@ -544,7 +577,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                               key: 0,
                               rowspan: col.rowspan,
                               colspan: col.colspan,
-                              style: { "padding-left": "0", "padding-right": "0" },
+                              style: { paddingLeft: 0, paddingRight: 0 },
                               class: "ele-print-expand-td"
                             }, [
                               col.column && (col.column.printSlot || col.column.slot) && !ownSlots.includes(
@@ -570,10 +603,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                                 verticalAlign: "top",
                                 borderLeftColor: col.hideLeftBorder ? "transparent" : void 0
                               }),
-                              class: vue.normalizeClass([
-                                "ele-print-tree-index",
-                                { "is-placeholder": !col.text }
-                              ])
+                              class: vue.normalizeClass(["ele-print-tree-index", {
+                                "is-placeholder": col.text == null || col.text === ""
+                              }])
                             }, vue.toDisplayString(col.text), 15, _hoisted_9)) : vue.createCommentVNode("", true)
                           ], 64)) : col.rowspan !== 0 && col.colspan !== 0 ? (vue.openBlock(), vue.createBlock(ToolPrintBodyCell, {
                             key: 2,

package/lib/ele-pro-table/components/tool-print.d.ts

@@ -2,7 +2,7 @@ import { PropType } from 'vue';
 import { StyleValue } from '../../ele-app/types';
 import { EleModalProps, ElePrinterProps, EleTableProps } from '../../ele-app/plus';
 import { Columns, DataItem, SpanMethod, SummaryMethod, CellStyle, CellClass, HeaderCellStyle, HeaderCellClass, TreeProps } from '../../ele-data-table/types';
-import { TableLocale, ExportDataType, BeforeExport, ExportPlugin, Datasource, FetchFunction, TableExportParams } from '../types';
+import { TableLocale, ExportDataType, BeforeExport, ExportPlugin, Datasource, FetchFunction, TableExportParams, GetDatasourceResultFunction } from '../types';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: {
     row: DataItem | undefined;
@@ -80,6 +80,11 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     beforePrint: PropType<BeforeExport>;
     /** 打印插件 */
     printPlugin: PropType<ExportPlugin>;
+    /** 获取数据源返回结果方法 */
+    getDatasourceResult: {
+        type: PropType<GetDatasourceResultFunction>;
+        required: true;
+    };
 }>, {
     openModal: () => void;
     closeModal: () => void;
@@ -148,12 +153,17 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     beforePrint: PropType<BeforeExport>;
     /** 打印插件 */
     printPlugin: PropType<ExportPlugin>;
+    /** 获取数据源返回结果方法 */
+    getDatasourceResult: {
+        type: PropType<GetDatasourceResultFunction>;
+        required: true;
+    };
 }>> & Readonly<{}>, {
     showSummary: boolean;
     tableHeader: boolean;
-    defaultShowTreeIndex: boolean;
     defaultDataType: ExportDataType;
     defaultShowFooter: boolean;
+    defaultShowTreeIndex: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;