zmdms-utils 0.0.44 → 0.0.46

package/dist/es/htmlToPdf.d.ts

@@ -0,0 +1,40 @@
+import { IImgToPdfConfig } from './pdf.js';
+
+interface IConfig {
+    /** 容器，从哪个容器里面找需要转换的元素 */
+    container?: HTMLElement;
+    /**
+     * 需要转换的dom 可以是一个字符串
+     * 如果是字符串的话 那么就是通过querySelectorAll的形式查找
+     * 如果是一个dom实例
+     * 如果是多个dom实例
+     **/
+    pageDom?: string | HTMLElement | HTMLElement[];
+    /**
+     * 是否使用canvas直接转
+     */
+    useCanvas?: boolean;
+    /**
+     * 是否生成多份PDF
+     */
+    isMultiple?: boolean;
+    /**
+     * pdf名称 默认取dom元素配置的 data-title属性
+     */
+    pdfName?: string;
+    /**
+     * pdf相关配置
+     */
+    pdfConfig?: IImgToPdfConfig["pdfConfig"];
+    /**
+     * 是否下载pdf
+     */
+    isDownload?: boolean;
+    /**
+     * 水印相关
+     */
+    waterConfig?: IImgToPdfConfig["waterConfig"];
+}
+declare function htmlToPdf(config: IConfig): Promise<unknown>;
+
+export { htmlToPdf };

package/dist/es/htmlToPdf.js

@@ -0,0 +1,82 @@
+import { __awaiter, __generator } from './_virtual/_tslib.js';
+import dayjs from 'dayjs';
+import { imgToPdf } from './pdf.js';
+import { domToCanvas } from './canvas.js';
+
+function htmlToPdf(config) {
+    var _this = this;
+    var container = config.container, pageDom = config.pageDom, _a = config.useCanvas, useCanvas = _a === void 0 ? true : _a, isMultiple = config.isMultiple, pdfConfig = config.pdfConfig, pdfName = config.pdfName, isDownload = config.isDownload, waterConfig = config.waterConfig;
+    // 找到需要转换的dom
+    var domList;
+    if (typeof pageDom === "string") {
+        domList = container
+            ? container.querySelectorAll(pageDom)
+            : document.body.querySelectorAll(pageDom);
+        domList = Array.from(domList);
+    }
+    else {
+        domList = Array.isArray(pageDom) ? pageDom : [pageDom];
+    }
+    if (domList.length === 0) {
+        return Promise.reject("没有可以导出的元素!");
+    }
+    if (!useCanvas) {
+        // 直接导出html 待实现
+        return Promise.resolve();
+    }
+    // 通过html => canvas => pdf 的形式导出
+    // 多份导出
+    if (isMultiple) {
+        var promiseArr_1 = [];
+        domList.forEach(function (domItem, index) {
+            var dataTitle = domItem.dataset.title || "".concat(dayjs().format("YYYY-MM-DD"), "-").concat(index + 1);
+            var item = domToCanvas(domItem).then(function (canvas) { return __awaiter(_this, void 0, void 0, function () {
+                var canvasWidth, canvasHeight, pdf;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            canvasWidth = canvas.width;
+                            canvasHeight = canvas.height;
+                            return [4 /*yield*/, imgToPdf({
+                                    images: {
+                                        image: canvas,
+                                        width: canvasWidth,
+                                        height: canvasHeight,
+                                    },
+                                    pdfConfig: pdfConfig,
+                                    pdfDownloadConfig: {
+                                        isDownload: isDownload,
+                                        pdfName: pdfName ? pdfName : dataTitle,
+                                    },
+                                    waterConfig: waterConfig,
+                                })];
+                        case 1:
+                            pdf = _a.sent();
+                            return [2 /*return*/, pdf];
+                    }
+                });
+            }); });
+            promiseArr_1.push(item);
+        });
+        return Promise.all(promiseArr_1);
+    }
+    else {
+        // 创建canvas组
+        var promiseArr = domList.map(function (domItem, index) {
+            return domToCanvas(domItem);
+        });
+        var dataTitle = domList[0].dataset.title || "".concat(dayjs().format("YYYY-MM-DD"));
+        // 合并成一个pdf导出
+        return imgToPdf({
+            images: promiseArr,
+            pdfConfig: pdfConfig,
+            pdfDownloadConfig: {
+                isDownload: isDownload,
+                pdfName: pdfName ? pdfName : dataTitle,
+            },
+            waterConfig: waterConfig,
+        });
+    }
+}
+
+export { htmlToPdf };

package/dist/es/pdf.d.ts

@@ -1,19 +1,26 @@
 import { RGBAData } from 'jspdf';
 import { IWaterResult } from './water.js';
 
-/**
- * 图片 转 pdf
- */
 declare function imgToPdf(config: IImgToPdfConfig): Promise<unknown>;
-interface IImgToPdfConfig {
-    /** 图片 base64字符串 */
-    image: string | HTMLImageElement | HTMLCanvasElement | Uint8Array | RGBAData;
+type IImage = string | HTMLImageElement | HTMLCanvasElement | Uint8Array | RGBAData;
+interface IIMageConfig {
+    image: IImage;
     width: number;
     height: number;
-    /** 是否直接下载pdf */
-    isDownload?: boolean;
+}
+interface IImgToPdfConfig {
+    /** 图片 base64字符串 */
+    images: IIMageConfig | any[];
     /** 生成的pdf左边距 */
     leftPadding?: number;
+    pdfConfig?: IPdfConfig;
+    pdfDownloadConfig?: IPdfDownloadConfig;
+    /**
+     * 水印相关信息
+     */
+    waterConfig?: IWaterResult;
+}
+interface IPdfConfig {
     /** 导出pdf单位 */
     unit?: "pt" | "mm";
     /**
@@ -29,14 +36,14 @@ interface IImgToPdfConfig {
      * 生成的pdf是否压缩
      */
     compress?: boolean;
+}
+interface IPdfDownloadConfig {
     /**
      * 生成pdf的名称
      */
     pdfName?: string;
-    /**
-     * 水印相关信息
-     */
-    waterConfig?: IWaterResult;
+    /** 是否直接下载pdf */
+    isDownload?: boolean;
 }
 
-export { IImgToPdfConfig, imgToPdf };
+export { IImgToPdfConfig, IPdfConfig, IPdfDownloadConfig, imgToPdf };

package/dist/es/pdf.js

@@ -1,69 +1,79 @@
+import { __awaiter, __generator } from './_virtual/_tslib.js';
 import { jsPDF } from 'jspdf';
+import dayjs from 'dayjs';
 
-/**
- * 图片 转 pdf
- */
 function imgToPdf(config) {
+    var images = config.images, _a = config.leftPadding, leftPadding = _a === void 0 ? 20 : _a, pdfConfig = config.pdfConfig, pdfDownloadConfig = config.pdfDownloadConfig, waterConfig = config.waterConfig;
+    var _b = pdfDownloadConfig || {}, isDownload = _b.isDownload, pdfName = _b.pdfName;
+    if (Array.isArray(images)) {
+        // 合并成一个pdf导出
+        // 解析pdf参数
+        var resultPdfConfig = parsePdfConfig(pdfConfig);
+        var _c = resultPdfConfig.format, pdfWidth_1 = _c[0], pdfHeight_1 = _c[1];
+        // 创建一个新的jsPDF实例
+        var pdf_1 = new jsPDF(resultPdfConfig);
+        return (function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var i, _i, images_1, canvasPromise, canvas, canvasWidth, canvasHeight;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            i = 0;
+                            _i = 0, images_1 = images;
+                            _a.label = 1;
+                        case 1:
+                            if (!(_i < images_1.length)) return [3 /*break*/, 4];
+                            canvasPromise = images_1[_i];
+                            i++;
+                            return [4 /*yield*/, canvasPromise];
+                        case 2:
+                            canvas = _a.sent();
+                            canvasWidth = canvas.width;
+                            canvasHeight = canvas.height;
+                            insertImgToPdf(pdf_1, pdfWidth_1, pdfHeight_1, {
+                                imageConfig: {
+                                    image: canvas,
+                                    width: canvasWidth,
+                                    height: canvasHeight,
+                                },
+                                leftPadding: leftPadding,
+                                waterConfig: waterConfig,
+                            });
+                            // 继续分页
+                            if (i < images.length) {
+                                pdf_1.addPage();
+                            }
+                            _a.label = 3;
+                        case 3:
+                            _i++;
+                            return [3 /*break*/, 1];
+                        case 4:
+                            if (isDownload) {
+                                pdf_1.save("".concat(pdfName || dayjs().format("YYYY-MM-DD"), ".pdf"));
+                            }
+                            return [2 /*return*/, Promise.resolve(pdf_1)];
+                    }
+                });
+            });
+        })();
+    }
+    var image = images.image, width = images.width, height = images.height;
     return new Promise(function (resolve, reject) {
-        var _a;
         try {
-            var image = config.image, width = config.width, height = config.height, _b = config.leftPadding, leftPadding = _b === void 0 ? 20 : _b, _c = config.compress, compress = _c === void 0 ? true : _c, _d = config.orientation, orientation_1 = _d === void 0 ? "p" : _d, _e = config.format, format = _e === void 0 ? "a4" : _e, pdfName = config.pdfName, waterConfig = config.waterConfig, isDownload = config.isDownload;
-            // 单位转换
-            var _f = parsePdfFormat(format), pdfWidth = _f[0], pdfHeight = _f[1];
-            // 如果是横向的话，需要转换下宽高的位置
-            if (orientation_1 === "l") {
-                _a = [pdfHeight, pdfWidth], pdfWidth = _a[0], pdfHeight = _a[1];
-            }
-            var unit = config.unit || "pt";
-            // 缩放图片 以适应PDF页面宽度
-            var canvasWidth = width; // 图片原始宽度
-            var canvasHeight = height; // 图片原始高度
+            // 解析pdf参数
+            var resultPdfConfig = parsePdfConfig(pdfConfig);
+            var _a = resultPdfConfig.format, pdfWidth = _a[0], pdfHeight = _a[1];
             // 创建一个新的jsPDF实例
-            var pdf = new jsPDF({
-                // 方向 l：横向  p：纵向
-                orientation: orientation_1,
-                // 单位
-                unit: unit,
-                format: [pdfWidth, pdfHeight],
-                compress: compress,
+            var pdf = new jsPDF(resultPdfConfig);
+            insertImgToPdf(pdf, pdfWidth, pdfHeight, {
+                imageConfig: {
+                    image: image,
+                    width: width,
+                    height: height,
+                },
+                leftPadding: leftPadding,
+                waterConfig: waterConfig,
             });
-            // 一页pdf能显示的canvas高度
-            var pageHeight = (canvasWidth / pdfWidth) * pdfHeight;
-            // 将绘制图片的宽度 设置 成pdf的宽度 （减去偏移）
-            var imgWidth = pdfWidth - leftPadding;
-            // 等比例换算绘制图片高度
-            var imgHeight = (imgWidth / canvasWidth) * canvasHeight;
-            // 需要打印的图片总高度，初始状态和图片高度相等
-            var totalHeight = canvasHeight;
-            if (totalHeight < pageHeight) {
-                pdf.addImage(image, "JPEG", leftPadding, 0, imgWidth, imgHeight);
-                // 添加水印
-                if (waterConfig) {
-                    addImageWater(pdf, waterConfig.image, {
-                        width: waterConfig.width,
-                        height: waterConfig.height,
-                    });
-                }
-            }
-            else {
-                var position = 0;
-                while (totalHeight > 0) {
-                    pdf.addImage(image, "JPEG", leftPadding, position, imgWidth, imgHeight);
-                    // 添加水印
-                    if (waterConfig) {
-                        addImageWater(pdf, waterConfig.image, {
-                            width: waterConfig.width,
-                            height: waterConfig.height,
-                        });
-                    }
-                    totalHeight -= pageHeight;
-                    //避免添加空白页
-                    position -= pdfHeight;
-                    if (totalHeight > 0) {
-                        pdf.addPage();
-                    }
-                }
-            }
             if (isDownload) {
                 pdf.save("".concat(pdfName, ".pdf"));
             }
@@ -74,6 +84,7 @@ function imgToPdf(config) {
         }
     });
 }
+// 解析format 为数值
 function parsePdfFormat(format) {
     if (format === "a4") {
         return [595.28, 841.89];
@@ -84,6 +95,70 @@ function parsePdfFormat(format) {
     // 默认返回a4的数值
     return [595.28, 841.89];
 }
+// 解析pdf实例化参数
+function parsePdfConfig(pdfConfig) {
+    var _a;
+    var _b = pdfConfig || {}, _c = _b.compress, compress = _c === void 0 ? true : _c, _d = _b.orientation, orientation = _d === void 0 ? "p" : _d, _e = _b.format, format = _e === void 0 ? "a4" : _e, _f = _b.unit, unit = _f === void 0 ? "pt" : _f;
+    // 单位转换
+    var _g = parsePdfFormat(format), pdfWidth = _g[0], pdfHeight = _g[1];
+    // 如果是横向的话，需要转换下宽高的位置
+    if (orientation === "l") {
+        _a = [pdfHeight, pdfWidth], pdfWidth = _a[0], pdfHeight = _a[1];
+    }
+    return {
+        // 方向 l：横向  p：纵向
+        orientation: orientation,
+        // 单位
+        unit: unit,
+        format: [pdfWidth, pdfHeight],
+        compress: compress,
+    };
+}
+// 将图片插入pdf中
+function insertImgToPdf(pdf, pdfWidth, pdfHeight, config) {
+    var imageConfig = config.imageConfig, _a = config.leftPadding, leftPadding = _a === void 0 ? 20 : _a, waterConfig = config.waterConfig;
+    var image = imageConfig.image, width = imageConfig.width, height = imageConfig.height;
+    // 缩放图片 以适应PDF页面宽度
+    var canvasWidth = width; // 图片原始宽度
+    var canvasHeight = height; // 图片原始高度
+    // 一页pdf能显示的canvas高度
+    var pageHeight = (canvasWidth / pdfWidth) * pdfHeight;
+    // 将绘制图片的宽度 设置 成pdf的宽度 （减去偏移）
+    var imgWidth = pdfWidth - leftPadding;
+    // 等比例换算绘制图片高度
+    var imgHeight = (imgWidth / canvasWidth) * canvasHeight;
+    // 需要打印的图片总高度，初始状态和图片高度相等
+    var totalHeight = canvasHeight;
+    if (totalHeight < pageHeight) {
+        pdf.addImage(image, "JPEG", leftPadding, 0, imgWidth, imgHeight);
+        // 添加水印
+        if (waterConfig) {
+            addImageWater(pdf, waterConfig.image, {
+                width: waterConfig.width,
+                height: waterConfig.height,
+            });
+        }
+    }
+    else {
+        var position = 0;
+        while (totalHeight > 0) {
+            pdf.addImage(image, "JPEG", leftPadding, position, imgWidth, imgHeight);
+            // 添加水印
+            if (waterConfig) {
+                addImageWater(pdf, waterConfig.image, {
+                    width: waterConfig.width,
+                    height: waterConfig.height,
+                });
+            }
+            totalHeight -= pageHeight;
+            //避免添加空白页
+            position -= pdfHeight;
+            if (totalHeight > 0) {
+                pdf.addPage();
+            }
+        }
+    }
+}
 /**
  * 给PDF添加图片水印
  */
@@ -98,4 +173,4 @@ function addImageWater(pdf, imgData, options) {
     }
 }
 
-export { addImageWater, imgToPdf };
+export { addImageWater, imgToPdf, insertImgToPdf, parsePdfConfig, parsePdfFormat };

package/dist/es/water.js

@@ -72,6 +72,13 @@ function getDefaultContent() {
     if (typeof jwtInfo === "object" && jwtInfo != null) {
         var username = jwtInfo.real_name || jwtInfo.realName || "";
         var phone = jwtInfo.phone || "";
+        var phoneLen = phone.length;
+        if (phoneLen <= 4) {
+            phone = phone;
+        }
+        else {
+            phone = phone.slice(phoneLen - 4);
+        }
         var time = dayjs().format("YYMMDD");
         return ["".concat(username, " ").concat(phone), time];
     }

package/dist/index.d.ts

@@ -15,5 +15,6 @@ export { BASIC_KEY, EMITTER_CCP_KEY, EMITTER_PCC_KEY, EMITTER_TYPE, TOKEN_KEY }
 export { convert, html, match, pinyin } from 'pinyin-pro';
 export { domToCanvas } from './es/canvas.js';
 export { imgToPdf } from './es/pdf.js';
+export { htmlToPdf } from './es/htmlToPdf.js';
 export { htmlPrint, imgPrint, pdfPrint, windowPrint } from './es/print.js';
 export { createWater, getDefaultContent, mergeWaterConfig } from './es/water.js';

package/dist/index.js

@@ -15,5 +15,6 @@ export { BASIC_KEY, EMITTER_CCP_KEY, EMITTER_PCC_KEY, EMITTER_TYPE, TOKEN_KEY }
 export { convert, html, match, pinyin } from './es/node_modules/pinyin-pro/dist/index.js';
 export { domToCanvas } from './es/canvas.js';
 export { imgToPdf } from './es/pdf.js';
+export { htmlToPdf } from './es/htmlToPdf.js';
 export { htmlPrint, imgPrint, pdfPrint, windowPrint } from './es/print.js';
 export { createWater, getDefaultContent, mergeWaterConfig } from './es/water.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-utils",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/htmlToPdf.ts

@@ -0,0 +1,120 @@
+import dayjs from "dayjs";
+import { IImgToPdfConfig, imgToPdf } from "./pdf";
+import { domToCanvas } from "./canvas";
+
+interface IConfig {
+  /** 容器，从哪个容器里面找需要转换的元素 */
+  container?: HTMLElement;
+  /**
+   * 需要转换的dom 可以是一个字符串
+   * 如果是字符串的话 那么就是通过querySelectorAll的形式查找
+   * 如果是一个dom实例
+   * 如果是多个dom实例
+   **/
+  pageDom?: string | HTMLElement | HTMLElement[];
+  /**
+   * 是否使用canvas直接转
+   */
+  useCanvas?: boolean;
+  /**
+   * 是否生成多份PDF
+   */
+  isMultiple?: boolean;
+  /**
+   * pdf名称 默认取dom元素配置的 data-title属性
+   */
+  pdfName?: string;
+  /**
+   * pdf相关配置
+   */
+  pdfConfig?: IImgToPdfConfig["pdfConfig"];
+  /**
+   * 是否下载pdf
+   */
+  isDownload?: boolean;
+  /**
+   * 水印相关
+   */
+  waterConfig?: IImgToPdfConfig["waterConfig"];
+}
+
+export function htmlToPdf(config: IConfig) {
+  const {
+    container,
+    pageDom,
+    useCanvas = true,
+    isMultiple,
+    pdfConfig,
+    pdfName,
+    isDownload,
+    waterConfig,
+  } = config;
+  // 找到需要转换的dom
+  let domList: any;
+  if (typeof pageDom === "string") {
+    domList = container
+      ? container.querySelectorAll(pageDom)
+      : document.body.querySelectorAll(pageDom);
+    domList = Array.from(domList);
+  } else {
+    domList = Array.isArray(pageDom) ? pageDom : [pageDom];
+  }
+
+  if (domList.length === 0) {
+    return Promise.reject("没有可以导出的元素!");
+  }
+
+  if (!useCanvas) {
+    // 直接导出html 待实现
+    return Promise.resolve();
+  }
+
+  // 通过html => canvas => pdf 的形式导出
+
+  // 多份导出
+  if (isMultiple) {
+    let promiseArr: any = [];
+    domList.forEach((domItem: HTMLElement, index: number) => {
+      const dataTitle =
+        domItem.dataset.title || `${dayjs().format("YYYY-MM-DD")}-${index + 1}`;
+      const item = domToCanvas(domItem).then(async (canvas) => {
+        // 计算canvas的宽度和高度转换为PDF的宽度和高度
+        const canvasWidth = canvas.width;
+        const canvasHeight = canvas.height;
+        const pdf = await imgToPdf({
+          images: {
+            image: canvas,
+            width: canvasWidth,
+            height: canvasHeight,
+          },
+          pdfConfig,
+          pdfDownloadConfig: {
+            isDownload,
+            pdfName: pdfName ? pdfName : dataTitle,
+          },
+          waterConfig,
+        });
+        return pdf;
+      });
+      promiseArr.push(item);
+    });
+    return Promise.all(promiseArr);
+  } else {
+    // 创建canvas组
+    let promiseArr: any = domList.map((domItem: HTMLElement, index: number) => {
+      return domToCanvas(domItem);
+    });
+    const dataTitle =
+      domList[0].dataset.title || `${dayjs().format("YYYY-MM-DD")}`;
+    // 合并成一个pdf导出
+    return imgToPdf({
+      images: promiseArr,
+      pdfConfig,
+      pdfDownloadConfig: {
+        isDownload,
+        pdfName: pdfName ? pdfName : dataTitle,
+      },
+      waterConfig,
+    });
+  }
+}

package/src/index.ts

@@ -70,6 +70,9 @@ export { domToCanvas } from "./canvas";
 // pdf 相关
 export { imgToPdf } from "./pdf";
 
+// htmltopdf
+export { htmlToPdf } from "./htmlToPdf";
+
 // 打印相关
 export { windowPrint, htmlPrint, imgPrint, pdfPrint } from "./print";
 

package/src/pdf.ts

@@ -1,89 +1,68 @@
 import { RGBAData, jsPDF } from "jspdf";
+import dayjs from "dayjs";
 import { IWaterResult } from "./water";
 
-/**
- * 图片 转 pdf
- */
 export function imgToPdf(config: IImgToPdfConfig) {
+  const {
+    images,
+    leftPadding = 20,
+    pdfConfig,
+    pdfDownloadConfig,
+    waterConfig,
+  } = config;
+  const { isDownload, pdfName } = pdfDownloadConfig || {};
+  if (Array.isArray(images)) {
+    // 合并成一个pdf导出
+    // 解析pdf参数
+    const resultPdfConfig = parsePdfConfig(pdfConfig);
+    const [pdfWidth, pdfHeight] = resultPdfConfig.format;
+    // 创建一个新的jsPDF实例
+    const pdf = new jsPDF(resultPdfConfig);
+    return (async function () {
+      let i = 0;
+      for (const canvasPromise of images) {
+        i++;
+        const canvas = await canvasPromise;
+        const canvasWidth = canvas.width;
+        const canvasHeight = canvas.height;
+        insertImgToPdf(pdf, pdfWidth, pdfHeight, {
+          imageConfig: {
+            image: canvas,
+            width: canvasWidth,
+            height: canvasHeight,
+          },
+          leftPadding,
+          waterConfig,
+        });
+        // 继续分页
+        if (i < images.length) {
+          pdf.addPage();
+        }
+      }
+      if (isDownload) {
+        pdf.save(`${pdfName || dayjs().format("YYYY-MM-DD")}.pdf`);
+      }
+      return Promise.resolve(pdf);
+    })();
+  }
+  const { image, width, height } = images;
   return new Promise((resolve, reject) => {
     try {
-      const {
-        image,
-        width,
-        height,
-        leftPadding = 20,
-        compress = true,
-        orientation = "p",
-        format = "a4",
-        pdfName,
-        waterConfig,
-        isDownload,
-      } = config;
-
-      // 单位转换
-      let [pdfWidth, pdfHeight] = parsePdfFormat(format);
-      // 如果是横向的话，需要转换下宽高的位置
-      if (orientation === "l") {
-        [pdfWidth, pdfHeight] = [pdfHeight, pdfWidth];
-      }
-      const unit = config.unit || "pt";
-
-      // 缩放图片 以适应PDF页面宽度
-      const canvasWidth = width; // 图片原始宽度
-      const canvasHeight = height; // 图片原始高度
-
+      // 解析pdf参数
+      const resultPdfConfig = parsePdfConfig(pdfConfig);
+      const [pdfWidth, pdfHeight] = resultPdfConfig.format;
       // 创建一个新的jsPDF实例
-      const pdf = new jsPDF({
-        // 方向 l：横向  p：纵向
-        orientation,
-        // 单位
-        unit,
-        format: [pdfWidth, pdfHeight],
-        compress,
+      const pdf = new jsPDF(resultPdfConfig);
+
+      insertImgToPdf(pdf, pdfWidth, pdfHeight, {
+        imageConfig: {
+          image,
+          width,
+          height,
+        },
+        leftPadding,
+        waterConfig,
       });
-      // 一页pdf能显示的canvas高度
-      let pageHeight = (canvasWidth / pdfWidth) * pdfHeight;
-      // 将绘制图片的宽度 设置 成pdf的宽度 （减去偏移）
-      let imgWidth = pdfWidth - leftPadding;
-      // 等比例换算绘制图片高度
-      let imgHeight = (imgWidth / canvasWidth) * canvasHeight;
-      // 需要打印的图片总高度，初始状态和图片高度相等
-      let totalHeight = canvasHeight;
-      if (totalHeight < pageHeight) {
-        pdf.addImage(image, "JPEG", leftPadding, 0, imgWidth, imgHeight);
-        // 添加水印
-        if (waterConfig) {
-          addImageWater(pdf, waterConfig.image, {
-            width: waterConfig.width,
-            height: waterConfig.height,
-          });
-        }
-      } else {
-        let position = 0;
-        while (totalHeight > 0) {
-          pdf.addImage(
-            image,
-            "JPEG",
-            leftPadding,
-            position,
-            imgWidth,
-            imgHeight
-          );
-          // 添加水印
-          if (waterConfig) {
-            addImageWater(pdf, waterConfig.image, {
-              width: waterConfig.width,
-              height: waterConfig.height,
-            });
-          }
-          totalHeight -= pageHeight;
-          //避免添加空白页
-          position -= pdfHeight;
-          if (totalHeight > 0) {
-            pdf.addPage();
-          }
-        }
-      }
       if (isDownload) {
         pdf.save(`${pdfName}.pdf`);
       }
@@ -93,7 +72,8 @@ export function imgToPdf(config: IImgToPdfConfig) {
     }
   });
 }
-function parsePdfFormat(format: IImgToPdfConfig["format"]) {
+// 解析format 为数值
+export function parsePdfFormat(format: IPdfConfig["format"]) {
   if (format === "a4") {
     return [595.28, 841.89];
   }
@@ -103,6 +83,84 @@ function parsePdfFormat(format: IImgToPdfConfig["format"]) {
   // 默认返回a4的数值
   return [595.28, 841.89];
 }
+// 解析pdf实例化参数
+export function parsePdfConfig(pdfConfig?: IPdfConfig) {
+  const {
+    compress = true,
+    orientation = "p",
+    format = "a4",
+    unit = "pt",
+  } = pdfConfig || {};
+  // 单位转换
+  let [pdfWidth, pdfHeight] = parsePdfFormat(format);
+  // 如果是横向的话，需要转换下宽高的位置
+  if (orientation === "l") {
+    [pdfWidth, pdfHeight] = [pdfHeight, pdfWidth];
+  }
+
+  return {
+    // 方向 l：横向  p：纵向
+    orientation,
+    // 单位
+    unit,
+    format: [pdfWidth, pdfHeight],
+    compress,
+  };
+}
+// 将图片插入pdf中
+export function insertImgToPdf(
+  pdf: any,
+  pdfWidth: number,
+  pdfHeight: number,
+  config: {
+    imageConfig: IIMageConfig;
+    leftPadding?: number;
+    waterConfig?: IWaterResult;
+  }
+) {
+  const { imageConfig, leftPadding = 20, waterConfig } = config;
+  const { image, width, height } = imageConfig;
+  // 缩放图片 以适应PDF页面宽度
+  const canvasWidth = width; // 图片原始宽度
+  const canvasHeight = height; // 图片原始高度
+
+  // 一页pdf能显示的canvas高度
+  let pageHeight = (canvasWidth / pdfWidth) * pdfHeight;
+  // 将绘制图片的宽度 设置 成pdf的宽度 （减去偏移）
+  let imgWidth = pdfWidth - leftPadding;
+  // 等比例换算绘制图片高度
+  let imgHeight = (imgWidth / canvasWidth) * canvasHeight;
+  // 需要打印的图片总高度，初始状态和图片高度相等
+  let totalHeight = canvasHeight;
+  if (totalHeight < pageHeight) {
+    pdf.addImage(image, "JPEG", leftPadding, 0, imgWidth, imgHeight);
+    // 添加水印
+    if (waterConfig) {
+      addImageWater(pdf, waterConfig.image, {
+        width: waterConfig.width,
+        height: waterConfig.height,
+      });
+    }
+  } else {
+    let position = 0;
+    while (totalHeight > 0) {
+      pdf.addImage(image, "JPEG", leftPadding, position, imgWidth, imgHeight);
+      // 添加水印
+      if (waterConfig) {
+        addImageWater(pdf, waterConfig.image, {
+          width: waterConfig.width,
+          height: waterConfig.height,
+        });
+      }
+      totalHeight -= pageHeight;
+      //避免添加空白页
+      position -= pdfHeight;
+      if (totalHeight > 0) {
+        pdf.addPage();
+      }
+    }
+  }
+}
 
 /**
  * 给PDF添加图片水印
@@ -122,15 +180,32 @@ export function addImageWater(
   }
 }
 
-export interface IImgToPdfConfig {
-  /** 图片 base64字符串 */
-  image: string | HTMLImageElement | HTMLCanvasElement | Uint8Array | RGBAData;
+type IImage =
+  | string
+  | HTMLImageElement
+  | HTMLCanvasElement
+  | Uint8Array
+  | RGBAData;
+interface IIMageConfig {
+  image: IImage;
   width: number;
   height: number;
-  /** 是否直接下载pdf */
-  isDownload?: boolean;
+}
+export interface IImgToPdfConfig {
+  /** 图片 base64字符串 */
+  images: IIMageConfig | any[];
   /** 生成的pdf左边距 */
   leftPadding?: number;
+  pdfConfig?: IPdfConfig;
+  pdfDownloadConfig?: IPdfDownloadConfig;
+  /**
+   * 水印相关信息
+   */
+  waterConfig?: IWaterResult;
+}
+
+// pdf配置
+export interface IPdfConfig {
   /** 导出pdf单位 */
   unit?: "pt" | "mm";
   /**
@@ -146,12 +221,14 @@ export interface IImgToPdfConfig {
    * 生成的pdf是否压缩
    */
   compress?: boolean;
+}
+
+// pdf下载相关配置
+export interface IPdfDownloadConfig {
   /**
    * 生成pdf的名称
    */
   pdfName?: string;
-  /**
-   * 水印相关信息
-   */
-  waterConfig?: IWaterResult;
+  /** 是否直接下载pdf */
+  isDownload?: boolean;
 }

package/src/water.ts

@@ -78,7 +78,13 @@ export function getDefaultContent() {
   const jwtInfo: any = parseToken();
   if (typeof jwtInfo === "object" && jwtInfo != null) {
     const username = jwtInfo.real_name || jwtInfo.realName || "";
-    const phone = jwtInfo.phone || "";
+    let phone = jwtInfo.phone || "";
+    const phoneLen = phone.length;
+    if (phoneLen <= 4) {
+      phone = phone;
+    } else {
+      phone = phone.slice(phoneLen - 4);
+    }
     const time = dayjs().format("YYMMDD");
     return [`${username} ${phone}`, time];
   }