You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2020/11/10 04:25:05 UTC
[incubator-echarts] 02/02: fix(types): add encode in more series
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch enhance-type
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit b5d57a6ca05f52525bfd320187e5982cca2b6f42
Author: pissang <bm...@gmail.com>
AuthorDate: Tue Nov 10 12:21:30 2020 +0800
fix(types): add encode in more series
---
src/chart/bar/BarSeries.ts | 5 +++--
src/chart/boxplot/BoxplotSeries.ts | 5 +++--
src/chart/candlestick/CandlestickSeries.ts | 6 ++++--
src/chart/effectScatter/EffectScatterSeries.ts | 6 ++++--
src/chart/funnel/FunnelSeries.ts | 5 +++--
src/chart/gauge/GaugeSeries.ts | 5 +++--
src/chart/heatmap/HeatmapSeries.ts | 5 +++--
src/chart/line/LineSeries.ts | 6 ++++--
src/chart/radar/RadarSeries.ts | 5 +++--
src/chart/scatter/ScatterSeries.ts | 5 +++--
10 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/src/chart/bar/BarSeries.ts b/src/chart/bar/BarSeries.ts
index a854482..e6717ca 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<Bar
}
export interface BarSeriesOption extends BaseBarSeriesOption<BarStateOption>, BarStateOption,
- SeriesStackOptionMixin, SeriesSamplingOptionMixin {
+ SeriesStackOptionMixin, SeriesSamplingOptionMixin, SeriesEncodeOptionMixin {
type?: 'bar'
diff --git a/src/chart/boxplot/BoxplotSeries.ts b/src/chart/boxplot/BoxplotSeries.ts
index fb7abae..b3cad64 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, ExtraStateOption>, BoxplotStateOption,
- SeriesOnCartesianOptionMixin {
+ SeriesOnCartesianOptionMixin, SeriesEncodeOptionMixin {
type?: 'boxplot'
coordinateSystem?: 'cartesian2d'
diff --git a/src/chart/candlestick/CandlestickSeries.ts b/src/chart/candlestick/CandlestickSeries.ts
index 617a174..05f6302 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, ExtraStateOption>, CandlestickStateOption,
SeriesOnCartesianOptionMixin,
- SeriesLargeOptionMixin {
+ SeriesLargeOptionMixin,
+ SeriesEncodeOptionMixin {
type?: 'candlestick'
diff --git a/src/chart/effectScatter/EffectScatterSeries.ts b/src/chart/effectScatter/EffectScatterSeries.ts
index f08974c..7ca740e 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>, 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 21edd25..4fb89c7 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>, FunnelStateOption,
- BoxLayoutOptionMixin {
+ BoxLayoutOptionMixin, SeriesEncodeOptionMixin {
type?: 'funnel'
min?: number
diff --git a/src/chart/gauge/GaugeSeries.ts b/src/chart/gauge/GaugeSeries.ts
index f3fbee7..81b5b09 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>, GaugeStateOption,
- CircleLayoutOptionMixin {
+ CircleLayoutOptionMixin, SeriesEncodeOptionMixin {
type?: 'gauge'
// override radius
diff --git a/src/chart/heatmap/HeatmapSeries.ts b/src/chart/heatmap/HeatmapSeries.ts
index 9c936a2..d0c2eeb 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>, 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 4e1c94c..01a1db3 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<LineStateOption, ExtraSta
SeriesOnPolarOptionMixin,
SeriesStackOptionMixin,
SeriesSamplingOptionMixin,
- SymbolOptionMixin {
+ SymbolOptionMixin,
+ SeriesEncodeOptionMixin {
type?: 'line'
coordinateSystem?: 'cartesian2d' | 'polar'
diff --git a/src/chart/radar/RadarSeries.ts b/src/chart/radar/RadarSeries.ts
index bdf3ec4..0256cae 100644
--- a/src/chart/radar/RadarSeries.ts
+++ b/src/chart/radar/RadarSeries.ts
@@ -30,7 +30,8 @@ import {
AreaStyleOption,
OptionDataValue,
StatesOptionMixin,
- OptionDataItemObject
+ OptionDataItemObject,
+ SeriesEncodeOptionMixin
} from '../../util/types';
import GlobalModel from '../../model/Global';
import List from '../../data/List';
@@ -53,7 +54,7 @@ export interface RadarSeriesDataItemOption extends SymbolOptionMixin,
}
export interface RadarSeriesOption extends SeriesOption<RadarSeriesStateOption>, RadarSeriesStateOption,
- SymbolOptionMixin {
+ SymbolOptionMixin, SeriesEncodeOptionMixin {
type?: 'radar'
coordinateSystem?: 'radar'
diff --git a/src/chart/scatter/ScatterSeries.ts b/src/chart/scatter/ScatterSeries.ts
index c6f4f5b..1411941 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<ScatterStateOption, Ex
SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin, SeriesOnCalendarOptionMixin,
SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin,
SeriesLargeOptionMixin, SeriesStackOptionMixin,
- SymbolOptionMixin {
+ SymbolOptionMixin, SeriesEncodeOptionMixin {
type?: 'scatter'
coordinateSystem?: string
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org