Merge pull request #219 from VisActor/fix/pie-legend

Fix/pie legend

Author: 666haiwen

README.md

@@ -3,7 +3,7 @@
 VSeed, an elegant data composer, transforming complexity into simplicity.
 
 [![npm Version](https://img.shields.io/npm/v/@visactor/vseed.svg)](https://www.npmjs.com/package/@visactor/vseed)
-[![Coverage](https://img.shields.io/badge/Coverage-90.46%25-brightgreen.svg)](https://github.com/VisActor/VSeed/actions/workflows/coverage.yml)
+[![Coverage](https://img.shields.io/badge/Coverage-90.49%25-brightgreen.svg)](https://github.com/VisActor/VSeed/actions/workflows/coverage.yml)
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/VisActor/VSeed)
 [![Changesets](https://github.com/VisActor/VSeed/actions/workflows/changesets.yml/badge.svg)](https://github.com/VisActor/VSeed/actions/workflows/changesets.yml)
 [![Deploy to GitHub Pages](https://github.com/VisActor/VSeed/actions/workflows/deploy.yml/badge.svg)](https://visactor.github.io/VSeed/)

packages/vseed/src/pipeline/advanced/chart/pipeline/donut.ts

@@ -25,8 +25,8 @@ export const donutAdvancedPipeline: AdvancedPipeline = [
   defaultMeasureId,
 
   encodingAdapter(
-    [defaultEncodingForPie, buildMeasures],
-    [encodingForPie, buildMeasures, pickMeasuresForReshape(['tooltip', 'label', 'color']), pickDimensionsForReshape],
+    [buildMeasures, defaultEncodingForPie],
+    [buildMeasures, encodingForPie, pickMeasuresForReshape(['tooltip', 'label', 'color']), pickDimensionsForReshape],
   ),
   pivotAdapter([reshapeWithEncoding], [pivotReshapeWithEncoding]),
 

packages/vseed/src/pipeline/advanced/chart/pipeline/pie.ts

@@ -25,8 +25,8 @@ export const pieAdvancedPipeline: AdvancedPipeline = [
   defaultMeasureId,
 
   encodingAdapter(
-    [defaultEncodingForPie, buildMeasures],
-    [encodingForPie, buildMeasures, pickMeasuresForReshape(['tooltip', 'label', 'color']), pickDimensionsForReshape],
+    [buildMeasures, defaultEncodingForPie],
+    [buildMeasures, encodingForPie, pickMeasuresForReshape(['tooltip', 'label', 'color']), pickDimensionsForReshape],
   ),
   pivotAdapter([reshapeWithEncoding], [pivotReshapeWithEncoding]),
 

packages/vseed/src/pipeline/advanced/chart/pipes/encoding/pie.ts

@@ -1,7 +1,7 @@
 import { unique } from 'remeda'
 import { MeasureId } from 'src/dataReshape'
 import { findAllMeasures } from 'src/pipeline/utils'
-import type { AdvancedPipe, Dimension, Dimensions, Encoding, Measure, Measures } from 'src/types'
+import type { AdvancedPipe, Dimension, Dimensions, Encoding, Measure, MeasureGroup, Measures } from 'src/types'
 import { addColorToEncoding } from './color'
 
 export const defaultEncodingForPie: AdvancedPipe = (advancedVSeed) => {
@@ -22,7 +22,12 @@ export const encodingForPie: AdvancedPipe = (advancedVSeed) => {
   const encoding: Encoding = {}
 
   if (hasDimensionEncoding) {
-    generateDimensionEncoding(dimensions, encoding, measures.length > 1)
+    const hasMultiMeaureInSingleView =
+      (measures.length > 1 && vseedMeasures.every((m) => !(m as MeasureGroup).children)) ||
+      vseedMeasures.some((m) => {
+        return m && (m as MeasureGroup).children && (m as MeasureGroup).children!.length > 1
+      })
+    generateDimensionEncoding(dimensions, encoding, hasMultiMeaureInSingleView)
   } else {
     generateDefaultDimensionEncoding(dimensions, encoding)
   }

packages/vseed/src/pipeline/spec/chart/pipeline/dualAxis.ts

@@ -53,6 +53,11 @@ import {
   pivotAxisStyle,
   dimensionLinkage,
   annotationPointOfDualAxis,
+  barStyleFilter,
+  pointStyleFilter,
+  lineStyleFilter,
+  areaStyleFilter,
+  tooltipDualAxis,
 } from '../pipes'
 
 const dualAxis: VChartSpecPipeline = [
@@ -69,11 +74,11 @@ const dualAxis: VChartSpecPipeline = [
       barGapInGroup,
       stackCornerRadius,
 
-      colorBarStyleFill(barStyle),
-      colorPointStyleFill(pointStyle),
-      pointStateDimensionHover,
-      colorLineStyleFill(lineStyle),
-      colorAreaStyleFill(areaStyle),
+      barStyleFilter(colorBarStyleFill(barStyle)),
+      pointStyleFilter(colorPointStyleFill(pointStyle)),
+      pointStyleFilter(pointStateDimensionHover),
+      lineStyleFilter(colorLineStyleFill(lineStyle)),
+      areaStyleFilter(colorAreaStyleFill(areaStyle)),
     ],
     [
       initDualAxisSecondary,
@@ -87,11 +92,11 @@ const dualAxis: VChartSpecPipeline = [
       barGapInGroup,
       stackCornerRadius,
 
-      colorBarStyleFill(barStyle),
-      colorPointStyleFill(pointStyle),
-      pointStateDimensionHover,
-      colorLineStyleFill(lineStyle),
-      colorAreaStyleFill(areaStyle),
+      barStyleFilter(colorBarStyleFill(barStyle)),
+      pointStyleFilter(colorPointStyleFill(pointStyle)),
+      pointStyleFilter(pointStateDimensionHover),
+      lineStyleFilter(colorLineStyleFill(lineStyle)),
+      areaStyleFilter(colorAreaStyleFill(areaStyle)),
     ],
   ),
   xBand,
@@ -108,6 +113,8 @@ const dualAxis: VChartSpecPipeline = [
   annotationVerticalLine,
   annotationHorizontalLine,
   annotationAreaBand,
+
+  tooltipDualAxis,
 ]
 
 const pivotDualAxis: PivotChartSpecPipeline = [
@@ -164,6 +171,8 @@ const pivotDualAxis: PivotChartSpecPipeline = [
     annotationVerticalLine,
     annotationHorizontalLine,
     annotationAreaBand,
+
+    tooltipDualAxis,
   ]),
   pivotRowDimensions,
   pivotColumnDimensions,

packages/vseed/src/pipeline/spec/chart/pipes/crosshair/horizontalCrosshairRect.ts

@@ -28,7 +28,7 @@ export const horizontalCrosshairRect: VChartSpecPipe = (spec, context) => {
       type: 'rect',
       style: {
         lineWidth: 0,
-        opacity: 0.2,
+        opacity: 0.26,
         fill: rectColor,
       },
     },

packages/vseed/src/pipeline/spec/chart/pipes/crosshair/verticalCrosshairRect.ts

@@ -28,7 +28,7 @@ export const verticalCrosshairRect: VChartSpecPipe = (spec, context) => {
       type: 'rect',
       style: {
         lineWidth: 0,
-        opacity: 0.2,
+        opacity: 0.26,
         fill: rectColor,
       },
     },

packages/vseed/src/pipeline/spec/chart/pipes/index.ts

@@ -18,3 +18,4 @@ export * from './size'
 export * from './barWidth'
 export * from './regressionLine'
 export * from './region'
+export * from './pipeFilter'

packages/vseed/src/pipeline/spec/chart/pipes/pipeFilter/areaStyleFilter.ts

@@ -0,0 +1,12 @@
+import type { IAreaChartSpec } from '@visactor/vchart'
+import type { VChartSpecPipe } from 'src/types'
+
+export const areaStyleFilter = (pipe: VChartSpecPipe): VChartSpecPipe => {
+  return (spec, context) => {
+    if (spec.type === 'area') {
+      return pipe(spec, context) as IAreaChartSpec
+    }
+
+    return spec
+  }
+}

packages/vseed/src/pipeline/spec/chart/pipes/pipeFilter/barStyleFilter.ts

@@ -0,0 +1,12 @@
+import type { IBarChartSpec } from '@visactor/vchart'
+import type { VChartSpecPipe } from 'src/types'
+
+export const barStyleFilter = (pipe: VChartSpecPipe): VChartSpecPipe => {
+  return (spec, context) => {
+    if (spec.type === 'bar') {
+      return pipe(spec, context) as IBarChartSpec
+    }
+
+    return spec
+  }
+}