Merge pull request #1520 from VisActor/fix/group-gradient

fix: fix group fill gradient #1518
VisActor · Oct 30, 2024 · f425014 · f425014
2 parents 108b06e + c170809
commit f425014
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/common/changes/@visactor/vrender-core/fix-group-gradient_2024-10-28-13-33.json b/common/changes/@visactor/vrender-core/fix-group-gradient_2024-10-28-13-33.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vrender-core",
+      "comment": "fix: fix group fill gradient #1518",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vrender-core"
+}
diff --git a/packages/vrender-core/src/render/contributions/render/group-render.ts b/packages/vrender-core/src/render/contributions/render/group-render.ts
@@ -73,7 +73,10 @@ export class DefaultCanvasGroupRender implements IGraphicRender {
       path = groupAttribute.path,
       lineWidth = groupAttribute.lineWidth,
       visible = groupAttribute.visible,
-      fillStrokeOrder = groupAttribute.fillStrokeOrder
+      fillStrokeOrder = groupAttribute.fillStrokeOrder,
+
+      x: originX = groupAttribute.x,
+      y: originY = groupAttribute.y
     } = group.attribute;
 
     // 不绘制或者透明
@@ -166,7 +169,7 @@ export class DefaultCanvasGroupRender implements IGraphicRender {
         if (fillCb) {
           fillCb(context, group.attribute, groupAttribute);
         } else if (fVisible) {
-          context.setCommonStyle(group, group.attribute, x, y, groupAttribute);
+          context.setCommonStyle(group, group.attribute, originX - x, originY - y, groupAttribute);
           context.fill();
         }
       }
@@ -177,7 +180,7 @@ export class DefaultCanvasGroupRender implements IGraphicRender {
         if (strokeCb) {
           strokeCb(context, group.attribute, groupAttribute);
         } else if (sVisible) {
-          context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);
+          context.setStrokeStyle(group, group.attribute, originX - x, originY - y, groupAttribute);
           context.stroke();
         }
       }