From e078e69e4d7dd7d651bf9218d4be9d1d8bfb936e Mon Sep 17 00:00:00 2001 From: xiaoluoHe Date: Thu, 16 Jan 2025 14:26:46 +0800 Subject: [PATCH 01/10] fix: fix the issue where the final text of the label increase count animation is incorrect --- .../fix-label-increaseCount_2025-01-16-06-26.json | 10 ++++++++++ packages/vrender-core/src/animate/custom-animate.ts | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 common/changes/@visactor/vrender-core/fix-label-increaseCount_2025-01-16-06-26.json diff --git a/common/changes/@visactor/vrender-core/fix-label-increaseCount_2025-01-16-06-26.json b/common/changes/@visactor/vrender-core/fix-label-increaseCount_2025-01-16-06-26.json new file mode 100644 index 000000000..c2e045c77 --- /dev/null +++ b/common/changes/@visactor/vrender-core/fix-label-increaseCount_2025-01-16-06-26.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-core", + "comment": "fix: fix the issue where the final text of the label increase count animation is incorrect", + "type": "none" + } + ], + "packageName": "@visactor/vrender-core" +} \ No newline at end of file diff --git a/packages/vrender-core/src/animate/custom-animate.ts b/packages/vrender-core/src/animate/custom-animate.ts index 3d3aa85a7..d08b045ef 100644 --- a/packages/vrender-core/src/animate/custom-animate.ts +++ b/packages/vrender-core/src/animate/custom-animate.ts @@ -87,7 +87,7 @@ export class IncreaseCount extends ACustomAnimate<{ text: string | number }> { return; } if (end) { - out.text = this.toNumber; + out.text = this.to?.text; } else { out.text = (this.fromNumber + (this.toNumber - this.fromNumber) * ratio).toFixed(this.decimalLength); } From e7b9ef46efe1202c7704bc31b56af53e82a46f49 Mon Sep 17 00:00:00 2001 From: xile611 Date: Thu, 16 Jan 2025 18:33:00 +0800 Subject: [PATCH 02/10] fix: fix layout of title when not set height --- packages/vrender-components/src/title/title.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/vrender-components/src/title/title.ts b/packages/vrender-components/src/title/title.ts index 0cf9381af..dc8380ca8 100644 --- a/packages/vrender-components/src/title/title.ts +++ b/packages/vrender-components/src/title/title.ts @@ -261,15 +261,17 @@ export class Title extends AbstractComponent> { if (isValid(verticalAlign) || isValid(textStyle.verticalAlign)) { const mainTitleVerticalAlign = textStyle.verticalAlign ? textStyle.verticalAlign : verticalAlign; - if (mainTitleVerticalAlign === 'middle' && isValid(fixedMainTitleHeight)) { - this._mainTitle.setAttribute('y', fixedMainTitleHeight / 2); + const mainTitleHeight = fixedMainTitleHeight ?? this._mainTitle.AABBBounds.height(); + + if (mainTitleVerticalAlign === 'middle' && isValid(mainTitleHeight)) { + this._mainTitle.setAttribute('y', mainTitleHeight / 2); this._mainTitle.setAttribute('textBaseline', 'middle'); - } else if (mainTitleVerticalAlign === 'bottom' && isValid(fixedMainTitleHeight)) { - this._mainTitle.setAttribute('y', fixedMainTitleHeight); + } else if (mainTitleVerticalAlign === 'bottom' && isValid(mainTitleHeight)) { + this._mainTitle.setAttribute('y', mainTitleHeight); this._mainTitle.setAttribute('textBaseline', 'bottom'); } else { this._mainTitle.setAttribute('y', 0); - this._mainTitle.setAttribute('textBaseline', 'top'); + this._mainTitle.setAttribute('textBaseline', mainTitleVerticalAlign); } } } @@ -308,7 +310,7 @@ export class Title extends AbstractComponent> { this._subTitle.setAttribute('textBaseline', 'bottom'); } else { this._subTitle.setAttribute('y', subTitleYStart); - this._subTitle.setAttribute('textBaseline', 'top'); + this._subTitle.setAttribute('textBaseline', subTitleVerticalAlign); } } } From 393ae740ce115619b02ede5404ca55782904b4d2 Mon Sep 17 00:00:00 2001 From: xile611 Date: Thu, 16 Jan 2025 18:33:58 +0800 Subject: [PATCH 03/10] docs: update changlog of rush --- .../fix-title-vertical-align_2025-01-16-10-33.json | 11 +++++++++++ .../fix-title-vertical-align_2025-01-16-10-33.json | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 common/changes/@visactor/vrender-components/fix-title-vertical-align_2025-01-16-10-33.json create mode 100644 common/changes/@visactor/vrender-core/fix-title-vertical-align_2025-01-16-10-33.json diff --git a/common/changes/@visactor/vrender-components/fix-title-vertical-align_2025-01-16-10-33.json b/common/changes/@visactor/vrender-components/fix-title-vertical-align_2025-01-16-10-33.json new file mode 100644 index 000000000..3756a84d6 --- /dev/null +++ b/common/changes/@visactor/vrender-components/fix-title-vertical-align_2025-01-16-10-33.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "fix: fix layout of title when not set height\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-title-vertical-align_2025-01-16-10-33.json b/common/changes/@visactor/vrender-core/fix-title-vertical-align_2025-01-16-10-33.json new file mode 100644 index 000000000..a41dc4370 --- /dev/null +++ b/common/changes/@visactor/vrender-core/fix-title-vertical-align_2025-01-16-10-33.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "fix: fix layout of title when not set height\n\n", + "type": "none", + "packageName": "@visactor/vrender-core" + } + ], + "packageName": "@visactor/vrender-core", + "email": "dingling112@gmail.com" +} \ No newline at end of file From 0f779964599d18c8ccec31f4075fb0aba540dd61 Mon Sep 17 00:00:00 2001 From: xile611 Date: Thu, 16 Jan 2025 20:15:45 +0800 Subject: [PATCH 04/10] fix: fix layout of title when has sub text --- packages/vrender-components/src/title/title.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vrender-components/src/title/title.ts b/packages/vrender-components/src/title/title.ts index dc8380ca8..81af2efef 100644 --- a/packages/vrender-components/src/title/title.ts +++ b/packages/vrender-components/src/title/title.ts @@ -301,7 +301,7 @@ export class Title extends AbstractComponent> { this._mainTitle.AABBBounds.y1 + Math.max(this._mainTitle.AABBBounds.height(), fixedMainTitleHeight) : this._mainTitle.AABBBounds.y2 : 0; - const subTitleHeight = subtextStyle.height ?? height; + const subTitleHeight = subtextStyle.height ?? height ?? this._subTitle.AABBBounds.height(); if (subTitleVerticalAlign === 'middle' && isValid(subTitleHeight)) { this._subTitle.setAttribute('y', subTitleYStart + subTitleHeight / 2); this._subTitle.setAttribute('textBaseline', 'middle'); From c542f036070b70145bbb8917b03cf074d8f2b257 Mon Sep 17 00:00:00 2001 From: xile611 Date: Fri, 17 Jan 2025 10:27:09 +0800 Subject: [PATCH 05/10] fix: fix layout of title when has invalid verticalAlign --- .../vrender-components/src/title/title.ts | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/vrender-components/src/title/title.ts b/packages/vrender-components/src/title/title.ts index 81af2efef..912250ca8 100644 --- a/packages/vrender-components/src/title/title.ts +++ b/packages/vrender-components/src/title/title.ts @@ -261,15 +261,16 @@ export class Title extends AbstractComponent> { if (isValid(verticalAlign) || isValid(textStyle.verticalAlign)) { const mainTitleVerticalAlign = textStyle.verticalAlign ? textStyle.verticalAlign : verticalAlign; - const mainTitleHeight = fixedMainTitleHeight ?? this._mainTitle.AABBBounds.height(); + const mainTitleHeight = + fixedMainTitleHeight ?? (this._mainTitle.AABBBounds.empty() ? 0 : this._mainTitle.AABBBounds.height()); - if (mainTitleVerticalAlign === 'middle' && isValid(mainTitleHeight)) { + if (mainTitleVerticalAlign === 'middle') { this._mainTitle.setAttribute('y', mainTitleHeight / 2); this._mainTitle.setAttribute('textBaseline', 'middle'); - } else if (mainTitleVerticalAlign === 'bottom' && isValid(mainTitleHeight)) { + } else if (mainTitleVerticalAlign === 'bottom') { this._mainTitle.setAttribute('y', mainTitleHeight); this._mainTitle.setAttribute('textBaseline', 'bottom'); - } else { + } else if (mainTitleVerticalAlign === 'top') { this._mainTitle.setAttribute('y', 0); this._mainTitle.setAttribute('textBaseline', mainTitleVerticalAlign); } @@ -298,17 +299,22 @@ export class Title extends AbstractComponent> { const subTitleYStart = this._mainTitle ? isValid(fixedMainTitleHeight) ? // 如果是用户指定的高度，根据bounds的height 和指定高度求最大值 - this._mainTitle.AABBBounds.y1 + Math.max(this._mainTitle.AABBBounds.height(), fixedMainTitleHeight) + this._mainTitle.AABBBounds.y1 + + Math.max( + this._mainTitle.AABBBounds.empty() ? 0 : this._mainTitle.AABBBounds.height(), + fixedMainTitleHeight + ) : this._mainTitle.AABBBounds.y2 : 0; - const subTitleHeight = subtextStyle.height ?? height ?? this._subTitle.AABBBounds.height(); - if (subTitleVerticalAlign === 'middle' && isValid(subTitleHeight)) { + const subTitleHeight = + subtextStyle.height ?? height ?? (this._subTitle.AABBBounds.empty() ? 0 : this._subTitle.AABBBounds.height()); + if (subTitleVerticalAlign === 'middle') { this._subTitle.setAttribute('y', subTitleYStart + subTitleHeight / 2); this._subTitle.setAttribute('textBaseline', 'middle'); - } else if (subTitleVerticalAlign === 'bottom' && isValid(subTitleHeight)) { + } else if (subTitleVerticalAlign === 'bottom') { this._subTitle.setAttribute('y', subTitleYStart + subTitleHeight); this._subTitle.setAttribute('textBaseline', 'bottom'); - } else { + } else if (subTitleVerticalAlign === 'top') { this._subTitle.setAttribute('y', subTitleYStart); this._subTitle.setAttribute('textBaseline', subTitleVerticalAlign); } From 33de4e7ea9b1b5c37d6df1e6de680be0356a56cd Mon Sep 17 00:00:00 2001 From: xile611 Date: Fri, 17 Jan 2025 11:43:32 +0800 Subject: [PATCH 06/10] fix: fix wrong value for verticalAlign --- .../vrender-components/src/title/title.ts | 72 +++++++++---------- 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/packages/vrender-components/src/title/title.ts b/packages/vrender-components/src/title/title.ts index 912250ca8..55d5f08d4 100644 --- a/packages/vrender-components/src/title/title.ts +++ b/packages/vrender-components/src/title/title.ts @@ -8,6 +8,7 @@ import type { TitleAttrs } from './type'; import type { ComponentOptions } from '../interface'; import { DEFAULT_HTML_TEXT_SPEC } from '../constant'; import { loadTitleComponent } from './register'; +import { Text } from '@visactor/vrender-core'; loadTitleComponent(); export class Title extends AbstractComponent> { @@ -259,21 +260,20 @@ export class Title extends AbstractComponent> { } } - if (isValid(verticalAlign) || isValid(textStyle.verticalAlign)) { - const mainTitleVerticalAlign = textStyle.verticalAlign ? textStyle.verticalAlign : verticalAlign; - const mainTitleHeight = - fixedMainTitleHeight ?? (this._mainTitle.AABBBounds.empty() ? 0 : this._mainTitle.AABBBounds.height()); + const mainTitleVerticalAlign = textStyle.verticalAlign ? textStyle.verticalAlign : verticalAlign; + const mainTitleHeight = + fixedMainTitleHeight ?? (this._mainTitle.AABBBounds.empty() ? 0 : this._mainTitle.AABBBounds.height()); - if (mainTitleVerticalAlign === 'middle') { - this._mainTitle.setAttribute('y', mainTitleHeight / 2); - this._mainTitle.setAttribute('textBaseline', 'middle'); - } else if (mainTitleVerticalAlign === 'bottom') { - this._mainTitle.setAttribute('y', mainTitleHeight); - this._mainTitle.setAttribute('textBaseline', 'bottom'); - } else if (mainTitleVerticalAlign === 'top') { - this._mainTitle.setAttribute('y', 0); - this._mainTitle.setAttribute('textBaseline', mainTitleVerticalAlign); - } + if (mainTitleVerticalAlign === 'middle') { + this._mainTitle.setAttribute('y', mainTitleHeight / 2); + this._mainTitle.setAttribute('textBaseline', 'middle'); + } else if (mainTitleVerticalAlign === 'bottom') { + this._mainTitle.setAttribute('y', mainTitleHeight); + this._mainTitle.setAttribute('textBaseline', 'bottom'); + } else { + // 如果没有显示的设置verticalAlign，默认top + this._mainTitle.setAttribute('y', 0); + this._mainTitle.setAttribute('textBaseline', 'top'); } } @@ -294,30 +294,26 @@ export class Title extends AbstractComponent> { } } - if (isValid(verticalAlign) || isValid(textStyle.verticalAlign)) { - const subTitleVerticalAlign = subtextStyle.verticalAlign ? subtextStyle.verticalAlign : verticalAlign; - const subTitleYStart = this._mainTitle - ? isValid(fixedMainTitleHeight) - ? // 如果是用户指定的高度，根据bounds的height 和指定高度求最大值 - this._mainTitle.AABBBounds.y1 + - Math.max( - this._mainTitle.AABBBounds.empty() ? 0 : this._mainTitle.AABBBounds.height(), - fixedMainTitleHeight - ) - : this._mainTitle.AABBBounds.y2 - : 0; - const subTitleHeight = - subtextStyle.height ?? height ?? (this._subTitle.AABBBounds.empty() ? 0 : this._subTitle.AABBBounds.height()); - if (subTitleVerticalAlign === 'middle') { - this._subTitle.setAttribute('y', subTitleYStart + subTitleHeight / 2); - this._subTitle.setAttribute('textBaseline', 'middle'); - } else if (subTitleVerticalAlign === 'bottom') { - this._subTitle.setAttribute('y', subTitleYStart + subTitleHeight); - this._subTitle.setAttribute('textBaseline', 'bottom'); - } else if (subTitleVerticalAlign === 'top') { - this._subTitle.setAttribute('y', subTitleYStart); - this._subTitle.setAttribute('textBaseline', subTitleVerticalAlign); - } + const subTitleVerticalAlign = subtextStyle.verticalAlign ? subtextStyle.verticalAlign : verticalAlign; + + const subTitleYStart = this._mainTitle + ? isValid(fixedMainTitleHeight) + ? // 如果是用户指定的高度，根据bounds的height 和指定高度求最大值 + this._mainTitle.AABBBounds.y1 + + Math.max(this._mainTitle.AABBBounds.empty() ? 0 : this._mainTitle.AABBBounds.height(), fixedMainTitleHeight) + : this._mainTitle.AABBBounds.y2 + : 0; + const subTitleHeight = + subtextStyle.height ?? height ?? (this._subTitle.AABBBounds.empty() ? 0 : this._subTitle.AABBBounds.height()); + if (subTitleVerticalAlign === 'middle') { + this._subTitle.setAttribute('y', subTitleYStart + subTitleHeight / 2); + this._subTitle.setAttribute('textBaseline', 'middle'); + } else if (subTitleVerticalAlign === 'bottom') { + this._subTitle.setAttribute('y', subTitleYStart + subTitleHeight); + this._subTitle.setAttribute('textBaseline', 'bottom'); + } else { + this._subTitle.setAttribute('y', subTitleYStart); + this._subTitle.setAttribute('textBaseline', 'top'); } } } From b124ef9ec71ff730dce1e5acdc799170623606a8 Mon Sep 17 00:00:00 2001 From: xile611 Date: Sun, 26 Jan 2025 15:05:51 +0800 Subject: [PATCH 07/10] feat: add instance to the callback of label --- packages/vrender-components/src/label/base.ts | 9 ++++++--- packages/vrender-components/src/label/type.ts | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/vrender-components/src/label/base.ts b/packages/vrender-components/src/label/base.ts index 8e1c79c94..9cfabd0d8 100644 --- a/packages/vrender-components/src/label/base.ts +++ b/packages/vrender-components/src/label/base.ts @@ -195,7 +195,8 @@ export class LabelBase extends AbstractComponent { data, labels, this.getRelatedGraphic.bind(this), - this._isCollectionBase ? (d: LabelItem) => this._idToPoint.get(d.id) : null + this._isCollectionBase ? (d: LabelItem) => this._idToPoint.get(d.id) : null, + this ); } else { // 根据关联图元和配置的position计算标签坐标 @@ -206,7 +207,8 @@ export class LabelBase extends AbstractComponent { labels = customOverlapFunc( labels as Text[], this.getRelatedGraphic.bind(this), - this._isCollectionBase ? (d: LabelItem) => this._idToPoint.get(d.id) : null + this._isCollectionBase ? (d: LabelItem) => this._idToPoint.get(d.id) : null, + this ); } else { // 防重叠逻辑 @@ -219,7 +221,8 @@ export class LabelBase extends AbstractComponent { this.attribute.onAfterOverlapping( labels as Text[], this.getRelatedGraphic.bind(this), - this._isCollectionBase ? (d: LabelItem) => this._idToPoint.get(d.id) : null + this._isCollectionBase ? (d: LabelItem) => this._idToPoint.get(d.id) : null, + this ); } diff --git a/packages/vrender-components/src/label/type.ts b/packages/vrender-components/src/label/type.ts index fcef620ce..403556c6c 100644 --- a/packages/vrender-components/src/label/type.ts +++ b/packages/vrender-components/src/label/type.ts @@ -129,7 +129,8 @@ export interface BaseLabelAttrs extends IGroupGraphicAttribute { item: LabelItem[], labels: (IText | IRichText)[], getRelatedGraphic: (data: LabelItem) => IGraphic, - getRelatedPoint?: (data: LabelItem) => IPointLike + getRelatedPoint: ((data: LabelItem) => IPointLike) | null | undefined, + labelComponent: IGroup ) => (IText | IRichText)[]; /** 自定义标签躲避函数 @@ -138,7 +139,8 @@ export interface BaseLabelAttrs extends IGroupGraphicAttribute { customOverlapFunc?: ( label: (IText | IRichText)[], getRelatedGraphic: (data: LabelItem) => IGraphic, - getRelatedPoint?: (data: LabelItem) => IPointLike + getRelatedPoint: ((data: LabelItem) => IPointLike) | null | undefined, + labelComponent: IGroup ) => (IText | IRichText)[]; /** * 防重叠计算完成后的回调函数 @@ -147,7 +149,8 @@ export interface BaseLabelAttrs extends IGroupGraphicAttribute { onAfterOverlapping?: ( labels: (IText | IRichText)[], getRelatedGraphic: (data: LabelItem) => IGraphic, - getRelatedPoint?: (data: LabelItem) => IPointLike + getRelatedPoint: ((data: LabelItem) => IPointLike) | null | undefined, + labelComponent: IGroup ) => void; /** * 关闭交互效果 From c7693070377530365e05830af47e572212bbef15 Mon Sep 17 00:00:00 2001 From: xile611 Date: Sun, 26 Jan 2025 15:07:09 +0800 Subject: [PATCH 08/10] docs: update changlog of rush --- .../feat-label-callback-params_2025-01-26-07-07.json | 11 +++++++++++ .../feat-label-callback-params_2025-01-26-07-07.json | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 common/changes/@visactor/vrender-components/feat-label-callback-params_2025-01-26-07-07.json create mode 100644 common/changes/@visactor/vrender-core/feat-label-callback-params_2025-01-26-07-07.json diff --git a/common/changes/@visactor/vrender-components/feat-label-callback-params_2025-01-26-07-07.json b/common/changes/@visactor/vrender-components/feat-label-callback-params_2025-01-26-07-07.json new file mode 100644 index 000000000..d73443990 --- /dev/null +++ b/common/changes/@visactor/vrender-components/feat-label-callback-params_2025-01-26-07-07.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "feat: add instance to the callback of label\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/feat-label-callback-params_2025-01-26-07-07.json b/common/changes/@visactor/vrender-core/feat-label-callback-params_2025-01-26-07-07.json new file mode 100644 index 000000000..c7c28495d --- /dev/null +++ b/common/changes/@visactor/vrender-core/feat-label-callback-params_2025-01-26-07-07.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "feat: add instance to the callback of label\n\n", + "type": "none", + "packageName": "@visactor/vrender-core" + } + ], + "packageName": "@visactor/vrender-core", + "email": "dingling112@gmail.com" +} \ No newline at end of file From ca990d752915e2ec757c10c476c3aa1336187b63 Mon Sep 17 00:00:00 2001 From: zhouxinyu Date: Mon, 27 Jan 2025 12:55:29 +0800 Subject: [PATCH 09/10] fix: fix issue with inversify error when nobind --- ...x-inversify-optional_2025-01-27-04-55.json | 10 ++++ ...x-inversify-optional_2025-01-27-04-55.json | 10 ++++ ...x-inversify-optional_2025-01-27-04-55.json | 10 ++++ .../common/inversify/annotation/optional.ts | 9 ++++ .../src/common/inversify/container.ts | 18 +++---- .../contributions/render/draw-contribution.ts | 5 +- .../src/picker/contributions/common/base.ts | 5 +- .../browser/src/pages/anxu-picker.ts | 47 +++++++++++++++++++ .../__tests__/browser/src/pages/index.ts | 4 ++ 9 files changed, 108 insertions(+), 10 deletions(-) create mode 100644 common/changes/@visactor/vrender-core/fix-inversify-optional_2025-01-27-04-55.json create mode 100644 common/changes/@visactor/vrender-kits/fix-inversify-optional_2025-01-27-04-55.json create mode 100644 common/changes/@visactor/vrender/fix-inversify-optional_2025-01-27-04-55.json create mode 100644 packages/vrender-core/src/common/inversify/annotation/optional.ts create mode 100644 packages/vrender/__tests__/browser/src/pages/anxu-picker.ts diff --git a/common/changes/@visactor/vrender-core/fix-inversify-optional_2025-01-27-04-55.json b/common/changes/@visactor/vrender-core/fix-inversify-optional_2025-01-27-04-55.json new file mode 100644 index 000000000..f91a9b3dc --- /dev/null +++ b/common/changes/@visactor/vrender-core/fix-inversify-optional_2025-01-27-04-55.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-core", + "comment": "fix: fix issue with inversify error when nobind", + "type": "none" + } + ], + "packageName": "@visactor/vrender-core" +} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-kits/fix-inversify-optional_2025-01-27-04-55.json b/common/changes/@visactor/vrender-kits/fix-inversify-optional_2025-01-27-04-55.json new file mode 100644 index 000000000..4364581bd --- /dev/null +++ b/common/changes/@visactor/vrender-kits/fix-inversify-optional_2025-01-27-04-55.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-kits", + "comment": "fix: fix issue with inversify error when nobind", + "type": "none" + } + ], + "packageName": "@visactor/vrender-kits" +} \ No newline at end of file diff --git a/common/changes/@visactor/vrender/fix-inversify-optional_2025-01-27-04-55.json b/common/changes/@visactor/vrender/fix-inversify-optional_2025-01-27-04-55.json new file mode 100644 index 000000000..0cc784b11 --- /dev/null +++ b/common/changes/@visactor/vrender/fix-inversify-optional_2025-01-27-04-55.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender", + "comment": "fix: fix issue with inversify error when nobind", + "type": "none" + } + ], + "packageName": "@visactor/vrender" +} \ No newline at end of file diff --git a/packages/vrender-core/src/common/inversify/annotation/optional.ts b/packages/vrender-core/src/common/inversify/annotation/optional.ts new file mode 100644 index 000000000..ee35ab2db --- /dev/null +++ b/packages/vrender-core/src/common/inversify/annotation/optional.ts @@ -0,0 +1,9 @@ +import { Metadata } from '../meta-data'; +import { OPTIONAL_TAG } from '../metadata_keys'; +import { createTaggedDecorator } from './inject_base'; + +function optional() { + return createTaggedDecorator(new Metadata(OPTIONAL_TAG, true)); +} + +export { optional }; diff --git a/packages/vrender-core/src/common/inversify/container.ts b/packages/vrender-core/src/common/inversify/container.ts index fda8aeaaf..849485895 100644 --- a/packages/vrender-core/src/common/inversify/container.ts +++ b/packages/vrender-core/src/common/inversify/container.ts @@ -200,16 +200,18 @@ export class Container { serviceIdentifier: injectIdentifier, constructorArgsMetadata }; - const bindings = this._bindingDictionary.get(injectIdentifier).filter(b => { + const bindings = (this._bindingDictionary.get(injectIdentifier) || []).filter(b => { return b.constraint(target as any); }); - const request = { - injectIdentifier, - metadata: constructorArgsMetadata, - bindings - }; - - arr.push(request); + if (bindings.length) { + const request = { + injectIdentifier, + metadata: constructorArgsMetadata, + bindings: bindings + }; + + arr.push(request); + } } return arr; diff --git a/packages/vrender-core/src/render/contributions/render/draw-contribution.ts b/packages/vrender-core/src/render/contributions/render/draw-contribution.ts index b3f066399..09f1c4e65 100644 --- a/packages/vrender-core/src/render/contributions/render/draw-contribution.ts +++ b/packages/vrender-core/src/render/contributions/render/draw-contribution.ts @@ -18,7 +18,7 @@ import { findNextGraphic, foreach } from '../../../common/sort'; import { ContributionProvider } from '../../../common/contribution-provider'; import { DefaultAttribute } from '../../../graphic/config'; import type { IAABBBounds, IBounds, IMatrix } from '@visactor/vutils'; -import { Bounds, Logger, getRectIntersect, isRectIntersect } from '@visactor/vutils'; +import { Bounds, Logger, getRectIntersect, isArray, isRectIntersect } from '@visactor/vutils'; import { container } from '../../../container'; import { GraphicRender, IncrementalDrawContribution } from './symbol'; import { DrawItemInterceptor } from './draw-interceptor'; @@ -66,6 +66,9 @@ export class DefaultDrawContribution implements IDrawContribution { this.backupDirtyBounds = new Bounds(); this.global = application.global; this.layerService = application.layerService; + if (!isArray(this.contributions)) { + this.contributions = [this.contributions]; + } this.init(); } diff --git a/packages/vrender-kits/src/picker/contributions/common/base.ts b/packages/vrender-kits/src/picker/contributions/common/base.ts index 218ad66c6..0d40f0989 100644 --- a/packages/vrender-kits/src/picker/contributions/common/base.ts +++ b/packages/vrender-kits/src/picker/contributions/common/base.ts @@ -12,7 +12,7 @@ import type { } from '@visactor/vrender-core'; export abstract class PickerBase { - canvasRenderer!: IGraphicRender; + canvasRenderer?: IGraphicRender; contains(graphic: IGraphic, point: IPoint, params?: IPickParams): boolean { if (!graphic.AABBBounds.containsPoint(point)) { @@ -21,6 +21,9 @@ export abstract class PickerBase { if (graphic.attribute.pickMode === 'imprecise') { return true; } + if (!this.canvasRenderer) { + return true; + } const { pickContext } = params ?? {}; if (!pickContext) { diff --git a/packages/vrender/__tests__/browser/src/pages/anxu-picker.ts b/packages/vrender/__tests__/browser/src/pages/anxu-picker.ts new file mode 100644 index 000000000..a349339d7 --- /dev/null +++ b/packages/vrender/__tests__/browser/src/pages/anxu-picker.ts @@ -0,0 +1,47 @@ +import { createStage, createRect, IGraphic, container } from '@visactor/vrender-core'; +import { loadBrowserEnv, loadMathPicker, registerRect } from '@visactor/vrender-kits'; + +registerRect(); +loadBrowserEnv(container); +loadMathPicker(container); + +// container.load(roughModule); +export const page = () => { + const graphics: IGraphic[] = []; + // graphics.push( + // createRect({ + // x: 100, + // y: 100, + // width: 20, + // height: 100, + // fill: colorPools[10], + // stroke: [colorPools[0], colorPools[0], colorPools[0], colorPools[0]], + // cornerRadius: 10, + // lineWidth: 5 + // }) + // ); + + const rect = createRect({ + x: 20, + y: 20, + width: 101.55555555555556, + height: 30, + cornerRadius: -4, + background: + 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMjAiIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPGcgY2xpcC1wYXRoPSJ1cmwoI2NsaXAwXzFfMTUxNjkpIj4KPHBhdGggZD0iTTEwIDIwQzE1LjUyMjggMjAgMjAgMTUuNTIyOCAyMCAxMEMyMCA0LjQ3NzE1IDE1LjUyMjggMCAxMCAwQzQuNDc3MTUgMCAwIDQuNDc3MTUgMCAxMEMwIDE1LjUyMjggNC40NzcxNSAyMCAxMCAyMFoiIGZpbGw9IiNGMEYwRjAiLz4KPHBhdGggZD0iTTIwIDkuOTk5OTZDMjAgNS43MDAzMSAxNy4yODYzIDIuMDM0ODggMTMuNDc4MyAwLjYyMTk0OFYxOS4zNzhDMTcuMjg2MyAxNy45NjUgMjAgMTQuMjk5NiAyMCA5Ljk5OTk2WiIgZmlsbD0iI0Q4MDAyNyIvPgo8cGF0aCBkPSJNMCA5Ljk5OTk2QzAgMTQuMjk5NiAyLjcxMzc1IDE3Ljk2NSA2LjUyMTc2IDE5LjM3OFYwLjYyMTk0OEMyLjcxMzc1IDIuMDM0ODggMCA1LjcwMDMxIDAgOS45OTk5NloiIGZpbGw9IiM2REE1NDQiLz4KPC9nPgo8ZGVmcz4KPGNsaXBQYXRoIGlkPSJjbGlwMF8xXzE1MTY5Ij4KPHJlY3Qgd2lkdGg9IjIwIiBoZWlnaHQ9IjIwIiBmaWxsPSJ3aGl0ZSIvPgo8L2NsaXBQYXRoPgo8L2RlZnM+Cjwvc3ZnPgo=', + fill: 'rgba(0,0,0,0.3)', + backgroundMode: 'repeat-x', + boundsPadding: [2, 2, 2, 2], + pickMode: 'imprecise' + }); + + rect.addEventListener('click', () => { + console.log('click'); + }); + + const stage = createStage({ + canvas: 'main', + autoRender: true + }); + stage.defaultLayer.add(rect); +}; diff --git a/packages/vrender/__tests__/browser/src/pages/index.ts b/packages/vrender/__tests__/browser/src/pages/index.ts index 2fed4b3de..c12928a4b 100644 --- a/packages/vrender/__tests__/browser/src/pages/index.ts +++ b/packages/vrender/__tests__/browser/src/pages/index.ts @@ -15,6 +15,10 @@ export const pages = [ name: '性能测试', path: 'performance-test' }, + { + name: '按需加载', + path: 'anxu-picker' + }, { name: '基础事件测试', path: 'interactive-test' From 6a1d10fb2de36d2b53f9548fce23098e3b1c60bc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 5 Feb 2025 07:09:53 +0000 Subject: [PATCH 10/10] build: prelease version 0.21.12 --- ...abel-callback-params_2025-01-26-07-07.json | 11 -------- ...title-vertical-align_2025-01-16-10-33.json | 11 -------- ...abel-callback-params_2025-01-26-07-07.json | 11 -------- ...x-inversify-optional_2025-01-27-04-55.json | 10 ------- ...-label-increaseCount_2025-01-16-06-26.json | 10 ------- ...title-vertical-align_2025-01-16-10-33.json | 11 -------- ...x-inversify-optional_2025-01-27-04-55.json | 10 ------- ...x-inversify-optional_2025-01-27-04-55.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 | 15 +++++++++++ packages/vrender-components/CHANGELOG.md | 14 +++++++++- packages/vrender-components/package.json | 6 ++--- packages/vrender-core/CHANGELOG.json | 21 +++++++++++++++ packages/vrender-core/CHANGELOG.md | 16 +++++++++++- 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 | 12 +++++++++ packages/vrender/CHANGELOG.md | 9 ++++++- packages/vrender/package.json | 6 ++--- tools/bugserver-trigger/package.json | 8 +++--- 30 files changed, 161 insertions(+), 123 deletions(-) delete mode 100644 common/changes/@visactor/vrender-components/feat-label-callback-params_2025-01-26-07-07.json delete mode 100644 common/changes/@visactor/vrender-components/fix-title-vertical-align_2025-01-16-10-33.json delete mode 100644 common/changes/@visactor/vrender-core/feat-label-callback-params_2025-01-26-07-07.json delete mode 100644 common/changes/@visactor/vrender-core/fix-inversify-optional_2025-01-27-04-55.json delete mode 100644 common/changes/@visactor/vrender-core/fix-label-increaseCount_2025-01-16-06-26.json delete mode 100644 common/changes/@visactor/vrender-core/fix-title-vertical-align_2025-01-16-10-33.json delete mode 100644 common/changes/@visactor/vrender-kits/fix-inversify-optional_2025-01-27-04-55.json delete mode 100644 common/changes/@visactor/vrender/fix-inversify-optional_2025-01-27-04-55.json diff --git a/common/changes/@visactor/vrender-components/feat-label-callback-params_2025-01-26-07-07.json b/common/changes/@visactor/vrender-components/feat-label-callback-params_2025-01-26-07-07.json deleted file mode 100644 index d73443990..000000000 --- a/common/changes/@visactor/vrender-components/feat-label-callback-params_2025-01-26-07-07.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "feat: add instance to the callback of label\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-components/fix-title-vertical-align_2025-01-16-10-33.json b/common/changes/@visactor/vrender-components/fix-title-vertical-align_2025-01-16-10-33.json deleted file mode 100644 index 3756a84d6..000000000 --- a/common/changes/@visactor/vrender-components/fix-title-vertical-align_2025-01-16-10-33.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "fix: fix layout of title when not set height\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/feat-label-callback-params_2025-01-26-07-07.json b/common/changes/@visactor/vrender-core/feat-label-callback-params_2025-01-26-07-07.json deleted file mode 100644 index c7c28495d..000000000 --- a/common/changes/@visactor/vrender-core/feat-label-callback-params_2025-01-26-07-07.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "feat: add instance to the callback of label\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-inversify-optional_2025-01-27-04-55.json b/common/changes/@visactor/vrender-core/fix-inversify-optional_2025-01-27-04-55.json deleted file mode 100644 index f91a9b3dc..000000000 --- a/common/changes/@visactor/vrender-core/fix-inversify-optional_2025-01-27-04-55.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-core", - "comment": "fix: fix issue with inversify error when nobind", - "type": "none" - } - ], - "packageName": "@visactor/vrender-core" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-label-increaseCount_2025-01-16-06-26.json b/common/changes/@visactor/vrender-core/fix-label-increaseCount_2025-01-16-06-26.json deleted file mode 100644 index c2e045c77..000000000 --- a/common/changes/@visactor/vrender-core/fix-label-increaseCount_2025-01-16-06-26.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-core", - "comment": "fix: fix the issue where the final text of the label increase count animation is incorrect", - "type": "none" - } - ], - "packageName": "@visactor/vrender-core" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-title-vertical-align_2025-01-16-10-33.json b/common/changes/@visactor/vrender-core/fix-title-vertical-align_2025-01-16-10-33.json deleted file mode 100644 index a41dc4370..000000000 --- a/common/changes/@visactor/vrender-core/fix-title-vertical-align_2025-01-16-10-33.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "fix: fix layout of title when not set height\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-kits/fix-inversify-optional_2025-01-27-04-55.json b/common/changes/@visactor/vrender-kits/fix-inversify-optional_2025-01-27-04-55.json deleted file mode 100644 index 4364581bd..000000000 --- a/common/changes/@visactor/vrender-kits/fix-inversify-optional_2025-01-27-04-55.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-kits", - "comment": "fix: fix issue with inversify error when nobind", - "type": "none" - } - ], - "packageName": "@visactor/vrender-kits" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender/fix-inversify-optional_2025-01-27-04-55.json b/common/changes/@visactor/vrender/fix-inversify-optional_2025-01-27-04-55.json deleted file mode 100644 index 0cc784b11..000000000 --- a/common/changes/@visactor/vrender/fix-inversify-optional_2025-01-27-04-55.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender", - "comment": "fix: fix issue with inversify error when nobind", - "type": "none" - } - ], - "packageName": "@visactor/vrender" -} \ No newline at end of file diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 25a4fb9e4..4b8ccb763 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.21.11 + '@visactor/vrender': workspace:0.21.12 '@visactor/vutils': ~0.19.3 '@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.21.11 + '@visactor/vrender': workspace:0.21.12 '@visactor/vutils': ~0.19.3 '@vitejs/plugin-react': 3.1.0 cross-env: ^7.0.3 @@ -111,8 +111,8 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 - '@visactor/react-vrender': workspace:0.21.11 - '@visactor/vrender': workspace:0.21.11 + '@visactor/react-vrender': workspace:0.21.12 + '@visactor/vrender': workspace:0.21.12 '@visactor/vutils': ~0.19.3 '@vitejs/plugin-react': 3.1.0 cross-env: ^7.0.3 @@ -153,8 +153,8 @@ importers: '@types/jest': ^26.0.0 '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 - '@visactor/vrender-core': workspace:0.21.11 - '@visactor/vrender-kits': workspace:0.21.11 + '@visactor/vrender-core': workspace:0.21.12 + '@visactor/vrender-kits': workspace:0.21.12 '@visactor/vutils': ~0.19.3 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 @@ -200,8 +200,8 @@ importers: '@internal/ts-config': workspace:* '@rushstack/eslint-patch': ~1.1.4 '@types/jest': ^26.0.0 - '@visactor/vrender-core': workspace:0.21.11 - '@visactor/vrender-kits': workspace:0.21.11 + '@visactor/vrender-core': workspace:0.21.12 + '@visactor/vrender-kits': workspace:0.21.12 '@visactor/vscale': ~0.19.3 '@visactor/vutils': ~0.19.3 cross-env: ^7.0.3 @@ -287,7 +287,7 @@ importers: '@types/node-fetch': 2.6.4 '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 - '@visactor/vrender-core': workspace:0.21.11 + '@visactor/vrender-core': workspace:0.21.12 '@visactor/vutils': ~0.19.3 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 @@ -371,10 +371,10 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/node': '*' '@types/node-fetch': 2.6.4 - '@visactor/vrender': workspace:0.21.11 - '@visactor/vrender-components': workspace:0.21.11 - '@visactor/vrender-core': workspace:0.21.11 - '@visactor/vrender-kits': workspace:0.21.11 + '@visactor/vrender': workspace:0.21.12 + '@visactor/vrender-components': workspace:0.21.12 + '@visactor/vrender-core': workspace:0.21.12 + '@visactor/vrender-kits': workspace:0.21.12 cross-env: ^7.0.3 eslint: ~8.18.0 form-data: ~4.0.0 diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index 99fbf753b..5bd29e7c3 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.21.11","nextBump":"patch"}] +[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.21.12","nextBump":"patch"}] diff --git a/docs/package.json b/docs/package.json index a92fbb445..f3508a043 100644 --- a/docs/package.json +++ b/docs/package.json @@ -13,7 +13,7 @@ "@visactor/vchart": "1.3.0", "@visactor/vutils": "~0.19.3", "@visactor/vgrammar": "~0.5.7", - "@visactor/vrender": "workspace:0.21.11", + "@visactor/vrender": "workspace:0.21.12", "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 fbabfac66..3b80592e8 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.21.12", + "tag": "@visactor/react-vrender-utils_v0.21.12", + "date": "Wed, 05 Feb 2025 07:04:09 GMT", + "comments": {} + }, { "version": "0.21.11", "tag": "@visactor/react-vrender-utils_v0.21.11", diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md index daf9b8d5b..c3c5605eb 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 Wed, 15 Jan 2025 12:13:28 GMT and should not be manually modified. +This log was last generated on Wed, 05 Feb 2025 07:04:09 GMT and should not be manually modified. + +## 0.21.12 +Wed, 05 Feb 2025 07:04:09 GMT + +_Version update only_ ## 0.21.11 Wed, 15 Jan 2025 12:13:28 GMT diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json index 28cd77eaa..80062a225 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.21.11", + "version": "0.21.12", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "react-dom": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:0.21.11", - "@visactor/react-vrender": "workspace:0.21.11", + "@visactor/vrender": "workspace:0.21.12", + "@visactor/react-vrender": "workspace:0.21.12", "@visactor/vutils": "~0.19.3", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" diff --git a/packages/react-vrender/CHANGELOG.json b/packages/react-vrender/CHANGELOG.json index 32a1f856c..f6e02e49b 100644 --- a/packages/react-vrender/CHANGELOG.json +++ b/packages/react-vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/react-vrender", "entries": [ + { + "version": "0.21.12", + "tag": "@visactor/react-vrender_v0.21.12", + "date": "Wed, 05 Feb 2025 07:04:09 GMT", + "comments": {} + }, { "version": "0.21.11", "tag": "@visactor/react-vrender_v0.21.11", diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md index b78820d42..df082e734 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 Wed, 15 Jan 2025 12:13:28 GMT and should not be manually modified. +This log was last generated on Wed, 05 Feb 2025 07:04:09 GMT and should not be manually modified. + +## 0.21.12 +Wed, 05 Feb 2025 07:04:09 GMT + +_Version update only_ ## 0.21.11 Wed, 15 Jan 2025 12:13:28 GMT diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json index 557b4a910..5df1592b3 100644 --- a/packages/react-vrender/package.json +++ b/packages/react-vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender", - "version": "0.21.11", + "version": "0.21.12", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -23,7 +23,7 @@ "react": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:0.21.11", + "@visactor/vrender": "workspace:0.21.12", "@visactor/vutils": "~0.19.3", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json index 4439c1d97..9b82294a8 100644 --- a/packages/vrender-components/CHANGELOG.json +++ b/packages/vrender-components/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "@visactor/vrender-components", "entries": [ + { + "version": "0.21.12", + "tag": "@visactor/vrender-components_v0.21.12", + "date": "Wed, 05 Feb 2025 07:04:09 GMT", + "comments": { + "none": [ + { + "comment": "feat: add instance to the callback of label\n\n" + }, + { + "comment": "fix: fix layout of title when not set height\n\n" + } + ] + } + }, { "version": "0.21.11", "tag": "@visactor/vrender-components_v0.21.11", diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md index 73a5931d0..7ef14c960 100644 --- a/packages/vrender-components/CHANGELOG.md +++ b/packages/vrender-components/CHANGELOG.md @@ -1,6 +1,18 @@ # Change Log - @visactor/vrender-components -This log was last generated on Wed, 15 Jan 2025 12:13:28 GMT and should not be manually modified. +This log was last generated on Wed, 05 Feb 2025 07:04:09 GMT and should not be manually modified. + +## 0.21.12 +Wed, 05 Feb 2025 07:04:09 GMT + +### Updates + +- feat: add instance to the callback of label + + +- fix: fix layout of title when not set height + + ## 0.21.11 Wed, 15 Jan 2025 12:13:28 GMT diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json index 84cfdeaae..76f14bfb9 100644 --- a/packages/vrender-components/package.json +++ b/packages/vrender-components/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-components", - "version": "0.21.11", + "version": "0.21.12", "description": "components library for dp visualization", "sideEffects": false, "main": "cjs/index.js", @@ -27,8 +27,8 @@ "dependencies": { "@visactor/vutils": "~0.19.3", "@visactor/vscale": "~0.19.3", - "@visactor/vrender-core": "workspace:0.21.11", - "@visactor/vrender-kits": "workspace:0.21.11" + "@visactor/vrender-core": "workspace:0.21.12", + "@visactor/vrender-kits": "workspace:0.21.12" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json index 1a102ef58..96ad5a3bb 100644 --- a/packages/vrender-core/CHANGELOG.json +++ b/packages/vrender-core/CHANGELOG.json @@ -1,6 +1,27 @@ { "name": "@visactor/vrender-core", "entries": [ + { + "version": "0.21.12", + "tag": "@visactor/vrender-core_v0.21.12", + "date": "Wed, 05 Feb 2025 07:04:09 GMT", + "comments": { + "none": [ + { + "comment": "feat: add instance to the callback of label\n\n" + }, + { + "comment": "fix: fix issue with inversify error when nobind" + }, + { + "comment": "fix: fix the issue where the final text of the label increase count animation is incorrect" + }, + { + "comment": "fix: fix layout of title when not set height\n\n" + } + ] + } + }, { "version": "0.21.11", "tag": "@visactor/vrender-core_v0.21.11", diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md index 22ccc7912..1713fe8ee 100644 --- a/packages/vrender-core/CHANGELOG.md +++ b/packages/vrender-core/CHANGELOG.md @@ -1,6 +1,20 @@ # Change Log - @visactor/vrender-core -This log was last generated on Wed, 15 Jan 2025 12:13:28 GMT and should not be manually modified. +This log was last generated on Wed, 05 Feb 2025 07:04:09 GMT and should not be manually modified. + +## 0.21.12 +Wed, 05 Feb 2025 07:04:09 GMT + +### Updates + +- feat: add instance to the callback of label + + +- fix: fix issue with inversify error when nobind +- fix: fix the issue where the final text of the label increase count animation is incorrect +- fix: fix layout of title when not set height + + ## 0.21.11 Wed, 15 Jan 2025 12:13:28 GMT diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json index 412c41247..06b47fc9d 100644 --- a/packages/vrender-core/package.json +++ b/packages/vrender-core/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-core", - "version": "0.21.11", + "version": "0.21.12", "description": "", "sideEffects": [ "./src/modules.ts", diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json index 47b13d4ba..86cd53954 100644 --- a/packages/vrender-kits/CHANGELOG.json +++ b/packages/vrender-kits/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@visactor/vrender-kits", "entries": [ + { + "version": "0.21.12", + "tag": "@visactor/vrender-kits_v0.21.12", + "date": "Wed, 05 Feb 2025 07:04:09 GMT", + "comments": { + "none": [ + { + "comment": "fix: fix issue with inversify error when nobind" + } + ] + } + }, { "version": "0.21.11", "tag": "@visactor/vrender-kits_v0.21.11", diff --git a/packages/vrender-kits/CHANGELOG.md b/packages/vrender-kits/CHANGELOG.md index 05373f818..f21d755c2 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 Wed, 15 Jan 2025 12:13:28 GMT and should not be manually modified. +This log was last generated on Wed, 05 Feb 2025 07:04:09 GMT and should not be manually modified. + +## 0.21.12 +Wed, 05 Feb 2025 07:04:09 GMT + +### Updates + +- fix: fix issue with inversify error when nobind ## 0.21.11 Wed, 15 Jan 2025 12:13:28 GMT diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index 952e4ea90..79b9c6b29 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-kits", - "version": "0.21.11", + "version": "0.21.12", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "~0.19.3", - "@visactor/vrender-core": "workspace:0.21.11", + "@visactor/vrender-core": "workspace:0.21.12", "@resvg/resvg-js": "2.4.1", "roughjs": "4.5.2", "gifuct-js": "2.1.2" diff --git a/packages/vrender/CHANGELOG.json b/packages/vrender/CHANGELOG.json index 1669400f0..3b70da580 100644 --- a/packages/vrender/CHANGELOG.json +++ b/packages/vrender/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@visactor/vrender", "entries": [ + { + "version": "0.21.12", + "tag": "@visactor/vrender_v0.21.12", + "date": "Wed, 05 Feb 2025 07:04:09 GMT", + "comments": { + "none": [ + { + "comment": "fix: fix issue with inversify error when nobind" + } + ] + } + }, { "version": "0.21.11", "tag": "@visactor/vrender_v0.21.11", diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md index e70a79a89..4ba706562 100644 --- a/packages/vrender/CHANGELOG.md +++ b/packages/vrender/CHANGELOG.md @@ -1,6 +1,13 @@ # Change Log - @visactor/vrender -This log was last generated on Wed, 15 Jan 2025 12:13:28 GMT and should not be manually modified. +This log was last generated on Wed, 05 Feb 2025 07:04:09 GMT and should not be manually modified. + +## 0.21.12 +Wed, 05 Feb 2025 07:04:09 GMT + +### Updates + +- fix: fix issue with inversify error when nobind ## 0.21.11 Wed, 15 Jan 2025 12:13:28 GMT diff --git a/packages/vrender/package.json b/packages/vrender/package.json index dfbdddca5..6288c7421 100644 --- a/packages/vrender/package.json +++ b/packages/vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender", - "version": "0.21.11", + "version": "0.21.12", "description": "", "sideEffects": true, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "test-watch": "cross-env DEBUG_MODE=1 jest --watch" }, "dependencies": { - "@visactor/vrender-core": "workspace:0.21.11", - "@visactor/vrender-kits": "workspace:0.21.11" + "@visactor/vrender-core": "workspace:0.21.12", + "@visactor/vrender-kits": "workspace:0.21.12" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/tools/bugserver-trigger/package.json b/tools/bugserver-trigger/package.json index 16772bf11..fc67ccac9 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.21.11", - "@visactor/vrender-core": "workspace:0.21.11", - "@visactor/vrender-kits": "workspace:0.21.11", - "@visactor/vrender-components": "workspace:0.21.11" + "@visactor/vrender": "workspace:0.21.12", + "@visactor/vrender-core": "workspace:0.21.12", + "@visactor/vrender-kits": "workspace:0.21.12", + "@visactor/vrender-components": "workspace:0.21.12" }, "devDependencies": { "@rushstack/eslint-patch": "~1.1.4",