leafer-x-watermark 1.1.1 → 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

@@ -1,123 +1,4 @@
-import { MatrixHelper, MathHelper, PaintImage, Platform, Debug, dataProcessor, boundsType, registerUI, Plugin, RectData, isObject, UICreator, Rect } from '@leafer-ui/core';
-
-const { get, scale, copy } = MatrixHelper;
-const { getFloorScale } = MathHelper;
-const { abs } = Math;
-const originalCreatePattern = PaintImage.createPattern.bind(PaintImage);
-function normalizeStagger(stagger) {
-  if (typeof stagger === "number") {
-    return { type: "x", offset: stagger };
-  }
-  return { type: stagger.type || "x", offset: stagger.offset || 0 };
-}
-function createStaggerCanvas(image, imgWidth, imgHeight, xGap, yGap, stagger, opacity, smooth) {
-  const unitWidth = imgWidth + xGap;
-  const unitHeight = imgHeight + yGap;
-  const isXStagger = stagger.type === "x";
-  const patternWidth = isXStagger ? unitWidth : unitWidth * 2;
-  const patternHeight = isXStagger ? unitHeight * 2 : unitHeight;
-  const canvas = Platform.origin.createCanvas(
-    Math.max(Math.floor(patternWidth), 1),
-    Math.max(Math.floor(patternHeight), 1)
-  );
-  const ctx = canvas.getContext("2d");
-  if (opacity && opacity < 1)
-    ctx.globalAlpha = opacity;
-  ctx.imageSmoothingEnabled = smooth !== false;
-  const imgView = image.view;
-  const drawImg = (x, y) => {
-    ctx.drawImage(imgView, 0, 0, image.width, image.height, x, y, imgWidth, imgHeight);
-  };
-  const offset = stagger.offset / 100 * (isXStagger ? unitWidth : unitHeight);
-  if (isXStagger) {
-    drawImg(0, 0);
-    drawImg(offset, unitHeight);
-    if (offset + imgWidth > unitWidth) {
-      drawImg(offset - unitWidth, unitHeight);
-    }
-  } else {
-    drawImg(0, 0);
-    drawImg(unitWidth, offset);
-    if (offset + imgHeight > unitHeight) {
-      drawImg(unitWidth, offset - unitHeight);
-    }
-  }
-  return canvas;
-}
-function createPatternWithStagger(paint, ui, canvas, renderOptions) {
-  const originPaint = paint.originPaint;
-  const rawStagger = originPaint?.stagger;
-  if (rawStagger === void 0 || rawStagger === 0) {
-    originalCreatePattern(paint, ui, canvas, renderOptions);
-    return;
-  }
-  const stagger = normalizeStagger(rawStagger);
-  if (stagger.offset === 0) {
-    originalCreatePattern(paint, ui, canvas, renderOptions);
-    return;
-  }
-  let { scaleX, scaleY } = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions);
-  const id = `${scaleX}-${scaleY}-stagger-${stagger.type}-${stagger.offset}`;
-  if (paint.patternId !== id && !ui.destroyed) {
-    const { image, data } = paint;
-    const { transform, gap } = data;
-    const fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
-    let imageMatrix;
-    let xGap = 0;
-    let yGap = 0;
-    let { width, height } = image;
-    if (fixScale) {
-      scaleX *= fixScale;
-      scaleY *= fixScale;
-    }
-    width *= scaleX;
-    height *= scaleY;
-    if (gap) {
-      xGap = gap.x * scaleX / abs(data.scaleX || 1);
-      yGap = gap.y * scaleY / abs(data.scaleY || 1);
-    }
-    const unitWidth = width + xGap;
-    const unitHeight = height + yGap;
-    const isXStagger = stagger.type === "x";
-    const patternWidth = isXStagger ? unitWidth : unitWidth * 2;
-    const patternHeight = isXStagger ? unitHeight * 2 : unitHeight;
-    if (transform || scaleX !== 1 || scaleY !== 1) {
-      const matrixScaleX = scaleX * getFloorScale(patternWidth);
-      const matrixScaleY = scaleY * getFloorScale(patternHeight);
-      imageMatrix = get();
-      if (transform)
-        copy(imageMatrix, transform);
-      scale(imageMatrix, 1 / matrixScaleX, 1 / matrixScaleY);
-    }
-    const imageCanvas = createStaggerCanvas(
-      image,
-      width,
-      height,
-      xGap,
-      yGap,
-      stagger,
-      data.opacity,
-      ui.leafer?.config.smooth
-    );
-    const pattern = image.getPattern(
-      imageCanvas,
-      data.repeat || "repeat",
-      imageMatrix,
-      paint
-    );
-    paint.style = pattern;
-    paint.patternId = id;
-  }
-}
-function installStaggerPattern() {
-  PaintImage.createPattern = createPatternWithStagger;
-}
-function processStaggerData(paint) {
-  if (paint.stagger !== void 0) {
-    return normalizeStagger(paint.stagger);
-  }
-  return null;
-}
+import { Debug, dataProcessor, boundsType, registerUI, Plugin, RectData, isObject, UICreator, Rect, MatrixHelper, MathHelper, PaintImage, Platform } from '@leafer-ui/core';
 
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -129,8 +10,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   if (kind && result) __defProp(target, key, result);
   return result;
 };
-installStaggerPattern();
-const debug = Debug.get("leafer-x-watermark");
+const console = Debug.get("leafer-x-watermark");
 class ProcessorData extends RectData {
   _tileContent = "";
   _cachedUrl;
@@ -219,7 +99,7 @@ class ProcessorData extends RectData {
       around: "center"
     });
   }
-  async regenerateImage() {
+  regenerateImage() {
     const leaf = this.__leaf;
     const { _tileContent } = this;
     const { width, height } = leaf;
@@ -233,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() {
@@ -262,6 +154,7 @@ let Watermark = class extends Rect {
   }
   constructor(data) {
     super(data);
+    console.log(this.tileURL);
   }
 };
 __decorateClass([
@@ -296,4 +189,123 @@ Watermark = __decorateClass([
 ], Watermark);
 Plugin.add("leafer-x-watermark");
 
+const { get, scale, copy } = MatrixHelper;
+const { getFloorScale } = MathHelper;
+const { abs } = Math;
+const originalCreatePattern = PaintImage.createPattern.bind(PaintImage);
+function normalizeStagger(stagger) {
+  if (typeof stagger === "number") {
+    return { type: "x", offset: stagger };
+  }
+  return { type: stagger.type || "x", offset: stagger.offset || 0 };
+}
+function createStaggerCanvas(image, imgWidth, imgHeight, xGap, yGap, stagger, opacity, smooth) {
+  const unitWidth = imgWidth + xGap;
+  const unitHeight = imgHeight + yGap;
+  const isXStagger = stagger.type === "x";
+  const patternWidth = isXStagger ? unitWidth : unitWidth * 2;
+  const patternHeight = isXStagger ? unitHeight * 2 : unitHeight;
+  const canvas = Platform.origin.createCanvas(
+    Math.max(Math.floor(patternWidth), 1),
+    Math.max(Math.floor(patternHeight), 1)
+  );
+  const ctx = canvas.getContext("2d");
+  if (opacity && opacity < 1)
+    ctx.globalAlpha = opacity;
+  ctx.imageSmoothingEnabled = smooth !== false;
+  const imgView = image.view;
+  const drawImg = (x, y) => {
+    ctx.drawImage(imgView, 0, 0, image.width, image.height, x, y, imgWidth, imgHeight);
+  };
+  const offset = stagger.offset / 100 * (isXStagger ? unitWidth : unitHeight);
+  if (isXStagger) {
+    drawImg(0, 0);
+    drawImg(offset, unitHeight);
+    if (offset + imgWidth > unitWidth) {
+      drawImg(offset - unitWidth, unitHeight);
+    }
+  } else {
+    drawImg(0, 0);
+    drawImg(unitWidth, offset);
+    if (offset + imgHeight > unitHeight) {
+      drawImg(unitWidth, offset - unitHeight);
+    }
+  }
+  return canvas;
+}
+function createPatternWithStagger(paint, ui, canvas, renderOptions) {
+  const originPaint = paint.originPaint;
+  const rawStagger = originPaint?.stagger;
+  if (rawStagger === void 0 || rawStagger === 0) {
+    originalCreatePattern(paint, ui, canvas, renderOptions);
+    return;
+  }
+  const stagger = normalizeStagger(rawStagger);
+  if (stagger.offset === 0) {
+    originalCreatePattern(paint, ui, canvas, renderOptions);
+    return;
+  }
+  let { scaleX, scaleY } = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions);
+  const id = `${scaleX}-${scaleY}-stagger-${stagger.type}-${stagger.offset}`;
+  if (paint.patternId !== id && !ui.destroyed) {
+    const { image, data } = paint;
+    const { transform, gap } = data;
+    const fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
+    let imageMatrix;
+    let xGap = 0;
+    let yGap = 0;
+    let { width, height } = image;
+    if (fixScale) {
+      scaleX *= fixScale;
+      scaleY *= fixScale;
+    }
+    width *= scaleX;
+    height *= scaleY;
+    if (gap) {
+      xGap = gap.x * scaleX / abs(data.scaleX || 1);
+      yGap = gap.y * scaleY / abs(data.scaleY || 1);
+    }
+    const unitWidth = width + xGap;
+    const unitHeight = height + yGap;
+    const isXStagger = stagger.type === "x";
+    const patternWidth = isXStagger ? unitWidth : unitWidth * 2;
+    const patternHeight = isXStagger ? unitHeight * 2 : unitHeight;
+    if (transform || scaleX !== 1 || scaleY !== 1) {
+      const matrixScaleX = scaleX * getFloorScale(patternWidth);
+      const matrixScaleY = scaleY * getFloorScale(patternHeight);
+      imageMatrix = get();
+      if (transform)
+        copy(imageMatrix, transform);
+      scale(imageMatrix, 1 / matrixScaleX, 1 / matrixScaleY);
+    }
+    const imageCanvas = createStaggerCanvas(
+      image,
+      width,
+      height,
+      xGap,
+      yGap,
+      stagger,
+      data.opacity,
+      ui.leafer?.config.smooth
+    );
+    const pattern = image.getPattern(
+      imageCanvas,
+      data.repeat || "repeat",
+      imageMatrix,
+      paint
+    );
+    paint.style = pattern;
+    paint.patternId = id;
+  }
+}
+function installStaggerPattern() {
+  PaintImage.createPattern = createPatternWithStagger;
+}
+function processStaggerData(paint) {
+  if (paint.stagger !== void 0) {
+    return normalizeStagger(paint.stagger);
+  }
+  return null;
+}
+
 export { ProcessorData, Watermark, installStaggerPattern, normalizeStagger, processStaggerData };

package/package.json

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