leafer-x-watermark 3.0.0 → 3.2.0

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { IRectData, IUI, IRectInputData, IObject, IJSONOptions } from '@leafer-ui/interface';
-import { RectData, Rect } from '@leafer-ui/core';
+import { RectData, Rect, PropertyEvent } from '@leafer-ui/core';
 
 type IStaggerType = 'x' | 'y';
 interface IStaggerData {
@@ -17,6 +17,7 @@ declare module '@leafer-ui/interface' {
     }
 }
 
+type ITileContentParser = (content: string) => object | null;
 interface ITileGap {
     x?: number;
     y?: number;
@@ -48,6 +49,7 @@ interface IProcessDataType extends IRectData {
 }
 interface IWatermark extends IWatermarkAttrData, IUI {
     __: IProcessDataType;
+    tileContentParser?: ITileContentParser;
 }
 interface IWatermarkInputData extends IWatermarkAttrData, IRectInputData {
 }
@@ -91,7 +93,10 @@ declare abstract class ProcessorDataBase extends RectData implements IProcessDat
 
 declare abstract class WatermarkBase<TConstructorData = IWatermarkInputData> extends Rect<TConstructorData> implements IWatermark {
     __: ProcessorDataBase;
-    get tileURL(): string;
+    tileContentParser?: ITileContentParser;
+    constructor(data?: TConstructorData);
+    syncParentSize(e?: PropertyEvent): void;
+    destroy(): void;
 }
 
 declare class ProcessorDataAsync extends ProcessorDataBase {
@@ -108,6 +113,7 @@ declare class WatermarkAsync<TConstructorData = IWatermarkInputData> extends Wat
     tileGap: number | ITileGap;
     tileStagger: IStagger;
     tileRotation: number;
+    get tileURL(): string;
 }
 
 declare class ProcessorData$1 extends ProcessorDataBase {
@@ -124,13 +130,14 @@ declare class WatermarkSync<TConstructorData = IWatermarkInputData> extends Wate
     tileGap: number | ITileGap;
     tileStagger: IStagger;
     tileRotation: number;
+    get tileURL(): string;
 }
 
 declare class ProcessorData extends ProcessorDataBase {
     __leaf: WatermarkURL;
     regenerateImage(): void;
 }
-declare class WatermarkURL<TConstructorData = IWatermarkInputData> extends Rect<TConstructorData> implements IWatermark {
+declare class WatermarkURL<TConstructorData = IWatermarkInputData> extends WatermarkBase<TConstructorData> {
     get __tag(): string;
     __: ProcessorData;
     tileURL?: string;
@@ -146,4 +153,4 @@ declare function installStaggerPattern(): void;
 declare function processStaggerData(paint: any): INormalizedStagger | null;
 
 export { WatermarkAsync, WatermarkSync, WatermarkURL, installStaggerPattern, normalizeStagger, processStaggerData };
-export type { INormalizedStagger, IProcessDataType, IStagger, IStaggerData, IStaggerType, ITileGap, IWatermark, IWatermarkAttrData, IWatermarkInputData };
+export type { INormalizedStagger, IProcessDataType, IStagger, IStaggerData, IStaggerType, ITileContentParser, ITileGap, IWatermark, IWatermarkAttrData, IWatermarkInputData };

package/dist/index.mjs

@@ -1,6 +1,14 @@
-import { Debug, RectData, isObject, UICreator, Rect, dataProcessor, boundsType, registerUI, Plugin, Creator, MatrixHelper, MathHelper, PaintImage, Platform } from '@leafer-ui/core';
+import { Debug, RectData, isObject, UICreator, Rect, PropertyEvent, dataProcessor, boundsType, registerUI, Plugin, Creator, MatrixHelper, MathHelper, PaintImage, Platform } from '@leafer-ui/core';
 
 const console = Debug.get("leafer-x-watermark");
+function defaultTileContentParser(content) {
+  try {
+    return JSON.parse(content);
+  } catch (e) {
+    console.error("Invalid tileContent JSON:", e);
+    return null;
+  }
+}
 class ProcessorDataBase extends RectData {
   _cachedUrl;
   _cachedBounds;
@@ -22,6 +30,8 @@ class ProcessorDataBase extends RectData {
   setTileMode(value) {
     this._tileMode = value;
     this.updateFill();
+    if (value && this.__leaf.syncParentSize)
+      this.__leaf.syncParentSize();
   }
   setTileSize(value) {
     this._tileSize = value;
@@ -102,12 +112,8 @@ class ProcessorDataBase extends RectData {
       this.__leaf.fill = void 0;
       return null;
     }
-    try {
-      return JSON.parse(_tileContent);
-    } catch (e) {
-      console.error("Invalid tileContent JSON:", e);
-      return null;
-    }
+    const parser = this.__leaf.tileContentParser || defaultTileContentParser;
+    return parser(_tileContent);
   }
   updateLeafDimensions(bounds) {
     const leaf = this.__leaf;
@@ -125,8 +131,30 @@ class ProcessorDataBase extends RectData {
 }
 
 class WatermarkBase extends Rect {
-  get tileURL() {
-    return this.__._cachedUrl;
+  tileContentParser;
+  constructor(data) {
+    super(data);
+    this.syncParentSize = this.syncParentSize.bind(this);
+    this.waitParent(() => {
+      this.parent.on(PropertyEvent.CHANGE, this.syncParentSize);
+      this.syncParentSize();
+    });
+  }
+  syncParentSize(e) {
+    if (e && !["width", "height"].includes(e.attrName)) {
+      return;
+    }
+    if (this.__._tileMode && this.parent) {
+      this.width = this.parent.width;
+      this.height = this.parent.height;
+      this.y = this.x = 0;
+    }
+  }
+  destroy() {
+    if (this.parent) {
+      this.parent.off(PropertyEvent.CHANGE, this.syncParentSize);
+    }
+    super.destroy();
   }
 }
 
@@ -166,6 +194,9 @@ let WatermarkAsync = class extends WatermarkBase {
   get __tag() {
     return "WatermarkAsync";
   }
+  get tileURL() {
+    return this.__._cachedUrl;
+  }
 };
 __decorateClass$2([
   dataProcessor(ProcessorDataAsync)
@@ -235,6 +266,9 @@ let WatermarkSync = class extends WatermarkBase {
   get __tag() {
     return "WatermarkSync";
   }
+  get tileURL() {
+    return this.__._cachedUrl;
+  }
 };
 __decorateClass$1([
   dataProcessor(ProcessorData$1)
@@ -303,7 +337,7 @@ class ProcessorData extends ProcessorDataBase {
     });
   }
 }
-let WatermarkURL = class extends Rect {
+let WatermarkURL = class extends WatermarkBase {
   get __tag() {
     return "WatermarkURL";
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "leafer-x-watermark",
   "type": "module",
-  "version": "3.0.0",
+  "version": "3.2.0",
   "packageManager": "pnpm@10.14.0",
   "description": "Leafer 水印插件",
   "author": "XiaDeYu <1579883916@qq.com>",