diff --git a/src/chart/bar/BarSeries.ts b/src/chart/bar/BarSeries.ts index a85448251b130f7db6297dafc0c7dcacdc9851be..e6717ca2e16fc4fbf23a11b45bb7418e33f73023 100644 --- a/src/chart/bar/BarSeries.ts +++ b/src/chart/bar/BarSeries.ts @@ -26,7 +26,8 @@ import { StatesOptionMixin, OptionDataItemObject, SeriesSamplingOptionMixin, - SeriesLabelOption + SeriesLabelOption, + SeriesEncodeOptionMixin } from '../../util/types'; import type Cartesian2D from '../../coord/cartesian/Cartesian2D'; import type Polar from '../../coord/polar/Polar'; @@ -50,7 +51,7 @@ export interface BarDataItemOption extends BarStateOption, StatesOptionMixin, BarStateOption, - SeriesStackOptionMixin, SeriesSamplingOptionMixin { + SeriesStackOptionMixin, SeriesSamplingOptionMixin, SeriesEncodeOptionMixin { type?: 'bar' diff --git a/src/chart/boxplot/BoxplotSeries.ts b/src/chart/boxplot/BoxplotSeries.ts index fb7abaea86995628bbeb7d6f5f8975e75e203f9b..b3cad649962531db39785df02578dca5689adda6 100644 --- a/src/chart/boxplot/BoxplotSeries.ts +++ b/src/chart/boxplot/BoxplotSeries.ts @@ -28,7 +28,8 @@ import { SeriesLabelOption, OptionDataValueNumeric, StatesOptionMixin, - DefaultExtraEmpasisState + DefaultExtraEmpasisState, + SeriesEncodeOptionMixin } from '../../util/types'; import type Axis2D from '../../coord/cartesian/Axis2D'; import Cartesian2D from '../../coord/cartesian/Cartesian2D'; @@ -55,7 +56,7 @@ interface ExtraStateOption { } export interface BoxplotSeriesOption extends SeriesOption, BoxplotStateOption, - SeriesOnCartesianOptionMixin { + SeriesOnCartesianOptionMixin, SeriesEncodeOptionMixin { type?: 'boxplot' coordinateSystem?: 'cartesian2d' diff --git a/src/chart/candlestick/CandlestickSeries.ts b/src/chart/candlestick/CandlestickSeries.ts index 617a1741c961476d60f16c812356bfd9a2c38eb0..05f630275e90d36b415e573e82cd47c9b9f004c0 100644 --- a/src/chart/candlestick/CandlestickSeries.ts +++ b/src/chart/candlestick/CandlestickSeries.ts @@ -31,7 +31,8 @@ import { SeriesLargeOptionMixin, OptionDataValueNumeric, StatesOptionMixin, - DefaultExtraEmpasisState + DefaultExtraEmpasisState, + SeriesEncodeOptionMixin } from '../../util/types'; import List from '../../data/List'; import Cartesian2D from '../../coord/cartesian/Cartesian2D'; @@ -62,7 +63,8 @@ interface ExtraStateOption { export interface CandlestickSeriesOption extends SeriesOption, CandlestickStateOption, SeriesOnCartesianOptionMixin, - SeriesLargeOptionMixin { + SeriesLargeOptionMixin, + SeriesEncodeOptionMixin { type?: 'candlestick' diff --git a/src/chart/effectScatter/EffectScatterSeries.ts b/src/chart/effectScatter/EffectScatterSeries.ts index f08974ce0f37f8f88692220f34df6fcc7355e9e8..7ca740ecb62c357c22652f392ea59e3fb09796e7 100644 --- a/src/chart/effectScatter/EffectScatterSeries.ts +++ b/src/chart/effectScatter/EffectScatterSeries.ts @@ -30,7 +30,8 @@ import { OptionDataValue, ItemStyleOption, SeriesLabelOption, - StatesOptionMixin + StatesOptionMixin, + SeriesEncodeOptionMixin } from '../../util/types'; import GlobalModel from '../../model/Global'; import List from '../../data/List'; @@ -56,7 +57,8 @@ export interface EffectScatterDataItemOption extends SymbolOptionMixin, export interface EffectScatterSeriesOption extends SeriesOption, EffectScatterStateOption, SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin, SeriesOnCalendarOptionMixin, - SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin, SymbolOptionMixin { + SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin, SymbolOptionMixin, + SeriesEncodeOptionMixin { type?: 'effectScatter' diff --git a/src/chart/funnel/FunnelSeries.ts b/src/chart/funnel/FunnelSeries.ts index 21edd252200001dc12752bf12b0dc7a8a1274ce6..4fb89c7c5575bd1bfb3e61bbb409e7f885b67415 100644 --- a/src/chart/funnel/FunnelSeries.ts +++ b/src/chart/funnel/FunnelSeries.ts @@ -35,7 +35,8 @@ import { OptionDataItemObject, LayoutOrient, VerticalAlign, - SeriesLabelOption + SeriesLabelOption, + SeriesEncodeOptionMixin } from '../../util/types'; import GlobalModel from '../../model/Global'; import List from '../../data/List'; @@ -64,7 +65,7 @@ export interface FunnelDataItemOption } export interface FunnelSeriesOption extends SeriesOption, FunnelStateOption, - BoxLayoutOptionMixin { + BoxLayoutOptionMixin, SeriesEncodeOptionMixin { type?: 'funnel' min?: number diff --git a/src/chart/gauge/GaugeSeries.ts b/src/chart/gauge/GaugeSeries.ts index f3fbee7e40d3ef17bd17d30d0e7aedc529be8198..81b5b09cc3746c70613f9491a5374c1b287e0262 100644 --- a/src/chart/gauge/GaugeSeries.ts +++ b/src/chart/gauge/GaugeSeries.ts @@ -27,7 +27,8 @@ import { LabelOption, ItemStyleOption, OptionDataValueNumeric, - StatesOptionMixin + StatesOptionMixin, + SeriesEncodeOptionMixin } from '../../util/types'; import GlobalModel from '../../model/Global'; import List from '../../data/List'; @@ -110,7 +111,7 @@ export interface GaugeDataItemOption extends GaugeStateOption, StatesOptionMixin detail?: DetailOption } export interface GaugeSeriesOption extends SeriesOption, GaugeStateOption, - CircleLayoutOptionMixin { + CircleLayoutOptionMixin, SeriesEncodeOptionMixin { type?: 'gauge' // override radius diff --git a/src/chart/heatmap/HeatmapSeries.ts b/src/chart/heatmap/HeatmapSeries.ts index 9c936a271d40ac7400ae783d9f765009b602f8dc..d0c2eeb9f147130f25d03e7cf1de56492d753b65 100644 --- a/src/chart/heatmap/HeatmapSeries.ts +++ b/src/chart/heatmap/HeatmapSeries.ts @@ -27,7 +27,8 @@ import { ItemStyleOption, SeriesLabelOption, OptionDataValue, - StatesOptionMixin + StatesOptionMixin, + SeriesEncodeOptionMixin } from '../../util/types'; import GlobalModel from '../../model/Global'; import List from '../../data/List'; @@ -48,7 +49,7 @@ export interface HeatmapDataItemOption extends HeatmapStateOption, StatesOptionM } export interface HeatmapSeriesOption extends SeriesOption, HeatmapStateOption, - SeriesOnCartesianOptionMixin, SeriesOnGeoOptionMixin { + SeriesOnCartesianOptionMixin, SeriesOnGeoOptionMixin, SeriesEncodeOptionMixin { type?: 'heatmap' coordinateSystem?: 'cartesian2d' | 'geo' | 'calendar' diff --git a/src/chart/line/LineSeries.ts b/src/chart/line/LineSeries.ts index 4e1c94c0094a928e7f144f75f3af2cfb6151577f..01a1db3e6fa50e93f80e09345442b3411aad6add 100644 --- a/src/chart/line/LineSeries.ts +++ b/src/chart/line/LineSeries.ts @@ -32,7 +32,8 @@ import { SymbolOptionMixin, SeriesSamplingOptionMixin, StatesOptionMixin, - DefaultExtraEmpasisState + DefaultExtraEmpasisState, + SeriesEncodeOptionMixin } from '../../util/types'; import List from '../../data/List'; import type Cartesian2D from '../../coord/cartesian/Cartesian2D'; @@ -80,7 +81,8 @@ export interface LineSeriesOption extends SeriesOption, RadarSeriesStateOption, - SymbolOptionMixin { + SymbolOptionMixin, SeriesEncodeOptionMixin { type?: 'radar' coordinateSystem?: 'radar' diff --git a/src/chart/scatter/ScatterSeries.ts b/src/chart/scatter/ScatterSeries.ts index c6f4f5b53492278bcf95a56a216eef44bfafc42b..141194126cc9201ef39ab20a5dce1d4ef54e91e6 100644 --- a/src/chart/scatter/ScatterSeries.ts +++ b/src/chart/scatter/ScatterSeries.ts @@ -34,7 +34,8 @@ import { SymbolOptionMixin, StatesOptionMixin, OptionDataItemObject, - DefaultExtraEmpasisState + DefaultExtraEmpasisState, + SeriesEncodeOptionMixin } from '../../util/types'; import GlobalModel from '../../model/Global'; import List from '../../data/List'; @@ -61,7 +62,7 @@ export interface ScatterSeriesOption extends SeriesOption