fix(types): add formatter in label

src/chart/bar/BarSeries.ts

@@ -22,11 +22,11 @@ import SeriesModel from '../../model/Series';
 import {
     ItemStyleOption,
     OptionDataValue,
-    LabelOption,
     SeriesStackOptionMixin,
     StatesOptionMixin,
     OptionDataItemObject,
-    SeriesSamplingOptionMixin
+    SeriesSamplingOptionMixin,
+    SeriesLabelOption
 } from '../../util/types';
 import type Cartesian2D from '../../coord/cartesian/Cartesian2D';
 import type Polar from '../../coord/polar/Polar';
@@ -37,7 +37,7 @@ import { BrushCommonSelectorsForSeries } from '../../component/brush/selector';
 
 export interface BarStateOption {
     itemStyle?: BarItemStyleOption
-    label?: LabelOption
+    label?: SeriesLabelOption
 }
 
 export interface BarItemStyleOption extends ItemStyleOption {

src/chart/bar/PictorialBarSeries.ts

@@ -22,7 +22,7 @@ import SeriesModel from '../../model/Series';
 import {
     OptionDataValue,
     ItemStyleOption,
-    LabelOption,
+    SeriesLabelOption,
     AnimationOptionMixin,
     SeriesStackOptionMixin,
     StatesOptionMixin,
@@ -34,7 +34,7 @@ import { inheritDefaultOption } from '../../util/component';
 
 export interface PictorialBarStateOption {
     itemStyle?: ItemStyleOption
-    label?: LabelOption
+    label?: SeriesLabelOption
 }
 
 interface PictorialBarSeriesSymbolOption {

src/chart/boxplot/BoxplotSeries.ts

@@ -25,7 +25,7 @@ import {
     SeriesOnCartesianOptionMixin,
     LayoutOrient,
     ItemStyleOption,
-    LabelOption,
+    SeriesLabelOption,
     OptionDataValueNumeric,
     StatesOptionMixin,
     DefaultExtraEmpasisState
@@ -39,7 +39,7 @@ type BoxplotDataValue = OptionDataValueNumeric[];
 
 export interface BoxplotStateOption {
     itemStyle?: ItemStyleOption
-    label?: LabelOption
+    label?: SeriesLabelOption
 }
 
 export interface BoxplotDataItemOption

src/chart/candlestick/CandlestickSeries.ts

@@ -27,7 +27,7 @@ import {
     ItemStyleOption,
     ZRColor,
     ColorString,
-    LabelOption,
+    SeriesLabelOption,
     SeriesLargeOptionMixin,
     OptionDataValueNumeric,
     StatesOptionMixin,
@@ -45,7 +45,7 @@ interface CandlestickItemStyleOption extends ItemStyleOption {
 }
 export interface CandlestickStateOption {
     itemStyle?: CandlestickItemStyleOption
-    label?: LabelOption
+    label?: SeriesLabelOption
 }
 export interface CandlestickDataItemOption
     extends CandlestickStateOption, StatesOptionMixin<CandlestickStateOption, ExtraStateOption> {

src/chart/effectScatter/EffectScatterSeries.ts

@@ -29,7 +29,7 @@ import {
     SymbolOptionMixin,
     OptionDataValue,
     ItemStyleOption,
-    LabelOption,
+    SeriesLabelOption,
     StatesOptionMixin
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
@@ -41,7 +41,7 @@ type ScatterDataValue = OptionDataValue | OptionDataValue[];
 
 export interface EffectScatterStateOption {
     itemStyle?: ItemStyleOption
-    label?: LabelOption
+    label?: SeriesLabelOption
 }
 
 export interface EffectScatterDataItemOption extends SymbolOptionMixin,

src/chart/funnel/FunnelSeries.ts

@@ -34,14 +34,15 @@ import {
     StatesOptionMixin,
     OptionDataItemObject,
     LayoutOrient,
-    VerticalAlign
+    VerticalAlign,
+    SeriesLabelOption
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import List from '../../data/List';
 import ComponentModel from '../../model/Component';
 
 
-type FunnelLabelOption = Omit<LabelOption, 'position'> & {
+type FunnelLabelOption = Omit<SeriesLabelOption, 'position'> & {
     position?: LabelOption['position']
         | 'outer' | 'inner' | 'center' | 'rightTop' | 'rightBottom' | 'leftTop' | 'leftBottom'
 };

src/chart/graph/GraphSeries.ts

@@ -32,14 +32,14 @@ import {
     SeriesOnSingleOptionMixin,
     OptionDataValue,
     RoamOptionMixin,
-    LabelOption,
+    SeriesLabelOption,
     ItemStyleOption,
     LineStyleOption,
     SymbolOptionMixin,
     BoxLayoutOptionMixin,
     LabelFormatterCallback,
     Dictionary,
-    LineLabelOption,
+    SeriesLineLabelOption,
     StatesOptionMixin,
     GraphEdgeItemObject,
     OptionDataValueNumeric,
@@ -64,7 +64,7 @@ interface GraphEdgeLineStyleOption extends LineStyleOption {
 
 export interface GraphNodeStateOption {
     itemStyle?: ItemStyleOption
-    label?: LabelOption
+    label?: SeriesLabelOption
 }
 
 
@@ -110,7 +110,7 @@ export interface GraphNodeItemOption extends SymbolOptionMixin, GraphNodeStateOp
 
 export interface GraphEdgeStateOption {
     lineStyle?: GraphEdgeLineStyleOption
-    label?: LineLabelOption
+    label?: SeriesLineLabelOption
 }
 export interface GraphEdgeItemOption extends
         GraphEdgeStateOption,
@@ -171,12 +171,8 @@ export interface GraphSeriesOption extends SeriesOption,
     edgeSymbol?: string | string[]
     edgeSymbolSize?: number | number[]
 
-    edgeLabel?: LineLabelOption & {
-        formatter?: LabelFormatterCallback | string
-    }
-    label?: LabelOption & {
-        formatter?: LabelFormatterCallback | string
-    }
+    edgeLabel?: SeriesLineLabelOption
+    label?: SeriesLabelOption
 
     itemStyle?: ItemStyleOption
     lineStyle?: GraphEdgeLineStyleOption
@@ -184,22 +180,22 @@ export interface GraphSeriesOption extends SeriesOption,
     emphasis?: {
         focus?: GraphNodeItemOption['emphasis']['focus']
         scale?: boolean
-        label?: LabelOption
-        edgeLabel?: LabelOption
+        label?: SeriesLabelOption
+        edgeLabel?: SeriesLabelOption
         itemStyle?: ItemStyleOption
         lineStyle?: LineStyleOption
     }
 
     blur?: {
-        label?: LabelOption
-        edgeLabel?: LabelOption
+        label?: SeriesLabelOption
+        edgeLabel?: SeriesLabelOption
         itemStyle?: ItemStyleOption
         lineStyle?: LineStyleOption
     }
 
     select?: {
-        label?: LabelOption
-        edgeLabel?: LabelOption
+        label?: SeriesLabelOption
+        edgeLabel?: SeriesLabelOption
         itemStyle?: ItemStyleOption
         lineStyle?: LineStyleOption
     }

src/chart/heatmap/HeatmapSeries.ts

@@ -25,7 +25,7 @@ import {
     SeriesOnCartesianOptionMixin,
     SeriesOnGeoOptionMixin,
     ItemStyleOption,
-    LabelOption,
+    SeriesLabelOption,
     OptionDataValue,
     StatesOptionMixin
 } from '../../util/types';
@@ -40,7 +40,7 @@ type HeatmapDataValue = OptionDataValue[];
 export interface HeatmapStateOption {
     // Available on cartesian2d coordinate system
     itemStyle?: ItemStyleOption
-    label?: LabelOption
+    label?: SeriesLabelOption
 }
 
 export interface HeatmapDataItemOption extends HeatmapStateOption, StatesOptionMixin<HeatmapStateOption> {

src/chart/line/LineSeries.ts

@@ -24,7 +24,7 @@ import {
     SeriesOption,
     SeriesOnPolarOptionMixin,
     SeriesStackOptionMixin,
-    LabelOption,
+    SeriesLabelOption,
     LineStyleOption,
     ItemStyleOption,
     AreaStyleOption,
@@ -49,7 +49,7 @@ interface ExtraStateOption {
 
 export interface LineStateOption {
     itemStyle?: ItemStyleOption
-    label?: LabelOption
+    label?: SeriesLabelOption
 }
 
 export interface LineDataItemOption extends SymbolOptionMixin,
@@ -59,7 +59,7 @@ export interface LineDataItemOption extends SymbolOptionMixin,
     value?: LineDataValue
 }
 
-export interface LineEndLabelOption extends LabelOption {
+export interface LineEndLabelOption extends SeriesLabelOption {
     valueAnimation: boolean
 }
 
@@ -88,7 +88,7 @@ export interface LineSeriesOption extends SeriesOption<LineStateOption, ExtraSta
     // If clip the overflow value
     clip?: boolean
 
-    label?: LabelOption
+    label?: SeriesLabelOption
     endLabel?: LineEndLabelOption
 
     lineStyle?: LineStyleOption

src/chart/lines/LinesSeries.ts

@@ -32,8 +32,8 @@ import {
     SeriesLargeOptionMixin,
     LineStyleOption,
     OptionDataValue,
-    LineLabelOption,
-    StatesOptionMixin
+    StatesOptionMixin,
+    SeriesLineLabelOption
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import type { LineDrawModelOption } from '../helper/LineDraw';
@@ -83,7 +83,7 @@ interface LegacyDataItemOption {
 
 export interface LinesStateOption {
     lineStyle?: LinesLineStyleOption
-    label?: LineLabelOption
+    label?: SeriesLineLabelOption
 }
 
 export interface LinesDataItemOption extends LinesStateOption, StatesOptionMixin<LinesStateOption> {

src/chart/map/MapSeries.ts

@@ -27,12 +27,12 @@ import {
     SeriesOption,
     BoxLayoutOptionMixin,
     SeriesEncodeOptionMixin,
-    LabelOption,
     OptionDataItemObject,
     OptionDataValueNumeric,
     ParsedValue,
     SeriesOnGeoOptionMixin,
-    StatesOptionMixin
+    StatesOptionMixin,
+    SeriesLabelOption
 } from '../../util/types';
 import { Dictionary } from 'zrender/src/core/types';
 import GeoModel, { GeoCommonOptionMixin, GeoItemStyleOption } from '../../coord/geo/GeoModel';
@@ -43,8 +43,7 @@ import { createTooltipMarkup } from '../../component/tooltip/tooltipMarkup';
 
 export interface MapStateOption {
     itemStyle?: GeoItemStyleOption
-    // FIXME:TS formatter?
-    label?: LabelOption
+    label?: SeriesLabelOption
 }
 export interface MapDataItemOption extends MapStateOption, StatesOptionMixin<MapStateOption>,
     OptionDataItemObject<OptionDataValueNumeric> {

src/chart/parallel/ParallelSeries.ts

@@ -25,7 +25,7 @@ import {
     SeriesOption,
     SeriesEncodeOptionMixin,
     LineStyleOption,
-    LabelOption,
+    SeriesLabelOption,
     SeriesTooltipOption,
     DimensionName,
     OptionDataValue,
@@ -44,7 +44,7 @@ type ParallelSeriesDataValue = OptionDataValue[];
 
 export interface ParallelStateOption {
     lineStyle?: LineStyleOption
-    label?: LabelOption
+    label?: SeriesLabelOption
 }
 
 export interface ParallelSeriesDataItemOption extends ParallelStateOption, StatesOptionMixin<ParallelStateOption> {
@@ -71,7 +71,7 @@ export interface ParallelSeriesOption extends
     parallelAxisDefault?: ParallelAxisOption;
 
     emphasis?: {
-        label?: LabelOption;
+        label?: SeriesLabelOption;
         lineStyle?: LineStyleOption;
     }
 

src/chart/pie/PieSeries.ts

@@ -30,13 +30,13 @@ import {
     CircleLayoutOptionMixin,
     LabelLineOption,
     ItemStyleOption,
-    LabelOption,
     BoxLayoutOptionMixin,
     OptionDataValueNumeric,
     SeriesEncodeOptionMixin,
     OptionDataItemObject,
     StatesOptionMixin,
-    DefaultExtraEmpasisState
+    DefaultExtraEmpasisState,
+    SeriesLabelOption
 } from '../../util/types';
 import List from '../../data/List';
 
@@ -58,14 +58,14 @@ export interface PieStateOption {
     label?: PieLabelOption
     labelLine?: PieLabelLineOption
 }
-interface PieLabelOption extends Omit<LabelOption, 'rotate' | 'position'> {
+interface PieLabelOption extends Omit<SeriesLabelOption, 'rotate' | 'position'> {
     rotate?: number
     alignTo?: 'none' | 'labelLine' | 'edge'
     edgeDistance?: string | number
     bleedMargin?: number
     distanceToLabelLine?: number
 
-    position?: LabelOption['position'] | 'outer' | 'inner' | 'center'
+    position?: SeriesLabelOption['position'] | 'outer' | 'inner' | 'center'
 }
 
 interface PieLabelLineOption extends LabelLineOption {

src/chart/radar/RadarSeries.ts

@@ -24,7 +24,7 @@ import LegendVisualProvider from '../../visual/LegendVisualProvider';
 import {
     SeriesOption,
     LineStyleOption,
-    LabelOption,
+    SeriesLabelOption,
     SymbolOptionMixin,
     ItemStyleOption,
     AreaStyleOption,
@@ -44,7 +44,7 @@ type RadarSeriesDataValue = OptionDataValue[];
 export interface RadarSeriesStateOption {
     lineStyle?: LineStyleOption
     areaStyle?: AreaStyleOption
-    label?: LabelOption
+    label?: SeriesLabelOption
     itemStyle?: ItemStyleOption
 }
 export interface RadarSeriesDataItemOption extends SymbolOptionMixin,

src/chart/sankey/SankeySeries.ts

@@ -24,7 +24,7 @@ import {
     SeriesOption,
     BoxLayoutOptionMixin,
     OptionDataValue,
-    LabelOption,
+    SeriesLabelOption,
     ItemStyleOption,
     LineStyleOption,
     LayoutOrient,
@@ -44,7 +44,7 @@ import { createTooltipMarkup } from '../../component/tooltip/tooltipMarkup';
 type FocusNodeAdjacency = boolean | 'inEdges' | 'outEdges' | 'allEdges';
 
 export interface SankeyNodeStateOption {
-    label?: LabelOption
+    label?: SeriesLabelOption
     itemStyle?: ItemStyleOption
 }
 

src/chart/scatter/ScatterSeries.ts

@@ -28,7 +28,7 @@ import {
     SeriesOnSingleOptionMixin,
     OptionDataValue,
     ItemStyleOption,
-    LabelOption,
+    SeriesLabelOption,
     SeriesLargeOptionMixin,
     SeriesStackOptionMixin,
     SymbolOptionMixin,
@@ -42,7 +42,7 @@ import { BrushCommonSelectorsForSeries } from '../../component/brush/selector';
 
 interface ScatterStateOption {
     itemStyle?: ItemStyleOption
-    label?: LabelOption
+    label?: SeriesLabelOption
 }
 
 interface ExtraStateOption {

src/chart/sunburst/SunburstSeries.ts

@@ -24,7 +24,7 @@ import {wrapTreePathInfo} from '../helper/treeHelper';
 import {
     SeriesOption,
     CircleLayoutOptionMixin,
-    LabelOption,
+    SeriesLabelOption,
     ItemStyleOption,
     OptionDataValue,
     CallbackDataParams,
@@ -49,11 +49,11 @@ interface SunburstItemStyleOption extends ItemStyleOption {
     borderRadius?: (number | string)[] | number | string
 }
 
-interface SunburstLabelOption extends Omit<LabelOption, 'rotate' | 'position'> {
+interface SunburstLabelOption extends Omit<SeriesLabelOption, 'rotate' | 'position'> {
     rotate?: 'radial' | 'tangential' | number
     minAngle?: number
     silent?: boolean
-    position?: LabelOption['position'] | 'outside'
+    position?: SeriesLabelOption['position'] | 'outside'
 }
 
 interface SunburstDataParams extends CallbackDataParams {

src/chart/themeRiver/ThemeRiverSeries.ts

@@ -27,13 +27,13 @@ import LegendVisualProvider from '../../visual/LegendVisualProvider';
 import {
     SeriesOption,
     SeriesOnSingleOptionMixin,
-    LabelOption,
     OptionDataValueDate,
     OptionDataValueNumeric,
     ItemStyleOption,
     BoxLayoutOptionMixin,
     ZRColor,
-    Dictionary
+    Dictionary,
+    SeriesLabelOption
 } from '../../util/types';
 import SingleAxis from '../../coord/single/SingleAxis';
 import GlobalModel from '../../model/Global';
@@ -42,7 +42,7 @@ import { createTooltipMarkup } from '../../component/tooltip/tooltipMarkup';
 
 const DATA_NAME_INDEX = 2;
 
-interface ThemeRiverSeriesLabelOption extends LabelOption {
+interface ThemeRiverSeriesLabelOption extends SeriesLabelOption {
     margin?: number
 }
 

src/chart/tree/TreeSeries.ts

@@ -26,7 +26,7 @@ import {
     RoamOptionMixin,
     LineStyleOption,
     ItemStyleOption,
-    LabelOption,
+    SeriesLabelOption,
     OptionDataValue,
     StatesOptionMixin,
     OptionDataItemObject,
@@ -48,7 +48,7 @@ export interface TreeSeriesStateOption {
      * Line style of the edge between node and it's parent.
      */
     lineStyle?: CurveLineStyleOption
-    label?: LabelOption
+    label?: SeriesLabelOption
 }
 
 interface ExtraStateOption {

src/chart/treemap/TreemapSeries.ts

@@ -34,7 +34,8 @@ import {
     OptionId,
     OptionName,
     DecalObject,
-    DefaultExtraEmpasisState
+    DefaultExtraEmpasisState,
+    SeriesLabelOption
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import { LayoutRect } from '../../util/layout';
@@ -51,7 +52,7 @@ interface BreadcrumbItemStyleOption extends ItemStyleOption {
     textStyle?: LabelOption
 }
 
-interface TreemapSeriesLabelOption extends LabelOption {
+interface TreemapSeriesLabelOption extends SeriesLabelOption {
     ellipsis?: boolean
     formatter?: string | ((params: CallbackDataParams) => string)
 }

src/component/marker/MarkAreaModel.ts

@@ -18,14 +18,14 @@
 */
 
 import MarkerModel, { MarkerOption, MarkerStatisticType, MarkerPositionOption } from './MarkerModel';
-import { LabelOption, ItemStyleOption, StatesOptionMixin } from '../../util/types';
+import { SeriesLabelOption, ItemStyleOption, StatesOptionMixin } from '../../util/types';
 import ComponentModel from '../../model/Component';
 import GlobalModel from '../../model/Global';
 
 
 interface MarkAreaStateOption {
     itemStyle?: ItemStyleOption
-    label?: LabelOption
+    label?: SeriesLabelOption
 }
 
 interface MarkAreaDataItemOptionBase extends MarkAreaStateOption, StatesOptionMixin<MarkAreaStateOption> {

src/component/marker/MarkLineModel.ts

@@ -22,7 +22,7 @@ import ComponentModel from '../../model/Component';
 import GlobalModel from '../../model/Global';
 import {
     LineStyleOption,
-    LineLabelOption,
+    SeriesLineLabelOption,
     SymbolOptionMixin,
     ItemStyleOption,
     StatesOptionMixin
@@ -34,7 +34,7 @@ interface MarkLineStateOption {
      * itemStyle for symbol
      */
     itemStyle?: ItemStyleOption
-    label?: LineLabelOption
+    label?: SeriesLineLabelOption
 }
 interface MarkLineDataItemOptionBase extends MarkLineStateOption, StatesOptionMixin<MarkLineStateOption> {
     name?: string

src/component/marker/MarkPointModel.ts

@@ -23,7 +23,7 @@ import GlobalModel from '../../model/Global';
 import {
     SymbolOptionMixin,
     ItemStyleOption,
-    LabelOption,
+    SeriesLabelOption,
     CallbackDataParams,
     StatesOptionMixin
 } from '../../util/types';
@@ -35,7 +35,7 @@ import {
 
 interface MarkPointStateOption {
     itemStyle?: ItemStyleOption
-    label?: LabelOption
+    label?: SeriesLabelOption
 }
 export interface MarkPointDataItemOption extends
     MarkPointStateOption, StatesOptionMixin<MarkPointStateOption>,

src/component/timeline/TimelineModel.ts

@@ -38,6 +38,7 @@ import Model from '../../model/Model';
 import GlobalModel, { GlobalModelSetOptionOpts } from '../../model/Global';
 import { each, isObject, clone } from 'zrender/src/core/util';
 import { convertOptionIdName, getDataItemValue } from '../../util/model';
+import { number } from '../../export';
 
 
 export interface TimelineControlStyle extends ItemStyleOption {
@@ -76,6 +77,7 @@ interface TimelineLabelOption extends Omit<LabelOption, 'position'> {
     // number can be distance to the timeline axis. sign will determine the side.
     position?: 'auto' | 'left' | 'right' | 'top' | 'bottom' | number
     interval?: 'auto' | number
+    formatter?: string | ((value: string | number, index: number) => string)
 }
 
 export interface TimelineDataItemOption extends SymbolOptionMixin {

src/util/types.ts

@@ -1013,6 +1013,10 @@ export interface LabelOption extends TextCommonOption {
     rich?: Dictionary<TextCommonOption>
 }
 
+export interface SeriesLabelOption extends LabelOption {
+    formatter?: string | LabelFormatterCallback<CallbackDataParams>
+}
+
 /**
  * Option for labels on line, like markLine, lines
  */
@@ -1050,6 +1054,11 @@ export interface LabelLineOption {
     lineStyle?: LineStyleOption
 }
 
+export interface SeriesLineLabelOption extends LineLabelOption {
+    formatter?: string | LabelFormatterCallback<CallbackDataParams>
+}
+
+
 
 export interface LabelLayoutOptionCallbackParams {
     /**
@@ -1419,7 +1428,8 @@ export interface StatesOptionMixin<StateOption, ExtraStateOpts extends ExtraStat
     blur?: StateOption & ExtraStateOpts['blur']
 }
 
-export interface SeriesOption<StateOption=any, ExtraStateOpts extends ExtraStateOptsBase = DefaultExtraStateOpts> extends
+export interface SeriesOption<
+    StateOption=any, ExtraStateOpts extends ExtraStateOptsBase = DefaultExtraStateOpts> extends
     ComponentOption,
     AnimationOptionMixin,
     ColorPaletteOptionMixin,