From 18fd2de319cd805fb79afb26e276ecde42d06bfb Mon Sep 17 00:00:00 2001 From: skie1997 Date: Fri, 6 Jun 2025 12:00:44 +0800 Subject: [PATCH 1/3] fix: mark interactive problem when brush. fix visactor/vchart#4017 --- ...and-datazoom-problem_2025-06-06-04-00.json | 10 +++++++ packages/vchart/src/component/brush/brush.ts | 26 ++++++++++++------- 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 common/changes/@visactor/vchart/fix-brush-and-datazoom-problem_2025-06-06-04-00.json diff --git a/common/changes/@visactor/vchart/fix-brush-and-datazoom-problem_2025-06-06-04-00.json b/common/changes/@visactor/vchart/fix-brush-and-datazoom-problem_2025-06-06-04-00.json new file mode 100644 index 0000000000..896985f720 --- /dev/null +++ b/common/changes/@visactor/vchart/fix-brush-and-datazoom-problem_2025-06-06-04-00.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vchart", + "comment": "fix: mark interactive problem when brush. fix visactor/vchart#4017", + "type": "none" + } + ], + "packageName": "@visactor/vchart" +} \ No newline at end of file diff --git a/packages/vchart/src/component/brush/brush.ts b/packages/vchart/src/component/brush/brush.ts index 73cf13d6a6..be0d7c060d 100644 --- a/packages/vchart/src/component/brush/brush.ts +++ b/packages/vchart/src/component/brush/brush.ts @@ -7,7 +7,7 @@ import { ComponentTypeEnum } from '../interface/type'; import { Brush as BrushComponent, IOperateType as BrushEvent } from '@visactor/vrender-components'; import type { IBounds, IPointLike, Maybe } from '@visactor/vutils'; // eslint-disable-next-line no-duplicate-imports -import { array, polygonIntersectPolygon, isValid, last, cloneDeep } from '@visactor/vutils'; +import { array, polygonIntersectPolygon, isValid, last } from '@visactor/vutils'; import type { IModelRenderOption, IModelSpecInfo } from '../../model/interface'; import type { IRegion } from '../../region/interface'; import type { IGraphic, IGroup, INode, IPolygon } from '@visactor/vrender-core'; @@ -55,8 +55,6 @@ export class Brush extends BaseComponent i private _cacheInteractiveRangeAttrs: BrushInteractiveRangeAttr[] = []; - private _needDisablePickable: boolean = false; - private _releatedAxes: AxisComponent[] = []; // 根据region找axis @@ -273,39 +271,41 @@ export class Brush extends BaseComponent i }); brush.addEventListener(BrushEvent.drawStart, (e: any) => { + this._setRegionMarkPickable(region, true); this._emitEvent(ChartEvent.brushStart, region); }); brush.addEventListener(BrushEvent.moveStart, (e: any) => { + this._setRegionMarkPickable(region, true); this._emitEvent(ChartEvent.brushStart, region); }); brush.addEventListener(BrushEvent.drawing, (e: any) => { - this._needDisablePickable = true; + this._setRegionMarkPickable(region, false); this._handleBrushChange(region, e); this._emitEvent(ChartEvent.brushChange, region); }); brush.addEventListener(BrushEvent.moving, (e: any) => { + this._setRegionMarkPickable(region, false); this._handleBrushChange(region, e); this._emitEvent(ChartEvent.brushChange, region); }); brush.addEventListener(BrushEvent.brushClear, (e: any) => { + this._setRegionMarkPickable(region, true); this._initMarkBrushState(componentIndex, ''); - this._needDisablePickable = false; this._emitEvent(ChartEvent.brushClear, region); }); brush.addEventListener(BrushEvent.drawEnd, (e: any) => { - this._needDisablePickable = false; + this._setRegionMarkPickable(region, true); const { operateMask } = e.detail as any; if (this._spec?.onBrushEnd) { // 如果onBrushEnd返回true，则清空brush， 并抛出clear事件 if (this._spec.onBrushEnd(e) === true) { this.clearGraphic(); this._initMarkBrushState(componentIndex, ''); - this._needDisablePickable = false; this._emitEvent(ChartEvent.brushClear, region); } else { this._spec.onBrushEnd(e); @@ -321,6 +321,7 @@ export class Brush extends BaseComponent i }); brush.addEventListener(BrushEvent.moveEnd, (e: any) => { + this._setRegionMarkPickable(region, true); const { operateMask } = e.detail as any; const inBrushData = this._extendDataInBrush(this._inBrushElementsMap); if (!this._spec.zoomWhenEmpty && inBrushData.length > 0) { @@ -486,7 +487,6 @@ export class Brush extends BaseComponent i this._outOfBrushElementsMap[elementKey] = el; delete this._inBrushElementsMap[operateMask.name][elementKey]; } - graphicItem.setAttribute('pickable', !this._needDisablePickable); }); }); } @@ -567,7 +567,6 @@ export class Brush extends BaseComponent i el.addState(OUT_BRUSH_STATE); this._linkedOutOfBrushElementsMap[elementKey] = el; } - graphicItem.setAttribute('pickable', !this._needDisablePickable); }); }); } @@ -654,6 +653,14 @@ export class Brush extends BaseComponent i }); }); } + + // 绘制brush的时候, 避免brush与图元交互冲突 + private _setRegionMarkPickable(region: IRegion, pickable: boolean) { + region + .getGroupMark() + .getProduct() + .elements.forEach(el => el.getGraphicItem().setAttribute('childrenPickable', pickable)); + } /** end: set mark state ***/ /** start: control data zoom ***/ @@ -754,7 +761,6 @@ export class Brush extends BaseComponent i this._brushComponents.forEach((brush, index) => { // 清空元素状态 this._initMarkBrushState(index, ''); - this._needDisablePickable = false; brush.removeAllChild(); brush.releaseBrushEvents(); From 2dbaf4cd2118385076d4965d1c99a8487444425c Mon Sep 17 00:00:00 2001 From: skie1997 Date: Fri, 6 Jun 2025 15:34:28 +0800 Subject: [PATCH 2/3] fix: markLine position error when domain is a same array. fix#4016 --- ...and-datazoom-problem_2025-06-06-07-33.json | 10 +++++++ packages/vchart/src/component/marker/utils.ts | 30 ++++++++++++++----- 2 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 common/changes/@visactor/vchart/fix-brush-and-datazoom-problem_2025-06-06-07-33.json diff --git a/common/changes/@visactor/vchart/fix-brush-and-datazoom-problem_2025-06-06-07-33.json b/common/changes/@visactor/vchart/fix-brush-and-datazoom-problem_2025-06-06-07-33.json new file mode 100644 index 0000000000..8697f4516b --- /dev/null +++ b/common/changes/@visactor/vchart/fix-brush-and-datazoom-problem_2025-06-06-07-33.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vchart", + "comment": "fix: markLine position error when domain is a same array. fix#4016", + "type": "none" + } + ], + "packageName": "@visactor/vchart" +} \ No newline at end of file diff --git a/packages/vchart/src/component/marker/utils.ts b/packages/vchart/src/component/marker/utils.ts index cce8c92f52..a0abc90935 100644 --- a/packages/vchart/src/component/marker/utils.ts +++ b/packages/vchart/src/component/marker/utils.ts @@ -27,6 +27,8 @@ import { AGGR_TYPE } from '../../constant/marker'; import type { IRegion } from '../../region/interface'; // eslint-disable-next-line no-duplicate-imports import type { OffsetPoint } from './interface'; +import type { IAxisHelper, IPolarAxisHelper } from '../axis'; +import { isContinuous } from '@visactor/vscale'; function isNeedExtendDomain(domain: number[], datum: number, autoRange: boolean) { if (!autoRange) { @@ -57,7 +59,9 @@ function getXValue( if (isPercent(datum.x)) { x = convertPercentToValue(datum.x, regionWidth) + regionStartLayoutStartPoint.x; } else { - x = (relativeSeries as ICartesianSeries).getXAxisHelper().dataToPosition([datum.x]) + regionStartLayoutStartPoint.x; + x = + convertDatumToValue((relativeSeries as ICartesianSeries).getXAxisHelper(), [datum.x]) + + regionStartLayoutStartPoint.x; } return x; @@ -80,7 +84,9 @@ function getYValue( if (isPercent(datum.y)) { y = convertPercentToValue(datum.y, regionHeight) + regionStartLayoutStartPoint.y; } else { - y = (relativeSeries as ICartesianSeries).getYAxisHelper().dataToPosition([datum.y]) + regionStartLayoutStartPoint.y; + y = + convertDatumToValue((relativeSeries as ICartesianSeries).getYAxisHelper(), [datum.y]) + + regionStartLayoutStartPoint.y; } return y; @@ -97,7 +103,7 @@ function getAngleValue( isNeedExtendDomain(angleDomain, datum.angle, autoRange) && (relativeSeries as IPolarSeries).angleAxisHelper?.setExtendDomain?.('marker_angleAxis_extend', datum.angle); - return (relativeSeries as IPolarSeries).angleAxisHelper.dataToPosition([datum.angle]); + return convertDatumToValue((relativeSeries as IPolarSeries).angleAxisHelper, [datum.angle]); } function getRadiusValue( @@ -111,13 +117,21 @@ function getRadiusValue( isNeedExtendDomain(radiusDomain, datum.radius, autoRange) && (relativeSeries as IPolarSeries).radiusAxisHelper?.setExtendDomain?.('marker_radiusAxis_extend', datum.radius); - return (relativeSeries as IPolarSeries).radiusAxisHelper.dataToPosition([datum.radius]); + return convertDatumToValue((relativeSeries as IPolarSeries).radiusAxisHelper, [datum.radius]); } function convertPercentToValue(percent: string, relativeLength: number) { return (Number(percent.substring(0, percent.length - 1)) * relativeLength) / 100; } +function convertDatumToValue(axisHelper: IAxisHelper | IPolarAxisHelper, datum: (number | string)[]) { + const scale = axisHelper.getScale(0); + if (isContinuous(scale.type) && scale.domain()[0] === scale.domain()[1] && datum[0] !== scale.domain()[0]) { + return NaN; + } + return axisHelper.dataToPosition(datum); +} + export function isAggrSpec(spec: IDataPos) { return AGGR_TYPE.includes(spec as any); } @@ -345,8 +359,8 @@ export function cartesianCoordinateLayout( isNeedExtendDomain(yDomain, yValue[0], autoRange) && refRelativeSeries.getYAxisHelper()?.setExtendDomain?.('marker_yAxis_extend', yValue[0] as number); points.push({ - x: refRelativeSeries.getXAxisHelper().dataToPosition(xValue) + regionStartLayoutStartPoint.x + offsetX, - y: refRelativeSeries.getYAxisHelper().dataToPosition(yValue) + regionStartLayoutStartPoint.y + offsetY + x: convertDatumToValue(refRelativeSeries.getXAxisHelper(), xValue) + regionStartLayoutStartPoint.x + offsetX, + y: convertDatumToValue(refRelativeSeries.getYAxisHelper(), yValue) + regionStartLayoutStartPoint.y + offsetY }); } ); @@ -382,8 +396,8 @@ export function polarCoordinateLayout(data: DataView, relativeSeries: IMarkerSup isNeedExtendDomain(radiusDomain, radiusValue[0], autoRange) && refRelativeSeries.radiusAxisHelper?.setExtendDomain?.('marker_yAxis_extend', radiusValue[0] as number); points.push({ - angle: refRelativeSeries.angleAxisHelper.dataToPosition(angleValue), - radius: refRelativeSeries.radiusAxisHelper.dataToPosition(radiusValue) + angle: convertDatumToValue(refRelativeSeries.angleAxisHelper, angleValue), + radius: convertDatumToValue(refRelativeSeries.radiusAxisHelper, radiusValue) }); } ); From ba61c9cd1db93288362d971bd52e782476ab32f7 Mon Sep 17 00:00:00 2001 From: skie1997 Date: Wed, 11 Jun 2025 19:02:59 +0800 Subject: [PATCH 3/3] chore: upgrade vrender & vgrammar version --- common/config/rush/pnpm-lock.yaml | 234 ++++++++++++------------- docs/package.json | 8 +- packages/openinula-vchart/package.json | 8 +- packages/react-vchart/package.json | 8 +- packages/vchart-extension/package.json | 10 +- packages/vchart/package.json | 24 +-- packages/vstory/package.json | 6 +- tools/story-player/package.json | 8 +- 8 files changed, 153 insertions(+), 153 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index e9bad90f14..0e29a54e4e 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -21,10 +21,10 @@ importers: '@visactor/vchart': workspace:1.13.10 '@visactor/vchart-extension': workspace:1.13.10 '@visactor/vchart-theme': ~1.6.6 - '@visactor/vgrammar': 0.16.7 + '@visactor/vgrammar': 0.16.9 '@visactor/vmind': 1.2.4-alpha.5 - '@visactor/vrender': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vrender': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vtable': 1.12.0 '@visactor/vtable-calendar': 1.12.0 '@visactor/vtable-editors': 1.12.0 @@ -59,10 +59,10 @@ importers: '@visactor/vchart': link:../packages/vchart '@visactor/vchart-extension': link:../packages/vchart-extension '@visactor/vchart-theme': 1.6.9 - '@visactor/vgrammar': 0.16.7 + '@visactor/vgrammar': 0.16.9 '@visactor/vmind': 1.2.4-alpha.5 - '@visactor/vrender': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vrender': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vtable': 1.12.0 '@visactor/vtable-calendar': 1.12.0 '@visactor/vtable-editors': 1.12.0 @@ -146,9 +146,9 @@ importers: '@types/offscreencanvas': 2019.6.4 '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:1.13.10 - '@visactor/vgrammar-core': 0.16.7 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vgrammar-core': 0.16.9 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vutils': ~0.19.5 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -167,9 +167,9 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../vchart - '@visactor/vgrammar-core': 0.16.7 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vgrammar-core': 0.16.9 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vutils': 0.19.5 react-is: 18.3.1 devDependencies: @@ -211,9 +211,9 @@ importers: '@types/react-dom': ^18.0.0 '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:1.13.10 - '@visactor/vgrammar-core': 0.16.7 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vgrammar-core': 0.16.9 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vutils': ~0.19.5 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -233,9 +233,9 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../vchart - '@visactor/vgrammar-core': 0.16.7 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vgrammar-core': 0.16.9 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vutils': 0.19.5 react-is: 18.3.1 devDependencies: @@ -372,17 +372,17 @@ importers: '@types/node': '*' '@types/offscreencanvas': 2019.6.4 '@visactor/vdataset': ~0.19.5 - '@visactor/vgrammar-core': 0.16.7 - '@visactor/vgrammar-hierarchy': 0.16.7 - '@visactor/vgrammar-projection': 0.16.7 - '@visactor/vgrammar-sankey': 0.16.7 - '@visactor/vgrammar-util': 0.16.7 - '@visactor/vgrammar-venn': 0.16.7 - '@visactor/vgrammar-wordcloud': 0.16.7 - '@visactor/vgrammar-wordcloud-shape': 0.16.7 - '@visactor/vrender-components': 0.22.10 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vgrammar-core': 0.16.9 + '@visactor/vgrammar-hierarchy': 0.16.9 + '@visactor/vgrammar-projection': 0.16.9 + '@visactor/vgrammar-sankey': 0.16.9 + '@visactor/vgrammar-util': 0.16.9 + '@visactor/vgrammar-venn': 0.16.9 + '@visactor/vgrammar-wordcloud': 0.16.9 + '@visactor/vgrammar-wordcloud-shape': 0.16.9 + '@visactor/vrender-components': 0.22.14 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vscale': ~0.19.5 '@visactor/vutils': ~0.19.5 '@visactor/vutils-extension': workspace:1.13.10 @@ -420,17 +420,17 @@ importers: vite: 3.2.6 dependencies: '@visactor/vdataset': 0.19.5 - '@visactor/vgrammar-core': 0.16.7 - '@visactor/vgrammar-hierarchy': 0.16.7 - '@visactor/vgrammar-projection': 0.16.7 - '@visactor/vgrammar-sankey': 0.16.7 - '@visactor/vgrammar-util': 0.16.7 - '@visactor/vgrammar-venn': 0.16.7 - '@visactor/vgrammar-wordcloud': 0.16.7 - '@visactor/vgrammar-wordcloud-shape': 0.16.7 - '@visactor/vrender-components': 0.22.10 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vgrammar-core': 0.16.9 + '@visactor/vgrammar-hierarchy': 0.16.9 + '@visactor/vgrammar-projection': 0.16.9 + '@visactor/vgrammar-sankey': 0.16.9 + '@visactor/vgrammar-util': 0.16.9 + '@visactor/vgrammar-venn': 0.16.9 + '@visactor/vgrammar-wordcloud': 0.16.9 + '@visactor/vgrammar-wordcloud-shape': 0.16.9 + '@visactor/vrender-components': 0.22.14 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vscale': 0.19.5 '@visactor/vutils': 0.19.5 '@visactor/vutils-extension': link:../vutils-extension @@ -491,10 +491,10 @@ importers: '@types/react-dom': ^18.0.0 '@visactor/vchart': workspace:1.13.10 '@visactor/vdataset': ~0.19.5 - '@visactor/vgrammar-core': 0.16.7 - '@visactor/vrender-components': 0.22.10 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vgrammar-core': 0.16.9 + '@visactor/vrender-components': 0.22.14 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vutils': ~0.19.5 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 @@ -515,10 +515,10 @@ importers: dependencies: '@visactor/vchart': link:../vchart '@visactor/vdataset': 0.19.5 - '@visactor/vgrammar-core': 0.16.7 - '@visactor/vrender-components': 0.22.10 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vgrammar-core': 0.16.9 + '@visactor/vrender-components': 0.22.14 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vutils': 0.19.5 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -890,9 +890,9 @@ importers: '@typescript-eslint/eslint-plugin': 5.30.0 '@typescript-eslint/parser': 5.30.0 '@visactor/vchart': workspace:1.13.10 - '@visactor/vrender': 0.22.10 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vrender': 0.22.14 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vutils': ~0.19.5 cross-env: ^7.0.3 eslint: ~8.18.0 @@ -905,9 +905,9 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../../packages/vchart - '@visactor/vrender': 0.22.10 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vrender': 0.22.14 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vutils': 0.19.5 devDependencies: '@internal/bundler': link:../bundler @@ -4861,97 +4861,97 @@ packages: topojson-client: 3.1.0 dev: false - /@visactor/vgrammar-coordinate/0.16.7: - resolution: {integrity: sha512-iVLTgoMeB4a6AyOlzi3Zz/33wzJnVvZeQDxbKm74iQEAqwrdiQjTVCazFlZhFgx/kNCWh4gFVmIcsz4A0K7yyA==} + /@visactor/vgrammar-coordinate/0.16.9: + resolution: {integrity: sha512-lvA8B7jN6Z13BHv3kJZ+/b9pd8s+EZ7J0unUaDN8uLBNGAha4HQ+M1fxJdVFBDyLXZ8sJuwGJNo7O0+pVZVCOg==} dependencies: - '@visactor/vgrammar-util': 0.16.7 + '@visactor/vgrammar-util': 0.16.9 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-core/0.16.7: - resolution: {integrity: sha512-bBcys8VVI6AtFmkan0Uy/77iUmkE652a6kmAMxI6eUU86qSEHIMgHuB0Q6JwXuBPhFQ2YaZ0cEKMeVzwG2rMSw==} + /@visactor/vgrammar-core/0.16.9: + resolution: {integrity: sha512-qZZ2S/z39y0nV2GxSVbegcSdBzPXmUReVbk6WF/XTddTxEe7WzwW18+pBiwXN6oUzzerRffMI6/ae9IWe1+qfA==} dependencies: '@visactor/vdataset': 0.19.5 - '@visactor/vgrammar-coordinate': 0.16.7 - '@visactor/vgrammar-util': 0.16.7 - '@visactor/vrender-components': 0.22.10 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vgrammar-coordinate': 0.16.9 + '@visactor/vgrammar-util': 0.16.9 + '@visactor/vrender-components': 0.22.14 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vscale': 0.19.5 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-hierarchy/0.16.7: - resolution: {integrity: sha512-YaMR/0gvgS463pv3WUbp2t/AAahnGwVdiZRwoaaPRYwgW3sLj5bM8F6kI5UAT1g4las+WTb/OqC/J7p7xl1yMg==} + /@visactor/vgrammar-hierarchy/0.16.9: + resolution: {integrity: sha512-TfieKAxywiUxrpgiNqU1Ws5nDpma+dEwXwIDLONE1P8X39kzE2gNWYSvealuvMZT4jGiRLjRv9Okq32kaZYY+g==} dependencies: - '@visactor/vgrammar-core': 0.16.7 - '@visactor/vgrammar-util': 0.16.7 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vgrammar-core': 0.16.9 + '@visactor/vgrammar-util': 0.16.9 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-projection/0.16.7: - resolution: {integrity: sha512-ql1q0fbvwsBAHdqKq0lNc0eqWPTXclVWUVmaiWXDTHGdIaQadIVxbSN4c1ZF+PjQZqlHANvMedE+H3NkH86sUQ==} + /@visactor/vgrammar-projection/0.16.9: + resolution: {integrity: sha512-2NMtevzTICuvsMJI2phxqzg1LJz5tI7eUljbI6m2Da/JW4SZE7qRpyknhmnO6XIXD/24Lv3FxH1BY03pVhkl4A==} dependencies: - '@visactor/vgrammar-core': 0.16.7 - '@visactor/vgrammar-util': 0.16.7 + '@visactor/vgrammar-core': 0.16.9 + '@visactor/vgrammar-util': 0.16.9 '@visactor/vutils': 0.19.5 d3-geo: 1.12.1 dev: false - /@visactor/vgrammar-sankey/0.16.7: - resolution: {integrity: sha512-1e+6T1CYdr5325iHx0nYdbziJCTSzFZD+YPNci/aqDeVYioCKLFM3aHsXvZDVYkSf1LWAadZKmTIyMeY8/iLbw==} + /@visactor/vgrammar-sankey/0.16.9: + resolution: {integrity: sha512-bD/LgF6Tk3J9Ql0SyK/9nhPZE+aEoqRJEtAk9keQ/pLUPjJumJGdx3lD2mVtx7suRTnewS0WcrP03kzVIm/n7A==} dependencies: - '@visactor/vgrammar-core': 0.16.7 - '@visactor/vgrammar-util': 0.16.7 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vgrammar-core': 0.16.9 + '@visactor/vgrammar-util': 0.16.9 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-util/0.16.7: - resolution: {integrity: sha512-TSUMaWDF+icwmeLFKJc3JJNVi+VrCtNgh9mHzetZx7xdIU1N4ezYZ6dT+PRNIXVETXlhB/WhJwEv9CWiUh23Mw==} + /@visactor/vgrammar-util/0.16.9: + resolution: {integrity: sha512-huSfPLjzquxLjMP6bS7kKljQvn2sJrYyTorBTBb7AJf6Dsav4CbnjqJUB6FzNLgMn6Bts1Yri+4FFydqO1yLwg==} dependencies: - '@visactor/vrender-core': 0.22.10 + '@visactor/vrender-core': 0.22.14 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-venn/0.16.7: - resolution: {integrity: sha512-d8ezA0f92wUmm/BgG9hUpDX1mpiW6Vb3RSJPyJIs62Qg243OUU4mfhKnmYeggFG1q/B2RCD+H+Slkk2nPlWH3Q==} + /@visactor/vgrammar-venn/0.16.9: + resolution: {integrity: sha512-vhO4DOzXKr6wD79ABAlTRf++qfenKWC35RwnSrdlBmfIGutJOVkQBd/6ZXKwJByf+Lygmvq+mRBC1EsYO8Sk3Q==} dependencies: - '@visactor/vgrammar-core': 0.16.7 - '@visactor/vgrammar-util': 0.16.7 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vgrammar-core': 0.16.9 + '@visactor/vgrammar-util': 0.16.9 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-wordcloud-shape/0.16.7: - resolution: {integrity: sha512-vaAlS8GoZ57Ny2FRc3vSSUeC99t33tDDji99OLb8dmKYcVv4HPzsd3UOo+rSp+fkARiutrnJ75gTC/U55zlv2A==} + /@visactor/vgrammar-wordcloud-shape/0.16.9: + resolution: {integrity: sha512-oPysZjt+X0dR/mI0ipOtg+QikEBgd/xv5llriXe5Gi/LasKNoeRUi2ZwU3HFfF7ru9vDcA58Z1gIanmmAAbg0A==} dependencies: - '@visactor/vgrammar-core': 0.16.7 - '@visactor/vgrammar-util': 0.16.7 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vgrammar-core': 0.16.9 + '@visactor/vgrammar-util': 0.16.9 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vscale': 0.19.5 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-wordcloud/0.16.7: - resolution: {integrity: sha512-fWaxIHxs0w/xeskZNRQnK4pNIsoCOEADHI1rS/WeQboHh+3NeAAtGaxvVd1d1VFbVA5TFk4iWe9w+JLv34GxSQ==} + /@visactor/vgrammar-wordcloud/0.16.9: + resolution: {integrity: sha512-vMx+IoihY0Gyojcszl6s/jFXJDZ1Spvvv1RJ9IQkAjZoH8koZIojS9FFqlBY8gCdXUnz0cfe+fzgHq7kaYwpvQ==} dependencies: - '@visactor/vgrammar-core': 0.16.7 - '@visactor/vgrammar-util': 0.16.7 - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vgrammar-core': 0.16.9 + '@visactor/vgrammar-util': 0.16.9 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar/0.16.7: - resolution: {integrity: sha512-VimGF2npJeqVm0Hk900h7JwAmErM7irAeuCgejXGMYGvx6Jh0ddNsV8Cc00Rrs5zHbqF64B9SJEhUZfDdb09IA==} + /@visactor/vgrammar/0.16.9: + resolution: {integrity: sha512-P/K2p86G9muktZXhDD3h86fBxnzJEbwEB9B+GvMAOCrTdHnVdtvPoMI/6k11SYU14i1aPbBb9RcLBiPrqNRTiA==} dependencies: - '@visactor/vgrammar-core': 0.16.7 + '@visactor/vgrammar-core': 0.16.9 dev: false /@visactor/vmind/1.2.4-alpha.5: @@ -4982,11 +4982,11 @@ packages: gifuct-js: 2.1.2 dev: false - /@visactor/vrender-components/0.22.10: - resolution: {integrity: sha512-rfsci9y9AkEp/TCqCs0wpYdmPYqRnViEZ3EF9yiKhuFMExzdO8opga7JPfHJSbGCMoaqU5mWVCiEALsQkFuRQg==} + /@visactor/vrender-components/0.22.14: + resolution: {integrity: sha512-W6vDZlj3inyAUrKeXpwmhnfklR0r+ZWsKfdTVE3VjTEHMnPBWhtPVUOefMNc3SYNDxDSjjGNVmRbwFkRh5Wbcw==} dependencies: - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 '@visactor/vscale': 0.19.5 '@visactor/vutils': 0.19.5 dev: false @@ -4998,8 +4998,8 @@ packages: color-convert: 2.0.1 dev: false - /@visactor/vrender-core/0.22.10: - resolution: {integrity: sha512-I2+/odcPphPujZtA26S4RG8Yn9BNPt4jlcsbOPwDGP5MvN7oLkWTSMgu4C9r0/lWYvfkwi5JpaoU8lLBZT7e6w==} + /@visactor/vrender-core/0.22.14: + resolution: {integrity: sha512-16J6Wi2uLP3Csy1oBKeI+Dt1uB6pKM3YBRws6VKZYf2xyNsVvv7rY51H3X/WuxrqAu31JSVOU/oJFV1lF4UXPw==} dependencies: '@visactor/vutils': 0.19.5 color-convert: 2.0.1 @@ -5014,22 +5014,22 @@ packages: roughjs: 4.5.2 dev: false - /@visactor/vrender-kits/0.22.10: - resolution: {integrity: sha512-XjhThrOLvd1m7+o2jKNGKZSSAlHQG4cIm7H6BV2ew9/eQ532Fj8Vd7N17KU8bBnXzPulCmPpnEFj++E4Mnoqpg==} + /@visactor/vrender-kits/0.22.14: + resolution: {integrity: sha512-LGJEuW8J+MmEe2t6jsY48oxe4Uhh8mM3hlyyP6ORB5T7VVL/rCEjJa37wuUSWDjG5gulgIk+94Xd055Z36PpDg==} dependencies: '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 0.22.10 + '@visactor/vrender-core': 0.22.14 '@visactor/vutils': 0.19.5 gifuct-js: 2.1.2 lottie-web: 5.12.2 roughjs: 4.5.2 dev: false - /@visactor/vrender/0.22.10: - resolution: {integrity: sha512-YHk/MWJUnsrv2KKOSN1/METsOXC0ejrBS6tmgwTfJJy724gW472qv1vpU87zLHOI8lcNEzREOWddH8cQxlQmFg==} + /@visactor/vrender/0.22.14: + resolution: {integrity: sha512-VPYy9UM8e4xmRjtwj/i3jdbiYISqT8FobvbMxM7EbGF/M4BSvOA6xVwmS84ZbNLIWEOwck8yX5ob6WL7EndCZg==} dependencies: - '@visactor/vrender-core': 0.22.10 - '@visactor/vrender-kits': 0.22.10 + '@visactor/vrender-core': 0.22.14 + '@visactor/vrender-kits': 0.22.14 dev: false /@visactor/vscale/0.18.18: diff --git a/docs/package.json b/docs/package.json index 33893dd55b..34beacd47e 100644 --- a/docs/package.json +++ b/docs/package.json @@ -19,9 +19,9 @@ "@visactor/vchart-theme": "~1.6.6", "@visactor/vmind": "1.2.4-alpha.5", "@visactor/vutils": "~0.19.5", - "@visactor/vrender": "0.22.10", - "@visactor/vrender-kits": "0.22.10", - "@visactor/vgrammar": "0.16.7", + "@visactor/vrender": "0.22.14", + "@visactor/vrender-kits": "0.22.14", + "@visactor/vgrammar": "0.16.9", "@visactor/vtable": "1.12.0", "@visactor/vtable-editors": "1.12.0", "@visactor/vtable-gantt": "1.12.0", @@ -59,4 +59,4 @@ "react-device-detect": "^2.2.2", "minimist": "1.2.8" } -} +} \ No newline at end of file diff --git a/packages/openinula-vchart/package.json b/packages/openinula-vchart/package.json index fab82b9447..9ec9c54edb 100644 --- a/packages/openinula-vchart/package.json +++ b/packages/openinula-vchart/package.json @@ -30,9 +30,9 @@ "dependencies": { "@visactor/vchart": "workspace:1.13.10", "@visactor/vutils": "~0.19.5", - "@visactor/vrender-core": "0.22.10", - "@visactor/vrender-kits": "0.22.10", - "@visactor/vgrammar-core": "0.16.7", + "@visactor/vrender-core": "0.22.14", + "@visactor/vrender-kits": "0.22.14", + "@visactor/vgrammar-core": "0.16.9", "react-is": "^18.2.0" }, "devDependencies": { @@ -79,4 +79,4 @@ "access": "public", "registry": "https://registry.npmjs.org/" } -} +} \ No newline at end of file diff --git a/packages/react-vchart/package.json b/packages/react-vchart/package.json index cbfcf11436..dc2ee651f4 100644 --- a/packages/react-vchart/package.json +++ b/packages/react-vchart/package.json @@ -30,9 +30,9 @@ "dependencies": { "@visactor/vchart": "workspace:1.13.10", "@visactor/vutils": "~0.19.5", - "@visactor/vrender-core": "0.22.10", - "@visactor/vrender-kits": "0.22.10", - "@visactor/vgrammar-core": "0.16.7", + "@visactor/vrender-core": "0.22.14", + "@visactor/vrender-kits": "0.22.14", + "@visactor/vgrammar-core": "0.16.9", "react-is": "^18.2.0" }, "devDependencies": { @@ -83,4 +83,4 @@ "access": "public", "registry": "https://registry.npmjs.org/" } -} +} \ No newline at end of file diff --git a/packages/vchart-extension/package.json b/packages/vchart-extension/package.json index 4c7b6c0b8c..06a98c6b94 100644 --- a/packages/vchart-extension/package.json +++ b/packages/vchart-extension/package.json @@ -21,10 +21,10 @@ "start": "ts-node __tests__/runtime/browser/scripts/initVite.ts && vite serve __tests__/runtime/browser" }, "dependencies": { - "@visactor/vrender-core": "0.22.10", - "@visactor/vrender-kits": "0.22.10", - "@visactor/vrender-components": "0.22.10", - "@visactor/vgrammar-core": "0.16.7", + "@visactor/vrender-core": "0.22.14", + "@visactor/vrender-kits": "0.22.14", + "@visactor/vrender-components": "0.22.14", + "@visactor/vgrammar-core": "0.16.9", "@visactor/vutils": "~0.19.5", "@visactor/vdataset": "~0.19.5", "@visactor/vchart": "workspace:1.13.10" @@ -60,4 +60,4 @@ "registry": "https://registry.npmjs.org/" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/vchart/package.json b/packages/vchart/package.json index 0d64fda18e..c3c9e50a7e 100644 --- a/packages/vchart/package.json +++ b/packages/vchart/package.json @@ -121,21 +121,21 @@ "@visactor/vutils": "~0.19.5", "@visactor/vdataset": "~0.19.5", "@visactor/vscale": "~0.19.5", - "@visactor/vrender-core": "0.22.10", - "@visactor/vrender-kits": "0.22.10", - "@visactor/vrender-components": "0.22.10", - "@visactor/vgrammar-core": "0.16.7", - "@visactor/vgrammar-projection": "0.16.7", - "@visactor/vgrammar-wordcloud": "0.16.7", - "@visactor/vgrammar-wordcloud-shape": "0.16.7", - "@visactor/vgrammar-hierarchy": "0.16.7", - "@visactor/vgrammar-sankey": "0.16.7", - "@visactor/vgrammar-venn": "0.16.7", - "@visactor/vgrammar-util": "0.16.7", + "@visactor/vrender-core": "0.22.14", + "@visactor/vrender-kits": "0.22.14", + "@visactor/vrender-components": "0.22.14", + "@visactor/vgrammar-core": "0.16.9", + "@visactor/vgrammar-projection": "0.16.9", + "@visactor/vgrammar-wordcloud": "0.16.9", + "@visactor/vgrammar-wordcloud-shape": "0.16.9", + "@visactor/vgrammar-hierarchy": "0.16.9", + "@visactor/vgrammar-sankey": "0.16.9", + "@visactor/vgrammar-venn": "0.16.9", + "@visactor/vgrammar-util": "0.16.9", "@visactor/vutils-extension": "workspace:1.13.10" }, "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org/" } -} +} \ No newline at end of file diff --git a/packages/vstory/package.json b/packages/vstory/package.json index cb4d7a2dcf..bfa59dbc5c 100644 --- a/packages/vstory/package.json +++ b/packages/vstory/package.json @@ -21,9 +21,9 @@ }, "dependencies": { "@visactor/vchart": "workspace:1.11.0", - "@visactor/vrender-core": "0.22.10", - "@visactor/vrender-kits": "0.22.10", - "@visactor/vrender-components": "0.22.10", + "@visactor/vrender-core": "0.22.14", + "@visactor/vrender-kits": "0.22.14", + "@visactor/vrender-components": "0.22.14", "@visactor/vutils": "~0.19.5" }, "devDependencies": { diff --git a/tools/story-player/package.json b/tools/story-player/package.json index 15bed72c49..65468a3c0b 100644 --- a/tools/story-player/package.json +++ b/tools/story-player/package.json @@ -56,10 +56,10 @@ "vite": "3.2.6" }, "dependencies": { - "@visactor/vrender-core": "0.22.10", - "@visactor/vrender-kits": "0.22.10", + "@visactor/vrender-core": "0.22.14", + "@visactor/vrender-kits": "0.22.14", "@visactor/vchart": "workspace:1.13.10", - "@visactor/vrender": "0.22.10", + "@visactor/vrender": "0.22.14", "@visactor/vutils": "~0.19.5" } -} +} \ No newline at end of file