ztxkutils 2.7.14 → 2.7.15

package/dist/print.d.ts

@@ -1,3 +1,8 @@
+/**
+ * @author 陈亚雄
+ * @description 打印相关方法
+ */
+import { jsPDF } from 'jspdf';
 /**
  * 添加水印
  */
@@ -21,5 +26,11 @@ export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, }:
     dom: HTMLElement;
     pdfName: string;
     isShowPage?: boolean;
-}): Promise<void>;
+}): Promise<{
+    pdf: jsPDF;
+    pdfBase64: any[];
+}> | Promise<{
+    pdf: jsPDF;
+    pdfBase64: string;
+}>;
 export {};

package/dist/print.js

@@ -108,6 +108,7 @@ function htmlToPdf(_a) {
     if (allDom.length > 0 && isShowPage) {
         var allDomArray = Array.prototype.slice.call(allDom);
         var promiseAllDomArray_1 = allDomArray.map(function (dom) { return html2canvas(dom); });
+        var pdfBase64_1 = [];
         return (function () {
             return __awaiter(this, void 0, void 0, function () {
                 var i, _i, promiseAllDomArray_2, item, canvas;
@@ -128,13 +129,17 @@ function htmlToPdf(_a) {
                             if (i < promiseAllDomArray_1.length) {
                                 pdf.addPage();
                             }
+                            pdfBase64_1.push(pdf.output('dataurlstring'));
                             _a.label = 3;
                         case 3:
                             _i++;
                             return [3 /*break*/, 1];
                         case 4:
                             pdf.save(pdfName + ".pdf");
-                            return [2 /*return*/, Promise.resolve()];
+                            return [2 /*return*/, Promise.resolve({
+                                    pdf: pdf,
+                                    pdfBase64: pdfBase64_1,
+                                })];
                     }
                 });
             });
@@ -144,6 +149,10 @@ function htmlToPdf(_a) {
         return html2canvas(dom).then(function (canvas) {
             createPdf(canvas, pdf);
             pdf.save(pdfName + ".pdf");
+            return {
+                pdf: pdf,
+                pdfBase64: pdf.output('dataurlstring'),
+            };
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkutils",
-  "version": "2.7.14",
+  "version": "2.7.15",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",