diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 7076ec1894..0d1297a1d7 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -22,8 +22,8 @@ importers: '@visactor/vchart-extension': workspace:2.0.7 '@visactor/vchart-theme': ~1.6.6 '@visactor/vmind': 1.2.4-alpha.5 - '@visactor/vrender': ~1.0.21 - '@visactor/vrender-kits': ~1.0.21 + '@visactor/vrender': ~1.0.23 + '@visactor/vrender-kits': ~1.0.23 '@visactor/vtable': 1.19.0-alpha.0 '@visactor/vtable-calendar': 1.19.0-alpha.0 '@visactor/vtable-editors': 1.19.0-alpha.0 @@ -59,8 +59,8 @@ importers: '@visactor/vchart-extension': link:../packages/vchart-extension '@visactor/vchart-theme': 1.6.9 '@visactor/vmind': 1.2.4-alpha.5 - '@visactor/vrender': 1.0.21 - '@visactor/vrender-kits': 1.0.21 + '@visactor/vrender': 1.0.23 + '@visactor/vrender-kits': 1.0.23 '@visactor/vtable': 1.19.0-alpha.0 '@visactor/vtable-calendar': 1.19.0-alpha.0 '@visactor/vtable-editors': 1.19.0-alpha.0 @@ -144,8 +144,8 @@ importers: '@types/offscreencanvas': 2019.6.4 '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:2.0.7 - '@visactor/vrender-core': ~1.0.21 - '@visactor/vrender-kits': ~1.0.21 + '@visactor/vrender-core': ~1.0.23 + '@visactor/vrender-kits': ~1.0.23 '@visactor/vutils': ~1.0.12 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -164,8 +164,8 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../vchart - '@visactor/vrender-core': 1.0.21 - '@visactor/vrender-kits': 1.0.21 + '@visactor/vrender-core': 1.0.23 + '@visactor/vrender-kits': 1.0.23 '@visactor/vutils': 1.0.12 react-is: 18.3.1 devDependencies: @@ -208,8 +208,8 @@ importers: '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:2.0.7 '@visactor/vchart-extension': workspace:2.0.7 - '@visactor/vrender-core': ~1.0.21 - '@visactor/vrender-kits': ~1.0.21 + '@visactor/vrender-core': ~1.0.23 + '@visactor/vrender-kits': ~1.0.23 '@visactor/vutils': ~1.0.12 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -230,8 +230,8 @@ importers: dependencies: '@visactor/vchart': link:../vchart '@visactor/vchart-extension': link:../vchart-extension - '@visactor/vrender-core': 1.0.21 - '@visactor/vrender-kits': 1.0.21 + '@visactor/vrender-core': 1.0.23 + '@visactor/vrender-kits': 1.0.23 '@visactor/vutils': 1.0.12 react-is: 18.3.1 devDependencies: @@ -371,10 +371,10 @@ importers: '@types/offscreencanvas': 2019.6.4 '@visactor/vdataset': ~1.0.12 '@visactor/vlayouts': ~1.0.12 - '@visactor/vrender-animate': ~1.0.21 - '@visactor/vrender-components': ~1.0.21 - '@visactor/vrender-core': ~1.0.21 - '@visactor/vrender-kits': ~1.0.21 + '@visactor/vrender-animate': ~1.0.23 + '@visactor/vrender-components': ~1.0.23 + '@visactor/vrender-core': ~1.0.23 + '@visactor/vrender-kits': ~1.0.23 '@visactor/vscale': ~1.0.12 '@visactor/vutils': ~1.0.12 '@visactor/vutils-extension': workspace:2.0.7 @@ -413,10 +413,10 @@ importers: dependencies: '@visactor/vdataset': 1.0.12 '@visactor/vlayouts': 1.0.12 - '@visactor/vrender-animate': 1.0.21 - '@visactor/vrender-components': 1.0.21 - '@visactor/vrender-core': 1.0.21 - '@visactor/vrender-kits': 1.0.21 + '@visactor/vrender-animate': 1.0.23 + '@visactor/vrender-components': 1.0.23 + '@visactor/vrender-core': 1.0.23 + '@visactor/vrender-kits': 1.0.23 '@visactor/vscale': 1.0.12 '@visactor/vutils': 1.0.12 '@visactor/vutils-extension': link:../vutils-extension @@ -478,10 +478,10 @@ importers: '@visactor/vchart': workspace:2.0.7 '@visactor/vdataset': ~1.0.12 '@visactor/vlayouts': ~1.0.12 - '@visactor/vrender-animate': ~1.0.21 - '@visactor/vrender-components': ~1.0.21 - '@visactor/vrender-core': ~1.0.21 - '@visactor/vrender-kits': ~1.0.21 + '@visactor/vrender-animate': ~1.0.23 + '@visactor/vrender-components': ~1.0.23 + '@visactor/vrender-core': ~1.0.23 + '@visactor/vrender-kits': ~1.0.23 '@visactor/vutils': ~1.0.12 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 @@ -503,10 +503,10 @@ importers: '@visactor/vchart': link:../vchart '@visactor/vdataset': 1.0.12 '@visactor/vlayouts': 1.0.12 - '@visactor/vrender-animate': 1.0.21 - '@visactor/vrender-components': 1.0.21 - '@visactor/vrender-core': 1.0.21 - '@visactor/vrender-kits': 1.0.21 + '@visactor/vrender-animate': 1.0.23 + '@visactor/vrender-components': 1.0.23 + '@visactor/vrender-core': 1.0.23 + '@visactor/vrender-kits': 1.0.23 '@visactor/vutils': 1.0.12 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -878,9 +878,9 @@ importers: '@typescript-eslint/eslint-plugin': 5.30.0 '@typescript-eslint/parser': 5.30.0 '@visactor/vchart': workspace:2.0.7 - '@visactor/vrender': ~1.0.21 - '@visactor/vrender-core': ~1.0.21 - '@visactor/vrender-kits': ~1.0.21 + '@visactor/vrender': ~1.0.23 + '@visactor/vrender-core': ~1.0.23 + '@visactor/vrender-kits': ~1.0.23 '@visactor/vutils': ~1.0.12 cross-env: ^7.0.3 eslint: ~8.18.0 @@ -893,9 +893,9 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../../packages/vchart - '@visactor/vrender': 1.0.21 - '@visactor/vrender-core': 1.0.21 - '@visactor/vrender-kits': 1.0.21 + '@visactor/vrender': 1.0.23 + '@visactor/vrender-core': 1.0.23 + '@visactor/vrender-kits': 1.0.23 '@visactor/vutils': 1.0.12 devDependencies: '@internal/bundler': link:../bundler @@ -4884,10 +4884,10 @@ packages: '@visactor/vutils': 1.0.4 dev: false - /@visactor/vrender-animate/1.0.21: - resolution: {integrity: sha512-RgnGt+VDjUNZVssm1TTss0fjuLNkGsU7JPgG2eQQ/cPX6X/wViZR4QOxnNAnfHpmT74HII/RSD/ZUORhcVRiUg==} + /@visactor/vrender-animate/1.0.23: + resolution: {integrity: sha512-vja09GBcgPtiQbl8CgUf+P7mC0h9Mobkbbi23aDC14b+g9q+zU4ti9tN8OHu5o2ti+V6269J7DI34CEqZtMr9Q==} dependencies: - '@visactor/vrender-core': 1.0.21 + '@visactor/vrender-core': 1.0.23 '@visactor/vutils': 1.0.12 dev: false @@ -4901,12 +4901,12 @@ packages: '@visactor/vutils': 1.0.4 dev: false - /@visactor/vrender-components/1.0.21: - resolution: {integrity: sha512-KH3XFo4Kq/SlpzCZbfuYz0btDBrv8jr+6QkDgloc4jdJOZlHnhuTu/aXBEY8HoAwqUrf6yMX/gQd7yG5xrXBcg==} + /@visactor/vrender-components/1.0.23: + resolution: {integrity: sha512-WRtc2ws0V1aqQ31PSkys1/4If0qCNU3vB54xou8ykzySYMp+HNUgSlZd6vmT/wDDSZPQA6FG/NAlQZXrnm+X3A==} dependencies: - '@visactor/vrender-animate': 1.0.21 - '@visactor/vrender-core': 1.0.21 - '@visactor/vrender-kits': 1.0.21 + '@visactor/vrender-animate': 1.0.23 + '@visactor/vrender-core': 1.0.23 + '@visactor/vrender-kits': 1.0.23 '@visactor/vscale': 1.0.12 '@visactor/vutils': 1.0.12 dev: false @@ -4918,8 +4918,8 @@ packages: color-convert: 2.0.1 dev: false - /@visactor/vrender-core/1.0.21: - resolution: {integrity: sha512-6CmeOT1bfUhrnedraAFflkPqDsSmggQPvN9hQFWE/Eov0G+x0uTJAbUMD7zLDWCVIbsHhuKwh+oAB+Uilg7Oxg==} + /@visactor/vrender-core/1.0.23: + resolution: {integrity: sha512-zqdvbnBd9fFQG7LXB4Nw31GOj9i8zxzWiRJTcSzx66O6QUym1A7l2YiJS0nUCzrpJWrpD7fbMop3u8oXvqxZiQ==} dependencies: '@visactor/vutils': 1.0.12 color-convert: 2.0.1 @@ -4936,24 +4936,24 @@ packages: roughjs: 4.5.2 dev: false - /@visactor/vrender-kits/1.0.21: - resolution: {integrity: sha512-yi1kf4BDwF7UZWWtwA5+GDYFHiFdx2uP4/Qv1Hun66XrYROZV0XjkipAuZAIXrYt25WNFYXBEc/tYed5otrOkQ==} + /@visactor/vrender-kits/1.0.23: + resolution: {integrity: sha512-FneiEWZLmPIrcvT94Po/v+6e2IGy31idCkarzS0bSoPf1EhvqLLCD41b5dycKQSObe12tV2YnTRuZnvYTutUfA==} dependencies: '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 1.0.21 + '@visactor/vrender-core': 1.0.23 '@visactor/vutils': 1.0.12 gifuct-js: 2.1.2 lottie-web: 5.13.0 roughjs: 4.5.2 dev: false - /@visactor/vrender/1.0.21: - resolution: {integrity: sha512-j0bVzkF+TOoCRIzTfmv+a18gDSW5rpQ9TxdTqK7kQuxmh/eWpUmvTbhpsMKE812Fi368kR/1zh1FIbFjgGmnng==} + /@visactor/vrender/1.0.23: + resolution: {integrity: sha512-3cDiNQFCArjFX20+UxiaLKecB2cV+8p4LIDvmd18g+mcQeihq/Fls7ymtNfR0o1a3G2cKXWMRLFEGdvTrmXo7Q==} dependencies: - '@visactor/vrender-animate': 1.0.21 - '@visactor/vrender-components': 1.0.21 - '@visactor/vrender-core': 1.0.21 - '@visactor/vrender-kits': 1.0.21 + '@visactor/vrender-animate': 1.0.23 + '@visactor/vrender-components': 1.0.23 + '@visactor/vrender-core': 1.0.23 + '@visactor/vrender-kits': 1.0.23 dev: false /@visactor/vscale/0.18.18: @@ -5072,7 +5072,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.27.1_@babel+core@7.20.12 magic-string: 0.27.0 react-refresh: 0.14.2 - vite: 3.2.6_@types+node@22.15.30 + vite: 3.2.6 transitivePeerDependencies: - supports-color dev: true diff --git a/docs/package.json b/docs/package.json index 72fcfd620c..a73f748611 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.21", - "@visactor/vrender-kits": "~1.0.21", + "@visactor/vrender": "~1.0.23", + "@visactor/vrender-kits": "~1.0.23", "@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 4938f7b1b4..9ab56fb4da 100644 --- a/packages/openinula-vchart/package.json +++ b/packages/openinula-vchart/package.json @@ -30,8 +30,8 @@ "dependencies": { "@visactor/vchart": "workspace:2.0.7", "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "~1.0.21", - "@visactor/vrender-kits": "~1.0.21", + "@visactor/vrender-core": "~1.0.23", + "@visactor/vrender-kits": "~1.0.23", "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 2d00f95ab1..865504a49d 100644 --- a/packages/react-vchart/package.json +++ b/packages/react-vchart/package.json @@ -31,8 +31,8 @@ "@visactor/vchart": "workspace:2.0.7", "@visactor/vchart-extension": "workspace:2.0.7", "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "~1.0.21", - "@visactor/vrender-kits": "~1.0.21", + "@visactor/vrender-core": "~1.0.23", + "@visactor/vrender-kits": "~1.0.23", "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 c5ca758800..66ffc1fe94 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.21", - "@visactor/vrender-kits": "~1.0.21", - "@visactor/vrender-components": "~1.0.21", - "@visactor/vrender-animate": "~1.0.21", + "@visactor/vrender-core": "~1.0.23", + "@visactor/vrender-kits": "~1.0.23", + "@visactor/vrender-components": "~1.0.23", + "@visactor/vrender-animate": "~1.0.23", "@visactor/vchart": "workspace:2.0.7", "@visactor/vutils": "~1.0.12", "@visactor/vdataset": "~1.0.12", @@ -61,4 +61,4 @@ "registry": "https://registry.npmjs.org/" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/vchart-extension/src/charts/ranking-bar/ranking-bar-transformer.ts b/packages/vchart-extension/src/charts/ranking-bar/ranking-bar-transformer.ts index 1abe8e0426..7d841f8ff0 100644 --- a/packages/vchart-extension/src/charts/ranking-bar/ranking-bar-transformer.ts +++ b/packages/vchart-extension/src/charts/ranking-bar/ranking-bar-transformer.ts @@ -1,8 +1,6 @@ import type { IRankingBarSpec } from './interface'; -import type { ICartesianAxisSpec, ICommonChartSpec, ILabelSpec } from '@visactor/vchart'; -import type { ITextGraphicAttribute } from '@visactor/vchart'; -import { BaseChartSpecTransformer } from '@visactor/vchart'; -import { isValid } from '@visactor/vchart'; +import type { ICartesianAxisSpec, ICommonChartSpec, ILabelSpec, ITextGraphicAttribute } from '@visactor/vchart'; +import { BaseChartSpecTransformer, isValid } from '@visactor/vchart'; export class RankingBarChartSpecTransformer extends BaseChartSpecTransformer { transformSpec(spec: T): void { diff --git a/packages/vchart/package.json b/packages/vchart/package.json index 0e596cc8a6..936b6e8f49 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.21", - "@visactor/vrender-kits": "~1.0.21", - "@visactor/vrender-components": "~1.0.21", - "@visactor/vrender-animate": "~1.0.21", + "@visactor/vrender-core": "~1.0.23", + "@visactor/vrender-kits": "~1.0.23", + "@visactor/vrender-components": "~1.0.23", + "@visactor/vrender-animate": "~1.0.23", "@visactor/vutils-extension": "workspace:2.0.7" }, "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org/" } -} +} \ No newline at end of file diff --git a/packages/vchart/src/index.ts b/packages/vchart/src/index.ts index 69a3c01a29..4afa5da748 100644 --- a/packages/vchart/src/index.ts +++ b/packages/vchart/src/index.ts @@ -35,3 +35,66 @@ export * from './component/base'; export * from './compile/data/compilable-data'; export * from './animation'; export * from './interaction'; + +export { + createImage, + createPath, + createArc3d, + createPyramid3d, + createRect3d, + registerDirectionalLight, + registerOrthoCamera, + registerViewTransform3dPlugin, + graphicCreator, + type IGraphic, + type IGlyph, + type IGroup, + type IText, + type ILine, + type IArea, + type IRect, + type INode, + type IStage, + type EasingType, + type ILineGraphicAttribute, + type ITextGraphicAttribute, + type IRectGraphicAttribute, + type IGroupGraphicAttribute, + type TextAlignType, + type TextBaselineType, + type GraphicEventType, + type IAreaGraphicAttribute, + type ISymbolGraphicAttribute +} from '@visactor/vrender-core'; + +export { ACustomAnimate, AnimateExecutor, RotateBySphereAnimate } from '@visactor/vrender-animate'; + +// vrender-components +export { + AbstractComponent, + Segment, + MarkPoint, + type SegmentAttributes, + type Point +} from '@visactor/vrender-components'; + +// vrender-kits +export { + registerLine, + registerRect, + registerArc3d, + registerPyramid3d, + registerRect3d, + registerShadowRoot +} from '@visactor/vrender-kits'; + +// vlayouts +export * from '@visactor/vlayouts'; + +// vdataset +export { DataView, DataSet, svgParser } from '@visactor/vdataset'; +export type { SVGParsedElement, SVGParserResult, ISVGSourceOption } from '@visactor/vdataset'; + +// vutils +// @ts-ignore +export * from '@visactor/vutils'; diff --git a/packages/vchart/src/vchart-all.ts b/packages/vchart/src/vchart-all.ts index bbe02a3044..a621f7955a 100644 --- a/packages/vchart/src/vchart-all.ts +++ b/packages/vchart/src/vchart-all.ts @@ -162,66 +162,3 @@ VChart.useRegisters([ ]); export { VChart }; - -export { - createImage, - createPath, - createArc3d, - createPyramid3d, - createRect3d, - registerDirectionalLight, - registerOrthoCamera, - registerViewTransform3dPlugin, - graphicCreator, - type IGraphic, - type IGlyph, - type IGroup, - type IText, - type ILine, - type IArea, - type IRect, - type INode, - type IStage, - type EasingType, - type ILineGraphicAttribute, - type ITextGraphicAttribute, - type IRectGraphicAttribute, - type IGroupGraphicAttribute, - type TextAlignType, - type TextBaselineType, - type GraphicEventType, - type IAreaGraphicAttribute, - type ISymbolGraphicAttribute -} from '@visactor/vrender-core'; - -export { ACustomAnimate, AnimateExecutor, RotateBySphereAnimate } from '@visactor/vrender-animate'; - -// vrender-components -export { - AbstractComponent, - Segment, - MarkPoint, - type SegmentAttributes, - type Point -} from '@visactor/vrender-components'; - -// vrender-kits -export { - registerLine, - registerRect, - registerArc3d, - registerPyramid3d, - registerRect3d, - registerShadowRoot -} from '@visactor/vrender-kits'; - -// vlayouts -export * from '@visactor/vlayouts'; - -// vdataset -export { DataView, DataSet, svgParser } from '@visactor/vdataset'; -export type { SVGParsedElement, SVGParserResult, ISVGSourceOption } from '@visactor/vdataset'; - -// vutils -// @ts-ignore -export * from '@visactor/vutils'; diff --git a/tools/story-player/package.json b/tools/story-player/package.json index b22eed7c58..ed963c22b7 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.21", - "@visactor/vrender-kits": "~1.0.21", + "@visactor/vrender-core": "~1.0.23", + "@visactor/vrender-kits": "~1.0.23", "@visactor/vchart": "workspace:2.0.7", - "@visactor/vrender": "~1.0.21", + "@visactor/vrender": "~1.0.23", "@visactor/vutils": "~1.0.12" } -} +} \ No newline at end of file