Merge pull request #21147 from apache/fix/ts-export-type

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

Author: 100pah

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';