ztxkutils 2.7.16 → 2.7.17

package/dist/print.d.ts

@@ -21,17 +21,18 @@ interface IParams {
     hiddenClassNames?: string[];
 }
 export declare function printCurrentDom({ hiddenClassNames }?: IParams): void;
-export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, noDownload, }: {
+export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, }: {
     pageClassName?: string;
     dom: HTMLElement;
     pdfName: string;
     isShowPage?: boolean;
-    noDownload?: boolean;
+}): Promise<jsPDF>;
+export declare function htmlToPdfForExport({ pageClassName, dom, isShowPage, }: {
+    pageClassName?: string;
+    dom: HTMLElement;
+    isShowPage?: boolean;
 }): Promise<{
-    pdf: jsPDF;
-    pdfBase64: any[];
-}> | Promise<{
-    pdf: jsPDF;
-    pdfBase64: string;
+    pdfs: any;
+    pdfBase64: any;
 }>;
 export {};

package/dist/print.js

@@ -102,13 +102,12 @@ function createPdf(canvas, pdf) {
     }
 }
 function htmlToPdf(_a) {
-    var pageClassName = _a.pageClassName, dom = _a.dom, pdfName = _a.pdfName, isShowPage = _a.isShowPage, noDownload = _a.noDownload;
+    var pageClassName = _a.pageClassName, dom = _a.dom, pdfName = _a.pdfName, isShowPage = _a.isShowPage;
     var pdf = new jsPDF(undefined, 'pt', 'a4');
     var allDom = document.querySelectorAll(pageClassName ? pageClassName : '.html2canvas-container-page');
     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;
@@ -129,19 +128,13 @@ 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:
-                            if (!noDownload) {
-                                pdf.save(pdfName + ".pdf");
-                            }
-                            return [2 /*return*/, Promise.resolve({
-                                    pdf: pdf,
-                                    pdfBase64: pdfBase64_1,
-                                })];
+                            pdf.save(pdfName + ".pdf");
+                            return [2 /*return*/, Promise.resolve(pdf)];
                     }
                 });
             });
@@ -150,15 +143,65 @@ function htmlToPdf(_a) {
     else {
         return html2canvas(dom).then(function (canvas) {
             createPdf(canvas, pdf);
-            if (!noDownload) {
-                pdf.save(pdfName + ".pdf");
-            }
+            pdf.save(pdfName + ".pdf");
+            return pdf;
+        });
+    }
+}
+// html转pdf，为了上传用
+function htmlToPdfForExport(_a) {
+    var pageClassName = _a.pageClassName, dom = _a.dom, isShowPage = _a.isShowPage;
+    // 看是否需要分页
+    var allDom = document.querySelectorAll(pageClassName ? pageClassName : '.html2canvas-container-page');
+    // 如果需要分页
+    if (allDom.length > 0 && isShowPage) {
+        // 类数组转为数组
+        var allDomArray = Array.prototype.slice.call(allDom);
+        // 每个dom添加canvas处理
+        var promiseAllDomArray_3 = allDomArray.map(function (dom) { return html2canvas(dom); });
+        var pdfBase64_1 = [];
+        var pdfs_1 = [];
+        return (function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var _i, promiseAllDomArray_4, item, pdf, canvas;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            _i = 0, promiseAllDomArray_4 = promiseAllDomArray_3;
+                            _a.label = 1;
+                        case 1:
+                            if (!(_i < promiseAllDomArray_4.length)) return [3 /*break*/, 4];
+                            item = promiseAllDomArray_4[_i];
+                            pdf = new jsPDF(undefined, 'pt', 'a4');
+                            return [4 /*yield*/, item];
+                        case 2:
+                            canvas = _a.sent();
+                            createPdf(canvas, pdf);
+                            pdfBase64_1.push(pdf.output('dataurlstring'));
+                            pdfs_1.push(pdf);
+                            _a.label = 3;
+                        case 3:
+                            _i++;
+                            return [3 /*break*/, 1];
+                        case 4: return [2 /*return*/, Promise.resolve({
+                                pdfs: pdfs_1,
+                                pdfBase64: pdfBase64_1,
+                            })];
+                    }
+                });
+            });
+        })();
+    }
+    else {
+        var pdf_1 = new jsPDF(undefined, 'pt', 'a4');
+        return html2canvas(dom).then(function (canvas) {
+            createPdf(canvas, pdf_1);
             return {
-                pdf: pdf,
-                pdfBase64: pdf.output('dataurlstring'),
+                pdfs: [pdf_1],
+                pdfBase64: [pdf_1.output('dataurlstring')],
             };
         });
     }
 }
 
-export { addWaterHandle, htmlToPdf, printCurrentDom, removeWaterHandle };
+export { addWaterHandle, htmlToPdf, htmlToPdfForExport, printCurrentDom, removeWaterHandle };

package/package.json

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