ztxkutils 2.5.9 → 2.6.2

package/dist/print.d.ts

@@ -1,10 +1,12 @@
 /**
  * 添加水印
  */
-export declare function addWaterHandle({ waterText, waterClassName }?: {
-    waterText: string;
-    waterClassName: string;
+export declare function addWaterHandle({ waterText, waterClassName, isPrintWater, }?: {
+    waterText?: string;
+    waterClassName?: string[];
+    isPrintWater?: boolean;
 }): void;
+export declare function removeWaterHandle(): void;
 /**
  * 打印页面
  * hiddenClassNames 需要隐藏的样式 默认有hiddenPrint
@@ -14,11 +16,10 @@ interface IParams {
     hiddenClassNames?: string[];
 }
 export declare function printCurrentDom({ hiddenClassNames }?: IParams): void;
-/**
- * html转pdf
- */
-export declare function htmlToPdf({ dom, pdfName, }: {
+export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, }: {
+    pageClassName?: string;
     dom: HTMLElement;
     pdfName: string;
-}): void;
+    isShowPage?: boolean;
+}): Promise<void>;
 export {};

package/dist/print.js

@@ -1,4 +1,4 @@
-import { a as __spreadArray } from './tslib.es6-f9459658.js';
+import { a as __spreadArray, c as __awaiter, d as __generator } from './tslib.es6-f9459658.js';
 import { jsPDF } from 'jspdf';
 import html2canvas from 'html2canvas';
 
@@ -8,8 +8,9 @@ import html2canvas from 'html2canvas';
 function addWaterHandle(_a) {
     var _b = _a === void 0 ? {
         waterText: '',
-        waterClassName: '',
-    } : _a, waterText = _b.waterText, waterClassName = _b.waterClassName;
+        waterClassName: [],
+        isPrintWater: true,
+    } : _a, waterText = _b.waterText, waterClassName = _b.waterClassName, isPrintWater = _b.isPrintWater;
     var canvas = document.createElement('canvas');
     var waterStyleDom = document.getElementById('water-style-dom-110011');
     if (waterStyleDom) {
@@ -29,14 +30,28 @@ function addWaterHandle(_a) {
     var styleDom = document.createElement('style');
     styleDom.setAttribute('type', 'text/css');
     styleDom.setAttribute('id', 'water-style-dom-110011');
-    styleDom.innerText =
-        '@media print{' +
-            (waterClassName ? "." + waterClassName : 'body') +
+    styleDom.innerText = isPrintWater
+        ? '@media print{' +
+            (Array.isArray(waterClassName) && waterClassName.length > 0
+                ? "" + waterClassName.join(',')
+                : 'body') +
             ' {background: url(' +
             canvas.toDataURL('image/png') +
-            ') left top repeat;}}';
+            ') left top repeat;}}'
+        : (Array.isArray(waterClassName) && waterClassName.length > 0
+            ? "" + waterClassName.join(',')
+            : 'body') +
+            ' {background: url(' +
+            canvas.toDataURL('image/png') +
+            ') left top repeat;}';
     document.head.appendChild(styleDom);
 }
+function removeWaterHandle() {
+    var waterStyleDom = document.getElementById('water-style-dom-110011');
+    if (waterStyleDom) {
+        waterStyleDom.remove();
+    }
+}
 function printCurrentDom(_a) {
     var _b = _a === void 0 ? { hiddenClassNames: [] } : _a, hiddenClassNames = _b.hiddenClassNames;
     var printStyleDom = document.getElementById('print-style-dom-110011');
@@ -46,7 +61,7 @@ function printCurrentDom(_a) {
     var styleDom = document.createElement('style');
     styleDom.setAttribute('type', 'text/css');
     styleDom.setAttribute('id', 'print-style-dom-110011');
-    styleDom.innerText = "@media print{ " + __spreadArray(__spreadArray([], hiddenClassNames), [
+    styleDom.innerText = "@media print{ " + __spreadArray(__spreadArray([], (hiddenClassNames || [])), [
         '.hiddenPrint',
         '.hidden-print-footer',
     ]).join(',') + " { display: none; } }";
@@ -56,40 +71,81 @@ function printCurrentDom(_a) {
 /**
  * html转pdf
  */
-function htmlToPdf(_a) {
-    var dom = _a.dom, pdfName = _a.pdfName;
-    html2canvas(dom).then(function (canvas) {
-        var contentWidth = canvas.width;
-        var contentHeight = canvas.height;
-        // 一页pdf显示html页面生成的canvas高度
-        var pageHeight = (contentWidth / 592.28) * 841.89;
-        // 未生成pdf的html页面高度
-        var leftHeight = contentHeight;
-        // 页面拍内衣
-        var position = 0;
-        //a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的宽高
-        var imgWidth = 595.28;
-        var imgHeight = (592.28 / contentWidth) * contentHeight;
-        var pageData = canvas.toDataURL('image/jpeg', 1.0);
-        var pdf = new jsPDF(undefined, 'pt', 'a4');
-        //有两个高度需要区分，一个是html页面的实际高度，和生成pdf的页面高度(841.89)
-        //当内容未超过pdf一页显示的范围，无需分页
-        if (leftHeight < pageHeight) {
-            pdf.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight);
-        }
-        else {
-            while (leftHeight > 0) {
-                pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight);
-                leftHeight -= pageHeight;
-                position -= 841.89;
-                //避免添加空白页
-                if (leftHeight > 0) {
-                    pdf.addPage();
-                }
+function createPdf(canvas, pdf) {
+    var contentWidth = canvas.width;
+    var contentHeight = canvas.height;
+    // 一页pdf显示html页面生成的canvas高度
+    var pageHeight = (contentWidth / 592.28) * 841.89;
+    // 未生成pdf的html页面高度
+    var leftHeight = contentHeight;
+    // 页面拍内衣
+    var position = 0;
+    //a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的宽高
+    var imgWidth = 595.28;
+    var imgHeight = (592.28 / contentWidth) * contentHeight;
+    var pageData = canvas.toDataURL('image/jpeg', 1.0);
+    //有两个高度需要区分，一个是html页面的实际高度，和生成pdf的页面高度(841.89)
+    //当内容未超过pdf一页显示的范围，无需分页
+    if (leftHeight < pageHeight) {
+        pdf.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight);
+    }
+    else {
+        while (leftHeight > 0) {
+            pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight);
+            leftHeight -= pageHeight;
+            position -= 841.89;
+            //避免添加空白页
+            if (leftHeight > 0) {
+                pdf.addPage();
             }
         }
-        pdf.save(pdfName + ".pdf");
-    });
+    }
+}
+function htmlToPdf(_a) {
+    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); });
+        return (function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var i, _i, promiseAllDomArray_2, item, canvas;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            i = 0;
+                            _i = 0, promiseAllDomArray_2 = promiseAllDomArray_1;
+                            _a.label = 1;
+                        case 1:
+                            if (!(_i < promiseAllDomArray_2.length)) return [3 /*break*/, 4];
+                            item = promiseAllDomArray_2[_i];
+                            i++;
+                            return [4 /*yield*/, item];
+                        case 2:
+                            canvas = _a.sent();
+                            createPdf(canvas, pdf);
+                            if (i < promiseAllDomArray_1.length) {
+                                pdf.addPage();
+                            }
+                            _a.label = 3;
+                        case 3:
+                            _i++;
+                            return [3 /*break*/, 1];
+                        case 4:
+                            pdf.save(pdfName + ".pdf");
+                            return [2 /*return*/, Promise.resolve()];
+                    }
+                });
+            });
+        })();
+    }
+    else {
+        return html2canvas(dom).then(function (canvas) {
+            createPdf(canvas, pdf);
+            pdf.save(pdfName + ".pdf");
+        });
+    }
 }
 
-export { addWaterHandle, htmlToPdf, printCurrentDom };
+export { addWaterHandle, htmlToPdf, printCurrentDom, removeWaterHandle };

package/package.json

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