ele-admin-plus 1.2.1-beta.2 → 1.2.1-beta.4

package/es/ele-pro-table/components/tool-export.js

@@ -1,10 +1,8 @@
-import { defineComponent, ref, reactive, watch, resolveComponent, openBlock, createBlock, withCtx, createVNode, mergeProps, createTextVNode, toDisplayString, withModifiers, createCommentVNode, createElementVNode } from "vue";
-import { ElForm, ElFormItem, ElInput, ElSelect, ElOption, ElCheckbox, ElButton, ElIcon } from "element-plus";
-import { DownloadOutlined } from "../../icons";
+import { defineComponent, ref, reactive, watch, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createVNode, createTextVNode, toDisplayString, withModifiers, createCommentVNode, createElementVNode } from "vue";
+import { ElForm, ElFormItem, ElInput, ElSelect, ElOption, ElCheckbox, ElButton } from "element-plus";
 import { findTree, eachTree } from "../../utils/core";
-import EleTool from "../../ele-tool/index";
 import EleModal from "../../ele-modal/index";
-import { getColItems, columnsExportFilter, getCheckedColumns, getExportData, exportCSV } from "../util";
+import { getCheckedColumns, columnsExportFilter, getExportData, exportCSV, getCacheColsWidth, getColItems } from "../util";
 import ToolColumnList from "./tool-column-list";
 const _sfc_main = defineComponent({
   name: "ToolExport",
@@ -16,20 +14,17 @@ const _sfc_main = defineComponent({
     ElOption,
     ElCheckbox,
     ElButton,
-    ElIcon,
-    DownloadOutlined,
-    EleTool,
     EleModal,
     ToolColumnList
   },
   props: {
-    /** 提示位置 */
-    placement: String,
     /** 表格国际化 */
     locale: {
       type: Object,
       required: true
     },
+    /** 缓存本地的名称 */
+    cacheKey: String,
     /** 弹窗参数 */
     modalProps: Object,
     /** 列数据 */
@@ -66,6 +61,13 @@ const _sfc_main = defineComponent({
       type: String,
       default: "pageData"
     },
+    /** 默认是否勾选表尾 */
+    defaultShowFooter: {
+      type: Boolean,
+      default: true
+    },
+    /** 默认是否勾选层级序号 */
+    defaultShowTreeIndex: Boolean,
     /** 导出前的钩子函数 */
     beforeExport: Function
   },
@@ -91,57 +93,80 @@ const _sfc_main = defineComponent({
     const showFooter = ref(false);
     const showTreeIndex = ref(false);
     const treeIndexDisabled = ref(true);
-    const openModal = () => {
-      visible.value = true;
-    };
-    const closeModal = () => {
-      visible.value = false;
-    };
     const showLoading = () => {
       loading.value = true;
     };
     const hideLoading = () => {
       loading.value = false;
     };
-    const exportData = (data) => {
+    const openModal = () => {
+      visible.value = true;
+    };
+    const closeModal = () => {
+      hideLoading();
+      visible.value = false;
+    };
+    const exportData = (params) => {
       var _a;
       showLoading();
-      const columns = getCheckedColumns(
+      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) || getCheckedColumns(
         props.columns,
         colItems.value,
         true,
-        (item) => item.hideInExport,
-        columnsExportFilter
+        void 0,
+        columnsExportFilter,
+        false,
+        colItems.value
+      );
+      const tableColumns = (params == null ? void 0 : params.columns) || getCheckedColumns(
+        props.columns,
+        colItems.value,
+        true,
+        void 0,
+        columnsExportFilter,
+        true,
+        colItems.value
       );
       const { headerData, bodyData, footerData, bodyCols } = getExportData(
-        data,
-        columns,
+        exportDataValue,
+        exportColumns,
         props.spanMethod,
         props.pageIndex,
-        showFooter.value,
+        isShowFooter,
         props.sumText,
         props.summaryMethod,
         (_a = props.treeProps) == null ? void 0 : _a.children,
-        showTreeIndex.value,
-        showHeader.value
+        isShowTreeIndex,
+        isShowHeader
       );
       if (typeof props.beforeExport === "function") {
         const flag = props.beforeExport({
-          data,
-          columns,
+          data: exportDataValue,
+          columns: exportColumns,
           headerData,
           bodyData,
           footerData,
           bodyCols,
-          fileName: form.fileName,
+          fileName: exportFileName,
+          dataType: exportDataType,
           hideLoading,
-          closeModal
+          closeModal,
+          showHeader: isShowHeader,
+          showFooter: isShowFooter,
+          showTreeIndex: isShowTreeIndex,
+          tableColumns
         });
         if (flag === false) {
           return;
         }
       }
-      exportCSV(form.fileName, headerData, bodyData, footerData);
+      exportCSV(exportFileName, headerData, bodyData, footerData);
       hideLoading();
       closeModal();
     };
@@ -152,11 +177,11 @@ const _sfc_main = defineComponent({
           return;
         }
         if (dataType.value === "selections") {
-          exportData([...props.selections || []]);
+          exportData({ data: [...props.selections || []] });
           return;
         }
         if (dataType.value !== "data") {
-          exportData([...props.pageData || []]);
+          exportData({ data: [...props.pageData || []] });
           return;
         }
         if (props.datasource == null || typeof props.datasource !== "function" || typeof props.fetch !== "function") {
@@ -167,9 +192,10 @@ const _sfc_main = defineComponent({
           props.datasource(params).then((result) => {
             if (result == null) {
               hideLoading();
+              closeModal();
               return;
             }
-            exportData(result);
+            exportData({ data: result });
           }).catch((e) => {
             console.error(e);
             hideLoading();
@@ -178,13 +204,15 @@ const _sfc_main = defineComponent({
       });
     };
     const initColItems = () => {
+      const colsWidth = getCacheColsWidth(props.cacheKey);
       const { cols, checkAll, indeterminate } = getColItems(
         props.columns,
         props.locale,
         columnsExportFilter,
         void 0,
         true,
-        true
+        true,
+        colsWidth
       );
       colItems.value = cols;
       isCheckAll.value = checkAll;
@@ -232,6 +260,14 @@ const _sfc_main = defineComponent({
         });
       }
     };
+    const handleColWidthChange = (item, width) => {
+      eachTree(colItems.value, (d) => {
+        if (d.uid === item.uid) {
+          d.width = width;
+          return false;
+        }
+      });
+    };
     const handleReset = () => {
       initColItems();
     };
@@ -246,21 +282,18 @@ const _sfc_main = defineComponent({
         form.fileName = props.defaultFileName;
         dataType.value = props.defaultDataType;
         initColItems();
-        showHeader.value = props.tableHeader;
-        showFooter.value = props.showSummary;
+        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"];
           }
         )) && findTree(colItems.value, (c) => c.type === "expand") == null;
-        if (treeIndexDisabled.value) {
-          showTreeIndex.value = false;
-        }
-        handleTreeIndexChange(showTreeIndex.value);
+        showTreeIndex.value = treeIndexDisabled.value ? false : !!props.defaultShowTreeIndex;
         return;
       }
-      loading.value = false;
+      hideLoading();
       (_b = (_a = formRef.value) == null ? void 0 : _a.clearValidate) == null ? void 0 : _b.call(_a);
     });
     watch(
@@ -288,9 +321,11 @@ const _sfc_main = defineComponent({
       handleExport,
       handleCheckedChange,
       handleSortChange,
+      handleColWidthChange,
       handleCheckAllChange,
       handleReset,
-      handleTreeIndexChange
+      handleTreeIndexChange,
+      exportData
     };
   }
 });
@@ -306,8 +341,6 @@ const _hoisted_2 = { class: "ele-tool-column-header" };
 const _hoisted_3 = { class: "ele-tool-column-label" };
 const _hoisted_4 = { class: "ele-tool-form-options" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_DownloadOutlined = resolveComponent("DownloadOutlined");
-  const _component_ElIcon = resolveComponent("ElIcon");
   const _component_ElInput = resolveComponent("ElInput");
   const _component_ElFormItem = resolveComponent("ElFormItem");
   const _component_ElOption = resolveComponent("ElOption");
@@ -317,168 +350,155 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElForm = resolveComponent("ElForm");
   const _component_ElButton = resolveComponent("ElButton");
   const _component_EleModal = resolveComponent("EleModal");
-  const _component_EleTool = resolveComponent("EleTool");
-  return openBlock(), createBlock(_component_EleTool, {
+  return openBlock(), createBlock(_component_EleModal, mergeProps({
+    form: true,
+    width: "460px",
     title: _ctx.locale.export,
-    placement: _ctx.placement,
-    onClick: _ctx.openModal
-  }, {
-    default: withCtx(() => [
-      createVNode(_component_ElIcon, { style: { "transform": "scale(1.1)", "transform-origin": "bottom" } }, {
+    position: "center"
+  }, _ctx.modalProps || {}, {
+    modelValue: _ctx.visible,
+    "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => _ctx.visible = $event)
+  }), {
+    footer: withCtx(() => [
+      createVNode(_component_ElButton, { onClick: _ctx.closeModal }, {
         default: withCtx(() => [
-          createVNode(_component_DownloadOutlined)
+          createTextVNode(toDisplayString(_ctx.locale.exportCancel), 1)
         ]),
         _: 1
-      }),
-      createVNode(_component_EleModal, mergeProps({
-        form: true,
-        width: "460px",
-        title: _ctx.locale.export,
-        position: "center"
-      }, _ctx.modalProps || {}, {
-        modelValue: _ctx.visible,
-        "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => _ctx.visible = $event)
-      }), {
-        footer: withCtx(() => [
-          createVNode(_component_ElButton, { onClick: _ctx.closeModal }, {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(_ctx.locale.exportCancel), 1)
-            ]),
-            _: 1
-          }, 8, ["onClick"]),
-          createVNode(_component_ElButton, {
-            loading: _ctx.loading,
-            type: "primary",
-            onClick: _ctx.handleExport
+      }, 8, ["onClick"]),
+      createVNode(_component_ElButton, {
+        loading: _ctx.loading,
+        type: "primary",
+        onClick: _ctx.handleExport
+      }, {
+        default: withCtx(() => [
+          createTextVNode(toDisplayString(_ctx.locale.exportOk), 1)
+        ]),
+        _: 1
+      }, 8, ["loading", "onClick"])
+    ]),
+    default: withCtx(() => [
+      createVNode(_component_ElForm, {
+        ref: "formRef",
+        model: _ctx.form,
+        labelWidth: "80px",
+        onSubmit: _cache[6] || (_cache[6] = withModifiers(() => {
+        }, ["prevent"])),
+        class: "ele-tool-export-form"
+      }, {
+        default: withCtx(() => [
+          createVNode(_component_ElFormItem, {
+            label: _ctx.locale.exportFileName,
+            prop: "fileName",
+            rules: _ctx.fileNameRules
           }, {
             default: withCtx(() => [
-              createTextVNode(toDisplayString(_ctx.locale.exportOk), 1)
+              createVNode(_component_ElInput, {
+                maxlength: 200,
+                clearable: true,
+                modelValue: _ctx.form.fileName,
+                "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.form.fileName = $event),
+                placeholder: _ctx.locale.exportFileNamePlaceholder
+              }, null, 8, ["modelValue", "placeholder"])
             ]),
             _: 1
-          }, 8, ["loading", "onClick"])
-        ]),
-        default: withCtx(() => [
-          createVNode(_component_ElForm, {
-            ref: "formRef",
-            model: _ctx.form,
-            labelWidth: "80px",
-            onSubmit: _cache[6] || (_cache[6] = withModifiers(() => {
-            }, ["prevent"])),
-            class: "ele-tool-export-form"
+          }, 8, ["label", "rules"]),
+          createVNode(_component_ElFormItem, {
+            label: _ctx.locale.exportSelectData
           }, {
             default: withCtx(() => [
-              createVNode(_component_ElFormItem, {
-                label: _ctx.locale.exportFileName,
-                prop: "fileName",
-                rules: _ctx.fileNameRules
-              }, {
-                default: withCtx(() => [
-                  createVNode(_component_ElInput, {
-                    maxlength: 20,
-                    clearable: true,
-                    modelValue: _ctx.form.fileName,
-                    "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.form.fileName = $event),
-                    placeholder: _ctx.locale.exportFileNamePlaceholder
-                  }, null, 8, ["modelValue", "placeholder"])
-                ]),
-                _: 1
-              }, 8, ["label", "rules"]),
-              createVNode(_component_ElFormItem, {
-                label: _ctx.locale.exportSelectData
-              }, {
-                default: withCtx(() => [
-                  createVNode(_component_ElSelect, {
-                    modelValue: _ctx.dataType,
-                    "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _ctx.dataType = $event),
-                    placeholder: _ctx.locale.exportSelectData
-                  }, {
-                    default: withCtx(() => [
-                      _ctx.pageData != null ? (openBlock(), createBlock(_component_ElOption, {
-                        key: 0,
-                        value: "pageData",
-                        label: _ctx.locale.exportDataTypePage
-                      }, null, 8, ["label"])) : createCommentVNode("", true),
-                      _ctx.selections != null ? (openBlock(), createBlock(_component_ElOption, {
-                        key: 1,
-                        value: "selections",
-                        label: _ctx.locale.exportDataTypeSelected
-                      }, null, 8, ["label"])) : createCommentVNode("", true),
-                      _ctx.datasource != null ? (openBlock(), createBlock(_component_ElOption, {
-                        key: 2,
-                        value: "data",
-                        label: _ctx.locale.exportDataTypeAll
-                      }, null, 8, ["label"])) : createCommentVNode("", true)
-                    ]),
-                    _: 1
-                  }, 8, ["modelValue", "placeholder"])
-                ]),
-                _: 1
-              }, 8, ["label"]),
-              createVNode(_component_ElFormItem, {
-                label: _ctx.locale.exportSelectColumn
+              createVNode(_component_ElSelect, {
+                modelValue: _ctx.dataType,
+                "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _ctx.dataType = $event),
+                placeholder: _ctx.locale.exportSelectData
               }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_1, [
-                    createElementVNode("div", _hoisted_2, [
-                      createElementVNode("div", _hoisted_3, [
-                        createVNode(_component_ElCheckbox, {
-                          label: _ctx.locale.columnTitle,
-                          modelValue: _ctx.isCheckAll,
-                          indeterminate: _ctx.isIndeterminate,
-                          "onUpdate:modelValue": _ctx.handleCheckAllChange
-                        }, null, 8, ["label", "modelValue", "indeterminate", "onUpdate:modelValue"])
-                      ]),
-                      createElementVNode("div", {
-                        class: "ele-tool-column-link",
-                        onClick: _cache[2] || (_cache[2] = (...args) => _ctx.handleReset && _ctx.handleReset(...args))
-                      }, toDisplayString(_ctx.locale.columnReset), 1)
-                    ]),
-                    createVNode(_component_ToolColumnList, {
-                      data: _ctx.colItems,
-                      sortable: true,
-                      onSortChange: _ctx.handleSortChange,
-                      onCheckedChange: _ctx.handleCheckedChange
-                    }, null, 8, ["data", "onSortChange", "onCheckedChange"])
-                  ])
+                  _ctx.pageData != null ? (openBlock(), createBlock(_component_ElOption, {
+                    key: 0,
+                    value: "pageData",
+                    label: _ctx.locale.exportDataTypePage
+                  }, null, 8, ["label"])) : createCommentVNode("", true),
+                  _ctx.selections != null ? (openBlock(), createBlock(_component_ElOption, {
+                    key: 1,
+                    value: "selections",
+                    label: _ctx.locale.exportDataTypeSelected
+                  }, null, 8, ["label"])) : createCommentVNode("", true),
+                  _ctx.datasource != null ? (openBlock(), createBlock(_component_ElOption, {
+                    key: 2,
+                    value: "data",
+                    label: _ctx.locale.exportDataTypeAll
+                  }, null, 8, ["label"])) : createCommentVNode("", true)
                 ]),
                 _: 1
-              }, 8, ["label"]),
-              createVNode(_component_ElFormItem, {
-                label: _ctx.locale.exportOther
-              }, {
-                default: withCtx(() => [
-                  createElementVNode("div", _hoisted_4, [
-                    createVNode(_component_ElCheckbox, {
-                      label: _ctx.locale.exportOtherHeader,
-                      modelValue: _ctx.showHeader,
-                      "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => _ctx.showHeader = $event)
-                    }, null, 8, ["label", "modelValue"]),
-                    createVNode(_component_ElCheckbox, {
-                      label: _ctx.locale.exportOtherFooter,
-                      modelValue: _ctx.showFooter,
-                      "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => _ctx.showFooter = $event),
-                      disabled: !_ctx.showSummary
-                    }, null, 8, ["label", "modelValue", "disabled"]),
+              }, 8, ["modelValue", "placeholder"])
+            ]),
+            _: 1
+          }, 8, ["label"]),
+          createVNode(_component_ElFormItem, {
+            label: _ctx.locale.exportSelectColumn
+          }, {
+            default: withCtx(() => [
+              createElementVNode("div", _hoisted_1, [
+                createElementVNode("div", _hoisted_2, [
+                  createElementVNode("div", _hoisted_3, [
                     createVNode(_component_ElCheckbox, {
-                      label: _ctx.locale.exportOtherTreeIndex,
-                      modelValue: _ctx.showTreeIndex,
-                      "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => _ctx.showTreeIndex = $event),
-                      disabled: _ctx.treeIndexDisabled,
-                      onChange: _ctx.handleTreeIndexChange
-                    }, null, 8, ["label", "modelValue", "disabled", "onChange"])
-                  ])
+                      label: _ctx.locale.columnTitle,
+                      modelValue: _ctx.isCheckAll,
+                      indeterminate: _ctx.isIndeterminate,
+                      "onUpdate:modelValue": _ctx.handleCheckAllChange
+                    }, null, 8, ["label", "modelValue", "indeterminate", "onUpdate:modelValue"])
+                  ]),
+                  createElementVNode("div", {
+                    class: "ele-tool-column-link",
+                    onClick: _cache[2] || (_cache[2] = (...args) => _ctx.handleReset && _ctx.handleReset(...args))
+                  }, toDisplayString(_ctx.locale.columnReset), 1)
                 ]),
-                _: 1
-              }, 8, ["label"])
+                createVNode(_component_ToolColumnList, {
+                  data: _ctx.colItems,
+                  sortable: true,
+                  allowWidth: true,
+                  columnWidthPlaceholder: _ctx.locale.columnWidth,
+                  onSortChange: _ctx.handleSortChange,
+                  onCheckedChange: _ctx.handleCheckedChange,
+                  onColWidthChange: _ctx.handleColWidthChange
+                }, null, 8, ["data", "columnWidthPlaceholder", "onSortChange", "onCheckedChange", "onColWidthChange"])
+              ])
+            ]),
+            _: 1
+          }, 8, ["label"]),
+          createVNode(_component_ElFormItem, {
+            label: _ctx.locale.exportOther
+          }, {
+            default: withCtx(() => [
+              createElementVNode("div", _hoisted_4, [
+                createVNode(_component_ElCheckbox, {
+                  label: _ctx.locale.exportOtherHeader,
+                  modelValue: _ctx.showHeader,
+                  "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => _ctx.showHeader = $event)
+                }, null, 8, ["label", "modelValue"]),
+                createVNode(_component_ElCheckbox, {
+                  label: _ctx.locale.exportOtherFooter,
+                  modelValue: _ctx.showFooter,
+                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => _ctx.showFooter = $event),
+                  disabled: !_ctx.showSummary
+                }, null, 8, ["label", "modelValue", "disabled"]),
+                createVNode(_component_ElCheckbox, {
+                  label: _ctx.locale.exportOtherTreeIndex,
+                  modelValue: _ctx.showTreeIndex,
+                  "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => _ctx.showTreeIndex = $event),
+                  disabled: _ctx.treeIndexDisabled,
+                  onChange: _ctx.handleTreeIndexChange
+                }, null, 8, ["label", "modelValue", "disabled", "onChange"])
+              ])
             ]),
             _: 1
-          }, 8, ["model"])
+          }, 8, ["label"])
         ]),
         _: 1
-      }, 16, ["title", "modelValue"])
+      }, 8, ["model"])
     ]),
     _: 1
-  }, 8, ["title", "placement", "onClick"]);
+  }, 16, ["title", "modelValue"]);
 }
 const toolExport = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {

package/es/ele-pro-table/components/tool-print-body-cell.d.ts

@@ -1,5 +1,6 @@
 import { PropType } from 'vue';
 import { StyleValues } from '../../ele-app/types';
+import { CellStyle, CellClass } from '../../ele-data-table/types';
 import { CustomRenderProps } from '../../ele-virtual-table/types';
 import { ExportDataItem } from '../types';
 
@@ -12,9 +13,9 @@ declare const _default: import('vue').DefineComponent<{
     /** 列索引 */
     columnIndex: NumberConstructor;
     /** 单元格样式 */
-    bodyCellStyle: PropType<import('element-plus').CellStyle<import('../types').DataItem> | undefined>;
+    bodyCellStyle: PropType<CellStyle>;
     /** 单元格类名自定义 */
-    bodyCellClass: PropType<import('element-plus').CellCls<import('../types').DataItem> | undefined>;
+    bodyCellClass: PropType<CellClass>;
 }, {
     renderOpt: import('vue').ComputedRef<CustomRenderProps>;
     cellStyle: import('vue').ComputedRef<StyleValues | undefined>;
@@ -28,8 +29,8 @@ declare const _default: import('vue').DefineComponent<{
     /** 列索引 */
     columnIndex: NumberConstructor;
     /** 单元格样式 */
-    bodyCellStyle: PropType<import('element-plus').CellStyle<import('../types').DataItem> | undefined>;
+    bodyCellStyle: PropType<CellStyle>;
     /** 单元格类名自定义 */
-    bodyCellClass: PropType<import('element-plus').CellCls<import('../types').DataItem> | undefined>;
+    bodyCellClass: PropType<CellClass>;
 }>>, {}, {}>;
 export default _default;

package/es/ele-pro-table/components/tool-print-body-cell.js

@@ -23,7 +23,7 @@ const _sfc_main = defineComponent({
       const { text, row, column, index: $index } = props.col;
       const params = [{ row, column, $index }];
       const slotName = column ? column.printSlot || column.slot : void 0;
-      if (column && !["expand", "selection", "index"].includes(column.type || "") && slotName && typeof slots[slotName] === "function") {
+      if (column && "expand" !== column.type && slotName && typeof slots[slotName] === "function") {
         return { render: slots[slotName], params };
       }
       return { render: () => text, params };

package/es/ele-pro-table/components/tool-print-header-cell.d.ts

@@ -1,5 +1,6 @@
 import { PropType } from 'vue';
 import { StyleValues } from '../../ele-app/types';
+import { HeaderCellStyle, HeaderCellClass } from '../../ele-data-table/types';
 import { CustomRenderProps } from '../../ele-virtual-table/types';
 import { ExportDataItem } from '../types';
 
@@ -12,9 +13,9 @@ declare const _default: import('vue').DefineComponent<{
     /** 列索引 */
     columnIndex: NumberConstructor;
     /** 单元格样式 */
-    headerCellStyle: PropType<import('element-plus').CellStyle<import('../types').DataItem> | undefined>;
+    headerCellStyle: PropType<HeaderCellStyle>;
     /** 单元格类名自定义 */
-    headerCellClass: PropType<import('element-plus').CellCls<import('../types').DataItem> | undefined>;
+    headerCellClass: PropType<HeaderCellClass>;
 }, {
     renderOpt: import('vue').ComputedRef<CustomRenderProps>;
     cellStyle: import('vue').ComputedRef<StyleValues | undefined>;
@@ -28,8 +29,8 @@ declare const _default: import('vue').DefineComponent<{
     /** 列索引 */
     columnIndex: NumberConstructor;
     /** 单元格样式 */
-    headerCellStyle: PropType<import('element-plus').CellStyle<import('../types').DataItem> | undefined>;
+    headerCellStyle: PropType<HeaderCellStyle>;
     /** 单元格类名自定义 */
-    headerCellClass: PropType<import('element-plus').CellCls<import('../types').DataItem> | undefined>;
+    headerCellClass: PropType<HeaderCellClass>;
 }>>, {}, {}>;
 export default _default;

package/es/ele-pro-table/components/tool-print-header-cell.js

@@ -20,8 +20,9 @@ const _sfc_main = defineComponent({
     const renderOpt = computed(() => {
       const { text, column } = props.col;
       const params = [{ column, $index: props.columnIndex }];
-      if (column && "index" !== column.type && column.headerSlot && typeof slots[column.headerSlot] === "function") {
-        return { render: slots[column.headerSlot], params };
+      const slotName = column ? column.printHeaderSlot || column.headerSlot : void 0;
+      if (column && slotName && typeof slots[slotName] === "function") {
+        return { render: slots[slotName], params };
       }
       return { render: () => text, params };
     });