ele-admin-plus 1.1.9-beta.9 → 1.2.0-beta.1

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

@@ -1,8 +1,9 @@
-import type { PropType } from 'vue';
+import { ExportDataItem } from '../types';
+import { CustomRenderProps } from '../../ele-virtual-table/types';
 import { StyleValues } from '../../ele-app/types';
-import type { CustomRenderProps } from '../../ele-virtual-table/types';
-import type { ExportDataItem } from '../types';
-declare const _default: import("vue").DefineComponent<{
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 列数据 */
     col: {
         type: PropType<ExportDataItem>;
@@ -11,14 +12,14 @@ declare const _default: import("vue").DefineComponent<{
     /** 列索引 */
     columnIndex: NumberConstructor;
     /** 单元格样式 */
-    headerCellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<import("../types").DataItem> | undefined>;
+    headerCellStyle: PropType<import('element-plus').CellStyle<import('../types').DataItem> | undefined>;
     /** 单元格类名自定义 */
-    headerCellClass: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<import("../types").DataItem> | undefined>;
+    headerCellClass: PropType<import('element-plus').CellCls<import('../types').DataItem> | undefined>;
 }, {
-    renderOpt: import("vue").ComputedRef<CustomRenderProps>;
-    cellStyle: import("vue").ComputedRef<StyleValues | undefined>;
-    cellClass: import("vue").ComputedRef<string>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    renderOpt: import('vue').ComputedRef<CustomRenderProps>;
+    cellStyle: import('vue').ComputedRef<StyleValues | undefined>;
+    cellClass: import('vue').ComputedRef<string>;
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 列数据 */
     col: {
         type: PropType<ExportDataItem>;
@@ -27,8 +28,8 @@ declare const _default: import("vue").DefineComponent<{
     /** 列索引 */
     columnIndex: NumberConstructor;
     /** 单元格样式 */
-    headerCellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<import("../types").DataItem> | undefined>;
+    headerCellStyle: PropType<import('element-plus').CellStyle<import('../types').DataItem> | undefined>;
     /** 单元格类名自定义 */
-    headerCellClass: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<import("../types").DataItem> | undefined>;
+    headerCellClass: PropType<import('element-plus').CellCls<import('../types').DataItem> | undefined>;
 }>>, {}, {}>;
 export default _default;

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

@@ -33,30 +33,13 @@ const _sfc_main = vue.defineComponent({
     ToolPrintHeaderCell
   },
   props: {
-    /** 提示文字 */
-    title: String,
     /** 提示位置 */
     placement: String,
-    /** 全选文字 */
-    checkAllText: String,
-    /** 重置文字 */
-    resetText: String,
-    /** 无标题列文字 */
-    untitledText: String,
-    /** 选择数据文字 */
-    selectDataText: String,
-    /** 选择字段文字 */
-    selectColumnText: String,
-    /** 当前页数据文字 */
-    dataTypePageText: String,
-    /** 选中数据文字 */
-    dataTypeSelectedText: String,
-    /** 全部数据文字 */
-    dataTypeAllText: String,
-    /** 取消文字 */
-    cancelText: String,
-    /** 确定文字 */
-    okText: String,
+    /** 表格国际化 */
+    locale: {
+      type: Object,
+      required: true
+    },
     /** 弹窗参数 */
     modalProps: Object,
     /** 打印组件参数 */
@@ -70,9 +53,11 @@ const _sfc_main = vue.defineComponent({
     /** 表格当前页数据 */
     pageData: Array,
     /** 表格全部数据 */
-    datasource: Array,
+    datasource: [Array, Function],
     /** 单元格合并行列方法 */
     spanMethod: Function,
+    /** 表格是否有表头 */
+    tableHeader: Boolean,
     /** 是否显示合计行 */
     showSummary: Boolean,
     /** 合计行文本 */
@@ -89,6 +74,8 @@ const _sfc_main = vue.defineComponent({
     headerCellClassName: [String, Function],
     /** 序号列起始索引 */
     pageIndex: Number,
+    /** 子级字段名 */
+    childrenField: String,
     /** 表格请求数据方法 */
     fetch: Function,
     /** 默认数据类型 */
@@ -106,6 +93,10 @@ const _sfc_main = vue.defineComponent({
     const colItems = vue.ref([]);
     const isCheckAll = vue.ref(false);
     const isIndeterminate = vue.ref(false);
+    const showHeader = vue.ref(true);
+    const showFooter = vue.ref(false);
+    const showTreeIndex = vue.ref(false);
+    const treeIndexDisabled = vue.ref(true);
     const printOptions = vue.reactive({
       printing: false,
       headerData: [],
@@ -113,7 +104,8 @@ const _sfc_main = vue.defineComponent({
       footerData: [],
       hasHeader: false,
       hasFooter: false,
-      bodyCols: []
+      bodyCols: [],
+      data: []
     });
     const openModal = () => {
       visible.value = true;
@@ -129,9 +121,6 @@ const _sfc_main = vue.defineComponent({
     };
     const onPrintDone = () => {
       hideLoading();
-      if (props.printerProps != null && typeof props.printerProps.onDone === "function") {
-        props.printerProps.onDone();
-      }
     };
     const printData = (data) => {
       showLoading();
@@ -139,16 +128,19 @@ const _sfc_main = vue.defineComponent({
         props.columns,
         colItems.value,
         true,
-        util$1.exportColumnsfilter
+        util$1.columnsPrintFilter
       );
       const { headerData, bodyData, footerData, bodyCols } = util$1.getExportData(
         data,
         columns,
         props.spanMethod,
         props.pageIndex,
-        props.showSummary,
+        showFooter.value,
         props.sumText,
-        props.summaryMethod
+        props.summaryMethod,
+        props.childrenField,
+        showTreeIndex.value,
+        showHeader.value
       );
       if (typeof props.beforePrint === "function") {
         const flag = props.beforePrint({
@@ -165,6 +157,7 @@ const _sfc_main = vue.defineComponent({
           return;
         }
       }
+      printOptions.data = data;
       printOptions.headerData = headerData;
       printOptions.bodyData = bodyData;
       printOptions.footerData = footerData;
@@ -203,8 +196,12 @@ const _sfc_main = vue.defineComponent({
     const initColItems = () => {
       colItems.value = util$1.getColItems(
         props.columns,
-        props.untitledText,
-        util$1.exportColumnsfilter
+        props.locale.columnUntitled,
+        props.locale.columnIndex,
+        props.locale.columnExpand,
+        util$1.columnsPrintFilter,
+        true,
+        true
       );
       let checkAll = true;
       let indeterminate = false;
@@ -222,11 +219,12 @@ const _sfc_main = vue.defineComponent({
       isCheckAll.value = colItems.value.length > 0 && checkAll;
       isIndeterminate.value = !checkAll && indeterminate;
     };
-    const onCheckedChange = (item, checked) => {
+    const onCheckedChange = (item, checked, type) => {
       let checkAll = true;
       let indeterminate = false;
       core.eachTree(colItems.value, (d) => {
-        if (d.uid === item.uid) {
+        const flag = item == null ? type === d.type : d.uid === item.uid;
+        if (flag) {
           d.checked = checked;
         }
         if (!d.checked && checkAll) {
@@ -235,7 +233,7 @@ const _sfc_main = vue.defineComponent({
         if (d.checked && !indeterminate) {
           indeterminate = true;
         }
-        if (d.uid === item.uid && !checkAll && indeterminate) {
+        if (flag && !checkAll && indeterminate) {
           return false;
         }
       });
@@ -266,12 +264,30 @@ const _sfc_main = vue.defineComponent({
     const onReset = () => {
       initColItems();
     };
+    const handleTreeIndexChange = (checked) => {
+      if (checked) {
+        onCheckedChange(void 0, false, "index");
+      }
+    };
     vue.watch(visible, (visible2) => {
       if (visible2) {
         dataType.value = props.defaultDataType;
         initColItems();
+        showHeader.value = props.tableHeader;
+        showFooter.value = props.showSummary;
+        treeIndexDisabled.value = !(props.pageData && props.pageData.some(
+          (d) => {
+            var _a;
+            return props.childrenField && ((_a = d[props.childrenField]) == null ? void 0 : _a.length);
+          }
+        )) && core.findTree(colItems.value, (c) => c.type === "expand") == null;
+        if (treeIndexDisabled.value) {
+          showTreeIndex.value = false;
+        }
+        handleTreeIndexChange(showTreeIndex.value);
         return;
       }
+      printOptions.data = [];
       printOptions.headerData = [];
       printOptions.bodyData = [];
       printOptions.footerData = [];
@@ -288,6 +304,10 @@ const _sfc_main = vue.defineComponent({
       colItems,
       isCheckAll,
       isIndeterminate,
+      showHeader,
+      showFooter,
+      showTreeIndex,
+      treeIndexDisabled,
       printOptions,
       openModal,
       closeModal,
@@ -296,7 +316,8 @@ const _sfc_main = vue.defineComponent({
       onCheckedChange,
       onSortChange,
       onCheckAllChange,
-      onReset
+      onReset,
+      handleTreeIndexChange
     };
   }
 });
@@ -310,9 +331,14 @@ const _export_sfc = (sfc, props) => {
 const _hoisted_1 = { class: "ele-tool-column is-sortable" };
 const _hoisted_2 = { class: "ele-tool-column-header" };
 const _hoisted_3 = { class: "ele-tool-column-label" };
-const _hoisted_4 = ["width"];
-const _hoisted_5 = { key: 0 };
-const _hoisted_6 = { key: 1 };
+const _hoisted_4 = { class: "ele-tool-form-options" };
+const _hoisted_5 = ["width"];
+const _hoisted_6 = { key: 0 };
+const _hoisted_7 = ["colspan", "rowspan"];
+const _hoisted_8 = ["rowspan", "colspan"];
+const _hoisted_9 = ["colspan", "rowspan"];
+const _hoisted_10 = { key: 1 };
+const _hoisted_11 = ["colspan", "rowspan"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_PrinterOutlined = vue.resolveComponent("PrinterOutlined");
   const _component_ElIcon = vue.resolveComponent("ElIcon");
@@ -331,7 +357,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElePrinter = vue.resolveComponent("ElePrinter");
   const _component_EleTool = vue.resolveComponent("EleTool");
   return vue.openBlock(), vue.createBlock(_component_EleTool, {
-    title: _ctx.title,
+    title: _ctx.locale.print,
     placement: _ctx.placement,
     onClick: _ctx.openModal
   }, {
@@ -345,16 +371,16 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       vue.createVNode(_component_EleModal, vue.mergeProps({
         form: true,
         width: "460px",
-        title: _ctx.title,
+        title: _ctx.locale.print,
         position: "center"
       }, _ctx.modalProps || {}, {
         modelValue: _ctx.visible,
-        "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => _ctx.visible = $event)
+        "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => _ctx.visible = $event)
       }), {
         footer: vue.withCtx(() => [
           vue.createVNode(_component_ElButton, { onClick: _ctx.closeModal }, {
             default: vue.withCtx(() => [
-              vue.createTextVNode(vue.toDisplayString(_ctx.cancelText), 1)
+              vue.createTextVNode(vue.toDisplayString(_ctx.locale.exportCancel), 1)
             ]),
             _: 1
           }, 8, ["onClick"]),
@@ -364,7 +390,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             onClick: _ctx.handlePrint
           }, {
             default: vue.withCtx(() => [
-              vue.createTextVNode(vue.toDisplayString(_ctx.okText), 1)
+              vue.createTextVNode(vue.toDisplayString(_ctx.locale.exportOk), 1)
             ]),
             _: 1
           }, 8, ["loading", "onClick"])
@@ -372,33 +398,35 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         default: vue.withCtx(() => [
           vue.createVNode(_component_ElForm, {
             labelWidth: "80px",
-            onSubmit: _cache[2] || (_cache[2] = vue.withModifiers(() => {
+            onSubmit: _cache[5] || (_cache[5] = vue.withModifiers(() => {
             }, ["prevent"])),
             class: "ele-tool-print-form"
           }, {
             default: vue.withCtx(() => [
-              vue.createVNode(_component_ElFormItem, { label: _ctx.selectDataText }, {
+              vue.createVNode(_component_ElFormItem, {
+                label: _ctx.locale.exportSelectData
+              }, {
                 default: vue.withCtx(() => [
                   vue.createVNode(_component_ElSelect, {
                     modelValue: _ctx.dataType,
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.dataType = $event),
-                    placeholder: _ctx.selectDataText
+                    placeholder: _ctx.locale.exportSelectData
                   }, {
                     default: vue.withCtx(() => [
                       _ctx.pageData != null ? (vue.openBlock(), vue.createBlock(_component_ElOption, {
                         key: 0,
                         value: "pageData",
-                        label: _ctx.dataTypePageText
+                        label: _ctx.locale.exportDataTypePage
                       }, null, 8, ["label"])) : vue.createCommentVNode("", true),
                       _ctx.selections != null ? (vue.openBlock(), vue.createBlock(_component_ElOption, {
                         key: 1,
                         value: "selections",
-                        label: _ctx.dataTypeSelectedText
+                        label: _ctx.locale.exportDataTypeSelected
                       }, null, 8, ["label"])) : vue.createCommentVNode("", true),
                       _ctx.datasource != null ? (vue.openBlock(), vue.createBlock(_component_ElOption, {
                         key: 2,
                         value: "data",
-                        label: _ctx.dataTypeAllText
+                        label: _ctx.locale.exportDataTypeAll
                       }, null, 8, ["label"])) : vue.createCommentVNode("", true)
                     ]),
                     _: 1
@@ -406,26 +434,24 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 ]),
                 _: 1
               }, 8, ["label"]),
-              vue.createVNode(_component_ElFormItem, { label: _ctx.selectColumnText }, {
+              vue.createVNode(_component_ElFormItem, {
+                label: _ctx.locale.exportSelectColumn
+              }, {
                 default: vue.withCtx(() => [
                   vue.createElementVNode("div", _hoisted_1, [
                     vue.createElementVNode("div", _hoisted_2, [
                       vue.createElementVNode("div", _hoisted_3, [
                         vue.createVNode(_component_ElCheckbox, {
+                          label: _ctx.locale.columnTitle,
                           modelValue: _ctx.isCheckAll,
                           indeterminate: _ctx.isIndeterminate,
                           "onUpdate:modelValue": _ctx.onCheckAllChange
-                        }, {
-                          default: vue.withCtx(() => [
-                            vue.createTextVNode(vue.toDisplayString(_ctx.checkAllText), 1)
-                          ]),
-                          _: 1
-                        }, 8, ["modelValue", "indeterminate", "onUpdate:modelValue"])
+                        }, null, 8, ["label", "modelValue", "indeterminate", "onUpdate:modelValue"])
                       ]),
                       vue.createElementVNode("div", {
                         class: "ele-tool-column-link",
                         onClick: _cache[1] || (_cache[1] = (...args) => _ctx.onReset && _ctx.onReset(...args))
-                      }, vue.toDisplayString(_ctx.resetText), 1)
+                      }, vue.toDisplayString(_ctx.locale.columnReset), 1)
                     ]),
                     vue.createVNode(_component_ToolColumnList, {
                       data: _ctx.colItems,
@@ -436,6 +462,34 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   ])
                 ]),
                 _: 1
+              }, 8, ["label"]),
+              vue.createVNode(_component_ElFormItem, {
+                label: _ctx.locale.exportOther
+              }, {
+                default: vue.withCtx(() => [
+                  vue.createElementVNode("div", _hoisted_4, [
+                    vue.createVNode(_component_ElCheckbox, {
+                      label: _ctx.locale.exportOtherHeader,
+                      modelValue: _ctx.showHeader,
+                      "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => _ctx.showHeader = $event),
+                      disabled: !_ctx.tableHeader
+                    }, null, 8, ["label", "modelValue", "disabled"]),
+                    vue.createVNode(_component_ElCheckbox, {
+                      label: _ctx.locale.exportOtherFooter,
+                      modelValue: _ctx.showFooter,
+                      "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => _ctx.showFooter = $event),
+                      disabled: !_ctx.showSummary
+                    }, null, 8, ["label", "modelValue", "disabled"]),
+                    vue.createVNode(_component_ElCheckbox, {
+                      label: _ctx.locale.exportOtherTreeIndex,
+                      modelValue: _ctx.showTreeIndex,
+                      "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => _ctx.showTreeIndex = $event),
+                      disabled: _ctx.treeIndexDisabled,
+                      onChange: _ctx.handleTreeIndexChange
+                    }, null, 8, ["label", "modelValue", "disabled", "onChange"])
+                  ])
+                ]),
+                _: 1
               }, 8, ["label"])
             ]),
             _: 1
@@ -445,10 +499,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       }, 16, ["title", "modelValue"]),
       vue.createVNode(_component_ElePrinter, vue.mergeProps({ target: "_iframe" }, _ctx.printerProps || {}, {
         modelValue: _ctx.printOptions.printing,
-        "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => _ctx.printOptions.printing = $event),
+        "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => _ctx.printOptions.printing = $event),
         onDone: _ctx.onPrintDone
       }), {
         default: vue.withCtx(() => [
+          vue.renderSlot(_ctx.$slots, "printTop", {
+            data: _ctx.printOptions.data
+          }),
           vue.createVNode(_component_EleTable, vue.mergeProps({
             border: true,
             printSkin: true,
@@ -461,22 +518,33 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   return vue.openBlock(), vue.createElementBlock("col", {
                     key: col.key,
                     width: col.width
-                  }, null, 8, _hoisted_4);
+                  }, null, 8, _hoisted_5);
                 }), 128))
               ]),
-              _ctx.printOptions.hasHeader ? (vue.openBlock(), vue.createElementBlock("thead", _hoisted_5, [
+              _ctx.printOptions.hasHeader ? (vue.openBlock(), vue.createElementBlock("thead", _hoisted_6, [
                 (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.printOptions.headerData, (item, index) => {
                   return vue.openBlock(), vue.createElementBlock("tr", { key: index }, [
                     (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(item, (col, columnIndex) => {
-                      return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
-                        col.rowspan != 0 && col.colspan != 0 ? (vue.openBlock(), vue.createBlock(_component_ToolPrintHeaderCell, {
-                          key: col.key,
+                      return vue.openBlock(), vue.createElementBlock(vue.Fragment, {
+                        key: col.key
+                      }, [
+                        col.isTreeIndex ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
+                          col.rowspan !== 0 && col.colspan !== 0 ? (vue.openBlock(), vue.createElementBlock("th", {
+                            key: 0,
+                            colspan: col.colspan,
+                            rowspan: col.rowspan,
+                            class: "ele-print-tree-index"
+                          }, null, 8, _hoisted_7)) : vue.createCommentVNode("", true)
+                        ], 64)) : col.rowspan !== 0 && col.colspan !== 0 ? (vue.openBlock(), vue.createBlock(_component_ToolPrintHeaderCell, {
+                          key: 1,
                           col,
                           columnIndex,
                           headerCellStyle: _ctx.headerCellStyle,
                           headerCellClass: _ctx.headerCellClassName
                         }, vue.createSlots({ _: 2 }, [
-                          vue.renderList(Object.keys(_ctx.$slots), (name) => {
+                          vue.renderList(Object.keys(_ctx.$slots).filter(
+                            (k) => !["printTop", "printBottom"].includes(k)
+                          ), (name) => {
                             return {
                               name,
                               fn: vue.withCtx((slotProps) => [
@@ -486,7 +554,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                           })
                         ]), 1032, ["col", "columnIndex", "headerCellStyle", "headerCellClass"])) : vue.createCommentVNode("", true)
                       ], 64);
-                    }), 256))
+                    }), 128))
                   ]);
                 }), 128))
               ])) : vue.createCommentVNode("", true),
@@ -494,15 +562,52 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.printOptions.bodyData, (item, index) => {
                   return vue.openBlock(), vue.createElementBlock("tr", { key: index }, [
                     (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(item, (col, columnIndex) => {
-                      return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
-                        col.rowspan != 0 && col.colspan != 0 ? (vue.openBlock(), vue.createBlock(_component_ToolPrintBodyCell, {
-                          key: col.key,
+                      return vue.openBlock(), vue.createElementBlock(vue.Fragment, {
+                        key: col.key
+                      }, [
+                        col.isExpandCell ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
+                          col.rowspan !== 0 && col.colspan !== 0 ? (vue.openBlock(), vue.createElementBlock("td", {
+                            key: 0,
+                            rowspan: col.rowspan,
+                            colspan: col.colspan,
+                            style: { "padding-left": "0", "padding-right": "0" },
+                            class: "ele-print-expand-td"
+                          }, [
+                            col.column && (col.column.printSlot || col.column.slot) && !["printTop", "printBottom"].includes(
+                              col.column.printSlot || col.column.slot
+                            ) ? vue.renderSlot(_ctx.$slots, col.column.printSlot || col.column.slot, vue.normalizeProps(vue.mergeProps({ key: 0 }, {
+                              row: col.row,
+                              column: col.column,
+                              $index: col.index
+                            }))) : vue.createCommentVNode("", true)
+                          ], 8, _hoisted_8)) : vue.createCommentVNode("", true)
+                        ], 64)) : col.isTreeIndex ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
+                          col.rowspan !== 0 && col.colspan !== 0 ? (vue.openBlock(), vue.createElementBlock("td", {
+                            key: 0,
+                            colspan: col.colspan,
+                            rowspan: col.rowspan,
+                            style: vue.normalizeStyle({
+                              paddingLeft: 0,
+                              paddingRight: 0,
+                              textAlign: "center",
+                              verticalAlign: "top",
+                              borderLeftColor: col.text ? void 0 : "transparent"
+                            }),
+                            class: vue.normalizeClass([
+                              "ele-print-tree-index",
+                              { "is-placeholder": !col.text }
+                            ])
+                          }, vue.toDisplayString(col.text), 15, _hoisted_9)) : vue.createCommentVNode("", true)
+                        ], 64)) : col.rowspan !== 0 && col.colspan !== 0 ? (vue.openBlock(), vue.createBlock(_component_ToolPrintBodyCell, {
+                          key: 2,
                           col,
                           columnIndex,
                           bodyCellStyle: _ctx.cellStyle,
                           bodyCellClass: _ctx.cellClassName
                         }, vue.createSlots({ _: 2 }, [
-                          vue.renderList(Object.keys(_ctx.$slots), (name) => {
+                          vue.renderList(Object.keys(_ctx.$slots).filter(
+                            (k) => !["printTop", "printBottom"].includes(k)
+                          ), (name) => {
                             return {
                               name,
                               fn: vue.withCtx((slotProps) => [
@@ -512,29 +617,37 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                           })
                         ]), 1032, ["col", "columnIndex", "bodyCellStyle", "bodyCellClass"])) : vue.createCommentVNode("", true)
                       ], 64);
-                    }), 256))
+                    }), 128))
                   ]);
                 }), 128))
               ]),
-              _ctx.printOptions.hasFooter ? (vue.openBlock(), vue.createElementBlock("tfoot", _hoisted_6, [
+              _ctx.printOptions.hasFooter ? (vue.openBlock(), vue.createElementBlock("tfoot", _hoisted_10, [
                 (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.printOptions.footerData, (item, index) => {
                   return vue.openBlock(), vue.createElementBlock("tr", { key: index }, [
                     (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(item, (col) => {
-                      return vue.openBlock(), vue.createElementBlock("td", {
-                        key: col.key
-                      }, [
-                        vue.createVNode(_component_CellRender, {
-                          render: () => col.text,
-                          params: []
-                        }, null, 8, ["render"])
-                      ]);
-                    }), 128))
+                      return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
+                        col.rowspan !== 0 && col.colspan !== 0 ? (vue.openBlock(), vue.createElementBlock("td", {
+                          key: col.key,
+                          colspan: col.colspan,
+                          rowspan: col.rowspan
+                        }, [
+                          !col.isExpandCell ? (vue.openBlock(), vue.createBlock(_component_CellRender, {
+                            key: 0,
+                            render: () => col.text,
+                            params: []
+                          }, null, 8, ["render"])) : vue.createCommentVNode("", true)
+                        ], 8, _hoisted_11)) : vue.createCommentVNode("", true)
+                      ], 64);
+                    }), 256))
                   ]);
                 }), 128))
               ])) : vue.createCommentVNode("", true)
             ]),
             _: 3
-          }, 16, ["hasHeader", "hasFooter"])
+          }, 16, ["hasHeader", "hasFooter"]),
+          vue.renderSlot(_ctx.$slots, "printBottom", {
+            data: _ctx.printOptions.data
+          })
         ]),
         _: 3
       }, 16, ["modelValue", "onDone"])