From bc68c77398e5e3ee5b8f653e2bd6e50b4afdea20 Mon Sep 17 00:00:00 2001 From: xile611 Date: Mon, 29 Apr 2024 15:47:14 +0800 Subject: [PATCH 1/7] fix: fix error of label when all the labels are cleared --- packages/vrender-components/src/label/arc.ts | 4 + packages/vrender-components/src/label/base.ts | 103 +++++++++--------- 2 files changed, 56 insertions(+), 51 deletions(-) diff --git a/packages/vrender-components/src/label/arc.ts b/packages/vrender-components/src/label/arc.ts index d3484a79d..5b7cb408a 100644 --- a/packages/vrender-components/src/label/arc.ts +++ b/packages/vrender-components/src/label/arc.ts @@ -156,6 +156,10 @@ export class ArcLabel extends LabelBase { } protected _layout(texts: (IText | IRichText)[]) { + if (!texts || !texts.length) { + return; + } + const labels = super._layout(texts); const textBoundsArray = labels.map(label => this.getGraphicBounds(label as any)); const ellipsisLabelAttribute = { diff --git a/packages/vrender-components/src/label/base.ts b/packages/vrender-components/src/label/base.ts index 61cfc25e6..46fe1eb53 100644 --- a/packages/vrender-components/src/label/base.ts +++ b/packages/vrender-components/src/label/base.ts @@ -639,60 +639,61 @@ export class LabelBase extends AbstractComponent { const labelLines = [] as ILine[]; const { visible: showLabelLine } = this.attribute.line ?? {}; - labels.forEach((text, index) => { - const relatedGraphic = this.getRelatedGraphic(text.attribute); - const textId = (text.attribute as LabelItem).id; - const textKey = this._isCollectionBase ? textId : relatedGraphic; - const state = prevTextMap?.get(textKey) ? 'update' : 'enter'; - let labelLine: ILine; - if (showLabelLine) { - labelLine = this._createLabelLine(text as IText, relatedGraphic); - } - // TODO: add animate - if (state === 'enter') { - texts.push(text); - currentTextMap.set(textKey, labelLine ? { text, labelLine } : { text }); - if (relatedGraphic) { - const { from, to } = getAnimationAttributes(text.attribute, 'fadeIn'); - this.add(text); + labels && + labels.forEach((text, index) => { + const relatedGraphic = this.getRelatedGraphic(text.attribute); + const textId = (text.attribute as LabelItem).id; + const textKey = this._isCollectionBase ? textId : relatedGraphic; + const state = prevTextMap?.get(textKey) ? 'update' : 'enter'; + let labelLine: ILine; + if (showLabelLine) { + labelLine = this._createLabelLine(text as IText, relatedGraphic); + } + // TODO: add animate + if (state === 'enter') { + texts.push(text); + currentTextMap.set(textKey, labelLine ? { text, labelLine } : { text }); + if (relatedGraphic) { + const { from, to } = getAnimationAttributes(text.attribute, 'fadeIn'); + this.add(text); + + if (labelLine) { + labelLines.push(labelLine); + this.add(labelLine); + } - if (labelLine) { - labelLines.push(labelLine); - this.add(labelLine); + this._syncStateWithRelatedGraphic(relatedGraphic); + // enter的时长如果不是大于0，那么直接跳过动画 + this._animationConfig.enter.duration > 0 && + relatedGraphic.once('animate-bind', a => { + // text和labelLine共用一个from + text.setAttributes(from); + labelLine && labelLine.setAttributes(from); + const listener = this._afterRelatedGraphicAttributeUpdate( + text, + texts, + labelLine, + labelLines, + index, + relatedGraphic, + to, + this._animationConfig.enter + ); + relatedGraphic.on('afterAttributeUpdate', listener); + }); + } + } else if (state === 'update') { + const prevLabel = prevTextMap.get(textKey); + prevTextMap.delete(textKey); + currentTextMap.set(textKey, prevLabel); + const prevText = prevLabel.text; + const { duration, easing } = this._animationConfig.update; + updateAnimation(prevText as Text, text as Text, this._animationConfig.update); + if (prevLabel.labelLine && labelLine) { + prevLabel.labelLine.animate().to(labelLine.attribute, duration, easing); } - - this._syncStateWithRelatedGraphic(relatedGraphic); - // enter的时长如果不是大于0，那么直接跳过动画 - this._animationConfig.enter.duration > 0 && - relatedGraphic.once('animate-bind', a => { - // text和labelLine共用一个from - text.setAttributes(from); - labelLine && labelLine.setAttributes(from); - const listener = this._afterRelatedGraphicAttributeUpdate( - text, - texts, - labelLine, - labelLines, - index, - relatedGraphic, - to, - this._animationConfig.enter - ); - relatedGraphic.on('afterAttributeUpdate', listener); - }); - } - } else if (state === 'update') { - const prevLabel = prevTextMap.get(textKey); - prevTextMap.delete(textKey); - currentTextMap.set(textKey, prevLabel); - const prevText = prevLabel.text; - const { duration, easing } = this._animationConfig.update; - updateAnimation(prevText as Text, text as Text, this._animationConfig.update); - if (prevLabel.labelLine && labelLine) { - prevLabel.labelLine.animate().to(labelLine.attribute, duration, easing); } - } - }); + }); prevTextMap.forEach(label => { label.text ?.animate() From 99856b3f933a1652c5abcbed9b05cb79f68e2760 Mon Sep 17 00:00:00 2001 From: xile611 Date: Mon, 29 Apr 2024 15:48:39 +0800 Subject: [PATCH 2/7] docs: update changlog of rush --- .../fix-fix-label-error_2024-04-29-07-48.json | 11 +++++++++++ .../fix-fix-label-error_2024-04-29-07-48.json | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 common/changes/@visactor/vrender-components/fix-fix-label-error_2024-04-29-07-48.json create mode 100644 common/changes/@visactor/vrender-core/fix-fix-label-error_2024-04-29-07-48.json diff --git a/common/changes/@visactor/vrender-components/fix-fix-label-error_2024-04-29-07-48.json b/common/changes/@visactor/vrender-components/fix-fix-label-error_2024-04-29-07-48.json new file mode 100644 index 000000000..aac9f6797 --- /dev/null +++ b/common/changes/@visactor/vrender-components/fix-fix-label-error_2024-04-29-07-48.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "fix: fix error of label when all the labels are cleared\n\n", + "type": "none", + "packageName": "@visactor/vrender-components" + } + ], + "packageName": "@visactor/vrender-components", + "email": "dingling112@gmail.com" +} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-fix-label-error_2024-04-29-07-48.json b/common/changes/@visactor/vrender-core/fix-fix-label-error_2024-04-29-07-48.json new file mode 100644 index 000000000..c287afd45 --- /dev/null +++ b/common/changes/@visactor/vrender-core/fix-fix-label-error_2024-04-29-07-48.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "fix: fix error of label when all the labels are cleared\n\n", + "type": "none", + "packageName": "@visactor/vrender-core" + } + ], + "packageName": "@visactor/vrender-core", + "email": "dingling112@gmail.com" +} \ No newline at end of file From bb1bb6638c19d7394569c8677f8c7b54c7205506 Mon Sep 17 00:00:00 2001 From: neuqzxy Date: Mon, 29 Apr 2024 07:52:55 +0000 Subject: [PATCH 3/7] docs: generate changelog of release v0.18.16 --- docs/assets/changelog/en/changelog.md | 14 ++++++++++++++ docs/assets/changelog/zh/changelog.md | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/docs/assets/changelog/en/changelog.md b/docs/assets/changelog/en/changelog.md index 4df146448..bbadbac3f 100644 --- a/docs/assets/changelog/en/changelog.md +++ b/docs/assets/changelog/en/changelog.md @@ -1,3 +1,17 @@ +# v0.18.16 + +2024-04-29 + + +**🐛 Bug fix** + +- **@visactor/vrender-components**: theme should not support 3d graphics +- **@visactor/vrender-core**: theme should not support 3d graphics + + + +[more detail about v0.18.16](https://github.com/VisActor/VRender/releases/tag/v0.18.16) + # v0.18.15 2024-04-28 diff --git a/docs/assets/changelog/zh/changelog.md b/docs/assets/changelog/zh/changelog.md index 723d9dbe7..d81c8df28 100644 --- a/docs/assets/changelog/zh/changelog.md +++ b/docs/assets/changelog/zh/changelog.md @@ -1,3 +1,17 @@ +# v0.18.16 + +2024-04-29 + + +**🐛 功能修复** + +- **@visactor/vrender-components**: theme should not support 3d graphics +- **@visactor/vrender-core**: theme should not support 3d graphics + + + +[更多详情请查看 v0.18.16](https://github.com/VisActor/VRender/releases/tag/v0.18.16) + # v0.18.15 2024-04-28 From 75959be0743d5018542e6fd30c29cfe5ba3e6e84 Mon Sep 17 00:00:00 2001 From: zhouxinyu Date: Mon, 29 Apr 2024 16:31:40 +0800 Subject: [PATCH 4/7] fix: fix issue with rect stroke array while defined by x1y1, closed #1169 --- .../fix-rect-stroke-x1y1_2024-04-29-08-31.json | 10 ++++++++++ .../render/contributions/rect-contribution-render.ts | 10 ++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 common/changes/@visactor/vrender-core/fix-rect-stroke-x1y1_2024-04-29-08-31.json diff --git a/common/changes/@visactor/vrender-core/fix-rect-stroke-x1y1_2024-04-29-08-31.json b/common/changes/@visactor/vrender-core/fix-rect-stroke-x1y1_2024-04-29-08-31.json new file mode 100644 index 000000000..521d18585 --- /dev/null +++ b/common/changes/@visactor/vrender-core/fix-rect-stroke-x1y1_2024-04-29-08-31.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-core", + "comment": "fix: fix issue with rect stroke array while defined by x1y1, closed #1169", + "type": "none" + } + ], + "packageName": "@visactor/vrender-core" +} \ No newline at end of file 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 36485c105..7e408aea0 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 @@ -210,11 +210,17 @@ export class SplitRectAfterRenderContribution implements IRectRenderContribution ) => boolean ) { const { - width = groupAttribute.width, - height = groupAttribute.height, + x1, + y1, + x: originX = groupAttribute.x, + y: originY = groupAttribute.y, stroke = groupAttribute.stroke } = rect.attribute as any; + let { width, height } = rect.attribute; + width = (width ?? x1 - originX) || 0; + height = (height ?? y1 - originY) || 0; + // 不是数组 if (!(Array.isArray(stroke) && stroke.some(s => s === false))) { return; From a6c9d9ca06b10fd2c1a6ac7d9dcbab6c704309cf Mon Sep 17 00:00:00 2001 From: Rui-Sun Date: Mon, 29 Apr 2024 16:52:20 +0800 Subject: [PATCH 5/7] fix: fix flex-end layout order --- .../vrender-core/fix-flex-layout_2024-04-29-08-52.json | 10 ++++++++++ .../src/plugins/builtin-plugin/flex-layout-plugin.ts | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 common/changes/@visactor/vrender-core/fix-flex-layout_2024-04-29-08-52.json diff --git a/common/changes/@visactor/vrender-core/fix-flex-layout_2024-04-29-08-52.json b/common/changes/@visactor/vrender-core/fix-flex-layout_2024-04-29-08-52.json new file mode 100644 index 000000000..3126a63e2 --- /dev/null +++ b/common/changes/@visactor/vrender-core/fix-flex-layout_2024-04-29-08-52.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-core", + "comment": "fix: fix flex-end layout order", + "type": "none" + } + ], + "packageName": "@visactor/vrender-core" +} \ No newline at end of file diff --git a/packages/vrender-core/src/plugins/builtin-plugin/flex-layout-plugin.ts b/packages/vrender-core/src/plugins/builtin-plugin/flex-layout-plugin.ts index 6653d1fb1..2b1ca4d3f 100644 --- a/packages/vrender-core/src/plugins/builtin-plugin/flex-layout-plugin.ts +++ b/packages/vrender-core/src/plugins/builtin-plugin/flex-layout-plugin.ts @@ -301,7 +301,7 @@ export class FlexLayoutPlugin implements IPlugin { } } else if (justifyContent === 'flex-end') { let pos = main.len; - for (let i = lastIdx; i <= currSeg.idx; i++) { + for (let i = currSeg.idx; i >= lastIdx; i--) { pos -= mianLenArray[i].mainLen; const posBaseLeftTop = pos + getPadding(children[i], main.field); const b = this.getAABBBounds(children[i]); From 0d8c4baf2391007b12217993f23099a948d772ad Mon Sep 17 00:00:00 2001 From: zhouxinyu Date: Tue, 30 Apr 2024 15:33:11 +0800 Subject: [PATCH 6/7] fix: fix issue with setLineDash crash, closed #1047 --- .../vrender-core/develop_2024-04-30-07-33.json | 10 ++++++++++ .../vrender-kits/develop_2024-04-30-07-33.json | 10 ++++++++++ .../src/render/contributions/render/text-render.ts | 4 ++-- .../src/canvas/contributions/browser/context.ts | 4 ++-- .../src/canvas/contributions/lynx/context.ts | 4 ++-- .../src/canvas/contributions/taro/context.ts | 2 +- 6 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 common/changes/@visactor/vrender-core/develop_2024-04-30-07-33.json create mode 100644 common/changes/@visactor/vrender-kits/develop_2024-04-30-07-33.json diff --git a/common/changes/@visactor/vrender-core/develop_2024-04-30-07-33.json b/common/changes/@visactor/vrender-core/develop_2024-04-30-07-33.json new file mode 100644 index 000000000..603f4336d --- /dev/null +++ b/common/changes/@visactor/vrender-core/develop_2024-04-30-07-33.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-core", + "comment": "fix: fix issue with setLineDash crash, closed #1047", + "type": "none" + } + ], + "packageName": "@visactor/vrender-core" +} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-kits/develop_2024-04-30-07-33.json b/common/changes/@visactor/vrender-kits/develop_2024-04-30-07-33.json new file mode 100644 index 000000000..1c067ed58 --- /dev/null +++ b/common/changes/@visactor/vrender-kits/develop_2024-04-30-07-33.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-kits", + "comment": "fix: fix issue with setLineDash crash, closed #1047", + "type": "none" + } + ], + "packageName": "@visactor/vrender-kits" +} \ No newline at end of file diff --git a/packages/vrender-core/src/render/contributions/render/text-render.ts b/packages/vrender-core/src/render/contributions/render/text-render.ts index 9ac5b1fb9..d3662cd0a 100644 --- a/packages/vrender-core/src/render/contributions/render/text-render.ts +++ b/packages/vrender-core/src/render/contributions/render/text-render.ts @@ -338,7 +338,7 @@ export class DefaultCanvasTextRender extends BaseRender implements IGraph if (underline) { attribute.lineWidth = underline; context.setStrokeStyle(text, attribute, x, y, textAttribute); - context.setLineDash(underlineDash); + underlineDash && context.setLineDash(underlineDash); context.beginPath(); const dy = y + offsetY + fontSize + underlineOffset; context.moveTo(x + offsetX, dy, z); @@ -387,7 +387,7 @@ export class DefaultCanvasTextRender extends BaseRender implements IGraph if (underline) { attribute.lineWidth = underline; context.setStrokeStyle(text, attribute, x, y, textAttribute); - context.setLineDash(underlineDash); + underlineDash && context.setLineDash(underlineDash); context.beginPath(); const dy = y + offsetY + fontSize + deltaY + underlineOffset; context.moveTo(x + offsetX, dy, z); diff --git a/packages/vrender-kits/src/canvas/contributions/browser/context.ts b/packages/vrender-kits/src/canvas/contributions/browser/context.ts index d2c06b3a8..6fee8bd7c 100644 --- a/packages/vrender-kits/src/canvas/contributions/browser/context.ts +++ b/packages/vrender-kits/src/canvas/contributions/browser/context.ts @@ -871,7 +871,7 @@ export class BrowserContext2d implements IContext2d { // works for Chrome and IE11 if (!!this.nativeContext.setLineDash) { - _context.setLineDash(a[0]); + a[0] && _context.setLineDash(a[0]); } else if ('mozDash' in _context) { // verified that this works in firefox (_context as any).mozDash = a[0]; @@ -1132,7 +1132,7 @@ export class BrowserContext2d implements IContext2d { _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr); _context.strokeStyle = createColor(this, stroke as any, params, offsetX, offsetY); _context.lineJoin = lineJoin; - _context.setLineDash(lineDash); + lineDash && _context.setLineDash(lineDash); _context.lineCap = lineCap; _context.miterLimit = miterLimit; } diff --git a/packages/vrender-kits/src/canvas/contributions/lynx/context.ts b/packages/vrender-kits/src/canvas/contributions/lynx/context.ts index 442d08b2e..760637371 100644 --- a/packages/vrender-kits/src/canvas/contributions/lynx/context.ts +++ b/packages/vrender-kits/src/canvas/contributions/lynx/context.ts @@ -29,7 +29,7 @@ export class LynxContext2d extends BrowserContext2d implements IContext2d { if (lineDash[0] === 0 && lineDash[1] === 0) { return; } - _context.setLineDash(lineDash); + lineDash && _context.setLineDash(lineDash); } } @@ -61,7 +61,7 @@ export class LynxContext2d extends BrowserContext2d implements IContext2d { _context.lineJoin = lineJoin; // lynx环境中lineDash不能为[0, 0] if (!(lineDash[0] === 0 && lineDash[1] === 0)) { - _context.setLineDash(lineDash); + lineDash && _context.setLineDash(lineDash); } _context.lineCap = lineCap; _context.miterLimit = miterLimit; diff --git a/packages/vrender-kits/src/canvas/contributions/taro/context.ts b/packages/vrender-kits/src/canvas/contributions/taro/context.ts index 27dc66bfb..d69399603 100644 --- a/packages/vrender-kits/src/canvas/contributions/taro/context.ts +++ b/packages/vrender-kits/src/canvas/contributions/taro/context.ts @@ -106,7 +106,7 @@ export class TaroContext2d extends BrowserContext2d implements IContext2d { _context.setLineWidth(getScaledStroke(this, lineWidth, this.dpr)); _context.setStrokeStyle(createColor(this, stroke as any, params, offsetX, offsetY)); _context.setLineJoin(lineJoin); - _context.setLineDash(lineDash); + lineDash && _context.setLineDash(lineDash); _context.setLineCap(lineCap); _context.setMiterLimit(miterLimit); } From e3d9278759144f5b5dc4b4db6c790184f83337d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 30 Apr 2024 07:52:17 +0000 Subject: [PATCH 7/7] build: prelease version 0.18.17 --- .../fix-fix-label-error_2024-04-29-07-48.json | 11 -------- .../develop_2024-04-30-07-33.json | 10 ------- .../fix-fix-label-error_2024-04-29-07-48.json | 11 -------- .../fix-flex-layout_2024-04-29-08-52.json | 10 ------- ...fix-rect-stroke-x1y1_2024-04-29-08-31.json | 10 ------- .../develop_2024-04-30-07-33.json | 10 ------- common/config/rush/pnpm-lock.yaml | 26 +++++++++---------- common/config/rush/version-policies.json | 2 +- docs/package.json | 2 +- packages/react-vrender-utils/CHANGELOG.json | 6 +++++ packages/react-vrender-utils/CHANGELOG.md | 7 ++++- packages/react-vrender-utils/package.json | 6 ++--- packages/react-vrender/CHANGELOG.json | 6 +++++ packages/react-vrender/CHANGELOG.md | 7 ++++- packages/react-vrender/package.json | 4 +-- packages/vrender-components/CHANGELOG.json | 12 +++++++++ packages/vrender-components/CHANGELOG.md | 11 +++++++- packages/vrender-components/package.json | 6 ++--- packages/vrender-core/CHANGELOG.json | 21 +++++++++++++++ packages/vrender-core/CHANGELOG.md | 14 +++++++++- packages/vrender-core/package.json | 2 +- packages/vrender-kits/CHANGELOG.json | 12 +++++++++ packages/vrender-kits/CHANGELOG.md | 9 ++++++- packages/vrender-kits/package.json | 4 +-- packages/vrender/CHANGELOG.json | 6 +++++ packages/vrender/CHANGELOG.md | 7 ++++- packages/vrender/package.json | 6 ++--- tools/bugserver-trigger/package.json | 8 +++--- 28 files changed, 145 insertions(+), 101 deletions(-) delete mode 100644 common/changes/@visactor/vrender-components/fix-fix-label-error_2024-04-29-07-48.json delete mode 100644 common/changes/@visactor/vrender-core/develop_2024-04-30-07-33.json delete mode 100644 common/changes/@visactor/vrender-core/fix-fix-label-error_2024-04-29-07-48.json delete mode 100644 common/changes/@visactor/vrender-core/fix-flex-layout_2024-04-29-08-52.json delete mode 100644 common/changes/@visactor/vrender-core/fix-rect-stroke-x1y1_2024-04-29-08-31.json delete mode 100644 common/changes/@visactor/vrender-kits/develop_2024-04-30-07-33.json diff --git a/common/changes/@visactor/vrender-components/fix-fix-label-error_2024-04-29-07-48.json b/common/changes/@visactor/vrender-components/fix-fix-label-error_2024-04-29-07-48.json deleted file mode 100644 index aac9f6797..000000000 --- a/common/changes/@visactor/vrender-components/fix-fix-label-error_2024-04-29-07-48.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "fix: fix error of label when all the labels are cleared\n\n", - "type": "none", - "packageName": "@visactor/vrender-components" - } - ], - "packageName": "@visactor/vrender-components", - "email": "dingling112@gmail.com" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/develop_2024-04-30-07-33.json b/common/changes/@visactor/vrender-core/develop_2024-04-30-07-33.json deleted file mode 100644 index 603f4336d..000000000 --- a/common/changes/@visactor/vrender-core/develop_2024-04-30-07-33.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-core", - "comment": "fix: fix issue with setLineDash crash, closed #1047", - "type": "none" - } - ], - "packageName": "@visactor/vrender-core" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-fix-label-error_2024-04-29-07-48.json b/common/changes/@visactor/vrender-core/fix-fix-label-error_2024-04-29-07-48.json deleted file mode 100644 index c287afd45..000000000 --- a/common/changes/@visactor/vrender-core/fix-fix-label-error_2024-04-29-07-48.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "fix: fix error of label when all the labels are cleared\n\n", - "type": "none", - "packageName": "@visactor/vrender-core" - } - ], - "packageName": "@visactor/vrender-core", - "email": "dingling112@gmail.com" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-flex-layout_2024-04-29-08-52.json b/common/changes/@visactor/vrender-core/fix-flex-layout_2024-04-29-08-52.json deleted file mode 100644 index 3126a63e2..000000000 --- a/common/changes/@visactor/vrender-core/fix-flex-layout_2024-04-29-08-52.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-core", - "comment": "fix: fix flex-end layout order", - "type": "none" - } - ], - "packageName": "@visactor/vrender-core" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-rect-stroke-x1y1_2024-04-29-08-31.json b/common/changes/@visactor/vrender-core/fix-rect-stroke-x1y1_2024-04-29-08-31.json deleted file mode 100644 index 521d18585..000000000 --- a/common/changes/@visactor/vrender-core/fix-rect-stroke-x1y1_2024-04-29-08-31.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-core", - "comment": "fix: fix issue with rect stroke array while defined by x1y1, closed #1169", - "type": "none" - } - ], - "packageName": "@visactor/vrender-core" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-kits/develop_2024-04-30-07-33.json b/common/changes/@visactor/vrender-kits/develop_2024-04-30-07-33.json deleted file mode 100644 index 1c067ed58..000000000 --- a/common/changes/@visactor/vrender-kits/develop_2024-04-30-07-33.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-kits", - "comment": "fix: fix issue with setLineDash crash, closed #1047", - "type": "none" - } - ], - "packageName": "@visactor/vrender-kits" -} \ No newline at end of file diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index a9f6df53e..4c7a6ca74 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -14,7 +14,7 @@ importers: '@types/react-dom': ^18.0.0 '@visactor/vchart': 1.3.0 '@visactor/vgrammar': ~0.5.7 - '@visactor/vrender': workspace:0.18.16 + '@visactor/vrender': workspace:0.18.17 '@visactor/vutils': ~0.18.1 '@vitejs/plugin-react': 3.1.0 axios: ^1.4.0 @@ -71,7 +71,7 @@ importers: '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 '@types/react-reconciler': ^0.28.2 - '@visactor/vrender': workspace:0.18.16 + '@visactor/vrender': workspace:0.18.17 '@visactor/vutils': ~0.18.1 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -109,8 +109,8 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 - '@visactor/react-vrender': workspace:0.18.16 - '@visactor/vrender': workspace:0.18.16 + '@visactor/react-vrender': workspace:0.18.17 + '@visactor/vrender': workspace:0.18.17 '@visactor/vutils': ~0.18.1 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -149,8 +149,8 @@ importers: '@types/jest': ^26.0.0 '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 - '@visactor/vrender-core': workspace:0.18.16 - '@visactor/vrender-kits': workspace:0.18.16 + '@visactor/vrender-core': workspace:0.18.17 + '@visactor/vrender-kits': workspace:0.18.17 '@visactor/vutils': ~0.18.1 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 @@ -194,8 +194,8 @@ importers: '@internal/ts-config': workspace:* '@rushstack/eslint-patch': ~1.1.4 '@types/jest': ^26.0.0 - '@visactor/vrender-core': workspace:0.18.16 - '@visactor/vrender-kits': workspace:0.18.16 + '@visactor/vrender-core': workspace:0.18.17 + '@visactor/vrender-kits': workspace:0.18.17 '@visactor/vscale': ~0.17.3 '@visactor/vutils': ~0.18.1 eslint: ~8.18.0 @@ -277,7 +277,7 @@ importers: '@types/node-fetch': 2.6.4 '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 - '@visactor/vrender-core': workspace:0.18.16 + '@visactor/vrender-core': workspace:0.18.17 '@visactor/vutils': ~0.18.1 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 @@ -357,10 +357,10 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/node': '*' '@types/node-fetch': 2.6.4 - '@visactor/vrender': workspace:0.18.16 - '@visactor/vrender-components': workspace:0.18.16 - '@visactor/vrender-core': workspace:0.18.16 - '@visactor/vrender-kits': workspace:0.18.16 + '@visactor/vrender': workspace:0.18.17 + '@visactor/vrender-components': workspace:0.18.17 + '@visactor/vrender-core': workspace:0.18.17 + '@visactor/vrender-kits': workspace:0.18.17 eslint: ~8.18.0 form-data: ~4.0.0 node-fetch: 2.6.6 diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index 0546f0f8d..645ffcd7d 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.18.16","nextBump":"patch"}] +[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.18.17","nextBump":"patch"}] diff --git a/docs/package.json b/docs/package.json index ed95b9dd1..161cf4bc3 100644 --- a/docs/package.json +++ b/docs/package.json @@ -13,7 +13,7 @@ "@visactor/vchart": "1.3.0", "@visactor/vutils": "~0.18.1", "@visactor/vgrammar": "~0.5.7", - "@visactor/vrender": "workspace:0.18.16", + "@visactor/vrender": "workspace:0.18.17", "markdown-it": "^13.0.0", "highlight.js": "^11.8.0", "axios": "^1.4.0", diff --git a/packages/react-vrender-utils/CHANGELOG.json b/packages/react-vrender-utils/CHANGELOG.json index f6f201db8..1c377e59b 100644 --- a/packages/react-vrender-utils/CHANGELOG.json +++ b/packages/react-vrender-utils/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/react-vrender-utils", "entries": [ + { + "version": "0.18.17", + "tag": "@visactor/react-vrender-utils_v0.18.17", + "date": "Tue, 30 Apr 2024 07:48:41 GMT", + "comments": {} + }, { "version": "0.18.16", "tag": "@visactor/react-vrender-utils_v0.18.16", diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md index 22f2ff107..22b925ab9 100644 --- a/packages/react-vrender-utils/CHANGELOG.md +++ b/packages/react-vrender-utils/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/react-vrender-utils -This log was last generated on Mon, 29 Apr 2024 07:40:31 GMT and should not be manually modified. +This log was last generated on Tue, 30 Apr 2024 07:48:41 GMT and should not be manually modified. + +## 0.18.17 +Tue, 30 Apr 2024 07:48:41 GMT + +_Version update only_ ## 0.18.16 Mon, 29 Apr 2024 07:40:31 GMT diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json index aa063cc6e..dff0cf41f 100644 --- a/packages/react-vrender-utils/package.json +++ b/packages/react-vrender-utils/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender-utils", - "version": "0.18.16", + "version": "0.18.17", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "react-dom": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:0.18.16", - "@visactor/react-vrender": "workspace:0.18.16", + "@visactor/vrender": "workspace:0.18.17", + "@visactor/react-vrender": "workspace:0.18.17", "@visactor/vutils": "~0.18.1", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" diff --git a/packages/react-vrender/CHANGELOG.json b/packages/react-vrender/CHANGELOG.json index 3e43dca90..308e491b6 100644 --- a/packages/react-vrender/CHANGELOG.json +++ b/packages/react-vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/react-vrender", "entries": [ + { + "version": "0.18.17", + "tag": "@visactor/react-vrender_v0.18.17", + "date": "Tue, 30 Apr 2024 07:48:41 GMT", + "comments": {} + }, { "version": "0.18.16", "tag": "@visactor/react-vrender_v0.18.16", diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md index 5971686b6..e45fc7c77 100644 --- a/packages/react-vrender/CHANGELOG.md +++ b/packages/react-vrender/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/react-vrender -This log was last generated on Mon, 29 Apr 2024 07:40:31 GMT and should not be manually modified. +This log was last generated on Tue, 30 Apr 2024 07:48:41 GMT and should not be manually modified. + +## 0.18.17 +Tue, 30 Apr 2024 07:48:41 GMT + +_Version update only_ ## 0.18.16 Mon, 29 Apr 2024 07:40:31 GMT diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json index 5ee319fc5..3ece744f2 100644 --- a/packages/react-vrender/package.json +++ b/packages/react-vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender", - "version": "0.18.16", + "version": "0.18.17", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -23,7 +23,7 @@ "react": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:0.18.16", + "@visactor/vrender": "workspace:0.18.17", "@visactor/vutils": "~0.18.1", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json index 69fdc85ec..91cb7c038 100644 --- a/packages/vrender-components/CHANGELOG.json +++ b/packages/vrender-components/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@visactor/vrender-components", "entries": [ + { + "version": "0.18.17", + "tag": "@visactor/vrender-components_v0.18.17", + "date": "Tue, 30 Apr 2024 07:48:41 GMT", + "comments": { + "none": [ + { + "comment": "fix: fix error of label when all the labels are cleared\n\n" + } + ] + } + }, { "version": "0.18.16", "tag": "@visactor/vrender-components_v0.18.16", diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md index 99e7b7a2b..6d12eb57e 100644 --- a/packages/vrender-components/CHANGELOG.md +++ b/packages/vrender-components/CHANGELOG.md @@ -1,6 +1,15 @@ # Change Log - @visactor/vrender-components -This log was last generated on Mon, 29 Apr 2024 07:40:31 GMT and should not be manually modified. +This log was last generated on Tue, 30 Apr 2024 07:48:41 GMT and should not be manually modified. + +## 0.18.17 +Tue, 30 Apr 2024 07:48:41 GMT + +### Updates + +- fix: fix error of label when all the labels are cleared + + ## 0.18.16 Mon, 29 Apr 2024 07:40:31 GMT diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json index 785a6b944..f8ccedee3 100644 --- a/packages/vrender-components/package.json +++ b/packages/vrender-components/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-components", - "version": "0.18.16", + "version": "0.18.17", "description": "components library for dp visualization", "sideEffects": false, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "analysis-core": "bundle -f umd -a -i core.ts" }, "dependencies": { - "@visactor/vrender-core": "workspace:0.18.16", - "@visactor/vrender-kits": "workspace:0.18.16", + "@visactor/vrender-core": "workspace:0.18.17", + "@visactor/vrender-kits": "workspace:0.18.17", "@visactor/vutils": "~0.18.1", "@visactor/vscale": "~0.17.3" }, diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json index 0fc5f3917..8d907f863 100644 --- a/packages/vrender-core/CHANGELOG.json +++ b/packages/vrender-core/CHANGELOG.json @@ -1,6 +1,27 @@ { "name": "@visactor/vrender-core", "entries": [ + { + "version": "0.18.17", + "tag": "@visactor/vrender-core_v0.18.17", + "date": "Tue, 30 Apr 2024 07:48:41 GMT", + "comments": { + "none": [ + { + "comment": "fix: fix issue with setLineDash crash, closed #1047" + }, + { + "comment": "fix: fix error of label when all the labels are cleared\n\n" + }, + { + "comment": "fix: fix flex-end layout order" + }, + { + "comment": "fix: fix issue with rect stroke array while defined by x1y1, closed #1169" + } + ] + } + }, { "version": "0.18.16", "tag": "@visactor/vrender-core_v0.18.16", diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md index 3e37b495a..edd23fb58 100644 --- a/packages/vrender-core/CHANGELOG.md +++ b/packages/vrender-core/CHANGELOG.md @@ -1,6 +1,18 @@ # Change Log - @visactor/vrender-core -This log was last generated on Mon, 29 Apr 2024 07:40:31 GMT and should not be manually modified. +This log was last generated on Tue, 30 Apr 2024 07:48:41 GMT and should not be manually modified. + +## 0.18.17 +Tue, 30 Apr 2024 07:48:41 GMT + +### Updates + +- fix: fix issue with setLineDash crash, closed #1047 +- fix: fix error of label when all the labels are cleared + + +- fix: fix flex-end layout order +- fix: fix issue with rect stroke array while defined by x1y1, closed #1169 ## 0.18.16 Mon, 29 Apr 2024 07:40:31 GMT diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json index 8d5ceceb4..8e840446a 100644 --- a/packages/vrender-core/package.json +++ b/packages/vrender-core/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-core", - "version": "0.18.16", + "version": "0.18.17", "description": "", "sideEffects": [ "./src/modules.ts", diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json index d68fbd88d..32bee8f93 100644 --- a/packages/vrender-kits/CHANGELOG.json +++ b/packages/vrender-kits/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@visactor/vrender-kits", "entries": [ + { + "version": "0.18.17", + "tag": "@visactor/vrender-kits_v0.18.17", + "date": "Tue, 30 Apr 2024 07:48:41 GMT", + "comments": { + "none": [ + { + "comment": "fix: fix issue with setLineDash crash, closed #1047" + } + ] + } + }, { "version": "0.18.16", "tag": "@visactor/vrender-kits_v0.18.16", diff --git a/packages/vrender-kits/CHANGELOG.md b/packages/vrender-kits/CHANGELOG.md index 8855d769e..7dcb51add 100644 --- a/packages/vrender-kits/CHANGELOG.md +++ b/packages/vrender-kits/CHANGELOG.md @@ -1,6 +1,13 @@ # Change Log - @visactor/vrender-kits -This log was last generated on Mon, 29 Apr 2024 07:40:31 GMT and should not be manually modified. +This log was last generated on Tue, 30 Apr 2024 07:48:41 GMT and should not be manually modified. + +## 0.18.17 +Tue, 30 Apr 2024 07:48:41 GMT + +### Updates + +- fix: fix issue with setLineDash crash, closed #1047 ## 0.18.16 Mon, 29 Apr 2024 07:40:31 GMT diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index 967f37e59..fddb6f87d 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-kits", - "version": "0.18.16", + "version": "0.18.17", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -20,7 +20,7 @@ "test": "" }, "dependencies": { - "@visactor/vrender-core": "workspace:0.18.16", + "@visactor/vrender-core": "workspace:0.18.17", "@visactor/vutils": "~0.18.1", "@resvg/resvg-js": "2.4.1", "roughjs": "4.5.2" diff --git a/packages/vrender/CHANGELOG.json b/packages/vrender/CHANGELOG.json index 0c60c842a..0333d5f59 100644 --- a/packages/vrender/CHANGELOG.json +++ b/packages/vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender", "entries": [ + { + "version": "0.18.17", + "tag": "@visactor/vrender_v0.18.17", + "date": "Tue, 30 Apr 2024 07:48:41 GMT", + "comments": {} + }, { "version": "0.18.16", "tag": "@visactor/vrender_v0.18.16", diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md index 06fed21d3..8ad6b0e00 100644 --- a/packages/vrender/CHANGELOG.md +++ b/packages/vrender/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender -This log was last generated on Mon, 29 Apr 2024 07:40:31 GMT and should not be manually modified. +This log was last generated on Tue, 30 Apr 2024 07:48:41 GMT and should not be manually modified. + +## 0.18.17 +Tue, 30 Apr 2024 07:48:41 GMT + +_Version update only_ ## 0.18.16 Mon, 29 Apr 2024 07:40:31 GMT diff --git a/packages/vrender/package.json b/packages/vrender/package.json index acbae136f..b7c37b00c 100644 --- a/packages/vrender/package.json +++ b/packages/vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender", - "version": "0.18.16", + "version": "0.18.17", "description": "", "sideEffects": true, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "test-watch": "DEBUG_MODE=1 jest --watch" }, "dependencies": { - "@visactor/vrender-core": "workspace:0.18.16", - "@visactor/vrender-kits": "workspace:0.18.16" + "@visactor/vrender-core": "workspace:0.18.17", + "@visactor/vrender-kits": "workspace:0.18.17" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/tools/bugserver-trigger/package.json b/tools/bugserver-trigger/package.json index 339beff04..dbd7489e4 100644 --- a/tools/bugserver-trigger/package.json +++ b/tools/bugserver-trigger/package.json @@ -8,10 +8,10 @@ "ci": "ts-node --transpileOnly --skipProject ./scripts/trigger-test.ts" }, "dependencies": { - "@visactor/vrender": "workspace:0.18.16", - "@visactor/vrender-core": "workspace:0.18.16", - "@visactor/vrender-kits": "workspace:0.18.16", - "@visactor/vrender-components": "workspace:0.18.16" + "@visactor/vrender": "workspace:0.18.17", + "@visactor/vrender-core": "workspace:0.18.17", + "@visactor/vrender-kits": "workspace:0.18.17", + "@visactor/vrender-components": "workspace:0.18.17" }, "devDependencies": { "@rushstack/eslint-patch": "~1.1.4",