@meta2d/core 1.0.20 → 1.0.22

package/src/pen/render.js

@@ -377,6 +377,12 @@ function ctxDrawLinearGradientPath(ctx, pen) {
 }
 function getSmoothAdjacent(smoothLenth, p1, p2) {
     var nexLength = Math.sqrt((p2.x - p1.x) * (p2.x - p1.x) + (p2.y - p1.y) * (p2.y - p1.y));
+    if (nexLength === 0) {
+        return {
+            x: p1.x,
+            y: p1.y,
+        };
+    }
     if (smoothLenth < nexLength) {
         return {
             x: p1.x + ((p2.x - p1.x) * smoothLenth) / nexLength,
@@ -948,111 +954,112 @@ export function renderPen(ctx, pen) {
     inspectRect(ctx, store, pen); // 审查 rect
     var fill;
     // 该变量控制在 hover active 状态下的节点是否设置填充颜色
-    var setBack = true;
+    // let setBack = true;
     var lineGradientFlag = false;
+    var _stroke = undefined;
     if (pen.calculative.hover) {
-        ctx.strokeStyle = pen.hoverColor || store.options.hoverColor;
+        _stroke = pen.hoverColor || store.options.hoverColor;
         fill = pen.hoverBackground || store.options.hoverBackground;
-        ctx.fillStyle = fill;
-        fill && (setBack = false);
+        //  ctx.fillStyle = fill;
+        //  fill && (setBack = false);
     }
     else if (pen.calculative.active) {
-        ctx.strokeStyle = pen.activeColor || store.options.activeColor;
+        _stroke = pen.activeColor || store.options.activeColor;
         fill = pen.activeBackground || store.options.activeBackground;
-        ctx.fillStyle = fill;
-        fill && (setBack = false);
+        // ctx.fillStyle = fill;
+        // fill && (setBack = false);
     }
     else if (pen.calculative.isDock) {
         if (pen.type === PenType.Line) {
-            ctx.strokeStyle = store.options.dockPenColor;
+            _stroke = store.options.dockPenColor;
         }
         else {
             fill = rgba(store.options.dockPenColor, 0.2);
-            ctx.fillStyle = fill;
-            fill && (setBack = false);
+            //  ctx.fillStyle = fill;
+            //  fill && (setBack = false);
         }
     }
+    // else {
+    var strokeImg = pen.calculative.strokeImg;
+    if (pen.calculative.strokeImage && strokeImg) {
+        ctx.strokeStyle = _stroke || ctx.createPattern(strokeImg, 'repeat');
+        // fill = true;
+    }
     else {
-        var strokeImg = pen.calculative.strokeImg;
-        if (pen.calculative.strokeImage && strokeImg) {
-            ctx.strokeStyle = ctx.createPattern(strokeImg, 'repeat');
-            fill = true;
-        }
-        else {
-            var stroke = void 0;
-            // TODO: 线只有线性渐变
-            if (pen.calculative.strokeType) {
-                if (pen.calculative.lineGradientColors) {
-                    if (pen.name === 'line') {
-                        lineGradientFlag = true;
+        var stroke = void 0;
+        // TODO: 线只有线性渐变
+        if (pen.calculative.strokeType) {
+            if (pen.calculative.lineGradientColors) {
+                if (pen.name === 'line') {
+                    lineGradientFlag = true;
+                }
+                else {
+                    if (pen.calculative.lineGradient) {
+                        stroke = pen.calculative.lineGradient;
                     }
                     else {
-                        if (pen.calculative.lineGradient) {
-                            stroke = pen.calculative.lineGradient;
-                        }
-                        else {
-                            stroke = getLineGradient(ctx, pen);
-                            pen.calculative.lineGradient = stroke;
-                        }
+                        stroke = getLineGradient(ctx, pen);
+                        pen.calculative.lineGradient = stroke;
                     }
                 }
-                else {
-                    stroke = strokeLinearGradient(ctx, pen);
-                }
             }
             else {
-                stroke = pen.calculative.color || getGlobalColor(store);
+                stroke = strokeLinearGradient(ctx, pen);
             }
-            ctx.strokeStyle = stroke;
-        }
-    }
-    if (setBack) {
-        var backgroundImg = pen.calculative.backgroundImg;
-        if (pen.calculative.backgroundImage && backgroundImg) {
-            ctx.fillStyle = ctx.createPattern(backgroundImg, 'repeat');
-            fill = true;
         }
         else {
-            var back = void 0;
-            if (pen.calculative.bkType === Gradient.Linear) {
-                if (pen.calculative.gradientColors) {
-                    if (pen.name !== 'line') {
-                        //连线不考虑渐进背景
-                        if (pen.calculative.gradient) {
-                            //位置变化/放大缩小操作不会触发重新计算
-                            back = pen.calculative.gradient;
-                        }
-                        else {
-                            back = getBkGradient(ctx, pen);
-                            pen.calculative.gradient = back;
-                        }
-                    }
-                }
-                else {
-                    back = drawBkLinearGradient(ctx, pen);
-                }
-            }
-            else if (pen.calculative.bkType === Gradient.Radial) {
-                if (pen.calculative.gradientColors) {
-                    if (pen.calculative.radialGradient) {
-                        back = pen.calculative.radialGradient;
+            stroke = pen.calculative.color || getGlobalColor(store);
+        }
+        ctx.strokeStyle = _stroke || stroke;
+    }
+    // }
+    //if (setBack) {
+    var backgroundImg = pen.calculative.backgroundImg;
+    if (pen.calculative.backgroundImage && backgroundImg) {
+        ctx.fillStyle = fill || ctx.createPattern(backgroundImg, 'repeat');
+        fill = true;
+    }
+    else {
+        var back = void 0;
+        if (pen.calculative.bkType === Gradient.Linear) {
+            if (pen.calculative.gradientColors) {
+                if (pen.name !== 'line') {
+                    //连线不考虑渐进背景
+                    if (pen.calculative.gradient) {
+                        //位置变化/放大缩小操作不会触发重新计算
+                        back = pen.calculative.gradient;
                     }
                     else {
-                        back = getBkRadialGradient(ctx, pen);
-                        pen.calculative.radialGradient = back;
+                        back = getBkGradient(ctx, pen);
+                        pen.calculative.gradient = back;
                     }
                 }
+            }
+            else {
+                back = drawBkLinearGradient(ctx, pen);
+            }
+        }
+        else if (pen.calculative.bkType === Gradient.Radial) {
+            if (pen.calculative.gradientColors) {
+                if (pen.calculative.radialGradient) {
+                    back = pen.calculative.radialGradient;
+                }
                 else {
-                    back = drawBkRadialGradient(ctx, pen);
+                    back = getBkRadialGradient(ctx, pen);
+                    pen.calculative.radialGradient = back;
                 }
             }
             else {
-                back = pen.calculative.background || store.data.penBackground;
+                back = drawBkRadialGradient(ctx, pen);
             }
-            ctx.fillStyle = back;
-            fill = !!back;
         }
+        else {
+            back = pen.calculative.background || store.data.penBackground;
+        }
+        ctx.fillStyle = fill || back;
+        fill = !!back;
     }
+    // }
     setLineCap(ctx, pen);
     setLineJoin(ctx, pen);
     setGlobalAlpha(ctx, pen);
@@ -1396,7 +1403,9 @@ export function ctxDrawLinePath(canUsePath, ctx, pen, store) {
                         if (!pen.calculative.gradientAnimatePath) {
                             pen.calculative.gradientAnimatePath = getGradientAnimatePath(pen);
                         }
-                        ctx.stroke(pen.calculative.gradientAnimatePath);
+                        if (pen.calculative.gradientAnimatePath instanceof Path2D) {
+                            ctx.stroke(pen.calculative.gradientAnimatePath);
+                        }
                     }
                     else {
                         ctx.stroke(path);
@@ -1495,7 +1504,8 @@ export function renderAnchor(ctx, pt, pen) {
     if (!pt) {
         return;
     }
-    var active = pen.calculative.activeAnchor === pt;
+    var active = pen.calculative.canvas.store.activeAnchor ===
+        pen.calculative.activeAnchor && pen.calculative.activeAnchor === pt;
     var r = 3;
     if (pen.calculative.lineWidth > 3) {
         r = pen.calculative.lineWidth;
@@ -2532,7 +2542,7 @@ function inspectRect(ctx, store, pen) {
 }
 export function setGlobalAlpha(ctx, pen) {
     var globalAlpha = pen.calculative.globalAlpha;
-    if (globalAlpha < 1) {
+    if (globalAlpha < 1 || globalAlpha !== '') {
         ctx.globalAlpha = globalAlpha;
     }
 }
@@ -2555,7 +2565,13 @@ export function setChildValue(pen, data) {
     for (var k in data) {
         if (inheritanceProps.includes(k)) {
             pen[k] = data[k];
-            pen.calculative[k] = data[k];
+            if (k === 'fontSize') {
+                pen.calculative[k] = data[k] * pen.calculative.canvas.store.data.scale;
+                calcTextRect(pen);
+            }
+            else {
+                pen.calculative[k] = data[k];
+            }
         }
     }
     if (pen.calculative.canvas.parent.isCombine(pen) &&