fix(type): fix missing or missmatched TS export types

src/chart/chord/ChordSeries.ts

@@ -21,7 +21,8 @@ import {
     SeriesOption,
     SeriesOnCartesianOptionMixin,
     SeriesOnPolarOptionMixin,
-    SeriesOnCalendarOptionMixin,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
     SeriesOnGeoOptionMixin,
     SeriesOnSingleOptionMixin,
     OptionDataValue,
@@ -115,7 +116,8 @@ export interface ChordEdgeItemOption extends ChordEdgeStateOption,
 
 export interface ChordSeriesOption
     extends SeriesOption<ChordNodeStateOption<CallbackDataParams>, ChordStatesMixin>,
-    SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin, SeriesOnCalendarOptionMixin,
+    SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin,
+    ComponentOnCalendarOptionMixin, ComponentOnMatrixOptionMixin,
     SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin,
     SymbolOptionMixin<CallbackDataParams>,
     RoamOptionMixin,

src/chart/custom/CustomSeries.ts

@@ -37,7 +37,8 @@ import {
     ParsedValue,
     SeriesDataType,
     SeriesEncodeOptionMixin,
-    SeriesOnCalendarOptionMixin,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
     SeriesOnCartesianOptionMixin,
     SeriesOnGeoOptionMixin,
     SeriesOnPolarOptionMixin,
@@ -363,7 +364,8 @@ export interface CustomSeriesOption extends
     SeriesOnPolarOptionMixin,
     SeriesOnSingleOptionMixin,
     SeriesOnGeoOptionMixin,
-    SeriesOnCalendarOptionMixin {
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin {
 
     type?: 'custom'
 

src/chart/effectScatter/EffectScatterSeries.ts

@@ -23,7 +23,8 @@ import {
     SeriesOption,
     SeriesOnPolarOptionMixin,
     SeriesOnCartesianOptionMixin,
-    SeriesOnCalendarOptionMixin,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
     SeriesOnGeoOptionMixin,
     SeriesOnSingleOptionMixin,
     SymbolOptionMixin,
@@ -66,7 +67,8 @@ export interface EffectScatterDataItemOption extends SymbolOptionMixin,
 export interface EffectScatterSeriesOption
     extends SeriesOption<EffectScatterStateOption<CallbackDataParams>, EffectScatterStatesOptionMixin>,
     EffectScatterStateOption<CallbackDataParams>,
-    SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin, SeriesOnCalendarOptionMixin,
+    SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin,
+    ComponentOnCalendarOptionMixin, ComponentOnMatrixOptionMixin,
     SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin, SymbolOptionMixin<CallbackDataParams>,
     SeriesEncodeOptionMixin {
 

src/chart/funnel/FunnelSeries.ts

@@ -38,7 +38,9 @@ import {
     SeriesLabelOption,
     SeriesEncodeOptionMixin,
     DefaultStatesMixinEmphasis,
-    CallbackDataParams
+    CallbackDataParams,
+    ComponentOnMatrixOptionMixin,
+    ComponentOnCalendarOptionMixin
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import SeriesData from '../../data/SeriesData';
@@ -75,6 +77,7 @@ export interface FunnelDataItemOption
 export interface FunnelSeriesOption
     extends SeriesOption<FunnelStateOption<FunnelCallbackDataParams>, FunnelStatesMixin>,
     FunnelStateOption<FunnelCallbackDataParams>,
+    ComponentOnCalendarOptionMixin, ComponentOnMatrixOptionMixin,
     BoxLayoutOptionMixin, SeriesEncodeOptionMixin {
     type?: 'funnel'
 

src/chart/gauge/GaugeSeries.ts

@@ -30,7 +30,9 @@ import {
     StatesOptionMixin,
     SeriesEncodeOptionMixin,
     DefaultStatesMixinEmphasis,
-    CallbackDataParams
+    CallbackDataParams,
+    ComponentOnMatrixOptionMixin,
+    ComponentOnCalendarOptionMixin
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import SeriesData from '../../data/SeriesData';
@@ -123,6 +125,7 @@ export interface GaugeDataItemOption extends GaugeStateOption,
 }
 export interface GaugeSeriesOption extends SeriesOption<GaugeStateOption, GaugeStatesMixin>,
     GaugeStateOption<CallbackDataParams>,
+    ComponentOnCalendarOptionMixin, ComponentOnMatrixOptionMixin,
     CircleLayoutOptionMixin, SeriesEncodeOptionMixin {
     type?: 'gauge'
 

src/chart/graph/GraphSeries.ts

@@ -27,7 +27,8 @@ import {
     SeriesOption,
     SeriesOnCartesianOptionMixin,
     SeriesOnPolarOptionMixin,
-    SeriesOnCalendarOptionMixin,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
     SeriesOnGeoOptionMixin,
     SeriesOnSingleOptionMixin,
     OptionDataValue,
@@ -140,7 +141,8 @@ export interface GraphCategoryItemOption extends SymbolOptionMixin,
 
 export interface GraphSeriesOption
     extends SeriesOption<GraphNodeStateOption<CallbackDataParams>, GraphNodeStatesMixin>,
-    SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin, SeriesOnCalendarOptionMixin,
+    SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin,
+    ComponentOnCalendarOptionMixin, ComponentOnMatrixOptionMixin,
     SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin,
     SymbolOptionMixin<CallbackDataParams>,
     RoamOptionMixin,

src/chart/heatmap/HeatmapSeries.ts

@@ -29,7 +29,8 @@ import {
     OptionDataValue,
     StatesOptionMixin,
     SeriesEncodeOptionMixin,
-    SeriesOnCalendarOptionMixin,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
     DefaultStatesMixinEmphasis,
     CallbackDataParams
 } from '../../util/types';
@@ -64,7 +65,8 @@ export interface HeatmapSeriesOption
     HeatmapStateOption<CallbackDataParams>,
     SeriesOnCartesianOptionMixin,
     SeriesOnGeoOptionMixin,
-    SeriesOnCalendarOptionMixin,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
     SeriesEncodeOptionMixin {
 
     type?: 'heatmap'

src/chart/lines/LinesSeries.ts

@@ -28,7 +28,8 @@ import {
     SeriesOnCartesianOptionMixin,
     SeriesOnGeoOptionMixin,
     SeriesOnPolarOptionMixin,
-    SeriesOnCalendarOptionMixin,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
     SeriesLargeOptionMixin,
     LineStyleOption,
     OptionDataValue,
@@ -113,7 +114,7 @@ export interface LinesDataItemOption extends LinesStateOption,
 export interface LinesSeriesOption
     extends SeriesOption<LinesStateOption, LinesStatesMixin>, LinesStateOption<CallbackDataParams>,
     SeriesOnCartesianOptionMixin, SeriesOnGeoOptionMixin, SeriesOnPolarOptionMixin,
-    SeriesOnCalendarOptionMixin, SeriesLargeOptionMixin {
+    ComponentOnCalendarOptionMixin, ComponentOnMatrixOptionMixin, SeriesLargeOptionMixin {
 
     type?: 'lines'
 

src/chart/map/MapSeries.ts

@@ -34,7 +34,9 @@ import {
     StatesOptionMixin,
     SeriesLabelOption,
     StatesMixinBase,
-    CallbackDataParams
+    CallbackDataParams,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin
 } from '../../util/types';
 import { Dictionary } from 'zrender/src/core/types';
 import GeoModel, { GeoCommonOptionMixin, GeoItemStyleOption } from '../../coord/geo/GeoModel';
@@ -70,6 +72,8 @@ export interface MapSeriesOption extends
     // created. Otherwise use the specified geo component, and
     // `map` and `mapType` are ignored.
     SeriesOnGeoOptionMixin,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
     BoxLayoutOptionMixin,
     SeriesEncodeOptionMixin {
     type?: 'map'

src/chart/parallel/ParallelSeries.ts

@@ -35,7 +35,9 @@ import {
     OptionEncode,
     DefaultStatesMixinEmphasis,
     ZRColor,
-    CallbackDataParams
+    CallbackDataParams,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import SeriesData from '../../data/SeriesData';
@@ -60,6 +62,8 @@ export interface ParallelSeriesDataItemOption extends ParallelStateOption,
 export interface ParallelSeriesOption extends
     SeriesOption<ParallelStateOption<CallbackDataParams>, ParallelStatesMixin>,
     ParallelStateOption<CallbackDataParams>,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
     SeriesEncodeOptionMixin {
 
     type?: 'parallel';

src/chart/pie/PieSeries.ts

@@ -36,7 +36,11 @@ import {
     OptionDataItemObject,
     StatesOptionMixin,
     SeriesLabelOption,
-    DefaultEmphasisFocus
+    DefaultEmphasisFocus,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
+    SeriesOnGeoOptionMixin,
+    SeriesOnCartesianOptionMixin
 } from '../../util/types';
 import type SeriesData from '../../data/SeriesData';
 import { registerLayOutOnCoordSysUsage } from '../../core/CoordinateSystem';
@@ -102,6 +106,10 @@ export interface PieSeriesOption extends
     Omit<SeriesOption<PieStateOption<PieCallbackDataParams>, ExtraStateOption>, 'labelLine'>,
     PieStateOption<PieCallbackDataParams>,
     CircleLayoutOptionMixin<{centerExtra: string | number}>,
+    SeriesOnGeoOptionMixin,
+    SeriesOnCartesianOptionMixin,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
     BoxLayoutOptionMixin,
     SeriesEncodeOptionMixin {
 

src/chart/radar/RadarSeries.ts

@@ -33,7 +33,8 @@ import {
     OptionDataItemObject,
     SeriesEncodeOptionMixin,
     CallbackDataParams,
-    DefaultStatesMixinEmphasis
+    DefaultStatesMixinEmphasis,
+    SeriesOnRadarOptionMixin
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import SeriesData from '../../data/SeriesData';
@@ -61,14 +62,11 @@ export interface RadarSeriesDataItemOption extends SymbolOptionMixin,
 
 export interface RadarSeriesOption
     extends SeriesOption<RadarSeriesStateOption, RadarStatesMixin>,
-    RadarSeriesStateOption,
+    RadarSeriesStateOption, SeriesOnRadarOptionMixin,
     SymbolOptionMixin<CallbackDataParams>, SeriesEncodeOptionMixin {
     type?: 'radar'
     coordinateSystem?: 'radar'
 
-    radarIndex?: number
-    radarId?: string
-
     data?: (RadarSeriesDataItemOption | RadarSeriesDataValue)[]
 }
 

src/chart/sankey/SankeySeries.ts

@@ -35,7 +35,9 @@ import {
     OptionDataValueNumeric,
     DefaultEmphasisFocus,
     CallbackDataParams,
-    RoamOptionMixin
+    RoamOptionMixin,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import SeriesData from '../../data/SeriesData';
@@ -99,6 +101,8 @@ export interface SankeySeriesOption
     extends SeriesOption<SankeyBothStateOption<CallbackDataParams>, ExtraStateOption>,
     SankeyBothStateOption<CallbackDataParams>,
     BoxLayoutOptionMixin,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
     RoamOptionMixin {
     type?: 'sankey'
 

src/chart/scatter/ScatterSeries.ts

@@ -23,7 +23,8 @@ import {
     SeriesOption,
     SeriesOnCartesianOptionMixin,
     SeriesOnPolarOptionMixin,
-    SeriesOnCalendarOptionMixin,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
     SeriesOnGeoOptionMixin,
     SeriesOnSingleOptionMixin,
     OptionDataValue,
@@ -63,7 +64,8 @@ export interface ScatterDataItemOption extends SymbolOptionMixin,
 export interface ScatterSeriesOption
     extends SeriesOption<ScatterStateOption<CallbackDataParams>, ScatterStatesOptionMixin>,
     ScatterStateOption<CallbackDataParams>,
-    SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin, SeriesOnCalendarOptionMixin,
+    SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin,
+    ComponentOnCalendarOptionMixin, ComponentOnMatrixOptionMixin,
     SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin,
     SeriesLargeOptionMixin, SeriesStackOptionMixin,
     SymbolOptionMixin<CallbackDataParams>, SeriesEncodeOptionMixin {

src/chart/sunburst/SunburstSeries.ts

@@ -31,7 +31,9 @@ import {
     StatesOptionMixin,
     OptionDataItemObject,
     DefaultEmphasisFocus,
-    SunburstColorByMixin
+    SunburstColorByMixin,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import SeriesData from '../../data/SeriesData';
@@ -122,6 +124,8 @@ export interface SunburstSeriesOption extends
     SeriesOption<SunburstStateOption<SunburstDataParams>, SunburstStatesMixin>,
     SunburstStateOption<SunburstDataParams>,
     SunburstColorByMixin,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
     CircleLayoutOptionMixin {
 
     type?: 'sunburst'

src/chart/tree/TreeSeries.ts

@@ -31,7 +31,9 @@ import {
     StatesOptionMixin,
     OptionDataItemObject,
     CallbackDataParams,
-    DefaultEmphasisFocus
+    DefaultEmphasisFocus,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin
 } from '../../util/types';
 import SeriesData from '../../data/SeriesData';
 import View from '../../coord/View';
@@ -83,6 +85,7 @@ export interface TreeSeriesLeavesOption
 
 export interface TreeSeriesOption extends
     SeriesOption<TreeSeriesStateOption, TreeStatesMixin>, TreeSeriesStateOption,
+    ComponentOnCalendarOptionMixin, ComponentOnMatrixOptionMixin,
     SymbolOptionMixin<CallbackDataParams>, BoxLayoutOptionMixin, RoamOptionMixin {
     type?: 'tree'
 

src/chart/treemap/TreemapSeries.ts

@@ -37,7 +37,9 @@ import {
     SeriesLabelOption,
     DefaultEmphasisFocus,
     AriaOptionMixin,
-    BlurScope
+    BlurScope,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import { LayoutRect } from '../../util/layout';
@@ -153,6 +155,8 @@ export interface TreemapSeriesNodeItemOption extends TreemapSeriesVisualOption,
 export interface TreemapSeriesOption
     extends SeriesOption<TreemapStateOption<TreemapSeriesCallbackDataParams>, ExtraStateOption>,
     TreemapStateOption<TreemapSeriesCallbackDataParams>,
+    ComponentOnCalendarOptionMixin,
+    ComponentOnMatrixOptionMixin,
     BoxLayoutOptionMixin,
     RoamOptionMixin,
     TreemapSeriesVisualOption {

src/component/dataZoom/DataZoomModel.ts

@@ -32,7 +32,7 @@ import {
     getAxisMainType, DATA_ZOOM_AXIS_DIMENSIONS, DataZoomAxisDimension
 } from './helper';
 import SingleAxisModel from '../../coord/single/AxisModel';
-import { MULTIPLE_REFERRING, SINGLE_REFERRING } from '../../util/model';
+import { MULTIPLE_REFERRING, SINGLE_REFERRING, ModelFinderIndexQuery, ModelFinderIdQuery } from '../../util/model';
 
 
 export interface DataZoomOption extends ComponentOption {
@@ -47,22 +47,22 @@ export interface DataZoomOption extends ComponentOption {
     /**
      * Default the first horizontal category axis.
      */
-    xAxisIndex?: number | number[]
-    xAxisId?: string | string[]
+    xAxisIndex?: ModelFinderIndexQuery
+    xAxisId?: ModelFinderIdQuery
 
     /**
      * Default the first vertical category axis.
      */
-    yAxisIndex?: number | number[]
-    yAxisId?: string | string[]
+    yAxisIndex?: ModelFinderIndexQuery
+    yAxisId?: ModelFinderIdQuery
 
-    radiusAxisIndex?: number | number[]
-    radiusAxisId?: string | string[]
-    angleAxisIndex?: number | number[]
-    angleAxisId?: string | string[]
+    radiusAxisIndex?: ModelFinderIndexQuery
+    radiusAxisId?: ModelFinderIdQuery
+    angleAxisIndex?: ModelFinderIndexQuery
+    angleAxisId?: ModelFinderIdQuery
 
-    singleAxisIndex?: number | number[]
-    singleAxisId?: string | string[]
+    singleAxisIndex?: ModelFinderIndexQuery
+    singleAxisId?: ModelFinderIdQuery
 
     /**
      * Possible values: 'filter' or 'empty' or 'weakFilter'.