Merge branch 'feat/pivot_chart' into pre-release/0.9.2-alpha.3

VisActor · Jul 26, 2023 · d25b41c · d25b41c
2 parents 8cb02d2 + c975fad
commit d25b41c
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 28 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/vtable/examples/vite.config.js b/packages/vtable/examples/vite.config.js
@@ -1,9 +1,9 @@
 const { plugin: mdPlugin, Mode } = require('vite-plugin-markdown');
 
 module.exports = {
-  optimizeDeps: {
-    exclude: ['@visactor/vrender', '@visactor/vscale', '@visactor/vrender-components']
-  },
+  // optimizeDeps: {
+  //   exclude: ['@visactor/vrender', '@visactor/vscale', '@visactor/vrender-components']
+  // },
   server: {
     host: '0.0.0.0',
     port: 3003,

diff --git a/packages/vtable/package.json b/packages/vtable/package.json
@@ -47,12 +47,12 @@
     "ci": "node github-ci.js"
   },
   "dependencies": {
-    "@visactor/vrender": "0.12.3",
-    "@visactor/vutils": "0.9.0-alpha.2",
-    "@visactor/vrender-components": "0.12.3",
+    "@visactor/vrender": "~0.13.0",
+    "@visactor/vrender-components": "~0.13.0",
+    "@visactor/vutils": "~0.13.3",
+    "@visactor/vscale": "~0.13.3",
+    "@visactor/vdataset": "~0.13.3",
     "cssfontparser": "^1.2.1",
-    "@visactor/vscale": "0.9.0-alpha.2",
-    "@visactor/vdataset": "0.11.1",
     "d3-dsv": "^3.0.1",
     "d3-array": "3.2.3",
     "d3-geo": "^3.0.1",

diff --git a/packages/vtable/src/scenegraph/graphic/contributions/group-contribution-render.ts b/packages/vtable/src/scenegraph/graphic/contributions/group-contribution-render.ts
@@ -6,7 +6,8 @@ import type {
   IMarkAttribute,
   IGraphicAttribute,
   IThemeAttribute,
-  IGroupRenderContribution
+  IGroupRenderContribution,
+  IDrawContext
 } from '@visactor/vrender';
 import { BaseRenderContributionTime } from '@visactor/vrender';
 import type { Group } from '../group';
@@ -34,6 +35,7 @@ export class SplitGroupBeforeRenderContribution implements IGroupRenderContribut
     fVisible: boolean,
     sVisible: boolean,
     groupAttribute: Required<IGroupGraphicAttribute>,
+    drawContext: IDrawContext,
     fillCb?: (
       ctx: IContext2d,
       markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,
@@ -105,6 +107,7 @@ export class SplitGroupAfterRenderContribution implements IGroupRenderContributi
     fVisible: boolean,
     sVisible: boolean,
     groupAttribute: Required<IGroupGraphicAttribute>,
+    drawContext: IDrawContext,
     fillCb?: (
       ctx: IContext2d,
       markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,
@@ -362,6 +365,7 @@ export class DashGroupBeforeRenderContribution implements IGroupRenderContributi
     fVisible: boolean,
     sVisible: boolean,
     groupAttribute: Required<IGroupGraphicAttribute>,
+    drawContext: IDrawContext,
     fillCb?: (
       ctx: IContext2d,
       markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,
@@ -407,6 +411,7 @@ export class DashGroupAfterRenderContribution implements IGroupRenderContributio
     fVisible: boolean,
     sVisible: boolean,
     groupAttribute: Required<IGroupGraphicAttribute>,
+    drawContext: IDrawContext,
     fillCb?: (
       ctx: IContext2d,
       markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,
@@ -493,6 +498,7 @@ export class AdjustPosGroupBeforeRenderContribution implements IGroupRenderContr
     fVisible: boolean,
     sVisible: boolean,
     groupAttribute: Required<IGroupGraphicAttribute>,
+    drawContext: IDrawContext,
     fillCb?: (
       ctx: IContext2d,
       markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,
@@ -543,6 +549,7 @@ export class AdjustPosGroupAfterRenderContribution implements IGroupRenderContri
     fVisible: boolean,
     sVisible: boolean,
     groupAttribute: Required<IGroupGraphicAttribute>,
+    drawContext: IDrawContext,
     fillCb?: (
       ctx: IContext2d,
       markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,
@@ -620,6 +627,7 @@ export class AdjustColorGroupBeforeRenderContribution implements IGroupRenderCon
     fVisible: boolean,
     sVisible: boolean,
     groupAttribute: Required<IGroupGraphicAttribute>,
+    drawContext: IDrawContext,
     fillCb?: (
       ctx: IContext2d,
       markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,
@@ -659,6 +667,7 @@ export class AdjustColorGroupAfterRenderContribution implements IGroupRenderCont
     fVisible: boolean,
     sVisible: boolean,
     groupAttribute: Required<IGroupGraphicAttribute>,
+    drawContext: IDrawContext,
     fillCb?: (
       ctx: IContext2d,
       markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,

diff --git a/packages/vtable/src/scenegraph/graphic/contributions/image-contribution-render.ts b/packages/vtable/src/scenegraph/graphic/contributions/image-contribution-render.ts
@@ -6,7 +6,8 @@ import type {
   IMarkAttribute,
   IGraphicAttribute,
   IThemeAttribute,
-  IImageRenderContribution
+  IImageRenderContribution,
+  IDrawContext
 } from '@visactor/vrender';
 import { BaseRenderContributionTime } from '@visactor/vrender';
 
@@ -29,6 +30,7 @@ export class BeforeImageRenderContribution implements IImageRenderContribution {
     fVisible: boolean,
     sVisible: boolean,
     imageAttribute: Required<IImageGraphicAttribute>,
+    drawContext: IDrawContext,
     fillCb?: (
       ctx: IContext2d,
       markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,
@@ -71,6 +73,7 @@ export class AfterImageRenderContribution implements IImageRenderContribution {
     fVisible: boolean,
     sVisible: boolean,
     imageAttribute: Required<IImageGraphicAttribute>,
+    drawContext: IDrawContext,
     fillCb?: (
       ctx: IContext2d,
       markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,

diff --git a/packages/vtable/src/scenegraph/graphic/contributions/rect-contribution-render.ts b/packages/vtable/src/scenegraph/graphic/contributions/rect-contribution-render.ts
@@ -8,7 +8,8 @@ import type {
   IThemeAttribute,
   IRectRenderContribution,
   IGroup,
-  IGroupGraphicAttribute
+  IGroupGraphicAttribute,
+  IDrawContext
 } from '@visactor/vrender';
 import { BaseRenderContributionTime } from '@visactor/vrender';
 import { renderStroke } from './group-contribution-render';
@@ -28,6 +29,7 @@ export class SplitRectBeforeRenderContribution implements IRectRenderContributio
     fVisible: boolean,
     sVisible: boolean,
     rectAttribute: Required<IRectGraphicAttribute>,
+    drawContext: IDrawContext,
     fillCb?: (
       ctx: IContext2d,
       markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,
@@ -73,6 +75,7 @@ export class SplitRectAfterRenderContribution implements IRectRenderContribution
     fVisible: boolean,
     sVisible: boolean,
     rectAttribute: Required<IRectGraphicAttribute>,
+    drawContext: IDrawContext,
     fillCb?: (
       ctx: IContext2d,
       markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,