ztxkutils 2.7.14 → 2.7.17

package/dist/print.d.ts

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

package/dist/print.js

@@ -134,7 +134,7 @@ function htmlToPdf(_a) {
                             return [3 /*break*/, 1];
                         case 4:
                             pdf.save(pdfName + ".pdf");
-                            return [2 /*return*/, Promise.resolve()];
+                            return [2 /*return*/, Promise.resolve(pdf)];
                     }
                 });
             });
@@ -144,8 +144,64 @@ function htmlToPdf(_a) {
         return html2canvas(dom).then(function (canvas) {
             createPdf(canvas, 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 {
+                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.14",
+  "version": "2.7.17",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",