From 3b1356a95b14847a388bdda68bf5e1246629d413 Mon Sep 17 00:00:00 2001 From: zhouxinyu Date: Mon, 30 Dec 2024 15:38:46 +0800 Subject: [PATCH] fix: fix issue with cornerType not setted --- .../render/contributions/rect-contribution-render.ts | 4 ++-- .../src/render/contributions/render/group-render.ts | 2 +- .../src/render/contributions/render/image-render.ts | 2 +- .../src/render/contributions/render/rect-render.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/vrender-core/src/render/contributions/render/contributions/rect-contribution-render.ts b/packages/vrender-core/src/render/contributions/render/contributions/rect-contribution-render.ts index 6b920121b..ad560f4cc 100644 --- a/packages/vrender-core/src/render/contributions/render/contributions/rect-contribution-render.ts +++ b/packages/vrender-core/src/render/contributions/render/contributions/rect-contribution-render.ts @@ -91,7 +91,7 @@ export class DefaultRectRenderContribution implements IRectRenderContribution { width - sign * dw, height - sign * dw, cornerRadius, - cornerType === 'round' + cornerType !== 'bevel' ); } @@ -217,7 +217,7 @@ export class SplitRectAfterRenderContribution implements IRectRenderContribution width, height, cornerRadius, - cornerType === 'round', + cornerType !== 'bevel', new Array(4).fill(0).map((_, i) => (x1: number, y1: number, x2: number, y2: number) => { if (stroke[i]) { if (!(lastStrokeI === i - 1 && stroke[i] === lastStroke)) { diff --git a/packages/vrender-core/src/render/contributions/render/group-render.ts b/packages/vrender-core/src/render/contributions/render/group-render.ts index 5757c7091..e6a2e068d 100644 --- a/packages/vrender-core/src/render/contributions/render/group-render.ts +++ b/packages/vrender-core/src/render/contributions/render/group-render.ts @@ -122,7 +122,7 @@ export class DefaultCanvasGroupRender implements IGraphicRender { } else { context.beginPath(); // 测试后,cache对于重绘性能提升不大,但是在首屏有一定性能损耗,因此rect不再使用cache - createRectPath(context, x, y, width, height, cornerRadius, cornerType === 'round'); + createRectPath(context, x, y, width, height, cornerRadius, cornerType !== 'bevel'); } if (!this._groupRenderContribitions) { diff --git a/packages/vrender-core/src/render/contributions/render/image-render.ts b/packages/vrender-core/src/render/contributions/render/image-render.ts index ea970fb7c..e1b7ce899 100644 --- a/packages/vrender-core/src/render/contributions/render/image-render.ts +++ b/packages/vrender-core/src/render/contributions/render/image-render.ts @@ -95,7 +95,7 @@ export class DefaultCanvasImageRender extends BaseRender implements IGra // 不需要处理圆角 } else { context.beginPath(); - createRectPath(context, x, y, width, height, cornerRadius, cornerType === 'round'); + createRectPath(context, x, y, width, height, cornerRadius, cornerType !== 'bevel'); needRestore = true; } diff --git a/packages/vrender-core/src/render/contributions/render/rect-render.ts b/packages/vrender-core/src/render/contributions/render/rect-render.ts index 1ebc52a9f..c0e6f6bfc 100644 --- a/packages/vrender-core/src/render/contributions/render/rect-render.ts +++ b/packages/vrender-core/src/render/contributions/render/rect-render.ts @@ -115,7 +115,7 @@ export class DefaultCanvasRectRender extends BaseRender implements IGraph context.beginPath(); // 测试后,cache对于重绘性能提升不大,但是在首屏有一定性能损耗,因此rect不再使用cache - createRectPath(context, x, y, width, height, cornerRadius, cornerType === 'round'); + createRectPath(context, x, y, width, height, cornerRadius, cornerType !== 'bevel'); } const doFillOrStroke = {