From 1ccbab1443b1471d2be60c91c6b0aa01d752977a Mon Sep 17 00:00:00 2001 From: neuqzxy Date: Wed, 25 Dec 2024 08:33:28 +0000 Subject: [PATCH 1/9] docs: generate changelog of release v0.21.7 --- docs/assets/changelog/en/changelog.md | 29 +++++++++++++++++++++++++++ docs/assets/changelog/zh/changelog.md | 29 +++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/docs/assets/changelog/en/changelog.md b/docs/assets/changelog/en/changelog.md index a73554114..5104b8b34 100644 --- a/docs/assets/changelog/en/changelog.md +++ b/docs/assets/changelog/en/changelog.md @@ -1,3 +1,32 @@ +# v0.21.7 + +2024-12-25 + + +**🆕 New feature** + +- **@visactor/vrender-components**: support polygon sector crosshair for non-smooth angle axis +- **@visactor/vrender-components**: add switch component + +**🐛 Bug fix** + +- **@visactor/vrender-components**: upgrade vutils to 0.19.3 +- **@visactor/react-vrender-utils**: upgrade vutils to 0.19.3 +- **@visactor/react-vrender**: upgrade vutils to 0.19.3 +- **@visactor/vrender-kits**: upgrade vutils to 0.19.3 +- **@visactor/vrender-core**: upgrade vutils to 0.19.3 +- **@visactor/vrender**: upgrade vutils to 0.19.3 + +**🔖 other** + +- **@visactor/vrender-components**: Revert "fix: fix the bug of axis pickable" + +This reverts commit 55637a84c01f7af8f4b64ccdfc8cd7215a257c03. + + + +[more detail about v0.21.7](https://github.com/VisActor/VRender/releases/tag/v0.21.7) + # v0.21.6 2024-12-25 diff --git a/docs/assets/changelog/zh/changelog.md b/docs/assets/changelog/zh/changelog.md index 4d413bc94..2d6d0d56b 100644 --- a/docs/assets/changelog/zh/changelog.md +++ b/docs/assets/changelog/zh/changelog.md @@ -1,3 +1,32 @@ +# v0.21.7 + +2024-12-25 + + +**🆕 新增功能** + +- **@visactor/vrender-components**: support polygon sector crosshair for non-smooth angle axis +- **@visactor/vrender-components**: add switch component + +**🐛 功能修复** + +- **@visactor/vrender-components**: upgrade vutils to 0.19.3 +- **@visactor/react-vrender-utils**: upgrade vutils to 0.19.3 +- **@visactor/react-vrender**: upgrade vutils to 0.19.3 +- **@visactor/vrender-kits**: upgrade vutils to 0.19.3 +- **@visactor/vrender-core**: upgrade vutils to 0.19.3 +- **@visactor/vrender**: upgrade vutils to 0.19.3 + +**🔖 其他** + +- **@visactor/vrender-components**: Revert "fix: fix the bug of axis pickable" + +This reverts commit 55637a84c01f7af8f4b64ccdfc8cd7215a257c03. + + + +[更多详情请查看 v0.21.7](https://github.com/VisActor/VRender/releases/tag/v0.21.7) + # v0.21.6 2024-12-25 From e34641febca816d71e0d4ed18f4244604fa5f4d0 Mon Sep 17 00:00:00 2001 From: xiaoluoHe Date: Wed, 25 Dec 2024 17:00:06 +0800 Subject: [PATCH 2/9] feat: support label for 3d arc --- packages/vrender-components/src/label/arc.ts | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/packages/vrender-components/src/label/arc.ts b/packages/vrender-components/src/label/arc.ts index f935fd928..5b71b46ee 100644 --- a/packages/vrender-components/src/label/arc.ts +++ b/packages/vrender-components/src/label/arc.ts @@ -29,6 +29,7 @@ import { isFunction } from '@visactor/vutils'; export class ArcInfo { key!: string; refDatum!: any; + refArc!: IArc; /** * 绘图区圆弧中点 */ @@ -239,6 +240,14 @@ export class ArcLabel extends LabelBase { basedArc.labelLimit ?? (labels[i].attribute as ITextAttribute).maxLineWidth; } + if (basedArc.refArc && basedArc.refArc.type === 'arc3d') { + (labelAttribute as any).anchor3d = [ + basedArc.circleCenter.x - labelAttribute.x, + basedArc.circleCenter.y - labelAttribute.y + ]; + (labelAttribute as any).beta = basedArc.refArc.attribute.beta; + } + labels[i].setAttributes(labelAttribute); } } @@ -290,7 +299,7 @@ export class ArcLabel extends LabelBase { graphicAttribute.outerRadius, center ); - + arc.refArc = currentMark; arc.pointA = polarToCartesian( center as IPoint, this.computeDatumRadius(center.x * 2, center.y * 2, graphicAttribute.outerRadius), @@ -1006,6 +1015,14 @@ export class ArcLabel extends LabelBase { curveType: 'basis' }); } + + if (baseMark.type === 'arc3d' && baseMark) { + const { beta, x, y } = baseMark.attribute; + lineGraphic.setAttributes({ + beta, + anchor3d: [x, y] + }); + } } return lineGraphic; From 61c02e6603ad95e34ee7657d88d430efef1952b5 Mon Sep 17 00:00:00 2001 From: xiaoluoHe Date: Wed, 25 Dec 2024 17:02:22 +0800 Subject: [PATCH 3/9] docs: add changelog --- .../fix-3d-arc-label_2024-12-25-09-02.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 common/changes/@visactor/vrender-components/fix-3d-arc-label_2024-12-25-09-02.json diff --git a/common/changes/@visactor/vrender-components/fix-3d-arc-label_2024-12-25-09-02.json b/common/changes/@visactor/vrender-components/fix-3d-arc-label_2024-12-25-09-02.json new file mode 100644 index 000000000..c198bcc2a --- /dev/null +++ b/common/changes/@visactor/vrender-components/fix-3d-arc-label_2024-12-25-09-02.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-components", + "comment": "fix: handle the additional logic of 3d arc label layout", + "type": "none" + } + ], + "packageName": "@visactor/vrender-components" +} \ No newline at end of file From 48bab12e586a413a469b1c68f86d5f8c309bbba9 Mon Sep 17 00:00:00 2001 From: xiaoluoHe Date: Wed, 25 Dec 2024 17:04:53 +0800 Subject: [PATCH 4/9] fix: fix type error --- packages/vrender-components/src/label/arc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vrender-components/src/label/arc.ts b/packages/vrender-components/src/label/arc.ts index 5b71b46ee..3d0879474 100644 --- a/packages/vrender-components/src/label/arc.ts +++ b/packages/vrender-components/src/label/arc.ts @@ -299,7 +299,7 @@ export class ArcLabel extends LabelBase { graphicAttribute.outerRadius, center ); - arc.refArc = currentMark; + arc.refArc = currentMark as IArc; arc.pointA = polarToCartesian( center as IPoint, this.computeDatumRadius(center.x * 2, center.y * 2, graphicAttribute.outerRadius), From 6e196ab5e2b0077f719d695eafd33d6243e868e6 Mon Sep 17 00:00:00 2001 From: xile611 Date: Fri, 27 Dec 2024 10:42:30 +0800 Subject: [PATCH 5/9] fix: fix layout of title component --- .../vrender-components/src/title/title.ts | 99 ++++++++++--------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/packages/vrender-components/src/title/title.ts b/packages/vrender-components/src/title/title.ts index 818a964aa..eb4b1b7ef 100644 --- a/packages/vrender-components/src/title/title.ts +++ b/packages/vrender-components/src/title/title.ts @@ -66,10 +66,10 @@ export class Title extends AbstractComponent> { 'group' ) as IGroup; + const fixedMainTitleHeight = textStyle.height ?? height; if (this.attribute.visible !== false && textStyle.visible !== false) { const { width: mainTitleWidth, - height: mainTitleHeight, maxHeight: mainTitleMaxHeight, maxWidth: mainTitleMaxWidth, x = 0, @@ -84,7 +84,7 @@ export class Title extends AbstractComponent> { x, y, width: mainTitleWidth ?? width ?? 0, - height: mainTitleHeight ?? height ?? 0, + height: fixedMainTitleHeight ?? 0, ellipsis: ellipsis ?? true, wordBreak: wordBreak ?? 'break-word', maxHeight: mainTitleMaxHeight ?? maxHeight, @@ -104,7 +104,7 @@ export class Title extends AbstractComponent> { x, y, width: mainTitleWidth ?? width ?? 0, - height: mainTitleHeight ?? height ?? 0, + height: fixedMainTitleHeight ?? 0, ellipsis, wordBreak, maxHeight: mainTitleMaxHeight ?? maxHeight, @@ -121,7 +121,7 @@ export class Title extends AbstractComponent> { whiteSpace: 'normal', ...textStyle, maxLineWidth: textStyle.maxLineWidth ?? mainTitleWidth ?? width, - heightLimit: mainTitleHeight ?? maxHeight, + heightLimit: textStyle.height ?? maxHeight, lineClamp, ellipsis, x, @@ -132,8 +132,8 @@ export class Title extends AbstractComponent> { } } - const maintextHeight = this._mainTitle ? this._mainTitle.AABBBounds.height() : 0; - const maintextWidth = this._mainTitle ? this._mainTitle.AABBBounds.width() : 0; + const mainTextBoundsHeight = this._mainTitle ? this._mainTitle.AABBBounds.height() : 0; + const mainTextBoundsWidth = this._mainTitle ? this._mainTitle.AABBBounds.width() : 0; // 目前 height 限制等于 0 时，相当于 Infinity，无限制 @@ -149,7 +149,7 @@ export class Title extends AbstractComponent> { wordBreak = 'break-word', lineClamp } = subtextStyle; - const maxSubTextHeight = Math.max(Number.MIN_VALUE, maxHeight - maintextHeight); + const maxSubTextHeight = Math.max(Number.MIN_VALUE, maxHeight - mainTextBoundsHeight); if (subtextType === 'rich' || isValid(subtextStyle.character)) { const attr: any = { @@ -197,79 +197,79 @@ export class Title extends AbstractComponent> { lineClamp, ellipsis, x: 0, - y: maintextHeight + y: mainTextBoundsHeight }, 'text' ) as IText; } } - const subtextHeight = this._subTitle ? this._subTitle.AABBBounds.height() : 0; - const subtextWidth = this._subTitle ? this._subTitle.AABBBounds.width() : 0; + const subTextBoundsHeight = this._subTitle ? this._subTitle.AABBBounds.height() : 0; + const subTextBoundsWidth = this._subTitle ? this._subTitle.AABBBounds.width() : 0; // 设置宽高 - let titleWidth = Math.max(maintextWidth, subtextWidth); - let titleHeight = maintextHeight + (subtextStyle.height ?? subtextHeight); + let totalWidth = Math.max(mainTextBoundsWidth, subTextBoundsWidth); + let totalHeight = mainTextBoundsHeight + (subtextStyle.height ?? subTextBoundsHeight); if (isValid(width)) { - titleWidth = width; + totalWidth = width; } if (isValid(height)) { - titleHeight = height; + totalHeight = height; } - if (isValid(minWidth) && titleWidth < minWidth) { - titleWidth = minWidth; + if (isValid(minWidth) && totalWidth < minWidth) { + totalWidth = minWidth; } if (isValid(maxWidth)) { - if (titleWidth > maxWidth) { - titleWidth = maxWidth; + if (totalWidth > maxWidth) { + totalWidth = maxWidth; } } - if (isValid(minHeight) && titleHeight < minHeight) { - titleHeight = minHeight; + if (isValid(minHeight) && totalHeight < minHeight) { + totalHeight = minHeight; } if (isValid(maxHeight)) { - if (titleHeight > maxHeight) { - titleHeight = maxHeight; + if (totalHeight > maxHeight) { + totalHeight = maxHeight; } } - group.attribute.width = titleWidth; - group.attribute.height = titleHeight; + + group.attribute.width = totalWidth; + group.attribute.height = totalHeight; group.attribute.boundsPadding = parsedPadding; // 设置对齐 if (this._mainTitle) { if (isValid(align) || isValid(textStyle.align)) { const mainTitleAlign = textStyle.align ? textStyle.align : align; - const mainTitleWidth = textStyle.width ?? maintextWidth; - if (mainTitleAlign === 'left') { - this._mainTitle.setAttribute('x', 0); - this._mainTitle.setAttribute('textAlign', 'left'); - } else if (mainTitleAlign === 'center') { + const mainTitleWidth = textStyle.width ?? totalWidth; + if (mainTitleAlign === 'center') { this._mainTitle.setAttribute('x', mainTitleWidth / 2); this._mainTitle.setAttribute('textAlign', 'center'); } else if (mainTitleAlign === 'right') { this._mainTitle.setAttribute('x', mainTitleWidth); this._mainTitle.setAttribute('textAlign', 'right'); + } else { + this._mainTitle.setAttribute('x', 0); + this._mainTitle.setAttribute('textAlign', 'left'); } } if (isValid(verticalAlign) || isValid(textStyle.verticalAlign)) { const mainTitleVerticalAlign = textStyle.verticalAlign ? textStyle.verticalAlign : verticalAlign; - const mainTitleHeight = textStyle.height ? textStyle.height : titleHeight; - if (mainTitleVerticalAlign === 'top') { - this._mainTitle.setAttribute('y', 0); - this._mainTitle.setAttribute('textBaseline', 'top'); - } else if (mainTitleVerticalAlign === 'middle') { - this._mainTitle.setAttribute('y', mainTitleHeight / 2); + if (mainTitleVerticalAlign === 'middle' && isValid(fixedMainTitleHeight)) { + this._mainTitle.setAttribute('y', fixedMainTitleHeight / 2); this._mainTitle.setAttribute('textBaseline', 'middle'); - } else if (mainTitleVerticalAlign === 'bottom') { - this._mainTitle.setAttribute('y', mainTitleHeight); + } else if (mainTitleVerticalAlign === 'bottom' && isValid(fixedMainTitleHeight)) { + this._mainTitle.setAttribute('y', fixedMainTitleHeight); this._mainTitle.setAttribute('textBaseline', 'bottom'); + } else { + this._mainTitle.setAttribute('y', 0); + this._mainTitle.setAttribute('textBaseline', 'top'); } } } @@ -277,32 +277,33 @@ export class Title extends AbstractComponent> { if (this._subTitle) { if (isValid(align) || isValid(subtextStyle.align)) { const subTitleAlign = subtextStyle.align ? subtextStyle.align : align; - const subTitleWidth = subtextStyle.width ?? subtextWidth; - if (subTitleAlign === 'left') { - this._subTitle.setAttribute('x', 0); - this._subTitle.setAttribute('textAlign', 'left'); - } else if (subTitleAlign === 'center') { + // 当subText没有设置显示的宽度，但是mainText设置了显示的宽度的时候，为mainText为主，因为默认subText要和mainText对齐 + const subTitleWidth = subtextStyle.width ?? textStyle.width ?? totalWidth; + if (subTitleAlign === 'center') { this._subTitle.setAttribute('x', subTitleWidth / 2); this._subTitle.setAttribute('textAlign', 'center'); } else if (subTitleAlign === 'right') { this._subTitle.setAttribute('x', subTitleWidth); this._subTitle.setAttribute('textAlign', 'right'); + } else { + this._subTitle.setAttribute('x', 0); + this._subTitle.setAttribute('textAlign', 'left'); } } if (isValid(verticalAlign) || isValid(textStyle.verticalAlign)) { const subTitleVerticalAlign = subtextStyle.verticalAlign ? subtextStyle.verticalAlign : verticalAlign; - const subTitleYStart = maintextHeight; - const subTitleHeight = subtextStyle.height ?? 0; - if (subTitleVerticalAlign === 'top') { - this._subTitle.setAttribute('y', subTitleYStart); - this._subTitle.setAttribute('textBaseline', 'top'); - } else if (subTitleVerticalAlign === 'middle') { + const subTitleYStart = this._mainTitle ? this._mainTitle.AABBBounds.y2 : 0; + const subTitleHeight = subtextStyle.height ?? height; + if (subTitleVerticalAlign === 'middle' && isValid(subTitleHeight)) { this._subTitle.setAttribute('y', subTitleYStart + subTitleHeight / 2); this._subTitle.setAttribute('textBaseline', 'middle'); - } else if (subTitleVerticalAlign === 'bottom') { + } else if (subTitleVerticalAlign === 'bottom' && isValid(subTitleHeight)) { this._subTitle.setAttribute('y', subTitleYStart + subTitleHeight); this._subTitle.setAttribute('textBaseline', 'bottom'); + } else { + this._subTitle.setAttribute('y', subTitleYStart); + this._subTitle.setAttribute('textBaseline', 'top'); } } } From fa1c5b38cf640feabbeac71eaf0d1185163259b8 Mon Sep 17 00:00:00 2001 From: xile611 Date: Fri, 27 Dec 2024 10:43:07 +0800 Subject: [PATCH 6/9] docs: update changlog of rush --- .../fix-title-layout_2024-12-27-02-43.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@visactor/vrender-components/fix-title-layout_2024-12-27-02-43.json diff --git a/common/changes/@visactor/vrender-components/fix-title-layout_2024-12-27-02-43.json b/common/changes/@visactor/vrender-components/fix-title-layout_2024-12-27-02-43.json new file mode 100644 index 000000000..853a65d89 --- /dev/null +++ b/common/changes/@visactor/vrender-components/fix-title-layout_2024-12-27-02-43.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "fix: fix layout of title component\n\n", + "type": "none", + "packageName": "@visactor/vrender-components" + } + ], + "packageName": "@visactor/vrender-components", + "email": "dingling112@gmail.com" +} \ No newline at end of file From c5e5ee367578fa087f568c997afcb09b861b5899 Mon Sep 17 00:00:00 2001 From: xile611 Date: Mon, 30 Dec 2024 12:09:17 +0800 Subject: [PATCH 7/9] fix: fix fixed height of title --- packages/vrender-components/src/title/title.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/vrender-components/src/title/title.ts b/packages/vrender-components/src/title/title.ts index eb4b1b7ef..0cf9381af 100644 --- a/packages/vrender-components/src/title/title.ts +++ b/packages/vrender-components/src/title/title.ts @@ -293,7 +293,12 @@ export class Title extends AbstractComponent> { if (isValid(verticalAlign) || isValid(textStyle.verticalAlign)) { const subTitleVerticalAlign = subtextStyle.verticalAlign ? subtextStyle.verticalAlign : verticalAlign; - const subTitleYStart = this._mainTitle ? this._mainTitle.AABBBounds.y2 : 0; + const subTitleYStart = this._mainTitle + ? isValid(fixedMainTitleHeight) + ? // 如果是用户指定的高度，根据bounds的height 和指定高度求最大值 + this._mainTitle.AABBBounds.y1 + Math.max(this._mainTitle.AABBBounds.height(), fixedMainTitleHeight) + : this._mainTitle.AABBBounds.y2 + : 0; const subTitleHeight = subtextStyle.height ?? height; if (subTitleVerticalAlign === 'middle' && isValid(subTitleHeight)) { this._subTitle.setAttribute('y', subTitleYStart + subTitleHeight / 2); From 8634ef138fdc4cf2ae717ae18ff06f384cea1ba0 Mon Sep 17 00:00:00 2001 From: Rui-Sun Date: Mon, 6 Jan 2025 14:24:05 +0800 Subject: [PATCH 8/9] feat: add isImageAnonymous in global --- .../feat-isImageAnonymous_2025-01-06-06-22.json | 10 ++++++++++ packages/vrender-core/src/core/global.ts | 9 +++++++++ packages/vrender-core/src/interface/global.ts | 2 ++ .../src/env/contributions/browser-contribution.ts | 6 ++++-- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 common/changes/@visactor/vrender-core/feat-isImageAnonymous_2025-01-06-06-22.json diff --git a/common/changes/@visactor/vrender-core/feat-isImageAnonymous_2025-01-06-06-22.json b/common/changes/@visactor/vrender-core/feat-isImageAnonymous_2025-01-06-06-22.json new file mode 100644 index 000000000..7f0298227 --- /dev/null +++ b/common/changes/@visactor/vrender-core/feat-isImageAnonymous_2025-01-06-06-22.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-core", + "comment": "feat: add isImageAnonymous in global", + "type": "none" + } + ], + "packageName": "@visactor/vrender-core" +} \ No newline at end of file diff --git a/packages/vrender-core/src/core/global.ts b/packages/vrender-core/src/core/global.ts index 4c1ec7f75..3d7d0fb91 100644 --- a/packages/vrender-core/src/core/global.ts +++ b/packages/vrender-core/src/core/global.ts @@ -24,11 +24,20 @@ export class DefaultGlobal implements IGlobal { private _env: EnvType; private _isSafari?: boolean; private _isChrome?: boolean; + private _isImageAnonymous?: boolean = true; get env(): EnvType { return this._env; } private envContribution: IEnvContribution; + get isImageAnonymous(): boolean { + return this._isImageAnonymous; + } + + set isImageAnonymous(isImageAnonymous: boolean) { + this._isImageAnonymous = isImageAnonymous; + } + get devicePixelRatio(): number { if (!this._env) { this.setEnv(defaultEnv); diff --git a/packages/vrender-core/src/interface/global.ts b/packages/vrender-core/src/interface/global.ts index efca682f0..001c96bc5 100644 --- a/packages/vrender-core/src/interface/global.ts +++ b/packages/vrender-core/src/interface/global.ts @@ -283,4 +283,6 @@ export interface IGlobal extends Omit number; getElementLeft: (dom: any, baseWindow?: boolean) => number; getElementTopLeft: (dom: any, baseWindow?: boolean) => { top: number; left: number }; + + isImageAnonymous: boolean; } diff --git a/packages/vrender-kits/src/env/contributions/browser-contribution.ts b/packages/vrender-kits/src/env/contributions/browser-contribution.ts index 82fd1f493..9f55d589c 100644 --- a/packages/vrender-kits/src/env/contributions/browser-contribution.ts +++ b/packages/vrender-kits/src/env/contributions/browser-contribution.ts @@ -1,4 +1,4 @@ -import { injectable, Generator, BaseEnvContribution } from '@visactor/vrender-core'; +import { injectable, Generator, BaseEnvContribution, application } from '@visactor/vrender-core'; import type { ICanvasLike, EnvType, @@ -38,7 +38,9 @@ class DynamicB { export function createImageElement(src: string, isSvg: boolean = false): Promise { const img = document.createElement('img'); - img.crossOrigin = 'anonymous'; + if (application.global.isImageAnonymous) { + img.crossOrigin = 'anonymous'; + } if (isSvg) { const data = new Blob([src], { type: 'image/svg+xml' }); src = window.URL.createObjectURL(data); From 9aed1efd55de5b4b5a8c56362d72e06f11a413f3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 6 Jan 2025 11:15:36 +0000 Subject: [PATCH 9/9] build: prelease version 0.21.8 --- .../fix-3d-arc-label_2024-12-25-09-02.json | 10 ------- .../fix-title-layout_2024-12-27-02-43.json | 11 -------- ...eat-isImageAnonymous_2025-01-06-06-22.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 | 12 ++++++++- packages/vrender-components/package.json | 6 ++--- packages/vrender-core/CHANGELOG.json | 12 +++++++++ packages/vrender-core/CHANGELOG.md | 9 ++++++- packages/vrender-core/package.json | 2 +- packages/vrender-kits/CHANGELOG.json | 6 +++++ packages/vrender-kits/CHANGELOG.md | 7 ++++- 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 +++--- 25 files changed, 127 insertions(+), 70 deletions(-) delete mode 100644 common/changes/@visactor/vrender-components/fix-3d-arc-label_2024-12-25-09-02.json delete mode 100644 common/changes/@visactor/vrender-components/fix-title-layout_2024-12-27-02-43.json delete mode 100644 common/changes/@visactor/vrender-core/feat-isImageAnonymous_2025-01-06-06-22.json diff --git a/common/changes/@visactor/vrender-components/fix-3d-arc-label_2024-12-25-09-02.json b/common/changes/@visactor/vrender-components/fix-3d-arc-label_2024-12-25-09-02.json deleted file mode 100644 index c198bcc2a..000000000 --- a/common/changes/@visactor/vrender-components/fix-3d-arc-label_2024-12-25-09-02.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-components", - "comment": "fix: handle the additional logic of 3d arc label layout", - "type": "none" - } - ], - "packageName": "@visactor/vrender-components" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-components/fix-title-layout_2024-12-27-02-43.json b/common/changes/@visactor/vrender-components/fix-title-layout_2024-12-27-02-43.json deleted file mode 100644 index 853a65d89..000000000 --- a/common/changes/@visactor/vrender-components/fix-title-layout_2024-12-27-02-43.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "fix: fix layout of title component\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-isImageAnonymous_2025-01-06-06-22.json b/common/changes/@visactor/vrender-core/feat-isImageAnonymous_2025-01-06-06-22.json deleted file mode 100644 index 7f0298227..000000000 --- a/common/changes/@visactor/vrender-core/feat-isImageAnonymous_2025-01-06-06-22.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-core", - "comment": "feat: add isImageAnonymous in global", - "type": "none" - } - ], - "packageName": "@visactor/vrender-core" -} \ No newline at end of file diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index f83c7f160..aa3412bf6 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.7 + '@visactor/vrender': workspace:0.21.8 '@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.7 + '@visactor/vrender': workspace:0.21.8 '@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.7 - '@visactor/vrender': workspace:0.21.7 + '@visactor/react-vrender': workspace:0.21.8 + '@visactor/vrender': workspace:0.21.8 '@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.7 - '@visactor/vrender-kits': workspace:0.21.7 + '@visactor/vrender-core': workspace:0.21.8 + '@visactor/vrender-kits': workspace:0.21.8 '@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.7 - '@visactor/vrender-kits': workspace:0.21.7 + '@visactor/vrender-core': workspace:0.21.8 + '@visactor/vrender-kits': workspace:0.21.8 '@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.7 + '@visactor/vrender-core': workspace:0.21.8 '@visactor/vutils': ~0.19.3 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 @@ -369,10 +369,10 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/node': '*' '@types/node-fetch': 2.6.4 - '@visactor/vrender': workspace:0.21.7 - '@visactor/vrender-components': workspace:0.21.7 - '@visactor/vrender-core': workspace:0.21.7 - '@visactor/vrender-kits': workspace:0.21.7 + '@visactor/vrender': workspace:0.21.8 + '@visactor/vrender-components': workspace:0.21.8 + '@visactor/vrender-core': workspace:0.21.8 + '@visactor/vrender-kits': workspace:0.21.8 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 8134a70d5..6632da0a9 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.21.7","nextBump":"patch"}] +[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.21.8","nextBump":"patch"}] diff --git a/docs/package.json b/docs/package.json index 3c0ef46a3..7ea72f2f2 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.7", + "@visactor/vrender": "workspace:0.21.8", "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 dc40d6050..54631d1f6 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.8", + "tag": "@visactor/react-vrender-utils_v0.21.8", + "date": "Mon, 06 Jan 2025 11:07:36 GMT", + "comments": {} + }, { "version": "0.21.7", "tag": "@visactor/react-vrender-utils_v0.21.7", diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md index 6a218ef71..260e2690d 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, 25 Dec 2024 07:53:11 GMT and should not be manually modified. +This log was last generated on Mon, 06 Jan 2025 11:07:36 GMT and should not be manually modified. + +## 0.21.8 +Mon, 06 Jan 2025 11:07:36 GMT + +_Version update only_ ## 0.21.7 Wed, 25 Dec 2024 07:53:11 GMT diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json index 098d72eb0..0b3682226 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.7", + "version": "0.21.8", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "react-dom": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:0.21.7", - "@visactor/react-vrender": "workspace:0.21.7", + "@visactor/vrender": "workspace:0.21.8", + "@visactor/react-vrender": "workspace:0.21.8", "@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 50b557578..c4c829daf 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.8", + "tag": "@visactor/react-vrender_v0.21.8", + "date": "Mon, 06 Jan 2025 11:07:36 GMT", + "comments": {} + }, { "version": "0.21.7", "tag": "@visactor/react-vrender_v0.21.7", diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md index 526b40251..e3543eaa5 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, 25 Dec 2024 07:53:11 GMT and should not be manually modified. +This log was last generated on Mon, 06 Jan 2025 11:07:36 GMT and should not be manually modified. + +## 0.21.8 +Mon, 06 Jan 2025 11:07:36 GMT + +_Version update only_ ## 0.21.7 Wed, 25 Dec 2024 07:53:11 GMT diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json index 32ef0e261..e45d5de74 100644 --- a/packages/react-vrender/package.json +++ b/packages/react-vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender", - "version": "0.21.7", + "version": "0.21.8", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -23,7 +23,7 @@ "react": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:0.21.7", + "@visactor/vrender": "workspace:0.21.8", "@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 e67d654fe..9364e6029 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.8", + "tag": "@visactor/vrender-components_v0.21.8", + "date": "Mon, 06 Jan 2025 11:07:36 GMT", + "comments": { + "none": [ + { + "comment": "fix: handle the additional logic of 3d arc label layout" + }, + { + "comment": "fix: fix layout of title component\n\n" + } + ] + } + }, { "version": "0.21.7", "tag": "@visactor/vrender-components_v0.21.7", diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md index b80e036cb..cffd968aa 100644 --- a/packages/vrender-components/CHANGELOG.md +++ b/packages/vrender-components/CHANGELOG.md @@ -1,6 +1,16 @@ # Change Log - @visactor/vrender-components -This log was last generated on Wed, 25 Dec 2024 07:53:11 GMT and should not be manually modified. +This log was last generated on Mon, 06 Jan 2025 11:07:36 GMT and should not be manually modified. + +## 0.21.8 +Mon, 06 Jan 2025 11:07:36 GMT + +### Updates + +- fix: handle the additional logic of 3d arc label layout +- fix: fix layout of title component + + ## 0.21.7 Wed, 25 Dec 2024 07:53:11 GMT diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json index 0e0f05e6a..499396d6a 100644 --- a/packages/vrender-components/package.json +++ b/packages/vrender-components/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-components", - "version": "0.21.7", + "version": "0.21.8", "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.7", - "@visactor/vrender-kits": "workspace:0.21.7" + "@visactor/vrender-core": "workspace:0.21.8", + "@visactor/vrender-kits": "workspace:0.21.8" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json index df3cf244e..4b4ed0940 100644 --- a/packages/vrender-core/CHANGELOG.json +++ b/packages/vrender-core/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@visactor/vrender-core", "entries": [ + { + "version": "0.21.8", + "tag": "@visactor/vrender-core_v0.21.8", + "date": "Mon, 06 Jan 2025 11:07:36 GMT", + "comments": { + "none": [ + { + "comment": "feat: add isImageAnonymous in global" + } + ] + } + }, { "version": "0.21.7", "tag": "@visactor/vrender-core_v0.21.7", diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md index 2cc185b28..14d8f20a0 100644 --- a/packages/vrender-core/CHANGELOG.md +++ b/packages/vrender-core/CHANGELOG.md @@ -1,6 +1,13 @@ # Change Log - @visactor/vrender-core -This log was last generated on Wed, 25 Dec 2024 07:53:11 GMT and should not be manually modified. +This log was last generated on Mon, 06 Jan 2025 11:07:36 GMT and should not be manually modified. + +## 0.21.8 +Mon, 06 Jan 2025 11:07:36 GMT + +### Updates + +- feat: add isImageAnonymous in global ## 0.21.7 Wed, 25 Dec 2024 07:53:11 GMT diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json index 6d80b2246..0c5e24ea7 100644 --- a/packages/vrender-core/package.json +++ b/packages/vrender-core/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-core", - "version": "0.21.7", + "version": "0.21.8", "description": "", "sideEffects": [ "./src/modules.ts", diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json index 34576c877..52031d5d6 100644 --- a/packages/vrender-kits/CHANGELOG.json +++ b/packages/vrender-kits/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-kits", "entries": [ + { + "version": "0.21.8", + "tag": "@visactor/vrender-kits_v0.21.8", + "date": "Mon, 06 Jan 2025 11:07:36 GMT", + "comments": {} + }, { "version": "0.21.7", "tag": "@visactor/vrender-kits_v0.21.7", diff --git a/packages/vrender-kits/CHANGELOG.md b/packages/vrender-kits/CHANGELOG.md index 26d9233df..5b8740064 100644 --- a/packages/vrender-kits/CHANGELOG.md +++ b/packages/vrender-kits/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender-kits -This log was last generated on Wed, 25 Dec 2024 07:53:11 GMT and should not be manually modified. +This log was last generated on Mon, 06 Jan 2025 11:07:36 GMT and should not be manually modified. + +## 0.21.8 +Mon, 06 Jan 2025 11:07:36 GMT + +_Version update only_ ## 0.21.7 Wed, 25 Dec 2024 07:53:11 GMT diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index a378737bc..c83a97f37 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-kits", - "version": "0.21.7", + "version": "0.21.8", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "~0.19.3", - "@visactor/vrender-core": "workspace:0.21.7", + "@visactor/vrender-core": "workspace:0.21.8", "@resvg/resvg-js": "2.4.1", "roughjs": "4.5.2" }, diff --git a/packages/vrender/CHANGELOG.json b/packages/vrender/CHANGELOG.json index f29a28848..6ec53716f 100644 --- a/packages/vrender/CHANGELOG.json +++ b/packages/vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender", "entries": [ + { + "version": "0.21.8", + "tag": "@visactor/vrender_v0.21.8", + "date": "Mon, 06 Jan 2025 11:07:36 GMT", + "comments": {} + }, { "version": "0.21.7", "tag": "@visactor/vrender_v0.21.7", diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md index d92e18c88..ead7c60c1 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 Wed, 25 Dec 2024 07:53:11 GMT and should not be manually modified. +This log was last generated on Mon, 06 Jan 2025 11:07:36 GMT and should not be manually modified. + +## 0.21.8 +Mon, 06 Jan 2025 11:07:36 GMT + +_Version update only_ ## 0.21.7 Wed, 25 Dec 2024 07:53:11 GMT diff --git a/packages/vrender/package.json b/packages/vrender/package.json index 10c0ef859..eecfab3db 100644 --- a/packages/vrender/package.json +++ b/packages/vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender", - "version": "0.21.7", + "version": "0.21.8", "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.7", - "@visactor/vrender-kits": "workspace:0.21.7" + "@visactor/vrender-core": "workspace:0.21.8", + "@visactor/vrender-kits": "workspace:0.21.8" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/tools/bugserver-trigger/package.json b/tools/bugserver-trigger/package.json index 9da2af299..831781f91 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.7", - "@visactor/vrender-core": "workspace:0.21.7", - "@visactor/vrender-kits": "workspace:0.21.7", - "@visactor/vrender-components": "workspace:0.21.7" + "@visactor/vrender": "workspace:0.21.8", + "@visactor/vrender-core": "workspace:0.21.8", + "@visactor/vrender-kits": "workspace:0.21.8", + "@visactor/vrender-components": "workspace:0.21.8" }, "devDependencies": { "@rushstack/eslint-patch": "~1.1.4",