leafer-x-watermark 3.1.0 → 4.1.0

package/README.md

@@ -1,219 +1,141 @@
-# leafer-x-watermark
-
-[![npm version][npm-version-src]][npm-version-href]
-[![npm downloads][npm-downloads-src]][npm-downloads-href]
-[![bundle][bundle-src]][bundle-href]
-[![License][license-src]][license-href]
-
-Leafer UI 水印插件，支持任意 LeaferJS 元素平铺水印
-
-> ⚠️ **重要提示**：如果需要使用 `tileStagger`（错位排列）功能，必须在 `new App()` 后立即调用 `installStaggerPattern()` 进行补丁安装（此为临时方案，待官方支持后将移除）。
-
-## ✨ 特性
-
-- 🎨 **任意图形** - 支持任意 LeaferJS 元素作为水印内容
-- 🔄 **平铺模式** - 支持平铺（repeat）和拉伸（stretch）两种模式
-- 📐 **灵活缩放** - 支持自定义水印尺寸比例
-- 🔲 **间距控制** - 支持自定义水印间距
-- 🎯 **错位排列** - 支持水印错位（stagger）效果
-- 🔃 **旋转支持** - 支持水印旋转角度设置
-- ⚡ **性能优化** - 智能缓存，仅在必要时重新生成图片
-- 🚀 **多版本支持** - 提供同步、异步及 URL 三种版本，适配不同场景需求
-
-## 📦 安装
-
-```bash
-# pnpm
-pnpm add leafer-x-watermark
-
-# npm
-npm install leafer-x-watermark
-
-# yarn
-yarn add leafer-x-watermark
-```
-
-## 🚀 快速开始
-
-### 版本选择
-
-根据水印内容选择合适的版本：
-
-- **WatermarkSync（同步版本）** - 适用于纯文本、矩形等基础图形，性能更好
-- **WatermarkAsync（异步版本）** - 适用于包含图片URL、自定义字体等需要加载的异步资源
-- **WatermarkURL（URL版本）** - 直接通过图片URL创建水印，更加便捷
-
-```typescript
-import { WatermarkSync } from 'leafer-x-watermark'    // 同步版本
-import { WatermarkAsync } from 'leafer-x-watermark'   // 异步版本
-import { WatermarkURL } from 'leafer-x-watermark'     // URL版本
-```
-
-### 基础使用（同步版本）
-
-```typescript
-import { App } from 'leafer-ui'
-import { WatermarkSync, installStaggerPattern } from 'leafer-x-watermark'
-
-const app = new App({ view: 'app' })
-installStaggerPattern() // 全局安装一次即可
-
-const watermark = new WatermarkSync({
-  tileContent: JSON.stringify({
-    tag: 'Text',
-    text: '水印文字',
-    fill: 'rgba(0, 0, 0, 0.1)',
-    fontSize: 16,
-  }),
-  width: 800,
-  height: 600,
-})
-
-app.tree.add(watermark)
-```
-
-### URL版本使用
-
-可以直接使用图片 URL 作为水印内容：
-
-```typescript
-import { App } from 'leafer-ui'
-import { WatermarkURL, installStaggerPattern } from 'leafer-x-watermark'
-
-const app = new App({ view: 'app' })
-installStaggerPattern()
-
-const watermark = new WatermarkURL({
-  tileURL: 'https://example.com/logo.png',
-  tileMode: true,
-  tileSize: 50,
-  width: 800,
-  height: 600,
-})
-
-app.tree.add(watermark)
-```
-
-### 异步版本使用
-
-当水印内容包含图片资源时，使用异步版本：
-
-```typescript
-import { App } from 'leafer-ui'
-import { WatermarkAsync, installStaggerPattern } from 'leafer-x-watermark'
-
-const app = new App({ view: 'app' })
-installStaggerPattern()
-
-const watermark = new WatermarkAsync({
-  tileContent: JSON.stringify({
-    tag: 'Image',
-    url: 'https://example.com/logo.png',
-    width: 100,
-    height: 100,
-  }),
-  tileMode: true,
-  width: 800,
-  height: 600,
-})
-
-app.tree.add(watermark)
-```
-
-## 📖 API 文档
-
-### WatermarkSync / WatermarkAsync / WatermarkURL
-
-三个版本的 API 基本相同，主要区别：
-- **WatermarkSync**: 同步生成，适用于纯图形。
-- **WatermarkAsync**: 异步生成，适用于包含外部资源的图形。
-- **WatermarkURL**: 直接使用 `tileURL` 属性设置图片 URL。
-
-继承自 Leafer UI 的 [Rect](https://www.leaferjs.com/ui/reference/display/Rect.html) 组件，拥有所有 Rect 属性，并额外支持：
-
-| 属性 | 类型 | 默认值 | 说明 |
-|------|------|--------|------|
-| `tileContent` | string | - | 水印内容，LeaferJS 元素的 JSON 字符串（URL版本不支持） |
-| `tileURL` | string | - | 直接设置图片 URL 作为水印（仅限 URL版本） |
-| `tileMode` | boolean | `true` | 平铺模式：`true` 平铺，`false` 拉伸 |
-| `tileSize` | number | `100` | 显示比例（%），100 为原始大小 |
-| `tileGap` | `number \| { x?: number, y?: number }` | `0` | 间距比例（%），支持统一数值或分别设置 x/y 间距 |
-| `tileStagger` | `number \| { type?: 'x' \| 'y', offset: number }` | `0` | 错位偏移，支持数值(0-100)或详细配置 |
-| `tileRotation` | number | `0` | 水印旋转角度（度） |
-
-### 属性说明
-
-#### tileContent / tileURL
-
-水印内容支持 LeaferJS 元素的 JSON 字符串（Sync/Async版本）或直接图片 URL（URL版本）：
-
-```typescript
-// Sync / Async 版本使用 tileContent
-JSON.stringify({ tag: 'Text', text: '水印', fill: '#000', fontSize: 16 })
-
-// URL 版本使用 tileURL
-const tileURL = 'https://example.com/logo.png'
-```
-
-#### tileSize
-
-控制水印显示大小的比例：
-- `100` = 原始大小
-- `50` = 缩小 50%
-- `200` = 放大 200%
-- `0` 或负数 = 不显示水印
-
-#### tileGap
-
-间距基于显示尺寸的百分比计算：
-- `tileGap: 10` 表示间距为水印宽/高的 10%
-- 支持分别设置：`{ x: 20, y: 10 }`
-
-#### tileStagger
-
-错位排列效果，支持数值 (0-100) 或对象配置：
-- `tileStagger: 50` = 水平方向（x）相邻行偏移 50%
-- `{ type: 'y', offset: 50 }` = 垂直方向（y）相邻列偏移 50%
-- `0` = 无错位
-- `100` = 完全错位（等于一个完整水印尺寸）
-
-⚠️ **注意**：使用 `tileStagger` 功能前必须先调用 `installStaggerPattern()`
-
-## 💡 使用场景
-
-- 📄 文档版权保护
-- 🖼️ 图片水印
-- 🔒 机密文件标识
-- 🏢 企业 Logo 背景
-- 📑 证书防伪
-
-## 🔗 相关链接
-
-- [在线演示](https://leafer-x-watermark.vercel.app/)
-- [Leafer UI 文档](https://www.leaferjs.com/ui/guide/)
-
-## 🤝 贡献
-
-欢迎提交 Issue 和 Pull Request！
-
-## License
-
-[MIT](./LICENSE) License © 2024-PRESENT [XiaDeYu](https://github.com/Xdy1579883916)
-
-<!-- Badges -->
-
-[npm-version-src]: https://img.shields.io/npm/v/leafer-x-watermark?style=flat&colorA=080f12&colorB=1fa669
-
-[npm-version-href]: https://npmjs.com/package/leafer-x-watermark
-
-[npm-downloads-src]: https://img.shields.io/npm/dm/leafer-x-watermark?style=flat&colorA=080f12&colorB=1fa669
-
-[npm-downloads-href]: https://npmjs.com/package/leafer-x-watermark
-
-[bundle-src]: https://img.shields.io/bundlephobia/minzip/leafer-x-watermark?style=flat&colorA=080f12&colorB=1fa669&label=minzip
-
-[bundle-href]: https://bundlephobia.com/result?p=leafer-x-watermark
-
-[license-src]: https://img.shields.io/github/license/Xdy1579883916/leafer-x-watermark.svg?style=flat&colorA=080f12&colorB=1fa669
-
-[license-href]: https://github.com/Xdy1579883916/leafer-x-watermark/blob/master/LICENSE
+# leafer-x-watermark
+
+[![npm version][npm-version-src]][npm-version-href]
+[![npm downloads][npm-downloads-src]][npm-downloads-href]
+[![bundle][bundle-src]][bundle-href]
+[![License][license-src]][license-href]
+
+Leafer UI 水印插件，基于 Leafer 2.0.0 构建，使用更加简单高效。
+
+## ✨ 特性
+
+- 🖼️ **图片水印** - 直接使用图片 URL 创建水印
+- 🔄 **平铺模式** - 支持平铺（repeat）和拉伸（stretch）两种模式
+- 📐 **灵活缩放** - 支持自定义水印尺寸比例
+- 🔲 **间距控制** - 支持自定义水印间距
+- 🎯 **错位排列** - 支持水印错位效果：基于 Leafer 2.0.0版本（interlace）支持
+- 🔃 **旋转支持** - 支持水印旋转角度设置
+
+## 📦 安装
+
+```bash
+# pnpm
+pnpm add leafer-x-watermark
+
+# npm
+npm install leafer-x-watermark
+
+# yarn
+yarn add leafer-x-watermark
+```
+
+## 🚀 快速开始
+
+```typescript
+import { App } from 'leafer-ui'
+import { WatermarkURL } from 'leafer-x-watermark'
+
+const app = new App({ view: 'app' })
+
+const watermark = new WatermarkURL({
+  tileURL: 'https://leaferjs.com/image/logo.svg',
+  tileMode: true,
+  tileSize: 50, // 缩放 50%
+  tileGap: 20, // 间距 20%
+  tileStagger: 50, // 错位 50%
+  width: 800,
+  height: 600,
+})
+
+app.tree.add(watermark)
+```
+
+## 📖 API 文档
+
+### WatermarkURL
+
+继承自 Leafer UI 的 [Rect](https://www.leaferjs.com/ui/reference/display/Rect.html) 组件，拥有所有 Rect 属性。
+
+| 属性 | 类型 | 默认值 | 说明 |
+|------|------|--------|------|
+| `tileURL` | string | - | 水印图片的 URL 地址 |
+| `tileMode` | boolean | `true` | 平铺模式：`true` 平铺，`false` 拉伸 |
+| `tileSize` | number | `100` | 显示比例（%），100 为原始大小 |
+| `tileGap` | `number \| { x?: number, y?: number }` | `0` | 间距比例（%），支持统一数值或分别设置 x/y 间距 |
+| `tileStagger` | `number \| { type?: 'x' \| 'y', offset: number }` | `0` | 错位偏移，支持数值(0-100)或详细配置 |
+| `tileRotation` | number | `0` | 水印旋转角度（度） |
+
+### 属性说明
+
+#### tileURL
+
+设置水印图片的地址，支持网络图片 URL 或 Base64 字符串。
+
+```typescript
+// 使用网络图片
+watermark.tileURL = 'https://example.com/logo.png'
+```
+
+#### tileSize
+
+控制水印显示大小的比例：
+- `100` = 原始大小
+- `50` = 缩小 50%
+- `200` = 放大 200%
+- `0` = 不显示
+
+#### tileGap
+
+间距基于显示尺寸的百分比计算：
+- `tileGap: 10` 表示间距为水印宽/高的 10%
+- 支持分别设置：`{ x: 20, y: 10 }`
+
+#### tileStagger
+
+错位排列效果（Interlace），支持数值 (0-100) 或对象配置：
+- `tileStagger: 50` = 水平方向（x）相邻行偏移 50%
+- `{ type: 'y', offset: 50 }` = 垂直方向（y）相邻列偏移 50%
+- `0` = 无错位
+
+#### tileMode
+
+- `true`: 启用平铺模式（Repeat），支持间距、错位等效果。
+- `false`: 启用拉伸模式（Stretch），图片将填满整个区域。
+
+## 💡 使用场景
+
+- 📄 文档版权保护
+- 🖼️ 图片水印
+- 🔒 机密文件标识
+- 🏢 企业 Logo 背景
+
+## 🔗 相关链接
+
+- [在线演示](https://leafer-x-watermark.vercel.app/)
+- [Leafer UI 文档](https://www.leaferjs.com/ui/guide/)
+
+## 🤝 贡献
+
+欢迎提交 Issue 和 Pull Request！
+
+## License
+
+[MIT](./LICENSE) License © 2024-PRESENT [XiaDeYu](https://github.com/Xdy1579883916)
+
+<!-- Badges -->
+
+[npm-version-src]: https://img.shields.io/npm/v/leafer-x-watermark?style=flat&colorA=080f12&colorB=1fa669
+
+[npm-version-href]: https://npmjs.com/package/leafer-x-watermark
+
+[npm-downloads-src]: https://img.shields.io/npm/dm/leafer-x-watermark?style=flat&colorA=080f12&colorB=1fa669
+
+[npm-downloads-href]: https://npmjs.com/package/leafer-x-watermark
+
+[bundle-src]: https://img.shields.io/bundlephobia/minzip/leafer-x-watermark?style=flat&colorA=080f12&colorB=1fa669&label=minzip
+
+[bundle-href]: https://bundlephobia.com/result?p=leafer-x-watermark
+
+[license-src]: https://img.shields.io/github/license/Xdy1579883916/leafer-x-watermark.svg?style=flat&colorA=080f12&colorB=1fa669
+
+[license-href]: https://github.com/Xdy1579883916/leafer-x-watermark/blob/master/LICENSE

package/dist/index.d.mts

@@ -7,16 +7,13 @@ interface IStaggerData {
     offset: number;
 }
 type IStagger = number | IStaggerData;
-interface INormalizedStagger {
-    type: IStaggerType;
-    offset: number;
-}
 declare module '@leafer-ui/interface' {
     interface IImagePaint {
         stagger?: IStagger;
     }
 }
 
+type ITileContentParser = (content: string) => object | null;
 interface ITileGap {
     x?: number;
     y?: number;
@@ -31,7 +28,6 @@ interface IWatermarkAttrData {
     tileRotation?: number;
 }
 interface IProcessDataType extends IRectData {
-    _tileContent?: string;
     _tileURL?: string;
     _tileMode?: boolean;
     _tileSize?: number;
@@ -48,6 +44,7 @@ interface IProcessDataType extends IRectData {
 }
 interface IWatermark extends IWatermarkAttrData, IUI {
     __: IProcessDataType;
+    tileContentParser?: ITileContentParser;
 }
 interface IWatermarkInputData extends IWatermarkAttrData, IRectInputData {
 }
@@ -59,15 +56,13 @@ declare abstract class ProcessorDataBase extends RectData implements IProcessDat
         width: number;
         height: number;
     };
-    _tileContent?: string;
     _tileURL?: string;
     _tileMode?: boolean;
     _tileSize?: number;
     _tileGap?: number | ITileGap;
-    _tileStagger?: number;
+    _tileStagger?: IStagger;
     _tileRotation?: number;
     abstract regenerateImage(): void | Promise<void>;
-    setTileContent(value: string): void;
     setTileURL(value: string): void;
     setTileMode(value: boolean): void;
     setTileSize(value: number): void;
@@ -77,59 +72,20 @@ declare abstract class ProcessorDataBase extends RectData implements IProcessDat
     updateFill(): void;
     __getData(): IObject;
     __getInputData(names?: string[] | IObject, options?: IJSONOptions): IObject;
-    protected createTileItem(itemData: object): IUI;
-    protected parseAndValidateTileContent(): object | null;
     protected updateLeafDimensions(bounds: {
         width: number;
         height: number;
     }): void;
-    protected finalizeCachedData(url: string, bounds: {
-        width: number;
-        height: number;
-    }): void;
 }
 
 declare abstract class WatermarkBase<TConstructorData = IWatermarkInputData> extends Rect<TConstructorData> implements IWatermark {
     __: ProcessorDataBase;
+    tileContentParser?: ITileContentParser;
     constructor(data?: TConstructorData);
     syncParentSize(e?: PropertyEvent): void;
     destroy(): void;
 }
 
-declare class ProcessorDataAsync extends ProcessorDataBase {
-    __leaf: WatermarkAsync;
-    setTileContent(value: string): Promise<void>;
-    regenerateImage(): Promise<void>;
-}
-declare class WatermarkAsync<TConstructorData = IWatermarkInputData> extends WatermarkBase<TConstructorData> {
-    get __tag(): string;
-    __: ProcessorDataAsync;
-    tileContent?: string;
-    tileMode: boolean;
-    tileSize: number;
-    tileGap: number | ITileGap;
-    tileStagger: IStagger;
-    tileRotation: number;
-    get tileURL(): string;
-}
-
-declare class ProcessorData$1 extends ProcessorDataBase {
-    __leaf: WatermarkSync;
-    regenerateImage(): void;
-    private _simpleExport;
-}
-declare class WatermarkSync<TConstructorData = IWatermarkInputData> extends WatermarkBase<TConstructorData> {
-    get __tag(): string;
-    __: ProcessorData$1;
-    tileContent?: string;
-    tileMode: boolean;
-    tileSize: number;
-    tileGap: number | ITileGap;
-    tileStagger: IStagger;
-    tileRotation: number;
-    get tileURL(): string;
-}
-
 declare class ProcessorData extends ProcessorDataBase {
     __leaf: WatermarkURL;
     regenerateImage(): void;
@@ -145,9 +101,5 @@ declare class WatermarkURL<TConstructorData = IWatermarkInputData> extends Water
     tileRotation: number;
 }
 
-declare function normalizeStagger(stagger: IStagger): INormalizedStagger;
-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 { WatermarkURL };
+export type { IProcessDataType, ITileContentParser, ITileGap, IWatermark, IWatermarkAttrData, IWatermarkInputData };

package/dist/index.mjs

@@ -1,20 +1,20 @@
-import { Debug, RectData, isObject, UICreator, Rect, PropertyEvent, dataProcessor, boundsType, registerUI, Plugin, Creator, MatrixHelper, MathHelper, PaintImage, Platform } from '@leafer-ui/core';
+import { RectData, isObject, Rect, PropertyEvent, dataProcessor, boundsType, registerUI, Creator } from '@leafer-ui/core';
 
-const console = Debug.get("leafer-x-watermark");
+function normalizeStagger(stagger) {
+  if (typeof stagger === "number") {
+    return { type: "x", offset: stagger };
+  }
+  return { type: stagger.type || "x", offset: stagger.offset || 0 };
+}
 class ProcessorDataBase extends RectData {
   _cachedUrl;
   _cachedBounds;
-  _tileContent = "";
   _tileURL = "";
   _tileMode = true;
   _tileSize = 100;
   _tileGap = 0;
   _tileStagger = 0;
   _tileRotation = 0;
-  setTileContent(value) {
-    this._tileContent = value;
-    this.regenerateImage();
-  }
   setTileURL(value) {
     this._tileURL = value;
     this.regenerateImage();
@@ -22,7 +22,7 @@ class ProcessorDataBase extends RectData {
   setTileMode(value) {
     this._tileMode = value;
     this.updateFill();
-    if (value && this.__leaf.syncParentSize)
+    if (this.__leaf.syncParentSize)
       this.__leaf.syncParentSize();
   }
   setTileSize(value) {
@@ -68,13 +68,21 @@ class ProcessorDataBase extends RectData {
       }
       const gapX = xGap / 100 * sizeWidth;
       const gapY = yGap / 100 * sizeHeight;
+      const interlace = normalizeStagger(_tileStagger);
       leaf.fill = {
         type: "image",
         url: this._cachedUrl,
         mode: "repeat",
         gap: { x: gapX, y: gapY },
         size: { width: sizeWidth, height: sizeHeight },
-        stagger: _tileStagger,
+        interlace: {
+          type: interlace.type || "x",
+          offset: {
+            type: "percent",
+            // 为 0 时有bug，不渲染了，待修复。先手动改为1。
+            value: (interlace.offset || 1) / 100
+          }
+        },
         rotation: _tileRotation,
         align: "center"
       };
@@ -90,27 +98,6 @@ class ProcessorDataBase extends RectData {
     delete data.fill;
     return data;
   }
-  createTileItem(itemData) {
-    return UICreator.get("Group", {
-      children: [itemData],
-      around: "center"
-    });
-  }
-  parseAndValidateTileContent() {
-    const { _tileContent } = this;
-    if (!_tileContent) {
-      this._cachedUrl = void 0;
-      this._cachedBounds = void 0;
-      this.__leaf.fill = void 0;
-      return null;
-    }
-    try {
-      return JSON.parse(_tileContent);
-    } catch (e) {
-      console.error("Invalid tileContent JSON:", e);
-      return null;
-    }
-  }
   updateLeafDimensions(bounds) {
     const leaf = this.__leaf;
     const { width, height } = leaf;
@@ -119,14 +106,10 @@ class ProcessorDataBase extends RectData {
       leaf.height = bounds.height;
     }
   }
-  finalizeCachedData(url, bounds) {
-    this._cachedUrl = url;
-    this._cachedBounds = bounds;
-    this.updateFill();
-  }
 }
 
 class WatermarkBase extends Rect {
+  tileContentParser;
   constructor(data) {
     super(data);
     this.syncParentSize = this.syncParentSize.bind(this);
@@ -136,13 +119,17 @@ class WatermarkBase extends Rect {
     });
   }
   syncParentSize(e) {
-    if (e && !["width", "height"].includes(e.attrName)) {
+    if (e && !["width", "height", "x", "y"].includes(e.attrName)) {
       return;
     }
     if (this.__._tileMode && this.parent) {
       this.width = this.parent.width;
       this.height = this.parent.height;
-      this.y = this.x = 0;
+      this.y = this.x = this.rotation = 0;
+      this.scaleX = this.scaleY = 1;
+    } else {
+      this.width = this.__._cachedBounds?.width;
+      this.height = this.__._cachedBounds?.height;
     }
   }
   destroy() {
@@ -153,144 +140,6 @@ class WatermarkBase extends Rect {
   }
 }
 
-var __defProp$2 = Object.defineProperty;
-var __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor;
-var __decorateClass$2 = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target;
-  for (var i = decorators.length - 1, decorator; i >= 0; i--)
-    if (decorator = decorators[i])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result) __defProp$2(target, key, result);
-  return result;
-};
-class ProcessorDataAsync extends ProcessorDataBase {
-  // 异步版本需要覆盖，以便正确 await
-  async setTileContent(value) {
-    this._tileContent = value;
-    await this.regenerateImage();
-  }
-  async regenerateImage() {
-    const itemData = this.parseAndValidateTileContent();
-    if (!itemData)
-      return;
-    const tempItem = this.createTileItem(itemData);
-    const bounds = tempItem.getBounds("box", "local");
-    this.updateLeafDimensions(bounds);
-    const exportWidth = 1e3;
-    const { data: url } = await tempItem.export("png", {
-      blob: false,
-      size: { width: exportWidth }
-    });
-    tempItem.destroy();
-    this.finalizeCachedData(url, bounds);
-  }
-}
-let WatermarkAsync = class extends WatermarkBase {
-  get __tag() {
-    return "WatermarkAsync";
-  }
-  get tileURL() {
-    return this.__._cachedUrl;
-  }
-};
-__decorateClass$2([
-  dataProcessor(ProcessorDataAsync)
-], WatermarkAsync.prototype, "__", 2);
-__decorateClass$2([
-  boundsType()
-], WatermarkAsync.prototype, "tileContent", 2);
-__decorateClass$2([
-  boundsType(true)
-], WatermarkAsync.prototype, "tileMode", 2);
-__decorateClass$2([
-  boundsType(100)
-], WatermarkAsync.prototype, "tileSize", 2);
-__decorateClass$2([
-  boundsType(0)
-], WatermarkAsync.prototype, "tileGap", 2);
-__decorateClass$2([
-  boundsType(0)
-], WatermarkAsync.prototype, "tileStagger", 2);
-__decorateClass$2([
-  boundsType(0)
-], WatermarkAsync.prototype, "tileRotation", 2);
-WatermarkAsync = __decorateClass$2([
-  registerUI()
-], WatermarkAsync);
-
-var __defProp$1 = Object.defineProperty;
-var __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor;
-var __decorateClass$1 = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target;
-  for (var i = decorators.length - 1, decorator; i >= 0; i--)
-    if (decorator = decorators[i])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result) __defProp$1(target, key, result);
-  return result;
-};
-let ProcessorData$1 = class ProcessorData extends ProcessorDataBase {
-  regenerateImage() {
-    const itemData = this.parseAndValidateTileContent();
-    if (!itemData)
-      return;
-    const tempItem = this.createTileItem(itemData);
-    const { url, bounds } = this._simpleExport(tempItem);
-    this.updateLeafDimensions(bounds);
-    tempItem.destroy();
-    this.finalizeCachedData(url, bounds);
-  }
-  _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 WatermarkSync = class extends WatermarkBase {
-  get __tag() {
-    return "WatermarkSync";
-  }
-  get tileURL() {
-    return this.__._cachedUrl;
-  }
-};
-__decorateClass$1([
-  dataProcessor(ProcessorData$1)
-], WatermarkSync.prototype, "__", 2);
-__decorateClass$1([
-  boundsType()
-], WatermarkSync.prototype, "tileContent", 2);
-__decorateClass$1([
-  boundsType(true)
-], WatermarkSync.prototype, "tileMode", 2);
-__decorateClass$1([
-  boundsType(100)
-], WatermarkSync.prototype, "tileSize", 2);
-__decorateClass$1([
-  boundsType(0)
-], WatermarkSync.prototype, "tileGap", 2);
-__decorateClass$1([
-  boundsType(0)
-], WatermarkSync.prototype, "tileStagger", 2);
-__decorateClass$1([
-  boundsType(0)
-], WatermarkSync.prototype, "tileRotation", 2);
-WatermarkSync = __decorateClass$1([
-  registerUI()
-], WatermarkSync);
-Plugin.add("leafer-x-watermark");
-
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -301,17 +150,12 @@ var __decorateClass = (decorators, target, key, kind) => {
   if (kind && result) __defProp(target, key, result);
   return result;
 };
-async function toBase64(url) {
+async function getBounds(url) {
   return new Promise((resolve) => {
     const leaferImage = Creator.image({ url });
     leaferImage.load((image) => {
       const { width, height } = image;
-      const canvas = Creator.hitCanvas({ width, height, pixelRatio: 1 });
-      canvas.drawImage(image.view, 0, 0);
-      const data = canvas.toDataURL();
-      canvas.destroy();
-      leaferImage.destroy();
-      resolve({ data, bounds: { width, height } });
+      resolve({ data: url, bounds: { width, height } });
     });
   });
 }
@@ -324,7 +168,7 @@ class ProcessorData extends ProcessorDataBase {
       this.__leaf.fill = void 0;
       return;
     }
-    toBase64(url).then(({ data, bounds }) => {
+    getBounds(url).then(({ data, bounds }) => {
       this._cachedUrl = data;
       this._cachedBounds = bounds;
       this.updateLeafDimensions(bounds);
@@ -362,161 +206,4 @@ WatermarkURL = __decorateClass([
   registerUI()
 ], WatermarkURL);
 
-const { get, scale, copy } = MatrixHelper;
-const { getFloorScale } = MathHelper;
-const { abs } = Math;
-const ORIGINAL_CREATE_PATTERN = Symbol.for("leafer-x-watermark:PaintImage.createPattern.original");
-const STAGGER_PATTERN_ID = Symbol.for("leafer-x-watermark:paint.staggerPatternId");
-function ensureOriginalCreatePattern() {
-  const anyPaintImage = PaintImage;
-  if (!anyPaintImage[ORIGINAL_CREATE_PATTERN]) {
-    anyPaintImage[ORIGINAL_CREATE_PATTERN] = PaintImage.createPattern.bind(PaintImage);
-  }
-  return anyPaintImage[ORIGINAL_CREATE_PATTERN];
-}
-const staggerCanvasCache = /* @__PURE__ */ new WeakMap();
-function normalizeStagger(stagger) {
-  if (typeof stagger === "number") {
-    return { type: "x", offset: stagger };
-  }
-  return { type: stagger.type || "x", offset: stagger.offset || 0 };
-}
-function isSameStaggerParams(a, b) {
-  return a[0] === b[0] && a[1] === b[1] && a[2] === b[2] && a[3] === b[3] && a[4] === b[4] && a[5] === b[5] && a[6] === b[6] && a[7] === b[7];
-}
-function getStaggerCanvas(image, width, height, xGap, yGap, stagger, opacity, smooth) {
-  const cached = staggerCanvasCache.get(image);
-  if (cached) {
-    const nextParams = [
-      width,
-      height,
-      xGap,
-      yGap,
-      stagger.type,
-      stagger.offset,
-      opacity,
-      smooth
-    ];
-    if (isSameStaggerParams(cached.params, nextParams))
-      return cached.canvas;
-  }
-  const canvas = createStaggerCanvas(image, width, height, xGap, yGap, stagger, opacity, smooth);
-  staggerCanvasCache.set(image, {
-    params: [width, height, xGap, yGap, stagger.type, stagger.offset, opacity, smooth],
-    canvas
-  });
-  return canvas;
-}
-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 originalCreatePattern = ensureOriginalCreatePattern();
-  const rawStagger = paint.data?.stagger ?? paint.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 baseId = `${scaleX}-${scaleY}`;
-  const staggerId = `${baseId}-stagger-${stagger.type}-${stagger.offset}`;
-  const anyPaint = paint;
-  if (ui.destroyed)
-    return;
-  if (paint.patternId === baseId && anyPaint[STAGGER_PATTERN_ID] === staggerId)
-    return;
-  if (Platform.image.isLarge(paint.image, scaleX, scaleY) && !paint.data.repeat)
-    return;
-  const { image, data } = paint;
-  const { transform, gap } = data;
-  const fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
-  if (fixScale) {
-    scaleX *= fixScale;
-    scaleY *= fixScale;
-  }
-  let imageMatrix;
-  let xGap = 0;
-  let yGap = 0;
-  let { width, height } = image;
-  width *= scaleX;
-  height *= scaleY;
-  if (gap) {
-    xGap = gap.x * scaleX / abs(data.scaleX || 1);
-    yGap = gap.y * scaleY / abs(data.scaleY || 1);
-  }
-  if (transform || scaleX !== 1 || scaleY !== 1) {
-    scaleX *= getFloorScale(width + (xGap || 0));
-    scaleY *= getFloorScale(height + (yGap || 0));
-    imageMatrix = get();
-    if (transform)
-      copy(imageMatrix, transform);
-    scale(imageMatrix, 1 / scaleX, 1 / scaleY);
-  }
-  const imageCanvas = getStaggerCanvas(
-    image,
-    width,
-    height,
-    xGap,
-    yGap,
-    stagger,
-    data.opacity,
-    ui.leafer?.config.smooth
-  );
-  const pattern = image.getPattern(
-    imageCanvas,
-    data.repeat || (Platform.origin.noRepeat || "no-repeat"),
-    imageMatrix,
-    paint
-  );
-  paint.style = pattern;
-  paint.patternId = baseId;
-  anyPaint[STAGGER_PATTERN_ID] = staggerId;
-}
-function installStaggerPattern() {
-  ensureOriginalCreatePattern();
-  PaintImage.createPattern = createPatternWithStagger;
-}
-function processStaggerData(paint) {
-  if (paint.stagger !== void 0) {
-    return normalizeStagger(paint.stagger);
-  }
-  return null;
-}
-
-export { WatermarkAsync, WatermarkSync, WatermarkURL, installStaggerPattern, normalizeStagger, processStaggerData };
+export { WatermarkURL };

package/package.json

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