zmdms-utils 0.0.37 → 0.0.39

package/dist/es/pdf.d.ts

@@ -39,4 +39,4 @@ interface IImgToPdfConfig {
     waterConfig?: IWaterResult;
 }
 
-export { imgToPdf };
+export { IImgToPdfConfig, imgToPdf };

package/dist/es/water.d.ts

@@ -15,6 +15,7 @@ declare function mergeWaterConfig(waterConfig?: IWaterConfig): {
     rotate: number;
     zIndex: number;
     content: string | string[];
+    lineSpacing: number;
     font: {
         color: string | CanvasGradient | CanvasPattern;
         fontSize: number;
@@ -32,6 +33,7 @@ interface IWaterConfig {
     zIndex?: number;
     image?: string;
     content?: string | string[];
+    lineSpacing?: number;
     font?: {
         color?: CanvasFillStrokeStyles["fillStyle"];
         fontSize?: number;

package/dist/es/water.js

@@ -2,7 +2,7 @@
  * 创建水印
  */
 function createWater(config) {
-    var _a = mergeWaterConfig(config), width = _a.width, height = _a.height, rotate = _a.rotate, content = _a.content, font = _a.font;
+    var _a = mergeWaterConfig(config), width = _a.width, height = _a.height, rotate = _a.rotate, content = _a.content, font = _a.font, lineSpacing = _a.lineSpacing;
     // 创建canvas元素
     var canvas = document.createElement("canvas");
     canvas.width = width * 2;
@@ -21,7 +21,7 @@ function createWater(config) {
             if (Array.isArray(textLines)) {
                 // 多行文本
                 textLines.forEach(function (line, index) {
-                    ctx.fillText(line, 0, index * font.fontSize);
+                    ctx.fillText(line, 0, index * (font.fontSize + lineSpacing));
                 });
             }
             else {
@@ -47,13 +47,14 @@ function mergeWaterConfig(waterConfig) {
     var _a, _b, _c, _d, _e, _f;
     return {
         width: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.width) || 200,
-        height: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.height) || 60,
-        rotate: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.rotate) || -22,
+        height: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.height) || 200,
+        rotate: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.rotate) || -20,
         zIndex: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.zIndex) || 10,
         content: (waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.content) || "交投集团",
+        lineSpacing: 4,
         font: {
-            color: ((_a = waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.font) === null || _a === void 0 ? void 0 : _a.color) || "rgba(0, 0, 0, 0.1)",
-            fontSize: ((_b = waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.font) === null || _b === void 0 ? void 0 : _b.fontSize) || 18,
+            color: ((_a = waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.font) === null || _a === void 0 ? void 0 : _a.color) || "rgba(0, 0, 0, 0.2)",
+            fontSize: ((_b = waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.font) === null || _b === void 0 ? void 0 : _b.fontSize) || 14,
             fontWeight: ((_c = waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.font) === null || _c === void 0 ? void 0 : _c.fontWeight) || "normal",
             fontStyle: ((_d = waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.font) === null || _d === void 0 ? void 0 : _d.fontStyle) || "normal",
             fontFamily: ((_e = waterConfig === null || waterConfig === void 0 ? void 0 : waterConfig.font) === null || _e === void 0 ? void 0 : _e.fontFamily) || "微软雅黑",

package/package.json

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

package/src/pdf.ts

@@ -122,7 +122,7 @@ export function addImageWater(
   }
 }
 
-interface IImgToPdfConfig {
+export interface IImgToPdfConfig {
   /** 图片 base64字符串 */
   image: string | HTMLImageElement | HTMLCanvasElement | Uint8Array | RGBAData;
   width: number;

package/src/water.ts

@@ -2,7 +2,8 @@
  * 创建水印
  */
 export function createWater(config: IWaterConfig) {
-  const { width, height, rotate, content, font } = mergeWaterConfig(config);
+  const { width, height, rotate, content, font, lineSpacing } =
+    mergeWaterConfig(config);
 
   // 创建canvas元素
   const canvas = document.createElement("canvas");
@@ -24,7 +25,7 @@ export function createWater(config: IWaterConfig) {
       if (Array.isArray(textLines)) {
         // 多行文本
         textLines.forEach((line, index) => {
-          ctx.fillText(line, 0, index * font.fontSize);
+          ctx.fillText(line, 0, index * (font.fontSize + lineSpacing));
         });
       } else {
         // 单行文本
@@ -52,13 +53,14 @@ export function createWater(config: IWaterConfig) {
 export function mergeWaterConfig(waterConfig?: IWaterConfig) {
   return {
     width: waterConfig?.width || 200,
-    height: waterConfig?.height || 60,
-    rotate: waterConfig?.rotate || -22,
+    height: waterConfig?.height || 200,
+    rotate: waterConfig?.rotate || -20,
     zIndex: waterConfig?.zIndex || 10,
     content: waterConfig?.content || "交投集团",
+    lineSpacing: 4,
     font: {
-      color: waterConfig?.font?.color || "rgba(0, 0, 0, 0.1)",
-      fontSize: waterConfig?.font?.fontSize || 18,
+      color: waterConfig?.font?.color || "rgba(0, 0, 0, 0.2)",
+      fontSize: waterConfig?.font?.fontSize || 14,
       fontWeight: waterConfig?.font?.fontWeight || "normal",
       fontStyle: waterConfig?.font?.fontStyle || "normal",
       fontFamily: waterConfig?.font?.fontFamily || "微软雅黑",
@@ -82,6 +84,8 @@ export interface IWaterConfig {
   image?: string;
   // 文本水印内容
   content?: string | string[];
+  // 多行文本时，每行文本的间距
+  lineSpacing?: number;
   // 水印字体大小
   font?: {
     color?: CanvasFillStrokeStyles["fillStyle"];