From b104be134ae0e5190cd7765f19e119a14a5ced32 Mon Sep 17 00:00:00 2001 From: "lixuefei.1313" Date: Wed, 24 Dec 2025 15:16:54 +0800 Subject: [PATCH] fix: fix issue of axes title layout --- common/config/rush/pnpm-lock.yaml | 209 ++++++++++++------ docs/package.json | 6 +- packages/openinula-vchart/package.json | 6 +- packages/react-vchart/package.json | 6 +- packages/vchart-extension/package.json | 10 +- packages/vchart/package.json | 10 +- .../src/component/axis/cartesian/axis.ts | 6 +- tools/story-player/package.json | 8 +- 8 files changed, 172 insertions(+), 89 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index fabb6057f5..eee8043bb9 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.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@visactor/vrender-kits': - specifier: ~1.0.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@visactor/vtable': specifier: 1.19.0-alpha.0 version: 1.19.0-alpha.0 @@ -203,11 +203,11 @@ importers: specifier: workspace:2.0.11 version: link:../vchart '@visactor/vrender-core': - specifier: ~1.0.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@visactor/vrender-kits': - specifier: ~1.0.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@visactor/vutils': specifier: ~1.0.12 version: 1.0.21 @@ -294,11 +294,11 @@ importers: specifier: workspace:2.0.11 version: link:../vchart-extension '@visactor/vrender-core': - specifier: ~1.0.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@visactor/vrender-kits': - specifier: ~1.0.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@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.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@visactor/vrender-components': - specifier: ~1.0.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@visactor/vrender-core': - specifier: ~1.0.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@visactor/vrender-kits': - specifier: ~1.0.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@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.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@visactor/vrender-components': - specifier: ~1.0.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@visactor/vrender-core': - specifier: ~1.0.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@visactor/vrender-kits': - specifier: ~1.0.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@visactor/vutils': specifier: ~1.0.12 version: 1.0.21 @@ -1260,14 +1260,14 @@ importers: specifier: workspace:2.0.11 version: link:../../packages/vchart '@visactor/vrender': - specifier: ~1.0.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@visactor/vrender-core': - specifier: ~1.0.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@visactor/vrender-kits': - specifier: ~1.0.35 - version: 1.0.35 + specifier: ~1.0.36 + version: 1.0.36 '@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.35': - resolution: {integrity: sha512-0NIYadX++XXGTUsuEiyubuS1zGGgz9u6PZPDkfyLPft2H66VYTtK9QgkJk8Tmvcke3j5ahhzgo3YGjsKYtvhJQ==} + '@visactor/vrender-animate@1.0.36': + resolution: {integrity: sha512-AmWLsUG8Srha93ASrCdU4UhZkbq6bhrnen7CimQ5wV6Y8b6deAPopBi0F+FrChzi4bIVL4MdAE4DV8cX/BIYxw==} '@visactor/vrender-components@1.0.0-alpha.18': resolution: {integrity: sha512-7Euq+ZfswL74n2pgkaqZSsPxoSa5SPIGyXatN1eUrdzM2Z0kX6U0RcJg01fctvRs4op6WhcecRLqGvnHcBeb9Q==} - '@visactor/vrender-components@1.0.35': - resolution: {integrity: sha512-hUOLymrJRWKGw2M6N/9yIonw6avqQ1FZRqrGy7Oz2iJhIFICyeWBSmv05/ZNgHZkPYgUZ5iWafhRzEg+7yNCWw==} + '@visactor/vrender-components@1.0.36': + resolution: {integrity: sha512-z4MNfjwGwekKkwjjfci5A5c7+mOOjBKcA6cZtS0wDxiKY8R48fjPpd2QZlpVSOoLSeaYSbMBGCbTRXWpzLBQVg==} '@visactor/vrender-core@1.0.0-alpha.18': resolution: {integrity: sha512-0ihtNvCyNkOsWPFgRqowHzq0IcQgS2Wl/nPpKbVtxWKveenwlhA+ZKoQvam6VJyBY7jeNe1pROy0mJMDyVAJQw==} - '@visactor/vrender-core@1.0.35': - resolution: {integrity: sha512-l+4NcRAxc3CmndzwjZfNPrxA5rFxfGN0qHKN3N3je+EaLdkgOkqhdKTcCGxnoC+48QljidkQJQnw0i7oUPoeGQ==} + '@visactor/vrender-core@1.0.36': + resolution: {integrity: sha512-u/JprSGz0rNt/Oul/Y9h8/4qcAu9Xki+zX5fww2uePJREwhvQNnAAOubsUP7tG0jlHq5v9HIaJN+COUlKIZTyw==} '@visactor/vrender-kits@1.0.0-alpha.18': resolution: {integrity: sha512-Tvolkq+4G8qiPFZo0Aj8M//Yr6jR2h8FNkFEyWM9gbQbEiTkjpmHAJOYnoSsaPtPrcMSlG4EhJSFDk6ymANHVg==} - '@visactor/vrender-kits@1.0.35': - resolution: {integrity: sha512-uPc6hoBfdKwoM9v9jOeNJDAq5T+2HpYE/qldrhIZjgTx+ZPQHLD04pUxBxBI9+ZITaANGUgOW4I8acO/G5QzPA==} + '@visactor/vrender-kits@1.0.36': + resolution: {integrity: sha512-+gQayxykuqCDo2ncCH8u1jaVWyXzyTfqu9PFLmXusHeJF0zp4FvvEEsOy540b24mf0kKFimSpmWk6Duqb+0utw==} - '@visactor/vrender@1.0.35': - resolution: {integrity: sha512-BmVWcrY2o8+s3eTTW2J3qux5VEQ/cii8zW/qW8D/sgkZ174gC6J3TnuPzUn6Ytuawj7gc+XykXUrdahwuDpNzA==} + '@visactor/vrender@1.0.36': + resolution: {integrity: sha512-6VgL2vvlVvI1BnW0GKUiVDxPYUUJJLaliqR6hjmwKrZqRvdfib5iXlJf/ohQy6v/36jjZxxV5tTpF8jlu2DQLg==} '@visactor/vscale@0.18.18': resolution: {integrity: sha512-iRG4kv+5Fv4KX3AxEfV95XU3I6OmF0QizyAhqHxKa7L1MaT+MRvDDk5zHWf1E8gialLbL2xDe3GnT6g/4u5jhA==} @@ -13583,7 +13583,7 @@ snapshots: jest-resolve: 26.6.2 jest-resolve-dependencies: 26.6.3 jest-runner: 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@5.4.5)) - jest-runtime: 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@4.9.5)) + jest-runtime: 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@5.4.5)) jest-snapshot: 26.6.2 jest-util: 26.6.2 jest-validate: 26.6.2 @@ -13702,7 +13702,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@jest/test-sequencer@26.6.3': + '@jest/test-sequencer@26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@4.9.5))': dependencies: '@jest/test-result': 26.6.2 graceful-fs: 4.2.11 @@ -13710,7 +13710,25 @@ snapshots: jest-runner: 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@4.9.5)) jest-runtime: 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@4.9.5)) transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + + '@jest/test-sequencer@26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@5.4.5))': + dependencies: + '@jest/test-result': 26.6.2 + graceful-fs: 4.2.11 + jest-haste-map: 26.6.2 + jest-runner: 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@5.4.5)) + jest-runtime: 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@5.4.5)) + transitivePeerDependencies: + - bufferutil + - canvas - supports-color + - ts-node + - utf-8-validate '@jest/transform@24.9.0': dependencies: @@ -15008,9 +15026,9 @@ snapshots: '@visactor/vrender-core': 1.0.0-alpha.18 '@visactor/vutils': 1.0.4 - '@visactor/vrender-animate@1.0.35': + '@visactor/vrender-animate@1.0.36': dependencies: - '@visactor/vrender-core': 1.0.35 + '@visactor/vrender-core': 1.0.36 '@visactor/vutils': 1.0.21 '@visactor/vrender-components@1.0.0-alpha.18': @@ -15021,11 +15039,11 @@ snapshots: '@visactor/vscale': 1.0.4 '@visactor/vutils': 1.0.4 - '@visactor/vrender-components@1.0.35': + '@visactor/vrender-components@1.0.36': dependencies: - '@visactor/vrender-animate': 1.0.35 - '@visactor/vrender-core': 1.0.35 - '@visactor/vrender-kits': 1.0.35 + '@visactor/vrender-animate': 1.0.36 + '@visactor/vrender-core': 1.0.36 + '@visactor/vrender-kits': 1.0.36 '@visactor/vscale': 1.0.21 '@visactor/vutils': 1.0.21 @@ -15034,7 +15052,7 @@ snapshots: '@visactor/vutils': 1.0.4 color-convert: 2.0.1 - '@visactor/vrender-core@1.0.35': + '@visactor/vrender-core@1.0.36': dependencies: '@visactor/vutils': 1.0.21 color-convert: 2.0.1 @@ -15048,21 +15066,21 @@ snapshots: lottie-web: 5.13.0 roughjs: 4.5.2 - '@visactor/vrender-kits@1.0.35': + '@visactor/vrender-kits@1.0.36': dependencies: '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 1.0.35 + '@visactor/vrender-core': 1.0.36 '@visactor/vutils': 1.0.21 gifuct-js: 2.1.2 lottie-web: 5.13.0 roughjs: 4.6.6 - '@visactor/vrender@1.0.35': + '@visactor/vrender@1.0.36': dependencies: - '@visactor/vrender-animate': 1.0.35 - '@visactor/vrender-components': 1.0.35 - '@visactor/vrender-core': 1.0.35 - '@visactor/vrender-kits': 1.0.35 + '@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/vscale@0.18.18': dependencies: @@ -20854,7 +20872,7 @@ snapshots: jest-config@26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@4.9.5)): dependencies: '@babel/core': 7.20.12 - '@jest/test-sequencer': 26.6.3 + '@jest/test-sequencer': 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@4.9.5)) '@jest/types': 26.6.2 babel-jest: 26.6.3(@babel/core@7.20.12) chalk: 4.1.2 @@ -20882,7 +20900,7 @@ snapshots: jest-config@26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@5.4.5)): dependencies: '@babel/core': 7.20.12 - '@jest/test-sequencer': 26.6.3 + '@jest/test-sequencer': 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@5.4.5)) '@jest/types': 26.6.2 babel-jest: 26.6.3(@babel/core@7.20.12) chalk: 4.1.2 @@ -20892,7 +20910,7 @@ snapshots: jest-environment-jsdom: 26.6.2(canvas@2.11.2(encoding@0.1.13)) jest-environment-node: 26.6.2 jest-get-type: 26.3.0 - jest-jasmine2: 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@4.9.5)) + jest-jasmine2: 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@5.4.5)) jest-regex-util: 26.0.0 jest-resolve: 26.6.2 jest-util: 26.6.2 @@ -21108,6 +21126,33 @@ snapshots: - ts-node - utf-8-validate + jest-jasmine2@26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@5.4.5)): + dependencies: + '@babel/traverse': 7.28.5 + '@jest/environment': 26.6.2 + '@jest/source-map': 26.6.2 + '@jest/test-result': 26.6.2 + '@jest/types': 26.6.2 + '@types/node': 18.19.0 + chalk: 4.1.2 + co: 4.6.0 + expect: 26.6.2 + is-generator-fn: 2.1.0 + jest-each: 26.6.2 + jest-matcher-utils: 26.6.2 + jest-message-util: 26.6.2 + jest-runtime: 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@5.4.5)) + jest-snapshot: 26.6.2 + jest-util: 26.6.2 + pretty-format: 26.6.2 + throat: 5.0.0 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + jest-leak-detector@24.9.0: dependencies: jest-get-type: 24.9.0 @@ -21271,7 +21316,7 @@ snapshots: jest-leak-detector: 26.6.2 jest-message-util: 26.6.2 jest-resolve: 26.6.2 - jest-runtime: 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@4.9.5)) + jest-runtime: 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@5.4.5)) jest-util: 26.6.2 jest-worker: 26.6.2 source-map-support: 0.5.21 @@ -21347,6 +21392,42 @@ snapshots: - ts-node - utf-8-validate + jest-runtime@26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@5.4.5)): + dependencies: + '@jest/console': 26.6.2 + '@jest/environment': 26.6.2 + '@jest/fake-timers': 26.6.2 + '@jest/globals': 26.6.2 + '@jest/source-map': 26.6.2 + '@jest/test-result': 26.6.2 + '@jest/transform': 26.6.2 + '@jest/types': 26.6.2 + '@types/yargs': 15.0.20 + chalk: 4.1.2 + cjs-module-lexer: 0.6.0 + collect-v8-coverage: 1.0.3 + exit: 0.1.2 + glob: 7.2.3 + graceful-fs: 4.2.11 + jest-config: 26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@18.19.0)(typescript@5.4.5)) + jest-haste-map: 26.6.2 + jest-message-util: 26.6.2 + jest-mock: 26.6.2 + jest-regex-util: 26.0.0 + jest-resolve: 26.6.2 + jest-snapshot: 26.6.2 + jest-util: 26.6.2 + jest-validate: 26.6.2 + slash: 3.0.0 + strip-bom: 4.0.0 + yargs: 15.4.1 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + jest-serializer@24.9.0: {} jest-serializer@26.6.2: diff --git a/docs/package.json b/docs/package.json index c870248bb2..ea1f5ac16e 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.35", - "@visactor/vrender-kits": "~1.0.35", + "@visactor/vrender": "~1.0.36", + "@visactor/vrender-kits": "~1.0.36", "@visactor/vtable": "1.19.0-alpha.0", "@visactor/vtable-editors": "1.19.0-alpha.0", "@visactor/vtable-gantt": "1.19.0-alpha.0", @@ -58,4 +58,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 aac98d947d..5b6227502d 100644 --- a/packages/openinula-vchart/package.json +++ b/packages/openinula-vchart/package.json @@ -30,8 +30,8 @@ "dependencies": { "@visactor/vchart": "workspace:2.0.11", "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "~1.0.35", - "@visactor/vrender-kits": "~1.0.35", + "@visactor/vrender-core": "~1.0.36", + "@visactor/vrender-kits": "~1.0.36", "react-is": "^18.2.0" }, "devDependencies": { @@ -78,4 +78,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 39223a378b..01adfb3ccc 100644 --- a/packages/react-vchart/package.json +++ b/packages/react-vchart/package.json @@ -31,8 +31,8 @@ "@visactor/vchart": "workspace:2.0.11", "@visactor/vchart-extension": "workspace:2.0.11", "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "~1.0.35", - "@visactor/vrender-kits": "~1.0.35", + "@visactor/vrender-core": "~1.0.36", + "@visactor/vrender-kits": "~1.0.36", "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 a36207a764..2eac1d2794 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.35", - "@visactor/vrender-kits": "~1.0.35", - "@visactor/vrender-components": "~1.0.35", - "@visactor/vrender-animate": "~1.0.35", + "@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/vchart": "workspace:2.0.11", "@visactor/vutils": "~1.0.12", "@visactor/vdataset": "~1.0.12", @@ -66,4 +66,4 @@ "directory": "packages/vchart-extension" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/vchart/package.json b/packages/vchart/package.json index fbb33411d2..1a3ead3055 100644 --- a/packages/vchart/package.json +++ b/packages/vchart/package.json @@ -122,14 +122,14 @@ "@visactor/vdataset": "~1.0.12", "@visactor/vscale": "~1.0.12", "@visactor/vlayouts": "~1.0.12", - "@visactor/vrender-core": "~1.0.35", - "@visactor/vrender-kits": "~1.0.35", - "@visactor/vrender-components": "~1.0.35", - "@visactor/vrender-animate": "~1.0.35", + "@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/vutils-extension": "workspace:2.0.11" }, "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org/" } -} \ No newline at end of file +} diff --git a/packages/vchart/src/component/axis/cartesian/axis.ts b/packages/vchart/src/component/axis/cartesian/axis.ts index fc10d5c9ef..d8976623f2 100644 --- a/packages/vchart/src/component/axis/cartesian/axis.ts +++ b/packages/vchart/src/component/axis/cartesian/axis.ts @@ -716,7 +716,6 @@ export abstract class CartesianAxis