ztxkutils 2.10.27 → 2.10.28

package/dist/index.js

@@ -2,7 +2,7 @@ export { c as authority } from './authority-e6bde99f.js';
 export { d as dataModel } from './dataModel-1fbaff40.js';
 export { t as tools } from './tools-09a4d620.js';
 export { v as validate } from './validate-6e735536.js';
-export { r as request } from './request-c1ed2e36.js';
+export { r as request } from './request-944adae3.js';
 export { r as reqUrl } from './reqUrl-787dd9e5.js';
 import './tslib.es6-35653116.js';
 import 'dayjs';

package/dist/print.d.ts

@@ -21,7 +21,7 @@ interface IParams {
     hiddenClassNames?: string[];
 }
 export declare function printCurrentDom({ hiddenClassNames }?: IParams): void;
-export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, noWater, pdfOptions, imgPositionX, }: {
+export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, noWater, pdfOptions, imgPositionX, waterText, }: {
     pageClassName?: string;
     dom: HTMLElement;
     pdfName: string;
@@ -29,6 +29,7 @@ export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, noW
     noWater?: boolean;
     pdfOptions?: any;
     imgPositionX?: number;
+    waterText?: string;
 }): Promise<jsPDF>;
 export declare function htmlToPdfUseCanvas({ pageClassName, dom, pdfName, isShowPage, noWater, pdfOptions, imgPositionX, isDownload, }: {
     pageClassName?: string;
@@ -55,7 +56,7 @@ export interface IPdfOption {
     /** 上下边距 */
     pageMarginY?: number;
 }
-export declare function htmlToPdfNoCanvas({ pageClassName, dom, isShowPage, fileBinary, pdfName, isDownload, pdfOption, isAddWater, waterBase64, imgWidth, imgHeight, isCompress, }: {
+export declare function htmlToPdfNoCanvas({ pageClassName, dom, isShowPage, fileBinary, pdfName, isDownload, pdfOption, isAddWater, waterBase64, imgWidth, imgHeight, isCompress, waterText, }: {
     pageClassName?: string;
     dom: HTMLElement;
     isShowPage?: boolean;
@@ -70,5 +71,6 @@ export declare function htmlToPdfNoCanvas({ pageClassName, dom, isShowPage, file
     imgWidth?: number;
     imgHeight?: number;
     isCompress?: boolean;
+    waterText?: string;
 }): Promise<unknown>;
 export {};

package/dist/print.js

@@ -16,7 +16,7 @@ function addWaterHandle(_a) {
     }
     var canvasImg = createWaterHandle({
         waterText: waterText,
-    });
+    }).imgBase64;
     var styleDom = document.createElement('style');
     styleDom.setAttribute('type', 'text/css');
     styleDom.setAttribute('id', 'water-style-dom-110011');
@@ -77,8 +77,18 @@ function createWaterHandle(obj) {
     var defaultWaterText = '浙商中拓';
     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 = cavansWidth || 240;
-    canvas.height = cavansHeight || 100;
+    var defaultCanvasWidth = waterText
+        ? waterText.length > 10
+            ? waterText.length * 22
+            : 240
+        : 240;
+    var defaultCanvasHeight = waterText
+        ? waterText.length > 10
+            ? waterText.length * 9
+            : 100
+        : 100;
+    canvas.width = cavansWidth || defaultCanvasWidth;
+    canvas.height = cavansHeight || defaultCanvasHeight;
     var ctx = canvas.getContext('2d');
     if (ctx) {
         ctx.rotate((-10 * Math.PI) / 180); // 水印旋转角度
@@ -88,12 +98,22 @@ function createWaterHandle(obj) {
         ctx.textBaseline = 'middle';
         ctx.fillText(waterText || defaultWaterText, canvas.width / 2, canvas.height); // 水印在画布的位置x，y轴
     }
-    return canvas.toDataURL('image/png');
+    return {
+        imgBase64: canvas.toDataURL('image/png'),
+        width: canvas.width,
+        height: canvas.height,
+    };
 }
-function addPdfWaterHandle(pdf, waterBase64) {
+function addPdfWaterHandle(pdf, waterBase64, imgInfo) {
+    var width = 200;
+    var height = 80;
+    if (imgInfo) {
+        width = imgInfo === null || imgInfo === void 0 ? void 0 : imgInfo.width;
+        height = imgInfo === null || imgInfo === void 0 ? void 0 : imgInfo.height;
+    }
     for (var i = 0; i < 10; i++) {
-        pdf.addImage(waterBase64, 'PNG', 40, 140 * i, 200, 80, "1" + i);
-        pdf.addImage(waterBase64, 'PNG', 280, 140 * i, 200, 80, "2" + i);
+        pdf.addImage(waterBase64, 'PNG', 40, 140 * i, width, height, "1" + i);
+        pdf.addImage(waterBase64, 'PNG', 80 + width, 140 * i, width, height, "2" + i);
     }
 }
 /**
@@ -122,22 +142,24 @@ function createPdf(canvas, pdf, noWater, positionX, options) {
     if (leftHeight < pageHeight) {
         pdf.addImage(pageData, 'JPEG', positionX || 20, 10, imgWidth, imgHeight);
         if (!noWater) {
-            var waterBase64 = createWaterHandle({
+            var _a = createWaterHandle({
                 opacity: '0.07',
                 fontSize: '14px',
-            });
-            addPdfWaterHandle(pdf, waterBase64);
+                waterText: (options === null || options === void 0 ? void 0 : options.waterText) || '',
+            }), waterBase64 = _a.imgBase64, width = _a.width, height = _a.height;
+            addPdfWaterHandle(pdf, waterBase64, { width: width, height: height });
         }
     }
     else {
         while (leftHeight > 0) {
             pdf.addImage(pageData, 'JPEG', positionX || 20, position, imgWidth, imgHeight);
             if (!noWater) {
-                var waterBase64 = createWaterHandle({
+                var _b = createWaterHandle({
                     opacity: '0.07',
                     fontSize: '14px',
-                });
-                addPdfWaterHandle(pdf, waterBase64);
+                    waterText: (options === null || options === void 0 ? void 0 : options.waterText) || '',
+                }), waterBase64 = _b.imgBase64, width = _b.width, height = _b.height;
+                addPdfWaterHandle(pdf, waterBase64, { width: width, height: height });
             }
             leftHeight -= pageHeight;
             // position -= 841.89;
@@ -150,7 +172,7 @@ function createPdf(canvas, pdf, noWater, positionX, options) {
     }
 }
 function htmlToPdf(_a) {
-    var pageClassName = _a.pageClassName, dom = _a.dom, pdfName = _a.pdfName, isShowPage = _a.isShowPage, noWater = _a.noWater, pdfOptions = _a.pdfOptions, imgPositionX = _a.imgPositionX;
+    var pageClassName = _a.pageClassName, dom = _a.dom, pdfName = _a.pdfName, isShowPage = _a.isShowPage, noWater = _a.noWater, pdfOptions = _a.pdfOptions, imgPositionX = _a.imgPositionX, waterText = _a.waterText;
     var allDom = document.querySelectorAll(pageClassName ? pageClassName : '.html2canvas-container-page');
     var format = (pdfOptions === null || pdfOptions === void 0 ? void 0 : pdfOptions.format) || [632.28, 841.89];
     var pdf = new jsPDF(__assign({ unit: 'pt', format: format }, (pdfOptions || {})));
@@ -180,6 +202,7 @@ function htmlToPdf(_a) {
                             createPdf(canvas, pdf, noWater, imgPositionX, {
                                 width: format === null || format === void 0 ? void 0 : format[0],
                                 height: format === null || format === void 0 ? void 0 : format[1],
+                                waterText: waterText,
                             });
                             if (i < promiseAllDomArray_1.length) {
                                 pdf.addPage();
@@ -201,6 +224,7 @@ function htmlToPdf(_a) {
             createPdf(canvas, pdf, noWater, imgPositionX, {
                 width: format === null || format === void 0 ? void 0 : format[0],
                 height: format === null || format === void 0 ? void 0 : format[1],
+                waterText: waterText,
             });
             pdf.save(pdfName + ".pdf");
             return pdf;
@@ -277,7 +301,7 @@ function htmlToPdfUseCanvas(_a) {
 }
 function htmlToPdfNoCanvas(_a) {
     var _b, _c;
-    var pageClassName = _a.pageClassName, dom = _a.dom, isShowPage = _a.isShowPage, fileBinary = _a.fileBinary, pdfName = _a.pdfName, isDownload = _a.isDownload, pdfOption = _a.pdfOption, isAddWater = _a.isAddWater, waterBase64 = _a.waterBase64, imgWidth = _a.imgWidth, imgHeight = _a.imgHeight, isCompress = _a.isCompress;
+    var pageClassName = _a.pageClassName, dom = _a.dom, isShowPage = _a.isShowPage, fileBinary = _a.fileBinary, pdfName = _a.pdfName, isDownload = _a.isDownload, pdfOption = _a.pdfOption, isAddWater = _a.isAddWater, waterBase64 = _a.waterBase64, imgWidth = _a.imgWidth, imgHeight = _a.imgHeight, isCompress = _a.isCompress; _a.waterText;
     return __awaiter(this, void 0, void 0, function () {
         var allDom, pageFormat, pageOrient, pageMarginX, pageMarginY, pdfOptions, allDomArray_1, pdfBase64_2, pdfs_2, pdf_2, pageWidth_1;
         return __generator(this, function (_d) {