zmdms-utils 0.0.36 → 0.0.38

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

@@ -6,6 +6,25 @@ declare function createWater(config: IWaterConfig): {
     canvasWidth: number;
     canvasHeight: number;
 };
+/**
+ * 默认配置
+ */
+declare function mergeWaterConfig(waterConfig?: IWaterConfig): {
+    width: number;
+    height: number;
+    rotate: number;
+    zIndex: number;
+    content: string | string[];
+    font: {
+        color: string | CanvasGradient | CanvasPattern;
+        fontSize: number;
+        fontWeight: number | "normal" | "light" | "weight";
+        fontStyle: "none" | "normal" | "italic" | "oblique";
+        fontFamily: string;
+        textAlign: CanvasTextAlign;
+    };
+    image: string | undefined;
+};
 interface IWaterConfig {
     width?: number;
     height?: number;
@@ -28,4 +47,4 @@ interface IWaterResult {
     height: number;
 }
 
-export { IWaterConfig, IWaterResult, createWater };
+export { IWaterConfig, IWaterResult, createWater, mergeWaterConfig };

package/dist/es/water.js

@@ -63,4 +63,4 @@ function mergeWaterConfig(waterConfig) {
     };
 }
 
-export { createWater };
+export { createWater, mergeWaterConfig };

package/dist/index.d.ts

@@ -16,4 +16,4 @@ export { convert, html, match, pinyin } from 'pinyin-pro';
 export { domToCanvas } from './es/canvas.js';
 export { imgToPdf } from './es/pdf.js';
 export { htmlPrint, imgPrint, pdfPrint, windowPrint } from './es/print.js';
-export { createWater } from './es/water.js';
+export { createWater, mergeWaterConfig } from './es/water.js';

package/dist/index.js

@@ -16,4 +16,4 @@ export { convert, html, match, pinyin } from './es/node_modules/pinyin-pro/dist/
 export { domToCanvas } from './es/canvas.js';
 export { imgToPdf } from './es/pdf.js';
 export { htmlPrint, imgPrint, pdfPrint, windowPrint } from './es/print.js';
-export { createWater } from './es/water.js';
+export { createWater, mergeWaterConfig } from './es/water.js';

package/package.json

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

package/src/index.ts

@@ -73,4 +73,4 @@ export { imgToPdf } from "./pdf";
 export { windowPrint, htmlPrint, imgPrint, pdfPrint } from "./print";
 
 // 水印相关
-export { createWater } from "./water";
+export { createWater, mergeWaterConfig } from "./water";

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

@@ -49,7 +49,7 @@ export function createWater(config: IWaterConfig) {
 /**
  * 默认配置
  */
-function mergeWaterConfig(waterConfig?: IWaterConfig) {
+export function mergeWaterConfig(waterConfig?: IWaterConfig) {
   return {
     width: waterConfig?.width || 200,
     height: waterConfig?.height || 60,