From 0e1890ac4c393547a0e885ab407455ebdb429e4e Mon Sep 17 00:00:00 2001 From: "lixuefei.1313" Date: Thu, 29 Jan 2026 20:56:46 +0800 Subject: [PATCH 1/2] fix: fix issue of wordCloud --- common/config/rush/pnpm-lock.yaml | 116 +++++++++--------- docs/package.json | 4 +- packages/openinula-vchart/package.json | 4 +- packages/react-vchart/package.json | 4 +- packages/vchart-extension/package.json | 8 +- packages/vchart/package.json | 8 +- packages/vchart/src/compile/compiler.ts | 5 +- packages/vchart/src/mark/base/base-mark.ts | 2 +- .../theme/builtin/common/series/word-cloud.ts | 4 +- tools/story-player/package.json | 6 +- 10 files changed, 82 insertions(+), 79 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index f125326109..28cd3f8ed8 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -37,11 +37,11 @@ importers: specifier: 1.2.4-alpha.5 version: 1.2.4-alpha.5 '@visactor/vrender': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vrender-kits': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vtable': specifier: 1.19.0-alpha.0 version: 1.19.0-alpha.0 @@ -203,11 +203,11 @@ importers: specifier: workspace:2.0.14 version: link:../vchart '@visactor/vrender-core': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vrender-kits': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vutils': specifier: ~1.0.12 version: 1.0.21 @@ -294,11 +294,11 @@ importers: specifier: workspace:2.0.14 version: link:../vchart-extension '@visactor/vrender-core': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vrender-kits': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vutils': specifier: ~1.0.12 version: 1.0.21 @@ -529,17 +529,17 @@ importers: specifier: ~1.0.12 version: 1.0.21 '@visactor/vrender-animate': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vrender-components': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vrender-core': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vrender-kits': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vscale': specifier: ~1.0.12 version: 1.0.21 @@ -692,17 +692,17 @@ importers: specifier: ~1.0.12 version: 1.0.21 '@visactor/vrender-animate': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vrender-components': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vrender-core': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vrender-kits': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vutils': specifier: ~1.0.12 version: 1.0.21 @@ -1260,14 +1260,14 @@ importers: specifier: workspace:2.0.14 version: link:../../packages/vchart '@visactor/vrender': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vrender-core': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vrender-kits': - specifier: ~1.0.39 - version: 1.0.39 + specifier: ~1.0.40 + version: 1.0.40 '@visactor/vutils': specifier: ~1.0.12 version: 1.0.21 @@ -3073,29 +3073,29 @@ packages: '@visactor/vrender-animate@1.0.0-alpha.18': resolution: {integrity: sha512-9kTtvp1ef+1t+AtUiza6A7qBQP7SmvOu3/ILGrqs/HGdZVj1XGjbYvD/X/zwKJ3LEb7gGV5fa8x95e4czTvRSA==} - '@visactor/vrender-animate@1.0.39': - resolution: {integrity: sha512-u8iNccWTlszdVoGFqHjLRXiVjHefZKcnQIGod0xrNx4/vaV/OCJZD/+7EvUUyoFYLZPCqafOcBtZh9jRr8cAYQ==} + '@visactor/vrender-animate@1.0.40': + resolution: {integrity: sha512-/OT+xKwTdRa+bhTF28mQxl+9HsaIncNFGv00G3m2EHQT7Ls8SCDAyD46J36+bU3eYKz/+V+CzL2ApwI/zXP8/A==} '@visactor/vrender-components@1.0.0-alpha.18': resolution: {integrity: sha512-7Euq+ZfswL74n2pgkaqZSsPxoSa5SPIGyXatN1eUrdzM2Z0kX6U0RcJg01fctvRs4op6WhcecRLqGvnHcBeb9Q==} - '@visactor/vrender-components@1.0.39': - resolution: {integrity: sha512-i/j16Rf6/mPiA4LZvvXJi0PvDFBCbcI/gSEV2JX6QTZmMWhXOgRZ2mA4kyqQVD4rNIyyXJEmIeVKsgPM0+3Qlw==} + '@visactor/vrender-components@1.0.40': + resolution: {integrity: sha512-+mooyFfpAaAjhBDN5XHKz1SH0vHe3IjabLJQWYwDZGvpPHieVIlZstkTIRMH63pJek0ViIZLHcxpf/i/qli+sw==} '@visactor/vrender-core@1.0.0-alpha.18': resolution: {integrity: sha512-0ihtNvCyNkOsWPFgRqowHzq0IcQgS2Wl/nPpKbVtxWKveenwlhA+ZKoQvam6VJyBY7jeNe1pROy0mJMDyVAJQw==} - '@visactor/vrender-core@1.0.39': - resolution: {integrity: sha512-+TrkiSt14qPzW2k8GlKt5gcNItFwfha+MnJa5TO7i6pu+rnzmjsStku5ZXyLEbEXzRLoUGGg13UoEznFqitawA==} + '@visactor/vrender-core@1.0.40': + resolution: {integrity: sha512-VNfxYGvNS2k1v2/+H0y9jIxjsFjgy3ieFGTDYz+o1rES2RY4wQIr6xJtdEkzXg6Foavp1gJj4fSf/wl2idEuTA==} '@visactor/vrender-kits@1.0.0-alpha.18': resolution: {integrity: sha512-Tvolkq+4G8qiPFZo0Aj8M//Yr6jR2h8FNkFEyWM9gbQbEiTkjpmHAJOYnoSsaPtPrcMSlG4EhJSFDk6ymANHVg==} - '@visactor/vrender-kits@1.0.39': - resolution: {integrity: sha512-cF/4sC0xHYQhQklstp5EwH6Td0pd9cy2kpFzPXrTwDJTr2Eqk9sU5sq6gCpqPnL0fWDZfSyJmJ7tM9ffDmcxHQ==} + '@visactor/vrender-kits@1.0.40': + resolution: {integrity: sha512-tMD2C4vQd5kN2WyDIkel4tId1NYGclKM1exIsJY51rgOjfJsjpRzC5WPe6KYqoIcDO5xDarX8TY4dkTR9S0l6w==} - '@visactor/vrender@1.0.39': - resolution: {integrity: sha512-5B+VuPMDGzErlNug/jNrYeJXPifNr27HIYIan9MWkMtn3i8GCGyVnP4d0rXm2yh9F2iqQLAPeyl3J33C4DNcXA==} + '@visactor/vrender@1.0.40': + resolution: {integrity: sha512-jgplV+ZSsbcWrOc0v4+IbSEwXy9B7xrfMYKYlcPt2U+W6g/kmguXoAnMmq07Qj3IVuUoJDdmyyaNesrUv0ENvQ==} '@visactor/vscale@0.18.18': resolution: {integrity: sha512-iRG4kv+5Fv4KX3AxEfV95XU3I6OmF0QizyAhqHxKa7L1MaT+MRvDDk5zHWf1E8gialLbL2xDe3GnT6g/4u5jhA==} @@ -15026,9 +15026,9 @@ snapshots: '@visactor/vrender-core': 1.0.0-alpha.18 '@visactor/vutils': 1.0.4 - '@visactor/vrender-animate@1.0.39': + '@visactor/vrender-animate@1.0.40': dependencies: - '@visactor/vrender-core': 1.0.39 + '@visactor/vrender-core': 1.0.40 '@visactor/vutils': 1.0.21 '@visactor/vrender-components@1.0.0-alpha.18': @@ -15039,11 +15039,11 @@ snapshots: '@visactor/vscale': 1.0.4 '@visactor/vutils': 1.0.4 - '@visactor/vrender-components@1.0.39': + '@visactor/vrender-components@1.0.40': dependencies: - '@visactor/vrender-animate': 1.0.39 - '@visactor/vrender-core': 1.0.39 - '@visactor/vrender-kits': 1.0.39 + '@visactor/vrender-animate': 1.0.40 + '@visactor/vrender-core': 1.0.40 + '@visactor/vrender-kits': 1.0.40 '@visactor/vscale': 1.0.21 '@visactor/vutils': 1.0.21 @@ -15052,7 +15052,7 @@ snapshots: '@visactor/vutils': 1.0.4 color-convert: 2.0.1 - '@visactor/vrender-core@1.0.39': + '@visactor/vrender-core@1.0.40': dependencies: '@visactor/vutils': 1.0.21 color-convert: 2.0.1 @@ -15066,21 +15066,21 @@ snapshots: lottie-web: 5.13.0 roughjs: 4.5.2 - '@visactor/vrender-kits@1.0.39': + '@visactor/vrender-kits@1.0.40': dependencies: '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 1.0.39 + '@visactor/vrender-core': 1.0.40 '@visactor/vutils': 1.0.21 gifuct-js: 2.1.2 lottie-web: 5.13.0 roughjs: 4.6.6 - '@visactor/vrender@1.0.39': + '@visactor/vrender@1.0.40': dependencies: - '@visactor/vrender-animate': 1.0.39 - '@visactor/vrender-components': 1.0.39 - '@visactor/vrender-core': 1.0.39 - '@visactor/vrender-kits': 1.0.39 + '@visactor/vrender-animate': 1.0.40 + '@visactor/vrender-components': 1.0.40 + '@visactor/vrender-core': 1.0.40 + '@visactor/vrender-kits': 1.0.40 '@visactor/vscale@0.18.18': dependencies: diff --git a/docs/package.json b/docs/package.json index 4314f6005e..ac8229e9c6 100644 --- a/docs/package.json +++ b/docs/package.json @@ -19,8 +19,8 @@ "@visactor/vchart-theme": "~1.6.6", "@visactor/vmind": "1.2.4-alpha.5", "@visactor/vutils": "~1.0.12", - "@visactor/vrender": "~1.0.39", - "@visactor/vrender-kits": "~1.0.39", + "@visactor/vrender": "~1.0.40", + "@visactor/vrender-kits": "~1.0.40", "@visactor/vtable": "1.19.0-alpha.0", "@visactor/vtable-editors": "1.19.0-alpha.0", "@visactor/vtable-gantt": "1.19.0-alpha.0", diff --git a/packages/openinula-vchart/package.json b/packages/openinula-vchart/package.json index 49494afed5..7358d872e6 100644 --- a/packages/openinula-vchart/package.json +++ b/packages/openinula-vchart/package.json @@ -30,8 +30,8 @@ "dependencies": { "@visactor/vchart": "workspace:2.0.14", "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "~1.0.39", - "@visactor/vrender-kits": "~1.0.39", + "@visactor/vrender-core": "~1.0.40", + "@visactor/vrender-kits": "~1.0.40", "react-is": "^18.2.0" }, "devDependencies": { diff --git a/packages/react-vchart/package.json b/packages/react-vchart/package.json index c745789fb2..994ce10a9b 100644 --- a/packages/react-vchart/package.json +++ b/packages/react-vchart/package.json @@ -31,8 +31,8 @@ "@visactor/vchart": "workspace:2.0.14", "@visactor/vchart-extension": "workspace:2.0.14", "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "~1.0.39", - "@visactor/vrender-kits": "~1.0.39", + "@visactor/vrender-core": "~1.0.40", + "@visactor/vrender-kits": "~1.0.40", "react-is": "^18.2.0" }, "devDependencies": { diff --git a/packages/vchart-extension/package.json b/packages/vchart-extension/package.json index 2da23510f5..a79f43e812 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": "~1.0.39", - "@visactor/vrender-kits": "~1.0.39", - "@visactor/vrender-components": "~1.0.39", - "@visactor/vrender-animate": "~1.0.39", + "@visactor/vrender-core": "~1.0.40", + "@visactor/vrender-kits": "~1.0.40", + "@visactor/vrender-components": "~1.0.40", + "@visactor/vrender-animate": "~1.0.40", "@visactor/vchart": "workspace:2.0.14", "@visactor/vutils": "~1.0.12", "@visactor/vdataset": "~1.0.12", diff --git a/packages/vchart/package.json b/packages/vchart/package.json index e76e2eb1f2..8703ddc503 100644 --- a/packages/vchart/package.json +++ b/packages/vchart/package.json @@ -122,10 +122,10 @@ "@visactor/vdataset": "~1.0.12", "@visactor/vscale": "~1.0.12", "@visactor/vlayouts": "~1.0.12", - "@visactor/vrender-core": "~1.0.39", - "@visactor/vrender-kits": "~1.0.39", - "@visactor/vrender-components": "~1.0.39", - "@visactor/vrender-animate": "~1.0.39", + "@visactor/vrender-core": "~1.0.40", + "@visactor/vrender-kits": "~1.0.40", + "@visactor/vrender-components": "~1.0.40", + "@visactor/vrender-animate": "~1.0.40", "@visactor/vutils-extension": "workspace:2.0.14" }, "publishConfig": { diff --git a/packages/vchart/src/compile/compiler.ts b/packages/vchart/src/compile/compiler.ts index 6ae4edc2b2..c443d4f552 100644 --- a/packages/vchart/src/compile/compiler.ts +++ b/packages/vchart/src/compile/compiler.ts @@ -501,8 +501,8 @@ export class Compiler implements ICompiler { const animationState = markAnimationStates.every(state => state === AnimationStateEnum.appear) ? AnimationStateEnum.appear : markAnimationStates.every(state => state === AnimationStateEnum.disappear) - ? AnimationStateEnum.disappear - : AnimationStateEnum.none; + ? AnimationStateEnum.disappear + : AnimationStateEnum.none; if (!this._stage.context) { this._stage.context = {}; } @@ -811,6 +811,7 @@ export class Compiler implements ICompiler { } else if (this._progressiveMarks && this._progressiveMarks.every(mark => mark.canAnimateAfterProgressive())) { this._progressiveMarks.forEach(mark => { mark.runAnimation(); + mark.clearExitGraphics(); }); } else if (this._progressiveMarks) { this._progressiveMarks = null; diff --git a/packages/vchart/src/mark/base/base-mark.ts b/packages/vchart/src/mark/base/base-mark.ts index 4a9093c630..d9457a0a3c 100644 --- a/packages/vchart/src/mark/base/base-mark.ts +++ b/packages/vchart/src/mark/base/base-mark.ts @@ -950,7 +950,7 @@ export class BaseMark extends GrammarItem implements IMar this.model.getColorScheme(), this.model.modelType === 'series' ? this.model.getSpec?.() : undefined ), - (this.model as unknown as ISeries).getDefaultColorDomain() + (this.model as unknown as ISeries)?.getDefaultColorDomain?.() ?? [] ); // 默认配置处理 const mergedStyle = { diff --git a/packages/vchart/src/theme/builtin/common/series/word-cloud.ts b/packages/vchart/src/theme/builtin/common/series/word-cloud.ts index 0d07093bc9..11c3fa5315 100644 --- a/packages/vchart/src/theme/builtin/common/series/word-cloud.ts +++ b/packages/vchart/src/theme/builtin/common/series/word-cloud.ts @@ -6,7 +6,9 @@ const getWordCloudTheme = (): IWordCloudSeriesTheme => { padding: 1, style: { textAlign: 'center', - textBaseline: 'alphabetic' + textBaseline: 'alphabetic', + scaleX: 1, + scaleY: 1 } } }; diff --git a/tools/story-player/package.json b/tools/story-player/package.json index 2002fac5b4..04c0bf437e 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": "~1.0.39", - "@visactor/vrender-kits": "~1.0.39", + "@visactor/vrender-core": "~1.0.40", + "@visactor/vrender-kits": "~1.0.40", "@visactor/vchart": "workspace:2.0.14", - "@visactor/vrender": "~1.0.39", + "@visactor/vrender": "~1.0.40", "@visactor/vutils": "~1.0.12" } } From ba3a07bbab53d4ab2c47024b0307e686adca7f88 Mon Sep 17 00:00:00 2001 From: "lixuefei.1313" Date: Thu, 29 Jan 2026 20:59:38 +0800 Subject: [PATCH 2/2] docs: update changlog of rush --- ...ade-vrender-to-fix-wordcloud_2026-01-29-12-59.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@visactor/vchart/fear-upgrade-vrender-to-fix-wordcloud_2026-01-29-12-59.json diff --git a/common/changes/@visactor/vchart/fear-upgrade-vrender-to-fix-wordcloud_2026-01-29-12-59.json b/common/changes/@visactor/vchart/fear-upgrade-vrender-to-fix-wordcloud_2026-01-29-12-59.json new file mode 100644 index 0000000000..b3598101de --- /dev/null +++ b/common/changes/@visactor/vchart/fear-upgrade-vrender-to-fix-wordcloud_2026-01-29-12-59.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "fix: fix issue of wordCloud\n\n", + "type": "none", + "packageName": "@visactor/vchart" + } + ], + "packageName": "@visactor/vchart", + "email": "lixuef1313@163.com" +} \ No newline at end of file