@leafer/worker 1.11.2 → 1.12.1

package/dist/worker.esm.min.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker.esm.min.js","sources":["../../../../../../../src/leafer/packages/interface/src/path/IPathCommand.ts"],"sourcesContent":["import { IPointData } from '../math/IMath'\n\ntype Command = number\ntype x = number\ntype y = number\ntype x1 = number\ntype y1 = number\ntype x2 = number\ntype y2 = number\ntype radiusX = number\ntype radiusY = number\ntype xAxisRotation = number\ntype largeArcFlag = number\ntype sweepFlag = number\n\n\nexport type MCommandData = [Command, x, y]\nexport type HCommandData = [Command, x]\nexport type VCommandData = [Command, y]\nexport type LCommandData = MCommandData\n\nexport type CCommandData = [Command, x1, y1, x2, y2, x, y]\nexport type SCommandData = [Command, x2, y2, x, y]\n\nexport type QCommandData = [Command, x1, y1, x, y]\nexport type TCommandData = [Command, x, y]\n\nexport type ZCommandData = [Command]\n\nexport type ACommandData = [Command, radiusX, radiusY, xAxisRotation, largeArcFlag, sweepFlag, x, y]\n\n\n// 非svg标准的canvas绘图命令\ntype width = number\ntype height = number\ntype rotation = number\ntype startAngle = number\ntype endAngle = number\ntype anticlockwise = boolean\ntype cornerRadius = number | number[]\ntype radius = number\n\nexport type RectCommandData = [Command, x, y, width, height]\nexport type RoundRectCommandData = [Command, x, y, width, height, cornerRadius]\nexport type EllipseCommandData = [Command, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise]\nexport type ArcCommandData = [Command, x, y, radius, startAngle, endAngle, anticlockwise]\nexport type ArcToCommandData = [Command, x1, y1, x2, y2, radius]\n\n\nexport type CanvasPathCommand = 1 | 2 | 5 | 7 | 11 // M | L | C | Q | Z   canvas可以绘制的命令\n\nexport type IPathCommandData = number[] // ...(MCommandData | LCommandData | CCommandData | QCommandData | ZCommandData)\n\n\n// 路径命令对象\nexport interface MoveToCommandObject {\n    name: 'M'\n    x: number\n    y: number\n}\nexport interface LineToCommandObject {\n    name: 'L'\n    x: number\n    y: number\n}\n\nexport interface BezierCurveToCommandObject {\n    name: 'C'\n    x1: number\n    y1: number\n    x2: number\n    y2: number\n    x: number\n    y: number\n}\n\nexport interface QuadraticCurveToCommandObject {\n    name: 'Q'\n    x1: number\n    y1: number\n    x: number\n    y: number\n}\n\nexport interface ClosePathCommandObject {\n    name: 'Z'\n}\n\nexport type IPathCommandObject = MoveToCommandObject | LineToCommandObject | BezierCurveToCommandObject | QuadraticCurveToCommandObject | ClosePathCommandObject // M | L | C | Q | Z   canvas可以绘制的命令\n\n\n// 可视化路径节点\n\nexport interface IPathCommandNodeBase {\n    name: 'M^' | 'L^' | 'C^' | 'Z^'\n    x: number\n    y: number\n    a?: IPointData // 第一个手柄，连接上一个节点\n    b?: IPointData // 第二个手柄，连接下一个节点\n    ab?: PathNodeHandleType // 手柄类型\n}\n\nexport interface MoveToCommandNode extends IPathCommandNodeBase {\n    name: 'M^'\n}\nexport interface LineToCommandNode extends IPathCommandNodeBase {\n    name: 'L^'\n}\n\nexport interface BezierCurveToCommandNode extends IPathCommandNodeBase {\n    name: 'C^'\n}\n\nexport interface ClosePathCommandNode {\n    name: 'Z^'\n    x?: number\n    y?: number\n    a?: IPointData\n    b?: IPointData\n    ab?: PathNodeHandleType\n\n}\n\nexport type IPathCommandNode = MoveToCommandNode | LineToCommandNode | BezierCurveToCommandNode | ClosePathCommandNode // M | L | C | Z   路径节点命令(适合可视化编辑)\n\nexport enum PathNodeHandleType { // 手柄类型\n    none = 1, // 无手柄\n    free = 2, // 每个手柄自由控制\n    mirrorAngle = 3, // 仅镜像角度\n    mirror = 4,  // 镜像角度和长度\n}\n\nexport type PathNodeHandleName = 'a' | 'b' // 手柄名称\n\nexport interface IPathNodeBase {\n    pathNode: IPathCommandNode\n}"],"names":["PathNodeHandleType"],"mappings":"klBA6HYA,GAAZ,SAAYA,GACRA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,YAAA,GAAA,cACAA,EAAAA,EAAA,OAAA,GAAA,QACH,CALD,CAAYA,IAAAA,EAAkB,CAAA"}
+{"version":3,"file":"worker.esm.min.js","sources":["../../../../../../../src/leafer/packages/interface/src/path/IPathCommand.ts"],"sourcesContent":["import { IPointData } from '../math/IMath'\n\ntype Command = number\ntype x = number\ntype y = number\ntype x1 = number\ntype y1 = number\ntype x2 = number\ntype y2 = number\ntype radiusX = number\ntype radiusY = number\ntype xAxisRotation = number\ntype largeArcFlag = number\ntype sweepFlag = number\n\n\nexport type MCommandData = [Command, x, y]\nexport type HCommandData = [Command, x]\nexport type VCommandData = [Command, y]\nexport type LCommandData = MCommandData\n\nexport type CCommandData = [Command, x1, y1, x2, y2, x, y]\nexport type SCommandData = [Command, x2, y2, x, y]\n\nexport type QCommandData = [Command, x1, y1, x, y]\nexport type TCommandData = [Command, x, y]\n\nexport type ZCommandData = [Command]\n\nexport type ACommandData = [Command, radiusX, radiusY, xAxisRotation, largeArcFlag, sweepFlag, x, y]\n\n\n// 非svg标准的canvas绘图命令\ntype width = number\ntype height = number\ntype rotation = number\ntype startAngle = number\ntype endAngle = number\ntype anticlockwise = boolean\ntype cornerRadius = number | number[]\ntype radius = number\n\nexport type RectCommandData = [Command, x, y, width, height]\nexport type RoundRectCommandData = [Command, x, y, width, height, cornerRadius]\nexport type EllipseCommandData = [Command, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise]\nexport type ArcCommandData = [Command, x, y, radius, startAngle, endAngle, anticlockwise]\nexport type ArcToCommandData = [Command, x1, y1, x2, y2, radius]\n\n\nexport type CanvasPathCommand = 1 | 2 | 5 | 7 | 11 // M | L | C | Q | Z   canvas可以绘制的命令\n\nexport type IPathCommandData = number[] // ...(MCommandData | LCommandData | CCommandData | QCommandData | ZCommandData)\n\n\n// 路径命令对象\nexport interface MoveToCommandObject {\n    name: 'M'\n    x: number\n    y: number\n}\nexport interface LineToCommandObject {\n    name: 'L'\n    x: number\n    y: number\n}\n\nexport interface BezierCurveToCommandObject {\n    name: 'C'\n    x1: number\n    y1: number\n    x2: number\n    y2: number\n    x: number\n    y: number\n}\n\nexport interface QuadraticCurveToCommandObject {\n    name: 'Q'\n    x1: number\n    y1: number\n    x: number\n    y: number\n}\n\nexport interface ClosePathCommandObject {\n    name: 'Z'\n}\n\nexport type IPathCommandObject = MoveToCommandObject | LineToCommandObject | BezierCurveToCommandObject | QuadraticCurveToCommandObject | ClosePathCommandObject // M | L | C | Q | Z   canvas可以绘制的命令\n\n\n// 可视化路径节点\n\nexport interface IPathCommandNodeBase {\n    name: 'M^' | 'L^' | 'C^' | 'Z^'\n    x: number\n    y: number\n    a?: IPointData // 第一个手柄，连接上一个节点\n    b?: IPointData // 第二个手柄，连接下一个节点\n    ab?: PathNodeHandleType // 手柄类型\n}\n\nexport interface MoveToCommandNode extends IPathCommandNodeBase {\n    name: 'M^'\n}\nexport interface LineToCommandNode extends IPathCommandNodeBase {\n    name: 'L^'\n}\n\nexport interface BezierCurveToCommandNode extends IPathCommandNodeBase {\n    name: 'C^'\n}\n\nexport interface ClosePathCommandNode {\n    name: 'Z^'\n    x?: number\n    y?: number\n    a?: IPointData\n    b?: IPointData\n    ab?: PathNodeHandleType\n}\n\nexport type IPathCommandNode = MoveToCommandNode | LineToCommandNode | BezierCurveToCommandNode | ClosePathCommandNode // M | L | C | Z   路径节点命令(适合可视化编辑)\n\nexport enum PathNodeHandleType { // 手柄类型\n    none = 1, // 无手柄\n    free = 2, // 每个手柄自由控制\n    mirrorAngle = 3, // 仅镜像角度\n    mirror = 4,  // 镜像角度和长度\n}\n\nexport type PathNodeHandleName = 'a' | 'b' // 手柄名称\n\nexport interface IPathNodeBase {\n    pathNode: IPathCommandNode\n}"],"names":["PathNodeHandleType"],"mappings":"klBA4HYA,GAAZ,SAAYA,GACRA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,YAAA,GAAA,cACAA,EAAAA,EAAA,OAAA,GAAA,QACH,CALD,CAAYA,IAAAA,EAAkB,CAAA"}

package/dist/worker.js

@@ -3818,16 +3818,27 @@ var LeaferUI = function(exports) {
         recycle(image) {
             image.use--;
             setTimeout(() => {
-                if (!image.use) I$1.recycledList.push(image);
+                if (!image.use) {
+                    if (Platform.image.isLarge(image)) {
+                        if (image.url) Resource.remove(image.url);
+                    } else {
+                        image.clearLevels();
+                        I$1.recycledList.push(image);
+                    }
+                }
             });
         },
-        clearRecycled() {
+        recyclePaint(paint) {
+            I$1.recycle(paint.image);
+        },
+        clearRecycled(force) {
             const list = I$1.recycledList;
-            if (list.length > I$1.maxRecycled) {
-                list.forEach(image => !image.use && image.url && Resource.remove(image.url));
+            if (list.length > I$1.maxRecycled || force) {
+                list.forEach(image => (!image.use || force) && image.url && Resource.remove(image.url));
                 list.length = 0;
             }
         },
+        clearLevels() {},
         hasAlphaPixel(config) {
             return FileHelper.alphaPixelTypes.some(item => I$1.isFormat(item, config));
         },
@@ -3842,7 +3853,7 @@ var LeaferUI = function(exports) {
             return false;
         },
         destroy() {
-            I$1.recycledList = [];
+            this.clearRecycled(true);
         }
     };
     const I$1 = ImageManager;
@@ -3942,11 +3953,15 @@ var LeaferUI = function(exports) {
             Platform.image.setPatternTransform(pattern, transform, paint);
             return pattern;
         }
+        clearLevels(_checkUse) {}
         destroy() {
+            this.clearLevels();
+            const {view: view} = this;
+            if (view && view.close) view.close();
             this.config = {
                 url: ""
             };
-            this.cache = null;
+            this.cache = this.view = null;
             this.waitComplete.length = 0;
         }
     }
@@ -4637,9 +4652,52 @@ var LeaferUI = function(exports) {
                 if (exclude && exclude === branch) continue;
                 updateBounds$4(branch);
             }
+        },
+        move(branch, x, y) {
+            let w;
+            const {children: children} = branch;
+            for (let i = 0, len = children.length; i < len; i++) {
+                branch = children[i];
+                w = branch.__world;
+                w.e += x;
+                w.f += y;
+                w.x += x;
+                w.y += y;
+                if (branch.isBranch) move$9(branch, x, y);
+            }
+        },
+        scale(branch, x, y, scaleX, scaleY, a, b) {
+            let w;
+            const {children: children} = branch;
+            const changeScaleX = scaleX - 1;
+            const changeScaleY = scaleY - 1;
+            for (let i = 0, len = children.length; i < len; i++) {
+                branch = children[i];
+                w = branch.__world;
+                w.a *= scaleX;
+                w.d *= scaleY;
+                if (w.b || w.c) {
+                    w.b *= scaleX;
+                    w.c *= scaleY;
+                }
+                if (w.e === w.x && w.f === w.y) {
+                    w.x = w.e += (w.e - a) * changeScaleX + x;
+                    w.y = w.f += (w.f - b) * changeScaleY + y;
+                } else {
+                    w.e += (w.e - a) * changeScaleX + x;
+                    w.f += (w.f - b) * changeScaleY + y;
+                    w.x += (w.x - a) * changeScaleX + x;
+                    w.y += (w.y - b) * changeScaleY + y;
+                }
+                w.width *= scaleX;
+                w.height *= scaleY;
+                w.scaleX *= scaleX;
+                w.scaleY *= scaleY;
+                if (branch.isBranch) scale$2(branch, x, y, scaleX, scaleY, a, b);
+            }
         }
     };
-    const {pushAllChildBranch: pushAllChildBranch$1, pushAllBranchStack: pushAllBranchStack, updateBoundsByBranchStack: updateBoundsByBranchStack} = BranchHelper;
+    const {pushAllChildBranch: pushAllChildBranch$1, pushAllBranchStack: pushAllBranchStack, updateBoundsByBranchStack: updateBoundsByBranchStack, move: move$9, scale: scale$2} = BranchHelper;
     const WaitHelper = {
         run(wait) {
             if (wait && wait.length) {
@@ -5576,6 +5634,7 @@ var LeaferUI = function(exports) {
     const LeafRender = {
         __render(canvas, options) {
             if (options.shape) return this.__renderShape(canvas, options);
+            if (options.cellList && !options.cellList.has(this)) return;
             if (this.__worldOpacity) {
                 const data = this.__;
                 if (data.bright && !options.topRendering) return options.topList.add(this);
@@ -6102,10 +6161,10 @@ var LeaferUI = function(exports) {
         hit(_world, _hitRadius) {
             return true;
         }
-        __hitWorld(_point) {
+        __hitWorld(_point, _forceHitFill) {
             return true;
         }
-        __hit(_local) {
+        __hit(_local, _forceHitFill) {
             return true;
         }
         __hitFill(_inner) {
@@ -6454,7 +6513,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "1.11.2";
+    const version = "1.12.1";
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() {
             return true;
@@ -6556,7 +6615,7 @@ var LeaferUI = function(exports) {
             return this.hasAdd || this.hasRemove || this.hasVisible;
         }
         get updatedList() {
-            if (this.hasRemove) {
+            if (this.hasRemove && this.config.usePartLayout) {
                 const updatedList = new LeafList;
                 this.__updatedList.list.forEach(item => {
                     if (item.leafer) updatedList.add(item);
@@ -6591,16 +6650,18 @@ var LeaferUI = function(exports) {
             if (this.running) this.target.emit(RenderEvent.REQUEST);
         }
         __onAttrChange(event) {
-            this.__updatedList.add(event.target);
+            if (this.config.usePartLayout) this.__updatedList.add(event.target);
             this.update();
         }
         __onChildEvent(event) {
-            if (event.type === ChildEvent.ADD) {
-                this.hasAdd = true;
-                this.__pushChild(event.child);
-            } else {
-                this.hasRemove = true;
-                this.__updatedList.add(event.parent);
+            if (this.config.usePartLayout) {
+                if (event.type === ChildEvent.ADD) {
+                    this.hasAdd = true;
+                    this.__pushChild(event.child);
+                } else {
+                    this.hasRemove = true;
+                    this.__updatedList.add(event.parent);
+                }
             }
             this.update();
         }
@@ -6707,7 +6768,9 @@ var LeaferUI = function(exports) {
     class Layouter {
         constructor(target, userConfig) {
             this.totalTimes = 0;
-            this.config = {};
+            this.config = {
+                usePartLayout: true
+            };
             this.__levelList = new LeafLevelList;
             this.target = target;
             if (userConfig) this.config = DataHelper.default(userConfig, this.config);
@@ -6752,7 +6815,7 @@ var LeaferUI = function(exports) {
             this.totalTimes++;
             this.layouting = true;
             this.target.emit(WatchEvent.REQUEST);
-            if (this.totalTimes > 1) {
+            if (this.totalTimes > 1 && this.config.usePartLayout) {
                 this.partLayout();
             } else {
                 this.fullLayout();
@@ -6867,7 +6930,7 @@ var LeaferUI = function(exports) {
         }
         update(change = true) {
             if (!this.changed) this.changed = change;
-            this.__requestRender();
+            if (!this.requestTime) this.__requestRender();
         }
         requestLayout() {
             this.target.emit(LayoutEvent.REQUEST);
@@ -6974,7 +7037,7 @@ var LeaferUI = function(exports) {
             Run.end(t);
         }
         __render(bounds, realBounds) {
-            const {canvas: canvas} = this, includes = bounds.includes(this.target.__world), options = includes ? {
+            const {canvas: canvas, target: target} = this, includes = bounds.includes(target.__world), options = includes ? {
                 includes: includes
             } : {
                 bounds: bounds,
@@ -6982,12 +7045,16 @@ var LeaferUI = function(exports) {
             };
             if (this.needFill) canvas.fillWorld(bounds, this.config.fill);
             if (Debug.showRepaint) Debug.drawRepaint(canvas, bounds);
-            Platform.render(this.target, canvas, options);
+            if (this.config.useCellRender) options.cellList = this.getCellList();
+            Platform.render(target, canvas, options);
             this.renderBounds = realBounds = realBounds || bounds;
             this.renderOptions = options;
             this.totalBounds.isEmpty() ? this.totalBounds = realBounds : this.totalBounds.add(realBounds);
             canvas.updateRender(realBounds);
         }
+        getCellList() {
+            return undefined;
+        }
         addBlock(block) {
             if (!this.updateBlocks) this.updateBlocks = [];
             this.updateBlocks.push(block);
@@ -7199,7 +7266,7 @@ var LeaferUI = function(exports) {
                 hit = child.__.hitRadius ? true : hitRadiusPoint$1(child.__world, point);
                 if (child.isBranch) {
                     if (hit || child.__ignoreHitWorld) {
-                        if (child.isBranchLeaf && child.__.__clipAfterFill && !child.__hitWorld(point)) continue;
+                        if (child.isBranchLeaf && child.__.__clipAfterFill && !child.__hitWorld(point, true)) continue;
                         if (child.topChildren) this.eachFind(child.topChildren, false);
                         this.eachFind(child.children, child.__onlyHitMask);
                         if (child.isBranchLeaf) this.hitChild(child, point);
@@ -7601,6 +7668,11 @@ var LeaferUI = function(exports) {
             }
             this._boxStyle = value;
         }
+        __getInputData(names, options) {
+            const data = super.__getInputData(names, options);
+            if (data.textEditing) delete data.textEditing;
+            return data;
+        }
     }
     class ImageData extends RectData {
         setUrl(value) {
@@ -10160,7 +10232,7 @@ var LeaferUI = function(exports) {
             target: this
         }) : this.__hitWorld(worldRadiusPoint);
     };
-    leaf$1.__hitWorld = function(point) {
+    leaf$1.__hitWorld = function(point, forceHitFill) {
         const data = this.__;
         if (!data.hitSelf) return false;
         const world = this.__world, layout = this.__layout;
@@ -10178,7 +10250,7 @@ var LeaferUI = function(exports) {
             this.__updateHitCanvas();
             if (!layout.boundsChanged) layout.hitCanvasChanged = false;
         }
-        return this.__hit(inner);
+        return this.__hit(inner, forceHitFill);
     };
     leaf$1.__hitFill = function(inner) {
         const h = this.__hitCanvas;
@@ -10237,12 +10309,12 @@ var LeaferUI = function(exports) {
         this.__drawHitPath(h);
         h.setStrokeOptions(data);
     };
-    ui$5.__hit = function(inner) {
+    ui$5.__hit = function(inner, forceHitFill) {
         if (this.__box && this.__box.__hit(inner)) return true;
         const data = this.__;
         if (data.__isHitPixel && this.__hitPixel(inner)) return true;
         const {hitFill: hitFill} = data;
-        const needHitFillPath = (data.fill || data.__isCanvas) && (hitFill === "path" || hitFill === "pixel" && !(data.__isAlphaPixelFill || data.__isCanvas)) || hitFill === "all";
+        const needHitFillPath = (data.fill || data.__isCanvas) && (hitFill === "path" || hitFill === "pixel" && !(data.__isAlphaPixelFill || data.__isCanvas)) || hitFill === "all" || forceHitFill;
         if (needHitFillPath && this.__hitFill(inner)) return true;
         const {hitStroke: hitStroke, __maxStrokeWidth: strokeWidth} = data;
         const needHitStrokePath = data.stroke && (hitStroke === "path" || hitStroke === "pixel" && !data.__isAlphaPixelStroke) || hitStroke === "all";
@@ -10589,6 +10661,7 @@ var LeaferUI = function(exports) {
         const {boxBounds: boxBounds} = ui.__layout;
         switch (paint.type) {
           case "image":
+            if (!paint.url) return undefined;
             leafPaint = PaintImage.image(ui, attrName, paint, boxBounds, !recycleMap || !recycleMap[paint.url]);
             break;
 
@@ -10903,7 +10976,7 @@ var LeaferUI = function(exports) {
         if (scaleX) scaleHelper(transform, scaleX, scaleY);
         translate(transform, box.x + x, box.y + y);
     }
-    const {get: get$1, scale: scale$2, copy: copy$4} = MatrixHelper;
+    const {get: get$1, scale: scale$1, copy: copy$4} = MatrixHelper;
     const {getFloorScale: getFloorScale} = MathHelper, {abs: abs$6} = Math;
     function createPatternTask(paint, ui, canvas, renderOptions) {
         if (!paint.patternTask) {
@@ -10932,7 +11005,7 @@ var LeaferUI = function(exports) {
                     scaleY *= getFloorScale(height + (yGap || 0));
                     imageMatrix = get$1();
                     if (transform) copy$4(imageMatrix, transform);
-                    scale$2(imageMatrix, 1 / scaleX, 1 / scaleY);
+                    scale$1(imageMatrix, 1 / scaleX, 1 / scaleY);
                 }
                 const imageCanvas = image.getCanvas(width, height, data.opacity, data.filters, xGap, yGap, ui.leafer && ui.leafer.config.smooth);
                 const pattern = image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || "no-repeat"), imageMatrix, paint);
@@ -10962,7 +11035,7 @@ var LeaferUI = function(exports) {
                 if (data.repeat) {
                     drawImage = false;
                 } else if (!(originPaint.changeful || Platform.name === "miniapp" && ResizeEvent.isResizing(ui) || exporting)) {
-                    drawImage = Platform.image.isLarge(image, scaleX, scaleY);
+                    drawImage = Platform.image.isLarge(image, scaleX, scaleY) || image.width * scaleX > 8096 || image.height * scaleY > 8096;
                 }
             }
             if (drawImage) {
@@ -11018,7 +11091,7 @@ var LeaferUI = function(exports) {
                 if (url) {
                     if (!recycleMap) recycleMap = {};
                     recycleMap[url] = true;
-                    ImageManager.recycle(image);
+                    ImageManager.recyclePaint(paint);
                     if (image.loading) {
                         if (!input) {
                             input = data.__input && data.__input[attrName] || [];
@@ -11925,7 +11998,7 @@ var LeaferUI = function(exports) {
         };
     }
     const {abs: abs$4} = Math;
-    const {copy: copy$2, scale: scale$1} = MatrixHelper;
+    const {copy: copy$2} = MatrixHelper;
     const {setListWithFn: setListWithFn} = BoundsHelper;
     const {worldBounds: worldBounds} = LeafBoundsHelper;
     const matrix$1 = getMatrixData();
@@ -11964,19 +12037,10 @@ var LeaferUI = function(exports) {
                         const aScaleX = abs$4(worldTransform.scaleX), aScaleY = abs$4(worldTransform.scaleY);
                         copy$2(matrix$1, worldTransform);
                         matrix$1.half = strokeWidth % 2;
-                        if (aScaleX !== aScaleY) {
-                            scale$1(matrix$1, 1 / aScaleX, 1 / aScaleY);
-                            canvas.setWorld(matrix$1, options.matrix);
-                            canvas.beginPath();
-                            data.strokeWidth = strokeWidth;
-                            const {x: x, y: y, width: width, height: height} = leaf.__layout.boxBounds;
-                            canvas.rect(x * aScaleX, y * aScaleY, width * aScaleX, height * aScaleY);
-                        } else {
-                            canvas.setWorld(matrix$1, options.matrix);
-                            canvas.beginPath();
-                            if (leaf.__.__useArrow) leaf.__drawPath(canvas); else leaf.__.__pathForRender ? leaf.__drawRenderPath(canvas) : leaf.__drawPathByBox(canvas);
-                            data.strokeWidth = strokeWidth / abs$4(worldTransform.scaleX);
-                        }
+                        canvas.setWorld(matrix$1, options.matrix);
+                        canvas.beginPath();
+                        if (leaf.__.__useArrow) leaf.__drawPath(canvas); else leaf.__.__pathForRender ? leaf.__drawRenderPath(canvas) : leaf.__drawPathByBox(canvas);
+                        data.strokeWidth = strokeWidth / Math.max(aScaleX, aScaleY);
                         if (stroke) isString(stroke) ? Paint.stroke(stroke, this, canvas, options) : Paint.strokes(stroke, this, canvas, options);
                         if (fill) isString(fill) ? Paint.fill(fill, this, canvas, options) : Paint.fills(fill, this, canvas, options);
                     }

package/dist/worker.min.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"worker.min.cjs","sources":["../../../../../../../src/leafer/packages/interface/src/path/IPathCommand.ts"],"sourcesContent":["import { IPointData } from '../math/IMath'\n\ntype Command = number\ntype x = number\ntype y = number\ntype x1 = number\ntype y1 = number\ntype x2 = number\ntype y2 = number\ntype radiusX = number\ntype radiusY = number\ntype xAxisRotation = number\ntype largeArcFlag = number\ntype sweepFlag = number\n\n\nexport type MCommandData = [Command, x, y]\nexport type HCommandData = [Command, x]\nexport type VCommandData = [Command, y]\nexport type LCommandData = MCommandData\n\nexport type CCommandData = [Command, x1, y1, x2, y2, x, y]\nexport type SCommandData = [Command, x2, y2, x, y]\n\nexport type QCommandData = [Command, x1, y1, x, y]\nexport type TCommandData = [Command, x, y]\n\nexport type ZCommandData = [Command]\n\nexport type ACommandData = [Command, radiusX, radiusY, xAxisRotation, largeArcFlag, sweepFlag, x, y]\n\n\n// 非svg标准的canvas绘图命令\ntype width = number\ntype height = number\ntype rotation = number\ntype startAngle = number\ntype endAngle = number\ntype anticlockwise = boolean\ntype cornerRadius = number | number[]\ntype radius = number\n\nexport type RectCommandData = [Command, x, y, width, height]\nexport type RoundRectCommandData = [Command, x, y, width, height, cornerRadius]\nexport type EllipseCommandData = [Command, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise]\nexport type ArcCommandData = [Command, x, y, radius, startAngle, endAngle, anticlockwise]\nexport type ArcToCommandData = [Command, x1, y1, x2, y2, radius]\n\n\nexport type CanvasPathCommand = 1 | 2 | 5 | 7 | 11 // M | L | C | Q | Z   canvas可以绘制的命令\n\nexport type IPathCommandData = number[] // ...(MCommandData | LCommandData | CCommandData | QCommandData | ZCommandData)\n\n\n// 路径命令对象\nexport interface MoveToCommandObject {\n    name: 'M'\n    x: number\n    y: number\n}\nexport interface LineToCommandObject {\n    name: 'L'\n    x: number\n    y: number\n}\n\nexport interface BezierCurveToCommandObject {\n    name: 'C'\n    x1: number\n    y1: number\n    x2: number\n    y2: number\n    x: number\n    y: number\n}\n\nexport interface QuadraticCurveToCommandObject {\n    name: 'Q'\n    x1: number\n    y1: number\n    x: number\n    y: number\n}\n\nexport interface ClosePathCommandObject {\n    name: 'Z'\n}\n\nexport type IPathCommandObject = MoveToCommandObject | LineToCommandObject | BezierCurveToCommandObject | QuadraticCurveToCommandObject | ClosePathCommandObject // M | L | C | Q | Z   canvas可以绘制的命令\n\n\n// 可视化路径节点\n\nexport interface IPathCommandNodeBase {\n    name: 'M^' | 'L^' | 'C^' | 'Z^'\n    x: number\n    y: number\n    a?: IPointData // 第一个手柄，连接上一个节点\n    b?: IPointData // 第二个手柄，连接下一个节点\n    ab?: PathNodeHandleType // 手柄类型\n}\n\nexport interface MoveToCommandNode extends IPathCommandNodeBase {\n    name: 'M^'\n}\nexport interface LineToCommandNode extends IPathCommandNodeBase {\n    name: 'L^'\n}\n\nexport interface BezierCurveToCommandNode extends IPathCommandNodeBase {\n    name: 'C^'\n}\n\nexport interface ClosePathCommandNode {\n    name: 'Z^'\n    x?: number\n    y?: number\n    a?: IPointData\n    b?: IPointData\n    ab?: PathNodeHandleType\n\n}\n\nexport type IPathCommandNode = MoveToCommandNode | LineToCommandNode | BezierCurveToCommandNode | ClosePathCommandNode // M | L | C | Z   路径节点命令(适合可视化编辑)\n\nexport enum PathNodeHandleType { // 手柄类型\n    none = 1, // 无手柄\n    free = 2, // 每个手柄自由控制\n    mirrorAngle = 3, // 仅镜像角度\n    mirror = 4,  // 镜像角度和长度\n}\n\nexport type PathNodeHandleName = 'a' | 'b' // 手柄名称\n\nexport interface IPathNodeBase {\n    pathNode: IPathCommandNode\n}"],"names":["PathNodeHandleType"],"mappings":"iBA6HYA,glBAAAA,QAAAA,wBAAAA,GAAAA,EAAAA,QAAAA,qBAAAA,2BAAkB,CAAA,IAC1BA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,YAAA,GAAA,cACAA,EAAAA,EAAA,OAAA,GAAA"}
+{"version":3,"file":"worker.min.cjs","sources":["../../../../../../../src/leafer/packages/interface/src/path/IPathCommand.ts"],"sourcesContent":["import { IPointData } from '../math/IMath'\n\ntype Command = number\ntype x = number\ntype y = number\ntype x1 = number\ntype y1 = number\ntype x2 = number\ntype y2 = number\ntype radiusX = number\ntype radiusY = number\ntype xAxisRotation = number\ntype largeArcFlag = number\ntype sweepFlag = number\n\n\nexport type MCommandData = [Command, x, y]\nexport type HCommandData = [Command, x]\nexport type VCommandData = [Command, y]\nexport type LCommandData = MCommandData\n\nexport type CCommandData = [Command, x1, y1, x2, y2, x, y]\nexport type SCommandData = [Command, x2, y2, x, y]\n\nexport type QCommandData = [Command, x1, y1, x, y]\nexport type TCommandData = [Command, x, y]\n\nexport type ZCommandData = [Command]\n\nexport type ACommandData = [Command, radiusX, radiusY, xAxisRotation, largeArcFlag, sweepFlag, x, y]\n\n\n// 非svg标准的canvas绘图命令\ntype width = number\ntype height = number\ntype rotation = number\ntype startAngle = number\ntype endAngle = number\ntype anticlockwise = boolean\ntype cornerRadius = number | number[]\ntype radius = number\n\nexport type RectCommandData = [Command, x, y, width, height]\nexport type RoundRectCommandData = [Command, x, y, width, height, cornerRadius]\nexport type EllipseCommandData = [Command, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise]\nexport type ArcCommandData = [Command, x, y, radius, startAngle, endAngle, anticlockwise]\nexport type ArcToCommandData = [Command, x1, y1, x2, y2, radius]\n\n\nexport type CanvasPathCommand = 1 | 2 | 5 | 7 | 11 // M | L | C | Q | Z   canvas可以绘制的命令\n\nexport type IPathCommandData = number[] // ...(MCommandData | LCommandData | CCommandData | QCommandData | ZCommandData)\n\n\n// 路径命令对象\nexport interface MoveToCommandObject {\n    name: 'M'\n    x: number\n    y: number\n}\nexport interface LineToCommandObject {\n    name: 'L'\n    x: number\n    y: number\n}\n\nexport interface BezierCurveToCommandObject {\n    name: 'C'\n    x1: number\n    y1: number\n    x2: number\n    y2: number\n    x: number\n    y: number\n}\n\nexport interface QuadraticCurveToCommandObject {\n    name: 'Q'\n    x1: number\n    y1: number\n    x: number\n    y: number\n}\n\nexport interface ClosePathCommandObject {\n    name: 'Z'\n}\n\nexport type IPathCommandObject = MoveToCommandObject | LineToCommandObject | BezierCurveToCommandObject | QuadraticCurveToCommandObject | ClosePathCommandObject // M | L | C | Q | Z   canvas可以绘制的命令\n\n\n// 可视化路径节点\n\nexport interface IPathCommandNodeBase {\n    name: 'M^' | 'L^' | 'C^' | 'Z^'\n    x: number\n    y: number\n    a?: IPointData // 第一个手柄，连接上一个节点\n    b?: IPointData // 第二个手柄，连接下一个节点\n    ab?: PathNodeHandleType // 手柄类型\n}\n\nexport interface MoveToCommandNode extends IPathCommandNodeBase {\n    name: 'M^'\n}\nexport interface LineToCommandNode extends IPathCommandNodeBase {\n    name: 'L^'\n}\n\nexport interface BezierCurveToCommandNode extends IPathCommandNodeBase {\n    name: 'C^'\n}\n\nexport interface ClosePathCommandNode {\n    name: 'Z^'\n    x?: number\n    y?: number\n    a?: IPointData\n    b?: IPointData\n    ab?: PathNodeHandleType\n}\n\nexport type IPathCommandNode = MoveToCommandNode | LineToCommandNode | BezierCurveToCommandNode | ClosePathCommandNode // M | L | C | Z   路径节点命令(适合可视化编辑)\n\nexport enum PathNodeHandleType { // 手柄类型\n    none = 1, // 无手柄\n    free = 2, // 每个手柄自由控制\n    mirrorAngle = 3, // 仅镜像角度\n    mirror = 4,  // 镜像角度和长度\n}\n\nexport type PathNodeHandleName = 'a' | 'b' // 手柄名称\n\nexport interface IPathNodeBase {\n    pathNode: IPathCommandNode\n}"],"names":["PathNodeHandleType"],"mappings":"iBA4HYA,glBAAAA,QAAAA,wBAAAA,GAAAA,EAAAA,QAAAA,qBAAAA,2BAAkB,CAAA,IAC1BA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,YAAA,GAAA,cACAA,EAAAA,EAAA,OAAA,GAAA"}