fix(types): fix more type issues. add symbol callbacks

src/chart/effectScatter/EffectScatterSeries.ts

@@ -31,7 +31,8 @@ import {
     ItemStyleOption,
     SeriesLabelOption,
     StatesOptionMixin,
-    SeriesEncodeOptionMixin
+    SeriesEncodeOptionMixin,
+    CallbackDataParams
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import List from '../../data/List';
@@ -57,7 +58,7 @@ export interface EffectScatterDataItemOption extends SymbolOptionMixin,
 
 export interface EffectScatterSeriesOption extends SeriesOption<EffectScatterStateOption>, EffectScatterStateOption,
     SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin, SeriesOnCalendarOptionMixin,
-    SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin, SymbolOptionMixin,
+    SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin, SymbolOptionMixin<CallbackDataParams>,
     SeriesEncodeOptionMixin {
 
     type?: 'effectScatter'

src/chart/graph/GraphSeries.ts

@@ -37,13 +37,13 @@ import {
     LineStyleOption,
     SymbolOptionMixin,
     BoxLayoutOptionMixin,
-    LabelFormatterCallback,
     Dictionary,
     SeriesLineLabelOption,
     StatesOptionMixin,
     GraphEdgeItemObject,
     OptionDataValueNumeric,
-    DefaultExtraEmpasisState
+    DefaultExtraEmpasisState,
+    CallbackDataParams
 } from '../../util/types';
 import SeriesModel from '../../model/Series';
 import Graph from '../../data/Graph';
@@ -139,7 +139,7 @@ export interface GraphCategoryItemOption extends SymbolOptionMixin,
 export interface GraphSeriesOption extends SeriesOption,
     SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin, SeriesOnCalendarOptionMixin,
     SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin,
-    SymbolOptionMixin,
+    SymbolOptionMixin<CallbackDataParams>,
     RoamOptionMixin,
     BoxLayoutOptionMixin {
 

src/chart/helper/SymbolDraw.ts

@@ -114,7 +114,7 @@ export interface SymbolDrawSeriesScope {
     focus?: string
     blurScope?: BlurScope
 
-    symbolRotate?: number
+    symbolRotate?: ScatterSeriesOption['symbolRotate']
     symbolOffset?: (number | string)[]
 
     labelStatesModels: Record<DisplayState, Model<LabelOption>>

src/chart/line/LineSeries.ts

@@ -33,7 +33,8 @@ import {
     SeriesSamplingOptionMixin,
     StatesOptionMixin,
     DefaultExtraEmpasisState,
-    SeriesEncodeOptionMixin
+    SeriesEncodeOptionMixin,
+    CallbackDataParams
 } from '../../util/types';
 import List from '../../data/List';
 import type Cartesian2D from '../../coord/cartesian/Cartesian2D';
@@ -81,7 +82,7 @@ export interface LineSeriesOption extends SeriesOption<LineStateOption, ExtraSta
     SeriesOnPolarOptionMixin,
     SeriesStackOptionMixin,
     SeriesSamplingOptionMixin,
-    SymbolOptionMixin,
+    SymbolOptionMixin<CallbackDataParams>,
     SeriesEncodeOptionMixin {
     type?: 'line'
 

src/chart/radar/RadarSeries.ts

@@ -31,7 +31,8 @@ import {
     OptionDataValue,
     StatesOptionMixin,
     OptionDataItemObject,
-    SeriesEncodeOptionMixin
+    SeriesEncodeOptionMixin,
+    CallbackDataParams
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import List from '../../data/List';
@@ -54,7 +55,7 @@ export interface RadarSeriesDataItemOption extends SymbolOptionMixin,
 }
 
 export interface RadarSeriesOption extends SeriesOption<RadarSeriesStateOption>, RadarSeriesStateOption,
-    SymbolOptionMixin, SeriesEncodeOptionMixin {
+    SymbolOptionMixin<CallbackDataParams>, SeriesEncodeOptionMixin {
     type?: 'radar'
     coordinateSystem?: 'radar'
 

src/chart/scatter/ScatterSeries.ts

@@ -35,7 +35,8 @@ import {
     StatesOptionMixin,
     OptionDataItemObject,
     DefaultExtraEmpasisState,
-    SeriesEncodeOptionMixin
+    SeriesEncodeOptionMixin,
+    CallbackDataParams
 } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import List from '../../data/List';
@@ -62,7 +63,7 @@ export interface ScatterSeriesOption extends SeriesOption<ScatterStateOption, Ex
     SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin, SeriesOnCalendarOptionMixin,
     SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin,
     SeriesLargeOptionMixin, SeriesStackOptionMixin,
-    SymbolOptionMixin, SeriesEncodeOptionMixin {
+    SymbolOptionMixin<CallbackDataParams>, SeriesEncodeOptionMixin {
     type?: 'scatter'
 
     coordinateSystem?: string

src/chart/sunburst/sunburstLayout.ts

@@ -23,7 +23,6 @@ import GlobalModel from '../../model/Global';
 import ExtensionAPI from '../../ExtensionAPI';
 import SunburstSeriesModel, { SunburstSeriesNodeItemOption, SunburstSeriesOption } from './SunburstSeries';
 import { TreeNode } from '../../data/Tree';
-import { valueToNode } from '@babel/types';
 
 // let PI2 = Math.PI * 2;
 const RADIAN = Math.PI / 180;

src/chart/tree/TreeSeries.ts

@@ -30,7 +30,8 @@ import {
     OptionDataValue,
     StatesOptionMixin,
     OptionDataItemObject,
-    DefaultExtraEmpasisState
+    DefaultExtraEmpasisState,
+    CallbackDataParams
 } from '../../util/types';
 import List from '../../data/List';
 import View from '../../coord/View';
@@ -58,7 +59,7 @@ interface ExtraStateOption {
     }
 }
 
-export interface TreeSeriesNodeItemOption extends SymbolOptionMixin,
+export interface TreeSeriesNodeItemOption extends SymbolOptionMixin<CallbackDataParams>,
     TreeSeriesStateOption, StatesOptionMixin<TreeSeriesStateOption, ExtraStateOption>,
     OptionDataItemObject<OptionDataValue> {
 

src/component/marker/MarkLineModel.ts

@@ -25,7 +25,8 @@ import {
     SeriesLineLabelOption,
     SymbolOptionMixin,
     ItemStyleOption,
-    StatesOptionMixin
+    StatesOptionMixin,
+    CallbackDataParams
 } from '../../util/types';
 
 interface MarkLineStateOption {

src/component/timeline/TimelineModel.ts

@@ -38,7 +38,6 @@ 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 {

src/util/types.ts

@@ -840,6 +840,7 @@ export interface RoamOptionMixin {
 export type SymbolSizeCallback<T> = (rawValue: any, params: T) => number | number[];
 export type SymbolCallback<T> = (rawValue: any, params: T) => string;
 export type SymbolRotateCallback<T> = (rawValue: any, params: T) => number;
+// export type SymbolOffsetCallback<T> = (rawValue: any, params: T) => (string | number)[];
 /**
  * Mixin of option set to control the element symbol.
  * Include type of symbol, and size of symbol.