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/06/10 15:43:36 UTC
[incubator-echarts] branch next updated: ts: export option
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 de86b1a ts: export option
de86b1a is described below
commit de86b1a5d89b92b6875ee53a3a4fc1ea583bda87
Author: pissang <bm...@gmail.com>
AuthorDate: Wed Jun 10 23:43:14 2020 +0800
ts: export option
---
option.ts | 107 ++++++++++++++++++++++++++
src/chart/bar/PictorialBarSeries.ts | 2 +
src/chart/graph/GraphSeries.ts | 2 +-
src/chart/parallel/ParallelSeries.ts | 2 +
src/component/dataZoom/InsideZoomModel.ts | 2 +-
src/component/dataZoom/SliderZoomModel.ts | 2 +-
src/component/timeline/SliderTimelineModel.ts | 2 +-
src/coord/cartesian/GridModel.ts | 2 +-
8 files changed, 116 insertions(+), 5 deletions(-)
diff --git a/option.ts b/option.ts
new file mode 100644
index 0000000..fc17c72
--- /dev/null
+++ b/option.ts
@@ -0,0 +1,107 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+import {GridOption} from './src/coord/cartesian/GridModel';
+import {PolarOption} from './src/coord/polar/PolarModel';
+import {GeoOption} from './src/coord/geo/GeoModel';
+import {SingleAxisOption} from './src/coord/single/AxisModel';
+import {ParallelAxisOption} from './src/coord/parallel/AxisModel';
+import {ParallelCoordinateSystemOption} from './src/coord/parallel/ParallelModel';
+import {CalendarOption} from './src/coord/calendar/CalendarModel';
+import {ToolboxOption} from './src/component/toolbox/ToolboxModel';
+import {TooltipOption} from './src/component/tooltip/TooltipModel';
+import {AxisPointerOption} from './src/component/axisPointer/AxisPointerModel';
+import {BrushOption} from './src/component/brush/BrushModel';
+import {TitleOption} from './src/component/title';
+
+import {TimelineOption} from './src/component/timeline/TimelineModel';
+import {SliderTimelineOption} from './src/component/timeline/SliderTimelineModel';
+
+import {LegendOption} from './src/component/legend/LegendModel';
+import {ScrollableLegendOption} from './src/component/legend/ScrollableLegendModel';
+
+import {DataZoomOption} from './src/component/dataZoom/DataZoomModel';
+import {SliderDataZoomOption} from './src/component/dataZoom/SliderZoomModel';
+import {InsideDataZoomOption} from './src/component/dataZoom/InsideZoomModel';
+
+import {VisualMapOption} from './src/component/visualMap/VisualMapModel';
+import {ContinousVisualMapOption} from './src/component/visualMap/ContinuousModel';
+import {PiecewiseVisualMapOption} from './src/component/visualMap/PiecewiseModel';
+
+import {LineSeriesOption} from './src/chart/line/LineSeries';
+import {BarSeriesOption} from './src/chart/bar/BarSeries';
+import {ScatterSeriesOption} from './src/chart/scatter/ScatterSeries';
+import {RadarSeriesOption} from './src/chart/radar/RadarSeries';
+import {MapSeriesOption} from './src/chart/map/MapSeries';
+import {TreeSeriesOption} from './src/chart/tree/TreeSeries';
+import {TreemapSeriesOption} from './src/chart/treemap/TreemapSeries';
+import {GraphSeriesOption} from './src/chart/graph/GraphSeries';
+import {GaugeSeriesOption} from './src/chart/gauge/GaugeSeries';
+import {FunnelSeriesOption} from './src/chart/funnel/FunnelSeries';
+import {ParallelSeriesOption} from './src/chart/parallel/ParallelSeries';
+import {SankeySeriesOption} from './src/chart/sankey/SankeySeries';
+import {BoxplotSeriesOption} from './src/chart/boxplot/BoxplotSeries';
+import {CandlestickSeriesOption} from './src/chart/candlestick/CandlestickSeries';
+import {EffectScatterSeriesOption} from './src/chart/effectScatter/EffectScatterSeries';
+import {LinesSeriesOption} from './src/chart/lines/LinesSeries';
+import {HeatmapSeriesOption} from './src/chart/heatmap/HeatmapSeries';
+import {PictorialBarSeriesOption} from './src/chart/bar/PictorialBarSeries';
+import {ThemeRiverSeriesOption} from './src/chart/themeRiver/ThemeRiverSeries';
+import {SunburstSeriesOption} from './src/chart/sunburst/SunburstSeries';
+
+
+export interface EChartsOption {
+ title?: TitleOption | TitleOption[]
+ grid?: GridOption | GridOption[]
+ polar?: PolarOption | PolarOption[]
+ geo?: GeoOption | GeoOption[]
+ singleAxis?: SingleAxisOption | SingleAxisOption[]
+ parallel?: ParallelCoordinateSystemOption | ParallelCoordinateSystemOption[]
+ parallelAxis?: ParallelAxisOption | ParallelAxisOption[]
+ calendar?: CalendarOption | CalendarOption[]
+ toolbox?: ToolboxOption | ToolboxOption[]
+ tooltip?: TooltipOption | TooltipOption[]
+ axisPointer?: AxisPointerOption | AxisPointerOption[]
+ brush?: BrushOption | BrushOption[]
+ timeline?: TimelineOption | SliderTimelineOption | (TimelineOption | SliderTimelineOption)[]
+ legend?: LegendOption | ScrollableLegendOption | (LegendOption | ScrollableLegendOption)[]
+ dataZoom?: SliderDataZoomOption | InsideDataZoomOption | (SliderDataZoomOption | InsideDataZoomOption)[]
+ visualMap?: (ContinousVisualMapOption | PiecewiseVisualMapOption)[]
+
+ series?: (LineSeriesOption
+ | BarSeriesOption
+ | ScatterSeriesOption
+ | RadarSeriesOption
+ | MapSeriesOption
+ | TreeSeriesOption
+ | TreemapSeriesOption
+ | GraphSeriesOption
+ | GaugeSeriesOption
+ | FunnelSeriesOption
+ | ParallelSeriesOption
+ | SankeySeriesOption
+ | BoxplotSeriesOption
+ | CandlestickSeriesOption
+ | EffectScatterSeriesOption
+ | LinesSeriesOption
+ | HeatmapSeriesOption
+ | PictorialBarSeriesOption
+ | ThemeRiverSeriesOption
+ | SunburstSeriesOption)[]
+}
\ No newline at end of file
diff --git a/src/chart/bar/PictorialBarSeries.ts b/src/chart/bar/PictorialBarSeries.ts
index 07abcc7..778ec14 100644
--- a/src/chart/bar/PictorialBarSeries.ts
+++ b/src/chart/bar/PictorialBarSeries.ts
@@ -109,6 +109,8 @@ export interface PictorialBarDataItemOption extends PictorialBarSeriesSymbolOpti
export interface PictorialBarSeriesOption extends BaseBarSeriesOption,
PictorialBarSeriesSymbolOption,
SeriesStackOptionMixin {
+ type?: 'pictorialBar'
+
coordinateSystem?: 'cartesian2d'
data?: (PictorialBarDataItemOption | PictorialBarValue)[]
diff --git a/src/chart/graph/GraphSeries.ts b/src/chart/graph/GraphSeries.ts
index 6ec4c2f..be5c250 100644
--- a/src/chart/graph/GraphSeries.ts
+++ b/src/chart/graph/GraphSeries.ts
@@ -137,7 +137,7 @@ export interface GraphCategoryItemOption extends SymbolOptionMixin {
}
}
-interface GraphSeriesOption extends SeriesOption,
+export interface GraphSeriesOption extends SeriesOption,
SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin, SeriesOnCalendarOptionMixin,
SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin,
SymbolOptionMixin,
diff --git a/src/chart/parallel/ParallelSeries.ts b/src/chart/parallel/ParallelSeries.ts
index 10f764d..1fd5c8f 100644
--- a/src/chart/parallel/ParallelSeries.ts
+++ b/src/chart/parallel/ParallelSeries.ts
@@ -56,6 +56,8 @@ export interface ParallelSeriesOption extends
SeriesOption,
SeriesEncodeOptionMixin {
+ type?: 'parallel';
+
coordinateSystem?: string;
parallelIndex?: number;
parallelId?: string;
diff --git a/src/component/dataZoom/InsideZoomModel.ts b/src/component/dataZoom/InsideZoomModel.ts
index ddf24df..3b8d3c3 100644
--- a/src/component/dataZoom/InsideZoomModel.ts
+++ b/src/component/dataZoom/InsideZoomModel.ts
@@ -21,7 +21,7 @@ import DataZoomModel, {DataZoomOption} from './DataZoomModel';
import ComponentModel from '../../model/Component';
import { inheritDefaultOption } from '../../util/component';
-interface InsideDataZoomOption extends DataZoomOption {
+export interface InsideDataZoomOption extends DataZoomOption {
/**
* Whether disable this inside zoom.
diff --git a/src/component/dataZoom/SliderZoomModel.ts b/src/component/dataZoom/SliderZoomModel.ts
index d7b6711..6165d0a 100644
--- a/src/component/dataZoom/SliderZoomModel.ts
+++ b/src/component/dataZoom/SliderZoomModel.ts
@@ -29,7 +29,7 @@ import {
} from '../../util/types';
import { inheritDefaultOption } from '../../util/component';
-interface SliderDataZoomOption extends DataZoomOption, BoxLayoutOptionMixin {
+export interface SliderDataZoomOption extends DataZoomOption, BoxLayoutOptionMixin {
show?: boolean
/**
diff --git a/src/component/timeline/SliderTimelineModel.ts b/src/component/timeline/SliderTimelineModel.ts
index 741d4f5..2791773 100644
--- a/src/component/timeline/SliderTimelineModel.ts
+++ b/src/component/timeline/SliderTimelineModel.ts
@@ -24,7 +24,7 @@ import { mixin } from 'zrender/src/core/util';
import List from '../../data/List';
import { inheritDefaultOption } from '../../util/component';
-interface SliderTimelineOption extends TimelineOption {
+export interface SliderTimelineOption extends TimelineOption {
}
class SliderTimelineModel extends TimelineModel {
diff --git a/src/coord/cartesian/GridModel.ts b/src/coord/cartesian/GridModel.ts
index df145fb..662df97 100644
--- a/src/coord/cartesian/GridModel.ts
+++ b/src/coord/cartesian/GridModel.ts
@@ -24,7 +24,7 @@ import { ComponentOption, BoxLayoutOptionMixin, ZRColor, ShadowOptionMixin } fro
import Grid from './Grid';
import { CoordinateSystemHostModel } from '../CoordinateSystem';
-interface GridOption extends ComponentOption, BoxLayoutOptionMixin, ShadowOptionMixin {
+export interface GridOption extends ComponentOption, BoxLayoutOptionMixin, ShadowOptionMixin {
show?: boolean;
// Whether grid size contain label.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org