[incubator-echarts] branch next updated: fix: fix parallel smooth update. fix #13302 .

2020-09-19 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang 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 2d1c701  fix: fix parallel smooth update. fix #13302 .
2d1c701 is described below

commit 2d1c70115e693be141e55b8e2ab6f1d6a57c2c36
Author: 100pah 
AuthorDate: Sat Sep 19 19:08:20 2020 +0800

fix: fix parallel smooth update. fix #13302 .
---
 src/chart/parallel/ParallelView.ts |  13 ++--
 test/parallel-feature.html | 139 +
 2 files changed, 145 insertions(+), 7 deletions(-)

diff --git a/src/chart/parallel/ParallelView.ts 
b/src/chart/parallel/ParallelView.ts
index 9a00f5e..af3cc25 100644
--- a/src/chart/parallel/ParallelView.ts
+++ b/src/chart/parallel/ParallelView.ts
@@ -27,6 +27,8 @@ import ExtensionAPI from '../../ExtensionAPI';
 import { StageHandlerProgressParams, ParsedValue, Payload } from 
'../../util/types';
 import Parallel from '../../coord/parallel/Parallel';
 import { OptionAxisType } from '../../coord/axisCommonTypes';
+import { numericToNumber } from '../../util/number';
+import { eqNaN } from 'zrender/src/core/util';
 
 const DEFAULT_SMOOTH = 0.3;
 
@@ -126,9 +128,6 @@ class ParallelView extends ChartView {
 }
 }
 
-/**
- * @override
- */
 remove() {
 this._dataGroup && this._dataGroup.removeAll();
 this._data = null;
@@ -185,10 +184,10 @@ function addEl(data: List, dataGroup: graphic.Group, 
dataIndex: number, dimensio
 function makeSeriesScope(seriesModel: ParallelSeriesModel): 
ParallelDrawSeriesScope {
 let smooth = seriesModel.get('smooth', true);
 smooth === true && (smooth = DEFAULT_SMOOTH);
+smooth = numericToNumber(smooth);
+eqNaN(smooth) && (smooth = 0);
 
-return {
-smooth: smooth != null ? +smooth : DEFAULT_SMOOTH
-};
+return { smooth };
 }
 
 function updateElCommon(
@@ -199,7 +198,7 @@ function updateElCommon(
 ) {
 el.useStyle(data.getItemVisual(dataIndex, 'style'));
 el.style.fill = null;
-seriesScope.smooth && (el.shape.smooth = seriesScope.smooth);
+el.setShape('smooth', seriesScope.smooth);
 
 const itemModel = 
data.getItemModel(dataIndex);
 const emphasisModel = itemModel.getModel('emphasis');
diff --git a/test/parallel-feature.html b/test/parallel-feature.html
new file mode 100644
index 000..2cd9cf4
--- /dev/null
+++ b/test/parallel-feature.html
@@ -0,0 +1,139 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+require(['echarts'/*, 'map/js/china' */], function (echarts) {
+var option;
+
+function generate_data(n, m, lb, ub) {
+let s = [];
+for (let i = 0; i < n; i++) {
+let vec = [];
+for (let j = 0; j < m; j++) {
+vec.push(lb + (Math.random() * (ub - lb)));
+}
+s.push(vec);
+}
+return s;
+}
+data = generate_data(20, 3, 0.0, 1.0);
+
+var option = {
+parallelAxis: [{
+dim: 0,
+name: 'f0'
+},
+{
+dim: 1,
+name: 'f1'
+},
+{
+dim: 2,
+name: 'f2'
+}
+],
+legend: {
+data: "data",
+},
+series: [{
+name: "data",
+type: "parallel",
+data: data,
+smooth: 0,
+lineStyle: {
+color: 'red',
+},
+}, ],
+};
+
+function updateSmooth(smoothValue) {
+chart.setOption({
+series: {
+smooth: smoothValue
+}
+});
+}
+
+var chart = testHelper.create(echarts, 'change-smooth', {
+title: [
+'Test Case Description of main0',
+'(Muliple lines and **emphasis** are supported in 
description)'
+],
+option: option,
+width: 600,
+height: 300,
+buttons: [{
+text: 'smooth: true',
+onclick: function () {
+updateSmooth(true);
+}
+}, {
+text: 'smooth: false',
+  

[incubator-echarts] 03/03: chore: tweak log.

2020-09-15 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 85c9b4c4b6faa5aef8694b8f52d1b36e8e0744c5
Author: 100pah 
AuthorDate: Tue Sep 15 16:50:10 2020 +0800

chore: tweak log.
---
 src/chart/custom.ts | 6 +++---
 src/util/log.ts | 6 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/chart/custom.ts b/src/chart/custom.ts
index 7cac6ea..0c645f8 100644
--- a/src/chart/custom.ts
+++ b/src/chart/custom.ts
@@ -19,7 +19,7 @@
 
 import {
 hasOwn, assert, isString, retrieve2, retrieve3, defaults, each,
-keys, isArrayLike, bind, logError, isFunction, eqNaN
+keys, isArrayLike, bind, isFunction, eqNaN
 } from 'zrender/src/core/util';
 import * as graphicUtil from '../util/graphic';
 import { setDefaultStateProxy, enableHoverEmphasis } from '../util/states';
@@ -81,7 +81,7 @@ import {
 import Transformable from 'zrender/src/core/Transformable';
 import { ItemStyleProps } from '../model/mixin/itemStyle';
 import { cloneValue } from 'zrender/src/animation/Animator';
-import { warn } from '../util/log';
+import { warn, error } from '../util/log';
 import { morphPath } from 'zrender/src/tool/morphPath';
 
 
@@ -1571,7 +1571,7 @@ function createOrUpdateItem(
 function applyShapeMorphingAnimation(oldEl: Element, el: Element, seriesModel: 
SeriesModel, dataIndex: number) {
 if (!((oldEl instanceof graphicUtil.Path) && (el instanceof 
graphicUtil.Path))) {
 if (__DEV__) {
-logError('`morph` can only be applied on two paths.');
+error('`morph` can only be applied on two paths.');
 }
 return;
 }
diff --git a/src/util/log.ts b/src/util/log.ts
index 4e443f6..527051c 100644
--- a/src/util/log.ts
+++ b/src/util/log.ts
@@ -40,6 +40,12 @@ export function warn(str: string) {
 }
 }
 
+export function error(str: string) {
+if (hasConsole) {
+console.error(ECHARTS_PREFIX + str);
+}
+}
+
 export function deprecateLog(str: string) {
 if (__DEV__) {
 if (storedLogs[str]) {  // Not display duplicate message.


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



[incubator-echarts] 01/03: chore: fix eslint, add console warn, enhance example.

2020-09-15 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 752f511ac660f784c6ccf419d6a0d12a3c55cbc5
Author: 100pah 
AuthorDate: Wed Sep 9 17:06:40 2020 +0800

chore: fix eslint, add console warn, enhance example.
---
 src/chart/custom.ts  |   8 +-
 src/chart/heatmap/HeatmapView.ts |   8 +-
 test/custom-transition2.html | 296 ++-
 test/data-transform-ecStat.html  |   7 +-
 4 files changed, 25 insertions(+), 294 deletions(-)

diff --git a/src/chart/custom.ts b/src/chart/custom.ts
index 5940580..6c9149b 100644
--- a/src/chart/custom.ts
+++ b/src/chart/custom.ts
@@ -18,7 +18,7 @@
 */
 
 import {
-hasOwn, assert, isString, retrieve2, retrieve3, defaults, each, keys, 
isArrayLike, bind
+hasOwn, assert, isString, retrieve2, retrieve3, defaults, each, keys, 
isArrayLike, bind, eqNaN
 } from 'zrender/src/core/util';
 import * as graphicUtil from '../util/graphic';
 import { setDefaultStateProxy, enableHoverEmphasis } from '../util/states';
@@ -80,6 +80,7 @@ import {
 import Transformable from 'zrender/src/core/Transformable';
 import { ItemStyleProps } from '../model/mixin/itemStyle';
 import { cloneValue } from 'zrender/src/animation/Animator';
+import { warn } from '../util/log';
 
 
 const inner = makeInner<{
@@ -1004,6 +1005,11 @@ const customDuringAPI = {
 }
 const style = (tmpDuringScope.el as Displayable).style;
 if (style) {
+if (__DEV__) {
+if (eqNaN(val)) {
+warn('style.' + key + ' must not be assigned with NaN.');
+}
+}
 style[key] = val;
 tmpDuringScope.isStyleDirty = true;
 }
diff --git a/src/chart/heatmap/HeatmapView.ts b/src/chart/heatmap/HeatmapView.ts
index c7c08c3..155e6b6 100644
--- a/src/chart/heatmap/HeatmapView.ts
+++ b/src/chart/heatmap/HeatmapView.ts
@@ -215,8 +215,12 @@ class HeatmapView extends ChartView {
 const dataDimY = data.get(dataDims[1], idx);
 
 // Ignore empty data and out of extent data
-if (isNaN(data.get(dataDims[2], idx) as number) || dataDimX < 
xAxisExtent[0] || dataDimX > xAxisExtent[1]
-|| dataDimY < yAxisExtent[0] || dataDimY > yAxisExtent[1]) 
{
+if (isNaN(data.get(dataDims[2], idx) as number)
+|| dataDimX < xAxisExtent[0]
+|| dataDimX > xAxisExtent[1]
+|| dataDimY < yAxisExtent[0]
+|| dataDimY > yAxisExtent[1]
+) {
 continue;
 }
 
diff --git a/test/custom-transition2.html b/test/custom-transition2.html
index f9a8338..f67be44 100644
--- a/test/custom-transition2.html
+++ b/test/custom-transition2.html
@@ -37,7 +37,6 @@ under the License.
 
 
 
-
 
 
 
@@ -52,287 +51,6 @@ under the License.
 
 
 
-
-require(['echarts'], function (echarts) {
-
-// output from echarts-stat
-var originalData = [[3.275154, 2.957587], [-3.344465, 2.603513], 
[0.355083, -3.376585], [1.852435, 3.547351], [-2.078973, 2.552013], [-0.993756, 
-0.884433], [2.682252, 4.007573], [-3.087776, 2.878713], [-1.565978, 
-1.256985], [2.441611, 0.444826], [-0.659487, 3.111284], [-0.459601, 
-2.618005], [2.17768, 2.387793], [-2.920969, 2.917485], [-0.028814, -4.168078], 
[3.625746, 2.119041], [-3.912363, 1.325108], [-0.551694, -2.814223], [2.855808, 
3.483301], [-3.594448, 2.856651], [0. [...]
-var allStepsData = [{
-
"clusterAssment":[[0,11.897518219790832],[1,0.6802138252635731],[0,13.390339526159327],[0,11.752691481115326],[1,1.3537646443055726],[0,6.098722748100828],[0,16.778555382575323],[1,0.2201162719580729],[0,9.90729312281183],[0,1.523748448197578],[1,5.280700404231374],[0,10.67860098859633],[0,5.781994590986328],[1,0.16789088367317268],[0,20.463190272942075],[0,9.485661047651329],[1,4.936282405816574],[0,12.13409250050333],[0,13.56634178686933],[1,0.6393460451944728],[0,7.153
 [...]
-
"centroids":[[1.23710375,0.1748061249998],[-2.94737575,3.32637813]],
-
"pointsInCluster":[[[3.275154,2.957587],[0.355083,-3.376585],[1.852435,3.547351],[-0.993756,-0.884433],[2.682252,4.007573],[-1.565978,-1.256985],[2.441611,0.444826],[-0.459601,-2.618005],[2.17768,2.387793],[-0.028814,-4.168078],[3.625746,2.119041],[-0.551694,-2.814223],[2.855808,3.483301],[0.421993,-2.372646],[1.650821,3.407572],[-0.718809,-2.492514],[4.513623,3.841029],[-0.656297,-1.449872],[1.919901,4.439368],[-1.576936,-2.977622],[3.598143,1.97597],[-1.79108,-2.184517]
 [...]
-}, {
-
"clusterAssment":[[0,0.14546105001184495],[1,0.6802138252635731],[2,1.0218458213990822]

[incubator-echarts] branch next updated (9be4a39 -> 85c9b4c)

2020-09-15 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


from 9be4a39  Merge pull request #13271 from apache/custom-shape-morphing
 new 752f511  chore: fix eslint, add console warn, enhance example.
 new d312b1c  Merge branch 'next' of github.com:apache/incubator-echarts 
into next
 new 85c9b4c  chore: tweak log.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/chart/custom.ts  |  11 +-
 src/chart/heatmap/HeatmapView.ts |   8 +-
 src/util/log.ts  |   6 +
 test/custom-transition2.html | 296 ++-
 test/data-transform-ecStat.html  |   7 +-
 5 files changed, 33 insertions(+), 295 deletions(-)


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



[incubator-echarts] 02/03: Merge branch 'next' of github.com:apache/incubator-echarts into next

2020-09-15 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit d312b1c724d7a6cfc102b9e2933a58b79a851454
Merge: 752f511 9be4a39
Author: 100pah 
AuthorDate: Tue Sep 15 16:48:02 2020 +0800

Merge branch 'next' of github.com:apache/incubator-echarts into next

# Conflicts:
#   src/chart/custom.ts

 src/chart/custom.ts | 103 +---
 test/custom-hexbin.html | 143 ++---
 test/custom-shape-morphing.html | 302 +++
 test/data/usa.json  |  54 +++
 test/map-nameProperty.html  | 341 +---
 5 files changed, 677 insertions(+), 266 deletions(-)

diff --cc src/chart/custom.ts
index 6c9149b,038602f..7cac6ea
--- a/src/chart/custom.ts
+++ b/src/chart/custom.ts
@@@ -18,7 -18,7 +18,8 @@@
  */
  
  import {
- hasOwn, assert, isString, retrieve2, retrieve3, defaults, each, keys, 
isArrayLike, bind, eqNaN
 -hasOwn, assert, isString, retrieve2, retrieve3, defaults, each, keys, 
isArrayLike, bind, logError, isFunction
++hasOwn, assert, isString, retrieve2, retrieve3, defaults, each,
++keys, isArrayLike, bind, logError, isFunction, eqNaN
  } from 'zrender/src/core/util';
  import * as graphicUtil from '../util/graphic';
  import { setDefaultStateProxy, enableHoverEmphasis } from '../util/states';
@@@ -80,7 -80,7 +81,8 @@@ import 
  import Transformable from 'zrender/src/core/Transformable';
  import { ItemStyleProps } from '../model/mixin/itemStyle';
  import { cloneValue } from 'zrender/src/animation/Animator';
 +import { warn } from '../util/log';
+ import { morphPath } from 'zrender/src/tool/morphPath';
  
  
  const inner = makeInner<{


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



[incubator-echarts] branch next updated (99ab1d7 -> 9be4a39)

2020-09-15 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


from 99ab1d7  ts: (1) add more strict type check for id, name from option. 
(2) add more strict conversion for id, name from option.
 add 69be972  feat(custom): add shapeMorphing option in renderItem returns.
 add 5ae6bde  fix(custom): fix other props transition when shape morphing
 add 63dfb28  fix: rename 'shapeMorphing' to 'morph' in option.
 new 9be4a39  Merge pull request #13271 from apache/custom-shape-morphing

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/chart/custom.ts | 102 +---
 test/custom-hexbin.html | 143 ++---
 test/custom-shape-morphing.html | 302 +++
 test/data/usa.json  |  54 +++
 test/map-nameProperty.html  | 341 +---
 5 files changed, 676 insertions(+), 266 deletions(-)
 create mode 100644 test/custom-shape-morphing.html
 create mode 100644 test/data/usa.json


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



[incubator-echarts] 01/01: Merge pull request #13271 from apache/custom-shape-morphing

2020-09-15 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 9be4a3943250e7f0cdcf2b841af762fe97f0fe70
Merge: 99ab1d7 63dfb28
Author: sushuang 
AuthorDate: Tue Sep 15 16:44:07 2020 +0800

Merge pull request #13271 from apache/custom-shape-morphing

[5.0] [Feature] Bring shape morphing ability in custom series

 src/chart/custom.ts | 102 +---
 test/custom-hexbin.html | 143 ++---
 test/custom-shape-morphing.html | 302 +++
 test/data/usa.json  |  54 +++
 test/map-nameProperty.html  | 341 +---
 5 files changed, 676 insertions(+), 266 deletions(-)


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



[incubator-echarts] branch custom-shape-morphing updated (5ae6bde -> 63dfb28)

2020-09-15 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch custom-shape-morphing
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


from 5ae6bde  fix(custom): fix other props transition when shape morphing
 add 63dfb28  fix: rename 'shapeMorphing' to 'morph' in option.

No new revisions were added by this update.

Summary of changes:
 src/chart/custom.ts | 8 
 test/custom-hexbin.html | 4 ++--
 test/custom-shape-morphing.html | 8 
 3 files changed, 10 insertions(+), 10 deletions(-)


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



[incubator-echarts] branch next updated: ts: (1) add more strict type check for id, name from option. (2) add more strict conversion for id, name from option.

2020-09-07 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang 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 99ab1d7  ts: (1) add more strict type check for id, name from option. 
(2) add more strict conversion for id, name from option.
99ab1d7 is described below

commit 99ab1d7a2f1413ce38dd55d3808c4e434fe49ba8
Author: 100pah 
AuthorDate: Mon Sep 7 23:59:12 2020 +0800

ts: (1) add more strict type check for id, name from option. (2) add more 
strict conversion for id, name from option.
---
 src/chart/helper/createGraphFromNodeEdge.ts |  3 +-
 src/chart/helper/whiskerBoxCommon.ts|  1 -
 src/chart/sankey/SankeySeries.ts|  2 +-
 src/component/timeline/TimelineModel.ts | 10 ++--
 src/data/List.ts| 75 ++---
 src/data/Tree.ts| 20 
 src/data/helper/dataStackHelper.ts  | 18 +++
 src/util/model.ts   | 31 +---
 src/util/types.ts   | 12 +++--
 9 files changed, 115 insertions(+), 57 deletions(-)

diff --git a/src/chart/helper/createGraphFromNodeEdge.ts 
b/src/chart/helper/createGraphFromNodeEdge.ts
index 16206de..6e07d27 100644
--- a/src/chart/helper/createGraphFromNodeEdge.ts
+++ b/src/chart/helper/createGraphFromNodeEdge.ts
@@ -30,6 +30,7 @@ import {
 OptionDataItemObject
 } from '../../util/types';
 import SeriesModel from '../../model/Series';
+import { convertOptionIdName } from '../../util/model';
 
 export default function (
 nodes: OptionSourceDataOriginal>,
@@ -59,7 +60,7 @@ export default function (
 if (graph.addEdge(source, target, linkCount)) {
 validEdges.push(link);
 linkNameList.push(zrUtil.retrieve(
-link.id != null ? link.id + '' : null,
+convertOptionIdName(link.id, null),
 source + ' > ' + target
 ));
 linkCount++;
diff --git a/src/chart/helper/whiskerBoxCommon.ts 
b/src/chart/helper/whiskerBoxCommon.ts
index d1f6976..679360d 100644
--- a/src/chart/helper/whiskerBoxCommon.ts
+++ b/src/chart/helper/whiskerBoxCommon.ts
@@ -25,7 +25,6 @@ import type { SeriesOption, SeriesOnCartesianOptionMixin, 
LayoutOrient } from '.
 import type GlobalModel from '../../model/Global';
 import type SeriesModel from '../../model/Series';
 import type CartesianAxisModel from '../../coord/cartesian/AxisModel';
-import type DataDimensionInfo from '../../data/DataDimensionInfo';
 import type List from '../../data/List';
 import type Axis2D from '../../coord/cartesian/Axis2D';
 import { CoordDimensionDefinition } from '../../data/helper/createDimensions';
diff --git a/src/chart/sankey/SankeySeries.ts b/src/chart/sankey/SankeySeries.ts
index 28d5e6f..3b6e361 100644
--- a/src/chart/sankey/SankeySeries.ts
+++ b/src/chart/sankey/SankeySeries.ts
@@ -38,7 +38,7 @@ import GlobalModel from '../../model/Global';
 import List from '../../data/List';
 import { LayoutRect } from '../../util/layout';
 import { createTooltipMarkup } from '../../component/tooltip/tooltipMarkup';
-import { defaultSeriesFormatTooltip } from 
'../../component/tooltip/seriesFormatTooltip';
+
 
 type FocusNodeAdjacency = boolean | 'inEdges' | 'outEdges' | 'allEdges';
 
diff --git a/src/component/timeline/TimelineModel.ts 
b/src/component/timeline/TimelineModel.ts
index 4598abd..7160d14 100644
--- a/src/component/timeline/TimelineModel.ts
+++ b/src/component/timeline/TimelineModel.ts
@@ -19,7 +19,6 @@
 
 import ComponentModel from '../../model/Component';
 import List from '../../data/List';
-import * as modelUtil from '../../util/model';
 import {
 ComponentOption,
 BoxLayoutOptionMixin,
@@ -38,6 +37,7 @@ import {
 import Model from '../../model/Model';
 import GlobalModel, { GlobalModelSetOptionOpts } from '../../model/Global';
 import { each, isObject, clone, isString } from 'zrender/src/core/util';
+import { convertOptionIdName, getDataItemValue } from '../../util/model';
 
 
 export interface TimelineControlStyle extends ItemStyleOption {
@@ -247,7 +247,7 @@ class TimelineModel extends ComponentModel {
 if (axisType === 'category') {
 processedDataArr = [];
 each(dataArr, function (item, index) {
-let value = modelUtil.getDataItemValue(item);
+const value = convertOptionIdName(getDataItemValue(item), '');
 let newItem;
 
 if (isObject(item)) {
@@ -260,11 +260,7 @@ class TimelineModel extends ComponentModel 
{
 
 processedDataArr.push(newItem);
 
-if (!isString(value) && (value == null || isNaN(value as 
number))) {
-value = '';
-}
-
-names.push(value + '');
+na

[incubator-echarts] branch next updated (f24d990 -> 85a47ef)

2020-09-07 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


from f24d990  fix: restrict expose of number and format: always declare 
expose explicitly.
 add bb4559f  fix: (1) Fix some buggy display result in tooltip, like 2 
value axis scatter, add add test cases for them. (2) Buggy results in 
tooltip.renderModel: 'richText' for each cases. And add test cases for them. 
(3) Add styles to renderMode: 'richText', make them the same as renderMode: 
'html'. (4) Make `tooltip.confine` default `true` if `tooltip.renderMode` is 
`richText`. And fix the positioning of it to avoid to overflow the container, 
which will be cut. (5) Fix the `tooltip [...]
 add e14fd92  fix: eslint.
 new 85a47ef  Merge pull request #13242 from apache/new-tooltip2

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/chart/graph/GraphSeries.ts |  38 +-
 src/chart/lines/LinesSeries.ts |  18 +-
 src/chart/map/MapSeries.ts |  30 +-
 src/chart/radar/RadarSeries.ts |  69 +-
 src/chart/sankey/SankeySeries.ts   |  43 +-
 src/chart/themeRiver/ThemeRiverSeries.ts   |  28 +-
 src/chart/tree/TreeSeries.ts   |  25 +-
 src/chart/treemap/TreemapSeries.ts |  19 +-
 src/component/axisPointer/axisTrigger.ts   |   4 +-
 src/component/marker/MarkerModel.ts|  37 +-
 src/component/timeline/SliderTimelineModel.ts  |   2 +-
 src/component/timeline/SliderTimelineView.ts   |   5 +-
 src/component/tooltip/TooltipHTMLContent.ts|  49 +-
 src/component/tooltip/TooltipModel.ts  |  10 +-
 src/component/tooltip/TooltipRichContent.ts|  76 +-
 src/component/tooltip/TooltipView.ts   | 301 
 .../tooltip/helper.ts} |  17 +-
 src/component/tooltip/seriesFormatTooltip.ts   | 154 
 src/component/tooltip/tooltipMarkup.ts | 529 +
 src/coord/radar/IndicatorAxis.ts   |   2 -
 src/model/Series.ts| 191 +
 src/model/mixin/dataFormat.ts  |  83 ++-
 src/util/format.ts | 121 ++-
 src/util/log.ts|   2 +-
 src/util/model.ts  |   5 +-
 src/util/number.ts |   9 +
 src/util/time.ts   |   2 +-
 src/util/types.ts  |   8 +-
 test/new-tooltip.html  | 825 ++---
 29 files changed, 1766 insertions(+), 936 deletions(-)
 copy src/{chart/graph/circularLayout.ts => component/tooltip/helper.ts} (66%)
 create mode 100644 src/component/tooltip/seriesFormatTooltip.ts
 create mode 100644 src/component/tooltip/tooltipMarkup.ts


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



[incubator-echarts] 01/01: Merge pull request #13242 from apache/new-tooltip2

2020-09-07 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 85a47ef63c1f0cf4821e3b882ea7758609a848b5
Merge: f24d990 e14fd92
Author: sushuang 
AuthorDate: Mon Sep 7 14:14:17 2020 +0800

Merge pull request #13242 from apache/new-tooltip2

fix:

 src/chart/graph/GraphSeries.ts |  38 +-
 src/chart/lines/LinesSeries.ts |  18 +-
 src/chart/map/MapSeries.ts |  30 +-
 src/chart/radar/RadarSeries.ts |  69 +-
 src/chart/sankey/SankeySeries.ts   |  43 +-
 src/chart/themeRiver/ThemeRiverSeries.ts   |  28 +-
 src/chart/tree/TreeSeries.ts   |  25 +-
 src/chart/treemap/TreemapSeries.ts |  19 +-
 src/component/axisPointer/axisTrigger.ts   |   4 +-
 src/component/marker/MarkerModel.ts|  37 +-
 src/component/timeline/SliderTimelineModel.ts  |   2 +-
 src/component/timeline/SliderTimelineView.ts   |   5 +-
 src/component/tooltip/TooltipHTMLContent.ts|  49 +-
 src/component/tooltip/TooltipModel.ts  |  10 +-
 src/component/tooltip/TooltipRichContent.ts|  76 +-
 src/component/tooltip/TooltipView.ts   | 301 
 .../tooltip/helper.ts} |  32 +-
 src/component/tooltip/seriesFormatTooltip.ts   | 154 
 src/component/tooltip/tooltipMarkup.ts | 529 +
 src/coord/radar/IndicatorAxis.ts   |   2 -
 src/model/Series.ts| 191 +
 src/model/mixin/dataFormat.ts  |  83 ++-
 src/util/format.ts | 121 ++-
 src/util/log.ts|   2 +-
 src/util/model.ts  |   5 +-
 src/util/number.ts |   9 +
 src/util/time.ts   |   2 +-
 src/util/types.ts  |   8 +-
 test/new-tooltip.html  | 825 ++---
 29 files changed, 1767 insertions(+), 950 deletions(-)


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



[incubator-echarts] 01/01: Merge pull request #13242 from apache/new-tooltip2

2020-09-07 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 85a47ef63c1f0cf4821e3b882ea7758609a848b5
Merge: f24d990 e14fd92
Author: sushuang 
AuthorDate: Mon Sep 7 14:14:17 2020 +0800

Merge pull request #13242 from apache/new-tooltip2

fix:

 src/chart/graph/GraphSeries.ts |  38 +-
 src/chart/lines/LinesSeries.ts |  18 +-
 src/chart/map/MapSeries.ts |  30 +-
 src/chart/radar/RadarSeries.ts |  69 +-
 src/chart/sankey/SankeySeries.ts   |  43 +-
 src/chart/themeRiver/ThemeRiverSeries.ts   |  28 +-
 src/chart/tree/TreeSeries.ts   |  25 +-
 src/chart/treemap/TreemapSeries.ts |  19 +-
 src/component/axisPointer/axisTrigger.ts   |   4 +-
 src/component/marker/MarkerModel.ts|  37 +-
 src/component/timeline/SliderTimelineModel.ts  |   2 +-
 src/component/timeline/SliderTimelineView.ts   |   5 +-
 src/component/tooltip/TooltipHTMLContent.ts|  49 +-
 src/component/tooltip/TooltipModel.ts  |  10 +-
 src/component/tooltip/TooltipRichContent.ts|  76 +-
 src/component/tooltip/TooltipView.ts   | 301 
 .../tooltip/helper.ts} |  32 +-
 src/component/tooltip/seriesFormatTooltip.ts   | 154 
 src/component/tooltip/tooltipMarkup.ts | 529 +
 src/coord/radar/IndicatorAxis.ts   |   2 -
 src/model/Series.ts| 191 +
 src/model/mixin/dataFormat.ts  |  83 ++-
 src/util/format.ts | 121 ++-
 src/util/log.ts|   2 +-
 src/util/model.ts  |   5 +-
 src/util/number.ts |   9 +
 src/util/time.ts   |   2 +-
 src/util/types.ts  |   8 +-
 test/new-tooltip.html  | 825 ++---
 29 files changed, 1767 insertions(+), 950 deletions(-)


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



[incubator-echarts] branch next updated (f24d990 -> 85a47ef)

2020-09-07 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


from f24d990  fix: restrict expose of number and format: always declare 
expose explicitly.
 add bb4559f  fix: (1) Fix some buggy display result in tooltip, like 2 
value axis scatter, add add test cases for them. (2) Buggy results in 
tooltip.renderModel: 'richText' for each cases. And add test cases for them. 
(3) Add styles to renderMode: 'richText', make them the same as renderMode: 
'html'. (4) Make `tooltip.confine` default `true` if `tooltip.renderMode` is 
`richText`. And fix the positioning of it to avoid to overflow the container, 
which will be cut. (5) Fix the `tooltip [...]
 add e14fd92  fix: eslint.
 new 85a47ef  Merge pull request #13242 from apache/new-tooltip2

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/chart/graph/GraphSeries.ts |  38 +-
 src/chart/lines/LinesSeries.ts |  18 +-
 src/chart/map/MapSeries.ts |  30 +-
 src/chart/radar/RadarSeries.ts |  69 +-
 src/chart/sankey/SankeySeries.ts   |  43 +-
 src/chart/themeRiver/ThemeRiverSeries.ts   |  28 +-
 src/chart/tree/TreeSeries.ts   |  25 +-
 src/chart/treemap/TreemapSeries.ts |  19 +-
 src/component/axisPointer/axisTrigger.ts   |   4 +-
 src/component/marker/MarkerModel.ts|  37 +-
 src/component/timeline/SliderTimelineModel.ts  |   2 +-
 src/component/timeline/SliderTimelineView.ts   |   5 +-
 src/component/tooltip/TooltipHTMLContent.ts|  49 +-
 src/component/tooltip/TooltipModel.ts  |  10 +-
 src/component/tooltip/TooltipRichContent.ts|  76 +-
 src/component/tooltip/TooltipView.ts   | 301 
 .../tooltip/helper.ts} |  17 +-
 src/component/tooltip/seriesFormatTooltip.ts   | 154 
 src/component/tooltip/tooltipMarkup.ts | 529 +
 src/coord/radar/IndicatorAxis.ts   |   2 -
 src/model/Series.ts| 191 +
 src/model/mixin/dataFormat.ts  |  83 ++-
 src/util/format.ts | 121 ++-
 src/util/log.ts|   2 +-
 src/util/model.ts  |   5 +-
 src/util/number.ts |   9 +
 src/util/time.ts   |   2 +-
 src/util/types.ts  |   8 +-
 test/new-tooltip.html  | 825 ++---
 29 files changed, 1766 insertions(+), 936 deletions(-)
 copy src/{chart/graph/circularLayout.ts => component/tooltip/helper.ts} (66%)
 create mode 100644 src/component/tooltip/seriesFormatTooltip.ts
 create mode 100644 src/component/tooltip/tooltipMarkup.ts


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



[incubator-echarts] branch new-tooltip2 updated: fix: eslint.

2020-09-06 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/new-tooltip2 by this push:
 new e14fd92  fix: eslint.
e14fd92 is described below

commit e14fd922bc0781df7eafd30dcca509e72350c5a8
Author: 100pah 
AuthorDate: Mon Sep 7 13:36:37 2020 +0800

fix: eslint.
---
 src/chart/radar/RadarSeries.ts | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/chart/radar/RadarSeries.ts b/src/chart/radar/RadarSeries.ts
index f7c5175..fb19f54 100644
--- a/src/chart/radar/RadarSeries.ts
+++ b/src/chart/radar/RadarSeries.ts
@@ -35,7 +35,9 @@ import {
 import GlobalModel from '../../model/Global';
 import List from '../../data/List';
 import Radar from '../../coord/radar/Radar';
-import { createTooltipMarkup, retrieveVisualColorForTooltipMarker as 
retrieveVisualColorForTooltip } from '../../component/tooltip/tooltipMarkup';
+import {
+createTooltipMarkup, retrieveVisualColorForTooltipMarker
+} from '../../component/tooltip/tooltipMarkup';
 
 type RadarSeriesDataValue = OptionDataValue[];
 
@@ -103,7 +105,7 @@ class RadarSeriesModel extends 
SeriesModel {
 const indicatorAxes = coordSys.getIndicatorAxes();
 const name = this.getData().getName(dataIndex);
 const nameToDisplay = name === '' ? this.name : name;
-const markerColor = retrieveVisualColorForTooltip(this, dataIndex);
+const markerColor = retrieveVisualColorForTooltipMarker(this, 
dataIndex);
 
 return createTooltipMarkup('section', {
 header: nameToDisplay,


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



[incubator-echarts] branch new-tooltip2 created (now bb4559f)

2020-09-06 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch new-tooltip2
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


  at bb4559f  fix: (1) Fix some buggy display result in tooltip, like 2 
value axis scatter, add add test cases for them. (2) Buggy results in 
tooltip.renderModel: 'richText' for each cases. And add test cases for them. 
(3) Add styles to renderMode: 'richText', make them the same as renderMode: 
'html'. (4) Make `tooltip.confine` default `true` if `tooltip.renderMode` is 
`richText`. And fix the positioning of it to avoid to overflow the container, 
which will be cut. (5) Fix the `tooltip [...]

This branch includes the following new commits:

 new bb4559f  fix: (1) Fix some buggy display result in tooltip, like 2 
value axis scatter, add add test cases for them. (2) Buggy results in 
tooltip.renderModel: 'richText' for each cases. And add test cases for them. 
(3) Add styles to renderMode: 'richText', make them the same as renderMode: 
'html'. (4) Make `tooltip.confine` default `true` if `tooltip.renderMode` is 
`richText`. And fix the positioning of it to avoid to overflow the container, 
which will be cut. (5) Fix the `tooltip [...]

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



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



[incubator-echarts] branch next updated (a6300c9 -> f24d990)

2020-09-06 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


from a6300c9  Merge pull request #12961 from plainheart/more-line-type
 add 0a1b895  fix: (1) fix data-transform specify dimension by index throw 
error. (2) some little refactor about source creation original brought by 
feature data transform.
 add 57fb8f7  fix: data transform: support 'fromTransformResult' and 
'transform' set on both dataset.
 add 50cdaf7  fix: make addComma more readable for tooltip and label when 
encounter "category" data.
 add 9353053  fix: [data-transform] add more hint in dev mode.
 add 68cd56e  Merge branch 'next' of github.com:apache/incubator-echarts 
into next
 add 3e46bf5  fix: fix tooltip location in rich text mode.
 add f24d990  fix: restrict expose of number and format: always declare 
expose explicitly.

No new revisions were added by this update.

Summary of changes:
 src/chart/helper/createListFromArray.ts |   6 +-
 src/component/tooltip/TooltipRichContent.ts |   2 +-
 src/component/transform/filterTransform.ts  |   2 +-
 src/component/transform/sortTransform.ts|   2 +-
 src/data/List.ts|   4 +-
 src/data/Source.ts  | 346 ++--
 src/data/helper/completeDimensions.ts   |   8 +-
 src/data/helper/createDimensions.ts |   2 +-
 src/data/helper/dataProvider.ts |  25 +-
 src/data/helper/sourceHelper.ts | 288 +--
 src/data/helper/sourceManager.ts|  55 +++--
 src/data/helper/transform.ts| 173 +-
 src/export.ts   |  54 -
 src/model/Series.ts |   2 +-
 src/util/format.ts  |   6 +-
 src/util/log.ts |  44 ++--
 src/util/types.ts   |   2 +-
 test/data-transform.html| 111 +
 test/new-tooltip.html   | 115 -
 19 files changed, 758 insertions(+), 489 deletions(-)


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



[incubator-echarts-doc] branch next updated: fix: tweak the last commit.

2020-08-30 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/next by this push:
 new f5b3148  fix: tweak the last commit.
 new 3bfd5ea  Merge branch 'next' of 
github.com:apache/incubator-echarts-doc into next
f5b3148 is described below

commit f5b314874c8d4a6a70d308657020caed4eb3d900
Author: 100pah 
AuthorDate: Tue Aug 25 21:57:43 2020 +0800

fix: tweak the last commit.
---
 en/tutorial/data-transform.md | 3 ---
 zh/tutorial/data-transform.md | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/en/tutorial/data-transform.md b/en/tutorial/data-transform.md
index b325345..8c532ea 100644
--- a/en/tutorial/data-transform.md
+++ b/en/tutorial/data-transform.md
@@ -547,9 +547,6 @@ option = {
 method: 'exponential'
 }
 }
-}, {
-fromDatasetIndex: 1,
-fromTransformResult: 1
 }],
 xAxis: { type: 'category' },
 yAxis: {},
diff --git a/zh/tutorial/data-transform.md b/zh/tutorial/data-transform.md
index 0d40d39..203ee1f 100644
--- a/zh/tutorial/data-transform.md
+++ b/zh/tutorial/data-transform.md
@@ -536,9 +536,6 @@ option = {
 method: 'exponential'
 }
 }
-}, {
-fromDatasetIndex: 1,
-fromTransformResult: 1
 }],
 xAxis: { type: 'category' },
 yAxis: {},


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



[incubator-echarts-doc] branch next updated: fix: tweak the last commit.

2020-08-30 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/next by this push:
 new f5b3148  fix: tweak the last commit.
 new 3bfd5ea  Merge branch 'next' of 
github.com:apache/incubator-echarts-doc into next
f5b3148 is described below

commit f5b314874c8d4a6a70d308657020caed4eb3d900
Author: 100pah 
AuthorDate: Tue Aug 25 21:57:43 2020 +0800

fix: tweak the last commit.
---
 en/tutorial/data-transform.md | 3 ---
 zh/tutorial/data-transform.md | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/en/tutorial/data-transform.md b/en/tutorial/data-transform.md
index b325345..8c532ea 100644
--- a/en/tutorial/data-transform.md
+++ b/en/tutorial/data-transform.md
@@ -547,9 +547,6 @@ option = {
 method: 'exponential'
 }
 }
-}, {
-fromDatasetIndex: 1,
-fromTransformResult: 1
 }],
 xAxis: { type: 'category' },
 yAxis: {},
diff --git a/zh/tutorial/data-transform.md b/zh/tutorial/data-transform.md
index 0d40d39..203ee1f 100644
--- a/zh/tutorial/data-transform.md
+++ b/zh/tutorial/data-transform.md
@@ -536,9 +536,6 @@ option = {
 method: 'exponential'
 }
 }
-}, {
-fromDatasetIndex: 1,
-fromTransformResult: 1
 }],
 xAxis: { type: 'category' },
 yAxis: {},


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



[incubator-echarts-website] branch asf-site updated: update

2020-08-27 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new 4a5dad3  update
4a5dad3 is described below

commit 4a5dad33ac0f9feac71db62621ecf97a88e020ac
Author: 100pah 
AuthorDate: Thu Aug 27 17:31:36 2020 +0800

update
---
 examples/en/editor.html | 2 +-
 examples/zh/editor.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/en/editor.html b/examples/en/editor.html
index ab364eb..f5f049b 100644
--- a/examples/en/editor.html
+++ b/examples/en/editor.html
@@ -40,7 +40,7 @@ window.EC_EXAMPLE_IS_GL = (function () {
 // But echarts-gl do not support CORS yet, still use same origin.
 window.ROOT_PATH = EC_EXAMPLE_IS_GL ? 'https://echarts.apache.org/examples' : 
'https://echarts.apache.org/examples';
 window.CDN_PAY_ROOT_PATH = 'https://echarts.apache.org/examples';
-window.CDN_PAY_VERSION = '20200710_1';
+window.CDN_PAY_VERSION = '20200710_2';
 window.CDN_THIRD_PARTY_ECHARTS_GL = 
'https://cdn.jsdelivr.net/npm/echarts-gl/dist/echarts-gl.min.js'
 https://cdn.jsdelivr.net/npm/dat.gui@0.6.5/build/dat.gui.min.js&quot</a>;>https://cdn.jsdelivr.net/npm/echarts/dist/echarts.min.js?_v_=1597861062346&quot</a>;>https://cdn.jsdelivr.net/npm/echarts-stat/dist/ecStat.min.js&quot</a>;>https://cdn.jsdelivr.net/npm/echarts/map/js/china.js?_v_=1597861062346&quot</a>;>https://echarts.apache.org/examples</a>' : 
'<a  rel="nofollow" href="https://echarts-www.cdn.bcebos.com/examples">https://echarts-www.cdn.bcebos.com/examples</a>';
 window.CDN_PAY_ROOT_PATH = '<a  rel="nofollow" href="https://echarts-www.cdn.bcebos.com/examples">https://echarts-www.cdn.bcebos.com/examples</a>';
-window.CDN_PAY_VERSION = '20200710_1';
+window.CDN_PAY_VERSION = '20200710_2';
 window.CDN_THIRD_PARTY_ECHARTS_GL = 
'<a  rel="nofollow" href="https://cdn.jsdelivr.net/npm/echarts-gl/dist/echarts-gl.min.js">https://cdn.jsdelivr.net/npm/echarts-gl/dist/echarts-gl.min.js</a>'
 https://cdn.jsdelivr.net/npm/dat.gui@0.6.5/build/dat.gui.min.js&quot</a>;>https://cdn.jsdelivr.net/npm/echarts/dist/echarts.min.js?_v_=1597861062346&quot</a>;>https://cdn.jsdelivr.net/npm/echarts-stat/dist/ecStat.min.js&quot</a>;>https://cdn.jsdelivr.net/npm/echarts/map/js/china.js?_v_=1597861062346&quot</a>;>

[incubator-echarts-website] branch asf-site updated: update

2020-08-27 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new e8be264  update
e8be264 is described below

commit e8be2644af769071d24570256be3cc22a6fda67d
Author: 100pah 
AuthorDate: Thu Aug 27 17:20:14 2020 +0800

update
---
 examples/data/map-parallel-prices.js | 416 ---
 1 file changed, 416 deletions(-)

diff --git a/examples/data/map-parallel-prices.js 
b/examples/data/map-parallel-prices.js
index 4e85823..e69de29 100644
--- a/examples/data/map-parallel-prices.js
+++ b/examples/data/map-parallel-prices.js
@@ -1,416 +0,0 @@
-
-var geoCoordMap = {
-"Amsterdam": [4.895168,52.370216],
-"Athens": [-83.357567,33.951935],
-"Auckland": [174.763332,-36.84846],
-"Bangkok": [100.501765,13.756331],
-"Barcelona": [2.173403,41.385064],
-"Beijing": [116.407395,39.904211],
-"Berlin": [13.404954,52.520007],
-"Bogotá": [-74.072092,4.710989],
-"Bratislava": [17.107748,48.148596],
-"Brussels": [4.35171,50.85034],
-"Budapest": [19.040235,47.497912],
-"Buenos Aires": [-58.381559,-34.603684],
-"Bucharest": [26.102538,44.426767],
-"Caracas": [-66.903606,10.480594],
-"Chicago": [-87.629798,41.878114],
-"Delhi": [77.209021,28.613939],
-"Doha": [51.53104,25.285447],
-"Dubai": [55.270783,25.204849],
-"Dublin": [-6.26031,53.349805],
-"Frankfurt": [8.682127,50.110922],
-"Geneva": [6.143158,46.204391],
-"Helsinki": [24.938379,60.169856],
-"Hong Kong": [114.109497,22.396428],
-"Istanbul": [28.978359,41.008238],
-"Jakarta": [106.845599,-6.208763],
-"Johannesburg": [28.047305,-26.204103],
-"Cairo": [31.235712,30.04442],
-"Kiev": [30.5234,50.4501],
-"Copenhagen": [12.568337,55.676097],
-"Kuala Lumpur": [101.686855,3.139003],
-"Lima": [-77.042793,-12.046374],
-"Lisbon": [-9.139337,38.722252],
-"Ljubljana": [14.505751,46.056947],
-"London": [-0.127758,51.507351],
-"Los Angeles": [-118.243685,34.052234],
-"Luxembourg": [6.129583,49.815273],
-"Lyon": [4.835659,45.764043],
-"Madrid": [-3.70379,40.416775],
-"Milan": [9.185924,45.465422],
-"Manama": [50.58605,26.228516],
-"Manila": [120.984219,14.599512],
-"Mexico City": [-99.133208,19.432608],
-"Miami": [-80.19179,25.76168],
-"Montreal": [-73.567256,45.501689],
-"Moscow": [37.6173,55.755826],
-"Mumbai": [72.877656,19.075984],
-"Munich": [11.581981,48.135125],
-"Nairobi": [36.821946,-1.292066],
-"New York": [-74.005941,40.712784],
-"Nicosia": [33.382276,35.185566],
-"Oslo": [10.752245,59.913869],
-"Paris": [2.35,48.856614],
-"Prague": [14.4378,50.075538],
-"Riga": [24.105186,56.949649],
-"Rio de Janeiro": [-43.172896,-22.906847],
-"Rome": [12.496366,41.902783],
-"Santiago de Chile": [-70.669265,-33.44889],
-"São Paulo": [-46.633309,-23.55052],
-"Seoul": [126.977969,37.566535],
-"Shanghai": [121.473701,31.230416],
-"Singapore": [103.819836,1.352083],
-"Sofia": [23.321868,42.697708],
-"Stockholm": [18.068581,59.329323],
-"Sydney": [151.209296,-33.86882],
-"Taipei": [121.565418,25.032969],
-"Tallinn": [24.753575,59.436961],
-"Tel Aviv": [34.781768,32.0853],
-"Tokyo": [139.691706,35.689487],
-"Toronto": [-79.383184,43.653226],
-"Vilnius": [25.279651,54.687156],
-"Warsaw": [21.012229,52.229676],
-"Vienna": [16.373819,48.208174],
-"Zurich": [8.541694,47.376887]
-};
-
-var schema = [
-"Cities",
-"Gross purchasing power",
-"Net purchasing power",
-"Prices (excl. rent)",
-"Prices (incl. rent)",
-"Gross wages",
-"Net wages",
-"Working time [hours per year]",
-"Vacation [paid working days per year]",
-"Time required for 1 Big Mac [minutes]",
-"Time required for 1 kg of bread [minutes]",
-"Time required for 1 kg of rice [minutes]",
-"Time required for 1 iPhone 4S, 16 GB [hours]&q

[incubator-echarts-doc] branch next updated: fix: add missing doc for data-transform

2020-08-25 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/next by this push:
 new 145e8a9  fix: add missing doc for data-transform
 new a8d3952  Merge branch 'next' of 
github.com:apache/incubator-echarts-doc into next
145e8a9 is described below

commit 145e8a9f9dc5dffaa1750a186d5738460397518e
Author: 100pah 
AuthorDate: Tue Aug 25 21:39:31 2020 +0800

fix: add missing doc for data-transform
---
 en/option/component/dataset.md | 21 +
 en/tutorial/data-transform.md  | 14 ++
 zh/option/component/dataset.md | 21 +
 zh/tutorial/data-transform.md  | 14 ++
 4 files changed, 70 insertions(+)

diff --git a/en/option/component/dataset.md b/en/option/component/dataset.md
index b02e1f2..6729866 100644
--- a/en/option/component/dataset.md
+++ b/en/option/component/dataset.md
@@ -72,3 +72,24 @@ Note: "the first row/column" means that if 
[series.seriesLayoutBy](~series.serie
 {{ import: component-data-transform-filter }}
 {{ import: component-data-transform-sort }}
 {{ import: component-data-transform-external }}
+
+## fromDatasetIndex(number)
+
+Specify the input dataset for [dataset.transform](~dataset.transform).
+If [dataset.transform](~dataset.transform) specified but both 
`fromDatasetIndex` and `fromDatasetId` are not specified, `fromDatasetIndex: 0` 
will be used by default.
+
+{{ use: partial-data-transform-tutorial-ref }}
+
+## fromDatasetId(string)
+
+Specify the input dataset for [dataset.transform](~dataset.transform).
+
+{{ use: partial-data-transform-tutorial-ref }}
+
+## fromTransformResult(number)
+
+If a [dataset.transform](~dataset.transform) produces more than one result, we 
can use `fromTransformResult` to retrieve some certain result.
+
+In most cases, `fromTransformResult` do not need to be specified because most 
transforms only produce one result. If `fromTransformResult` is not specified, 
we use `fromTransformResult: 0` by default.
+
+{{ use: partial-data-transform-tutorial-ref }}
diff --git a/en/tutorial/data-transform.md b/en/tutorial/data-transform.md
index 9141544..b325345 100644
--- a/en/tutorial/data-transform.md
+++ b/en/tutorial/data-transform.md
@@ -148,6 +148,7 @@ In most cases, transform functions only need to produce one 
data. But there is i
 
 For example, in the built-in boxplot transform, besides boxplot data produced, 
the outlier data are also produced, which can be used in a scatter series. See 
the [example](${galleryEditorPath}boxplot-light-velocity=1=1).
 
+We use prop 
[dataset.fromTransformResult](option.html#dataset.fromTransformResult) to 
satisfy this requirement. For example:
 
 ```js
 option = {
@@ -191,6 +192,19 @@ option = {
 };
 ```
 
+What more, 
[dataset.fromTransformResult](option.html#dataset.fromTransformResult) and 
[dataset.transform](option.html#dataset.transform) can both appear in one 
dataset, which means that the input of the transform is from retrieved from the 
upstream result specified by `fromTransformResult`. For example:
+
+```js
+{
+fromDatasetIndex: 1,
+fromTransformResult: 1,
+transform: {
+type: 'sort',
+config: { dimension: 2, order: 'desc' }
+}
+}
+```
+
 
 ### Debug in develop environment
 
diff --git a/zh/option/component/dataset.md b/zh/option/component/dataset.md
index 2e22d77..5ad3cc4 100644
--- a/zh/option/component/dataset.md
+++ b/zh/option/component/dataset.md
@@ -74,3 +74,24 @@ ECharts 4 开始支持了 `数据集`(`dataset`)组件用于单独的数据
 {{ import: component-data-transform-sort }}
 {{ import: component-data-transform-external }}
 
+
+## fromDatasetIndex(number)
+
+指定 [dataset.transform](~dataset.transform) 以哪个 dataset 作为输入。如果 
[dataset.transform](~dataset.transform) 被指定了,但是 `fromDatasetIndex` 和 
`fromDatasetId` 都没有被指定,那么默认会使用 `fromDatasetIndex: 0`.
+
+{{ use: partial-data-transform-tutorial-ref }}
+
+## fromDatasetId(string)
+
+指定 [dataset.transform](~dataset.transform) 以哪个 dataset 作为输入。
+
+{{ use: partial-data-transform-tutorial-ref }}
+
+## fromTransformResult(number)
+
+如果一个 [dataset.transform](~dataset.transform) 会产出多个结果 data ,我们可以使用 
`fromTransformResult` 获得特定的结果。
+
+大多数场景下,transform 只会产出一个结果,所以大多数情况下 `fromTransformResult` 并不需要指定。当不指定 
`fromTransformResult` 时,默认使用 `fromTransformResult: 0`。
+
+{{ use: partial-data-transform-tutorial-ref }}
+
diff --git a/zh/tutorial/data-transform.md b/zh/tutorial/data-transform.md
index 2e8d29d..0d40d39 100644
--- a/zh/tutorial/data-transform.md
+++ b/zh/tutorial/data-transform.md
@@ -139,6 +139,7 @@ option: {
 
 例如,在内置的 "boxplot" transform 中,除了 boxplot 系列所需要的 data 外,离群点( outlier 
)也会被生成,并且可以用例如散点图系列显示出来。例如,[example](${galleryEditorPath}boxplot-light-velocity=1=1)。
 
+我们提供配置 [dataset.fromTransformResult](option.html#dataset.fromTransformResult) 
来满足这种情况,例如:
 
 ```js
 option = {
@@ -184,6 +185,19 @@ optio

[incubator-echarts-doc] branch next updated: add doc for data-transform

2020-08-24 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/next by this push:
 new d8744a6  add doc for data-transform
d8744a6 is described below

commit d8744a602ba39dbcf51a48e7dcad30b8930e0e24
Author: 100pah 
AuthorDate: Mon Aug 24 16:53:28 2020 +0800

add doc for data-transform
---
 build.js   |   2 +-
 en/option/component/data-transform-external.md |  20 +
 en/option/component/data-transform-filter.md   |  14 +
 en/option/component/data-transform-sort.md |  14 +
 en/option/component/dataset.md |  10 +-
 en/option/partial/data-transform.md|  25 ++
 en/tutorial/data-transform.md  | 556 +
 en/tutorial/dataset.md |  12 +
 en/tutorial/tutorial.md|   1 +
 tool/extractDesc.js|   3 +-
 zh/option/component/data-transform-external.md |  21 +
 zh/option/component/data-transform-filter.md   |  14 +
 zh/option/component/data-transform-sort.md |  14 +
 zh/option/component/dataset.md |  12 +-
 zh/option/partial/data-transform.md|  27 ++
 zh/tutorial/data-transform.md  | 545 
 zh/tutorial/dataset.md |   4 +
 zh/tutorial/tutorial.md|   1 +
 18 files changed, 1291 insertions(+), 4 deletions(-)

diff --git a/build.js b/build.js
index b8cc3df..9e3bc24 100644
--- a/build.js
+++ b/build.js
@@ -131,7 +131,7 @@ async function run() {
 
 for (let language of languages) {
 await md2jsonAsync({
-sectionsAnyOf: ['visualMap', 'dataZoom', 'series', 
'graphic.elements'],
+sectionsAnyOf: ['visualMap', 'dataZoom', 'series', 
'graphic.elements', 'dataset.transform'],
 entry: 'option',
 language
 });
diff --git a/en/option/component/data-transform-external.md 
b/en/option/component/data-transform-external.md
new file mode 100644
index 000..6b7f1d9
--- /dev/null
+++ b/en/option/component/data-transform-external.md
@@ -0,0 +1,20 @@
+{{ target: component-data-transform-external }}
+
+## transform.xxx:xxx(Object)
+
+Besides built-in transforms (like 'filter', 'sort'), we can also use external 
transforms to provide more powerful functionalities.
+
+{{ use: partial-data-transform-tutorial-ref }}
+
+### type(string) = 'xxx:xxx'
+
+Built-in transform has no namespace (like `type: 'filter'`, `type: 'sort'`).
+
+External transform has namespace (like `type: 'ecStat:regression'`).
+
+### config
+
+The needed parameters of this data transform. Each type of transform has its 
own definition of `config`.
+
+
+{{ use: partial-data-transform-print }}
diff --git a/en/option/component/data-transform-filter.md 
b/en/option/component/data-transform-filter.md
new file mode 100644
index 000..698da5d
--- /dev/null
+++ b/en/option/component/data-transform-filter.md
@@ -0,0 +1,14 @@
+{{ target: component-data-transform-filter }}
+
+## transform.filter(Object)
+
+### type(string) = 'filter'
+
+### config
+
+The condition of transform "filter".
+
+{{ use: partial-data-transform-tutorial-ref }}
+
+
+{{ use: partial-data-transform-print }}
diff --git a/en/option/component/data-transform-sort.md 
b/en/option/component/data-transform-sort.md
new file mode 100644
index 000..a8d3007
--- /dev/null
+++ b/en/option/component/data-transform-sort.md
@@ -0,0 +1,14 @@
+{{ target: component-data-transform-sort }}
+
+## transform.sort(Object)
+
+### type(string) = 'sort'
+
+### config
+
+The condition of transform "sort".
+
+{{ use: partial-data-transform-tutorial-ref }}
+
+
+{{ use: partial-data-transform-print }}
diff --git a/en/option/component/dataset.md b/en/option/component/dataset.md
index 1ee7c35..b02e1f2 100644
--- a/en/option/component/dataset.md
+++ b/en/option/component/dataset.md
@@ -7,7 +7,6 @@
 
 More details about `dataset` can be checked in the 
[tutorial](tutorial.html#Dataset).
 

 
 {{use: partial-component-id(prefix="#")}}
 
@@ -64,3 +63,12 @@ Whether the first row/column of `dataset.source` represents 
[dimension names](da
 + `false`: data start from the first row/column.
 
 Note: "the first row/column" means that if 
[series.seriesLayoutBy](~series.seriesLayoutBy) is set as `'column'`, pick the 
first row, otherwise, if it is set as `'row'`, pick the first column.
+
+
+## transform(Object)
+
+{{ use: partial-data-transform-tutorial-ref }}
+
+{{ import: component-data-transform-filter }}
+{{ import: component-data-transform-sort }}
+{{ import: component-data-transform-external }}
diff --git a/en/option/partial/data-transform.md 
b/en/option/partial/data-transform.md
new file mode 100644
index 000..7344d22
--- /dev/null
+++ b/en/option/partial/data-

[incubator-echarts-doc] branch next updated: (1) `npm run localsite` to update example rapidly in dev. (2) add error hint. (3) tweak text in doc.

2020-08-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/next by this push:
 new eea4d0d  (1) `npm run localsite` to update example rapidly in dev. (2) 
add error hint. (3) tweak text in doc.
eea4d0d is described below

commit eea4d0d50c5d590534fafa9e3873d3e2e9f6f370
Author: 100pah 
AuthorDate: Tue Aug 18 23:03:03 2020 +0800

(1) `npm run localsite` to update example rapidly in dev. (2) add error 
hint. (3) tweak text in doc.
---
 en/tutorial/media-query.md |  2 +-
 package.json   |  1 +
 tool/md2json.js| 14 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/en/tutorial/media-query.md b/en/tutorial/media-query.md
index f126031..34d88ab 100644
--- a/en/tutorial/media-query.md
+++ b/en/tutorial/media-query.md
@@ -133,7 +133,7 @@ A `query` is in the following format:
 }
 ```
 
-Currently there are three supported attributes:`width`, `height`, 
`aspectRatio` (length-to-width ratio), each of which can add `min` or `max` as 
prefix. E.g., `minWidth: 200` stands for when width is greater than or equal to 
200px. When two attributes are written together, it means *and* in Bool logic. 
For example, `{minWidth: 200, maxHeight: 300}` stands for when width is greater 
than or equal to 200px and height is smaller than or equal to 300px.
+Currently there are three supported attributes:`width`, `height`, 
`aspectRatio` (height / width), each of which can add `min` or `max` as prefix. 
E.g., `minWidth: 200` stands for when width is greater than or equal to 200px. 
When two attributes are written together, it means *and* in Bool logic. For 
example, `{minWidth: 200, maxHeight: 300}` stands for when width is greater 
than or equal to 200px and height is smaller than or equal to 300px.
 
 
 **option: **
diff --git a/package.json b/package.json
index 91af066..89be2dc 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
   "scripts": {
 "build": "node build.js --env asf",
 "watch": "node build.js --env dev --watch",
+"localsite": "node build.js --env localsite",
 "build:site": "npx webpack --config build/webpack.config.js --mode 
production",
 "watch:site": "npx webpack --config build/webpack.config.js --mode 
development --devtool sourcemap --watch",
 "server": "node server.js",
diff --git a/tool/md2json.js b/tool/md2json.js
index bd8b2fc..bff7203 100644
--- a/tool/md2json.js
+++ b/tool/md2json.js
@@ -3,6 +3,7 @@ const marked = require('marked');
 const etpl = require('etpl');
 const glob = require('glob');
 const htmlparser2 = require('htmlparser2');
+const chalk = require('chalk');
 
 function convert(opts, cb) {
 const mdPath = opts.path;
@@ -42,7 +43,18 @@ function convert(opts, cb) {
 Object.prototype[key] = tplEnv[key];
 });
 
-var mdStr = etplEngine.getRenderer(entry)({});
+var mdStr;
+var compileErr;
+try {
+mdStr = etplEngine.getRenderer(entry)({});
+}
+catch (err) {
+compileErr = err;
+}
+if (compileErr) {
+console.error(chalk.red('There is something illegal in doc md!'));
+throw err;
+}
 
 // Restore the global variables.
 Object.keys(tplEnv).forEach(function (key) {


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



[incubator-echarts] branch next updated: feature: enable media query and timeline declared without `baseOption` in echarts option.

2020-08-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang 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 2deacbd  feature: enable media query and timeline declared without 
`baseOption` in echarts option.
2deacbd is described below

commit 2deacbd5203701ef836a15e99d8c059df7a4782b
Author: 100pah 
AuthorDate: Tue Aug 18 15:03:16 2020 +0800

feature: enable media query and timeline declared without `baseOption` in 
echarts option.
---
 package.json|   1 +
 src/model/OptionManager.ts  | 130 +--
 src/util/types.ts   |   8 +-
 test/media-pie.html | 292 
 test/ut/spec/model/timelineMediaOptions.test.js | 430 
 test/ut/spec/model/timelineOptions.test.js  | 178 --
 6 files changed, 674 insertions(+), 365 deletions(-)

diff --git a/package.json b/package.json
index 186f1f0..fdfc853 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
 "test:visual": "node test/runTest/server.js",
 "test:visual:report": "node test/runTest/genReport.js",
 "test": "node build/build.js --prepublish && jest --config 
test/ut/jest.config.js",
+"test:single": "jest --config test/ut/jest.config.js --coverage=false -t",
 "mktest": "node test/build/mktest.js",
 "mktest:help": "node test/build/mktest.js -h",
 "lint": "./node_modules/.bin/eslint src/**/*.ts extension-src/**/*.ts",
diff --git a/src/model/OptionManager.ts b/src/model/OptionManager.ts
index b92d5b4..850a29f 100644
--- a/src/model/OptionManager.ts
+++ b/src/model/OptionManager.ts
@@ -235,34 +235,105 @@ class OptionManager {
 
 }
 
+/**
+ * [RAW_OPTION_PATTERNS]
+ * (Note: "series: []" represents all other props in `ECUnitOption`)
+ *
+ * (1) No prop "baseOption" declared:
+ * Root option is used as "baseOption" (except prop "options" and "media").
+ * ```js
+ * option = {
+ * series: [],
+ * timeline: {},
+ * options: [],
+ * };
+ * option = {
+ * series: [],
+ * media: {},
+ * };
+ * option = {
+ * series: [],
+ * timeline: {},
+ * options: [],
+ * media: {},
+ * }
+ * ```
+ *
+ * (2) Prop "baseOption" declared:
+ * If "baseOption" declared, `ECUnitOption` props can only be declared
+ * inside "baseOption" except prop "timeline" (compat ec2).
+ * ```js
+ * option = {
+ * baseOption: {
+ * timeline: {},
+ * series: [],
+ * },
+ * options: []
+ * };
+ * option = {
+ * baseOption: {
+ * series: [],
+ * },
+ * media: []
+ * };
+ * option = {
+ * baseOption: {
+ * timeline: {},
+ * series: [],
+ * },
+ * options: []
+ * media: []
+ * };
+ * option = {
+ * // ec3 compat ec2: allow (only) `timeline` declared
+ * // outside baseOption. Keep this setting for compat.
+ * timeline: {},
+ * baseOption: {
+ * series: [],
+ * },
+ * options: [],
+ * media: []
+ * };
+ * ```
+ */
 function parseRawOption(
+// `rawOption` May be modified
 rawOption: ECOption,
 optionPreprocessorFuncs: OptionPreprocessor[],
 isNew: boolean
 ): ParsedRawOption {
-let timelineOptions: ECUnitOption[] = [];
 const mediaList: MediaUnit[] = [];
 let mediaDefault: MediaUnit;
 let baseOption: ECUnitOption;
 
-// Compatible with ec2.
-const timelineOpt = rawOption.timeline;
+const declaredBaseOption = rawOption.baseOption;
+// Compatible with ec2, [RAW_OPTION_PATTERNS] above.
+const timelineOnRoot = rawOption.timeline;
+const timelineOptionsOnRoot = rawOption.options;
+const mediaOnRoot = rawOption.media;
+const hasMedia = !!rawOption.media;
+const hasTimeline = !!(
+timelineOptionsOnRoot || timelineOnRoot || (declaredBaseOption && 
declaredBaseOption.timeline)
+);
 
-if (rawOption.baseOption) {
-baseOption = rawOption.baseOption;
+if (declaredBaseOption) {
+baseOption = declaredBaseOption;
+// For merge option.
+if (!baseOption.timeline) {
+baseOption.timeline = timelineOnRoot;
+}
 }
-
-// For timeline
-if (timelineOpt || rawOption.options) {
-baseOption = baseOption || {} as ECUnitOption;
-timelineOptions = (rawOption.options || []).slice();
+// For convenience, enable to use the root option as the `baseOption`:
+// `{ ...normalOptionProps, media: [{ ... }, { ... }] }`
+else {
+if (hasTimeline || hasMedia) {
+rawOption.options = rawOption.media = null;
+}
+  

[incubator-echarts] branch next updated: feature: enable media query and timeline declared without `baseOption` in echarts option.

2020-08-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang 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 2deacbd  feature: enable media query and timeline declared without 
`baseOption` in echarts option.
2deacbd is described below

commit 2deacbd5203701ef836a15e99d8c059df7a4782b
Author: 100pah 
AuthorDate: Tue Aug 18 15:03:16 2020 +0800

feature: enable media query and timeline declared without `baseOption` in 
echarts option.
---
 package.json|   1 +
 src/model/OptionManager.ts  | 130 +--
 src/util/types.ts   |   8 +-
 test/media-pie.html | 292 
 test/ut/spec/model/timelineMediaOptions.test.js | 430 
 test/ut/spec/model/timelineOptions.test.js  | 178 --
 6 files changed, 674 insertions(+), 365 deletions(-)

diff --git a/package.json b/package.json
index 186f1f0..fdfc853 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
 "test:visual": "node test/runTest/server.js",
 "test:visual:report": "node test/runTest/genReport.js",
 "test": "node build/build.js --prepublish && jest --config 
test/ut/jest.config.js",
+"test:single": "jest --config test/ut/jest.config.js --coverage=false -t",
 "mktest": "node test/build/mktest.js",
 "mktest:help": "node test/build/mktest.js -h",
 "lint": "./node_modules/.bin/eslint src/**/*.ts extension-src/**/*.ts",
diff --git a/src/model/OptionManager.ts b/src/model/OptionManager.ts
index b92d5b4..850a29f 100644
--- a/src/model/OptionManager.ts
+++ b/src/model/OptionManager.ts
@@ -235,34 +235,105 @@ class OptionManager {
 
 }
 
+/**
+ * [RAW_OPTION_PATTERNS]
+ * (Note: "series: []" represents all other props in `ECUnitOption`)
+ *
+ * (1) No prop "baseOption" declared:
+ * Root option is used as "baseOption" (except prop "options" and "media").
+ * ```js
+ * option = {
+ * series: [],
+ * timeline: {},
+ * options: [],
+ * };
+ * option = {
+ * series: [],
+ * media: {},
+ * };
+ * option = {
+ * series: [],
+ * timeline: {},
+ * options: [],
+ * media: {},
+ * }
+ * ```
+ *
+ * (2) Prop "baseOption" declared:
+ * If "baseOption" declared, `ECUnitOption` props can only be declared
+ * inside "baseOption" except prop "timeline" (compat ec2).
+ * ```js
+ * option = {
+ * baseOption: {
+ * timeline: {},
+ * series: [],
+ * },
+ * options: []
+ * };
+ * option = {
+ * baseOption: {
+ * series: [],
+ * },
+ * media: []
+ * };
+ * option = {
+ * baseOption: {
+ * timeline: {},
+ * series: [],
+ * },
+ * options: []
+ * media: []
+ * };
+ * option = {
+ * // ec3 compat ec2: allow (only) `timeline` declared
+ * // outside baseOption. Keep this setting for compat.
+ * timeline: {},
+ * baseOption: {
+ * series: [],
+ * },
+ * options: [],
+ * media: []
+ * };
+ * ```
+ */
 function parseRawOption(
+// `rawOption` May be modified
 rawOption: ECOption,
 optionPreprocessorFuncs: OptionPreprocessor[],
 isNew: boolean
 ): ParsedRawOption {
-let timelineOptions: ECUnitOption[] = [];
 const mediaList: MediaUnit[] = [];
 let mediaDefault: MediaUnit;
 let baseOption: ECUnitOption;
 
-// Compatible with ec2.
-const timelineOpt = rawOption.timeline;
+const declaredBaseOption = rawOption.baseOption;
+// Compatible with ec2, [RAW_OPTION_PATTERNS] above.
+const timelineOnRoot = rawOption.timeline;
+const timelineOptionsOnRoot = rawOption.options;
+const mediaOnRoot = rawOption.media;
+const hasMedia = !!rawOption.media;
+const hasTimeline = !!(
+timelineOptionsOnRoot || timelineOnRoot || (declaredBaseOption && 
declaredBaseOption.timeline)
+);
 
-if (rawOption.baseOption) {
-baseOption = rawOption.baseOption;
+if (declaredBaseOption) {
+baseOption = declaredBaseOption;
+// For merge option.
+if (!baseOption.timeline) {
+baseOption.timeline = timelineOnRoot;
+}
 }
-
-// For timeline
-if (timelineOpt || rawOption.options) {
-baseOption = baseOption || {} as ECUnitOption;
-timelineOptions = (rawOption.options || []).slice();
+// For convenience, enable to use the root option as the `baseOption`:
+// `{ ...normalOptionProps, media: [{ ... }, { ... }] }`
+else {
+if (hasTimeline || hasMedia) {
+rawOption.options = rawOption.media = null;
+}
+  

[incubator-echarts-doc] branch next updated (54ff66f -> 5ff7bab)

2020-08-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


from 54ff66f  label(zh): add overflow option in label.
 new c931ed3  chrom: clarify README
 new fa5b83b  Merge branch 'next' of 
github.com:apache/incubator-echarts-doc into next
 new 14bfdfd  tweak series.dimensions desc.
 new 5ff7bab  Merge branch 'next' of 
github.com:apache/incubator-echarts-doc into next

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md  | 10 ++
 en/option/partial/encode-dimensions.md |  2 +-
 zh/option/partial/encode-dimensions.md |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)


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



[incubator-echarts-doc] 03/04: tweak series.dimensions desc.

2020-08-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 14bfdfdabfb3afddcc321aea20b45aa745e129e3
Author: 100pah 
AuthorDate: Tue Aug 18 13:56:37 2020 +0800

tweak series.dimensions desc.
---
 en/option/partial/encode-dimensions.md | 2 +-
 zh/option/partial/encode-dimensions.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/en/option/partial/encode-dimensions.md 
b/en/option/partial/encode-dimensions.md
index b3abea7..9a7cec9 100644
--- a/en/option/partial/encode-dimensions.md
+++ b/en/option/partial/encode-dimensions.md
@@ -139,7 +139,7 @@ var option = {
 
 `dimensions` can be used to define dimension info for `series.data` or 
`dataset.source`.
 
-Notice: if [dataset](~dataset) is used, we can provide dimension names in the 
first column/row of [dataset.source](~dataset.source), and not need to specify 
`dimensions` here. But if `dimensions` is specified here, echarts will not 
retrieve dimension names from the first row/column of `dataset.source` any more.
+Notice: if [dataset](~dataset) is used, we can definite dimensions in 
[dataset.dimensions](~dataset.dimensions), or provide dimension names in the 
first column/row of [dataset.source](~dataset.source), and not need to specify 
`dimensions` here. But if `dimensions` is specified here, it will be used 
despite the dimension definitions in dataset.
 
 
 For example:
diff --git a/zh/option/partial/encode-dimensions.md 
b/zh/option/partial/encode-dimensions.md
index 56ce435..50a895a 100644
--- a/zh/option/partial/encode-dimensions.md
+++ b/zh/option/partial/encode-dimensions.md
@@ -136,7 +136,7 @@ var option = {
 
 使用 dimensions 定义 `series.data` 或者 `dataset.source` 的每个维度的信息。
 
-注意:如果使用了 [dataset](~dataset),那么可以在 [dataset.source](~dataset.source) 的第一行/列中给出 
dimension 名称。于是就不用在这里指定 dimension。但是,如果在这里指定了 `dimensions`,那么 ECharts 不再会自动从 
`dataset.source` 的第一行/列中获取维度信息。
+注意:如果使用了 [dataset](~dataset),那么可以在 [dataset.dimensions](~dataset.dimensions) 
中定义 dimension ,或者在 [dataset.source](~dataset.source) 的第一行/列中给出 dimension 
名称。于是就不用在这里指定 dimension。但如果在这里指定了 `dimensions`,那么优先使用这里的。
 
 例如:
 


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



[incubator-echarts-doc] 03/04: tweak series.dimensions desc.

2020-08-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 14bfdfdabfb3afddcc321aea20b45aa745e129e3
Author: 100pah 
AuthorDate: Tue Aug 18 13:56:37 2020 +0800

tweak series.dimensions desc.
---
 en/option/partial/encode-dimensions.md | 2 +-
 zh/option/partial/encode-dimensions.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/en/option/partial/encode-dimensions.md 
b/en/option/partial/encode-dimensions.md
index b3abea7..9a7cec9 100644
--- a/en/option/partial/encode-dimensions.md
+++ b/en/option/partial/encode-dimensions.md
@@ -139,7 +139,7 @@ var option = {
 
 `dimensions` can be used to define dimension info for `series.data` or 
`dataset.source`.
 
-Notice: if [dataset](~dataset) is used, we can provide dimension names in the 
first column/row of [dataset.source](~dataset.source), and not need to specify 
`dimensions` here. But if `dimensions` is specified here, echarts will not 
retrieve dimension names from the first row/column of `dataset.source` any more.
+Notice: if [dataset](~dataset) is used, we can definite dimensions in 
[dataset.dimensions](~dataset.dimensions), or provide dimension names in the 
first column/row of [dataset.source](~dataset.source), and not need to specify 
`dimensions` here. But if `dimensions` is specified here, it will be used 
despite the dimension definitions in dataset.
 
 
 For example:
diff --git a/zh/option/partial/encode-dimensions.md 
b/zh/option/partial/encode-dimensions.md
index 56ce435..50a895a 100644
--- a/zh/option/partial/encode-dimensions.md
+++ b/zh/option/partial/encode-dimensions.md
@@ -136,7 +136,7 @@ var option = {
 
 使用 dimensions 定义 `series.data` 或者 `dataset.source` 的每个维度的信息。
 
-注意:如果使用了 [dataset](~dataset),那么可以在 [dataset.source](~dataset.source) 的第一行/列中给出 
dimension 名称。于是就不用在这里指定 dimension。但是,如果在这里指定了 `dimensions`,那么 ECharts 不再会自动从 
`dataset.source` 的第一行/列中获取维度信息。
+注意:如果使用了 [dataset](~dataset),那么可以在 [dataset.dimensions](~dataset.dimensions) 
中定义 dimension ,或者在 [dataset.source](~dataset.source) 的第一行/列中给出 dimension 
名称。于是就不用在这里指定 dimension。但如果在这里指定了 `dimensions`,那么优先使用这里的。
 
 例如:
 


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



[incubator-echarts-doc] 02/04: Merge branch 'next' of github.com:apache/incubator-echarts-doc into next

2020-08-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit fa5b83b18a9f8408f9548b9886ac83be4eea9f83
Merge: c931ed3 f00cd12
Author: 100pah 
AuthorDate: Fri Aug 7 02:18:41 2020 +0800

Merge branch 'next' of github.com:apache/incubator-echarts-doc into next

 build.js   | 32 ++--
 config/env.asf.js  |  4 ++--
 config/env.dev.js  |  7 ---
 config/env.echartsjs.js|  4 ++--
 config/env.localsite.js|  4 ++--
 en/option/component/x-axis.md  | 13 +
 en/option/component/y-axis.md  | 14 ++
 en/tutorial/bar-race.md| 24 
 en/tutorial/tutorial.md|  1 +
 src/components/LiveExample.vue | 24 
 src/docHelper.js   | 29 ++---
 src/shared.js  | 10 ++
 src/style/mixin.scss   |  3 +++
 zh/option/component/x-axis.md  | 12 
 zh/option/component/y-axis.md  | 12 
 zh/tutorial/bar-race.md| 24 
 zh/tutorial/tutorial.md|  1 +
 17 files changed, 176 insertions(+), 42 deletions(-)


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



[incubator-echarts-doc] 04/04: Merge branch 'next' of github.com:apache/incubator-echarts-doc into next

2020-08-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 5ff7bab92ff9c204e5baf1f5d5659e9eff2c2e71
Merge: 14bfdfd 54ff66f
Author: 100pah 
AuthorDate: Tue Aug 18 14:49:02 2020 +0800

Merge branch 'next' of github.com:apache/incubator-echarts-doc into next

 .babelrc  |   8 +--
 build.js  |   4 +-
 build/webpack.config.js   |   5 ++
 config/env.asf.js |   4 +-
 config/env.echartsjs.js   |  15 -
 config/env.localsite.js   |   4 +-
 en/changelog.md   | 119 
 en/option/series/treemap.md   |  12 ++--
 package.json  |   5 --
 public/en/api.html|   8 ++-
 public/en/option-gl.html  |   8 ++-
 public/en/option.html |   9 ++-
 public/en/tutorial.html   |   9 ++-
 public/zh/api.html|   9 ++-
 public/zh/option-gl.html  |   9 ++-
 public/zh/option.html |   9 ++-
 public/zh/tutorial.html   |   9 ++-
 src/components/DocContentItemCard.vue |   5 +-
 src/components/LiveExample.vue|   9 +--
 src/config.js |  12 
 src/main.js   |  47 -
 src/store.js  |   2 +-
 src/style/mixin.scss  |   3 +-
 zh/changelog.md   | 119 
 zh/option/component/geo-common.md |   2 -
 zh/option/partial/label-layout.md | 123 ++
 zh/option/partial/label.md|  10 ---
 zh/option/partial/text-style.md   |  29 
 zh/option/series/bar.md   |   9 ++-
 zh/option/series/custom.md|   6 ++
 zh/option/series/effectScatter.md |   5 ++
 zh/option/series/funnel.md|   5 ++
 zh/option/series/graph.md |   6 ++
 zh/option/series/heatmap.md   |   5 ++
 zh/option/series/line.md  |   6 ++
 zh/option/series/lines.md |   5 ++
 zh/option/series/map.md   |   5 ++
 zh/option/series/pictorialBar.md  |   6 ++
 zh/option/series/pie.md   |   5 ++
 zh/option/series/radar.md |   5 ++
 zh/option/series/sankey.md|   5 ++
 zh/option/series/scatter.md   |   5 ++
 zh/option/series/sunburst.md  |   6 ++
 zh/option/series/themeRiver.md|   5 ++
 zh/option/series/tree.md  |   5 ++
 zh/option/series/treemap.md   |  24 +++
 46 files changed, 469 insertions(+), 256 deletions(-)


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



[incubator-echarts-doc] 04/04: Merge branch 'next' of github.com:apache/incubator-echarts-doc into next

2020-08-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 5ff7bab92ff9c204e5baf1f5d5659e9eff2c2e71
Merge: 14bfdfd 54ff66f
Author: 100pah 
AuthorDate: Tue Aug 18 14:49:02 2020 +0800

Merge branch 'next' of github.com:apache/incubator-echarts-doc into next

 .babelrc  |   8 +--
 build.js  |   4 +-
 build/webpack.config.js   |   5 ++
 config/env.asf.js |   4 +-
 config/env.echartsjs.js   |  15 -
 config/env.localsite.js   |   4 +-
 en/changelog.md   | 119 
 en/option/series/treemap.md   |  12 ++--
 package.json  |   5 --
 public/en/api.html|   8 ++-
 public/en/option-gl.html  |   8 ++-
 public/en/option.html |   9 ++-
 public/en/tutorial.html   |   9 ++-
 public/zh/api.html|   9 ++-
 public/zh/option-gl.html  |   9 ++-
 public/zh/option.html |   9 ++-
 public/zh/tutorial.html   |   9 ++-
 src/components/DocContentItemCard.vue |   5 +-
 src/components/LiveExample.vue|   9 +--
 src/config.js |  12 
 src/main.js   |  47 -
 src/store.js  |   2 +-
 src/style/mixin.scss  |   3 +-
 zh/changelog.md   | 119 
 zh/option/component/geo-common.md |   2 -
 zh/option/partial/label-layout.md | 123 ++
 zh/option/partial/label.md|  10 ---
 zh/option/partial/text-style.md   |  29 
 zh/option/series/bar.md   |   9 ++-
 zh/option/series/custom.md|   6 ++
 zh/option/series/effectScatter.md |   5 ++
 zh/option/series/funnel.md|   5 ++
 zh/option/series/graph.md |   6 ++
 zh/option/series/heatmap.md   |   5 ++
 zh/option/series/line.md  |   6 ++
 zh/option/series/lines.md |   5 ++
 zh/option/series/map.md   |   5 ++
 zh/option/series/pictorialBar.md  |   6 ++
 zh/option/series/pie.md   |   5 ++
 zh/option/series/radar.md |   5 ++
 zh/option/series/sankey.md|   5 ++
 zh/option/series/scatter.md   |   5 ++
 zh/option/series/sunburst.md  |   6 ++
 zh/option/series/themeRiver.md|   5 ++
 zh/option/series/tree.md  |   5 ++
 zh/option/series/treemap.md   |  24 +++
 46 files changed, 469 insertions(+), 256 deletions(-)


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



[incubator-echarts-doc] 01/04: chrom: clarify README

2020-08-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit c931ed3079feff1b9da75326eb693c2f0dd57db5
Author: 100pah 
AuthorDate: Fri Aug 7 02:18:27 2020 +0800

chrom: clarify README
---
 README.md | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index 6a43a21..4149a2d 100644
--- a/README.md
+++ b/README.md
@@ -36,9 +36,19 @@ It will:
 + websitePath
 
 For example:
+Embed a example in doc:
 ```md
 ~[700x300](${galleryViewPath}doc-example/aria-pie=1=1)
 ```
+Provide a example link in doc:
+```md
+[vertically scrollable legend](${galleryEditorPath}pie-legend=1=1)
+```
+Provide a website link in doc:
+```md
+[Apache ECharts (incubating) website](${websitePath}/en/download.html)
+```
+
 
  Reference of option
 


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



[incubator-echarts-doc] 01/04: chrom: clarify README

2020-08-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit c931ed3079feff1b9da75326eb693c2f0dd57db5
Author: 100pah 
AuthorDate: Fri Aug 7 02:18:27 2020 +0800

chrom: clarify README
---
 README.md | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index 6a43a21..4149a2d 100644
--- a/README.md
+++ b/README.md
@@ -36,9 +36,19 @@ It will:
 + websitePath
 
 For example:
+Embed a example in doc:
 ```md
 ~[700x300](${galleryViewPath}doc-example/aria-pie=1=1)
 ```
+Provide a example link in doc:
+```md
+[vertically scrollable legend](${galleryEditorPath}pie-legend=1=1)
+```
+Provide a website link in doc:
+```md
+[Apache ECharts (incubating) website](${websitePath}/en/download.html)
+```
+
 
  Reference of option
 


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



[incubator-echarts-doc] 02/04: Merge branch 'next' of github.com:apache/incubator-echarts-doc into next

2020-08-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit fa5b83b18a9f8408f9548b9886ac83be4eea9f83
Merge: c931ed3 f00cd12
Author: 100pah 
AuthorDate: Fri Aug 7 02:18:41 2020 +0800

Merge branch 'next' of github.com:apache/incubator-echarts-doc into next

 build.js   | 32 ++--
 config/env.asf.js  |  4 ++--
 config/env.dev.js  |  7 ---
 config/env.echartsjs.js|  4 ++--
 config/env.localsite.js|  4 ++--
 en/option/component/x-axis.md  | 13 +
 en/option/component/y-axis.md  | 14 ++
 en/tutorial/bar-race.md| 24 
 en/tutorial/tutorial.md|  1 +
 src/components/LiveExample.vue | 24 
 src/docHelper.js   | 29 ++---
 src/shared.js  | 10 ++
 src/style/mixin.scss   |  3 +++
 zh/option/component/x-axis.md  | 12 
 zh/option/component/y-axis.md  | 12 
 zh/tutorial/bar-race.md| 24 
 zh/tutorial/tutorial.md|  1 +
 17 files changed, 176 insertions(+), 42 deletions(-)


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



[incubator-echarts-doc] branch next updated (54ff66f -> 5ff7bab)

2020-08-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


from 54ff66f  label(zh): add overflow option in label.
 new c931ed3  chrom: clarify README
 new fa5b83b  Merge branch 'next' of 
github.com:apache/incubator-echarts-doc into next
 new 14bfdfd  tweak series.dimensions desc.
 new 5ff7bab  Merge branch 'next' of 
github.com:apache/incubator-echarts-doc into next

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md  | 10 ++
 en/option/partial/encode-dimensions.md |  2 +-
 zh/option/partial/encode-dimensions.md |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)


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



[incubator-echarts] tag 5.0.0-alpha.2 created (now 7cde546)

2020-08-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to tag 5.0.0-alpha.2
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


  at 7cde546  (commit)
No new revisions were added by this update.


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



[incubator-echarts] branch next updated: release: 5.0.0-alpha.2

2020-08-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang 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 7cde546  release: 5.0.0-alpha.2
7cde546 is described below

commit 7cde54664e4408a073f4a5fbf65957b435d7632b
Author: 100pah 
AuthorDate: Tue Aug 18 01:33:51 2020 +0800

release: 5.0.0-alpha.2
---
 dist/echarts.common.js | 457 +---
 dist/echarts.common.js.map |   2 +-
 dist/echarts.common.min.js |   2 +-
 dist/echarts.js| 769 -
 dist/echarts.js.map|   2 +-
 dist/echarts.min.js|   2 +-
 dist/echarts.simple.js | 374 
 dist/echarts.simple.js.map |   2 +-
 dist/echarts.simple.min.js |   2 +-
 dist/extension/bmap.js |  10 +-
 dist/extension/bmap.js.map |   2 +-
 dist/extension/bmap.min.js |   2 +-
 dist/extension/dataTool.js |   4 +-
 dist/extension/dataTool.js.map |   2 +-
 package-lock.json  |  20 +-
 package.json   |   4 +-
 src/echarts.ts |   4 +-
 17 files changed, 988 insertions(+), 672 deletions(-)

diff --git a/dist/echarts.common.js b/dist/echarts.common.js
index 9ddb00a..bd44547 100644
--- a/dist/echarts.common.js
+++ b/dist/echarts.common.js
@@ -708,9 +708,7 @@
 
   function noop() {}
 
-  var zrUtil =
-  /*#__PURE__*/
-  Object.freeze({
+  var zrUtil = /*#__PURE__*/Object.freeze({
 __proto__: null,
 $override: $override,
 guid: guid,
@@ -901,9 +899,7 @@
 return out;
   }
 
-  var vector =
-  /*#__PURE__*/
-  Object.freeze({
+  var vector = /*#__PURE__*/Object.freeze({
 __proto__: null,
 create: create,
 copy: copy,
@@ -1442,7 +1438,7 @@
 
   function removeEventListener(el, name, handler, opt) {
 if (isDomLevel2) {
-  el.removeEventListener(name, handler);
+  el.removeEventListener(name, handler, opt);
 } else {
   el.detachEvent('on' + name, handler);
 }
@@ -2697,13 +2693,9 @@
 
   var requestAnimationFrame;
 
-  if (typeof window !== 'undefined') {
-requestAnimationFrame = window.requestAnimationFrame && 
window.requestAnimationFrame.bind(window) || window.msRequestAnimationFrame && 
window.msRequestAnimationFrame.bind(window) || window.mozRequestAnimationFrame 
|| window.webkitRequestAnimationFrame;
-  } else {
-requestAnimationFrame = function (func) {
-  return setTimeout(func, 16);
-};
-  }
+  requestAnimationFrame = typeof window !== 'undefined' && 
window.requestAnimationFrame && window.requestAnimationFrame.bind(window) || 
window.msRequestAnimationFrame && window.msRequestAnimationFrame.bind(window) 
|| window.mozRequestAnimationFrame || window.webkitRequestAnimationFrame || 
function (func) {
+return setTimeout(func, 16);
+  };
 
   var requestAnimationFrame$1 = requestAnimationFrame;
   var easing = {
@@ -3649,9 +3641,7 @@
 return 'rgb(' + r + ',' + g + ',' + b + ')';
   }
 
-  var color =
-  /*#__PURE__*/
-  Object.freeze({
+  var color = /*#__PURE__*/Object.freeze({
 __proto__: null,
 parse: parse,
 lift: lift,
@@ -4157,7 +4147,7 @@
 return;
   }
 
-  this._additiveAnimator = additiveTo;
+  this._additiveAnimators = additiveTo;
 }
 
 Animator.prototype.getTarget = function () {
@@ -4183,7 +4173,7 @@
   track = tracks[propName] = new Track(propName);
   var initialValue = void 0;
 
-  var additiveTrack = this._additiveAnimator && 
this._additiveAnimator.getTrack(propName);
+  var additiveTrack = this._getAdditiveTrack(propName);
 
   if (additiveTrack) {
 var lastFinalKf = 
additiveTrack.keyframes[additiveTrack.keyframes.length - 1];
@@ -4247,6 +4237,23 @@
   }
 };
 
+Animator.prototype._getAdditiveTrack = function (trackName) {
+  var additiveTrack;
+  var additiveAnimators = this._additiveAnimators;
+
+  if (additiveAnimators) {
+for (var i = 0; i < additiveAnimators.length; i++) {
+  var track = additiveAnimators[i].getTrack(trackName);
+
+  if (track) {
+additiveTrack = track;
+  }
+}
+  }
+
+  return additiveTrack;
+};
+
 Animator.prototype.start = function (easing, forceAnimate) {
   if (this._started > 0) {
 return;
@@ -4260,7 +4267,7 @@
 var propName = this._trackKeys[i];
 var track = this._tracks[propName];
 
-var additiveTrack = this._additiveAnimator && 
this._additiveAnimator.getTrack(propName);
+var additiveTrack = this._getAdditiveTrack(propName);
 
 var kfs = track.keyframes;
 track.prepare(additiveTrack);
@@ -4283,9 +4290,21 @@
   delay: this._delay,
   onframe: function (percent) {
   

[incubator-echarts] branch next updated: fix: [data-transform] (1) update the sort rule for string and incomparable value. update test cases. (2) `parser: 'number'` supports suffix parse (like '100%',

2020-08-14 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang 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 17f088a  fix: [data-transform] (1) update the sort rule for string and 
incomparable value. update test cases. (2) `parser: 'number'` supports suffix 
parse (like '100%', '20px').
17f088a is described below

commit 17f088a75efdcddd69151773e1d7e25882abedaa
Author: 100pah 
AuthorDate: Fri Aug 14 22:48:33 2020 +0800

fix: [data-transform] (1) update the sort rule for string and incomparable 
value. update test cases. (2) `parser: 'number'` supports suffix parse (like 
'100%', '20px').
---
 src/component/transform/sortTransform.ts  |   4 +-
 src/data/helper/dataValueHelper.ts|  54 +--
 test/data-transform.html  |  88 +++
 test/ut/spec/data/dataValueHelper.test.js | 251 +++---
 4 files changed, 223 insertions(+), 174 deletions(-)

diff --git a/src/component/transform/sortTransform.ts 
b/src/component/transform/sortTransform.ts
index 8f6f184..0583f1a 100644
--- a/src/component/transform/sortTransform.ts
+++ b/src/component/transform/sortTransform.ts
@@ -56,8 +56,8 @@ type OrderExpression = {
 dimension: DimensionLoose;
 order: 'asc' | 'desc';
 parser?: RawValueParserType;
-// Value that is not comparable (like null/undefined) will be
-// put to head or tail.
+// The meansing of "incomparable": see [SORT_COMPARISON_RULE]
+// in `data/helper/dataValueHelper.ts`
 incomparable?: 'min' | 'max';
 };
 
diff --git a/src/data/helper/dataValueHelper.ts 
b/src/data/helper/dataValueHelper.ts
index 07c98e0..98e36c8 100644
--- a/src/data/helper/dataValueHelper.ts
+++ b/src/data/helper/dataValueHelper.ts
@@ -82,7 +82,10 @@ export type RawValueParserType = 'number' | 'time' | 'trim';
 type RawValueParser = (val: unknown) => unknown;
 const valueParserMap = createHashMap({
 'number': function (val): number {
-return numericToNumber(val);
+// Do not use `numericToNumber` here. We have by defualt 
`numericToNumber`.
+// Here the number parser can have loose rule:
+// enable to cut suffix: "120px" => 120, "14%" => 14.
+return parseFloat(val as string);
 },
 'time': function (val): number {
 // return timestamp.
@@ -143,6 +146,7 @@ export class SortOrderComparator {
  * @param order by defualt: 'asc'
  * @param incomparable by defualt: Always on the tail.
  *That is, if 'asc' => 'max', if 'desc' => 'min'
+ *See the definition of "incomparable" in [SORT_COMPARISON_RULE]
  */
 constructor(order: 'asc' | 'desc', incomparable: 'min' | 'max') {
 const isDesc = order === 'desc';
@@ -152,6 +156,7 @@ export class SortOrderComparator {
 }
 this._incomparable = incomparable === 'min' ? -Infinity : Infinity;
 }
+// See [SORT_COMPARISON_RULE].
 // Performance sensitive.
 evaluate(lval: unknown, rval: unknown): -1 | 0 | 1 {
 // Most cases is 'number', and typeof maybe 10 times faseter than 
parseFloat.
@@ -159,23 +164,26 @@ export class SortOrderComparator {
 const rvalTypeof = typeof rval;
 let lvalFloat = lvalTypeof === 'number' ? lval : numericToNumber(lval);
 let rvalFloat = rvalTypeof === 'number' ? rval : numericToNumber(rval);
-const lvalIncmpr = isNaN(lvalFloat as number);
-const rvalIncmpr = isNaN(rvalFloat as number);
-if (lvalIncmpr) {
+const lvalNotNumeric = isNaN(lvalFloat as number);
+const rvalNotNumeric = isNaN(rvalFloat as number);
+
+if (lvalNotNumeric) {
 lvalFloat = this._incomparable;
 }
-if (rvalIncmpr) {
+if (rvalNotNumeric) {
 rvalFloat = this._incomparable;
 }
-// In most cases, pure string sort has no meanings. But it can exists 
when need to
-// group two categories (and order by anthor dimension meanwhile).
-// But if we support string sort, we still need to avoid the 
misleading of `'2' > '12'`,
-// and support '-' means empty, and trade `'abc' > 2` as incomparable.
-// So we support string comparison only if both lval and rval are 
string and not numeric.
-if (lvalIncmpr && rvalIncmpr && lvalTypeof === 'string' && rvalTypeof 
=== 'string') {
-lvalFloat = lval;
-rvalFloat = rval;
+if (lvalNotNumeric && rvalNotNumeric) {
+const lvalIsStr = lvalTypeof === 'string';
+const rvalIsStr = rvalTypeof === 'string';
+if (lvalIsStr) {
+lvalFloat = rvalIsStr ? lval : 0;
+}
+if (rvalIsStr) {
+rvalFloat = lvalIsStr ? rval : 0;
+}

[incubator-echarts] branch next updated (e98ef6f -> 2b13045)

2020-08-14 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


from e98ef6f  chore(.d.ts): fix import type not supported in lower ts 
version.
 add ff906a4  fix: [data-transform] Make the comparison operation accurate 
in common edge cases. Support parser 'number'.
 add 81d1306  fix: [data-transform] (1) clarity the detail of value 
comparison. (2) rename "parse" to "parser".
 new 2b13045  Merge pull request #13127 from apache/dataset-trans2

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/component/transform/sortTransform.ts |  89 +++---
 src/data/List.ts |   2 +-
 src/data/helper/dataValueHelper.ts   | 248 +
 src/data/helper/parseDataValue.ts|  73 -
 src/data/helper/transform.ts |   2 +-
 src/util/conditionalExpression.ts| 187 +
 src/util/number.ts   |  32 ++-
 test/data-transform.html | 173 +---
 test/ut/spec/data/completeDimensions.test.js |   4 +-
 test/ut/spec/data/dataValueHelper.test.js| 394 +++
 test/ut/spec/util/number.test.js |  54 
 11 files changed, 978 insertions(+), 280 deletions(-)
 create mode 100644 src/data/helper/dataValueHelper.ts
 delete mode 100644 src/data/helper/parseDataValue.ts
 create mode 100644 test/ut/spec/data/dataValueHelper.test.js


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



[incubator-echarts] 01/01: Merge pull request #13127 from apache/dataset-trans2

2020-08-14 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 2b130454b8606deab7bbe6355e73ca061928eb57
Merge: e98ef6f 81d1306
Author: sushuang 
AuthorDate: Fri Aug 14 19:01:02 2020 +0800

Merge pull request #13127 from apache/dataset-trans2

Dataset trans2

 src/component/transform/sortTransform.ts |  89 +++---
 src/data/List.ts |   2 +-
 src/data/helper/dataValueHelper.ts   | 248 +
 src/data/helper/parseDataValue.ts|  73 -
 src/data/helper/transform.ts |   2 +-
 src/util/conditionalExpression.ts| 187 +
 src/util/number.ts   |  32 ++-
 test/data-transform.html | 173 +---
 test/ut/spec/data/completeDimensions.test.js |   4 +-
 test/ut/spec/data/dataValueHelper.test.js| 394 +++
 test/ut/spec/util/number.test.js |  54 
 11 files changed, 978 insertions(+), 280 deletions(-)



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



[incubator-echarts] branch next updated: fix: (1) expose `echarts.time` accurately. (2) supplement a test case of parseDate

2020-08-14 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang 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 1097a48  fix: (1) expose `echarts.time` accurately. (2) supplement a 
test case of parseDate
1097a48 is described below

commit 1097a481f31563964dea14cde5f309b7a4a78a2d
Author: 100pah 
AuthorDate: Fri Aug 14 14:05:38 2020 +0800

fix: (1) expose `echarts.time` accurately. (2) supplement a test case of 
parseDate
---
 src/export.ts| 6 +-
 src/util/format.ts   | 1 +
 test/ut/spec/util/number.test.js | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/export.ts b/src/export.ts
index 36ed1a0..2b005e4 100644
--- a/src/export.ts
+++ b/src/export.ts
@@ -41,7 +41,6 @@ export {default as Model} from './model/Model';
 export {default as Axis} from './coord/Axis';
 export {numberUtil as number};
 export {formatUtil as format};
-export {timeUtil as time};
 export {throttle};
 export {ecHelper as helper};
 export {matrix};
@@ -52,6 +51,11 @@ export {default as env} from 'zrender/src/core/env';
 export {parseGeoJSON};
 export const parseGeoJson = parseGeoJSON;
 
+export const time = {
+parse: numberUtil.parseDate,
+format: timeUtil.format
+};
+
 const ecUtil = {};
 zrUtil.each(
 [
diff --git a/src/util/format.ts b/src/util/format.ts
index 7cfd68f..56d19c9 100644
--- a/src/util/format.ts
+++ b/src/util/format.ts
@@ -200,6 +200,7 @@ export function getTooltipMarker(inOpt: ColorString | 
GetTooltipMarkerOpt, extra
 
 
 /**
+ * @deprecated Use `time/format` instead.
  * ISO Date format
  * @param {string} tpl
  * @param {number} value
diff --git a/test/ut/spec/util/number.test.js b/test/ut/spec/util/number.test.js
index 98f1ba9..1e63117 100755
--- a/test/ut/spec/util/number.test.js
+++ b/test/ut/spec/util/number.test.js
@@ -250,6 +250,7 @@ describe('util/number', function () {
 
expect(+numberUtil.parseDate('2012-03-04T05:06:07.123+08:00')).toEqual(1330808767123);
 
expect(+numberUtil.parseDate('2012-03-04T05:06:07.123-0700')).toEqual(1330862767123);
 
expect(+numberUtil.parseDate('2012-03-04T05:06:07.123-07:00')).toEqual(1330862767123);
+
expect(+numberUtil.parseDate('2012-03-04T5:6:7.123-07:00')).toEqual(1330862767123);
 
 // Other string
 expect(+numberUtil.parseDate('2012')).toEqual(+new 
Date('2012-01-01T00:00:00'));


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



[incubator-echarts] 01/02: fix: [data-transform] Make the comparison operation accurate in common edge cases. Support parser 'number'.

2020-08-13 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit ff906a44006d073926459073ed4bf6288e0639e3
Author: 100pah 
AuthorDate: Wed Aug 12 22:54:37 2020 +0800

fix: [data-transform] Make the comparison operation accurate in common edge 
cases. Support parser 'number'.
---
 src/component/transform/sortTransform.ts |  44 +++--
 src/data/List.ts |   2 +-
 src/data/helper/dataValueHelper.ts   | 232 +++
 src/data/helper/parseDataValue.ts|  73 -
 src/data/helper/transform.ts |   2 +-
 src/util/conditionalExpression.ts| 183 -
 src/util/number.ts   |  35 +++-
 test/ut/spec/data/completeDimensions.test.js |   4 +-
 test/ut/spec/data/dataValueHelper.test.js| 209 
 test/ut/spec/util/number.test.js |  54 +++
 10 files changed, 614 insertions(+), 224 deletions(-)

diff --git a/src/component/transform/sortTransform.ts 
b/src/component/transform/sortTransform.ts
index e4f75e5..cd47616 100644
--- a/src/component/transform/sortTransform.ts
+++ b/src/component/transform/sortTransform.ts
@@ -24,7 +24,9 @@ import {
 import { makePrintable, throwError } from '../../util/log';
 import { isArray, each, hasOwn } from 'zrender/src/core/util';
 import { normalizeToArray } from '../../util/model';
-import { parseDate } from '../../util/number';
+import {
+RawValueParserType, getRawValueParser, createRelationalComparator
+} from '../../data/helper/dataValueHelper';
 
 /**
  * @usage
@@ -53,7 +55,7 @@ export interface SortTransformOption extends 
DataTransformOption {
 type OrderExpression = {
 dimension: DimensionLoose;
 order: SortOrder;
-parse?: 'time'
+parse?: RawValueParserType;
 };
 
 type SortOrder = 'asc' | 'desc';
@@ -65,13 +67,9 @@ if (__DEV__) {
 'Valid config is like:',
 '{ dimension: "age", order: "asc" }',
 'or [{ dimension: "age", order: "asc"], { dimension: "date", order: 
"desc" }]'
-].join('');
+].join(' ');
 }
 
-const timeParser = function (val: OptionDataValue): number {
-return +parseDate(val);
-};
-
 
 export const sortTransform: ExternalDataTransform = {
 
@@ -98,7 +96,7 @@ export const sortTransform: 
ExternalDataTransform = {
 const orderDefList: {
 dimIdx: DimensionIndex;
 orderReturn: -1 | 1;
-parser: (val: OptionDataValue) => number;
+parser: ReturnType;
 }[] = [];
 each(orderExprList, function (orderExpr) {
 const dimLoose = orderExpr.dimension;
@@ -131,18 +129,15 @@ export const sortTransform: 
ExternalDataTransform = {
 throwError(errMsg);
 }
 
-let parser;
-if (parserName) {
-if (parserName !== 'time') {
-if (__DEV__) {
-errMsg = makePrintable(
-'Invalid parser name' + parserName + '.\n',
-'Illegal config:', orderExpr, '.\n'
-);
-}
-throwError(errMsg);
+const parser = parserName ? getRawValueParser(parserName) : null;
+if (parserName && !parser) {
+if (__DEV__) {
+errMsg = makePrintable(
+'Invalid parser name ' + parserName + '.\n',
+'Illegal config:', orderExpr, '.\n'
+);
 }
-parser = timeParser;
+throwError(errMsg);
 }
 
 orderDefList.push({
@@ -175,6 +170,9 @@ export const sortTransform: 
ExternalDataTransform = {
 resultData.push(source.getRawDataItem(i));
 }
 
+const lt = createRelationalComparator('lt');
+const gt = createRelationalComparator('gt');
+
 resultData.sort(function (item0, item1) {
 if (item0 === headerPlaceholder) {
 return -1;
@@ -196,13 +194,13 @@ export const sortTransform: 
ExternalDataTransform = {
 let val0 = source.retrieveItemValue(item0, orderDef.dimIdx);
 let val1 = source.retrieveItemValue(item1, orderDef.dimIdx);
 if (orderDef.parser) {
-val0 = orderDef.parser(val0);
-val1 = orderDef.parser(val1);
+val0 = orderDef.parser(val0) as OptionDataValue;
+val1 = orderDef.parser(val1) as OptionDataValue;
 }
-if (val0 < val1) {
+if (lt.evaluate(val0, val1)) {
 return orderDef.orderReturn;
 }
-  

[incubator-echarts] 02/02: fix: [data-transform] (1) clarity the detail of value comparison. (2) rename "parse" to "parser".

2020-08-13 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 81d1306b5fc7dc528b01a360fe042b2b2ed72736
Author: 100pah 
AuthorDate: Fri Aug 14 05:09:54 2020 +0800

fix: [data-transform] (1) clarity the detail of value comparison. (2) 
rename "parse" to "parser".
---
 src/component/transform/sortTransform.ts  |  59 ++--
 src/data/helper/dataValueHelper.ts| 206 ++--
 src/util/conditionalExpression.ts |  32 +-
 src/util/number.ts|  15 +-
 test/data-transform.html  | 173 --
 test/ut/spec/data/dataValueHelper.test.js | 531 --
 6 files changed, 662 insertions(+), 354 deletions(-)

diff --git a/src/component/transform/sortTransform.ts 
b/src/component/transform/sortTransform.ts
index cd47616..8f6f184 100644
--- a/src/component/transform/sortTransform.ts
+++ b/src/component/transform/sortTransform.ts
@@ -22,10 +22,10 @@ import {
 DimensionLoose, SOURCE_FORMAT_KEYED_COLUMNS, DimensionIndex, 
OptionDataValue
 } from '../../util/types';
 import { makePrintable, throwError } from '../../util/log';
-import { isArray, each, hasOwn } from 'zrender/src/core/util';
+import { isArray, each } from 'zrender/src/core/util';
 import { normalizeToArray } from '../../util/model';
 import {
-RawValueParserType, getRawValueParser, createRelationalComparator
+RawValueParserType, getRawValueParser, SortOrderComparator
 } from '../../data/helper/dataValueHelper';
 
 /**
@@ -54,12 +54,13 @@ export interface SortTransformOption extends 
DataTransformOption {
 // PENDING: whether support { dimension: 'score', order: 'asc' } ?
 type OrderExpression = {
 dimension: DimensionLoose;
-order: SortOrder;
-parse?: RawValueParserType;
+order: 'asc' | 'desc';
+parser?: RawValueParserType;
+// Value that is not comparable (like null/undefined) will be
+// put to head or tail.
+incomparable?: 'min' | 'max';
 };
 
-type SortOrder = 'asc' | 'desc';
-const SortOrderValidMap = { asc: true, desc: true } as const;
 
 let sampleLog = '';
 if (__DEV__) {
@@ -95,13 +96,14 @@ export const sortTransform: 
ExternalDataTransform = {
 
 const orderDefList: {
 dimIdx: DimensionIndex;
-orderReturn: -1 | 1;
 parser: ReturnType;
+comparator: SortOrderComparator
 }[] = [];
 each(orderExprList, function (orderExpr) {
 const dimLoose = orderExpr.dimension;
 const order = orderExpr.order;
-const parserName = orderExpr.parse;
+const parserName = orderExpr.parser;
+const incomparable = orderExpr.incomparable;
 
 if (dimLoose == null) {
 if (__DEV__) {
@@ -110,13 +112,28 @@ export const sortTransform: 
ExternalDataTransform = {
 throwError(errMsg);
 }
 
-if (!hasOwn(SortOrderValidMap, order)) {
+if (order !== 'asc' && order !== 'desc') {
 if (__DEV__) {
 errMsg = 'Sort transform config must has "order" 
specified.' + sampleLog;
 }
 throwError(errMsg);
 }
 
+if (incomparable && (incomparable !== 'min' && incomparable !== 
'max')) {
+let errMsg = '';
+if (__DEV__) {
+errMsg = 'incomparable must be "min" or "max" rather than 
"' + incomparable + '".';
+}
+throwError(errMsg);
+}
+if (order !== 'asc' && order !== 'desc') {
+let errMsg = '';
+if (__DEV__) {
+errMsg = 'order must be "asc" or "desc" rather than "' + 
order + '".';
+}
+throwError(errMsg);
+}
+
 const dimInfo = source.getDimensionInfo(dimLoose);
 if (!dimInfo) {
 if (__DEV__) {
@@ -142,8 +159,8 @@ export const sortTransform: 
ExternalDataTransform = {
 
 orderDefList.push({
 dimIdx: dimInfo.index,
-orderReturn: order === 'asc' ? -1 : 1,
-parser: parser
+parser: parser,
+comparator: new SortOrderComparator(order, incomparable)
 });
 });
 
@@ -170,9 +187,6 @@ export const sortTransform: 
ExternalDataTransform = {
 resultData.push(source.getRawDataItem(i));
 }
 
-const lt = createRelationalComparator('lt');
-const gt = createRelationalComparator('gt');
-
 resultData.sort(function (item0, item1) {
 if (item0 === headerPlaceholder) {
 return -1;
@@ -180,15 +194,6 @@ export

[incubator-echarts] branch dataset-trans2 created (now 81d1306)

2020-08-13 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch dataset-trans2
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


  at 81d1306  fix: [data-transform] (1) clarity the detail of value 
comparison. (2) rename "parse" to "parser".

This branch includes the following new commits:

 new ff906a4  fix: [data-transform] Make the comparison operation accurate 
in common edge cases. Support parser 'number'.
 new 81d1306  fix: [data-transform] (1) clarity the detail of value 
comparison. (2) rename "parse" to "parser".

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



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



[incubator-echarts-doc] branch master updated: fix: migrate changelog to branch 4.9.0

2020-08-10 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new ca5298c  fix: migrate changelog to branch 4.9.0
ca5298c is described below

commit ca5298c507d0c88cbacd74e6b5d9da34eab2a03f
Author: 100pah 
AuthorDate: Mon Aug 10 20:14:06 2020 +0800

fix: migrate changelog to branch 4.9.0
---
 en/changelog.md | 46 --
 zh/changelog.md | 45 -
 2 files changed, 91 deletions(-)

diff --git a/en/changelog.md b/en/changelog.md
index 42f4466..b54b9c4 100644
--- a/en/changelog.md
+++ b/en/changelog.md
@@ -1,49 +1,3 @@
-## v4.9.0
-2020-08-06
-
-+ [Feature] [graph] Support multiple edges to link nodes in graph. 
[#12590](https://github.com/apache/incubator-echarts/pull/12590) 
([wf123537200](https://github.com/wf123537200))
-
-+ [Feature] [funnel] Add `orient` option in funnel. Support horizontal layout. 
[#12754](https://github.com/apache/incubator-echarts/pull/12754) 
([regrex](https://github.com/regrex))
-
-+ [Enhancement] [tooltip] Add text shadow options. 
[#12664](https://github.com/apache/incubator-echarts/pull/12664) 
([Ovilia](https://github.com/Ovilia))
-
-+ [Enhancement] [toolbox] Add `brushStyle` option to configuration style of 
brush rect in the dataZoom feature. 
[#12550](https://github.com/apache/incubator-echarts/pull/12550) 
([zhiyuc123](https://github.com/zhiyuc123))
-
-+ [Fix] [themeRiver] Optimize data process in themeRiver. 
[#12022](https://github.com/apache/incubator-echarts/pull/12022) 
([Zaynex](https://github.com/Zaynex))
-
-+ [Fix] [toolbox] Fix pie series render incorrectly after editing its data in 
the dataView feature. 
[#12561](https://github.com/apache/incubator-echarts/pull/12561) 
([plainheart](https://github.com/plainheart))
-
-+ [Fix] [toolbox] Fix dataView shows NaN when using dataset. 
[#11849](https://github.com/apache/incubator-echarts/pull/11849) 
([susiwen8](https://github.com/susiwen8))
-
-+ [Fix] [toolbox] Fix saveAsImage may have error in some special environments. 
[#12643](https://github.com/apache/incubator-echarts/pull/12643) 
([lzr900515](https://github.com/lzr900515))
-
-+ [Fix] [lines] Fix lines disappear if setOption again without data. 
[#12850](https://github.com/apache/incubator-echarts/pull/12850) 
([plainheart](https://github.com/plainheart))
-
-+ [Fix] [sunburst] [treemap] Fix label formatter in `levels` not work bug. 
[#12742](https://github.com/apache/incubator-echarts/pull/12742) 
([Ovilia](https://github.com/Ovilia))
-
-+ [Fix] [bmap] Fix bmap event `moveend` is always triggered when dragging or 
zoomend. [#12558](https://github.com/apache/incubator-echarts/pull/12558) 
([plainheart](https://github.com/plainheart))
-
-+ [Fix] [grid] Fix wrong gap calculation when `containLabel`is set in grid. 
[#12259](https://github.com/apache/incubator-echarts/issues/12259) 
([Ling310](https://github.com/Ling310))
-
-+ [Fix] [tooltip] Fix newline in tooltip of radar and map series when using 
`ricText` render mode. 
[#12664](https://github.com/apache/incubator-echarts/pull/12664) 
([Ovilia](https://github.com/Ovilia))
-
-+ [Fix] [tooltip] Update tooltip position proportionally when chart resized. 
[#12834](https://github.com/apache/incubator-echarts/pull/12834) 
([liulinboyi](https://github.com/liulinboyi))
-
-+ [Fix] [tooltip] Fix tooltip dispose in `richText` render mode. 
[#12608](https://github.com/apache/incubator-echarts/pull/12608) 
([plainheart](https://github.com/plainheart))
-
-+ [Fix] [tree] Fix image symbol not display on first render. 
[#12367](https://github.com/apache/incubator-echarts/pull/12367) 
([plainheart](https://github.com/plainheart))
-
-+ [Fix] [geo] Fix label formatter not work bug. 
[#12762](https://github.com/apache/incubator-echarts/pull/12762) 
([plainheart](https://github.com/plainheart))
-
-+ [Fix] [bar] Fix error when switching `showBackground` from `false` to 
`true`. [#13085](https://github.com/apache/incubator-echarts/pull/13085) 
([easonyq](https://github.com/easonyq))
-
-+ [Fix] [markArea] Fix label is not hidden when markArea is outside the grid. 
[#12669](https://github.com/apache/incubator-echarts/pull/12669) 
([Ovilia](https://github.com/Ovilia))
-
-+ [Fix] [markLine] [markPoint] Fix `symbolRotate` not work bug. 
[#12737](https://github.com/apache/incubator-echarts/pull/12737) 
[#12392](https://github.com/apache/incubator-echarts/pull/12392) 
([plainheart](https://github.com/plainheart))
-
-+ [Fix] [polar] Fix bar layout on polar with nagive axis. 
[#12418](https://github.com/apache/incubator-echarts/pull/12418) 
([gracelia](https://github.com/gracelia))
-
-
 
 ## v4.8.0
 2020-05-25
diff --git a/zh/changelog.md b/zh/changelog.md
index 68ab05a..f87f304 100644
--- a/zh/changelog.md
+++ b/zh/changelog.md
@@ -1,48 +1,3 @@
-## v4.9.0
-2020-08

[incubator-echarts-doc] branch 4.9.0 updated: fix: migrate changelog to branch 4.9.0

2020-08-10 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.9.0 by this push:
 new 45128f1  fix: migrate changelog to branch 4.9.0
45128f1 is described below

commit 45128f1997d5a853ea40fc56259954509c27c42e
Author: 100pah 
AuthorDate: Mon Aug 10 20:13:24 2020 +0800

fix: migrate changelog to branch 4.9.0
---
 en/changelog.md | 165 
 zh/changelog.md | 164 +++
 2 files changed, 211 insertions(+), 118 deletions(-)

diff --git a/en/changelog.md b/en/changelog.md
index 25585a7..42f4466 100644
--- a/en/changelog.md
+++ b/en/changelog.md
@@ -1,112 +1,159 @@
+## v4.9.0
+2020-08-06
+
++ [Feature] [graph] Support multiple edges to link nodes in graph. 
[#12590](https://github.com/apache/incubator-echarts/pull/12590) 
([wf123537200](https://github.com/wf123537200))
+
++ [Feature] [funnel] Add `orient` option in funnel. Support horizontal layout. 
[#12754](https://github.com/apache/incubator-echarts/pull/12754) 
([regrex](https://github.com/regrex))
+
++ [Enhancement] [tooltip] Add text shadow options. 
[#12664](https://github.com/apache/incubator-echarts/pull/12664) 
([Ovilia](https://github.com/Ovilia))
+
++ [Enhancement] [toolbox] Add `brushStyle` option to configuration style of 
brush rect in the dataZoom feature. 
[#12550](https://github.com/apache/incubator-echarts/pull/12550) 
([zhiyuc123](https://github.com/zhiyuc123))
+
++ [Fix] [themeRiver] Optimize data process in themeRiver. 
[#12022](https://github.com/apache/incubator-echarts/pull/12022) 
([Zaynex](https://github.com/Zaynex))
+
++ [Fix] [toolbox] Fix pie series render incorrectly after editing its data in 
the dataView feature. 
[#12561](https://github.com/apache/incubator-echarts/pull/12561) 
([plainheart](https://github.com/plainheart))
+
++ [Fix] [toolbox] Fix dataView shows NaN when using dataset. 
[#11849](https://github.com/apache/incubator-echarts/pull/11849) 
([susiwen8](https://github.com/susiwen8))
+
++ [Fix] [toolbox] Fix saveAsImage may have error in some special environments. 
[#12643](https://github.com/apache/incubator-echarts/pull/12643) 
([lzr900515](https://github.com/lzr900515))
+
++ [Fix] [lines] Fix lines disappear if setOption again without data. 
[#12850](https://github.com/apache/incubator-echarts/pull/12850) 
([plainheart](https://github.com/plainheart))
+
++ [Fix] [sunburst] [treemap] Fix label formatter in `levels` not work bug. 
[#12742](https://github.com/apache/incubator-echarts/pull/12742) 
([Ovilia](https://github.com/Ovilia))
+
++ [Fix] [bmap] Fix bmap event `moveend` is always triggered when dragging or 
zoomend. [#12558](https://github.com/apache/incubator-echarts/pull/12558) 
([plainheart](https://github.com/plainheart))
+
++ [Fix] [grid] Fix wrong gap calculation when `containLabel`is set in grid. 
[#12259](https://github.com/apache/incubator-echarts/issues/12259) 
([Ling310](https://github.com/Ling310))
+
++ [Fix] [tooltip] Fix newline in tooltip of radar and map series when using 
`ricText` render mode. 
[#12664](https://github.com/apache/incubator-echarts/pull/12664) 
([Ovilia](https://github.com/Ovilia))
+
++ [Fix] [tooltip] Update tooltip position proportionally when chart resized. 
[#12834](https://github.com/apache/incubator-echarts/pull/12834) 
([liulinboyi](https://github.com/liulinboyi))
+
++ [Fix] [tooltip] Fix tooltip dispose in `richText` render mode. 
[#12608](https://github.com/apache/incubator-echarts/pull/12608) 
([plainheart](https://github.com/plainheart))
+
++ [Fix] [tree] Fix image symbol not display on first render. 
[#12367](https://github.com/apache/incubator-echarts/pull/12367) 
([plainheart](https://github.com/plainheart))
+
++ [Fix] [geo] Fix label formatter not work bug. 
[#12762](https://github.com/apache/incubator-echarts/pull/12762) 
([plainheart](https://github.com/plainheart))
+
++ [Fix] [bar] Fix error when switching `showBackground` from `false` to 
`true`. [#13085](https://github.com/apache/incubator-echarts/pull/13085) 
([easonyq](https://github.com/easonyq))
+
++ [Fix] [markArea] Fix label is not hidden when markArea is outside the grid. 
[#12669](https://github.com/apache/incubator-echarts/pull/12669) 
([Ovilia](https://github.com/Ovilia))
+
++ [Fix] [markLine] [markPoint] Fix `symbolRotate` not work bug. 
[#12737](https://github.com/apache/incubator-echarts/pull/12737) 
[#12392](https://github.com/apache/incubator-echarts/pull/12392) 
([plainheart](https://github.com/plainheart))
+
++ [Fix] [polar] Fix bar layout on polar with nagive axis. 
[#12418](https://github.com/apache/incubator-echarts/pull/12418) 
([gracelia](https://github.com/gracelia))
+
+
+
 ## v4.8.0
 2020-05-25
 
-+ [Feature] [toolbox] Support download SVG file in toolbox when using SVG 
render mode. [#12144](https

[incubator-echarts] branch next updated: fix: make boxplot transform more reasonable: add config.itemNameFormatter and remove config.layout.

2020-08-06 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang 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 87bc7fb  fix: make boxplot transform more reasonable: add 
config.itemNameFormatter and remove config.layout.
87bc7fb is described below

commit 87bc7fb730d0e091d4a64820645271cdb402f328
Author: 100pah 
AuthorDate: Fri Aug 7 02:07:28 2020 +0800

fix: make boxplot transform more reasonable: add config.itemNameFormatter 
and remove config.layout.
---
 src/chart/boxplot/boxplotTransform.ts   | 11 +++--
 src/chart/boxplot/prepareBoxplotData.ts | 30 ++-
 test/boxplot-multi.html | 43 ++---
 test/boxplot.html   |  5 +---
 4 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/src/chart/boxplot/boxplotTransform.ts 
b/src/chart/boxplot/boxplotTransform.ts
index 2a8f1e0..bd92e7a 100644
--- a/src/chart/boxplot/boxplotTransform.ts
+++ b/src/chart/boxplot/boxplotTransform.ts
@@ -18,17 +18,14 @@
 */
 
 import { DataTransformOption, ExternalDataTransform } from 
'../../data/helper/transform';
-import prepareBoxplotData from './prepareBoxplotData';
+import prepareBoxplotData, { PrepareBoxplotDataOpt } from 
'./prepareBoxplotData';
 import { isArray } from 'zrender/src/core/util';
 import { throwError, makePrintable } from '../../util/log';
 
 
 export interface BoxplotTransformOption extends DataTransformOption {
 type: 'boxplot';
-config: {
-boundIQR?: number | 'none',
-layout?: 'horizontal' | 'vertical'
-}
+config: PrepareBoxplotDataOpt;
 }
 
 export const boxplotTransform: ExternalDataTransform = 
{
@@ -37,8 +34,6 @@ export const boxplotTransform: 
ExternalDataTransform = {
 
 transform: function transform(params) {
 const source = params.source;
-const config = params.config || {};
-
 const sourceData = source.data;
 if (
 !isArray(sourceData)
@@ -56,7 +51,7 @@ export const boxplotTransform: 
ExternalDataTransform = {
 
 const result = prepareBoxplotData(
 source.data as number[][],
-config
+params.config
 );
 
 return [{
diff --git a/src/chart/boxplot/prepareBoxplotData.ts 
b/src/chart/boxplot/prepareBoxplotData.ts
index 0a63a23..c7cb47c 100644
--- a/src/chart/boxplot/prepareBoxplotData.ts
+++ b/src/chart/boxplot/prepareBoxplotData.ts
@@ -18,6 +18,13 @@
 */
 
 import { quantile, asc } from '../../util/number';
+import { isFunction, isString } from 'zrender/src/core/util';
+
+export interface PrepareBoxplotDataOpt {
+boundIQR?: number | 'none';
+// Like "expriment{value}" produce: "expriment0", "expriment1", ...
+itemNameFormatter?: string | ((params: { value: number }) => string);
+}
 
 
 /**
@@ -36,18 +43,13 @@ import { quantile, asc } from '../../util/number';
  * @param opt.boundIQR=1.5 Data less than min bound is outlier.
  *  default 1.5, means Q1 - 1.5 * (Q3 - Q1).
  *  If 'none'/0 passed, min bound will not be used.
- * @param opt.layout='horizontal'
- *  Box plot layout, can be 'horizontal' or 'vertical'
  */
 export default function (
 rawData: number[][],
-opt: {
-boundIQR?: number | 'none',
-layout?: 'horizontal' | 'vertical'
-}
+opt: PrepareBoxplotDataOpt
 ): {
-boxData: number[][]
-outliers: number[][]
+boxData: (number | string)[][];
+outliers: (number | string)[][];
 } {
 opt = opt || {};
 const boxData = [];
@@ -73,13 +75,19 @@ export default function (
 ? max
 : Math.min(max, Q3 + bound);
 
-boxData.push([i, low, Q1, Q2, Q3, high]);
+const itemNameFormatter = opt.itemNameFormatter;
+const itemName = isFunction(itemNameFormatter)
+? itemNameFormatter({ value: i })
+: isString(itemNameFormatter)
+? itemNameFormatter.replace('{value}', i + '')
+: i + '';
+
+boxData.push([itemName, low, Q1, Q2, Q3, high]);
 
 for (let j = 0; j < ascList.length; j++) {
 const dataItem = ascList[j];
 if (dataItem < low || dataItem > high) {
-const outlier = [i, dataItem];
-opt.layout === 'vertical' && outlier.reverse();
+const outlier = [itemName, dataItem];
 outliers.push(outlier);
 }
 }
diff --git a/test/boxplot-multi.html b/test/boxplot-multi.html
index ef09919..ed4300d 100644
--- a/test/boxplot-multi.html
+++ b/test/boxplot-multi.html
@@ -69,9 +69,6 @@ under the License.
 splitArea: {
 show: true
 },
-axisLabel: {
-formatter: 'expr {value}'
-   

[incubator-echarts] branch fix/line-symbol-rotation created (now 6a9e723)

2020-08-05 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch fix/line-symbol-rotation
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


  at 6a9e723  fix: In Line.js (used by graph and markLine), when rotation 
is not specified by users, the "auto rotation" rule should not be broken when 
rendered at the second time (like when drag graph or move dataZoom). (Brought 
by 7c3f1896fa1fa93fc7d019f40fd4584024ca32eb #12392 )

This branch includes the following new commits:

 new 6a9e723  fix: In Line.js (used by graph and markLine), when rotation 
is not specified by users, the "auto rotation" rule should not be broken when 
rendered at the second time (like when drag graph or move dataZoom). (Brought 
by 7c3f1896fa1fa93fc7d019f40fd4584024ca32eb #12392 )

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



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



[incubator-echarts] 01/01: fix: In Line.js (used by graph and markLine), when rotation is not specified by users, the "auto rotation" rule should not be broken when rendered at the second time (like w

2020-08-05 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a commit to branch fix/line-symbol-rotation
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git

commit 6a9e7239acbc0d6162d7550c6cad7d98d681a0d7
Author: 100pah 
AuthorDate: Thu Aug 6 00:28:56 2020 +0800

fix: In Line.js (used by graph and markLine), when rotation is not 
specified by users, the "auto rotation" rule should not be broken when rendered 
at the second time (like when drag graph or move dataZoom). (Brought by 
7c3f1896fa1fa93fc7d019f40fd4584024ca32eb #12392 )
---
 src/chart/helper/Line.js| 18 --
 test/markLine-symbolRotate.html | 19 ++-
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/chart/helper/Line.js b/src/chart/helper/Line.js
index 7824751..260fa36 100644
--- a/src/chart/helper/Line.js
+++ b/src/chart/helper/Line.js
@@ -57,8 +57,8 @@ function createSymbol(name, lineData, idx) {
 );
 
 // rotate by default if symbolRotate is not specified or NaN
-symbolPath.rotation = symbolRotate == null || isNaN(symbolRotate)
-? undefined
+symbolPath.__specifiedRotation = symbolRotate == null || 
isNaN(symbolRotate)
+? void 0
 : +symbolRotate * Math.PI / 180 || 0;
 symbolPath.name = name;
 
@@ -131,13 +131,16 @@ function updateSymbolAndLabelBeforeLineUpdate() {
 // when symbol is set to be 'arrow' in markLine,
 // symbolRotate value will be ignored, and compulsively use tangent 
angle.
 // rotate by default if symbol rotation is not specified
-if (symbolFrom.rotation == null
-|| (symbolFrom.shape && symbolFrom.shape.symbolType === 'arrow')) {
+var specifiedRotation = symbolFrom.__specifiedRotation;
+if (specifiedRotation == null) {
 var tangent = line.tangentAt(0);
 symbolFrom.attr('rotation', Math.PI / 2 - Math.atan2(
 tangent[1], tangent[0]
 ));
 }
+else {
+symbolFrom.attr('rotation', specifiedRotation);
+}
 symbolFrom.attr('scale', [invScale * percent, invScale * percent]);
 }
 if (symbolTo) {
@@ -146,13 +149,16 @@ function updateSymbolAndLabelBeforeLineUpdate() {
 // when symbol is set to be 'arrow' in markLine,
 // symbolRotate value will be ignored, and compulsively use tangent 
angle.
 // rotate by default if symbol rotation is not specified
-if (symbolTo.rotation == null
-|| (symbolTo.shape && symbolTo.shape.symbolType === 'arrow')) {
+var specifiedRotation = symbolTo.__specifiedRotation;
+if (specifiedRotation == null) {
 var tangent = line.tangentAt(1);
 symbolTo.attr('rotation', -Math.PI / 2 - Math.atan2(
 tangent[1], tangent[0]
 ));
 }
+else {
+symbolTo.attr('rotation', specifiedRotation);
+}
 symbolTo.attr('scale', [invScale * percent, invScale * percent]);
 }
 
diff --git a/test/markLine-symbolRotate.html b/test/markLine-symbolRotate.html
index 96bd4b1..1a5afd5 100644
--- a/test/markLine-symbolRotate.html
+++ b/test/markLine-symbolRotate.html
@@ -118,6 +118,10 @@ under the License.
 silent: true,
 // symbol: 'triangle',
 data: [
+[
+{name: 'rotation not specified', coord: 
['2014-06-20', 300], symbol: 'arrow'},
+{coord: ['2014-07-18', 320], symbol: 
'triangle'}
+],
 {
 yAxis: 50,
 // symbolRotate: 0,
@@ -133,15 +137,18 @@ under the License.
 yAxis: 150,
 symbol: 'roundRect',
 symbolRotate: 40
-}, {
+},
+{
 yAxis: 200,
 symbol: 'diamond',
-symbolRotate: 70
-}, {
+symbolRotate: 45
+},
+{
 yAxis: 250,
 symbol: 'pin',
 symbolRotate: 45
-}, {
+},
+{
 yAxis: 300,
 symbol: 'circle',
 symbolRotate: 90
@@ -162,7 +169,9 @@ under the License.

[incubator-echarts-doc] branch master updated: fix: build script.

2020-08-05 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 308155f  fix: build script.
308155f is described below

commit 308155f6cc6017fe221db87da59368c381ab6253
Author: 100pah 
AuthorDate: Wed Aug 5 22:32:53 2020 +0800

fix: build script.
---
 build.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.js b/build.js
index 10ece37..b8cc3df 100644
--- a/build.js
+++ b/build.js
@@ -256,7 +256,7 @@ function writeSingleSchemaPartioned(schema, language, 
docName, format) {
 const outlineBasename = `${docName}-outline.json`;
 const outlineDestPath = path.resolve(config.releaseDestDir, 
`${language}/documents/${docName}-parts/${outlineBasename}`);
 fse.ensureDirSync(path.dirname(outlineDestPath));
-fse.outputFile(
+fse.outputFileSync(
 outlineDestPath,
 format ? JSON.stringify(outline, null, 2) : JSON.stringify(outline),
 'utf-8'
@@ -295,7 +295,7 @@ function writeSingleSchemaPartioned(schema, language, 
docName, format) {
 const descDestPath = path.resolve(config.releaseDestDir, 
`${language}/documents/${docName}-parts/${descBasename}`);
 fse.ensureDirSync(path.dirname(descDestPath));
 const content = JSON.stringify(json, null, 2);
-fse.outputFile(
+fse.outputFileSync(
 descDestPath,
 // format ? JSON.stringify(partDescriptions, null, 2) : 
JSON.stringify(partDescriptions),
 content,


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



[incubator-echarts] 01/01: Merge pull request #13078 from apache/master

2020-08-05 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit f375328e75d2e0be1b0a930d7345d9f11eadba7d
Merge: 3b61add 450ee94
Author: sushuang 
AuthorDate: Wed Aug 5 20:19:57 2020 +0800

Merge pull request #13078 from apache/master

Create release 4.9.0 branch

 .gitattributes   |   3 +
 .github/workflows/nodejs.yml |   4 +-
 .huskyrc |   5 +
 README.md|   2 +-
 extension-src/bmap/BMapCoordSys.js   |  18 +-
 extension-src/bmap/BMapModel.js  |   7 +-
 extension-src/bmap/BMapView.js   |  26 +-
 package-lock.json| 242 +++
 package.json |   1 +
 src/chart/bar/BarView.js |  27 +-
 src/chart/bar/PictorialBarSeries.js  |   4 +-
 src/chart/funnel/FunnelSeries.js |   1 +
 src/chart/funnel/funnelLayout.js | 232 ---
 src/chart/graph/GraphSeries.js   |  12 +-
 src/chart/graph/circularLayoutHelper.js  |  10 +-
 src/chart/graph/forceLayout.js   |   8 +-
 src/chart/graph/simpleLayoutHelper.js|  17 +-
 src/chart/helper/Line.js |  43 +-
 src/chart/helper/Symbol.js   |   4 +-
 src/chart/helper/createGraphFromNodeEdge.js  |   3 +-
 src/chart/helper/multipleGraphEdgeHelper.js  | 229 +++
 src/chart/lines/LinesSeries.js   |   4 +-
 src/chart/map/MapSeries.js   |   5 +-
 src/chart/radar/RadarSeries.js   |   7 +-
 src/chart/radar/RadarView.js |   6 +-
 src/chart/sunburst/SunburstPiece.js  |   6 +-
 src/chart/sunburst/SunburstSeries.js |  24 +-
 src/chart/themeRiver/ThemeRiverSeries.js |  48 +--
 src/chart/tree/TreeSeries.js |   2 +-
 src/chart/tree/TreeView.js   |   6 +-
 src/chart/treemap/TreemapSeries.js   |  14 +-
 src/chart/treemap/treemapLayout.js   |   4 +-
 src/chart/treemap/treemapVisual.js   |  33 +-
 src/component/axisPointer/axisTrigger.js |   2 +-
 src/component/legend/ScrollableLegendView.js |   2 +-
 src/component/marker/MarkAreaView.js |  68 ++-
 src/component/marker/MarkLineView.js |   4 +-
 src/component/marker/MarkPointView.js|   8 +-
 src/component/marker/MarkerModel.js  |   5 +-
 src/component/timeline/SliderTimelineView.js |  11 +-
 src/component/title.js   |   4 +-
 src/component/toolbox/feature/DataView.js|  28 +-
 src/component/toolbox/feature/DataZoom.js|  12 +-
 src/component/toolbox/feature/SaveAsImage.js |   3 +-
 src/component/tooltip/TooltipContent.js  |  43 +-
 src/component/tooltip/TooltipRichContent.js  |  61 ++-
 src/component/tooltip/TooltipView.js |   8 +-
 src/component/visualMap/VisualMapModel.js|   2 +-
 src/coord/axisDefault.js |   2 +-
 src/coord/axisHelper.js  |   4 +-
 src/coord/geo/GeoModel.js|   9 +-
 src/data/Graph.js|   5 -
 src/data/List.js |   2 +-
 src/data/Tree.js |  36 +-
 src/layout/barPolar.js   |   6 +-
 src/processor/dataSample.js  |   2 +-
 src/stream/Scheduler.js  |   2 +-
 src/visual/VisualMapping.js  |   2 +-
 test/axisLabel.html  |  11 +-
 test/bar-polar-stack.html| 218 ++
 test/bmap-mapOptions.html| 530 
 test/bmap2.html  | 592 +++
 test/data/aqi/aqi-beijing.json   |   1 +
 test/dataZoom-toolbox.html   |   8 +-
 test/dataset-charts.html |  36 +-
 test/funnel.html |  11 +-
 test/geo-labelFormatter.html | 364 
 test/graph-mulitple-edges.html   | 357 
 test/lines-mergeOption.html  | 103 +
 test/markArea.html   |  21 +-
 test/markLine-symbolRotate.html  | 178 
 test/markPoint.html  |  11 +-
 test/pie-dataView.html   | 122 ++
 test/radar.html  |   9 +-
 test/sunburst-visualMap.html |  24 +-
 test/themeRiver3.html| 154 +++
 test/timeline-dynamic-series.html| 136 +++---
 test/tooltip-rich.html   |  14 +-
 test/tooltip-textStyle.html  | 455 
 test/tooltip-windowResize.html   | 383 +
 test/tree-image2.html

[incubator-echarts] branch release updated (3b61add -> f375328)

2020-08-05 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch release
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


from 3b61add  Merge pull request #12574 from apache/release-dev
 add 6026bd3  Merge pull request #2 from apache/master
 add e15eaf0  Merge pull request #3 from apache/master
 add 09aaafe  Merge pull request #4 from apache/master
 add 82bb413  Merge pull request #5 from apache/master
 add c3dc1cb  feat(package.json): add husky pre-commit task to keep the 
code style consistent
 add 79919e7  Merge pull request #12526 from wf123537200/add-husky
 add 5c245bc  Merge pull request #6 from apache/master
 add 0a757f2  fix(tooltip): added dispose method for rich tooltip, close 
apache#12607.
 add 1b02954  Merge pull request #12608 from plainheart/fix-12607
 add baa6ea6  fix(bmap): tweak BMapView.js, no need to import `clone` from 
zrender and it can be fetched from echarts object. (#12568)
 add 4e5c6f7  saveAsImage function, use document.defaultView instead of 
window (#12643)
 add 7b5c5e2  fix(markArea): hide labels when markArea is not inside grid 
#12591
 add 2dac208  test(markArea): add test case for #12591
 add f62503d  fix(markArea): call axis.containData #12591
 add 31aaec0  docs: fix the spell error
 add 36754fc  Merge pull request #12674 from clChenLiang/master
 add 695375d  fix(line): fix `symbolRotate` for `markLine` does not work. 
close apache#12388.
 add f949aeb  fix(line): rotate by default if `symbolRotate` in `markLine` 
is not specified or NaN.
 add d4fb12a  test(markLine): remove useless variables.
 add 7c3f189  Merge pull request #12392 from plainheart/fix-12388
 add bb1d16e  Merge pull request #12707 from apache/release
 add 184d935  fix(polor): polar bar negative clipping #12109 (#12418)
 add 9b793bc  fix(markPoint): symbolRotate for markPoint does not work.
 add 19711a2  Merge pull request #12737 from plainheart/fix-12731
 add 9a9d829  fix(sunburst): enables label formatter in levels #12223
 add 15ee064  refactor(tree): remove level in tree data #12223
 add 0a98ffb  fix(treemap): remove levelItemStyles #12223
 add dc3f7bd  fix: fix treemap levels color does not work, which was 
brought by 55bd42dca1b7bb240895ea44396160acaa77694d in 4.8.0. Fix #12747.
 add 32a2c0c  Merge pull request #12742 from apache/fix-12223
 add cb9f6dc  Merge pull request #7 from apache/master
 add 5ed2c9b  Merge branch 'master' of 
https://github.com/apache/incubator-echarts
 add 0cb49f7  fix(bmap): remove Object.keys belongs to ES5.
 add 32961f6  Merge pull request #12780 from 
plainheart/fix-es5-in-bmap-extension
 add 40a6279  fix(radar): symbolRotate does not work for radar series.
 add 3bb072c  Merge pull request #12695 from 
plainheart/fix-radar-symbolRotate
 add ad25fe5  Update comments to not use defualt
 add 5c1a5fb  Merge pull request #12828 from 
xmatthias/replace_defualt_comments
 add a060cef  Merge branch 'master' of 
https://github.com/apache/incubator-echarts into fix-geo-label-formatter
 add 17689f1  fix(geo): label formatter in geo works incorrectly, tweaks 
apache#10666 & apache#8612.
 add 1c39dbe  fix(geo): use var but not literal.
 add 940b872  fix(geo): added default value for label status.
 add 300f75d  Merge pull request #12762 from 
plainheart/fix-geo-label-formatter
 add d11b53e  fix(tree): the symbols of image type do not display at the 
first rendering. close apache#12279.
 add df815b3  fix(tree): optimize code.
 add 6176bd2  fix(tree): tweak access way to the type of symbolEl.
 add 48d54d8  fix(tree): fix invalid opacity configuration for symbolPath.
 add 8631f27  Merge pull request #12367 from plainheart/fix-12279
 add e73aab0  fix(title): incorrect redirect when sublink is clicked.
 add 6f78c0d  Merge pull request #12842 from apache/fix-12841
 add a9653ea  ci: run on pr opened or synchronized
 add 4a84425  fix: #12812
 add 1b0e756  docs(tooltip): fix the spell error
 add 1f31de3  Merge pull request #12834 from liulinboyi/fix-12812
 add 1f90f1e  feat(graph): graph support multiple edges, for #6811
 add b2856b2  feat(graph): graph support mutil edge, for #6811
 add d9c5d2f  fix(tree): code rebuild follow the review suggest
 add 32a7062  fix(tree): code rebuild follow the review suggest #2
 add 754bf60  fix(tree): code rebuild follow the review suggest #2
 add 68eff58  fix(tree): code rebuild follow the review suggest #3
 add eadceff  fix(tree): code rebuild follow the review suggest #3
 add a02f3f2  fix(tree): code rebuild follow the review suggest #4
 add 601aa05  fix(tree): code rebuild follow the review suggest #5, add 
even test
 add fd25c1a  fix(tree): code rebuild follow the review suggest #6
 add baae12e  Merge pull request #12590 from wf12353

[incubator-echarts] branch master updated (ab3d9e4 -> 450ee94)

2020-08-05 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


from ab3d9e4  Merge pull request #12022 from Zaynex/fix-themeriver
 new 58aca40  feat(funnel): support orient horizontal
 new 6ffebb6  Merge remote-tracking branch 'origin/master' into 
feat-funnel-orient
 new bfaf1dd  feat(funnel): optimize orient api and label position values
 new a12b9c7  Merge remote-tracking branch 'origin/master' into 
feat-funnel-orient
 new 483c0cd  feat(funnel): change horizontal default label position
 new 450ee94  Merge pull request #12754 from regrex/feat-funnel-orient

The 5966 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/chart/funnel/FunnelSeries.js |   1 +
 src/chart/funnel/funnelLayout.js | 232 ++-
 test/funnel.html |  11 +-
 3 files changed, 188 insertions(+), 56 deletions(-)


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



[incubator-echarts] branch master updated (8d3291e -> ab3d9e4)

2020-08-05 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


from 8d3291e  Merge pull request #12669 from apache/fix-12591
 new e5975d0  fix(themeRiver): use layer key map rather then largestLayer 
#11948
 new f4a8bfb  chore: performance
 new 65d726e  fix: add hasOwnProperty for robustness.
 new ab3d9e4  Merge pull request #12022 from Zaynex/fix-themeriver

The 5960 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/chart/themeRiver/ThemeRiverSeries.js |  48 +-
 test/themeRiver3.html| 154 +++
 2 files changed, 175 insertions(+), 27 deletions(-)
 create mode 100644 test/themeRiver3.html


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



[incubator-echarts-website] branch asf-site updated: fix: prevent from visiting .git

2020-08-04 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new 37a9c84  fix: prevent from visiting .git
37a9c84 is described below

commit 37a9c84f72f054acf3d8b5d92257a0fe5cfbf636
Author: 100pah 
AuthorDate: Tue Aug 4 14:14:25 2020 +0800

fix: prevent from visiting .git
---
 .htaccess | 4 
 1 file changed, 4 insertions(+)

diff --git a/.htaccess b/.htaccess
index b017eba..8ecbd37 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,3 +1,7 @@
+RedirectMatch 404 /\.git
+RedirectMatch 404 /\.gitignore
+RedirectMatch 404 /\.htaccess
+
 Header set Access-Control-Allow-Origin "https://echarts.apache.org;
 Header set Access-Control-Allow-Methods: "*"
 Header set Access-Control-Allow-Headers: "*"


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



[incubator-echarts-doc] branch next created (now 92f689d)

2020-08-01 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


  at 92f689d  Merge pull request #126 from psimyn/patch-1

No new revisions were added by this update.


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



[incubator-echarts] tag 5.0.0-alpha.1 created (now 3d83d38)

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to tag 5.0.0-alpha.1
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


  at 3d83d38  (commit)
No new revisions were added by this update.


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



[incubator-echarts] tag 5.0.0-alpha.1 created (now ffde233)

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to tag 5.0.0-alpha.1
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


  at ffde233  (commit)
No new revisions were added by this update.


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



[incubator-echarts] 01/03: fix: remove unnecessary files.

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit fe6b6a2cd8426d57bd208661109537a87682f03d
Author: 100pah 
AuthorDate: Sat Aug 1 00:32:44 2020 +0800

fix: remove unnecessary files.
---
 extension-src/dataTool/boxplotTransform.ts | 70 --
 extension-src/dataTool/index.ts|  6 +--
 2 files changed, 3 insertions(+), 73 deletions(-)

diff --git a/extension-src/dataTool/boxplotTransform.ts 
b/extension-src/dataTool/boxplotTransform.ts
deleted file mode 100644
index 4a51370..000
--- a/extension-src/dataTool/boxplotTransform.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-* 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 { DataTransformOption, ExternalDataTransform } from 
'../../src/data/helper/transform';
-import prepareBoxplotData from './prepareBoxplotData';
-import { isArray, each } from 'zrender/src/core/util';
-// import { throwError, makePrintable } from '../../src/util/log';
-
-
-export interface BoxplotTransformOption extends DataTransformOption {
-type: 'echarts-extension:boxplot';
-config: {
-boundIQR?: number | 'none',
-layout?: 'horizontal' | 'vertical'
-}
-}
-
-export const boxplotTransform: ExternalDataTransform = 
{
-
-type: 'echarts-extension:boxplot',
-
-// PEDING: enhance to filter by index rather than create new data
-transform: function transform(params) {
-const source = params.source;
-const config = params.config || {};
-
-const sourceData = source.data;
-if (
-!isArray(sourceData)
-|| (sourceData[0] && !isArray(sourceData[0]))
-) {
-throw new Error(
-'source data is not applicable for this boxplot transform. 
Expect number[][].'
-);
-}
-
-const result = prepareBoxplotData(
-source.data as number[][],
-config
-);
-
-const boxData = result.boxData as (number | string)[][];
-each(boxData, function (item, dataIdx) {
-item.unshift(result.axisData[dataIdx]);
-});
-
-return [{
-data: boxData
-}, {
-data: result.outliers
-}];
-}
-};
-
diff --git a/extension-src/dataTool/index.ts b/extension-src/dataTool/index.ts
index c4cc447..3acc302 100644
--- a/extension-src/dataTool/index.ts
+++ b/extension-src/dataTool/index.ts
@@ -21,14 +21,14 @@
 import * as echarts from 'echarts';
 import * as gexf from './gexf';
 import prepareBoxplotData from './prepareBoxplotData';
-import { boxplotTransform } from './boxplotTransform';
+// import { boxplotTransform } from './boxplotTransform';
 
 export const version = '1.0.0';
 
 export {gexf};
 
 export {prepareBoxplotData};
-export {boxplotTransform};
+// export {boxplotTransform};
 
 // For backward compatibility, where the namespace `dataTool` will
 // be mounted on `echarts` is the extension `dataTool` is imported.
@@ -38,5 +38,5 @@ if (echarts.dataTool) {
 echarts.dataTool.version = version;
 echarts.dataTool.gexf = gexf;
 echarts.dataTool.prepareBoxplotData = prepareBoxplotData;
-echarts.dataTool.boxplotTransform = boxplotTransform;
+// echarts.dataTool.boxplotTransform = boxplotTransform;
 }


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



[incubator-echarts] 02/03: fix: fix zrender build path for extension.

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 165e1479b952c386ef2f52acc46fd9d4e237af02
Author: 100pah 
AuthorDate: Sat Aug 1 00:45:48 2020 +0800

fix: fix zrender build path for extension.
---
 build/config.js | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/config.js b/build/config.js
index 3d39d0e..1d94ce8 100644
--- a/build/config.js
+++ b/build/config.js
@@ -34,9 +34,10 @@ function preparePlugins(
 // In case node_modules/zrender is a symlink
 const zrNodeModulePath = nodePath.resolve(ecDir, 'node_modules/zrender');
 const zrRealPath = fs.realpathSync(zrNodeModulePath);
-if (zrRealPath !== zrNodeModulePath) {
-include.push(zrRealPath + '/**/*.ts');
-}
+// if (zrRealPath !== zrNodeModulePath) {
+// include.push(zrRealPath + '/**/*.ts');
+// }
+include.push(zrRealPath + '/**/*.ts');
 
 if (clean) {
 console.log('Built in clean mode without cache.');


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



[incubator-echarts] branch next updated (f1d026e -> ffde233)

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


from f1d026e  Merge branch 'next' of github.com:apache/incubator-echarts 
into next
 new fe6b6a2  fix: remove unnecessary files.
 new 165e147  fix: fix zrender build path for extension.
 new ffde233  release: 5.0.0-alpha.1

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build/config.js|  7 +-
 dist/echarts-en.common.js  |  64541 ---
 dist/echarts-en.common.min.js  | 22 -
 dist/echarts-en.js |  98328 -
 dist/echarts-en.js.map |  1 -
 dist/echarts-en.min.js | 22 -
 dist/echarts-en.simple.js  |  44487 
 dist/echarts-en.simple.min.js  | 22 -
 dist/echarts.common.js | 101430 -
 dist/echarts.common.js.map |  1 +
 dist/echarts.common.min.js |  2 +-
 dist/echarts.js| 152888 +++---
 dist/echarts.js.map|  2 +-
 dist/echarts.min.js|  2 +-
 dist/echarts.simple.js |  71147 ++--
 dist/echarts.simple.js.map |  1 +
 dist/echarts.simple.min.js |  2 +-
 dist/extension/bmap.js |960 +-
 dist/extension/bmap.js.map |  2 +-
 dist/extension/bmap.min.js |  2 +-
 dist/extension/dataTool.js |   1000 +-
 dist/extension/dataTool.js.map |  2 +-
 dist/extension/dataTool.min.js |  2 +-
 extension-src/dataTool/boxplotTransform.ts | 70 -
 extension-src/dataTool/index.ts|  6 +-
 package.json   |  4 +-
 26 files changed, 140589 insertions(+), 394364 deletions(-)
 delete mode 100644 dist/echarts-en.common.js
 delete mode 100644 dist/echarts-en.common.min.js
 delete mode 100644 dist/echarts-en.js
 delete mode 100644 dist/echarts-en.js.map
 delete mode 100644 dist/echarts-en.min.js
 delete mode 100644 dist/echarts-en.simple.js
 delete mode 100644 dist/echarts-en.simple.min.js
 create mode 100644 dist/echarts.common.js.map
 create mode 100644 dist/echarts.simple.js.map
 delete mode 100644 extension-src/dataTool/boxplotTransform.ts


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



[incubator-echarts] branch next updated: fix: update main theme

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang 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 a49c492  fix: update main theme
 new f1d026e  Merge branch 'next' of github.com:apache/incubator-echarts 
into next
a49c492 is described below

commit a49c4928ea380ec38f0d7f126995ec8ac5cd0cba
Author: 100pah 
AuthorDate: Fri Jul 31 23:21:33 2020 +0800

fix: update main theme
---
 src/model/globalDefault.ts | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/model/globalDefault.ts b/src/model/globalDefault.ts
index dd23a75..e74ce8c 100644
--- a/src/model/globalDefault.ts
+++ b/src/model/globalDefault.ts
@@ -40,7 +40,16 @@ export default {
 // '#ca8622', '#bda29a', '#6e7074', '#546570', '#c4ccd3'
 // ],
 color: [
-'#51689b', '#ce5c5c', '#fbc357', '#8fbf8f', '#659d84', '#fb8e6a', 
'#c77288', '#786090', '#91c4c5', '#6890ba'
+// '#51689b', '#ce5c5c', '#fbc357', '#8fbf8f', '#659d84', '#fb8e6a', 
'#c77288', '#786090', '#91c4c5', '#6890ba'
+'#5470c6',
+'#91cc75',
+'#ffbf25',
+'#ef6868',
+'#ffa086',
+'#b25790',
+'#fe719b',
+'#59d9d2',
+'#46a9ee'
 ],
 
 gradientColor: ['#f6efa6', '#d88273', '#bf444c'],


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



[incubator-echarts] 01/01: Merge branch 'next' into dataset-trans

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit fd38c5c881470d3dc6ff8bf3c9f8b83004fdb741
Merge: 7811279 f050a8a
Author: 100pah 
AuthorDate: Fri Jul 31 21:30:03 2020 +0800

Merge branch 'next' into dataset-trans

 build/amd2common.js  | 182 
 package.json |   4 -
 src/chart/bar/BarView.ts |   4 +-
 src/coord/axisDefault.ts |   3 +-
 src/echarts.ts   |  16 +-
 src/scale/Time.ts| 553 +++
 src/util/time.ts | 130 +++
 test/dynamicData2.html   |   3 -
 test/pie3.html   |  14 +-
 9 files changed, 429 insertions(+), 480 deletions(-)


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



[incubator-echarts] branch next updated (f050a8a -> fd38c5c)

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


from f050a8a  Merge pull request #13065 from apache/dataset-trans
 add 90a9c76  fix: miss a commit
 add 7811279  test: remove unnecessary test file.
 new fd38c5c  Merge branch 'next' into dataset-trans

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 echarts.all.ts|   3 +-
 test/data-transform-external.html | 116 --
 2 files changed, 1 insertion(+), 118 deletions(-)
 delete mode 100644 test/data-transform-external.html


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



[incubator-echarts] branch dataset-trans updated: test: remove unnecessary test file.

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/dataset-trans by this push:
 new 7811279  test: remove unnecessary test file.
7811279 is described below

commit 7811279036e7b0901609b1c2bf23b376df02780c
Author: 100pah 
AuthorDate: Fri Jul 31 21:26:50 2020 +0800

test: remove unnecessary test file.
---
 test/data-transform-external.html | 116 --
 1 file changed, 116 deletions(-)

diff --git a/test/data-transform-external.html 
b/test/data-transform-external.html
deleted file mode 100644
index f204874..000
--- a/test/data-transform-external.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-require(['echarts', 'data/Michelson-Morley.json', 
'extension/dataTool'], function (echarts, rawData, dataTool) {
-var boxplotTransform = dataTool.boxplotTransform;
-
-echarts.registerTransform(boxplotTransform);
-
-var option = {
-dataset: [{
-source: rawData
-}, {
-transform: {
-type: 'echarts-extension:boxplot'
-}
-}, {
-fromDatasetIndex: 1,
-fromTransformResult: 1
-}],
-title: [
-{
-text: 'Michelson-Morley Experiment',
-left: 'center'
-},
-{
-text: 'upper: Q3 + 1.5 * IRQ \nlower: Q1 - 1.5 * IRQ',
-borderColor: '#999',
-borderWidth: 1,
-textStyle: {
-fontSize: 14
-},
-left: '10%',
-top: '90%'
-}
-],
-legend: {
-bottom: 20
-},
-tooltip: {
-},
-grid: {
-bottom: 80
-},
-xAxis: {
-type: 'category',
-},
-yAxis: {
-type: 'value',
-name: 'km/s minus 299,000',
-},
-series: [{
-name: 'boxplot',
-type: 'boxplot',
-datasetIndex: 1
-}, {
-name: 'outlier',
-type: 'scatter',
-datasetIndex: 2
-}]
-};
-
-var chart = testHelper.create(echarts, 'main_boxplot', {
-title: [
-'Boxplot',
-],
-option: option
-});
-});
-
-
-
-
-
-


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



[incubator-echarts] branch dataset-trans updated (246667e -> feae3b4)

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch dataset-trans
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


from 246667e  fix: prevent potential issue after the implementation of 
isString change.
 add feae3b4  feature: move boxplot transform internally.

No new revisions were added by this update.

Summary of changes:
 src/chart/boxplot.ts   |  3 +
 .../chart/boxplot}/boxplotTransform.ts | 29 +
 .../chart/boxplot}/prepareBoxplotData.ts   | 35 ++-
 test/boxplot-multi.html| 48 ---
 test/boxplot.html  | 70 ++
 test/encode.html   | 24 +---
 6 files changed, 96 insertions(+), 113 deletions(-)
 copy {extension-src/dataTool => src/chart/boxplot}/boxplotTransform.ts (72%)
 copy {extension-src/dataTool => src/chart/boxplot}/prepareBoxplotData.ts (75%)


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



[incubator-echarts] branch dataset-trans updated: fix: miss a commit

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/dataset-trans by this push:
 new 90a9c76  fix: miss a commit
90a9c76 is described below

commit 90a9c766562d85e9a4f8beda756dfee742372e80
Author: 100pah 
AuthorDate: Fri Jul 31 21:26:20 2020 +0800

fix: miss a commit
---
 echarts.all.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/echarts.all.ts b/echarts.all.ts
index b8d3d90..0cd0e89 100644
--- a/echarts.all.ts
+++ b/echarts.all.ts
@@ -21,8 +21,7 @@ export * from './src/echarts';
 export * from './src/export';
 
 import './src/component/dataset';
-
-
+import './src/component/transform';
 
 // --
 // All of the modules that are allowed to be


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



[incubator-echarts] branch dataset-trans updated (246667e -> feae3b4)

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch dataset-trans
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


from 246667e  fix: prevent potential issue after the implementation of 
isString change.
 add feae3b4  feature: move boxplot transform internally.

No new revisions were added by this update.

Summary of changes:
 src/chart/boxplot.ts   |  3 +
 .../chart/boxplot}/boxplotTransform.ts | 29 +
 .../chart/boxplot}/prepareBoxplotData.ts   | 35 ++-
 test/boxplot-multi.html| 48 ---
 test/boxplot.html  | 70 ++
 test/encode.html   | 24 +---
 6 files changed, 96 insertions(+), 113 deletions(-)
 copy {extension-src/dataTool => src/chart/boxplot}/boxplotTransform.ts (72%)
 copy {extension-src/dataTool => src/chart/boxplot}/prepareBoxplotData.ts (75%)


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



[incubator-echarts] branch dataset-trans updated (246667e -> feae3b4)

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch dataset-trans
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


from 246667e  fix: prevent potential issue after the implementation of 
isString change.
 add feae3b4  feature: move boxplot transform internally.

No new revisions were added by this update.

Summary of changes:
 src/chart/boxplot.ts   |  3 +
 .../chart/boxplot}/boxplotTransform.ts | 29 +
 .../chart/boxplot}/prepareBoxplotData.ts   | 35 ++-
 test/boxplot-multi.html| 48 ---
 test/boxplot.html  | 70 ++
 test/encode.html   | 24 +---
 6 files changed, 96 insertions(+), 113 deletions(-)
 copy {extension-src/dataTool => src/chart/boxplot}/boxplotTransform.ts (72%)
 copy {extension-src/dataTool => src/chart/boxplot}/prepareBoxplotData.ts (75%)


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



[incubator-echarts] 07/10: ts: fix type.

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 4243980aa4881555339e9151d7e6d6e312798dde
Author: 100pah 
AuthorDate: Fri Jul 31 16:56:05 2020 +0800

ts: fix type.
---
 extension-src/dataTool/prepareBoxplotData.ts | 19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/extension-src/dataTool/prepareBoxplotData.ts 
b/extension-src/dataTool/prepareBoxplotData.ts
index b57575a..1bb733e 100644
--- a/extension-src/dataTool/prepareBoxplotData.ts
+++ b/extension-src/dataTool/prepareBoxplotData.ts
@@ -17,7 +17,6 @@
 * under the License.
 */
 
-// @ts-nocheck
 
 function asc(arr: T): T {
 arr.sort(function (a, b) {
@@ -59,11 +58,21 @@ function quantile(ascArr: number[], p: number): number {
  *  axisData: Array.
  * }
  */
-export default function (rawData, opt) {
-opt = opt || [];
+export default function (
+rawData: number[][],
+opt: {
+boundIQR?: number | 'none',
+layout?: 'horizontal' | 'vertical'
+}
+): {
+boxData: number[][]
+outliers: number[][]
+axisData: string[]
+} {
+opt = opt || {};
 const boxData = [];
 const outliers = [];
-const axisData = [];
+const axisData: string[] = [];
 const boundIQR = opt.boundIQR;
 const useExtreme = boundIQR === 'none' || boundIQR === 0;
 
@@ -77,7 +86,7 @@ export default function (rawData, opt) {
 const min = ascList[0];
 const max = ascList[ascList.length - 1];
 
-const bound = (boundIQR == null ? 1.5 : boundIQR) * (Q3 - Q1);
+const bound = (boundIQR == null ? 1.5 : boundIQR as number) * (Q3 - 
Q1);
 
 const low = useExtreme
 ? min


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



[incubator-echarts] 08/10: feature: add boxplot transform.

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 9881368b1668ca7f91d85d9f0d3504c974358533
Author: 100pah 
AuthorDate: Fri Jul 31 17:32:38 2020 +0800

feature: add boxplot transform.
---
 extension-src/dataTool/boxplotTransform.ts |  70 +
 extension-src/dataTool/index.ts|   3 +
 test/data-transform-external.html  | 116 +
 3 files changed, 189 insertions(+)

diff --git a/extension-src/dataTool/boxplotTransform.ts 
b/extension-src/dataTool/boxplotTransform.ts
new file mode 100644
index 000..4a51370
--- /dev/null
+++ b/extension-src/dataTool/boxplotTransform.ts
@@ -0,0 +1,70 @@
+/*
+* 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 { DataTransformOption, ExternalDataTransform } from 
'../../src/data/helper/transform';
+import prepareBoxplotData from './prepareBoxplotData';
+import { isArray, each } from 'zrender/src/core/util';
+// import { throwError, makePrintable } from '../../src/util/log';
+
+
+export interface BoxplotTransformOption extends DataTransformOption {
+type: 'echarts-extension:boxplot';
+config: {
+boundIQR?: number | 'none',
+layout?: 'horizontal' | 'vertical'
+}
+}
+
+export const boxplotTransform: ExternalDataTransform = 
{
+
+type: 'echarts-extension:boxplot',
+
+// PEDING: enhance to filter by index rather than create new data
+transform: function transform(params) {
+const source = params.source;
+const config = params.config || {};
+
+const sourceData = source.data;
+if (
+!isArray(sourceData)
+|| (sourceData[0] && !isArray(sourceData[0]))
+) {
+throw new Error(
+'source data is not applicable for this boxplot transform. 
Expect number[][].'
+);
+}
+
+const result = prepareBoxplotData(
+source.data as number[][],
+config
+);
+
+const boxData = result.boxData as (number | string)[][];
+each(boxData, function (item, dataIdx) {
+item.unshift(result.axisData[dataIdx]);
+});
+
+return [{
+data: boxData
+}, {
+data: result.outliers
+}];
+}
+};
+
diff --git a/extension-src/dataTool/index.ts b/extension-src/dataTool/index.ts
index 6724942..c4cc447 100644
--- a/extension-src/dataTool/index.ts
+++ b/extension-src/dataTool/index.ts
@@ -21,12 +21,14 @@
 import * as echarts from 'echarts';
 import * as gexf from './gexf';
 import prepareBoxplotData from './prepareBoxplotData';
+import { boxplotTransform } from './boxplotTransform';
 
 export const version = '1.0.0';
 
 export {gexf};
 
 export {prepareBoxplotData};
+export {boxplotTransform};
 
 // For backward compatibility, where the namespace `dataTool` will
 // be mounted on `echarts` is the extension `dataTool` is imported.
@@ -36,4 +38,5 @@ if (echarts.dataTool) {
 echarts.dataTool.version = version;
 echarts.dataTool.gexf = gexf;
 echarts.dataTool.prepareBoxplotData = prepareBoxplotData;
+echarts.dataTool.boxplotTransform = boxplotTransform;
 }
diff --git a/test/data-transform-external.html 
b/test/data-transform-external.html
new file mode 100644
index 000..f204874
--- /dev/null
+++ b/test/data-transform-external.html
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+require(['echarts', 'data/Michelson-Morley.json', 
'extension/dataTool'], function (echarts, rawData, dataTool) {
+var boxplotTransform = dataTool.boxplotTransform;
+
+echarts.registerTransform(boxplotTransform);
+
+var option = {
+dataset: [{
+source: rawData
+}, {
+transform: {
+type: 'echarts-extension:boxplot'
+}
+}, {
+fromDatasetIndex: 1,
+  

[incubator-echarts] 04/10: fix: fix dimension inherit rule.

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit f8a59dfa6b2c9f651582c053e851d5286afc7a63
Author: 100pah 
AuthorDate: Fri Jul 31 16:20:01 2020 +0800

fix: fix dimension inherit rule.
---
 src/component/transform/filterTransform.ts |   6 +-
 src/component/transform/sortTransform.ts   |   6 +-
 src/data/Source.ts |  22 -
 src/data/helper/sourceHelper.ts|  22 +++--
 src/data/helper/sourceManager.ts   |  45 ++---
 src/data/helper/transform.ts   |  74 ++-
 test/data-transform.html   | 145 -
 7 files changed, 264 insertions(+), 56 deletions(-)

diff --git a/src/component/transform/filterTransform.ts 
b/src/component/transform/filterTransform.ts
index 4b13008..4126f98 100644
--- a/src/component/transform/filterTransform.ts
+++ b/src/component/transform/filterTransform.ts
@@ -65,7 +65,7 @@ export const filterTransform: 
ExternalDataTransform = {
 if (__DEV__) {
 errMsg = makePrintable(
 'Can not find dimension info via: "' + dimLoose + 
'".\n',
-'Existing dimensions: ', source.dimensions, '.\n',
+'Existing dimensions: ', 
source.getDimensionInfoAll(), '.\n',
 'Illegal condition:', exprOption, '.\n'
 );
 }
@@ -93,9 +93,7 @@ export const filterTransform: 
ExternalDataTransform = {
 }
 
 return {
-data: resultData,
-dimensions: source.dimensions,
-sourceHeader: sourceHeaderCount
+data: resultData
 };
 }
 };
diff --git a/src/component/transform/sortTransform.ts 
b/src/component/transform/sortTransform.ts
index 9dfce97..e4f75e5 100644
--- a/src/component/transform/sortTransform.ts
+++ b/src/component/transform/sortTransform.ts
@@ -124,7 +124,7 @@ export const sortTransform: 
ExternalDataTransform = {
 if (__DEV__) {
 errMsg = makePrintable(
 'Can not find dimension info via: "' + dimLoose + 
'".\n',
-'Existing dimensions: ', source.dimensions, '.\n',
+'Existing dimensions: ', source.getDimensionInfoAll(), 
'.\n',
 'Illegal config:', orderExpr, '.\n'
 );
 }
@@ -214,9 +214,7 @@ export const sortTransform: 
ExternalDataTransform = {
 }
 
 return {
-data: resultData,
-dimensions: source.dimensions,
-sourceHeader: sourceHeaderCount
+data: resultData
 };
 }
 };
diff --git a/src/data/Source.ts b/src/data/Source.ts
index bed37d6..06d5a27 100644
--- a/src/data/Source.ts
+++ b/src/data/Source.ts
@@ -17,16 +17,18 @@
 * under the License.
 */
 
-import {createHashMap, isTypedArray, HashMap} from 'zrender/src/core/util';
+import {isTypedArray, HashMap} from 'zrender/src/core/util';
 import {
 SourceFormat, SeriesLayoutBy, DimensionDefinition,
-OptionEncodeValue, OptionSourceData, OptionEncode,
+OptionEncodeValue, OptionSourceData,
 SOURCE_FORMAT_ORIGINAL,
 SERIES_LAYOUT_BY_COLUMN,
 SOURCE_FORMAT_UNKNOWN,
 SOURCE_FORMAT_KEYED_COLUMNS,
 SOURCE_FORMAT_TYPED_ARRAY,
-DimensionName
+DimensionName,
+OptionSourceHeader,
+DimensionDefinitionLoose
 } from '../util/types';
 
 /**
@@ -65,6 +67,12 @@ import {
  * + "unknown"
  */
 
+export interface SourceMetaRawOption {
+seriesLayoutBy: SeriesLayoutBy;
+sourceHeader: OptionSourceHeader;
+dimensions: DimensionDefinitionLoose[];
+}
+
 class Source {
 
 /**
@@ -107,6 +115,11 @@ class Source {
  */
 readonly dimensionsDetectCount: number;
 
+/**
+ * Raw props from user option.
+ */
+readonly metaRawOption: SourceMetaRawOption;
+
 
 constructor(fields: {
 data: OptionSourceData,
@@ -118,6 +131,8 @@ class Source {
 startIndex?: number, // default: 0
 dimensionsDetectCount?: number,
 
+metaRawOption?: SourceMetaRawOption,
+
 // [Caveat]
 // This is the raw user defined `encode` in `series`.
 // If user not defined, DO NOT make a empty object or hashMap here.
@@ -136,6 +151,7 @@ class Source {
 this.dimensionsDefine = fields.dimensionsDefine;
 this.dimensionsDetectCount = fields.dimensionsDetectCount;
 this.encodeDefine = fields.encodeDefine;
+this.metaRawOption = fields.metaRawOption;
 }
 
 /**
diff --git a/src/data/helper/sourceHelper.ts b/src/data/helper/sourceHelper.ts
index 9ae0151..0905908 100644
--- a/src/data/helper/sourceHelper.ts
+++ b/src/data/helper/sourceHelper.ts
@@ -33,9 +33,10 @@ impo

[incubator-echarts] 05/10: Merge branch 'next' into dataset-trans

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit b6124d53b8f1cd91c4cb7a841837aad0d76498b6
Merge: f8a59df d17f801
Author: 100pah 
AuthorDate: Fri Jul 31 16:37:15 2020 +0800

Merge branch 'next' into dataset-trans

# Conflicts:
#   src/echarts.ts

 .eslintignore|   3 +-
 build/build-i18n.js  |  91 ++
 build/build.js   |  33 +-
 build/config.js  |   7 +-
 build/ec-lang-rollup-plugin.js   |  80 -
 build/release.js |  43 ++-
 src/langEN.ts => i18n/langEN-obj.js  |  32 +-
 src/langEN.ts => i18n/langEN.js  |  28 +-
 i18n/langES-obj.js   | 111 +++
 i18n/langES.js   | 107 +++
 i18n/langFI-obj.js   | 111 +++
 i18n/langFI.js   | 107 +++
 i18n/langFR-obj.js   | 172 +++
 i18n/langFR.js   | 168 +++
 i18n/langTH-obj.js   | 111 +++
 i18n/langTH.js   | 107 +++
 src/lang.ts => i18n/langZH-obj.js|  30 +-
 src/lang.ts => i18n/langZH.js|  26 +-
 package.json |   3 +-
 src/action/changeAxisOrder.ts|   3 +
 src/chart/bar/BarView.ts | 365 +--
 src/component/axis/AxisBuilder.ts|   5 +-
 src/component/legend/LegendModel.ts  |  32 +-
 src/component/timeline/SliderTimelineView.ts |   1 +
 src/component/toolbox/ToolboxModel.ts|  10 +-
 src/component/toolbox/feature/Brush.ts   |  41 +--
 src/component/toolbox/feature/DataView.ts|  43 +--
 src/component/toolbox/feature/DataZoom.ts|  28 +-
 src/component/toolbox/feature/MagicType.ts   |  44 +--
 src/component/toolbox/feature/Restore.ts |  21 +-
 src/component/toolbox/feature/SaveAsImage.ts |  34 ++-
 src/component/toolbox/featureManager.ts  |   3 +-
 src/coord/Axis.ts|  10 +-
 src/coord/axisHelper.ts  |   1 +
 src/coord/cartesian/defaultAxisExtentFromData.ts |   8 +-
 src/echarts.ts   |  13 +-
 src/{ => i18n}/langEN.ts |   2 +-
 src/i18n/langES.ts   |  80 +
 src/i18n/langFI.ts   |  80 +
 src/i18n/langFR.ts   | 142 +
 src/i18n/langTH.ts   |  80 +
 src/{lang.ts => i18n/langZH.ts}  |  38 ++-
 src/langES.ts|  68 -
 src/langFI.ts|  68 -
 src/langTH.ts|  68 -
 src/locale.ts|  79 +
 src/model/Global.ts  |  14 +
 src/scale/Ordinal.ts |  33 +-
 src/scale/Scale.ts   |   7 +
 src/scale/Time.ts| 101 +--
 src/util/format.ts   |  21 +-
 src/util/graphic.ts  |  59 +++-
 src/util/log.ts  |  22 +-
 src/util/time.ts |  70 +++--
 src/visual/aria.ts   |   9 +-
 test/bar-race.html   |  75 +++--
 test/lang.html   | 188 
 test/timeZone.html   |  11 +-
 58 files changed, 2568 insertions(+), 779 deletions(-)

diff --cc src/echarts.ts
index fa991fd,b69a478..a16d89f
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@@ -100,7 -100,7 +100,8 @@@ import { handleLegacySelectEvents } fro
  
  // At least canvas renderer.
  import 'zrender/src/canvas/canvas';
 +import { registerExternalTransform } from './data/helper/transform';
+ import { createLocaleObject, SYSTEM_LANG, LocaleOption } from './locale';
  
  declare let global: any;
  type ModelFinder = modelUtil.ModelFinder;
diff --cc src/util/log.ts
index 3aaab2d,8bb7d69..e50fb6d
--- a/src/util/log.ts
+++ b/src/util/log.ts
@@@ -18,10 -18,27 +18,28 @@@
  */
  
  import { Dictionary } from './types';
 +import { map, isString, isFunction, eqNaN, isRegExp } from 
'zrender/src/core/util';
  
+ const ECHARTS_PREFIX = '[ECharts] ';
  const storedLogs: Dictionary = {};
  
+ const hasConsole = typeof console !== 'undefined'
+ // eslint-disable-next-line
+ && console.warn && console.log;
+ 

[incubator-echarts] 10/10: fix: prevent potential issue after the implementation of isString change.

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 246667e768cc418668d89900750a37f6feef8893
Author: 100pah 
AuthorDate: Fri Jul 31 18:14:03 2020 +0800

fix: prevent potential issue after the implementation of isString change.
---
 src/util/model.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/util/model.ts b/src/util/model.ts
index 699b297..83a615f 100644
--- a/src/util/model.ts
+++ b/src/util/model.ts
@@ -26,7 +26,8 @@ import {
 map,
 assert,
 isString,
-indexOf
+indexOf,
+isStringSafe
 } from 'zrender/src/core/util';
 import env from 'zrender/src/core/env';
 import GlobalModel from '../model/Global';
@@ -527,7 +528,7 @@ export function validateIdOrName(idOrName: unknown) {
 }
 
 function isValidIdOrName(idOrName: unknown): boolean {
-return isString(idOrName) || isNumeric(idOrName);
+return isStringSafe(idOrName) || isNumeric(idOrName);
 }
 
 export function isNameSpecified(componentModel: ComponentModel): boolean {


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



[incubator-echarts] 01/10: ts: add types to some @ts-nocheck and remove some 'any'.

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 9d9ffce7efb4576cb65325f24fa650ae636c67b0
Author: 100pah 
AuthorDate: Sun Jul 26 19:32:17 2020 +0800

ts: add types to some @ts-nocheck and remove some 'any'.
---
 src/chart/bar/BarView.ts|   2 +-
 src/chart/custom.ts |   5 +-
 src/chart/funnel/FunnelSeries.ts|   2 +-
 src/chart/graph/GraphSeries.ts  |  20 +--
 src/chart/helper/createGraphFromNodeEdge.ts |  21 ++-
 src/chart/helper/createListFromArray.ts |   6 +-
 src/chart/helper/whiskerBoxCommon.ts|   7 +-
 src/chart/map/MapSeries.ts  |   2 +-
 src/chart/pie/PieSeries.ts  |   2 +-
 src/chart/sankey/SankeySeries.ts|  19 +--
 src/chart/sunburst/SunburstSeries.ts|   2 +-
 src/component/toolbox/feature/DataView.ts   |   2 +-
 src/component/toolbox/feature/MagicType.ts  |  17 +-
 src/coord/calendar/Calendar.ts  |   2 +-
 src/data/DataDimensionInfo.ts   |   2 +-
 src/data/Graph.ts   |   2 +-
 src/data/List.ts|  23 ++-
 src/data/Source.ts  |   8 +-
 src/data/helper/completeDimensions.ts   | 100 +++
 src/data/helper/createDimensions.ts |  22 ++-
 src/data/helper/dimensionHelper.ts  |  23 ++-
 src/data/helper/linkList.ts | 119 --
 src/data/helper/sourceHelper.ts | 246 ++--
 src/label/LabelManager.ts   |   7 +-
 src/model/Series.ts |  20 +--
 src/model/mixin/dataFormat.ts   |   9 +-
 src/stream/task.ts  |   5 +-
 src/util/graphic.ts |   5 +-
 src/util/model.ts   |   2 +-
 src/util/states.ts  |   8 +-
 src/util/types.ts   |  72 ++--
 31 files changed, 484 insertions(+), 298 deletions(-)

diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts
index eecb05d..f98de86 100644
--- a/src/chart/bar/BarView.ts
+++ b/src/chart/bar/BarView.ts
@@ -787,7 +787,7 @@ function updateStyle(
 
 // In case width or height are too small.
 function getLineWidth(
-itemModel: Model,
+itemModel: Model,
 rawLayout: RectLayout
 ) {
 const lineWidth = itemModel.get(BAR_BORDER_WIDTH_QUERY) || 0;
diff --git a/src/chart/custom.ts b/src/chart/custom.ts
index e1775f5..b31a4ff 100644
--- a/src/chart/custom.ts
+++ b/src/chart/custom.ts
@@ -50,7 +50,8 @@ import {
 DisplayState,
 ECElement,
 DisplayStateNonNormal,
-BlurScope
+BlurScope,
+SeriesDataType
 } from '../util/types';
 import Element, { ElementProps, ElementTextConfig } from 'zrender/src/Element';
 import prepareCartesian2d from '../coord/cartesian/prepareCustom';
@@ -411,7 +412,7 @@ class CustomSeriesModel extends 
SeriesModel {
 return createListFromArray(this.getSource(), this);
 }
 
-getDataParams(dataIndex: number, dataType?: string, el?: Element): 
CallbackDataParams & {
+getDataParams(dataIndex: number, dataType?: SeriesDataType, el?: Element): 
CallbackDataParams & {
 info: CustomExtraElementInfo
 } {
 const params = super.getDataParams(dataIndex, dataType) as 
ReturnType;
diff --git a/src/chart/funnel/FunnelSeries.ts b/src/chart/funnel/FunnelSeries.ts
index 15d35c5..bb358b2 100644
--- a/src/chart/funnel/FunnelSeries.ts
+++ b/src/chart/funnel/FunnelSeries.ts
@@ -99,7 +99,7 @@ class FunnelSeriesModel extends 
SeriesModel {
 this._defaultLabelLine(option);
 }
 
-getInitialData(option: FunnelSeriesOption, ecModel: GlobalModel): List {
+getInitialData(this: FunnelSeriesModel, option: FunnelSeriesOption, 
ecModel: GlobalModel): List {
 return createListSimply(this, {
 coordDimensions: ['value'],
 encodeDefaulter: zrUtil.curry(makeSeriesEncodeForNameBased, this)
diff --git a/src/chart/graph/GraphSeries.ts b/src/chart/graph/GraphSeries.ts
index 5a7f29c..a72622f 100644
--- a/src/chart/graph/GraphSeries.ts
+++ b/src/chart/graph/GraphSeries.ts
@@ -41,7 +41,9 @@ import {
 LabelFormatterCallback,
 Dictionary,
 LineLabelOption,
-StatesOptionMixin
+StatesOptionMixin,
+GraphEdgeItemObject,
+OptionDataValueNumeric
 } from '../../util/types';
 import SeriesModel from '../../model/Series';
 import Graph from '../../data/Graph';
@@ -107,16 +109,10 @@ export interface GraphEdgeStateOption {
 lineStyle?: GraphEdgeLineStyleOption
 label?: LineLabelOption
 }
-export interface GraphEdgeItemOption
-extends GraphEdgeStateOption, StatesOptionMixin {
-/**
- * Name or index of source node.
- */
-source?: string | number
-/**
- * Name or index of tar

[incubator-echarts] 02/10: Merge branch 'next' into dataset-trans

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 53d0200400bf0ca3907d8192d5f5afd6328d75d7
Merge: 9d9ffce d9d27e2
Author: 100pah 
AuthorDate: Thu Jul 30 13:28:03 2020 +0800

Merge branch 'next' into dataset-trans

# Conflicts:
#   src/chart/graph/GraphSeries.ts
#   src/chart/sankey/SankeySeries.ts
#   src/data/helper/dimensionHelper.ts
#   src/model/mixin/dataFormat.ts
#   src/util/graphic.ts
#   src/util/states.ts

 .eslintignore  |   14 +-
 .gitignore |4 +-
 README.md  |2 +-
 build/build.js |  229 +-
 build/config.js|   73 +-
 build/dev-fast.js  |   25 +-
 build/ec-lang-rollup-plugin.js |2 +-
 build/pre-publish.js   |  122 +-
 build/progress.js  |6 +-
 build/release.js   |   81 +
 build/{remove-dev.js => transform-dev.js}  |   39 +-
 echarts.common.ts  |2 +-
 {extension => extension-src}/bmap/README.md|0
 extension-src/dataTool/prepareBoxplotData.ts   |   23 +-
 extension/bmap/BMapCoordSys.js |  245 --
 extension/bmap/BMapModel.js|   68 -
 extension/bmap/BMapView.js |  143 -
 extension/bmap/bmap.js |   65 -
 extension/dataTool/gexf.js |  230 --
 extension/dataTool/index.js|   61 -
 extension/dataTool/prepareBoxplotData.js   |  107 -
 extension/webpack.config.js|   36 -
 package-lock.json  |  165 +-
 package.json   |   14 +-
 src/.eslintrc.yaml |1 +
 src/ExtensionAPI.ts|8 +-
 src/chart/bar/BarView.ts   |5 +-
 src/chart/bar/PictorialBarView.ts  |   17 +-
 src/chart/custom.ts|3 +-
 src/chart/gauge/GaugeView.ts   |4 +-
 src/chart/graph/GraphSeries.ts |   10 +-
 src/chart/graph/GraphView.ts   |5 +-
 src/chart/heatmap/HeatmapView.ts   |3 +-
 src/chart/helper/LargeLineDraw.ts  |3 +-
 src/chart/helper/LargeSymbolDraw.ts|3 +-
 src/chart/helper/LineDraw.ts   |3 +-
 src/chart/helper/Polyline.ts   |1 +
 src/chart/helper/Symbol.ts |   34 +-
 src/chart/helper/SymbolDraw.ts |3 +-
 src/chart/line/LineSeries.ts   |   12 +-
 src/chart/line/LineView.ts |   19 +-
 src/chart/lines/LinesSeries.ts |   11 +-
 src/chart/lines/LinesView.ts   |1 -
 src/chart/map/MapSeries.ts |   21 +-
 src/chart/pie/labelLayout.ts   |5 +
 src/chart/radar/RadarSeries.ts |   58 +-
 src/chart/radar/RadarView.ts   |   18 +-
 src/chart/sankey/SankeySeries.ts   |   32 +-
 src/chart/sankey/SankeyView.ts |7 +-
 src/chart/sankey/sankeyVisual.ts   |   11 +-
 src/chart/sunburst/SunburstPiece.ts|5 +-
 src/chart/sunburst/sunburstAction.ts   |1 -
 src/chart/themeRiver/ThemeRiverSeries.ts   |   20 +-
 src/chart/tree/TreeSeries.ts   |   23 +-
 src/chart/tree/TreeView.ts |5 +-
 src/chart/treemap/Breadcrumb.ts|6 +-
 src/chart/treemap/TreemapSeries.ts |   28 +-
 src/chart/treemap/TreemapView.ts   |   31 +-
 src/component/axis/AngleAxisView.ts|3 +-
 src/component/axis/AxisBuilder.ts  |   30 +-
 src/component/axis/AxisView.ts |1 -
 src/component/axis/CartesianAxisView.ts|   17 +-
 src/component/axisPointer/AxisPointerModel.ts  |   13 +-
 src/component/axisPointer/axisTrigger.ts   |   18 +-
 src/component/axisPointer/findPointFromSeries.ts   |   29 +-
 src/component/axisPointer/viewHelper.ts|   11 +-
 src/component/brush/BrushModel.ts  |1 -
 src/component/dataZoom/DataZoomModel.ts|1 -
 src/component/dataZoom/SliderZoomModel.ts  |   96 +-
 src/component/dataZoom/SliderZoomView.ts   |  418 ++-
 src/component/dataZoom/helper.ts   |1 

[incubator-echarts] branch dataset-trans created (now 246667e)

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch dataset-trans
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


  at 246667e  fix: prevent potential issue after the implementation of 
isString change.

This branch includes the following new commits:

 new 9d9ffce  ts: add types to some @ts-nocheck and remove some 'any'.
 new 53d0200  Merge branch 'next' into dataset-trans
 new e9a2b0f  feature: data transform
 new f8a59df  fix: fix dimension inherit rule.
 new b6124d5  Merge branch 'next' into dataset-trans
 new c6465c9  ts: fix type.
 new 4243980  ts: fix type.
 new 9881368  feature: add boxplot transform.
 new 2ce65aa  test: add case for ecStat
 new 246667e  fix: prevent potential issue after the implementation of 
isString change.

The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



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



[incubator-echarts] 03/10: feature: data transform

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit e9a2b0f5aee017be1bf41726e6531c38530ce28e
Author: 100pah 
AuthorDate: Fri Jul 31 13:02:59 2020 +0800

feature: data transform
---
 src/chart/helper/createListFromArray.ts|   9 +-
 src/chart/parallel/ParallelSeries.ts   |  30 +-
 src/component/dataset.ts   |  46 +-
 src/{util/ecData.ts => component/transform.ts} |  22 +-
 src/component/transform/filterTransform.ts | 101 
 src/component/transform/sortTransform.ts   | 223 +
 src/component/visualMap/PiecewiseModel.ts  |   1 +
 src/data/List.ts   |  45 +-
 src/data/Source.ts |  32 +-
 src/data/helper/dataProvider.ts| 267 ++
 src/data/helper/parseDataValue.ts  |  73 +++
 src/data/helper/sourceHelper.ts| 219 
 src/data/helper/sourceManager.ts   | 368 ++
 src/data/helper/transform.ts   | 317 
 src/echarts.ts |   3 +
 src/model/Component.ts |   4 +-
 src/model/OptionManager.ts |   4 +
 src/model/Series.ts|  16 +-
 src/util/conditionalExpression.ts  | 536 
 src/util/ecData.ts |   4 +-
 src/util/log.ts|  67 ++-
 src/util/model.ts  |   8 +-
 src/util/number.ts |   9 +-
 src/util/types.ts  |   7 +-
 test/data-transform.html   | 661 +
 25 files changed, 2760 insertions(+), 312 deletions(-)

diff --git a/src/chart/helper/createListFromArray.ts 
b/src/chart/helper/createListFromArray.ts
index e451cd3..c12ac24 100644
--- a/src/chart/helper/createListFromArray.ts
+++ b/src/chart/helper/createListFromArray.ts
@@ -28,13 +28,13 @@ import Source from '../../data/Source';
 import {enableDataStack} from '../../data/helper/dataStackHelper';
 import {makeSeriesEncodeForAxisCoordSys} from '../../data/helper/sourceHelper';
 import {
-SOURCE_FORMAT_ORIGINAL, DimensionDefinitionLoose, DimensionDefinition, 
OptionSourceData
+SOURCE_FORMAT_ORIGINAL, DimensionDefinitionLoose, DimensionDefinition, 
OptionSourceData, EncodeDefaulter
 } from '../../util/types';
 import SeriesModel from '../../model/Series';
 
 function createListFromArray(source: Source | OptionSourceData, seriesModel: 
SeriesModel, opt?: {
 generateCoord?: string
-useEncodeDefaulter?: boolean
+useEncodeDefaulter?: boolean | EncodeDefaulter
 }): List {
 opt = opt || {};
 
@@ -73,10 +73,13 @@ function createListFromArray(source: Source | 
OptionSourceData, seriesModel: Ser
 )) || ['x', 'y'];
 }
 
+const useEncodeDefaulter = opt.useEncodeDefaulter;
 const dimInfoList = createDimensions(source, {
 coordDimensions: coordSysDimDefs,
 generateCoord: opt.generateCoord,
-encodeDefaulter: opt.useEncodeDefaulter
+encodeDefaulter: zrUtil.isFunction(useEncodeDefaulter)
+? useEncodeDefaulter
+: useEncodeDefaulter
 ? zrUtil.curry(makeSeriesEncodeForAxisCoordSys, coordSysDimDefs, 
seriesModel)
 : null
 });
diff --git a/src/chart/parallel/ParallelSeries.ts 
b/src/chart/parallel/ParallelSeries.ts
index d0b5a38..287bc2f 100644
--- a/src/chart/parallel/ParallelSeries.ts
+++ b/src/chart/parallel/ParallelSeries.ts
@@ -18,7 +18,7 @@
 */
 
 
-import {each, createHashMap} from 'zrender/src/core/util';
+import {each, bind} from 'zrender/src/core/util';
 import SeriesModel from '../../model/Series';
 import createListFromArray from '../helper/createListFromArray';
 import {
@@ -29,13 +29,15 @@ import {
 SeriesTooltipOption,
 DimensionName,
 OptionDataValue,
-StatesOptionMixin
+StatesOptionMixin,
+OptionEncodeValue,
+Dictionary,
+OptionEncode
  } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import List from '../../data/List';
 import { ParallelActiveState, ParallelAxisOption } from 
'../../coord/parallel/AxisModel';
 import Parallel from '../../coord/parallel/Parallel';
-import Source from '../../data/Source';
 import ParallelModel from '../../coord/parallel/ParallelModel';
 
 type ParallelSeriesDataValue = OptionDataValue[];
@@ -89,12 +91,10 @@ class ParallelSeriesModel extends 
SeriesModel {
 coordinateSystem: Parallel;
 
 
-getInitialData(option: ParallelSeriesOption, ecModel: GlobalModel): List {
-const source = this.getSource();
-
-setEncodeAndDimensions(source, this);
-
-return createListFromArray(source, this);
+getInitialData(this: ParallelSeriesModel, option: ParallelSeriesOpt

[incubator-echarts] 06/10: ts: fix type.

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit c6465c965fb7f36a11c3c598aee586cb2d45c30a
Author: 100pah 
AuthorDate: Fri Jul 31 16:41:26 2020 +0800

ts: fix type.
---
 src/data/helper/sourceManager.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/data/helper/sourceManager.ts b/src/data/helper/sourceManager.ts
index 5a3f9ea..6a45f7f 100644
--- a/src/data/helper/sourceManager.ts
+++ b/src/data/helper/sourceManager.ts
@@ -19,8 +19,8 @@
 
 import { DatasetModel } from '../../component/dataset';
 import SeriesModel from '../../model/Series';
-import { setAsPrimitive, map, isTypedArray, defaults, assert, each } from 
'zrender/src/core/util';
-import Source from '../Source';
+import { setAsPrimitive, map, isTypedArray, assert, each } from 
'zrender/src/core/util';
+import Source, { SourceMetaRawOption } from '../Source';
 import {
 SeriesEncodableModel, OptionSourceData,
 SOURCE_FORMAT_TYPED_ARRAY, SOURCE_FORMAT_ORIGINAL,
@@ -28,7 +28,7 @@ import {
 } from '../../util/types';
 import {
 querySeriesUpstreamDatasetModel, queryDatasetUpstreamDatasetModels,
-createSource, SourceMetaRawOption, cloneSourceShallow, 
inheritSourceMetaRawOption
+createSource, cloneSourceShallow, inheritSourceMetaRawOption
 } from './sourceHelper';
 import { applyDataTransform } from './transform';
 


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



[incubator-echarts] 09/10: test: add case for ecStat

2020-07-31 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 2ce65aa05ba26adb0e66a0e9016a809aff69014b
Author: 100pah 
AuthorDate: Fri Jul 31 18:05:53 2020 +0800

test: add case for ecStat
---
 test/data-transform-ecStat.html | 120 
 test/lib/ecStat-1.1.1.min.js|   1 +
 test/lib/ecStatTransform.js |  48 
 3 files changed, 169 insertions(+)

diff --git a/test/data-transform-ecStat.html b/test/data-transform-ecStat.html
new file mode 100644
index 000..e05ddbc
--- /dev/null
+++ b/test/data-transform-ecStat.html
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+echarts.registerTransform(ecStatTransform(ecStat).regression);
+
+var rawData = [
+[1, 4862.4],
+[2, 5294.7],
+[3, 5934.5],
+[4, 7171.0],
+[5, 8964.4],
+[6, 10202.2],
+[7, 11962.5],
+[8, 14928.3],
+[9, 16909.2],
+[10, 18547.9],
+[11, 21617.8],
+[12, 26638.1],
+[13, 34634.4],
+[14, 46759.4],
+[15, 58478.1],
+[16, 67884.6],
+[17, 74462.6],
+[18, 79395.7]
+];
+
+var option = {
+dataset: [{
+source: rawData
+}, {
+transform: {
+type: 'ecStat:regression',
+config: {
+method: 'exponential'
+}
+}
+}, {
+fromDatasetIndex: 1,
+fromTransformResult: 1
+}],
+legend: {
+bottom: 20
+},
+tooltip: {
+},
+xAxis: {
+type: 'category',
+},
+yAxis: {
+},
+series: [{
+name: 'scatter',
+type: 'scatter',
+datasetIndex: 0
+}, {
+name: 'regression',
+type: 'line',
+symbol: 'none',
+datasetIndex: 1
+}]
+};
+
+var chart = testHelper.create(echarts, 'main_regression', {
+title: [
+'Regression',
+],
+option: option
+});
+
+
+
+
+
+
+
+
diff --git a/test/lib/ecStat-1.1.1.min.js b/test/lib/ecStat-1.1.1.min.js
new file mode 100644
index 000..6aa4af5
--- /dev/null
+++ b/test/lib/ecStat-1.1.1.min.js
@@ -0,0 +1 @@
+!function(r,t){"object"==typeof exports&&"object"==typeof 
module?module.exports=t():"function"==typeof 
define&?define([],t):"object"==typeof 
exports?exports.ecStat=t():r.ecStat=t()}(this,function(){return 
function(r){function t(e){if(n[e])return n[e].exports;var 
o=n[e]={exports:{},id:e,loaded:!1};return 
r[e].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var n={};return 
t.m=r,t.c=n,t.p="",t(0)}([function(r,t,n){var 
e;e=function(r){return{clustering:n(11),regression:n(13), [...]
\ No newline at end of file
diff --git a/test/lib/ecStatTransform.js b/test/lib/ecStatTransform.js
new file mode 100644
index 000..e411eed
--- /dev/null
+++ b/test/lib/ecStatTransform.js
@@ -0,0 +1,48 @@
+/*
+* 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.
+*/
+
+(function (root) {
+
+root.ecStatTransform = function (ecStat) {
+
+var regression = {
+
+type: 'ecStat:regression',
+
+transform: function transform(params) {
+var source = params.source;
+var config = params.config || {};
+ 

[incubator-echarts] branch next updated: fix(util/number): the `parseDate` function can not parse a date string like `2020-07-29 09:2:5`.

2020-07-29 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang 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 d395b4b  fix(util/number): the `parseDate` function can not parse a 
date string like `2020-07-29 09:2:5`.
 new b45a188  Merge pull request #13044 from plainheart/chore-fix
d395b4b is described below

commit d395b4b3584d07e57b9f70852772427a424fec72
Author: plainheart 
AuthorDate: Wed Jul 29 16:20:34 2020 +0800

fix(util/number): the `parseDate` function can not parse a date string like 
`2020-07-29 09:2:5`.
---
 src/util/number.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/number.ts b/src/util/number.ts
index d1ec793..d303534 100644
--- a/src/util/number.ts
+++ b/src/util/number.ts
@@ -283,7 +283,7 @@ export function isRadianAroundZero(val: number): boolean {
 }
 
 // eslint-disable-next-line
-const TIME_REG = /^(?:(\d{4})(?:[-\/](\d{1,2})(?:[-\/](\d{1,2})(?:[T 
](\d{1,2})(?::(\d\d)(?::(\d\d)(?:[.,](\d+))?)?)?(Z|[\+\-]\d\d:?\d\d)?)?)?)?)?$/;
 // jshint ignore:line
+const TIME_REG = /^(?:(\d{4})(?:[-\/](\d{1,2})(?:[-\/](\d{1,2})(?:[T 
](\d{1,2})(?::(\d{1,2})(?::(\d{1,2})(?:[.,](\d+))?)?)?(Z|[\+\-]\d\d:?\d\d)?)?)?)?)?$/;
 // jshint ignore:line
 
 /**
  * @param value These values can be accepted:


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



[incubator-echarts] branch next updated: fix: revert the break change brought by 0b5b67f4f17c2f3abc48c466bff0923e36e72892 ( default value rule of toolbox.dataZoom. xAxis/yAxis )

2020-07-26 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang 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 a1ce568  fix: revert the break change brought by 
0b5b67f4f17c2f3abc48c466bff0923e36e72892 ( default value rule of 
toolbox.dataZoom. xAxis/yAxis )
a1ce568 is described below

commit a1ce56815d29e3dfe2eb1e9dec26095fe235aca2
Author: 100pah 
AuthorDate: Mon Jul 27 13:40:37 2020 +0800

fix: revert the break change brought by 
0b5b67f4f17c2f3abc48c466bff0923e36e72892 ( default value rule of 
toolbox.dataZoom. xAxis/yAxis )
---
 src/component/toolbox/feature/DataZoom.ts | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/component/toolbox/feature/DataZoom.ts 
b/src/component/toolbox/feature/DataZoom.ts
index a69b92f..688a14c 100644
--- a/src/component/toolbox/feature/DataZoom.ts
+++ b/src/component/toolbox/feature/DataZoom.ts
@@ -244,13 +244,15 @@ function makeAxisFinder(dzFeatureModel: 
ToolboxDataZoomFeatureModel): ModelFinde
 yAxisId: dzFeatureModel.get('yAxisId', true)
 } as ModelFinderObject;
 
-// If not specified, it means use all axes.
-if (setting.xAxisIndex == null
-&& setting.yAxisIndex == null
-&& setting.xAxisId == null
-&& setting.yAxisId == null
-) {
-setting.xAxisIndex = setting.yAxisIndex = 'all';
+// If both `xAxisIndex` `xAxisId` not set, it means 'all'.
+// If both `yAxisIndex` `yAxisId` not set, it means 'all'.
+// Some old cases set like this below to close yAxis control but leave 
xAxis control:
+// `{ feature: { dataZoom: { yAxisIndex: false } }`.
+if (setting.xAxisIndex == null && setting.xAxisId == null) {
+setting.xAxisIndex = 'all';
+}
+if (setting.yAxisIndex == null && setting.yAxisId == null) {
+setting.yAxisIndex = 'all';
 }
 
 return setting;


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



[incubator-echarts-doc] branch master updated: enable cors

2020-07-26 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new be0e44a  enable cors
be0e44a is described below

commit be0e44a4e2dd3922430b497f968020a61c015835
Author: 100pah 
AuthorDate: Mon Jul 27 12:55:42 2020 +0800

enable cors
---
 src/docHelper.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/docHelper.js b/src/docHelper.js
index 1c1ba88..ccd02ee 100644
--- a/src/docHelper.js
+++ b/src/docHelper.js
@@ -109,7 +109,7 @@ export function preload(_baseUrl, _cdnRoot, _rootName, 
_docVersion) {
 let outlineUrl = `${cdnRoot}/${rootName}-outline.json?${docVersion}`;
 
 if (!outlineFetcher) {
-outlineFetcher = fetch(outlineUrl)
+outlineFetcher = fetch(outlineUrl, {mode: 'cors'})
 .then(response => response.json())
 .then(_json => processOutlines(_json));
 }
@@ -182,7 +182,7 @@ function ensurePageDescStorage(targetPath) {
 
 if (!descStorage[partionKey]) {
 let url = `${cdnRoot}/${partionKey}.json?${docVersion}`;
-let fetcher = fetch(url).then(response => response.json());
+let fetcher = fetch(url, {mode: 'cors'}).then(response => 
response.json());
 descStorage[partionKey] = {
 fetcher
 };


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



[incubator-echarts-website] branch asf-site updated: update cdn

2020-07-26 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new 515ad84  update cdn
515ad84 is described below

commit 515ad84d5d0044c6d07ab63f4fd4f1313b0c86b3
Author: 100pah 
AuthorDate: Mon Jul 27 12:47:35 2020 +0800

update cdn
---
 zh/option.html | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh/option.html b/zh/option.html
index 4ee282d..d37a755 100644
--- a/zh/option.html
+++ b/zh/option.html
@@ -1,4 +1,4 @@
-https://echarts-www.cdn.bcebos.com/zh/images/favicon.png?_v_=20200710_1;>https://cdn.jsdelivr.net/ [...]
+https://echarts-www.cdn.bcebos.com/zh/images/favicon.png?_v_=20200710_1;>https://cdn.jsdelivr.net/ [...]
 https://cdn.jsdelivr.net/npm/pace-progressbar@1.0.2/pace.min.js&quot</a>;>if 
(/windows/i.test(navigator.userAgent)) {
 var el = document.createElement('style');
 el.innerHTML = ''
@@ -9,8 +9,8 @@
 Documentation - Apache ECharts(incubating)html, 
body {
 /* position: sticky should not have overflow parents.*/
 overflow-x: hidden;
-}https://echarts-www.cdn.bcebos.com/zh/css/doc-bundle.css?_v_=1595563419393;>https://cdn.jsdelivr.net/npm/jquery@2.2.4/dist/jquery.min.js&quot</a>;>
-Apache ECharts 是一个正在由 Apache 孵化器赞助的 
Apache 开源基金会孵化的项目。我们正在处理将本站跳转到 https://echarts.apache.org; 
target="_blank">https://echarts.apache.org 的迁移工作。您可以现在就前往我们的 Apache 
官网。https://echarts.apache.org; target="_blank" 
onclick="logApache()" class="btn">访问官网xhttps://echarts-www.cdn.bcebos.com/zh/css/doc-bundle.css?_v_=1595824980287;>https://cdn.jsdelivr.net/npm/jquery@2.2.4/dist/jquery.min.js&quot</a>;>
+Apache ECharts 是一个正在由 Apache 孵化器赞助的 
Apache 开源基金会孵化的项目。我们正在处理将本站跳转到 https://echarts.apache.org; 
target="_blank">https://echarts.apache.org 的迁移工作。您可以现在就前往我们的 Apache 
官网。https://echarts.apache.org; target="_blank" 
onclick="logApache()" class="btn">访问官网xwindow.globalArgsExtra = {
 baseUrl: 'documents/option-parts',
 docType: 'option',
@@ -19,7 +19,7 @@
 if (window.EC_WWW_CDN_PAY_ROOT) {
 window.globalArgsExtra.cdnRoot = window.EC_WWW_CDN_PAY_ROOT + '/zh/' + 
window.globalArgsExtra.baseUrl
 }document.getElementById('nav-doc').className = 'active';
-window.globalArgsExtra.version = '1595563419393';
+window.globalArgsExtra.version = '1595824980287';
 echartsDoc.init('#ec-doc-main', window.globalArgsExtra);

[incubator-echarts-website] branch asf-site updated: add cdn checker

2020-07-22 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new 2cb3723  add cdn checker
2cb3723 is described below

commit 2cb372368236479d6c9940616084446a4627d533
Author: 100pah 
AuthorDate: Wed Jul 22 23:12:11 2020 +0800

add cdn checker
---
 zh/css/only_for_cdn_ready_check.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zh/css/only_for_cdn_ready_check.css 
b/zh/css/only_for_cdn_ready_check.css
new file mode 100644
index 000..2e024b2
--- /dev/null
+++ b/zh/css/only_for_cdn_ready_check.css
@@ -0,0 +1 @@
+/* 1595429512595 OK */
\ No newline at end of file


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



[incubator-echarts] 01/01: Merge pull request #12987 from apache/remove-component

2020-07-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 82015b76a1534cb9e1895122ceb49d138165f9a5
Merge: 7304d5a 29f2984
Author: sushuang 
AuthorDate: Sat Jul 18 17:47:27 2020 +0800

Merge pull request #12987 from apache/remove-component

Remove component

 src/chart/bar/BarView.ts|8 +-
 src/chart/bar/PictorialBarView.ts   |2 +-
 src/chart/helper/createListFromArray.ts |2 +-
 src/chart/map/MapSeries.ts  |2 +-
 src/chart/parallel/ParallelSeries.ts|4 +-
 src/chart/themeRiver/ThemeRiverSeries.ts|   10 +-
 src/chart/treemap/TreemapSeries.ts  |3 +-
 src/component/axisPointer.ts|6 +-
 src/component/brush/preprocessor.ts |   12 +-
 src/component/dataZoom/AxisProxy.ts |   29 +-
 src/component/dataZoom/DataZoomModel.ts |  446 +---
 src/component/dataZoom/DataZoomView.ts  |   69 --
 src/component/dataZoom/InsideZoomView.ts|  130 ++--
 src/component/dataZoom/SliderZoomView.ts|  116 ++-
 src/component/dataZoom/dataZoomAction.ts|   25 +-
 src/component/dataZoom/dataZoomProcessor.ts |   75 +-
 src/component/dataZoom/helper.ts|  287 
 src/component/dataZoom/roams.ts |  265 ---
 src/component/graphic.ts|9 +-
 src/component/helper/BrushTargetManager.ts  |4 +-
 src/component/timeline/TimelineModel.ts |6 +-
 src/component/timeline/timelineAction.ts|2 +-
 src/component/toolbox/feature/Brush.ts  |2 +-
 src/component/toolbox/feature/DataView.ts   |6 +-
 src/component/toolbox/feature/DataZoom.ts   |  181 +++--
 src/component/toolbox/feature/MagicType.ts  |   18 +-
 src/coord/axisModelCommonMixin.ts   |1 -
 src/coord/cartesian/AxisModel.ts|7 +-
 src/coord/cartesian/Grid.ts |6 +-
 src/coord/cartesian/cartesianAxisHelper.ts  |5 +-
 src/coord/geo/Geo.ts|6 +-
 src/coord/parallel/ParallelModel.ts |   14 +-
 src/coord/parallel/parallelCreator.ts   |9 +-
 src/coord/parallel/parallelPreprocessor.ts  |6 +-
 src/coord/polar/AxisModel.ts|7 +-
 src/coord/polar/polarCreator.ts |9 +-
 src/coord/single/singleCreator.ts   |9 +-
 src/echarts.ts  |   43 +-
 src/model/Component.ts  |   48 +-
 src/model/Global.ts |  512 +-
 src/model/Model.ts  |2 +-
 src/model/OptionManager.ts  |  188 +++--
 src/model/internalComponentCreator.ts   |   75 ++
 src/model/mixin/textStyle.ts|2 +-
 src/model/referHelper.ts|   11 +-
 src/preprocessor/backwardCompat.ts  |2 +-
 src/util/model.ts   |  572 +++
 src/util/types.ts   |   10 +-
 test/dataZoom-feature.html  |  709 +++
 test/dataZoom-toolbox.html  |   86 +++
 test/lib/testHelper.js  |   67 ++
 test/option-replaceMerge.html   | 1011 +++
 test/option-replaceMerge2.html  |  918 
 test/timeline-dynamic-series.html   |  201 +++---
 test/timeline-life.html |  279 
 55 files changed, 5068 insertions(+), 1466 deletions(-)


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



[incubator-echarts] branch next updated (7304d5a -> 82015b7)

2020-07-18 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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


from 7304d5a  ts: fix type follow the update of zrender.
 add 23e84e8  feature: remove the member `dependentModes` from 
`ComponentModel`. Use `ecMode.getComponent` `ecModel.queryComponents` instead. 
Because: (1) `dependentModes` is rarely used. (2) It might be wrongly cached. 
If cached, it might not be updated when new `setOption`. (3) Not necessary to 
prepare all dependencies model table for each component. Should better to 
require them when really want to use them.
 add 065cf80  feature: add `setOption` control param: `replaceMerge`.
 add 39891c0  Merge branch 'next' into remove-component
 add 18c2156  ts: remove "any" from type ECUnitOption (which causes "any" 
spread).
 add fa7cd46  fix: fix replaceMerge in feature "restore" and add test cases.
 add 1db1349  feature: In replaceMerge, trade {xxx: null/undefined} the 
same as {xxx: []} for ec option.
 add af07980  fix: fix type and tweak component.getReferingComponent.
 add 32a4b66  feature: (1) support axis id reference in dataZoom. (except 
toolbox dataZoom) (2) enhance dataZoom auto choose axis logic to support 
multiple setOption. (except toolbox dataZoom) (3) enhance dataZoom to enable 
axis and dataZoom removal. (except toolbox dataZoom) (4) simplify the code of 
dataZoom.
 add a3d29cf  feature: add test case for id duplicated.
 add cc81a49  feature: (1) support toolbox dataZoom works on the second 
setOption. (2) change the mechanism of "internal component" to support adding 
them dynamically. (3) uniform the "get referring component". (4) support 
toolbox dataZoom use axis id to refer axis (previously only axisIndex can be 
used). (5) remove the support to restore on the second setOption temporarily.
 add 4bbe3b2  fix: fix toolbox dataZoom when on grid.
 add f5a9667  fix: (1) Inside dataZoom can not dispose when grid removed. 
(2) uniform the reference between components.
 add c4d442e  fix: fix noTarget logic for dataZoom.
 add 7606cb7  fix: fix feature reproduce and complete test case.
 add 548bf37  add test case.
 add 3154459  Merge branch 'next' into remove-component
 add 29f2984  Merge branch 'next' into remove-component
 new 82015b7  Merge pull request #12987 from apache/remove-component

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/chart/bar/BarView.ts|8 +-
 src/chart/bar/PictorialBarView.ts   |2 +-
 src/chart/helper/createListFromArray.ts |2 +-
 src/chart/map/MapSeries.ts  |2 +-
 src/chart/parallel/ParallelSeries.ts|4 +-
 src/chart/themeRiver/ThemeRiverSeries.ts|   10 +-
 src/chart/treemap/TreemapSeries.ts  |3 +-
 src/component/axisPointer.ts|6 +-
 src/component/brush/preprocessor.ts |   12 +-
 src/component/dataZoom/AxisProxy.ts |   29 +-
 src/component/dataZoom/DataZoomModel.ts |  446 +---
 src/component/dataZoom/DataZoomView.ts  |   69 --
 src/component/dataZoom/InsideZoomView.ts|  130 ++--
 src/component/dataZoom/SliderZoomView.ts|  116 ++-
 src/component/dataZoom/dataZoomAction.ts|   25 +-
 src/component/dataZoom/dataZoomProcessor.ts |   75 +-
 src/component/dataZoom/helper.ts|  287 
 src/component/dataZoom/roams.ts |  265 ---
 src/component/graphic.ts|9 +-
 src/component/helper/BrushTargetManager.ts  |4 +-
 src/component/timeline/TimelineModel.ts |6 +-
 src/component/timeline/timelineAction.ts|2 +-
 src/component/toolbox/feature/Brush.ts  |2 +-
 src/component/toolbox/feature/DataView.ts   |6 +-
 src/component/toolbox/feature/DataZoom.ts   |  181 +++--
 src/component/toolbox/feature/MagicType.ts  |   18 +-
 src/coord/axisModelCommonMixin.ts   |1 -
 src/coord/cartesian/AxisModel.ts|7 +-
 src/coord/cartesian/Grid.ts |6 +-
 src/coord/cartesian/cartesianAxisHelper.ts  |5 +-
 src/coord/geo/Geo.ts|6 +-
 src/coord/parallel/ParallelModel.ts |   14 +-
 src/coord/parallel/parallelCreator.ts   |9 +-
 src/coord/parallel/parallelPreprocessor.ts  |6 +-
 src/coord/polar/AxisModel.ts|7 +-
 src/coord/polar/polarCreator.ts |9 +-
 src/coord/single/singleCreator.ts   |9 +-
 src/echarts.ts  |   43 +-
 src/model/Component.ts  |   48 +-
 src/model/Global.ts |  

[incubator-echarts] branch remove-component updated (3154459 -> 29f2984)

2020-07-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch remove-component
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


from 3154459  Merge branch 'next' into remove-component
 add 7304d5a  ts: fix type follow the update of zrender.
 new 29f2984  Merge branch 'next' into remove-component

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/model/Global.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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



[incubator-echarts] 01/01: Merge branch 'next' into remove-component

2020-07-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 29f2984163a385cd5e7e14ca5e487865b17cfbb8
Merge: 3154459 7304d5a
Author: 100pah 
AuthorDate: Fri Jul 17 20:03:12 2020 +0800

Merge branch 'next' into remove-component

# Conflicts:
#   src/model/Global.ts

 src/model/Global.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc src/model/Global.ts
index 9073aab,141ba8f..ff220f8
--- a/src/model/Global.ts
+++ b/src/model/Global.ts
@@@ -82,20 -73,11 +82,20 @@@ class GlobalModel extends Model;
+ private _componentsMap: HashMap;
  
  /**
 + * `_componentsMap` might have "hole" becuase of remove.
 + * So save components count for a certain mainType here.
 + */
 +private _componentsCount: HashMap;
 +
 +/**
   * Mapping between filtered series list and raw series list.
   * key: filtered series indices, value: raw series indices.
 + * Items of `_seriesIndices` never be null/empty/-1.
 + * If series has been removed by `replaceMerge`, those series
 + * also won't be in `_seriesIndices`, just like be filtered.
   */
  private _seriesIndices: number[];
  


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



[incubator-echarts] branch next updated: ts: fix type follow the update of zrender.

2020-07-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang 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 7304d5a  ts: fix type follow the update of zrender.
7304d5a is described below

commit 7304d5a9bedfb5e38bff0d553ce73d654189c3e9
Author: 100pah 
AuthorDate: Fri Jul 17 20:01:40 2020 +0800

ts: fix type follow the update of zrender.
---
 src/model/Global.ts | 2 +-
 src/util/model.ts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/model/Global.ts b/src/model/Global.ts
index d0cf090..141ba8f 100644
--- a/src/model/Global.ts
+++ b/src/model/Global.ts
@@ -73,7 +73,7 @@ class GlobalModel extends Model {
 
 private _optionManager: OptionManager;
 
-private _componentsMap: HashMap;
+private _componentsMap: HashMap;
 
 /**
  * Mapping between filtered series list and raw series list.
diff --git a/src/util/model.ts b/src/util/model.ts
index 1589c80..0145ea4 100644
--- a/src/util/model.ts
+++ b/src/util/model.ts
@@ -627,9 +627,9 @@ export function groupData(
 getKey: (item: T) => R // return key
 ): {
 keys: R[],
-buckets: HashMap // hasmap key: the key returned by `getKey`.
+buckets: HashMap // hasmap key: the key returned by `getKey`.
 } {
-const buckets = createHashMap();
+const buckets = createHashMap();
 const keys: R[] = [];
 
 each(array, function (item) {


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



[incubator-echarts] 07/16: fix: fix type and tweak component.getReferingComponent.

2020-07-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit af079802ecd260265bd9ca5575726442615ff82f
Author: 100pah 
AuthorDate: Tue Jul 14 17:30:37 2020 +0800

fix: fix type and tweak component.getReferingComponent.
---
 src/chart/themeRiver/ThemeRiverSeries.ts   |  2 +-
 src/coord/cartesian/Grid.ts|  4 +--
 src/coord/cartesian/cartesianAxisHelper.ts |  2 +-
 src/coord/geo/Geo.ts   |  2 +-
 src/echarts.ts |  2 +-
 src/model/Component.ts | 41 ++
 src/model/referHelper.ts   |  8 +++---
 src/util/model.ts  | 28 
 8 files changed, 69 insertions(+), 20 deletions(-)

diff --git a/src/chart/themeRiver/ThemeRiverSeries.ts 
b/src/chart/themeRiver/ThemeRiverSeries.ts
index 5e28bf2..3f0cc49 100644
--- a/src/chart/themeRiver/ThemeRiverSeries.ts
+++ b/src/chart/themeRiver/ThemeRiverSeries.ts
@@ -83,7 +83,7 @@ class ThemeRiverSeriesModel extends 
SeriesModel {
 
 static readonly dependencies = ['singleAxis'];
 
-nameMap: zrUtil.HashMap;
+nameMap: zrUtil.HashMap;
 
 coordinateSystem: Single;
 
diff --git a/src/coord/cartesian/Grid.ts b/src/coord/cartesian/Grid.ts
index 6c803f9..91e540b 100644
--- a/src/coord/cartesian/Grid.ts
+++ b/src/coord/cartesian/Grid.ts
@@ -254,9 +254,9 @@ class Grid implements CoordinateSystemMaster {
 } {
 const seriesModel = finder.seriesModel;
 const xAxisModel = finder.xAxisModel
-|| (seriesModel && seriesModel.getReferringComponents('xAxis')[0]);
+|| (seriesModel && seriesModel.getReferringComponents('xAxis', 
true).models[0]);
 const yAxisModel = finder.yAxisModel
-|| (seriesModel && seriesModel.getReferringComponents('yAxis')[0]);
+|| (seriesModel && seriesModel.getReferringComponents('yAxis', 
true).models[0]);
 const gridModel = finder.gridModel;
 const coordsList = this._coordsList;
 let cartesian: Cartesian2D;
diff --git a/src/coord/cartesian/cartesianAxisHelper.ts 
b/src/coord/cartesian/cartesianAxisHelper.ts
index f732f36..badc476 100644
--- a/src/coord/cartesian/cartesianAxisHelper.ts
+++ b/src/coord/cartesian/cartesianAxisHelper.ts
@@ -112,7 +112,7 @@ export function findAxisModels(seriesModel: SeriesModel): {
 } as ReturnType;
 zrUtil.each(axisModelMap, function (v, key) {
 const axisType = key.replace(/Model$/, '');
-const axisModel = seriesModel.getReferringComponents(axisType)[0] as 
CartesianAxisModel;
+const axisModel = seriesModel.getReferringComponents(axisType, 
true).models[0] as CartesianAxisModel;
 
 if (__DEV__) {
 if (!axisModel) {
diff --git a/src/coord/geo/Geo.ts b/src/coord/geo/Geo.ts
index 9627ba1..df84083 100644
--- a/src/coord/geo/Geo.ts
+++ b/src/coord/geo/Geo.ts
@@ -173,7 +173,7 @@ function getCoordSys(finder: ParsedModelFinder): Geo {
 : seriesModel
 ? (
 seriesModel.coordinateSystem as Geo // For map series.
-|| ((seriesModel.getReferringComponents('geo')[0] || {}) as 
GeoModel).coordinateSystem
+|| ((seriesModel.getReferringComponents('geo', true).models[0] || 
{}) as GeoModel).coordinateSystem
 )
 : null;
 }
diff --git a/src/echarts.ts b/src/echarts.ts
index 581bf53..63a2100 100644
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@ -1298,7 +1298,7 @@ class ECharts extends Eventful {
 subType && (condition.subType = subType); // subType may be '' by 
parseClassType;
 
 const excludeSeriesId = payload.excludeSeriesId;
-let excludeSeriesIdMap: zrUtil.HashMap;
+let excludeSeriesIdMap: zrUtil.HashMap;
 if (excludeSeriesId != null) {
 excludeSeriesIdMap = 
zrUtil.createHashMap(modelUtil.normalizeToArray(excludeSeriesId));
 }
diff --git a/src/model/Component.ts b/src/model/Component.ts
index 74fccf0..2e1b1a8 100644
--- a/src/model/Component.ts
+++ b/src/model/Component.ts
@@ -177,7 +177,9 @@ class ComponentModel extends Mode
 }
 }
 
-// Hooker after init or mergeOption
+/**
+ * Called immediately after `init` or `mergeOption` of this instance 
called.
+ */
 optionUpdated(newCptOption: Opt, isInit: boolean): void {}
 
 /**
@@ -265,14 +267,43 @@ class ComponentModel extends Mode
 return fields.defaultOption as Opt;
 }
 
-getReferringComponents(mainType: ComponentMainType): ComponentModel[] {
+/**
+ * Notice: always force to input param `useDefault` in case that forget to 
consider it.
+ *
+ * @param useDefault In many cases like series refer axis and axis refer 
grid,
+ *If axis index / axis id not spe

[incubator-echarts] 13/16: fix: fix noTarget logic for dataZoom.

2020-07-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit c4d442eb596e71c5e84cc622805db2997066fc7a
Author: 100pah 
AuthorDate: Thu Jul 16 19:13:39 2020 +0800

fix: fix noTarget logic for dataZoom.
---
 src/component/dataZoom/DataZoomModel.ts | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/component/dataZoom/DataZoomModel.ts 
b/src/component/dataZoom/DataZoomModel.ts
index 38aa4e7..6212aa2 100644
--- a/src/component/dataZoom/DataZoomModel.ts
+++ b/src/component/dataZoom/DataZoomModel.ts
@@ -171,7 +171,7 @@ class DataZoomModel extends Compon
 
 private _targetAxisInfoMap: DataZoomTargetAxisInfoMap;
 
-private _noTarget: boolean;
+private _noTarget: boolean = true;
 
 /**
  * It is `[rangeModeForMin, rangeModeForMax]`.
@@ -278,7 +278,12 @@ class DataZoomModel extends Compon
 this._fillAutoTargetAxisByOrient(targetAxisIndexMap, this._orient);
 }
 
-this._noTarget = !targetAxisIndexMap.keys().length;
+this._noTarget = true;
+targetAxisIndexMap.each(function (axisInfo) {
+if (axisInfo.indexList.length) {
+this._noTarget = false;
+}
+}, this);
 }
 
 private _fillSpecifiedTargetAxis(targetAxisIndexMap: 
DataZoomTargetAxisInfoMap): boolean {


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



[incubator-echarts] 04/16: ts: remove "any" from type ECUnitOption (which causes "any" spread).

2020-07-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 18c21561ff727e9c1795972a199c015ac63df522
Author: 100pah 
AuthorDate: Wed Jul 8 22:53:48 2020 +0800

ts: remove "any" from type ECUnitOption (which causes "any" spread).
---
 src/chart/bar/BarView.ts   |  8 +---
 src/chart/bar/PictorialBarView.ts  |  2 +-
 src/chart/parallel/ParallelSeries.ts   |  4 +++-
 src/component/axisPointer.ts   |  6 +++---
 src/component/brush/preprocessor.ts| 12 ++--
 src/component/toolbox/feature/Brush.ts |  2 +-
 src/component/toolbox/feature/DataView.ts  |  6 +++---
 src/component/toolbox/feature/DataZoom.ts  |  9 +++--
 src/component/toolbox/feature/MagicType.ts | 11 ++-
 src/coord/parallel/parallelPreprocessor.ts |  6 --
 src/echarts.ts |  5 +++--
 src/model/Component.ts |  2 ++
 src/model/Model.ts |  2 +-
 src/model/mixin/textStyle.ts   |  2 +-
 src/util/types.ts  |  8 +++-
 15 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts
index d7dc1e1..6a29190 100644
--- a/src/chart/bar/BarView.ts
+++ b/src/chart/bar/BarView.ts
@@ -47,7 +47,9 @@ import {
 OrdinalSortInfo,
 Payload,
 OrdinalNumber,
-ParsedValue
+ParsedValue,
+ECUnitOption,
+AnimationOptionMixin
 } from '../../util/types';
 import BarSeriesModel, { BarSeriesOption, BarDataItemOption } from 
'./BarSeries';
 import type Axis2D from '../../coord/cartesian/Axis2D';
@@ -708,7 +710,7 @@ function removeRect(
 style: {
 opacity: 0
 }
-}, animationModel, dataIndex, function () {
+}, animationModel as Model, dataIndex, function () {
 el.parent && el.parent.remove(el);
 });
 }
@@ -724,7 +726,7 @@ function removeSector(
 style: {
 opacity: 0
 }
-}, animationModel, dataIndex, function () {
+}, animationModel as Model, dataIndex, function () {
 el.parent && el.parent.remove(el);
 });
 }
diff --git a/src/chart/bar/PictorialBarView.ts 
b/src/chart/bar/PictorialBarView.ts
index 48a7774..d7ee71c 100644
--- a/src/chart/bar/PictorialBarView.ts
+++ b/src/chart/bar/PictorialBarView.ts
@@ -222,7 +222,7 @@ class PictorialBarView extends ChartView {
 if (ecModel.get('animation')) {
 if (data) {
 data.eachItemGraphicEl(function (bar: PictorialBarElement) {
-removeBar(data, graphic.getECData(bar).dataIndex, ecModel, 
bar);
+removeBar(data, graphic.getECData(bar).dataIndex, ecModel 
as Model, bar);
 });
 }
 }
diff --git a/src/chart/parallel/ParallelSeries.ts 
b/src/chart/parallel/ParallelSeries.ts
index 1fd5c8f..8dbe52b 100644
--- a/src/chart/parallel/ParallelSeries.ts
+++ b/src/chart/parallel/ParallelSeries.ts
@@ -32,7 +32,7 @@ import {
  } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import List from '../../data/List';
-import { ParallelActiveState } from '../../coord/parallel/AxisModel';
+import { ParallelActiveState, ParallelAxisOption } from 
'../../coord/parallel/AxisModel';
 import Parallel from '../../coord/parallel/Parallel';
 import Source from '../../data/Source';
 import ParallelModel from '../../coord/parallel/ParallelModel';
@@ -72,6 +72,8 @@ export interface ParallelSeriesOption extends
 realtime?: boolean;
 tooltip?: SeriesTooltipOption;
 
+parallelAxisDefault?: ParallelAxisOption;
+
 emphasis?: {
 label?: LabelOption;
 lineStyle?: LineStyleOption;
diff --git a/src/component/axisPointer.ts b/src/component/axisPointer.ts
index 2e0b9e7..1b68850 100644
--- a/src/component/axisPointer.ts
+++ b/src/component/axisPointer.ts
@@ -36,15 +36,15 @@ ComponentModel.registerClass(AxisPointerModel);
 echarts.registerPreprocessor(function (option) {
 // Always has a global axisPointerModel for default setting.
 if (option) {
-(!option.axisPointer || option.axisPointer.length === 0)
+(!option.axisPointer || (option.axisPointer as []).length === 0)
 && (option.axisPointer = {});
 
-const link = option.axisPointer.link;
+const link = (option.axisPointer as any).link;
 // Normalize to array to avoid object mergin. But if link
 // is not set, remain null/undefined, otherwise it will
 // override existent link setting.
 if (link && !zrUtil.isArray(link)) {
-option.axisPointer.link = [link];
+(option.axisPointer as any).link = [link];
 }
 }
 });
diff --git a/src/component/brush/preprocessor.ts 
b/src/component/brush/preprocessor.ts
ind

[incubator-echarts] 08/16: feature: (1) support axis id reference in dataZoom. (except toolbox dataZoom) (2) enhance dataZoom auto choose axis logic to support multiple setOption. (except toolbox data

2020-07-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 32a4b6626858207865a555874e774e3941c14883
Author: 100pah 
AuthorDate: Tue Jul 14 17:38:24 2020 +0800

feature:
(1) support axis id reference in dataZoom. (except toolbox dataZoom)
(2) enhance dataZoom auto choose axis logic to support multiple setOption. 
(except toolbox dataZoom)
(3) enhance dataZoom to enable axis and dataZoom removal. (except toolbox 
dataZoom)
(4) simplify the code of dataZoom.
---
 src/component/dataZoom/AxisProxy.ts |  13 +-
 src/component/dataZoom/DataZoomModel.ts | 432 +++-
 src/component/dataZoom/DataZoomView.ts  |   5 +-
 src/component/dataZoom/InsideZoomView.ts|   2 +-
 src/component/dataZoom/SliderZoomView.ts|  27 +-
 src/component/dataZoom/dataZoomAction.ts|  25 +-
 src/component/dataZoom/dataZoomProcessor.ts |  75 +++--
 src/component/dataZoom/helper.ts| 209 ++
 test/dataZoom-feature.html  | 256 +
 9 files changed, 594 insertions(+), 450 deletions(-)

diff --git a/src/component/dataZoom/AxisProxy.ts 
b/src/component/dataZoom/AxisProxy.ts
index b322d91..196c71d 100644
--- a/src/component/dataZoom/AxisProxy.ts
+++ b/src/component/dataZoom/AxisProxy.ts
@@ -105,17 +105,12 @@ class AxisProxy {
 
 getTargetSeriesModels() {
 const seriesModels: SeriesModel[] = [];
-const ecModel = this.ecModel;
 
-ecModel.eachSeries(function (seriesModel) {
+this.ecModel.eachSeries(function (seriesModel) {
 if (helper.isCoordSupported(seriesModel.get('coordinateSystem'))) {
-const dimName = this._dimName;
-const axisModel = ecModel.queryComponents({
-mainType: dimName + 'Axis',
-index: seriesModel.get(dimName + 'AxisIndex' as any),
-id: seriesModel.get(dimName + 'AxisId' as any)
-})[0];
-if (this._axisIndex === (axisModel && 
axisModel.componentIndex)) {
+const axisMainType = helper.getAxisMainType(this._dimName);
+const axisModel = 
seriesModel.getReferringComponents(axisMainType, true).models[0];
+if (axisModel && this._axisIndex === axisModel.componentIndex) 
{
 seriesModels.push(seriesModel);
 }
 }
diff --git a/src/component/dataZoom/DataZoomModel.ts 
b/src/component/dataZoom/DataZoomModel.ts
index 48ec294..d1fadbe 100644
--- a/src/component/dataZoom/DataZoomModel.ts
+++ b/src/component/dataZoom/DataZoomModel.ts
@@ -17,30 +17,24 @@
 * under the License.
 */
 
-import {__DEV__} from '../../config';
-import * as zrUtil from 'zrender/src/core/util';
+import { each, createHashMap, merge, HashMap, assert } from 
'zrender/src/core/util';
 import env from 'zrender/src/core/env';
-import * as modelUtil from '../../util/model';
 import AxisProxy from './AxisProxy';
 import ComponentModel from '../../model/Component';
 import {
 LayoutOrient,
 ComponentOption,
-Dictionary,
-LabelOption,
-SeriesOption,
-SeriesOnCartesianOptionMixin,
-SeriesOnPolarOptionMixin,
-SeriesOnSingleOptionMixin
+LabelOption
 } from '../../util/types';
 import Model from '../../model/Model';
 import GlobalModel from '../../model/Global';
-import SeriesModel from '../../model/Series';
 import { AxisBaseModel } from '../../coord/AxisBaseModel';
-import { OptionAxisType, AxisBaseOption } from '../../coord/axisCommonTypes';
-import { eachAxisDim } from './helper';
+import {
+getAxisMainType, DATA_ZOOM_AXIS_DIMENSIONS, DataZoomAxisDimension
+} from './helper';
+import SingleAxisModel from '../../coord/single/AxisModel';
+import { __DEV__ } from '../../config';
 
-const each = zrUtil.each;
 
 export interface DataZoomOption extends ComponentOption {
 
@@ -53,16 +47,21 @@ export interface DataZoomOption extends ComponentOption {
  * Default the first horizontal category axis.
  */
 xAxisIndex?: number | number[]
+xAxisId?: string | string[]
 
 /**
  * Default the first vertical category axis.
  */
 yAxisIndex?: number | number[]
+yAxisId?: string | string[]
 
 radiusAxisIndex?: number | number[]
+radiusAxisId?: string | string[]
 angleAxisIndex?: number | number[]
+angleAxisId?: string | string[]
 
 singleAxisIndex?: number | number[]
+singleAxisId?: string | string[]
 
 /**
  * Possible values: 'filter' or 'empty' or 'weakFilter'.
@@ -131,20 +130,27 @@ export interface DataZoomOption extends ComponentOption {
 
 type RangeOption = Pick;
 
-type ExtendedAxisBaseModel = AxisBaseModel & {
+export type DataZoomExtendedAxisBaseModel = AxisBaseModel & {
 __dzAxisProxy: AxisProxy
 };
 
-interface SeriesModelOn

[incubator-echarts] 09/16: feature: add test case for id duplicated.

2020-07-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit a3d29cf60002869679d58259b9f9d2b2758bbcec
Author: 100pah 
AuthorDate: Tue Jul 14 18:09:46 2020 +0800

feature: add test case for id duplicated.
---
 src/model/Global.ts   |  2 +-
 src/util/model.ts | 32 ++--
 test/lib/testHelper.js| 19 ++
 test/option-replaceMerge.html | 58 +--
 4 files changed, 90 insertions(+), 21 deletions(-)

diff --git a/src/model/Global.ts b/src/model/Global.ts
index ad02e72..5fd20d9 100644
--- a/src/model/Global.ts
+++ b/src/model/Global.ts
@@ -384,7 +384,7 @@ class GlobalModel extends Model {
 let metNonInner = false;
 for (let i = realLen - 1; i >= 0; i--) {
 // Remove options with inner id.
-if (opts[i] && !modelUtil.isIdInner(opts[i])) {
+if (opts[i] && !modelUtil.isComponentIdInternal(opts[i])) {
 metNonInner = true;
 }
 else {
diff --git a/src/util/model.ts b/src/util/model.ts
index 7e21a2e..e0939a9 100644
--- a/src/util/model.ts
+++ b/src/util/model.ts
@@ -56,6 +56,8 @@ import { isNumeric } from './number';
  */
 const DUMMY_COMPONENT_NAME_PREFIX = 'series\0';
 
+const INTERNAL_COMPONENT_ID_PREFIX = '\0_ec_\0';
+
 /**
  * If value is not array, then translate it to array.
  * @param  {*} value
@@ -242,8 +244,8 @@ function mappingToExistsInNormalMerge(
 // Can not match when both ids existing but different.
 && existing
 && (existing.id == null || cmptOption.id == null)
-&& !isIdInner(cmptOption)
-&& !isIdInner(existing)
+&& !isComponentIdInternal(cmptOption)
+&& !isComponentIdInternal(existing)
 && keyExistAndEqual('name', existing, cmptOption)
 ) {
 result[i].newOption = cmptOption;
@@ -264,7 +266,7 @@ function mappingToExistsInNormalMerge(
  * Mapping to exists for merge.
  * The mode "replaceMerge" means that:
  * (1) Only the id mapped components will be merged.
- * (2) Other existing components (except inner compoonets) will be removed.
+ * (2) Other existing components (except internal compoonets) will be removed.
  * (3) Other new options will be used to create new component.
  * (4) The index of the existing compoents will not be modified.
  * That means their might be "hole" after the removal.
@@ -286,20 +288,20 @@ function mappingToExistsInReplaceMerge(
 // contains elided items, which will be ommited.
 for (let index = 0; index < existings.length; index++) {
 const existing = existings[index];
-let innerExisting: T;
+let internalExisting: T;
 // Because of replaceMerge, `existing` may be null/undefined.
 if (existing) {
-if (isIdInner(existing)) {
-// inner components should not be removed.
-innerExisting = existing;
+if (isComponentIdInternal(existing)) {
+// internal components should not be removed.
+internalExisting = existing;
 }
-// Input with inner id is allowed for convenience of some internal 
usage.
+// Input with internal id is allowed for convenience of some 
internal usage.
 // When `existing` is rawOption (see 
`OptionManager`#`mergeOption`), id might be empty.
 if (existing.id != null) {
 existingIdIdxMap.set(existing.id, index);
 }
 }
-result.push({ existing: innerExisting });
+result.push({ existing: internalExisting });
 }
 
 // Mapping by id if specified.
@@ -350,7 +352,7 @@ function mappingByIndexFinally(
 return;
 }
 
-// Find the first place that not mapped by id and not inner component 
(consider the "hole").
+// Find the first place that not mapped by id and not internal 
component (consider the "hole").
 let resultItem;
 while (
 // Be `!resultItem` only when `nextIdx >= mappingResult.length`.
@@ -368,7 +370,7 @@ function mappingByIndexFinally(
 && !keyExistAndEqual('id', cmptOption, resultItem.existing)
 )
 || resultItem.newOption
-|| isIdInner(resultItem.existing)
+|| isComponentIdInternal(resultItem.existing)
 )
 ) {
 nextIdx++;
@@ -414,6 +416,7 @@ function makeIdAndName(
 each(mapResult, function (item) {
 const opt = item.newOption;
 
+// Force en

[incubator-echarts] branch remove-component created (now 3154459)

2020-07-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch remove-component
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


  at 3154459  Merge branch 'next' into remove-component

This branch includes the following new commits:

 new 23e84e8  feature: remove the member `dependentModes` from 
`ComponentModel`. Use `ecMode.getComponent` `ecModel.queryComponents` instead. 
Because: (1) `dependentModes` is rarely used. (2) It might be wrongly cached. 
If cached, it might not be updated when new `setOption`. (3) Not necessary to 
prepare all dependencies model table for each component. Should better to 
require them when really want to use them.
 new 065cf80  feature: add `setOption` control param: `replaceMerge`.
 new 39891c0  Merge branch 'next' into remove-component
 new 18c2156  ts: remove "any" from type ECUnitOption (which causes "any" 
spread).
 new fa7cd46  fix: fix replaceMerge in feature "restore" and add test cases.
 new 1db1349  feature: In replaceMerge, trade {xxx: null/undefined} the 
same as {xxx: []} for ec option.
 new af07980  fix: fix type and tweak component.getReferingComponent.
 new 32a4b66  feature: (1) support axis id reference in dataZoom. (except 
toolbox dataZoom) (2) enhance dataZoom auto choose axis logic to support 
multiple setOption. (except toolbox dataZoom) (3) enhance dataZoom to enable 
axis and dataZoom removal. (except toolbox dataZoom) (4) simplify the code of 
dataZoom.
 new a3d29cf  feature: add test case for id duplicated.
 new cc81a49  feature: (1) support toolbox dataZoom works on the second 
setOption. (2) change the mechanism of "internal component" to support adding 
them dynamically. (3) uniform the "get referring component". (4) support 
toolbox dataZoom use axis id to refer axis (previously only axisIndex can be 
used). (5) remove the support to restore on the second setOption temporarily.
 new 4bbe3b2  fix: fix toolbox dataZoom when on grid.
 new f5a9667  fix: (1) Inside dataZoom can not dispose when grid removed. 
(2) uniform the reference between components.
 new c4d442e  fix: fix noTarget logic for dataZoom.
 new 7606cb7  fix: fix feature reproduce and complete test case.
 new 548bf37  add test case.
 new 3154459  Merge branch 'next' into remove-component

The 16 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



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



[incubator-echarts] 14/16: fix: fix feature reproduce and complete test case.

2020-07-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 7606cb72b155a994584c7d0ff704541f27ff244c
Author: 100pah 
AuthorDate: Fri Jul 17 02:06:47 2020 +0800

fix: fix feature reproduce and complete test case.
---
 src/model/Global.ts|   7 +-
 src/model/OptionManager.ts |  12 +-
 src/preprocessor/backwardCompat.ts |   2 +-
 src/util/model.ts  |  90 --
 test/dataZoom-feature.html | 564 -
 test/option-replaceMerge.html  | 101 ++-
 6 files changed, 539 insertions(+), 237 deletions(-)

diff --git a/src/model/Global.ts b/src/model/Global.ts
index 93b674d..6328032 100644
--- a/src/model/Global.ts
+++ b/src/model/Global.ts
@@ -272,8 +272,11 @@ class GlobalModel extends Model {
 );
 
 const oldCmptList = componentsMap.get(mainType);
-const mergeMode = (replaceMergeMainTypeMap && 
replaceMergeMainTypeMap.get(mainType))
-? 'replaceMerge' : 'normalMerge';
+const mergeMode =
+// `!oldCmptList` means init. See the comment in 
`mappingToExists`
+  !oldCmptList ? 'replaceAll'
+: (replaceMergeMainTypeMap && 
replaceMergeMainTypeMap.get(mainType)) ? 'replaceMerge'
+: 'normalMerge';
 const mappingResult = modelUtil.mappingToExists(oldCmptList, 
newCmptOptionList, mergeMode);
 
 // Set mainType and complete subType.
diff --git a/src/model/OptionManager.ts b/src/model/OptionManager.ts
index 17d3767..33f0742 100644
--- a/src/model/OptionManager.ts
+++ b/src/model/OptionManager.ts
@@ -22,17 +22,19 @@
  */
 
 
-import ComponentModel, { ComponentModelConstructor } from './Component';
+// import ComponentModel, { ComponentModelConstructor } from './Component';
 import ExtensionAPI from '../ExtensionAPI';
 import {
-OptionPreprocessor, MediaQuery, ECUnitOption, MediaUnit, ECOption, 
SeriesOption, ComponentOption
+OptionPreprocessor, MediaQuery, ECUnitOption, MediaUnit, ECOption, 
SeriesOption
 } from '../util/types';
 import GlobalModel, { InnerSetOptionOpts } from './Global';
 import {
-MappingExistingItem, normalizeToArray, setComponentTypeToKeyInfo, 
mappingToExists
+normalizeToArray
+// , MappingExistingItem, setComponentTypeToKeyInfo, mappingToExists
 } from '../util/model';
 import {
-each, clone, map, merge, isTypedArray, setAsPrimitive, HashMap, 
createHashMap, extend
+each, clone, map, isTypedArray, setAsPrimitive
+// , HashMap , createHashMap, extend, merge,
 } from 'zrender/src/core/util';
 
 const QUERY_REG = /^(min|max)?(.+)$/;
@@ -45,7 +47,7 @@ interface ParsedRawOption {
 }
 
 // Key: mainType
-type FakeComponentsMap = HashMap<(MappingExistingItem & { subType: string 
})[]>;
+// type FakeComponentsMap = HashMap<(MappingExistingItem & { subType: string 
})[]>;
 
 /**
  * TERM EXPLANATIONS:
diff --git a/src/preprocessor/backwardCompat.ts 
b/src/preprocessor/backwardCompat.ts
index f710dcc..5e112f6 100644
--- a/src/preprocessor/backwardCompat.ts
+++ b/src/preprocessor/backwardCompat.ts
@@ -58,7 +58,7 @@ function set(opt: Dictionary, path: string, val: any, 
overwrite?: boolean)
 }
 
 function compatLayoutProperties(option: Dictionary) {
-each(LAYOUT_PROPERTIES, function (prop) {
+option && each(LAYOUT_PROPERTIES, function (prop) {
 if (prop[0] in option && !(prop[1] in option)) {
 option[prop[1]] = option[prop[0]];
 }
diff --git a/src/util/model.ts b/src/util/model.ts
index 6225339..5cf3568 100644
--- a/src/util/model.ts
+++ b/src/util/model.ts
@@ -162,17 +162,15 @@ export interface MappingExistingItem {
 type MappingResult = MappingResultItem[];
 interface MappingResultItem {
 // Existing component instance.
-existing?: T;
+existing: T;
 // The mapped new component option.
-newOption?: ComponentOption;
+newOption: ComponentOption;
 // Mark that the new component has nothing to do with any of the old 
components.
 // So they won't share view. Also see `__requireNewView`.
-brandNew?: boolean;
-// id?: string;
-// name?: string;
+brandNew: boolean;
 // keyInfo for new component.
 // All of them will be assigned to a created component instance.
-keyInfo?: {
+keyInfo: {
 name: string,
 id: string,
 mainType: ComponentMainType,
@@ -180,6 +178,8 @@ interface MappingResultItem
 };
 }
 
+type MappingToExistsMode = 'normalMerge' | 'replaceMerge' | 'replaceAll';
+
 /**
  * Mapping to existings for merge.
  *
@@ -198,22 +198,31 @@ interface MappingResultItem
  * That means their might be "hole" after the removal.
  * The new components are created first at those available index.
  *
+ * Mode "replaceAll":

[incubator-echarts] 06/16: feature: In replaceMerge, trade {xxx: null/undefined} the same as {xxx: []} for ec option.

2020-07-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 1db1349b17adfe7924483bab289f78873a4855e0
Author: 100pah 
AuthorDate: Tue Jul 14 17:28:21 2020 +0800

feature: In replaceMerge, trade {xxx: null/undefined} the same as {xxx: []} 
for ec option.
---
 src/model/Global.ts   | 60 +++-
 test/option-replaceMerge.html | 93 +++
 2 files changed, 135 insertions(+), 18 deletions(-)

diff --git a/src/model/Global.ts b/src/model/Global.ts
index 5fe..ad02e72 100644
--- a/src/model/Global.ts
+++ b/src/model/Global.ts
@@ -62,7 +62,7 @@ export interface GlobalModelSetOptionOpts {
 replaceMerge: ComponentMainType | ComponentMainType[];
 }
 export interface InnerSetOptionOpts {
-replaceMergeMainTypeMap: HashMap;
+replaceMergeMainTypeMap: HashMap;
 }
 
 // ---
@@ -81,7 +81,7 @@ class GlobalModel extends Model {
 
 private _optionManager: OptionManager;
 
-private _componentsMap: HashMap;
+private _componentsMap: HashMap;
 
 /**
  * `_componentsMap` might have "hole" becuase of remove.
@@ -218,6 +218,7 @@ class GlobalModel extends Model {
 const componentsMap = this._componentsMap;
 const componentsCount = this._componentsCount;
 const newCmptTypes: ComponentMainType[] = [];
+const newCmptTypeMap = createHashMap();
 const replaceMergeMainTypeMap = opt && opt.replaceMergeMainTypeMap;
 
 resetSourceDefaulter(this);
@@ -237,9 +238,23 @@ class GlobalModel extends Model {
 }
 else if (mainType) {
 newCmptTypes.push(mainType);
+newCmptTypeMap.set(mainType, true);
 }
 });
 
+if (replaceMergeMainTypeMap) {
+// If there is a mainType `xxx` in `replaceMerge` but not declared 
in option,
+// we trade it as it is declared in option as `{xxx: []}`. Because:
+// (1) for normal merge, `{xxx: null/undefined}` are the same 
meaning as `{xxx: []}`.
+// (2) some preprocessor may convert some of `{xxx: 
null/undefined}` to `{xxx: []}`.
+replaceMergeMainTypeMap.each(function (b, mainTypeInReplaceMerge) {
+if (!newCmptTypeMap.get(mainTypeInReplaceMerge)) {
+newCmptTypes.push(mainTypeInReplaceMerge);
+newCmptTypeMap.set(mainTypeInReplaceMerge, true);
+}
+});
+}
+
 (ComponentModel as ComponentModelConstructor).topologicalTravel(
 newCmptTypes,
 (ComponentModel as 
ComponentModelConstructor).getAllClassMainTypes(),
@@ -249,10 +264,8 @@ class GlobalModel extends Model {
 
 function visitComponent(
 this: GlobalModel,
-mainType: ComponentMainType,
-dependencies: string | string[]
+mainType: ComponentMainType
 ): void {
-
 const newCmptOptionList = 
modelUtil.normalizeToArray(newOption[mainType]);
 
 const oldCmptList = componentsMap.get(mainType);
@@ -263,11 +276,13 @@ class GlobalModel extends Model {
 // Set mainType and complete subType.
 modelUtil.setComponentTypeToKeyInfo(mappingResult, mainType, 
ComponentModel as ComponentModelConstructor);
 
-// Set it before the travel, in case that `this._componentsMap` is
-// used in some `init` or `merge` of components.
+// Empty it before the travel, in order to prevent 
`this._componentsMap`
+// from being used in the `init`/`mergeOption`/`optionUpdated` of 
some
+// components, which is probably incorrect logic.
 option[mainType] = null;
 componentsMap.set(mainType, null);
 componentsCount.set(mainType, 0);
+
 const optionsByMainType = [] as ComponentOption[];
 const cmptsByMainType = [] as ComponentModel[];
 let cmptsCountByMainType = 0;
@@ -794,8 +809,8 @@ export interface QueryConditionKindB {
 mainType: ComponentMainType;
 subType?: ComponentSubType;
 index?: number | number[];
-id?: string | string[];
-name?: string | string[];
+id?: string | number | (string | number)[];
+name?: (string | number) | (string | number)[];
 }
 export interface EachComponentAllCallback {
 (mainType: string, model: ComponentModel, componentIndex: number): void;
@@ -844,16 +859,25 @@ function mergeTheme(option: ECUnitOption, theme: 
ThemeOption): void {
 
 function queryByIdOrName(
 attr: 'id' | 'name',
-idOrName: string | string[],
+idOrName: string | number | (string | number)[],
 cmpts: T[]
 ): T[] {
-let keyMap: HashMap;
-return isArray(idOrName)
-? (
-keyMap = createHashMap(idOrName),
-

[incubator-echarts] 12/16: fix: (1) Inside dataZoom can not dispose when grid removed. (2) uniform the reference between components.

2020-07-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit f5a9667d8e234299b5eef35089015200d0456fdb
Author: 100pah 
AuthorDate: Thu Jul 16 19:00:06 2020 +0800

fix: (1) Inside dataZoom can not dispose when grid removed. (2) uniform the 
reference between components.
---
 src/chart/themeRiver/ThemeRiverSeries.ts   |   8 +-
 src/component/dataZoom/AxisProxy.ts|  18 +-
 src/component/dataZoom/DataZoomModel.ts|  15 +-
 src/component/dataZoom/DataZoomView.ts |  70 
 src/component/dataZoom/InsideZoomView.ts   | 128 +++---
 src/component/dataZoom/SliderZoomView.ts   |  91 --
 src/component/dataZoom/helper.ts   |  88 --
 src/component/dataZoom/roams.ts| 265 +
 src/component/toolbox/feature/DataZoom.ts  |   6 +-
 src/component/toolbox/feature/MagicType.ts |   7 +-
 src/coord/axisModelCommonMixin.ts  |   1 -
 src/coord/cartesian/AxisModel.ts   |   7 +-
 src/coord/cartesian/Grid.ts|   6 +-
 src/coord/cartesian/cartesianAxisHelper.ts |   5 +-
 src/coord/geo/Geo.ts   |   6 +-
 src/coord/parallel/parallelCreator.ts  |   9 +-
 src/coord/polar/AxisModel.ts   |   7 +-
 src/coord/polar/polarCreator.ts|   9 +-
 src/coord/single/singleCreator.ts  |   9 +-
 src/model/Component.ts |   6 +-
 src/model/referHelper.ts   |  11 +-
 src/util/model.ts  |  38 +++--
 test/dataZoom-feature.html |   2 +-
 test/option-replaceMerge.html  | 123 +++--
 24 files changed, 494 insertions(+), 441 deletions(-)

diff --git a/src/chart/themeRiver/ThemeRiverSeries.ts 
b/src/chart/themeRiver/ThemeRiverSeries.ts
index 3f0cc49..50c310b 100644
--- a/src/chart/themeRiver/ThemeRiverSeries.ts
+++ b/src/chart/themeRiver/ThemeRiverSeries.ts
@@ -22,7 +22,7 @@ import createDimensions from 
'../../data/helper/createDimensions';
 import {getDimensionTypeByAxis} from '../../data/helper/dimensionHelper';
 import List from '../../data/List';
 import * as zrUtil from 'zrender/src/core/util';
-import {groupData} from '../../util/model';
+import {groupData, SINGLE_REFERRING} from '../../util/model';
 import {encodeHTML} from '../../util/format';
 import LegendVisualProvider from '../../visual/LegendVisualProvider';
 import {
@@ -172,11 +172,7 @@ class ThemeRiverSeriesModel extends 
SeriesModel {
  */
 getInitialData(option: ThemeRiverSeriesOption, ecModel: GlobalModel): List 
{
 
-const singleAxisModel = ecModel.queryComponents({
-mainType: 'singleAxis',
-index: this.get('singleAxisIndex'),
-id: this.get('singleAxisId')
-})[0];
+const singleAxisModel = this.getReferringComponents('singleAxis', 
SINGLE_REFERRING).models[0];
 
 const axisType = singleAxisModel.get('type');
 
diff --git a/src/component/dataZoom/AxisProxy.ts 
b/src/component/dataZoom/AxisProxy.ts
index 196c71d..f34a08b 100644
--- a/src/component/dataZoom/AxisProxy.ts
+++ b/src/component/dataZoom/AxisProxy.ts
@@ -19,7 +19,6 @@
 
 import * as zrUtil from 'zrender/src/core/util';
 import * as numberUtil from '../../util/number';
-import * as helper from './helper';
 import sliderMove from '../helper/sliderMove';
 import GlobalModel from '../../model/Global';
 import SeriesModel from '../../model/Series';
@@ -30,6 +29,8 @@ import DataZoomModel from './DataZoomModel';
 import { AxisBaseModel } from '../../coord/AxisBaseModel';
 import { unionAxisExtentFromData } from '../../coord/axisHelper';
 import { ensureScaleRawExtentInfo } from '../../coord/scaleRawExtentInfo';
+import { getAxisMainType, isCoordSupported, DataZoomAxisDimension } from 
'./helper';
+import { SINGLE_REFERRING } from '../../util/model';
 
 const each = zrUtil.each;
 const asc = numberUtil.asc;
@@ -54,7 +55,7 @@ class AxisProxy {
 
 ecModel: GlobalModel;
 
-private _dimName: string;
+private _dimName: DataZoomAxisDimension;
 private _axisIndex: number;
 
 private _valueWindow: [number, number];
@@ -66,7 +67,12 @@ class AxisProxy {
 
 private _dataZoomModel: DataZoomModel;
 
-constructor(dimName: string, axisIndex: number, dataZoomModel: 
DataZoomModel, ecModel: GlobalModel) {
+constructor(
+dimName: DataZoomAxisDimension,
+axisIndex: number,
+dataZoomModel: DataZoomModel,
+ecModel: GlobalModel
+) {
 this._dimName = dimName;
 
 this._axisIndex = axisIndex;
@@ -107,9 +113,9 @@ class AxisProxy {
 const seriesModels: SeriesModel[] = [];
 
 this.ecModel.eachSeries(function (seriesModel) {
-if (helper.isCoordSupported(seriesModel.get('coordinateSystem'))) {
-const axisMainType = helper.getAxisMainType(this._dimName

[incubator-echarts] 02/16: feature: add `setOption` control param: `replaceMerge`.

2020-07-17 Thread sushuang
This is an automated email from the ASF dual-hosted git repository.

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

commit 065cf80c1e7c34c2dec405e81e45f6f339b07e3e
Author: 100pah 
AuthorDate: Tue Jul 7 23:02:06 2020 +0800

feature: add `setOption` control param: `replaceMerge`.
---
 src/chart/helper/createListFromArray.ts  |   2 +-
 src/chart/treemap/TreemapSeries.ts   |   3 +-
 src/component/graphic.ts |   8 +-
 src/component/timeline/TimelineModel.ts  |   6 +-
 src/component/timeline/timelineAction.ts |   2 +-
 src/echarts.ts   |  36 +-
 src/model/Component.ts   |   1 +
 src/model/Global.ts  | 396 --
 src/model/OptionManager.ts   |  35 +-
 src/util/model.ts| 268 +
 src/util/types.ts|   2 +-
 test/lib/testHelper.js   |  58 +++
 test/option-replaceMerge.html| 661 +++
 test/option-replaceMerge2.html   | 497 +++
 test/timeline-dynamic-series.html| 201 +-
 test/timeline-life.html  | 279 +
 16 files changed, 2101 insertions(+), 354 deletions(-)

diff --git a/src/chart/helper/createListFromArray.ts 
b/src/chart/helper/createListFromArray.ts
index d55bf3b..253240f 100644
--- a/src/chart/helper/createListFromArray.ts
+++ b/src/chart/helper/createListFromArray.ts
@@ -47,7 +47,7 @@ function createListFromArray(source: Source | any[], 
seriesModel: SeriesModel, o
 
 let coordSysDimDefs: DimensionDefinitionLoose[];
 
-if (coordSysInfo) {
+if (coordSysInfo && coordSysInfo.coordSysDims) {
 coordSysDimDefs = zrUtil.map(coordSysInfo.coordSysDims, function (dim) 
{
 const dimInfo = {
 name: dim
diff --git a/src/chart/treemap/TreemapSeries.ts 
b/src/chart/treemap/TreemapSeries.ts
index 18b036b..f325f49 100644
--- a/src/chart/treemap/TreemapSeries.ts
+++ b/src/chart/treemap/TreemapSeries.ts
@@ -36,6 +36,7 @@ import {
 import GlobalModel from '../../model/Global';
 import { LayoutRect } from '../../util/layout';
 import List from '../../data/List';
+import { normalizeToArray } from '../../util/model';
 
 // Only support numberic value.
 type TreemapSeriesDataValue = number | number[];
@@ -519,7 +520,7 @@ function completeTreeValue(dataNode: 
TreemapSeriesNodeItemOption) {
  * set default to level configuration
  */
 function setDefault(levels: TreemapSeriesLevelOption[], ecModel: GlobalModel) {
-const globalColorList = ecModel.get('color');
+const globalColorList = normalizeToArray(ecModel.get('color')) as 
ColorString[];
 
 if (!globalColorList) {
 return;
diff --git a/src/component/graphic.ts b/src/component/graphic.ts
index 7bc0247..1996918 100644
--- a/src/component/graphic.ts
+++ b/src/component/graphic.ts
@@ -142,18 +142,18 @@ const GraphicModel = echarts.extendComponentModel({
 const flattenedList = [];
 this._flatten(newList, flattenedList);
 
-const mappingResult = modelUtil.mappingToExists(existList, 
flattenedList);
+const mappingResult = 
modelUtil.mappingToExistsInNormalMerge(existList, flattenedList);
 modelUtil.makeIdAndName(mappingResult);
 
 // Clear elOptionsToUpdate
 const elOptionsToUpdate = this._elOptionsToUpdate = [];
 
 zrUtil.each(mappingResult, function (resultItem, index) {
-const newElOption = resultItem.option;
+const newElOption = resultItem.newOption;
 
 if (__DEV__) {
 zrUtil.assert(
-zrUtil.isObject(newElOption) || resultItem.exist,
+zrUtil.isObject(newElOption) || resultItem.existing,
 'Empty graphic option definition'
 );
 }
@@ -502,7 +502,7 @@ function isSetLoc(obj, props) {
 }
 
 function setKeyInfoToNewElOption(resultItem, newElOption) {
-const existElOption = resultItem.exist;
+const existElOption = resultItem.existing;
 
 // Set id and type after id assigned.
 newElOption.id = resultItem.keyInfo.id;
diff --git a/src/component/timeline/TimelineModel.ts 
b/src/component/timeline/TimelineModel.ts
index 11c9982..385854c 100644
--- a/src/component/timeline/TimelineModel.ts
+++ b/src/component/timeline/TimelineModel.ts
@@ -36,7 +36,7 @@ import {
 ZREasing
 } from '../../util/types';
 import Model from '../../model/Model';
-import GlobalModel from '../../model/Global';
+import GlobalModel, { GlobalModelSetOptionOpts } from '../../model/Global';
 import { each, isObject, clone, isString } from 'zrender/src/core/util';
 
 
@@ -121,6 +121,10 @@ export interface TimelineOption extends ComponentOption, 
BoxLayoutOptionMixin, S
 
 inverse?: boolean
 
+// If not specified, options will be changed by &quo

  1   2   3   4   5   6   7   8   9   10   >