leafer-x-watermark 1.2.0 → 1.3.0

package/dist/index.d.mts

@@ -1,3 +1,4 @@
+import * as _leafer_ui_interface from '@leafer-ui/interface';
 import { IRectData, IUI, IRectInputData, IObject, IJSONOptions } from '@leafer-ui/interface';
 import { RectData, Rect } from '@leafer-ui/core';
 
@@ -42,7 +43,7 @@ interface IProcessDataType extends IRectData {
         height: number;
     };
     updateFill: () => void;
-    regenerateImage: () => Promise<void>;
+    regenerateImage: () => void;
 }
 interface IWatermark extends IWatermarkAttrData, IUI {
     __: IProcessDataType;
@@ -57,7 +58,7 @@ declare class ProcessorData extends RectData implements IProcessDataType {
         width: number;
         height: number;
     };
-    setTileContent(value: string): Promise<void>;
+    setTileContent(value: string): void;
     _tileMode?: boolean;
     setTileMode(value: boolean): void;
     _tileSize?: number;
@@ -72,7 +73,11 @@ declare class ProcessorData extends RectData implements IProcessDataType {
     __getData(): IObject;
     __getInputData(names?: string[] | IObject, options?: IJSONOptions): IObject;
     private createTileItem;
-    regenerateImage(): Promise<void>;
+    regenerateImage(): void;
+    _simpleExport(ui: IUI): {
+        url: string;
+        bounds: _leafer_ui_interface.IBoundsData;
+    };
 }
 declare class Watermark<TConstructorData = IWatermarkInputData> extends Rect<TConstructorData> implements IWatermark {
     get __tag(): string;

package/dist/index.mjs

@@ -10,7 +10,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   if (kind && result) __defProp(target, key, result);
   return result;
 };
-const debug = Debug.get("leafer-x-watermark");
+const console = Debug.get("leafer-x-watermark");
 class ProcessorData extends RectData {
   _tileContent = "";
   _cachedUrl;
@@ -99,7 +99,7 @@ class ProcessorData extends RectData {
       around: "center"
     });
   }
-  async regenerateImage() {
+  regenerateImage() {
     const leaf = this.__leaf;
     const { _tileContent } = this;
     const { width, height } = leaf;
@@ -113,25 +113,37 @@ class ProcessorData extends RectData {
     try {
       itemData = JSON.parse(_tileContent);
     } catch (e) {
-      debug.error("Invalid tileContent JSON:", e);
+      console.error("Invalid tileContent JSON:", e);
       return;
     }
     const tempItem = this.createTileItem(itemData);
-    const bounds = tempItem.getBounds("box", "local");
+    const { url, bounds } = this._simpleExport(tempItem);
     if (!width || !height) {
       leaf.width = bounds.width;
       leaf.height = bounds.height;
     }
-    const exportWidth = 1e3;
-    const { data: url } = await tempItem.export("png", {
-      blob: false,
-      size: { width: exportWidth }
-    });
     this._cachedUrl = url;
-    this._cachedBounds = { width: bounds.width, height: bounds.height };
+    this._cachedBounds = bounds;
     tempItem.destroy();
     this.updateFill();
   }
+  _simpleExport(ui) {
+    const exportWidth = 1e3;
+    const bounds = ui.getBounds("render", "local");
+    const scaleRatio = exportWidth / bounds.width;
+    const scaledWidth = Math.floor(bounds.width * scaleRatio);
+    const scaledHeight = Math.floor(bounds.height * scaleRatio);
+    const canvas = UICreator.get("Canvas", {
+      x: 0,
+      y: 0,
+      width: scaledWidth,
+      height: scaledHeight
+    });
+    canvas.draw(ui, void 0, scaleRatio);
+    const url = canvas.canvas.toDataURL("image/png");
+    canvas.destroy();
+    return { url, bounds };
+  }
 }
 let Watermark = class extends Rect {
   get __tag() {
@@ -142,6 +154,7 @@ let Watermark = class extends Rect {
   }
   constructor(data) {
     super(data);
+    console.log(this.tileURL);
   }
 };
 __decorateClass([

package/package.json

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