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

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

@@ -70,7 +70,7 @@ const _sfc_main = vue.defineComponent({
     /** 表格当前页数据 */
     pageData: Array,
     /** 表格全部数据 */
-    datasource: Array,
+    datasource: [Array, Function],
     /** 单元格合并行列方法 */
     spanMethod: Function,
     /** 是否显示合计行 */
@@ -113,7 +113,8 @@ const _sfc_main = vue.defineComponent({
       footerData: [],
       hasHeader: false,
       hasFooter: false,
-      bodyCols: []
+      bodyCols: [],
+      data: []
     });
     const openModal = () => {
       visible.value = true;
@@ -129,9 +130,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,7 +137,7 @@ 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,
@@ -165,6 +163,7 @@ const _sfc_main = vue.defineComponent({
           return;
         }
       }
+      printOptions.data = data;
       printOptions.headerData = headerData;
       printOptions.bodyData = bodyData;
       printOptions.footerData = footerData;
@@ -204,7 +203,9 @@ const _sfc_main = vue.defineComponent({
       colItems.value = util$1.getColItems(
         props.columns,
         props.untitledText,
-        util$1.exportColumnsfilter
+        util$1.columnsPrintFilter,
+        true,
+        true
       );
       let checkAll = true;
       let indeterminate = false;
@@ -272,6 +273,7 @@ const _sfc_main = vue.defineComponent({
         initColItems();
         return;
       }
+      printOptions.data = [];
       printOptions.headerData = [];
       printOptions.bodyData = [];
       printOptions.footerData = [];
@@ -412,15 +414,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                     vue.createElementVNode("div", _hoisted_2, [
                       vue.createElementVNode("div", _hoisted_3, [
                         vue.createVNode(_component_ElCheckbox, {
+                          label: _ctx.checkAllText,
                           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",
@@ -449,6 +447,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         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,
@@ -476,7 +477,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                           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) => [
@@ -502,7 +505,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                           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) => [
@@ -534,7 +539,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ])) : vue.createCommentVNode("", true)
             ]),
             _: 3
-          }, 16, ["hasHeader", "hasFooter"])
+          }, 16, ["hasHeader", "hasFooter"]),
+          vue.renderSlot(_ctx.$slots, "printBottom", {
+            data: _ctx.printOptions.data
+          })
         ]),
         _: 3
       }, 16, ["modelValue", "onDone"])