You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2020/11/05 10:27:52 UTC
[incubator-echarts] branch bundle-dts updated: fix(type): add
marker and tooltip in series option
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch bundle-dts
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/bundle-dts by this push:
new 43b2cc1 fix(type): add marker and tooltip in series option
43b2cc1 is described below
commit 43b2cc1ccbb36a207390225c015b8417317bcc3a
Author: pissang <bm...@gmail.com>
AuthorDate: Thu Nov 5 18:26:36 2020 +0800
fix(type): add marker and tooltip in series option
---
src/chart/custom.ts | 4 ----
src/chart/map/MapSeries.ts | 3 ---
src/option.ts | 15 ++++++++++++---
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/chart/custom.ts b/src/chart/custom.ts
index 7484bc5..a366452 100644
--- a/src/chart/custom.ts
+++ b/src/chart/custom.ts
@@ -36,7 +36,6 @@ import {
EventQueryItem, ECEvent, SeriesOption, SeriesOnCartesianOptionMixin,
SeriesOnPolarOptionMixin, SeriesOnSingleOptionMixin, SeriesOnGeoOptionMixin,
SeriesOnCalendarOptionMixin, ItemStyleOption, SeriesEncodeOptionMixin,
- SeriesTooltipOption,
DimensionLoose,
ParsedValue,
Dictionary,
@@ -305,9 +304,6 @@ export interface CustomSeriesOption extends
// Only works on polar and cartesian2d coordinate system.
clip?: boolean;
-
- // FIXME needed?
- tooltip?: SeriesTooltipOption;
}
interface LegacyCustomSeriesOption extends SeriesOption<CustomSeriesStateOption>, CustomSeriesStateOption {}
diff --git a/src/chart/map/MapSeries.ts b/src/chart/map/MapSeries.ts
index 47a7e8f..e0fe56e 100644
--- a/src/chart/map/MapSeries.ts
+++ b/src/chart/map/MapSeries.ts
@@ -28,7 +28,6 @@ import {
BoxLayoutOptionMixin,
SeriesEncodeOptionMixin,
LabelOption,
- SeriesTooltipOption,
OptionDataItemObject,
OptionDataValueNumeric,
ParsedValue,
@@ -69,8 +68,6 @@ export interface MapSeriesOption extends
coordinateSystem?: string;
silent?: boolean;
- tooltip?: SeriesTooltipOption;
-
// FIXME:TS add marker types
markLine?: any;
markPoint?: any;
diff --git a/src/option.ts b/src/option.ts
index df6f44c..c9316e9 100644
--- a/src/option.ts
+++ b/src/option.ts
@@ -74,10 +74,13 @@ import {ToolboxMagicTypeFeatureOption} from './component/toolbox/feature/MagicTy
import {ToolboxRestoreFeatureOption} from './component/toolbox/feature/Restore';
import {ToolboxSaveAsImageFeatureOption} from './component/toolbox/feature/SaveAsImage';
import {ToolboxFeatureOption} from './component/toolbox/featureManager';
+import { MarkAreaOption } from './component/marker/MarkAreaModel';
-import { ECOption } from './util/types';
+import { ECOption, SeriesTooltipOption } from './util/types';
import { GraphicComponentLooseOption } from './component/graphic';
+import { MarkLineOption } from './component/marker/MarkLineModel';
+import { MarkPointOption } from './component/marker/MarkPointModel';
interface ToolboxFullOptionWithFeatures extends ToolboxOption {
feature?: {
@@ -94,7 +97,7 @@ interface ToolboxFullOptionWithFeatures extends ToolboxOption {
}
}
-type SeriesOption = LineSeriesOption
+type SeriesOption = (LineSeriesOption
| BarSeriesOption
| ScatterSeriesOption
| PieSeriesOption
@@ -115,7 +118,13 @@ type SeriesOption = LineSeriesOption
| PictorialBarSeriesOption
| ThemeRiverSeriesOption
| SunburstSeriesOption
- | CustomSeriesOption;
+ | CustomSeriesOption) & {
+ // Inject markArea markLine
+ markArea?: MarkAreaOption
+ markLine?: MarkLineOption
+ markPoint?: MarkPointOption
+ tooltip?: SeriesTooltipOption
+ };
export interface EChartsFullOption extends ECOption {
title?: TitleOption | TitleOption[]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org