diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 2cde8aff38..1f58b70907 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.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@visactor/vrender-kits': - specifier: ~1.0.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@visactor/vtable': specifier: 1.19.0-alpha.0 version: 1.19.0-alpha.0 @@ -203,11 +203,11 @@ importers: specifier: workspace:2.0.12 version: link:../vchart '@visactor/vrender-core': - specifier: ~1.0.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@visactor/vrender-kits': - specifier: ~1.0.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@visactor/vutils': specifier: ~1.0.12 version: 1.0.21 @@ -294,11 +294,11 @@ importers: specifier: workspace:2.0.12 version: link:../vchart-extension '@visactor/vrender-core': - specifier: ~1.0.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@visactor/vrender-kits': - specifier: ~1.0.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@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.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@visactor/vrender-components': - specifier: ~1.0.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@visactor/vrender-core': - specifier: ~1.0.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@visactor/vrender-kits': - specifier: ~1.0.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@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.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@visactor/vrender-components': - specifier: ~1.0.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@visactor/vrender-core': - specifier: ~1.0.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@visactor/vrender-kits': - specifier: ~1.0.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@visactor/vutils': specifier: ~1.0.12 version: 1.0.21 @@ -1260,14 +1260,14 @@ importers: specifier: workspace:2.0.12 version: link:../../packages/vchart '@visactor/vrender': - specifier: ~1.0.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@visactor/vrender-core': - specifier: ~1.0.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@visactor/vrender-kits': - specifier: ~1.0.36 - version: 1.0.36 + specifier: ~1.0.37 + version: 1.0.37 '@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.36': - resolution: {integrity: sha512-AmWLsUG8Srha93ASrCdU4UhZkbq6bhrnen7CimQ5wV6Y8b6deAPopBi0F+FrChzi4bIVL4MdAE4DV8cX/BIYxw==} + '@visactor/vrender-animate@1.0.37': + resolution: {integrity: sha512-DoCZcJLsQ7jLxXl/T2BJU8Md/SyEc8OEowYPDOInjBvLUDhohpdY2Et9XzjqOSXEN68lxqlB4dmowSjpMCHZGw==} '@visactor/vrender-components@1.0.0-alpha.18': resolution: {integrity: sha512-7Euq+ZfswL74n2pgkaqZSsPxoSa5SPIGyXatN1eUrdzM2Z0kX6U0RcJg01fctvRs4op6WhcecRLqGvnHcBeb9Q==} - '@visactor/vrender-components@1.0.36': - resolution: {integrity: sha512-z4MNfjwGwekKkwjjfci5A5c7+mOOjBKcA6cZtS0wDxiKY8R48fjPpd2QZlpVSOoLSeaYSbMBGCbTRXWpzLBQVg==} + '@visactor/vrender-components@1.0.37': + resolution: {integrity: sha512-/fevliN94goYwSjSfC9sYkox8QgxP3/o4msIHDsEeVL+9xlt0vkdduPfdgosTJqVcO2X6uZlBMK6hCiH0S3+ww==} '@visactor/vrender-core@1.0.0-alpha.18': resolution: {integrity: sha512-0ihtNvCyNkOsWPFgRqowHzq0IcQgS2Wl/nPpKbVtxWKveenwlhA+ZKoQvam6VJyBY7jeNe1pROy0mJMDyVAJQw==} - '@visactor/vrender-core@1.0.36': - resolution: {integrity: sha512-u/JprSGz0rNt/Oul/Y9h8/4qcAu9Xki+zX5fww2uePJREwhvQNnAAOubsUP7tG0jlHq5v9HIaJN+COUlKIZTyw==} + '@visactor/vrender-core@1.0.37': + resolution: {integrity: sha512-BxjGgTydlkzgAqRtNjFYgrHcGKCAzryGM56SxaSmjZYVRxBp/sz6Xh0q/+Pv5J/+yFKP5PEo9y/DL6quvGJ/Fg==} '@visactor/vrender-kits@1.0.0-alpha.18': resolution: {integrity: sha512-Tvolkq+4G8qiPFZo0Aj8M//Yr6jR2h8FNkFEyWM9gbQbEiTkjpmHAJOYnoSsaPtPrcMSlG4EhJSFDk6ymANHVg==} - '@visactor/vrender-kits@1.0.36': - resolution: {integrity: sha512-+gQayxykuqCDo2ncCH8u1jaVWyXzyTfqu9PFLmXusHeJF0zp4FvvEEsOy540b24mf0kKFimSpmWk6Duqb+0utw==} + '@visactor/vrender-kits@1.0.37': + resolution: {integrity: sha512-H03R5E4uTuWlKtg91cyRvcePC4Qow+jkP4yRGDAG84TWAJRQonXmXU4c7UeISMXugSz5+9wurD0UiyAhR+1nbg==} - '@visactor/vrender@1.0.36': - resolution: {integrity: sha512-6VgL2vvlVvI1BnW0GKUiVDxPYUUJJLaliqR6hjmwKrZqRvdfib5iXlJf/ohQy6v/36jjZxxV5tTpF8jlu2DQLg==} + '@visactor/vrender@1.0.37': + resolution: {integrity: sha512-xWrIVv6fTb9t+X8+phm5w93117XMGCnronFmP5JTye9vK98cIUTL1WLJ3+i03o/1BlI+jLR0dltp6S0IUXxD+g==} '@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.36': + '@visactor/vrender-animate@1.0.37': dependencies: - '@visactor/vrender-core': 1.0.36 + '@visactor/vrender-core': 1.0.37 '@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.36': + '@visactor/vrender-components@1.0.37': dependencies: - '@visactor/vrender-animate': 1.0.36 - '@visactor/vrender-core': 1.0.36 - '@visactor/vrender-kits': 1.0.36 + '@visactor/vrender-animate': 1.0.37 + '@visactor/vrender-core': 1.0.37 + '@visactor/vrender-kits': 1.0.37 '@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.36': + '@visactor/vrender-core@1.0.37': 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.36': + '@visactor/vrender-kits@1.0.37': dependencies: '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 1.0.36 + '@visactor/vrender-core': 1.0.37 '@visactor/vutils': 1.0.21 gifuct-js: 2.1.2 lottie-web: 5.13.0 roughjs: 4.6.6 - '@visactor/vrender@1.0.36': + '@visactor/vrender@1.0.37': dependencies: - '@visactor/vrender-animate': 1.0.36 - '@visactor/vrender-components': 1.0.36 - '@visactor/vrender-core': 1.0.36 - '@visactor/vrender-kits': 1.0.36 + '@visactor/vrender-animate': 1.0.37 + '@visactor/vrender-components': 1.0.37 + '@visactor/vrender-core': 1.0.37 + '@visactor/vrender-kits': 1.0.37 '@visactor/vscale@0.18.18': dependencies: diff --git a/docs/package.json b/docs/package.json index b0e21ae06d..d17aecafde 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.36", - "@visactor/vrender-kits": "~1.0.36", + "@visactor/vrender": "~1.0.37", + "@visactor/vrender-kits": "~1.0.37", "@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 1aaba560e6..79462d9446 100644 --- a/packages/openinula-vchart/package.json +++ b/packages/openinula-vchart/package.json @@ -30,8 +30,8 @@ "dependencies": { "@visactor/vchart": "workspace:2.0.12", "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "~1.0.36", - "@visactor/vrender-kits": "~1.0.36", + "@visactor/vrender-core": "~1.0.37", + "@visactor/vrender-kits": "~1.0.37", "react-is": "^18.2.0" }, "devDependencies": { diff --git a/packages/react-vchart/package.json b/packages/react-vchart/package.json index d22dc43397..f3afd03cbc 100644 --- a/packages/react-vchart/package.json +++ b/packages/react-vchart/package.json @@ -31,8 +31,8 @@ "@visactor/vchart": "workspace:2.0.12", "@visactor/vchart-extension": "workspace:2.0.12", "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "~1.0.36", - "@visactor/vrender-kits": "~1.0.36", + "@visactor/vrender-core": "~1.0.37", + "@visactor/vrender-kits": "~1.0.37", "react-is": "^18.2.0" }, "devDependencies": { diff --git a/packages/vchart-extension/package.json b/packages/vchart-extension/package.json index f3270e0060..e6c253514e 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.36", - "@visactor/vrender-kits": "~1.0.36", - "@visactor/vrender-components": "~1.0.36", - "@visactor/vrender-animate": "~1.0.36", + "@visactor/vrender-core": "~1.0.37", + "@visactor/vrender-kits": "~1.0.37", + "@visactor/vrender-components": "~1.0.37", + "@visactor/vrender-animate": "~1.0.37", "@visactor/vchart": "workspace:2.0.12", "@visactor/vutils": "~1.0.12", "@visactor/vdataset": "~1.0.12", diff --git a/packages/vchart/package.json b/packages/vchart/package.json index 69148cd961..a04170855f 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.36", - "@visactor/vrender-kits": "~1.0.36", - "@visactor/vrender-components": "~1.0.36", - "@visactor/vrender-animate": "~1.0.36", + "@visactor/vrender-core": "~1.0.37", + "@visactor/vrender-kits": "~1.0.37", + "@visactor/vrender-components": "~1.0.37", + "@visactor/vrender-animate": "~1.0.37", "@visactor/vutils-extension": "workspace:2.0.12" }, "publishConfig": { diff --git a/packages/vchart/src/mark/base/base-mark.ts b/packages/vchart/src/mark/base/base-mark.ts index b5347e8bb9..4a9093c630 100644 --- a/packages/vchart/src/mark/base/base-mark.ts +++ b/packages/vchart/src/mark/base/base-mark.ts @@ -1446,6 +1446,7 @@ export class BaseMark extends GrammarItem implements IMar allGraphics.forEach((g, index) => { g.context.graphicCount = graphicCount; g.context.graphicIndex = index; + g.stateSort = this._stateSort; }); this._dataByKey = newGroupedData; this._graphics = allGraphics; @@ -1551,9 +1552,16 @@ export class BaseMark extends GrammarItem implements IMar protected _runEncoder(graphics: IMarkGraphic[], noGroupEncode?: boolean) { const attrsByGroup = noGroupEncode ? null : this._runGroupEncoder(this._encoderOfState?.group); - graphics.forEach((g, index) => { - const attrs = this._runEncoderOfGraphic(this._encoderOfState?.update, g); + let attrs = this._runEncoderOfGraphic(this._encoderOfState?.update, g); + // 此时需要将最终的正确的样式设置给graphic,这样后续的动画目标属性才会正确,否则会动画样式只有默认状态的样式 + g.currentStates?.forEach((_state: string) => { + const stateAttr = this._runEncoderOfGraphic(this._encoderOfState?.[_state], g); + attrs = { + ...attrs, + ...stateAttr + }; + }); // 配置的优先级高于encoder if (!isNil(this._markConfig.interactive)) { @@ -1585,6 +1593,7 @@ export class BaseMark extends GrammarItem implements IMar } g.context = mockGraphic.context; g.context.diffAttrs = finalAttrs; + g.stateSort = this._stateSort; const gIndex = this._graphics === graphics ? index : index + this._graphics.length - graphics.length; if (gIndex >= 0) { diff --git a/tools/story-player/package.json b/tools/story-player/package.json index daaaa678be..b4b3809a94 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.36", - "@visactor/vrender-kits": "~1.0.36", + "@visactor/vrender-core": "~1.0.37", + "@visactor/vrender-kits": "~1.0.37", "@visactor/vchart": "workspace:2.0.12", - "@visactor/vrender": "~1.0.36", + "@visactor/vrender": "~1.0.37", "@visactor/vutils": "~1.0.12" } }