ztxkutils 2.9.14 → 2.10.0

package/dist/index.js

@@ -2,7 +2,7 @@ export { c as authority } from './authority-118dc4b1.js';
 export { d as dataModel } from './dataModel-1fbaff40.js';
 export { t as tools } from './tools-1e6fe951.js';
 export { v as validate } from './validate-3e15dd74.js';
-export { r as request } from './request-c3ba0965.js';
+export { r as request } from './request-f89650d7.js';
 export { r as reqUrl } from './reqUrl-4700395b.js';
 import './tslib.es6-f9459658.js';
 import 'dayjs';

package/dist/print.d.ts

@@ -21,11 +21,12 @@ interface IParams {
     hiddenClassNames?: string[];
 }
 export declare function printCurrentDom({ hiddenClassNames }?: IParams): void;
-export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, }: {
+export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, noWater, }: {
     pageClassName?: string;
     dom: HTMLElement;
     pdfName: string;
     isShowPage?: boolean;
+    noWater?: boolean;
 }): Promise<jsPDF>;
 export interface IPdfOption {
     /** 是否压缩 */

package/dist/print.js

@@ -76,10 +76,10 @@ function createWaterHandle(obj) {
             console.log(err);
         }
     }
-    var _a = obj || {}, waterText = _a.waterText, opacity = _a.opacity, fontSize = _a.fontSize;
+    var _a = obj || {}, waterText = _a.waterText, opacity = _a.opacity, fontSize = _a.fontSize, cavansWidth = _a.cavansWidth, cavansHeight = _a.cavansHeight;
     var canvas = document.createElement('canvas');
-    canvas.width = 200;
-    canvas.height = 80;
+    canvas.width = cavansWidth || 200;
+    canvas.height = cavansHeight || 80;
     var ctx = canvas.getContext('2d');
     if (ctx) {
         ctx.rotate((-10 * Math.PI) / 180); // 水印旋转角度
@@ -93,15 +93,14 @@ function createWaterHandle(obj) {
 }
 function addPdfWaterHandle(pdf, waterBase64) {
     for (var i = 0; i < 10; i++) {
-        pdf.addImage(waterBase64, 'PNG', 0, 80 * i, 200, 80, "1" + i);
-        pdf.addImage(waterBase64, 'PNG', 200, 80 * i, 200, 80, "2" + i);
-        pdf.addImage(waterBase64, 'PNG', 400, 80 * i, 200, 80, "3" + i);
+        pdf.addImage(waterBase64, 'PNG', 40, 140 * i, 200, 80, "1" + i);
+        pdf.addImage(waterBase64, 'PNG', 280, 140 * i, 200, 80, "2" + i);
     }
 }
 /**
  * html转pdf
  */
-function createPdf(canvas, pdf) {
+function createPdf(canvas, pdf, noWater) {
     var contentWidth = canvas.width;
     var contentHeight = canvas.height;
     // 一页pdf显示html页面生成的canvas高度
@@ -117,21 +116,25 @@ function createPdf(canvas, pdf) {
     //有两个高度需要区分，一个是html页面的实际高度，和生成pdf的页面高度(841.89)
     //当内容未超过pdf一页显示的范围，无需分页
     if (leftHeight < pageHeight) {
-        pdf.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight);
-        var waterBase64 = createWaterHandle({
-            opacity: '0.5',
-            fontSize: '15px',
-        });
-        addPdfWaterHandle(pdf, waterBase64);
-    }
-    else {
-        while (leftHeight > 0) {
-            pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight);
+        pdf.addImage(pageData, 'JPEG', 20, 10, imgWidth, imgHeight);
+        if (!noWater) {
             var waterBase64 = createWaterHandle({
-                opacity: '0.5',
-                fontSize: '15px',
+                opacity: '0.2',
+                fontSize: '14px',
             });
             addPdfWaterHandle(pdf, waterBase64);
+        }
+    }
+    else {
+        while (leftHeight > 0) {
+            pdf.addImage(pageData, 'JPEG', 20, position, imgWidth, imgHeight);
+            if (!noWater) {
+                var waterBase64 = createWaterHandle({
+                    opacity: '0.2',
+                    fontSize: '14px',
+                });
+                addPdfWaterHandle(pdf, waterBase64);
+            }
             leftHeight -= pageHeight;
             position -= 841.89;
             //避免添加空白页
@@ -142,9 +145,12 @@ function createPdf(canvas, 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 pageClassName = _a.pageClassName, dom = _a.dom, pdfName = _a.pdfName, isShowPage = _a.isShowPage, noWater = _a.noWater;
     var allDom = document.querySelectorAll(pageClassName ? pageClassName : '.html2canvas-container-page');
+    var pdf = new jsPDF({
+        unit: 'pt',
+        format: [632.28, 841.89],
+    });
     if (allDom.length > 0 && isShowPage) {
         var allDomArray = Array.prototype.slice.call(allDom);
         var promiseAllDomArray_1 = allDomArray.map(function (dom) {
@@ -168,7 +174,7 @@ function htmlToPdf(_a) {
                             return [4 /*yield*/, item];
                         case 2:
                             canvas = _a.sent();
-                            createPdf(canvas, pdf);
+                            createPdf(canvas, pdf, noWater);
                             if (i < promiseAllDomArray_1.length) {
                                 pdf.addPage();
                             }
@@ -186,7 +192,7 @@ function htmlToPdf(_a) {
     }
     else {
         return html2canvas(dom, { scale: 2 }).then(function (canvas) {
-            createPdf(canvas, pdf);
+            createPdf(canvas, pdf, noWater);
             pdf.save(pdfName + ".pdf");
             return pdf;
         });