diff --git a/src/chart/effectScatter/EffectScatterSeries.ts b/src/chart/effectScatter/EffectScatterSeries.ts index 7ca740ecb62c357c22652f392ea59e3fb09796e7..1d4c7fa696d718df8cdf648fd55acc291e93dc2f 100644 --- a/src/chart/effectScatter/EffectScatterSeries.ts +++ b/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, SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin, SeriesOnCalendarOptionMixin, - SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin, SymbolOptionMixin, + SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin, SymbolOptionMixin, SeriesEncodeOptionMixin { type?: 'effectScatter' diff --git a/src/chart/graph/GraphSeries.ts b/src/chart/graph/GraphSeries.ts index 6e6008ecf62c5a64010845d9ef16dc55921cdd8c..2471725cb006fe054ff410763edd33a294f59ef9 100644 --- a/src/chart/graph/GraphSeries.ts +++ b/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, RoamOptionMixin, BoxLayoutOptionMixin { diff --git a/src/chart/helper/SymbolDraw.ts b/src/chart/helper/SymbolDraw.ts index 0daee81d7ad7b52820584d03b5108a18ed112a72..aace5bd1276b1daab7c357420dad3ac56b2ae46a 100644 --- a/src/chart/helper/SymbolDraw.ts +++ b/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> diff --git a/src/chart/line/LineSeries.ts b/src/chart/line/LineSeries.ts index 01a1db3e6fa50e93f80e09345442b3411aad6add..958829287c111760ca5951a493e80f8d6af48baa 100644 --- a/src/chart/line/LineSeries.ts +++ b/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, SeriesEncodeOptionMixin { type?: 'line' diff --git a/src/chart/radar/RadarSeries.ts b/src/chart/radar/RadarSeries.ts index badec9d918d78701a36cdea11aa61d29154d6ee8..a84602718124a09c3c01f560c53a81c0b8f774ea 100644 --- a/src/chart/radar/RadarSeries.ts +++ b/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, - SymbolOptionMixin, SeriesEncodeOptionMixin { + SymbolOptionMixin, SeriesEncodeOptionMixin { type?: 'radar' coordinateSystem?: 'radar' diff --git a/src/chart/scatter/ScatterSeries.ts b/src/chart/scatter/ScatterSeries.ts index 141194126cc9201ef39ab20a5dce1d4ef54e91e6..cdb64ed675698a53f58028873e27546c0f9e4379 100644 --- a/src/chart/scatter/ScatterSeries.ts +++ b/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, SeriesEncodeOptionMixin { type?: 'scatter' coordinateSystem?: string diff --git a/src/chart/sunburst/sunburstLayout.ts b/src/chart/sunburst/sunburstLayout.ts index 67f9a9caeb1d3f7084318585408715410844d1fa..df333a443e49fdead4c5e196e16735408700cfc4 100644 --- a/src/chart/sunburst/sunburstLayout.ts +++ b/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; diff --git a/src/chart/tree/TreeSeries.ts b/src/chart/tree/TreeSeries.ts index e4bff338abe78bee0cf7706c58b2c44f2b75bcdc..e290403aba372e4e563725e874c01dd89a5956ca 100644 --- a/src/chart/tree/TreeSeries.ts +++ b/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, TreeSeriesStateOption, StatesOptionMixin, OptionDataItemObject { diff --git a/src/component/marker/MarkLineModel.ts b/src/component/marker/MarkLineModel.ts index 73c3cd4d74b45d7f2fe7b775f414c1f19a213c97..bd81c5d505137319d925808f86c95737f2b59d00 100644 --- a/src/component/marker/MarkLineModel.ts +++ b/src/component/marker/MarkLineModel.ts @@ -25,7 +25,8 @@ import { SeriesLineLabelOption, SymbolOptionMixin, ItemStyleOption, - StatesOptionMixin + StatesOptionMixin, + CallbackDataParams } from '../../util/types'; interface MarkLineStateOption { diff --git a/src/component/timeline/TimelineModel.ts b/src/component/timeline/TimelineModel.ts index db3656f0b1abf4db0674be26bcfa8b46f05d2ff3..3a33389679fa7ded0c0e971cc93de9dd105940dc 100644 --- a/src/component/timeline/TimelineModel.ts +++ b/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 { diff --git a/src/util/types.ts b/src/util/types.ts index 22d8cb92d2842fac6646b738ab07ed262e52236f..db5d3122b40363af49b756a57ec2ba103d57331d 100644 --- a/src/util/types.ts +++ b/src/util/types.ts @@ -840,6 +840,7 @@ export interface RoamOptionMixin { export type SymbolSizeCallback = (rawValue: any, params: T) => number | number[]; export type SymbolCallback = (rawValue: any, params: T) => string; export type SymbolRotateCallback = (rawValue: any, params: T) => number; +// export type SymbolOffsetCallback = (rawValue: any, params: T) => (string | number)[]; /** * Mixin of option set to control the element symbol. * Include type of symbol, and size of symbol.