[incubator-echarts] branch next updated: fix(type): include custom series in full option def

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shenyi pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git


The following commit(s) were added to refs/heads/next by this push:
     new 1313fe5  fix(type): include custom series in full option def
1313fe5 is described below

commit 1313fe56e1ac8a215a364d39f468d29f2aa89d4e
Author: pissang <bm...@gmail.com>
AuthorDate: Sun Aug 16 17:40:32 2020 +0800

    fix(type): include custom series in full option def
---
 src/chart/bar/BarView.ts | 2 +-
 src/chart/custom.ts      | 4 +++-
 src/chart/pie/PieView.ts | 2 --
 src/option.ts            | 4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts
index 6cc530d..d348252 100644
--- a/src/chart/bar/BarView.ts
+++ b/src/chart/bar/BarView.ts
@@ -19,7 +19,7 @@
 
 import Path, {PathProps} from 'zrender/src/graphic/Path';
 import Group from 'zrender/src/graphic/Group';
-import {extend, map, defaults, each, find} from 'zrender/src/core/util';
+import {extend, map, defaults, each} from 'zrender/src/core/util';
 import type {RectLike} from 'zrender/src/core/BoundingRect';
 import {
     Rect,
diff --git a/src/chart/custom.ts b/src/chart/custom.ts
index cd34cf7..5940580 100644
--- a/src/chart/custom.ts
+++ b/src/chart/custom.ts
@@ -245,7 +245,7 @@ interface CustomSeriesStateOption {
     label?: LabelOption;
 }
 
-interface CustomSeriesOption extends
+export interface CustomSeriesOption extends
     SeriesOption<never>,    // don't support StateOption in custom series.
     SeriesEncodeOptionMixin,
     SeriesOnCartesianOptionMixin,
@@ -254,6 +254,8 @@ interface CustomSeriesOption extends
     SeriesOnGeoOptionMixin,
     SeriesOnCalendarOptionMixin {
 
+    type?: 'custom'
+
     // If set as 'none', do not depends on coord sys.
     coordinateSystem?: string | 'none';
 
diff --git a/src/chart/pie/PieView.ts b/src/chart/pie/PieView.ts
index 3adc734..a497ad5 100644
--- a/src/chart/pie/PieView.ts
+++ b/src/chart/pie/PieView.ts
@@ -216,8 +216,6 @@ class PieView extends ChartView {
         const oldData = this._data;
         const group = this.group;
 
-        const hasAnimation = ecModel.get('animation');
-
         let startAngle: number;
         // First render
         if (!oldData && data.count() > 0) {
diff --git a/src/option.ts b/src/option.ts
index 79179b7..3465fc9 100644
--- a/src/option.ts
+++ b/src/option.ts
@@ -66,6 +66,7 @@ import type {HeatmapSeriesOption} from './chart/heatmap/HeatmapSeries';
 import type {PictorialBarSeriesOption} from './chart/bar/PictorialBarSeries';
 import type {ThemeRiverSeriesOption} from './chart/themeRiver/ThemeRiverSeries';
 import type {SunburstSeriesOption} from './chart/sunburst/SunburstSeries';
+import type {CustomSeriesOption} from './chart/custom';
 import { ECOption } from './util/types';
 
 
@@ -110,7 +111,8 @@ export interface EChartsFullOption extends ECOption {
         | HeatmapSeriesOption
         | PictorialBarSeriesOption
         | ThemeRiverSeriesOption
-        | SunburstSeriesOption)[]
+        | SunburstSeriesOption
+        | CustomSeriesOption)[]
 
     options?: EChartsFullOption[]
     baseOption?: EChartsFullOption


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org