Skip to content

Commit ebf4b20

Browse files
authored
Merge pull request #4608 from VisActor/feat/upgrade-vrender-1-1-3
fix: upgrade VRender and stabilize on-demand imports
2 parents 2aeb1cf + 693ec3c commit ebf4b20

33 files changed

Lines changed: 279 additions & 314 deletions

common/config/rush/pnpm-lock.yaml

Lines changed: 174 additions & 248 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"@visactor/vchart-theme": "~1.6.6",
2020
"@visactor/vmind": "1.2.4-alpha.5",
2121
"@visactor/vutils": "~1.0.23",
22-
"@visactor/vrender": "^1.1.2",
23-
"@visactor/vrender-kits": "^1.1.2",
22+
"@visactor/vrender": "^1.1.3",
23+
"@visactor/vrender-kits": "^1.1.3",
2424
"@visactor/vtable": "1.19.0-alpha.0",
2525
"@visactor/vtable-editors": "1.19.0-alpha.0",
2626
"@visactor/vtable-gantt": "1.19.0-alpha.0",

packages/openinula-vchart/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"dependencies": {
3131
"@visactor/vchart": "workspace:2.1.1",
3232
"@visactor/vutils": "~1.0.23",
33-
"@visactor/vrender-core": "^1.1.2",
34-
"@visactor/vrender-kits": "^1.1.2",
33+
"@visactor/vrender-core": "^1.1.3",
34+
"@visactor/vrender-kits": "^1.1.3",
3535
"react-is": "^18.2.0"
3636
},
3737
"devDependencies": {

packages/react-vchart/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"@visactor/vchart": "workspace:2.1.1",
3737
"@visactor/vchart-extension": "workspace:2.1.1",
3838
"@visactor/vutils": "~1.0.23",
39-
"@visactor/vrender-core": "^1.1.2",
40-
"@visactor/vrender-kits": "^1.1.2",
39+
"@visactor/vrender-core": "^1.1.3",
40+
"@visactor/vrender-kits": "^1.1.3",
4141
"react-is": "^18.2.0"
4242
},
4343
"devDependencies": {

packages/vchart-extension/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
"start": "ts-node __tests__/runtime/browser/scripts/initVite.ts && vite serve __tests__/runtime/browser"
2727
},
2828
"dependencies": {
29-
"@visactor/vrender-core": "^1.1.2",
30-
"@visactor/vrender-kits": "^1.1.2",
31-
"@visactor/vrender-components": "^1.1.2",
32-
"@visactor/vrender-animate": "^1.1.2",
29+
"@visactor/vrender-core": "^1.1.3",
30+
"@visactor/vrender-kits": "^1.1.3",
31+
"@visactor/vrender-components": "^1.1.3",
32+
"@visactor/vrender-animate": "^1.1.3",
3333
"@visactor/vchart": "workspace:2.1.1",
3434
"@visactor/vutils": "~1.0.23",
3535
"@visactor/vdataset": "~1.0.23",

packages/vchart-extension/src/charts/3d/arc-3d.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import { registerArc3d } from '@visactor/vrender-kits/register/register-arc3d';
2-
import { registerShadowRoot, createArc3d } from '@visactor/vchart';
3-
import { BaseArcMark, Factory, registerArcAnimation } from '@visactor/vchart';
2+
import { registerShadowRoot } from '@visactor/vrender-kits/register/register-shadowRoot';
3+
import { createArc3d } from '@visactor/vrender-core';
4+
import { registerArcAnimation } from '@visactor/vchart/esm/animation/config';
5+
import { Factory } from '@visactor/vchart/esm/core/factory';
6+
import { BaseArcMark } from '@visactor/vchart/esm/mark/arc';
47
import { MarkType3dEnum } from './enum';
58
import type { IArc3dMark, IArc3dMarkSpec } from './interface';
69

packages/vchart-extension/src/charts/3d/interface.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import type { IArcMarkSpec, IMarkRaw, IPoint, IPolygonMarkSpec, IRectMarkSpec } from '@visactor/vchart';
1+
import type { IMarkRaw } from '@visactor/vchart/esm/mark/interface/common';
2+
import type { IPoint } from '@visactor/vchart/esm/typings/coordinate';
3+
import type { IArcMarkSpec, IPolygonMarkSpec, IRectMarkSpec } from '@visactor/vchart/esm/typings/visual';
24

35
// 3d rect,支持length表示长宽高中的长属性(深度属性)
46
export interface IRect3dMarkSpec extends IRectMarkSpec {

packages/vchart-extension/src/charts/3d/layout.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
import type { IAxis, IBaseLayout, IChart, ILayoutItem, IOffset, LayoutSideType } from '@visactor/vchart';
2-
import { Factory, isXAxis, isYAxis, Layout } from '@visactor/vchart';
3-
import type { IBoundsLike } from '@visactor/vchart';
4-
import type { IRect } from '@visactor/vchart/src/typings/space';
1+
import type { IBoundsLike } from '@visactor/vutils';
2+
import type { IChart } from '@visactor/vchart/esm/chart/interface/chart';
3+
import { isXAxis, isYAxis } from '@visactor/vchart/esm/component/axis/cartesian/util/common';
4+
import type { IAxis } from '@visactor/vchart/esm/component/axis/interface/common';
5+
import { Factory } from '@visactor/vchart/esm/core/factory';
6+
import { Layout, type IOffset, type LayoutSideType } from '@visactor/vchart/esm/layout/base-layout';
7+
import type { IBaseLayout, ILayoutItem } from '@visactor/vchart/esm/layout/interface';
8+
import type { IRect } from '@visactor/vchart/esm/typings/space';
59

610
export class Layout3d extends Layout implements IBaseLayout {
711
declare recomputeWidth: boolean;

packages/vchart-extension/src/charts/3d/plugin.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
import { registerDirectionalLight, registerOrthoCamera, registerViewTransform3dPlugin } from '@visactor/vchart';
2-
import type { IChartPlugin, IChartPluginService, VChartRenderActionSource } from '@visactor/vchart';
3-
import { BasePlugin, registerChartPlugin } from '@visactor/vchart';
1+
import { registerDirectionalLight, registerOrthoCamera, registerViewTransform3dPlugin } from '@visactor/vrender-core';
2+
import type { VChartRenderActionSource } from '@visactor/vchart/esm/core/interface';
3+
import { BasePlugin } from '@visactor/vchart/esm/plugin/base/base-plugin';
4+
import type { IChartPlugin, IChartPluginService } from '@visactor/vchart/esm/plugin/chart/interface';
5+
import { registerChartPlugin } from '@visactor/vchart/esm/plugin/chart/register';
46
import { is3DAxisChart, is3DChart } from './util';
57

68
export class VChart3dPlugin extends BasePlugin implements IChartPlugin {

packages/vchart-extension/src/charts/3d/pyramid-3d.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
import { registerPyramid3d, registerShadowRoot, createPyramid3d } from '@visactor/vchart';
1+
import { createPyramid3d } from '@visactor/vrender-core';
2+
import { registerPyramid3d } from '@visactor/vrender-kits/register/register-pyramid3d';
3+
import { registerShadowRoot } from '@visactor/vrender-kits/register/register-shadowRoot';
4+
import { registerPolygonAnimation } from '@visactor/vchart/esm/animation/config';
5+
import { Factory } from '@visactor/vchart/esm/core/factory';
6+
import { BasePolygonMark } from '@visactor/vchart/esm/mark/polygon/base-polygon';
27
import type { IPyramid3dMark, IPyramid3dMarkSpec } from './interface';
38
import { MarkType3dEnum } from './enum';
4-
import { BasePolygonMark, Factory, registerPolygonAnimation } from '@visactor/vchart';
59

610
export class Pyramid3dMark extends BasePolygonMark<IPyramid3dMarkSpec> implements IPyramid3dMark {
711
static readonly type = MarkType3dEnum.pyramid3d;

0 commit comments

Comments
 (0)