[incubator-echarts] branch feat-decal created (now 9ec0aaa)

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

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


  at 9ec0aaa  feat(decal): decal for basic charts

This branch includes the following new commits:

 new 9ec0aaa  feat(decal): decal for basic charts

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: feat(decal): decal for basic charts

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

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

commit 9ec0aaad6552b0ed434ac8bfde7519801332fc5e
Author: Ovilia 
AuthorDate: Fri Sep 18 13:38:17 2020 +0800

feat(decal): decal for basic charts
---
 src/model/mixin/itemStyle.ts   |   2 +
 src/model/mixin/makeStyleMapper.ts |  10 +-
 src/util/decal.ts  | 285 +
 src/util/number.ts |  29 
 test/decal.html|  89 
 5 files changed, 413 insertions(+), 2 deletions(-)

diff --git a/src/model/mixin/itemStyle.ts b/src/model/mixin/itemStyle.ts
index 959ecc4..14f3c1d 100644
--- a/src/model/mixin/itemStyle.ts
+++ b/src/model/mixin/itemStyle.ts
@@ -25,6 +25,7 @@ import { PathStyleProps } from 'zrender/src/graphic/Path';
 export const ITEM_STYLE_KEY_MAP = [
 ['fill', 'color'],
 ['stroke', 'borderColor'],
+['decal'],
 ['lineWidth', 'borderWidth'],
 ['opacity'],
 ['shadowBlur'],
@@ -42,6 +43,7 @@ const getItemStyle = makeStyleMapper(ITEM_STYLE_KEY_MAP);
 
 type ItemStyleKeys = 'fill'
 | 'stroke'
+| 'decal'
 | 'lineWidth'
 | 'opacity'
 | 'shadowBlur'
diff --git a/src/model/mixin/makeStyleMapper.ts 
b/src/model/mixin/makeStyleMapper.ts
index e08e42a..4ed0f5e 100644
--- a/src/model/mixin/makeStyleMapper.ts
+++ b/src/model/mixin/makeStyleMapper.ts
@@ -20,9 +20,10 @@
 // TODO Parse shadow style
 // TODO Only shallow path support
 import * as zrUtil from 'zrender/src/core/util';
+import {Dictionary} from 'zrender/src/core/types';
+import {PathStyleProps} from 'zrender/src/graphic/Path';
 import Model from '../Model';
-import { Dictionary } from 'zrender/src/core/types';
-import { PathStyleProps } from 'zrender/src/graphic/Path';
+import {createOrUpdatePatternFromDecal} from '../../util/decal';
 
 export default function (properties: readonly string[][], ignoreParent?: 
boolean) {
 // Normalize
@@ -48,6 +49,11 @@ export default function (properties: readonly string[][], 
ignoreParent?: boolean
 style[properties[i][0]] = val;
 }
 }
+
+if (style.decal) {
+createOrUpdatePatternFromDecal(style.decal);
+}
+
 // TODO Text or image?
 return style as PathStyleProps;
 };
diff --git a/src/util/decal.ts b/src/util/decal.ts
new file mode 100644
index 000..4c77de7
--- /dev/null
+++ b/src/util/decal.ts
@@ -0,0 +1,285 @@
+import {DecalObject, DecalDashArrayX, DecalDashArrayY} from 
'zrender/src/graphic/Decal';
+import Pattern, {PatternObject} from 'zrender/src/graphic/Pattern';
+import {defaults, createCanvas, map} from 'zrender/src/core/util';
+import {getLeastCommonMultiple} from './number';
+
+/**
+ * Create or update pattern image from decal options
+ *
+ * @param {DecalObject} decalObject decal options
+ * @return {Pattern} pattern with generated image
+ */
+export function createOrUpdatePatternFromDecal(
+decalObject: DecalObject
+): PatternObject {
+if (decalObject.__pattern) {
+return decalObject.__pattern;
+}
+
+const decalOpt = defaults({
+shape: 'rect',
+symbolSize: 1,
+symbolKeepAspect: true,
+color: 'rgba(255, 255, 255, 0.4)',
+backgroundColor: null,
+dashArrayX: 10,
+dashArrayY: 10,
+dashLineOffset: 0,
+rotation: Math.PI / 4,
+maxTileWidth: 512,
+maxTileHeight: 512
+} as DecalObject, decalObject);
+if (decalOpt.backgroundColor === 'none') {
+decalOpt.backgroundColor = null;
+}
+
+const dashArrayX = normalizeDashArrayX(decalOpt.dashArrayX);
+const dashArrayY = normalizeDashArrayY(decalOpt.dashArrayY);
+
+const lineBlockLengthsX = getLineBlockLengthX(dashArrayX);
+const lineBlockLengthY = getLineBlockLengthY(dashArrayY);
+
+const canvas = createCanvas();
+const pSize = getPatternSize();
+
+canvas.width = pSize.width;
+canvas.height = pSize.height;
+canvas.style.width = canvas.width + 'px';
+canvas.style.height = canvas.height + 'px';
+
+const ctx = canvas.getContext('2d');
+
+brush();
+
+const base64 = canvas.toDataURL();
+
+const pattern = new Pattern(base64, 'repeat', decalOpt.rotation);
+decalObject.__pattern = pattern;
+
+decalObject.dirty = function () {
+console.log('dirty');
+};
+
+return pattern;
+
+/**
+ * Get minumum length that can make a repeatable pattern.
+ *
+ * @return {Object} pattern width and height
+ */
+function getPatternSize()
+: {
+width: number,
+height: number,
+lines: number
+}
+{
+/**
+ * For example, if dash is [[3, 2], [2, 1]] for X, it looks like

[incubator-echarts] branch fix-legend-style updated (a9b867b -> 7113d24)

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

ovilia pushed a change to branch fix-legend-style
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


from a9b867b  chore: merge
 add 7113d24  feat: legend.itemStyle has higher priority

No new revisions were added by this update.

Summary of changes:
 src/chart/helper/EffectLine.ts   |   2 -
 src/chart/helper/LargeSymbolDraw.ts  |  10 --
 src/chart/helper/Line.ts |   4 +-
 src/chart/helper/Symbol.ts   |  12 +--
 src/chart/line/LineView.ts   |   4 +
 src/chart/radar/RadarView.ts |   1 -
 src/component/legend/LegendView.ts   |  34 +++
 src/component/timeline/SliderTimelineView.ts |   1 -
 src/util/symbol.ts   |  33 +--
 src/visual/style.ts  |   6 ++
 test/area-large.html |   2 +-
 test/axes.html   |  10 +-
 test/axis-interval2.html |   1 -
 test/legend-style.html   | 136 ++-
 14 files changed, 174 insertions(+), 82 deletions(-)


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



[incubator-echarts-handbook] branch master updated (9cb168b -> 2a9e25f)

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

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


from 9cb168b  Merge pull request #3 from Hansz00/master
 new 2c9c40f  Translation Update
 new 244953f  application/data
 new 7d7ef58  Trans Update 2
 new 8a63fc4  Create dataset.md
 new 371b9e0  Create event.md
 new b8c48e4  Create legend.md
 new 64c6a55  create 3 files
 new 2a9e25f  Merge pull request #4 from Hansz00/master

The 87 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:
 contents/{zh => en}/application/data/drilldown.md  |   0
 contents/en/application/data/dynamic-data.md   | 109 +
 .../chart-specificatio/pie/basic-pie.md|  47 ++
 .../chart-specificatio/scatter/bubble.md   |  27 ++
 .../chart-specificatio/scatter/scatter.md  |  36 ++
 contents/en/best-practice/design/color-enhance.md  |  65 +++
 contents/en/concepts/axis.md   | 176 +++
 contents/en/concepts/chart-size.md |  88 
 contents/{zh => en}/concepts/coordinate.md |   0
 contents/en/concepts/dataset.md| 536 +
 contents/en/concepts/event.md  | 255 ++
 contents/en/concepts/legend.md | 145 ++
 contents/{zh => en}/concepts/options.md|   0
 contents/{zh => en}/concepts/series.md |   0
 contents/{zh => en}/concepts/tooltip.md|   0
 .../chart-specificatio/scatter/scatter.md  |   2 +-
 contents/zh/best-practice/design/color-enhance.md  |   2 +-
 contents/zh/concepts/axis.md   |   2 +-
 contents/zh/concepts/dataset.md|   4 +-
 contents/zh/concepts/event.md  |   2 +-
 20 files changed, 1490 insertions(+), 6 deletions(-)
 copy contents/{zh => en}/application/data/drilldown.md (100%)
 create mode 100644 contents/en/application/data/dynamic-data.md
 create mode 100644 
contents/en/best-practice/chart-specificatio/pie/basic-pie.md
 create mode 100644 
contents/en/best-practice/chart-specificatio/scatter/bubble.md
 create mode 100644 
contents/en/best-practice/chart-specificatio/scatter/scatter.md
 create mode 100644 contents/en/best-practice/design/color-enhance.md
 create mode 100644 contents/en/concepts/axis.md
 create mode 100644 contents/en/concepts/chart-size.md
 copy contents/{zh => en}/concepts/coordinate.md (100%)
 create mode 100644 contents/en/concepts/dataset.md
 create mode 100644 contents/en/concepts/event.md
 create mode 100644 contents/en/concepts/legend.md
 copy contents/{zh => en}/concepts/options.md (100%)
 copy contents/{zh => en}/concepts/series.md (100%)
 copy contents/{zh => en}/concepts/tooltip.md (100%)


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



[incubator-echarts] branch line-label updated (d5ea2e8 -> dd9c6db)

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

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


from d5ea2e8  feat: line label animation on the first setOption
 add dd9c6db  feat: update setOption animation

No new revisions were added by this update.

Summary of changes:
 src/chart/helper/Symbol.ts |   7 +-
 src/chart/helper/SymbolDraw.ts |  11 +-
 src/chart/line/LineSeries.ts   |   3 +-
 src/chart/line/LineView.ts | 127 ++
 test/line-endLabel.html| 234 +
 5 files changed, 332 insertions(+), 50 deletions(-)
 create mode 100644 test/line-endLabel.html


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



[incubator-echarts] 05/06: Merge branch 'next' into line-label

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

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

commit 95035807f9e24844a56e9045d516a510dac0e160
Merge: 84ce59f a6300c9
Author: Ovilia 
AuthorDate: Fri Sep 4 11:01:22 2020 +0800

Merge branch 'next' into line-label

 src/chart/bar/BarView.ts|   2 +-
 src/chart/helper/Line.ts|   2 +-
 src/chart/helper/Symbol.ts  |   5 +-
 src/chart/helper/SymbolDraw.ts  |   2 +-
 src/component/axis/SingleAxisView.ts|  13 +-
 src/component/axisPointer/viewHelper.ts |  17 +-
 src/component/title.ts  |   4 +-
 src/label/labelStyle.ts |  25 ++-
 src/model/mixin/itemStyle.ts|  24 +-
 src/model/mixin/lineStyle.ts|  43 ++--
 src/util/types.ts   |  14 +-
 src/visual/style.ts |   2 +-
 test/line-style.html| 381 +++-
 13 files changed, 457 insertions(+), 77 deletions(-)



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



[incubator-echarts] branch line-label created (now d5ea2e8)

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

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


  at d5ea2e8  feat: line label animation on the first setOption

This branch includes the following new commits:

 new 87d1d71  feat: change default line init animation
 new 6e2831e  feat(line)!: support both series and item delay with 
animationDelay callbacks
 new f680d16  feat(line): new animation for grid and polar
 new 84ce59f  WIP(line): line label animation
 new 9503580  Merge branch 'next' into line-label
 new d5ea2e8  feat: line label animation on the first setOption

The 6 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/06: feat(line): new animation for grid and polar

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

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

commit f680d16ed18c529990a556f950063b7b4a34cd4b
Author: Ovilia 
AuthorDate: Wed Sep 2 18:03:34 2020 +0800

feat(line): new animation for grid and polar
---
 src/chart/helper/createClipPathFromCoordSys.ts |  31 +--
 src/chart/line/LineView.ts |  83 -
 test/line-animation.html   | 103 +
 test/polarLine.html| 122 -
 4 files changed, 290 insertions(+), 49 deletions(-)

diff --git a/src/chart/helper/createClipPathFromCoordSys.ts 
b/src/chart/helper/createClipPathFromCoordSys.ts
index c8b1f82..d0d21a7 100644
--- a/src/chart/helper/createClipPathFromCoordSys.ts
+++ b/src/chart/helper/createClipPathFromCoordSys.ts
@@ -34,7 +34,6 @@ function createGridClipPath(
 seriesModel: SeriesModelWithLineWidth
 ) {
 const rect = cartesian.getArea();
-const isHorizontal = cartesian.getBaseAxis().isHorizontal();
 
 let x = rect.x;
 let y = rect.y;
@@ -62,11 +61,19 @@ function createGridClipPath(
 });
 
 if (hasAnimation) {
-clipPath.shape[isHorizontal ? 'width' : 'height'] = 0;
+const isHorizontal = cartesian.getBaseAxis().isHorizontal();
+if (isHorizontal) {
+clipPath.shape.width = 0;
+}
+else {
+clipPath.shape.y = y + height;
+clipPath.shape.height = 0;
+}
 graphic.initProps(clipPath, {
 shape: {
 width: width,
-height: height
+height: height,
+y: y
 }
 }, seriesModel);
 }
@@ -82,12 +89,14 @@ function createPolarClipPath(
 const sectorArea = polar.getArea();
 // Avoid float number rounding error for symbol on the edge of axis extent.
 
+const r0 = round(sectorArea.r0, 1);
+const r = round(sectorArea.r, 1);
 const clipPath = new graphic.Sector({
 shape: {
 cx: round(polar.cx, 1),
 cy: round(polar.cy, 1),
-r0: round(sectorArea.r0, 1),
-r: round(sectorArea.r, 1),
+r0: r0,
+r: r,
 startAngle: sectorArea.startAngle,
 endAngle: sectorArea.endAngle,
 clockwise: sectorArea.clockwise
@@ -95,10 +104,18 @@ function createPolarClipPath(
 });
 
 if (hasAnimation) {
-clipPath.shape.endAngle = sectorArea.startAngle;
+const isRadial = polar.getBaseAxis().dim === 'angle';
+
+if (isRadial) {
+clipPath.shape.endAngle = sectorArea.startAngle;
+}
+else {
+clipPath.shape.r = r0;
+}
 graphic.initProps(clipPath, {
 shape: {
-endAngle: sectorArea.endAngle
+endAngle: sectorArea.endAngle,
+r: r
 }
 }, seriesModel);
 }
diff --git a/src/chart/line/LineView.ts b/src/chart/line/LineView.ts
index cdcc025..5d12887 100644
--- a/src/chart/line/LineView.ts
+++ b/src/chart/line/LineView.ts
@@ -461,7 +461,12 @@ class LineView extends ChartView {
 isIgnore: isIgnoreFunc,
 clipShape: clipShapeForSymbol
 });
-this._initAnimation(data, isCoordSysPolar, clipShapeForSymbol);
+
+this._initAnimation(
+data,
+coordSys,
+clipShapeForSymbol
+);
 
 if (step) {
 // TODO If stacked series is not step
@@ -752,9 +757,21 @@ class LineView extends ChartView {
 
 _initAnimation(
 data: List,
-isCoordSysPolar: boolean,
+coordSys: Polar | Cartesian2D,
 clipShape: PolarArea | Cartesian2DArea
 ) {
+let isHorizontalOrRadial: boolean;
+let isCoordSysPolar: boolean;
+const baseAxis = coordSys.getBaseAxis();
+if (coordSys.type === 'cartesian2d') {
+isHorizontalOrRadial = (baseAxis as Axis2D).isHorizontal();
+isCoordSysPolar = false;
+}
+else if (coordSys.type === 'polar') {
+isHorizontalOrRadial = baseAxis.dim === 'angle';
+isCoordSysPolar = true;
+}
+
 const seriesModel = data.hostModel;
 let seriesDuration = seriesModel.get('animationDuration');
 if (typeof seriesDuration === 'function') {
@@ -768,35 +785,55 @@ class LineView extends ChartView {
 data.eachItemGraphicEl(function (symbol, idx) {
 const el = (symbol as SymbolClz).childAt(0) as Displayable;
 if (el) {
-const symbolSize = data.getItemVisual(
-idx,
-'symbolSize'
-);
-const symbolSizeArr = zrUtil.isArray(symbolSize)
-? symbolSize

[incubator-echarts] 06/06: feat: line label animation on the first setOption

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

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

commit d5ea2e818b27561fb01bfd9a3ef823481471bbb6
Author: Ovilia 
AuthorDate: Tue Sep 8 16:47:13 2020 +0800

feat: line label animation on the first setOption
---
 src/chart/helper/createClipPathFromCoordSys.ts |  13 +-
 src/chart/line/LineSeries.ts   |  15 +-
 src/chart/line/LineView.ts | 251 -
 test/line-animation.html   |  22 ++-
 4 files changed, 250 insertions(+), 51 deletions(-)

diff --git a/src/chart/helper/createClipPathFromCoordSys.ts 
b/src/chart/helper/createClipPathFromCoordSys.ts
index 1eb778b..85695cc 100644
--- a/src/chart/helper/createClipPathFromCoordSys.ts
+++ b/src/chart/helper/createClipPathFromCoordSys.ts
@@ -63,12 +63,20 @@ function createGridClipPath(
 });
 
 if (hasAnimation) {
-const isHorizontal = cartesian.getBaseAxis().isHorizontal();
+const baseAxis = cartesian.getBaseAxis();
+const isHorizontal = baseAxis.isHorizontal();
+const isAxisInversed = baseAxis.inverse;
+
 if (isHorizontal) {
+if (isAxisInversed) {
+clipPath.shape.x += width;
+}
 clipPath.shape.width = 0;
 }
 else {
-clipPath.shape.y = y + height;
+if (!isAxisInversed) {
+clipPath.shape.y += height;
+}
 clipPath.shape.height = 0;
 }
 
@@ -82,6 +90,7 @@ function createGridClipPath(
 shape: {
 width: width,
 height: height,
+x: x,
 y: y
 }
 }, seriesModel, null, done, duringCb);
diff --git a/src/chart/line/LineSeries.ts b/src/chart/line/LineSeries.ts
index 432bf92..fef653d 100644
--- a/src/chart/line/LineSeries.ts
+++ b/src/chart/line/LineSeries.ts
@@ -57,6 +57,10 @@ export interface LineDataItemOption extends 
SymbolOptionMixin,
 value?: LineDataValue
 }
 
+interface LineEndLabelOption extends LabelOption {
+valueAnimation: boolean
+}
+
 
 export interface LineSeriesOption extends SeriesOption {
 clip: true,
 
 label: {
-position: 'top',
-showDuringLabel: false
+position: 'top'
+},
+
+endLabel: {
+show: false,
+valueAnimation: false
 },
 
 lineStyle: {
diff --git a/src/chart/line/LineView.ts b/src/chart/line/LineView.ts
index 556e602..becee79 100644
--- a/src/chart/line/LineView.ts
+++ b/src/chart/line/LineView.ts
@@ -26,6 +26,7 @@ import SymbolClz from '../helper/Symbol';
 import lineAnimationDiff from './lineAnimationDiff';
 import * as graphic from '../../util/graphic';
 import * as modelUtil from '../../util/model';
+import * as numberUtil from '../../util/number';
 import {ECPolyline, ECPolygon} from './poly';
 import ChartView from '../../view/Chart';
 import {prepareDataCoordInfo, getStackedOnPoint} from './helper';
@@ -37,7 +38,7 @@ import type ExtensionAPI from '../../ExtensionAPI';
 import Cartesian2D from '../../coord/cartesian/Cartesian2D';
 import Polar from '../../coord/polar/Polar';
 import type List from '../../data/List';
-import type { Payload, Dictionary, ColorString, ECElement, DisplayState, 
ComponentOption } from '../../util/types';
+import type {Payload, Dictionary, ColorString, ECElement, DisplayState} from 
'../../util/types';
 import type OrdinalScale from '../../scale/Ordinal';
 import type Axis2D from '../../coord/cartesian/Axis2D';
 import { CoordinateSystemClipArea } from '../../coord/CoordinateSystem';
@@ -45,10 +46,11 @@ import { setStatesStylesFromModel, setStatesFlag, 
enableHoverEmphasis } from '..
 import { getECData } from '../../util/ecData';
 import Displayable from 'zrender/src/graphic/Displayable';
 import {makeInner} from '../../util/model';
-import ComponentModel from '../../model/Component';
 
 const inner = makeInner<{
-defaultOption: ComponentOption
+lastSplitId: number,
+precision: number,
+isStopped: boolean
 }, graphic.Text>();
 
 type PolarArea = ReturnType;
@@ -337,23 +339,17 @@ function createLineClipPath(
 seriesModel: LineSeriesModel
 ) {
 if (coordSys.type === 'cartesian2d') {
-const labelModel = seriesModel.getModel('label');
-let showDuringLabel = labelModel.get('showDuringLabel');
-
-const done = showDuringLabel
-? () => {
-
-}
-: null;
+const endLabelModel = seriesModel.getModel('endLabel');
+let showDuringLabel = endLabelModel.get('show');
 
 const during = showDuringLabel
 ? (percent: number, clipRect: graphic.Rect) => {
-lineView._updateDuringLabel(percent, clipRect, lineView._data);
+lineView._endLabelOnDuring(percent, clipRect, li

[incubator-echarts] 04/06: WIP(line): line label animation

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

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

commit 84ce59fc72c61d0a39e599d00ba4843c22f161f2
Author: Ovilia 
AuthorDate: Fri Sep 4 11:01:19 2020 +0800

WIP(line): line label animation
---
 src/chart/helper/createClipPathFromCoordSys.ts | 20 --
 src/chart/line/LineSeries.ts   |  5 +-
 src/chart/line/LineView.ts | 92 --
 src/label/labelStyle.ts|  1 +
 4 files changed, 108 insertions(+), 10 deletions(-)

diff --git a/src/chart/helper/createClipPathFromCoordSys.ts 
b/src/chart/helper/createClipPathFromCoordSys.ts
index d0d21a7..1eb778b 100644
--- a/src/chart/helper/createClipPathFromCoordSys.ts
+++ b/src/chart/helper/createClipPathFromCoordSys.ts
@@ -31,7 +31,9 @@ type SeriesModelWithLineWidth = SeriesModel void,
+during?: (percent: number, clipRect: graphic.Rect) => void
 ) {
 const rect = cartesian.getArea();
 
@@ -69,13 +71,20 @@ function createGridClipPath(
 clipPath.shape.y = y + height;
 clipPath.shape.height = 0;
 }
+
+const duringCb = typeof during === 'function'
+? (percent: number) => {
+during(percent, clipPath);
+}
+: null;
+
 graphic.initProps(clipPath, {
 shape: {
 width: width,
 height: height,
 y: y
 }
-}, seriesModel);
+}, seriesModel, null, done, duringCb);
 }
 
 return clipPath;
@@ -112,6 +121,7 @@ function createPolarClipPath(
 else {
 clipPath.shape.r = r0;
 }
+
 graphic.initProps(clipPath, {
 shape: {
 endAngle: sectorArea.endAngle,
@@ -125,7 +135,9 @@ function createPolarClipPath(
 function createClipPath(
 coordSys: CoordinateSystem,
 hasAnimation: boolean,
-seriesModel: SeriesModelWithLineWidth
+seriesModel: SeriesModelWithLineWidth,
+done?: () => void,
+during?: (percent: number) => void
 ) {
 if (!coordSys) {
 return null;
@@ -134,7 +146,7 @@ function createClipPath(
 return createPolarClipPath(coordSys as Polar, hasAnimation, 
seriesModel);
 }
 else if (coordSys.type === 'cartesian2d') {
-return createGridClipPath(coordSys as Cartesian2D, hasAnimation, 
seriesModel);
+return createGridClipPath(coordSys as Cartesian2D, hasAnimation, 
seriesModel, done, during);
 }
 return null;
 }
diff --git a/src/chart/line/LineSeries.ts b/src/chart/line/LineSeries.ts
index 9715908..432bf92 100644
--- a/src/chart/line/LineSeries.ts
+++ b/src/chart/line/LineSeries.ts
@@ -82,7 +82,7 @@ export interface LineSeriesOption extends 
SeriesOption 
{
 clip: true,
 
 label: {
-position: 'top'
+position: 'top',
+showDuringLabel: false
 },
 
 lineStyle: {
diff --git a/src/chart/line/LineView.ts b/src/chart/line/LineView.ts
index 5d12887..556e602 100644
--- a/src/chart/line/LineView.ts
+++ b/src/chart/line/LineView.ts
@@ -37,14 +37,19 @@ import type ExtensionAPI from '../../ExtensionAPI';
 import Cartesian2D from '../../coord/cartesian/Cartesian2D';
 import Polar from '../../coord/polar/Polar';
 import type List from '../../data/List';
-import type { Payload, Dictionary, ColorString, ECElement, DisplayState } from 
'../../util/types';
+import type { Payload, Dictionary, ColorString, ECElement, DisplayState, 
ComponentOption } from '../../util/types';
 import type OrdinalScale from '../../scale/Ordinal';
 import type Axis2D from '../../coord/cartesian/Axis2D';
 import { CoordinateSystemClipArea } from '../../coord/CoordinateSystem';
 import { setStatesStylesFromModel, setStatesFlag, enableHoverEmphasis } from 
'../../util/states';
 import { getECData } from '../../util/ecData';
 import Displayable from 'zrender/src/graphic/Displayable';
+import {makeInner} from '../../util/model';
+import ComponentModel from '../../model/Component';
 
+const inner = makeInner<{
+defaultOption: ComponentOption
+}, graphic.Text>();
 
 type PolarArea = ReturnType;
 type Cartesian2DArea = ReturnType;
@@ -326,13 +331,29 @@ function canShowAllSymbolForCategory(
 }
 
 function createLineClipPath(
+lineView: LineView,
 coordSys: Cartesian2D | Polar,
 hasAnimation: boolean,
 seriesModel: LineSeriesModel
 ) {
 if (coordSys.type === 'cartesian2d') {
+const labelModel = seriesModel.getModel('label');
+let showDuringLabel = labelModel.get('showDuringLabel');
+
+const done = showDuringLabel
+? () => {
+
+}
+: null;
+
+const during = showDuringLabel
+? (percent: number, clipRect: graphic.Rect) => {
+lineView._updateDuringLabel(percent, 

[incubator-echarts] 01/06: feat: change default line init animation

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

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

commit 87d1d718c21973bf2a280c5361fe51ade9f62380
Author: Ovilia 
AuthorDate: Wed Sep 2 14:17:12 2020 +0800

feat: change default line init animation
---
 src/chart/line/LineView.ts | 84 ++
 src/util/types.ts  |  2 +-
 2 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/src/chart/line/LineView.ts b/src/chart/line/LineView.ts
index 2c77752..00425cc 100644
--- a/src/chart/line/LineView.ts
+++ b/src/chart/line/LineView.ts
@@ -43,6 +43,7 @@ import type Axis2D from '../../coord/cartesian/Axis2D';
 import { CoordinateSystemClipArea } from '../../coord/CoordinateSystem';
 import { setStatesStylesFromModel, setStatesFlag, enableHoverEmphasis } from 
'../../util/states';
 import { getECData } from '../../util/ecData';
+import Displayable from 'zrender/src/graphic/Displayable';
 
 
 type PolarArea = ReturnType;
@@ -460,6 +461,7 @@ class LineView extends ChartView {
 isIgnore: isIgnoreFunc,
 clipShape: clipShapeForSymbol
 });
+this._initAnimation(data, isCoordSysPolar, clipShapeForSymbol);
 
 if (step) {
 // TODO If stacked series is not step
@@ -748,6 +750,88 @@ class LineView extends ChartView {
 return polygon;
 }
 
+_initAnimation(
+data: List,
+isCoordSysPolar: boolean,
+clipShape: PolarArea | Cartesian2DArea
+) {
+const seriesModel = data.hostModel;
+let seriesDuration = seriesModel.get('animationDuration');
+if (typeof seriesDuration === 'function') {
+seriesDuration = seriesDuration(null);
+}
+let seriesDalay = seriesModel.get('animationDelay') || 0;
+if (typeof seriesDalay === 'function') {
+seriesDalay = seriesDalay(null);
+}
+
+data.eachItemGraphicEl(function (symbol, idx) {
+const el = (symbol as SymbolClz).childAt(0) as Displayable;
+if (el) {
+const symbolSize = data.getItemVisual(
+idx,
+'symbolSize'
+);
+const symbolSizeArr = zrUtil.isArray(symbolSize)
+? symbolSize : [symbolSize, symbolSize];
+const lineWidth = el.style.lineWidth;
+
+const total = isCoordSysPolar
+? 0
+: (clipShape as Cartesian2DArea).width;
+const start = isCoordSysPolar
+? 0
+: (clipShape as Cartesian2DArea).x;
+const delay = (
+total === 0
+? 0
+: seriesDuration / total * (symbol.x - start)
+) + seriesDalay;
+
+el.stopAnimation();
+
+el.attr({
+scaleX: 1,
+scaleY: 1,
+style: {
+lineWidth: 0
+}
+});
+el.animateTo({
+scaleX: symbolSizeArr[0] / 2,
+scaleY: symbolSizeArr[1] / 2,
+style: {
+lineWidth: lineWidth
+}
+}, {
+duration: 200,
+delay: delay
+});
+
+const text = el.getTextContent();
+const textOpacity = text.style.opacity == null ? 1 : 
text.style.opacity;
+if (text) {
+text.stopAnimation();
+text.attr({
+style: {
+opacity: 0
+}
+});
+text.animateTo({
+style: {
+opacity: textOpacity
+}
+}, {
+duration: 300,
+delay: delay
+});
+}
+
+(el as ECElement).disableLabelAnimation = true;
+}
+});
+}
+
 /**
  * @private
  */
diff --git a/src/util/types.ts b/src/util/types.ts
index 52b4906..b9e1b8d 100644
--- a/src/util/types.ts
+++ b/src/util/types.ts
@@ -695,7 +695,7 @@ export interface AnimationOptionMixin {
  * Delay of initialize animation
  * Can be a callback to specify duration of each element
  */
-animationDelay?: AnimationDelayCallback
+animationDelay?: number | AnimationDelayCallback
 // For update animation
 /**
  * Delay of data update animation.


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

[incubator-echarts] 02/06: feat(line)!: support both series and item delay with animationDelay callbacks

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

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

commit 6e2831e717b047f1d021f255775a96593e8e1107
Author: Ovilia 
AuthorDate: Wed Sep 2 15:09:40 2020 +0800

feat(line)!: support both series and item delay with animationDelay 
callbacks

BREAKING CHANGE: May not be compatible with 4.x.
Since default symbol animation with line charts has been changed in 5.0 to 
be
displayed when the clipPath of the line goes through the data point,
animationDelay callback now has two meanings:
animationDelay: function (i) { return ... }
(1) If `i` is `null`, the callback should return the delay of the overall
series animation, that is, the delay before the line clipPath starts
changing.
(2) If `i` is a `number`, the callback should return the delay of the 
certain
delay of each data item.
In ECharts 4.x, however, since the label animation shows along with the line
animation, only the `number` form is used.
---
 src/chart/line/LineView.ts |  25 +---
 test/line-animation.html   | 148 +++--
 2 files changed, 145 insertions(+), 28 deletions(-)

diff --git a/src/chart/line/LineView.ts b/src/chart/line/LineView.ts
index 00425cc..cdcc025 100644
--- a/src/chart/line/LineView.ts
+++ b/src/chart/line/LineView.ts
@@ -760,10 +760,10 @@ class LineView extends ChartView {
 if (typeof seriesDuration === 'function') {
 seriesDuration = seriesDuration(null);
 }
-let seriesDalay = seriesModel.get('animationDelay') || 0;
-if (typeof seriesDalay === 'function') {
-seriesDalay = seriesDalay(null);
-}
+const seriesDalay = seriesModel.get('animationDelay') || 0;
+const seriesDalayValue = typeof seriesDalay === 'function'
+? seriesDalay(null)
+: seriesDalay;
 
 data.eachItemGraphicEl(function (symbol, idx) {
 const el = (symbol as SymbolClz).childAt(0) as Displayable;
@@ -782,11 +782,18 @@ class LineView extends ChartView {
 const start = isCoordSysPolar
 ? 0
 : (clipShape as Cartesian2DArea).x;
-const delay = (
-total === 0
-? 0
-: seriesDuration / total * (symbol.x - start)
-) + seriesDalay;
+
+let delay;
+if (typeof seriesDalay === 'function') {
+delay = seriesDalay(idx);
+}
+else {
+delay = (
+total === 0
+? 0
+: seriesDuration / total * (symbol.x - start)
+) + seriesDalayValue;
+}
 
 el.stopAnimation();
 
diff --git a/test/line-animation.html b/test/line-animation.html
index 5934eef..66bb57e 100644
--- a/test/line-animation.html
+++ b/test/line-animation.html
@@ -32,7 +32,7 @@ under the License.
 
 
 
-h1 {
+h2 {
 line-height: 60px;
 height: 60px;
 background: #146402;
@@ -44,13 +44,139 @@ under the License.
 .chart {
 height: 500px;
 }
+#main0, #main1 {
+height: 300px;
+}
 button {
 font-size: 16px;
 }
 
 
+Default Label Animation
+
+
+
+Label Animation with animationDelay callback
+
+
+
+dataZoom Animation
 CHANGE
-
+
+
+
+
+
+
+var echarts;
+var chart;
+
+require([
+'echarts'
+], function (ec) {
+echarts = ec;
+chart = myChart = 
echarts.init(document.getElementById('main0'));
+
+var xData = [];
+var data = [];
+var value = 200;
+var positive = 1;
+for (let i = 0; i < 10; ++i) {
+xData.push(i + '');
+value = positive * Math.round(Math.random() * 50) + value;
+data.push(value);
+
+if (Math.random() > 0.7) {
+positive = -1 * positive;
+}
+}
+
+option = {
+title: {
+text: 'Default Line Animation',
+subtext: 'Symbol and text should sync with line 
clipPath'
+},
+xAxis: {
+data: xData
+},
+yAxis: {},
+series: [{
+type: 'line',
+data

[incubator-echarts-bot] branch master updated: feat: add "PR: awaiting doc" label if doc changed

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 721cb2e  feat: add "PR: awaiting doc" label if doc changed
721cb2e is described below

commit 721cb2eb6f32f109402d7295476bc0a7a2958c91
Author: Ovilia 
AuthorDate: Mon Aug 31 13:47:54 2020 +0800

feat: add "PR: awaiting doc" label if doc changed
---
 index.js| 28 +---
 src/text.js |  4 
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/index.js b/index.js
index 212df55..71e158e 100644
--- a/index.js
+++ b/index.js
@@ -91,14 +91,24 @@ module.exports = app => {
 app.on(['pull_request.opened'], async context => {
 // const auth = context.payload.pull_request.author_association;
 const isCore = 
isCoreCommitter(context.payload.pull_request.user.login);
-const comment = context.github.issues.createComment(context.issue({
-body: isCore ? text.PR_OPENED_BY_COMMITTER : text.PR_OPENED
-}));
+let commentText = isCore
+? text.PR_OPENED_BY_COMMITTER
+: text.PR_OPENED;
 
 const labelList = ['PR: awaiting review'];
 if (isCore) {
 labelList.push('PR: author is committer');
 }
+const content = context.payload.pull_request.body;
+if (content && content.indexOf('[-] The API has been changed.') > -1) {
+labelList.push('PR: awaiting doc');
+commentText += '\n\n' + text.PR_AWAITING_DOC;
+}
+
+const comment = context.github.issues.createComment(context.issue({
+body: commentText
+}));
+
 const addLabel = context.github.issues.addLabels(context.issue({
 labels: labelList
 }));
@@ -106,6 +116,18 @@ module.exports = app => {
 return Promise.all([comment, addLabel]);
 });
 
+app.on(['pull_request.edited'], async context => {
+const content = context.payload.pull_request.body;
+if (content && content.indexOf('[-] The API has been changed.') > -1) {
+return context.github.issues.addLabels(context.issue({
+labels: ['PR: awaiting doc']
+}));
+}
+else {
+return getRemoveLabel(context, 'PR: awaiting doc');
+}
+});
+
 app.on(['pull_request.synchronize'], async context => {
 const addLabel = context.github.issues.addLabels(context.issue({
 labels: ['PR: awaiting review']
diff --git a/src/text.js b/src/text.js
index 9d13778..8f0764b 100644
--- a/src/text.js
+++ b/src/text.js
@@ -54,6 +54,9 @@ const PR_OPENED_BY_COMMITTER = PR_OPENED + `
 
 The pull request is marked to be \`PR: author is committer\` because you are a 
committer of this project.`;
 
+const PR_AWAITING_DOC = `Document changes are required in this PR. Please also 
make a PR to 
[apache/incubator-echarts-doc](https://github.com/apache/incubator-echarts-doc) 
for document changes. When the doc PR is merged, the maintainers will remove 
the \`PR: awaiting doc\` label.
+`;
+
 const PR_MERGED =
 `Congratulations! Your PR has been merged. Thanks for your contribution! 
`;
 
@@ -86,6 +89,7 @@ module.exports = {
 PR_MERGED,
 PR_OPENED_BY_COMMITTER,
 PR_NOT_MERGED,
+PR_AWAITING_DOC,
 ISSUE_TAGGED_WAITING_AUTHOR,
 ISSUE_TAGGED_EASY,
 ISSUE_TAGGED_PRIORITY_HIGH


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



[incubator-echarts] branch dirty-rect updated (b0d9456 -> c03bbbb)

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

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


from b0d9456  refactor(dirty-rect): reuse window logic
 add c03  refactor(dirty-rect): merge conditions

No new revisions were added by this update.

Summary of changes:
 src/echarts.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


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



[incubator-echarts] branch dirty-rect updated (97b1473 -> b0d9456)

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

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


from 97b1473  test(dirty-rect): support dirty rect in test
 add b0d9456  refactor(dirty-rect): reuse window logic

No new revisions were added by this update.

Summary of changes:
 src/echarts.ts | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)


-
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: doc: hoverLayerThreshold is missing in en option

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

ovilia 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 006a101  doc: hoverLayerThreshold is missing in en option
006a101 is described below

commit 006a10147cb34fd0e1e4f6c6c86eb1ab03c6afd1
Author: Ovilia 
AuthorDate: Fri Aug 21 16:12:57 2020 +0800

doc: hoverLayerThreshold is missing in en option
---
 en/option/option.md | 8 
 1 file changed, 8 insertions(+)

diff --git a/en/option/option.md b/en/option/option.md
index f64ba3e..0b08908 100644
--- a/en/option/option.md
+++ b/en/option/option.md
@@ -84,6 +84,14 @@ The default is `'source-over'`. Support settings for each 
series.
 
 `'lighter'` is also a common type of compositing operation. In this mode, the 
area where the number of graphics is concentrated is superimposed into a 
high-brightness color (white). It often used to highlight the effect of the 
area. See example [Global airline](${galleryEditorPath}lines-airline)
 
+# hoverLayerThreshold(number) = 3000
+
+When the number of element of the whole chart is larger than 
`hoverLayerThreshold`, a seperate hover layer is used to render hovered 
elements.
+
+The seperate hover layer is used to avoid re-painting the whole canvas when 
hovering on elements. Instead, the hovered elements are rendered in a seperate 
layer so that other elements don't have to be rendered again.
+
+ECharts 2 use seperate layer for all cases. But it brings some problems like 
the hovered elements may not covering everything else correctly, or translucent 
elements may not overlay correctly to each other. And it brings extra member 
cost due to the extra canvas and may bring burden on mobile devices. So since 
ECharts 3, the hover layer is not used by default. Only when the element amount 
is large enough will the hover layer used.
+
 # useUTC(boolean) = false
 
 Whether to use UTC in display.


-
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: doc: hoverLayerThreshold is missing in en option

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

ovilia 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 006a101  doc: hoverLayerThreshold is missing in en option
006a101 is described below

commit 006a10147cb34fd0e1e4f6c6c86eb1ab03c6afd1
Author: Ovilia 
AuthorDate: Fri Aug 21 16:12:57 2020 +0800

doc: hoverLayerThreshold is missing in en option
---
 en/option/option.md | 8 
 1 file changed, 8 insertions(+)

diff --git a/en/option/option.md b/en/option/option.md
index f64ba3e..0b08908 100644
--- a/en/option/option.md
+++ b/en/option/option.md
@@ -84,6 +84,14 @@ The default is `'source-over'`. Support settings for each 
series.
 
 `'lighter'` is also a common type of compositing operation. In this mode, the 
area where the number of graphics is concentrated is superimposed into a 
high-brightness color (white). It often used to highlight the effect of the 
area. See example [Global airline](${galleryEditorPath}lines-airline)
 
+# hoverLayerThreshold(number) = 3000
+
+When the number of element of the whole chart is larger than 
`hoverLayerThreshold`, a seperate hover layer is used to render hovered 
elements.
+
+The seperate hover layer is used to avoid re-painting the whole canvas when 
hovering on elements. Instead, the hovered elements are rendered in a seperate 
layer so that other elements don't have to be rendered again.
+
+ECharts 2 use seperate layer for all cases. But it brings some problems like 
the hovered elements may not covering everything else correctly, or translucent 
elements may not overlay correctly to each other. And it brings extra member 
cost due to the extra canvas and may bring burden on mobile devices. So since 
ECharts 3, the hover layer is not used by default. Only when the element amount 
is large enough will the hover layer used.
+
 # useUTC(boolean) = false
 
 Whether to use UTC in display.


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



[incubator-echarts] branch dirty-rect created (now 97b1473)

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

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


  at 97b1473  test(dirty-rect): support dirty rect in test

This branch includes the following new commits:

 new 97b1473  test(dirty-rect): support dirty rect in test

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: test(dirty-rect): support dirty rect in test

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

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

commit 97b1473315f6f4dacc5b14fafce4b0a00f064722
Author: Ovilia 
AuthorDate: Fri Aug 21 14:50:03 2020 +0800

test(dirty-rect): support dirty rect in test

ZRender supporting dirty rect can be found at ecomfe/zrender#570
---
 src/echarts.ts | 15 ++-
 test/lib/caseFrame.css |  7 ++-
 test/lib/caseFrame.js  | 32 
 test/lib/config.js |  3 +++
 4 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/echarts.ts b/src/echarts.ts
index dbe4378..7eb2d37 100644
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@ -322,6 +322,7 @@ class ECharts extends Eventful {
 locale?: string | LocaleOption,
 renderer?: RendererType,
 devicePixelRatio?: number,
+useDirtyRect?: boolean,
 width?: number,
 height?: number
 }
@@ -344,11 +345,23 @@ class ECharts extends Eventful {
 ) as any).__ECHARTS__DEFAULT__RENDERER__ || defaultRenderer;
 }
 
+let defaultUseDirtyRect = false;
+if (__DEV__) {
+const devUseDirtyRect = ((
+typeof window === 'undefined' ? global : window
+) as any).__ECHARTS__DEFAULT__USE_DIRTY_RECT__;
+
+defaultUseDirtyRect = devUseDirtyRect == null
+? defaultUseDirtyRect
+: devUseDirtyRect;
+}
+
 const zr = this._zr = zrender.init(dom, {
 renderer: opts.renderer || defaultRenderer,
 devicePixelRatio: opts.devicePixelRatio,
 width: opts.width,
-height: opts.height
+height: opts.height,
+useDirtyRect: opts.useDirtyRect == null ? defaultUseDirtyRect : 
opts.useDirtyRect
 });
 
 // Expect 60 fps.
diff --git a/test/lib/caseFrame.css b/test/lib/caseFrame.css
index 11816b5..33442f9 100644
--- a/test/lib/caseFrame.css
+++ b/test/lib/caseFrame.css
@@ -35,7 +35,7 @@
 }
 .case-frame .cases-list ul {
 padding-left: 32px;
-margin-top: 130px;
+margin-top: 170px;
 list-style-type: decimal;
 }
 .case-frame .info-panel {
@@ -54,10 +54,7 @@
 text-decoration: underline;
 }
 .case-frame .info-panel .renderer-selector {
-height: 40px;
-line-height: 40px;
-}
-.case-frame .info-panel .dist-selector {
+margin: 10px;
 }
 .case-frame .info-panel .list-filter {
 margin: 10px 0;
diff --git a/test/lib/caseFrame.js b/test/lib/caseFrame.js
index 10b2b10..febc9d5 100644
--- a/test/lib/caseFrame.js
+++ b/test/lib/caseFrame.js
@@ -40,8 +40,15 @@
 '',
 '',
 '',
-' 
CANVAS ',
-' SVG ',
+'',
+'
CANVAS ',
+'',
+'   ',
+'CANVAS (dirty rect) ',
+'',
+'',
+'SVG 
',
+'',
 '',
 '',
 '',
@@ -107,13 +114,23 @@
 });
 
 rendererSelector.off('click').on('click', function (e) {
-setState('renderer', e.target.value);
+if (e.target.value === 'dirty-rect') {
+setState('renderer', 'canvas');
+setState('useDirtyRect', true);
+}
+else {
+setState('renderer', e.target.value);
+setState('useDirtyRect', false);
+}
 });
 
 var renderer = getState('renderer');
+var useDirtyRect = getState('useDirtyRect');
 
 rendererSelector.each(function (index, el) {
-el.checked = el.value === renderer;
+el.checked = el.value === 'dirty-rect'
+? useDirtyRect
+: el.value === renderer;
 });
 }
 
@@ -190,6 +207,11 @@
 var matchResult = (pageURL || 
'').match(/[?&]__RENDERER__=(canvas|svg)(&|$)/);
 return matchResult && matchResult[1] || 'canvas';
 },
+// true, false
+useDirtyRect: function (pageURL) {
+var matchResult = (pageURL || 
'').match(/[?&]__USE_DIRTY_RECT__=(true|false)(&|$)/);
+return matchResult && matchResult[1] === 'true';
+},
 // 'dist', 'webpack', 'webpackold'
 dist: function (pageURL) {
 var matchResult = (pageURL || 
'').match(/[?&]__ECDIST__=(webpack-req-ec|webpack-req-eclibec|webpackold-req-ec|webpackold-req-eclibec)(&|$)/);
@@ -223,6 +245,7 @@
 function setState(prop, value) {
 var curr = {
 renderer: getState('renderer'),
+useDirtyRect: getState('useDirtyRect'),
 dist: getState('dist'),
 pagePath: getState('pagePath'

[incubator-echarts-bot] branch master updated: fix: fix `isCoreCommitter` import bug and update a deprecated usage(edit -> update).

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 2f2ce15  fix: fix `isCoreCommitter` import bug and update a deprecated 
usage(edit -> update).
2f2ce15 is described below

commit 2f2ce155c0c77df6a8e774c37ab7c50758738fdf
Author: plainheart 
AuthorDate: Thu Aug 20 18:25:03 2020 +0800

fix: fix `isCoreCommitter` import bug and update a deprecated usage(edit -> 
update).
---
 index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index b3858c9..212df55 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,6 @@
 const Issue = require('./src/issue');
 const text = require('./src/text');
-const isCoreCommitter = require('./src/coreCommitters');
+const { isCoreCommitter } = require('./src/coreCommitters');
 
 module.exports = app => {
 app.on(['issues.opened'], async context => {
@@ -157,7 +157,7 @@ function getRemoveLabel(context, name) {
 }
 
 function closeIssue(context) {
-const closeIssue = context.github.issues.edit(context.issue({
+const closeIssue = context.github.issues.update(context.issue({
 state: 'closed'
 }));
 return closeIssue;


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



[incubator-echarts] branch master updated: doc: update readme

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

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


The following commit(s) were added to refs/heads/master by this push:
 new eb396f2  doc: update readme
eb396f2 is described below

commit eb396f27137af1d74b42b1b28752f204a34dbecf
Author: Wenli Zhang 
AuthorDate: Wed Aug 19 13:28:59 2020 +0800

doc: update readme
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7e772b7..e369f6b 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# ECharts
+# Apache ECharts (incubating)
 
 https://echarts.apache.org/;>
 
 
 
-ECharts is a free, powerful charting and visualization library offering an 
easy way of adding intuitive, interactive, and highly customizable charts to 
your commercial products. It is written in pure JavaScript and based on https://github.com/ecomfe/zrender;>zrender, which is a whole new 
lightweight canvas library.
+Apache ECharts (incubating) is a free, powerful charting and visualization 
library offering an easy way of adding intuitive, interactive, and highly 
customizable charts to your commercial products. It is written in pure 
JavaScript and based on https://github.com/ecomfe/zrender;>zrender, which is a whole new 
lightweight canvas library.
 
 Now ECharts is an incubator project of Apache Software Foundation.
 Please check its incubator status 
[here](http://incubator.apache.org/projects/echarts.html)
@@ -13,7 +13,7 @@ Please check its incubator status 
[here](http://incubator.apache.org/projects/ec
 
 [![Build 
Status](https://travis-ci.org/apache/incubator-echarts.svg?branch=master)](https://travis-ci.org/apache/incubator-echarts)
 
[![](https://img.shields.io/npm/dw/echarts.svg?label=npm%20downloads=flat)](https://www.npmjs.com/package/echarts)
 [![Last npm 
release](https://img.shields.io/npm/v/echarts)](https://www.npmjs.com/package/echarts)
 
-## Get ECharts
+## Get Apache ECharts (incubating)
 
 You may choose one of the following methods:
 


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



[incubator-echarts] branch fix-readme created (now e59dd8d)

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

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


  at e59dd8d  doc: update readme

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: fix(bar-race): fix nextValue when no text

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

ovilia 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 9da374e  fix(bar-race): fix nextValue when no text
9da374e is described below

commit 9da374e386013fcd87abd4227c2a5008a79b6a94
Author: Ovilia 
AuthorDate: Tue Aug 18 14:15:55 2020 +0800

fix(bar-race): fix nextValue when no text
---
 src/util/graphic.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/graphic.ts b/src/util/graphic.ts
index 9b6ad08..dbdd8d1 100644
--- a/src/util/graphic.ts
+++ b/src/util/graphic.ts
@@ -578,7 +578,7 @@ function animateOrSetLabel(
 host && (host.startValue = host.nextValue);
 
 const duration = animatableModel.get('animationDuration');
-if (!duration) {
+if (!duration && host) {
 // No animation for the first frame
 host.nextValue = interpolateValues;
 }


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



[incubator-echarts] branch next updated (1097a48 -> 0e882aa)

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

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


from 1097a48  fix: (1) expose `echarts.time` accurately. (2) supplement a 
test case of parseDate
 add 71255dd  fix(bar-race): fix bug with animation #12484
 add d155de1  fix(bar-race): move realtimeSort to series
 add 1dd87fd  fix(bar-race): stop rendered listener when dispose
 add 340c7f1  fix(bar-race): remove animator logic and fix type
 new 0e882aa  Merge pull request #13121 from apache/bar-race

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/BarSeries.ts   |   6 +-
 src/chart/bar/BarView.ts |  85 
 src/coord/cartesian/AxisModel.ts |   6 -
 src/util/graphic.ts  |   6 +
 test/bar-race.html   | 427 ---
 5 files changed, 189 insertions(+), 341 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 #13121 from apache/bar-race

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

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

commit 0e882aaebb8a23aa0fdb956341ae0b527ce219ec
Merge: 1097a48 340c7f1
Author: Wenli Zhang 
AuthorDate: Fri Aug 14 17:19:22 2020 +0800

Merge pull request #13121 from apache/bar-race

fix(bar-race): fix bug with animation

 src/chart/bar/BarSeries.ts   |   6 +-
 src/chart/bar/BarView.ts |  85 
 src/coord/cartesian/AxisModel.ts |   6 -
 src/util/graphic.ts  |   6 +
 test/bar-race.html   | 427 ---
 5 files changed, 189 insertions(+), 341 deletions(-)


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



[incubator-echarts-bot] branch master updated: fix: pull request is committer checking

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

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


The following commit(s) were added to refs/heads/master by this push:
 new a58c231  fix: pull request is committer checking
a58c231 is described below

commit a58c2318116c505577d40dcffb9b467a36955b05
Author: Ovilia 
AuthorDate: Fri Aug 14 13:19:57 2020 +0800

fix: pull request is committer checking
---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 542578d..b3858c9 100644
--- a/index.js
+++ b/index.js
@@ -90,7 +90,7 @@ module.exports = app => {
 
 app.on(['pull_request.opened'], async context => {
 // const auth = context.payload.pull_request.author_association;
-const isCore = isCoreCommitter(context.payload.issue.user.login);
+const isCore = 
isCoreCommitter(context.payload.pull_request.user.login);
 const comment = context.github.issues.createComment(context.issue({
 body: isCore ? text.PR_OPENED_BY_COMMITTER : text.PR_OPENED
 }));


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



[incubator-echarts] branch next updated (9ad5dff -> 64e1356)

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

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


from 9ad5dff  Merge pull request #13117 from apache/fix-typo
 add 5a57d0f  test: barBorderRadius renamed to be borderRadius
 add 64e1356  Merge branch 'next' of github.com:apache/incubator-echarts 
into next

No new revisions were added by this update.

Summary of changes:
 test/bar-background.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


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



[incubator-echarts] branch bar-race updated (1dd87fd -> 340c7f1)

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

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


from 1dd87fd  fix(bar-race): stop rendered listener when dispose
 add 340c7f1  fix(bar-race): remove animator logic and fix type

No new revisions were added by this update.

Summary of changes:
 src/chart/bar/BarView.ts | 22 +-
 1 file changed, 5 insertions(+), 17 deletions(-)


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



[incubator-echarts] branch bar-race updated (d155de1 -> 1dd87fd)

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

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


from d155de1  fix(bar-race): move realtimeSort to series
 add 1dd87fd  fix(bar-race): stop rendered listener when dispose

No new revisions were added by this update.

Summary of changes:
 src/chart/bar/BarView.ts | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)


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



[incubator-echarts] branch bar-race updated (71255dd -> d155de1)

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

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


from 71255dd  fix(bar-race): fix bug with animation #12484
 add d155de1  fix(bar-race): move realtimeSort to series

No new revisions were added by this update.

Summary of changes:
 src/chart/bar/BarSeries.ts   | 6 +-
 src/chart/bar/BarView.ts | 4 +---
 src/coord/cartesian/AxisModel.ts | 6 --
 test/bar-race.html   | 9 ++---
 4 files changed, 8 insertions(+), 17 deletions(-)


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



[incubator-echarts] 01/01: fix(bar-race): fix bug with animation #12484

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

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

commit 71255ddf50c34811668475d3c053d63e3b29c241
Author: Ovilia 
AuthorDate: Thu Aug 13 18:42:13 2020 +0800

fix(bar-race): fix bug with animation #12484
---
 src/chart/bar/BarView.ts |  57 ---
 src/util/graphic.ts  |   6 +
 test/bar-race.html   | 426 +++
 3 files changed, 176 insertions(+), 313 deletions(-)

diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts
index 4b29118..e0d5c25 100644
--- a/src/chart/bar/BarView.ts
+++ b/src/chart/bar/BarView.ts
@@ -112,6 +112,7 @@ class BarView extends ChartView {
 private _isLargeDraw: boolean;
 
 private _isFirstFrame: boolean; // First frame after series added
+private _onRendered: Function;
 
 private _backgroundGroup: Group;
 
@@ -127,6 +128,8 @@ class BarView extends ChartView {
 render(seriesModel: BarSeriesModel, ecModel: GlobalModel, api: 
ExtensionAPI, payload: Payload) {
 this._model = seriesModel;
 
+this.removeOnRenderedListener(api);
+
 this._updateDrawMode(seriesModel);
 
 const coordinateSystemType = seriesModel.get('coordinateSystem');
@@ -197,10 +200,30 @@ class BarView extends ChartView {
 const realtimeSort = axisSort && axis2DModel.get('realtimeSort');
 
 // If no data in the first frame, wait for data to initSort
-if (realtimeSort && this._isFirstFrame && data.count()) {
-this._initSort(data, isHorizontalOrRadial, baseAxis as Axis2D, 
api);
-this._isFirstFrame = false;
-return;
+if (realtimeSort && data.count()) {
+if (this._isFirstFrame) {
+this._initSort(data, isHorizontalOrRadial, baseAxis as Axis2D, 
api);
+
+this._isFirstFrame = false;
+return;
+}
+else {
+this._onRendered = () => {
+const orderMap = (idx: number) => {
+const el = (data.getItemGraphicEl(idx) as Rect);
+if (el) {
+const shape = el.shape;
+// If data is NaN, shape.xxx may be NaN, so use || 
0 here in case
+return (isHorizontalOrRadial ? shape.y + 
shape.height : shape.x + shape.width) || 0;
+}
+else {
+return 0;
+}
+};
+this._updateSort(data, orderMap, baseAxis as Axis2D, api);
+};
+api.getZr().on('rendered', this._onRendered as any);
+}
 }
 
 const needsClip = seriesModel.get('clip', true) || realtimeSort;
@@ -382,23 +405,6 @@ class BarView extends ChartView {
 this._backgroundEls = bgEls;
 
 this._data = data;
-
-if (lastAnimator) {
-lastAnimator.during(() => {
-const orderMap = (idx: number) => {
-const el = (data.getItemGraphicEl(idx) as Rect);
-if (el) {
-const shape = el.shape;
-// If data is NaN, shape.xxx may be NaN, so use || 0 
here in case
-return (isHorizontalOrRadial ? shape.y + shape.height 
: shape.x + shape.width) || 0;
-}
-else {
-return 0;
-}
-};
-that._updateSort(data, orderMap, baseAxis as Axis2D, api);
-});
-}
 }
 
 private _renderLarge(seriesModel: BarSeriesModel, ecModel: GlobalModel, 
api: ExtensionAPI): void {
@@ -499,6 +505,8 @@ class BarView extends ChartView {
  * as long as the order in the view doesn't change.
  */
 if (!oldOrder[i] || oldOrder[i].ordinalNumber !== 
newOrder[i].ordinalNumber) {
+this.removeOnRenderedListener(api);
+
 const action = {
 type: 'changeAxisOrder',
 componentType: baseAxis.dim + 'Axis',
@@ -534,6 +542,13 @@ class BarView extends ChartView {
 this._clear(this._model);
 }
 
+removeOnRenderedListener(api: ExtensionAPI) {
+if (this._onRendered) {
+api.getZr().off('rendered', this._onRendered as any);
+this._onRendered = null;
+}
+}
+
 private _clear(model?: SeriesModel): void {
 const group = this.group;
 const data = this._data;
diff --git a/src/util/graphic.ts b/src/util/graphic.ts
index 5ca3ee6..9b6ad08 100644
--- a/src/util/graphic.ts
+++ b/src/util/graphic.ts
@@ -577,6 +577,12 @@ function animateOrSetLabel(
 const host = text &&

[incubator-echarts] branch bar-race created (now 71255dd)

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

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


  at 71255dd  fix(bar-race): fix bug with animation #12484

This branch includes the following new commits:

 new 71255dd  fix(bar-race): fix bug with animation #12484

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-bot] branch master updated: update committers

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 0bb310e  update committers
0bb310e is described below

commit 0bb310ea9085dd391e2960bae7ad365e17ce9f39
Author: Ovilia 
AuthorDate: Thu Aug 6 11:00:18 2020 +0800

update committers
---
 index.js  | 8 +---
 src/coreCommitters.js | 7 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/index.js b/index.js
index 0563fc7..542578d 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,6 @@
 const Issue = require('./src/issue');
 const text = require('./src/text');
+const isCoreCommitter = require('./src/coreCommitters');
 
 module.exports = app => {
 app.on(['issues.opened'], async context => {
@@ -88,13 +89,14 @@ module.exports = app => {
 });
 
 app.on(['pull_request.opened'], async context => {
-const auth = context.payload.pull_request.author_association;
+// const auth = context.payload.pull_request.author_association;
+const isCore = isCoreCommitter(context.payload.issue.user.login);
 const comment = context.github.issues.createComment(context.issue({
-body: isCommitter(auth) ? text.PR_OPENED_BY_COMMITTER : 
text.PR_OPENED
+body: isCore ? text.PR_OPENED_BY_COMMITTER : text.PR_OPENED
 }));
 
 const labelList = ['PR: awaiting review'];
-if (isCommitter(auth)) {
+if (isCore) {
 labelList.push('PR: author is committer');
 }
 const addLabel = context.github.issues.addLabels(context.issue({
diff --git a/src/coreCommitters.js b/src/coreCommitters.js
index 7fb05cb..75dcc9a 100644
--- a/src/coreCommitters.js
+++ b/src/coreCommitters.js
@@ -3,11 +3,16 @@ const committers = [
 '100pah',
 'Ovilia',
 'deqingli',
+'Wdingding',
 'susiwen8',
 'cuijian-dexter',
 'SnailSword',
 'plainheart',
-'wf123537200'
+'wf123537200',
+'yufeng04',
+'chfw',
+'alex2wong',
+'ClemMakesApps'
 ];
 
 function getCoreCommitters() {


-
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: doc: add option and tutorial of bar-race

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

ovilia 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 f00cd12  doc: add option and tutorial of bar-race
f00cd12 is described below

commit f00cd1203b7605356994bc97fd531411dfe56fd4
Author: Ovilia 
AuthorDate: Wed Aug 5 17:47:28 2020 +0800

doc: add option and tutorial of bar-race
---
 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/style/mixin.scss  |  1 +
 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 +
 9 files changed, 102 insertions(+)

diff --git a/en/option/component/x-axis.md b/en/option/component/x-axis.md
index e9a49f0..615dfbd 100644
--- a/en/option/component/x-axis.md
+++ b/en/option/component/x-axis.md
@@ -32,6 +32,19 @@ The first x axis in grid defaults to be on the bottom of the 
grid, and the secon
 Offset of x axis relative to default position. Useful when multiple x axis has 
same [position](~xAxis.position) value.
 
 
+## realtimeSort = false
+
+`realtimeSort` is used to enable bar race if set to be `true`. It is only 
valid if the [type](~xAxis.type) of xAxis is `'value'`.
+
+It should be used along with other options to enable bar race. Please refer to 
[bar race](tutorial.html#Bar%20Race) tutorial for more details.
+
+## sortSeriesIndex = 0
+
+The index of series used to sort in bar race. Since only one series is 
supported in bar race, `sortSeriesIndex` should always be `0`. It is only valid 
if [realtimeSort](~xAxis.realtimeSort) is `true` and [type](~xAxis.type) is 
`'value'`.
+
+It should be used along with other options to enable bar race. Please refer to 
[bar race](tutorial.html#Bar%20Race) tutorial for more details.
+
+
 {{ use: axis-common(
 prefix='#',
 componentType='xAxis',
diff --git a/en/option/component/y-axis.md b/en/option/component/y-axis.md
index 529806b..88caf49 100644
--- a/en/option/component/y-axis.md
+++ b/en/option/component/y-axis.md
@@ -30,6 +30,20 @@ The first y axis in grid defaults to be the left (`'left'`)  
of the grid, and th
 
 Offset of y axis relative to default position. Useful when multiple y axis has 
same [position](~yAxis.position) value.
 
+
+## realtimeSort = false
+
+`realtimeSort` is used to enable bar race if set to be `true`. It is only 
valid if the [type](~yAxis.type) of yAxis is `'value'`.
+
+It should be used along with other options to enable bar race. Please refer to 
[bar race](tutorial.html#Bar%20Race) tutorial for more details.
+
+## sortSeriesIndex = 0
+
+The index of series used to sort in bar race. Since only one series is 
supported in bar race, `sortSeriesIndex` should always be `0`. It is only valid 
if [realtimeSort](~yAxis.realtimeSort) is `true` and [type](~yAxis.type) is 
`'value'`.
+
+It should be used along with other options to enable bar race. Please refer to 
[bar race](tutorial.html#Bar%20Race) tutorial for more details.
+
+
 {{ use: axis-common(
 prefix='#',
 componentType='yAxis',
diff --git a/en/tutorial/bar-race.md b/en/tutorial/bar-race.md
new file mode 100644
index 000..4e12bec
--- /dev/null
+++ b/en/tutorial/bar-race.md
@@ -0,0 +1,24 @@
+{{ target: bar-race }}
+
+# Bar Race
+
+Bar race is a chart that shows changes in the ranking of data over time and it 
is supported by default sinde ECharts 5.
+
+> Bar race charts usually use horizontal bars. If you want to use vertical 
bars, just take the X axis and Y axis in this tutorial to the opposite.
+
+1. Set `yAxis.realtimeSort` to be `true` to enable bar race
+2. Set `yAxis.inverse` to be `true` to display longer bars at top
+3. `yAxis.animationDuration` is suggested to be set to be `300` for bar 
reordering animation for the first time
+4. `yAxis.animationDurationUpdate` is suggested to be set to be `300` for bar 
reordering animation for later times
+5. Set `yAxis.max` to be *n - 1* where *n* is the number of bars to be 
displayed; otherwise, all bars are displayed
+6. `xAxis.max` is suggested to be set to be `'dataMax'` so that the maximum of 
data is used as X maximum.
+7. If realtime label changing is required, set `series.label.valueAnimation` 
to be `true`
+8. Set `animationDuration` to be `0` so that the first animation doesn't start 
from 0; if you wish otherwise, set it to be the same value as 
`animationDurationUpdate`
+9. `animationDurationUpdate` is suggested to be set to be `3000` for animation 
update duration, which should be the same as the frequency of calling 
`setOption`
+10. Call `setOption` to update data to be of next time with `setInterval` at 
the frequency of `animationDurationUpdate`
+
+A full exam

[incubator-echarts] branch fix-12591 updated (2dac208 -> 2fc1a85)

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

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


from 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 ac9c8f5  Merge pull request #12478 from apache/master
 add 0f9f38b  fix syntax error
 add a85a03d  Merge pull request #12494 from apache/fix-syntax
 add 4a91a73  fix(axis): fix typo in #12371
 add d7edf07  Merge pull request #12497 from apache/fix-12371
 add 582cd73  fix(bar): fix bar background incorrect on polar
 add 911bd4b  Merge pull request #12501 from apache/fix-polar-bar-background
 add 1360a8e  fix(geo): fix default name property when parsing GeoJSON
 add 043ff9e  Merge pull request #12500 from apache/fix-geo-name-property
 add ced2c23  release: 4.8.0
 add 167ee79  release: upgrade zrender dep.
 add a74ce97  fix: zrender version should be fixed.
 add 3b61add  Merge pull request #12574 from apache/release-dev
 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 wf123537200/feat-6811
 add ba82a40  tweak(graph): tweak apache#12590.
 add 4ffd864  Merge pull request #12891 from plainheart/tweak-12590
 add 45e74ea  Update TreeView.js
 add 491d30b  Merge pull request #12915 

[incubator-echarts-handbook] branch master updated (adf5471 -> 9cb168b)

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

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


from adf5471  chore: tweak style and update concepts/axis.md.
 new 24b3d8c  Create bar-race.md
 new 5ea3708  Create basic-bar.md
 new 9365bef  bar
 new 2b6d04c  Create stacked-bar.md
 new 6cd6ea8  Create area-line.md
 new f7d835e  Format Changed
 new e0cc051  Update basic-line.md
 new 9fbbd2d  Update basic-line.md
 new 2310696  Create basic-line.md
 new c82453b  Update basic-bar.md
 new 7583f52  Update area-line.md
 new b699723  Create step-line.md
 new 0739385  Create smooth-line.md & stacked-line.md
 new e96f121  Update basic-line.md
 new 268c6da  Update basic-line.md
 new 09afaf2  Update basic-pie.md
 new 3e6c7a2  Create basic-pie.md & rose.md
 new 02287d9  Create ring.md & correct the code
 new 3afbf3a  Create basic-scatter.md
 new 904662b  Update basic-pie.md
 new e409794  Create aria.md
 new acea580  Update Files
 new 17fa452  Create canvas-vs-svg.md
 new b2ce0db  Update basic-bar.md
 new 0050048  Create basic-bar.md
 new 8fabf84  Create bi-directional-bar.md
 new ecccb09  Update grouped-bar.md
 new 5417c0d  Update bi-directional-bar.md
 new afdf696  Create grouped-bar.md
 new c140b26  Create stacked-bar.md
 new 5b6c3ed  Create funnel.md
 new 0cb2ef4  Update gauger.md
 new 2937430  Create gauger.md
 new 18e83d1  Update area.md
 new dfce3bc  Create area.md
 new 604c1f7  Update basic-line.md
 new 23bb6ef  Create basic-line.md
 new 4de2d5c  Create stacked-area.md
 new 959d09f  Problem Fixed #2
 new 83eb6d4  Update radar.md
 new 28feb7e  Update radar.md
 new 10750da  Create radar.md
 new 9cb168b  Merge pull request #3 from Hansz00/master

The 79 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:
 .../en/application/chart-types/bar/bar-race.md |   4 +
 .../en/application/chart-types/bar/basic-bar.md| 165 +
 .../en/application/chart-types/bar/polar-bar.md|   2 +
 .../en/application/chart-types/bar/stacked-bar.md  |  30 
 .../application/chart-types/bar/visual-map.md  |   0
 .../application/chart-types/bar/waterfall.md   |   0
 .../en/application/chart-types/line/area-line.md   |  27 
 .../en/application/chart-types/line/basic-line.md  | 130 
 .../en/application/chart-types/line/smooth-line.md |  18 +++
 .../application/chart-types/line/stacked-line.md   |   6 +-
 .../en/application/chart-types/line/step-line.md   |  39 +
 .../en/application/chart-types/pie/basic-pie.md| 105 +
 contents/en/application/chart-types/pie/ring.md|  88 +++
 .../{zh => en}/application/chart-types/pie/rose.md |   6 +-
 .../chart-types/scatter/basic-scatter.md   | 117 +++
 contents/en/best-practice/aria.md  |  61 
 contents/en/best-practice/canvas-vs-svg.md |  53 +++
 .../chart-specificatio/bar/basic-bar.md|  41 +
 .../chart-specificatio/bar/bi-directional-bar.md   |  29 
 .../chart-specificatio/bar/grouped-bar.md  |  20 +++
 .../chart-specificatio/bar/stacked-bar.md  |  21 +++
 .../en/best-practice/chart-specificatio/funnel.md  |  36 +
 .../en/best-practice/chart-specificatio/gauger.md  |  17 +++
 .../best-practice/chart-specificatio/line/area.md  |  23 +++
 .../chart-specificatio/line/basic-line.md  |  36 +
 .../chart-specificatio/line/stacked-area.md|  45 ++
 .../en/best-practice/chart-specificatio/radar.md   |  29 
 contents/{zh => en}/best-practice/mobile.md|   0
 .../zh/application/chart-types/line/basic-line.md  |   4 +-
 .../zh/application/chart-types/pie/basic-pie.md|   2 +-
 contents/zh/application/chart-types/pie/ring.md|   5 +-
 .../chart-specificatio/bar/basic-bar.md|   2 +-
 .../chart-specificatio/bar/grouped-bar.md  |   2 +-
 .../zh/best-practice/chart-specificatio/gauger.md  |   1 -
 .../best-practice/chart-specificatio/line/area.md  |   2 +-
 .../chart-specificatio/line/basic-line.md  |   2 +-
 .../zh/best-practice/chart-specificatio/radar.md   |   2 +-
 37 files changed, 1151 insertions(+), 19 deletions(-)
 create mode 100755 contents/en/application/chart-types/bar/bar-race.md
 create mode 100755 contents/en/application/chart-types/bar/basic-bar.md
 create mode 100755 contents/en/application/chart-types/bar/polar-bar.md
 create mode 100755 contents/en/application/chart-types/bar/stacked-bar.md
 copy contents/{zh => en}/application/chart-types/bar/visual-ma

[incubator-echarts] branch fix-bar-race created (now 0372b4d)

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

ovilia pushed a change to branch fix-bar-race
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


  at 0372b4d  fix(bar-race): fix interpolation

This branch includes the following new commits:

 new 0372b4d  fix(bar-race): fix interpolation

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(bar-race): fix interpolation

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

ovilia pushed a commit to branch fix-bar-race
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git

commit 0372b4d00389f1157b092138a63fe3214c353bd3
Author: Ovilia 
AuthorDate: Fri Jul 31 22:18:43 2020 +0800

fix(bar-race): fix interpolation
---
 src/chart/bar/BarView.ts | 13 +++--
 src/util/graphic.ts  | 17 -
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts
index 0150d48..62907ea 100644
--- a/src/chart/bar/BarView.ts
+++ b/src/chart/bar/BarView.ts
@@ -144,8 +144,6 @@ class BarView extends ChartView {
 else if (__DEV__) {
 console.warn('Only cartesian2d and polar supported for bar.');
 }
-
-this._isFirstFrame = false;
 }
 
 incrementalPrepareRender(seriesModel: BarSeriesModel): void {
@@ -199,8 +197,11 @@ class BarView extends ChartView {
 const axisSort = coord.type === 'cartesian2d' && 
axis2DModel.get('sort')
 && axis2DModel.get('sortSeriesIndex') === seriesModel.seriesIndex;
 const realtimeSort = axisSort && axis2DModel.get('realtimeSort');
-if (realtimeSort && this._isFirstFrame) {
+
+// If no data in the first frame, wait for data to initSort
+if (realtimeSort && this._isFirstFrame && data.count()) {
 this._initSort(data, isHorizontalOrRadial, baseAxis as Axis2D, 
api);
+this._isFirstFrame = false;
 return;
 }
 
@@ -385,7 +386,7 @@ class BarView extends ChartView {
 this._data = data;
 
 if (lastAnimator) {
-lastAnimator.during(percent => {
+lastAnimator.during(() => {
 const orderMap = (idx: number) => {
 const el = (data.getItemGraphicEl(idx) as Rect);
 if (el) {
@@ -499,7 +500,7 @@ class BarView extends ChartView {
  * bars are both out of sight, we don't wish to trigger 
reorder action
  * as long as the order in the view doesn't change.
  */
-if (oldOrder[i].ordinalNumber !== newOrder[i].ordinalNumber) {
+if (!oldOrder[i] || oldOrder[i].ordinalNumber !== 
newOrder[i].ordinalNumber) {
 const action = {
 type: 'changeAxisOrder',
 componentType: baseAxis.dim + 'Axis',
@@ -525,7 +526,7 @@ class BarView extends ChartView {
 axisId: baseAxis.index,
 sortInfo: this._dataSort(
 data,
-idx => parseInt(data.get(isHorizontal ? 'y' : 'x', idx) as 
string, 10) || 0
+idx => parseFloat(data.get(isHorizontal ? 'y' : 'x', idx) as 
string) || 0
 )
 } as Payload;
 api.dispatchAction(action);
diff --git a/src/util/graphic.ts b/src/util/graphic.ts
index b456fb6..5ca3ee6 100644
--- a/src/util/graphic.ts
+++ b/src/util/graphic.ts
@@ -601,12 +601,19 @@ function animateOrSetLabel(
 interpolated[i] = (rawValues as [])[i];
 }
 else {
+/**
+ * startValues may be undefined if no data in last 
setOption but
+ * have data in this setOption. Use the data in this 
setOption
+ * as interpolated value.
+ */
 const startValues = host.startValue as number[];
-const value = interpolateNumber(
-startValues && startValues[i] ? startValues[i] : 0,
-(interpolateValues as number[])[i],
-percent
-);
+const value = startValues == null
+? (rawValues as [])[i]
+: interpolateNumber(
+startValues && startValues[i] ? startValues[i] 
: 0,
+(interpolateValues as number[])[i],
+percent
+);
 interpolated[i] = numberUtil.round(value), precision;
 }
 }


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



[incubator-echarts] branch fix-append-data created (now a798249)

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

ovilia pushed a change to branch fix-append-data
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


  at a798249  fix(appendData): wakeUp when appendData

This branch includes the following new commits:

 new a798249  fix(appendData): wakeUp when appendData

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(appendData): wakeUp when appendData

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

ovilia pushed a commit to branch fix-append-data
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git

commit a7982493b6ecee3306be42e32854084f13c348c1
Author: Ovilia 
AuthorDate: Fri Jul 31 17:38:00 2020 +0800

fix(appendData): wakeUp when appendData
---
 src/echarts.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/echarts.ts b/src/echarts.ts
index b69a478..645cd68 100644
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@ -1225,6 +1225,8 @@ class ECharts extends Eventful {
 // `appendData` meaningless.
 
 this._scheduler.unfinished = true;
+
+this.getZr().wakeUp();
 }
 
 


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



[incubator-echarts] branch feat-bar-race updated (7bb6f30 -> 50100c6)

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

ovilia pushed a change to branch feat-bar-race
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


from 7bb6f30  fix(bar-race): bar out of range going into view
 add fb97d91  Comment some code
 add 4b9b313  Merge pull request #13048 from susiwen8/simplify
 add 11e6626  fix type errors. styling tweak.
 add d9d27e2  fix(tooltip): optimize rich text display
 add e446e0a  fix(axis): optimize tick calculate in time axis
 add d001989  fix(axis): improve ticks calculation in time axis
 add fb5c77d  merge next
 add 50100c6  fix(bar-race): fix bar race with real example

No new revisions were added by this update.

Summary of changes:
 src/chart/bar/BarView.ts| 31 +++---
 src/component/tooltip/TooltipRichContent.ts |  1 +
 src/component/tooltip/TooltipView.ts| 96 +++--
 src/coord/axisCommonTypes.ts|  2 +-
 src/coord/axisDefault.ts|  1 -
 src/coord/axisHelper.ts |  7 ++-
 src/model/Series.ts |  2 +-
 src/scale/Time.ts   | 92 +++
 src/util/graphic.ts |  3 +-
 src/util/log.ts | 22 ++-
 src/util/time.ts|  6 +-
 src/util/types.ts   |  2 -
 test/bar-race.html  | 76 +++
 13 files changed, 223 insertions(+), 118 deletions(-)


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



[incubator-echarts] branch feat-bar-race updated (03fee21 -> 7bb6f30)

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

ovilia pushed a change to branch feat-bar-race
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


from 03fee21  fix(bar-race): fix label animation #12484
 add 2a909d9  fix(time): tooltip formatter for time axis #12859
 add 5170b52  Merge pull request #13039 from apache/time-formatter
 add 353fee9  fix(axis): fix axisType null pointer access bug.
 add 70fa023  fix(axis): fix axisType null pointer access bug.
 add ca10b34  fix(legend): fix logic issue caused null pointer access.
 add 9f53004  fix(axis): pass tick value to the formatter instead of object 
to avoid breaking change.
 add d395b4b  fix(util/number): the `parseDate` function can not parse a 
date string like `2020-07-29 09:2:5`.
 add b45a188  Merge pull request #13044 from plainheart/chore-fix
 add 41656cf  fix(time): fix time format precision in dataZoom label and 
tooltip
 add 6eca9ac  style(time): improve code style
 add 785c6e2  Feat: new default tooltip
 add 60c5897  Fix typo and change layout for tooltip content
 add c5fcc79  Remove chinese comments
 add 0bc34e4  tooltip new layout update
 add bcf3258  Find nearset series
 add 5232cad  tooltip arrow style and box shadow
 add 3ab2274  New tooltip for pie
 add ebadfd2  Tooltip margin
 add 4706928  Radar tooltip layout
 add 48dc408  save
 add 76c645b  Merge branch 'next' into tooltip
 add 11d3a50  tooltip unified function
 add 5f65d97  code simplification
 add 050ad8c  Sankey tooltip border
 add 29cad06  Set sankey item visual
 add 8809320  Find cartesian2d base axis
 add c5ae307  Add tooltip order value
 add 078f89f  Markline tooltip border color
 add dccaa3a  Map tooltip series name condition
 add 664386d  Tooltip border color works with gradient
 add 0a7b426  Merge branch 'next' into tooltip
 add 48fa1a7  Fix markpoint on stacked chart are incorrect
 add 05338c8  Encode html for markpoint
 add f2bfddf  Merge branch 'next' into tooltip
 add 00a7dac  Tweak typo
 add ecd7aac  Tooltip border work with stacked line chart
 add b53ca68  Tooltip arrow position
 add 9461341  Add test case
 add a0b2039  Remove useless return
 add bb80c7a  Change option value
 add 27428a9  Merge branch 'next' into tooltip
 add 93dc85f  Tooltip order works in Radar
 add 0899808  remove console
 add 3ddb125  Fix tooltip content is null or undefined, tooltip still show
 add f8bc64f  Fix tooltip was not centered
 add 732f0f2  Fix multiple chart margin was to small
 add b8a19a4  Partial correction base on CR
 add 8e1f581  Delete unused params for tooltip cb
 add f173743  Add default border color
 add ad1e885  test: new-tooltip.html style
 add 0132df7  Use data params coordinateSystem not first series
 add 666e775  Tooltip order
 add f295eca  Add test case for tooltip order
 add 4802ea2  Hold tooltip arrow
 add 3bd954e  Revert "Hold tooltip arrow"
 add 2888c74  Calc tooltip position when 'position' is 'top'
 add c202e85  Tooltip confine is true, don't show arrow
 add c988039  Correction
 add f6d321a  Remove unnecessary if statement
 add c2eaa34  Merge branch 'next' into tooltip
 add 23d44a8  Fix tooltip richtext and tooltip position
 add aa850c5  Fix tooltip rich text format
 add 805a9f7  Tooltip rich text border color
 add 96be2b7  Tooltip rich text white space
 add 747eaa3  Tooltip rich text alignment
 add 09f54fd  Tooltiop rich text left alignment
 add 587e3fc  Merge branch 'next' into tooltip
 add 67e0b98  Merge remote-tracking branch 'upstream/next' into tooltip
 add eeb81e0  Merge branch 'next' into tooltip
 add 7e7564b  Remove useless import
 add 0936253  Remove duplicate import
 add 65e04af  Add test case
 add 9425323  Revert type
 add 0a9d0bd  Correction base on CR
 add 05909e7  Tooltip style change
 add 4399d1f  Merge branch 'next' into tooltip
 add aee0b1a  Tooltip style
 add a04682b  Fix multi sub tooltip
 add abe451b  Merge branch 'next' into tooltip
 add 7abfd73  Merge remote-tracking branch 'upstream/next' into tooltip
 add d1cf86c  Merge branch 'tooltip' of 
https://github.com/susiwen8/incubator-echarts into tooltip
 add acc31ad  Merge remote-tracking branch 'upstream/next' into tooltip
 add 02bfd5a  Tooltip arrow box-shadow
 add 8662a79  Tooltip style
 add 275343f  Merge remote-tracking branch 'upstream/next' into tooltip
 add 1c8c057  test case
 add 3771d44  Fix tooltip 'fly' with arrow
 add 0fe7eed  Add condition for transition
 add 4ea092b  Arrow style
 add 95534a4  Merge pull request #12947 from susiwen8/tooltip
 add 4acb689  feat(axis): not show axisLine,axisTick for value axis if 
other is cateory or time.
 add 12e56f3  style: t

[incubator-echarts] branch next updated: feat(aria): add space for English separators (#13047)

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

ovilia 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 d86e591  feat(aria): add space for English separators (#13047)
d86e591 is described below

commit d86e5918608127479f634293b04730fd1392b299
Author: Hank <46049129+hans...@users.noreply.github.com>
AuthorDate: Thu Jul 30 10:31:37 2020 +0800

feat(aria): add space for English separators (#13047)
---
 src/langEN.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/langEN.ts b/src/langEN.ts
index 64ac81c..3dc01b6 100644
--- a/src/langEN.ts
+++ b/src/langEN.ts
@@ -134,8 +134,8 @@ export default {
 withName: 'the data for {name} is {value}',
 withoutName: '{value}',
 separator: {
-middle: ',',
-end: '.'
+middle: ', ',
+end: '. '
 }
 }
 }


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



[incubator-echarts] 01/01: fix(bar-race): fix label animation #12484

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

ovilia pushed a commit to branch feat-bar-race
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git

commit 03fee21840cffae72e214fd2188523857fd85ade
Author: Ovilia 
AuthorDate: Wed Jul 29 19:08:14 2020 +0800

fix(bar-race): fix label animation #12484
---
 src/action/changeAxisOrder.ts|   5 +
 src/chart/bar/BarView.ts | 322 +--
 src/component/axis/AxisBuilder.ts|   5 +-
 src/coord/Axis.ts|  10 +-
 src/coord/cartesian/defaultAxisExtentFromData.ts |   8 +-
 src/scale/Ordinal.ts |  33 ++-
 src/scale/Scale.ts   |   7 +
 src/util/graphic.ts  |  53 ++--
 8 files changed, 277 insertions(+), 166 deletions(-)

diff --git a/src/action/changeAxisOrder.ts b/src/action/changeAxisOrder.ts
index c270dae..dd74b7e 100644
--- a/src/action/changeAxisOrder.ts
+++ b/src/action/changeAxisOrder.ts
@@ -41,6 +41,11 @@ echarts.registerAction({
 ecModel.eachComponent(
 { mainType: componentType, query: payload },
 function (componentModel) {
+// console.log('in action')
+if (payload.sortInfo) {
+// console.log(payload.sortInfo);
+componentModel.axis.setCategorySortInfo(payload.sortInfo);
+}
 }
 );
 });
diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts
index a1d4d0d..90855b1 100644
--- a/src/chart/bar/BarView.ts
+++ b/src/chart/bar/BarView.ts
@@ -17,6 +17,10 @@
 * under the License.
 */
 
+import Path, {PathProps} from 'zrender/src/graphic/Path';
+import Group from 'zrender/src/graphic/Group';
+import {extend, map, defaults, each} from 'zrender/src/core/util';
+import type {RectLike} from 'zrender/src/core/BoundingRect';
 import {
 Rect,
 Sector,
@@ -29,8 +33,6 @@ import {
 import { getECData } from "../../util/ecData";
 import { enableHoverEmphasis, setStatesStylesFromModel } from 
'../../util/states';
 import { setLabelStyle, getLabelStatesModels } from '../../label/labelStyle';
-import Path, { PathProps } from 'zrender/src/graphic/Path';
-import Group from 'zrender/src/graphic/Group';
 import {throttle} from '../../util/throttle';
 import {createClipPath} from '../helper/createClipPathFromCoordSys';
 import Sausage from '../../util/shape/sausage';
@@ -45,20 +47,23 @@ import {
 OrdinalSortInfo,
 Payload,
 OrdinalNumber,
-ParsedValue
+ParsedValue,
+ECElement
 } from '../../util/types';
-import BarSeriesModel, { BarSeriesOption, BarDataItemOption } from 
'./BarSeries';
+import BarSeriesModel, {BarSeriesOption, BarDataItemOption} from './BarSeries';
 import type Axis2D from '../../coord/cartesian/Axis2D';
 import type Cartesian2D from '../../coord/cartesian/Cartesian2D';
-import type { RectLike } from 'zrender/src/core/BoundingRect';
 import type Model from '../../model/Model';
 import { isCoordinateSystemType } from '../../coord/CoordinateSystem';
 import { getDefaultLabel } from '../helper/labelHelper';
 import OrdinalScale from '../../scale/Ordinal';
 import AngleAxis from '../../coord/polar/AngleAxis';
 import RadiusAxis from '../../coord/polar/RadiusAxis';
-import { extend, map, defaults, each } from 'zrender/src/core/util';
 import SeriesModel from '../../model/Series';
+import {AngleAxisModel, RadiusAxisModel} from '../../coord/polar/AxisModel';
+import CartesianAxisModel from '../../coord/cartesian/AxisModel';
+import {LayoutRect} from '../../util/layout';
+import Animator from 'zrender/src/animation/Animator';
 
 const BAR_BORDER_WIDTH_QUERY = ['itemStyle', 'borderWidth'] as const;
 const BAR_BORDER_RADIUS_QUERY = ['itemStyle', 'borderRadius'] as const;
@@ -108,12 +113,19 @@ class BarView extends ChartView {
 
 private _isLargeDraw: boolean;
 
+private _isFirstFrame: boolean; // First frame after series added
+
 private _backgroundGroup: Group;
 
 private _backgroundEls: (Rect | Sector)[];
 
 private _model: BarSeriesModel;
 
+constructor () {
+super();
+this._isFirstFrame = true;
+}
+
 render(seriesModel: BarSeriesModel, ecModel: GlobalModel, api: 
ExtensionAPI, payload: Payload) {
 this._model = seriesModel;
 
@@ -132,6 +144,8 @@ class BarView extends ChartView {
 else if (__DEV__) {
 console.warn('Only cartesian2d and polar supported for bar.');
 }
+
+this._isFirstFrame = false;
 }
 
 incrementalPrepareRender(seriesModel: BarSeriesModel): void {
@@ -168,25 +182,27 @@ class BarView extends ChartView {
 
 const coord = seriesModel.coordinateSystem;
 const baseAxis = coord.getBaseAxis();
-let valueAxis: Axis2D | RadiusAxis | AngleAxis;
 let isHorizontalOrRadial: boolean;
 
+let lastAnimator: Animator = null;
+
 if (coord.type === 'c

[incubator-echarts] branch feat-bar-race created (now 03fee21)

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

ovilia pushed a change to branch feat-bar-race
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


  at 03fee21  fix(bar-race): fix label animation #12484

This branch includes the following new commits:

 new 03fee21  fix(bar-race): fix label animation #12484

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 (ee32d1e -> 5170b52)

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

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


from ee32d1e  fix(axis): fix category labels not shown after refacted time 
axis
 add 2a909d9  fix(time): tooltip formatter for time axis #12859
 new 5170b52  Merge pull request #13039 from apache/time-formatter

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/lang.ts|  4 ++--
 src/scale/Time.ts  | 26 +++---
 src/util/format.ts | 34 ++
 src/util/time.ts   | 22 --
 test/timeZone.html | 17 ++---
 5 files changed, 65 insertions(+), 38 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 #13039 from apache/time-formatter

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

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

commit 5170b52c04bc0fc5b31006ee79355e036e648822
Merge: ee32d1e 2a909d9
Author: Wenli Zhang 
AuthorDate: Wed Jul 29 14:04:57 2020 +0800

Merge pull request #13039 from apache/time-formatter

fix(time): tooltip formatter for time axis

 src/lang.ts|  4 ++--
 src/scale/Time.ts  | 26 +++---
 src/util/format.ts | 34 ++
 src/util/time.ts   | 22 --
 test/timeZone.html | 17 ++---
 5 files changed, 65 insertions(+), 38 deletions(-)


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



[incubator-echarts] branch time-formatter created (now 2a909d9)

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

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


  at 2a909d9  fix(time): tooltip formatter for time axis #12859

This branch includes the following new commits:

 new 2a909d9  fix(time): tooltip formatter for time axis #12859

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(time): tooltip formatter for time axis #12859

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

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

commit 2a909d9cfdf43714b1cfe90bd46cf48e6945ac79
Author: Ovilia 
AuthorDate: Wed Jul 29 13:46:54 2020 +0800

fix(time): tooltip formatter for time axis #12859
---
 src/lang.ts|  4 ++--
 src/scale/Time.ts  | 26 +++---
 src/util/format.ts | 34 ++
 src/util/time.ts   | 22 --
 test/timeZone.html | 17 ++---
 5 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/src/lang.ts b/src/lang.ts
index 2c94fef..42dc196 100644
--- a/src/lang.ts
+++ b/src/lang.ts
@@ -28,8 +28,8 @@ export default {
 '七月', '八月', '九月', '十月', '十一月', '十二月'
 ],
 monthAbbr: [
-'一', '二', '三', '四', '五', '六',
-'七', '八', '九', '十', '十一', '十二'
+'1月', '2月', '3月', '4月', '5月', '6月',
+'7月', '8月', '9月', '10月', '11月', '12月'
 ],
 dayOfWeek: [
 '星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'
diff --git a/src/scale/Time.ts b/src/scale/Time.ts
index 6f43e58..b7cd2aa 100644
--- a/src/scale/Time.ts
+++ b/src/scale/Time.ts
@@ -39,7 +39,6 @@
 // as its original time, without any time difference.
 
 import * as numberUtil from '../util/number';
-import * as formatUtil from '../util/format';
 import * as timeUtil from '../util/time';
 import * as scaleHelper from './helper';
 import IntervalScale from './Interval';
@@ -82,11 +81,8 @@ class TimeScale extends IntervalScale {
 _approxInterval: number;
 
 getLabel(tick: TimeScaleTick): string {
-const labelFormatType = timeUtil.getUnitFromValue(
-tick.value,
-this.getSetting('useUTC')
-);
-return formatUtil.formatTime(labelFormatType, tick.value);
+const useUTC = this.getSetting('useUTC');
+return timeUtil.format(tick.value, 
timeUtil.defaultLeveledFormatter.none, useUTC);
 }
 
 getFormattedLabel(
@@ -281,21 +277,15 @@ function getIntervalTicks(
 isUTC: boolean,
 extent: number[]
 ): TimeScaleTick[] {
+const safeLimit = 1;
 const utc = isUTC ? 'UTC' : '';
 const ticks: TimeScaleTick[] = [];
 const unitNames = timeUtil.timeUnits;
 let levelId = 0;
-for (let i = 0, hasTickInLevel = false; i < unitNames.length; ++i) {
+for (let i = 0, hasTickInLevel = false; i < unitNames.length && 
ticks.length < safeLimit; ++i) {
 let date = new Date(extent[0]) as any;
 
 if (unitNames[i] === 'week' || unitNames[i] === 'half-week') {
-const endDate = new Date(extent[1]) as any;
-if (date['get' + utc + 'FullYear']() === endDate['get' + utc + 
'FullYear']()
-&& date['get' + utc + 'Month']() === endDate['get' + utc + 
'Month']()
-) {
-continue;
-}
-
 date['set' + utc + 'Hours'](0);
 date['set' + utc + 'Minutes'](0);
 date['set' + utc + 'Seconds'](0);
@@ -310,8 +300,7 @@ function getIntervalTicks(
 }
 
 let isDateWithinExtent = true;
-let hasWeekData = false;
-while (isDateWithinExtent) {
+while (isDateWithinExtent && ticks.length < safeLimit) {
 const dates = approxInterval > ONE_DAY * 8 ? []
 : (approxInterval > ONE_DAY * 3.5 ? [8, 16, 24] : [4, 8, 
12, 16, 20, 24, 28]);
 for (let d = 0; d < dates.length; ++d) {
@@ -322,7 +311,6 @@ function getIntervalTicks(
 break;
 }
 else if (dateTime >= extent[0]) {
-hasWeekData = true;
 ticks.push({
 value: dateTime,
 level: levelId
@@ -339,7 +327,7 @@ function getIntervalTicks(
 )) {
 // Level value changes within extent
 let isFirst = true;
-while (true) {
+while (ticks.length < safeLimit) {
 switch (unitNames[i]) {
 case 'year':
 case 'half-year':
@@ -434,7 +422,7 @@ function getIntervalTicks(
 date['set' + utc + 'Milliseconds'](0);
 }
 else {
-date['set' + utc + 'MilliSeconds'](date['get' + 
utc + 'MilliSeconds']() + 100);
+date['set' + utc + 'Milliseconds'](date['get' + 
utc + 'Milliseconds']() + 100);
 }
 break;
 }
diff --git a/src/util/format.ts b/src/util/format.ts
index e9df40f..0becbef 100644
--- a/src/util/format.ts
+++ b/src/util/format.ts
@@ -19,6 +19,7 @@
 
 import * as zrUtil from 'zrender/src/core/util';
 import * as num

[incubator-echarts] branch time-formatter updated (f2d34e0 -> 2572fa7)

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

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


from f2d34e0  feat(time): update lang
 add 5809720  feat: add label manager for each series to layout label.
 add 2b8da72  feat: improve label layouting. displayed by priority(default 
to be size of area).
 add 8c467f2  Merge branch 'next' into label-enhancement
 add 9718d12  fix(label): respect the original ignore value when handling 
overlap
 add db8297b  feat(label): ignore style.x/y when x/y is given in labelLayout
 add 6f9f5af  Merge branch 'next' into label-enhancement
 add 7df0126  Merge branch 'next' into label-enhancement
 add 447c0a6  fix(progressive): fix task may not been executed in 
progressive rendering.
 add 7e84356  fix: avoid unexpected treeshaking.
 add 5239e3c  feat: using state for all user interactions.
 add 75a69b1  fix(pie): fix pie hover state
 add b631038  fix(label): fix emphasis position.
 add 8bf2072  enhance(pie): improve pie animation. #12553
 add c30f137  feat: add auto calculated label guide line.
 add e201982  fix(state): fix some state issues on pie.
 add 17eb9c0  feat(state): add stateAnimation in all series. use state in 
sunburst.
 add 4ae89c2  enhance(state): clearStates and restoreState in the 
renderSeries overall.
 add c94b745  fix: fix rotation origin in graph and tree. fix itemStyle in 
and level of sunbrst.
 add 0d467b1  fix: fix textContent z on hover.
 add e4c1308  fix: still compat barBorderRadius, barBorderColor
 add 6b86fff  fix: use highlighted and selected flag to determine if apply 
state.
 add 0bb61d0  fix: exclude default stroke when intersecting labels.
 add 601259d  fix: fix hover scale in graph and tree
 add ea1978b  fix: use fill instead of textFIll for text
 add 72c10a2  Merge branch 'next' into label-enhancement
 add bce7435  fix(bar): compat barBorderWidth
 add 7f53a78  Merge branch 'next' into label-enhancement
 add bda15a2  Merge branch 'next' into label-enhancement
 add 6fa462f  fix: compat barBorderXXX in backgroundStyle. rename 
barBorderRadius to borderRadius
 add 34e4cb0  feat: label and labelLine animation
 add 906e363  fix: compat barBorderXXX in backgroundStyle
 add 678b42d  fix: fix class error in ES6 built file
 add fba40c7  fix: fix not existed emphasis state caused error.
 add c11498d  refact: layout label after render in pie.
 add 4062b9f  feat: support state transition in geo component
 add 5accd25  feat(pie): improve the shape of label layout
 add d8b1f1c  feat: add minTurnAngle in labelLine
 add 86d6c25  feat: ignore labelLayout if it's not specified in option
 add fead688  feat(label): support overlap configuration in labelLayout
 add dae5a2b  feat: add labelLine for all series
 add c344d13  feat: add draggable in labelLayout
 add 6f57d74  fix(label): fix logic issues in setLabelLineStyle
 add 65f4fc4  feat: change label overlap configuration for supporting 
overlap layout
 add ca57e80  feat(label: add shift-x, shift-y option for moveOverlap in 
labelLayout
 add 0089d9b  feat(label): optimize label auto layout when aligned 
horizontally or vertically
 add 1c7a130  feat(label): rewrite the label shift algorithm in layout
 add a7310d8  feat(label): squeeze the labels then hide if there is no 
space.
 add 73f0a6b  fix(type): prefer rotate over rotation in label configuration
 add eb94696  fix(state): fix emphasis toggle too frequently caused color 
lift accumulation
 add 3a80a47  fix(toolbox): fix icon emphasis status not keep when selected.
 add 3f46e8a  fix(state): fix wrong emphasis lift color when animation is 
enabled
 add a2645c1  fix(state): forget to remove saved states in clearStates.
 add 9919c52  fix(state): use flag to determine which states to restore 
instead of simply save and restore
 add dd37d60  fix(state): fix last commit, still needs save, clear and 
restore states without animation.
 add e8605d0  fix(label): fix label animation with selected states.
 add 1dc916d  ts: update roamHelper
 add 9185991  fix(sunburst): fix sunburst animation
 add fdcc88d  fix(treemap): fix treemap label displayed text
 add 678a33b  fix(visualMap): fix error when target series not exists.
 add f3ed3fa  feat(label): use the new layout algorithm in pie
 add 27f2044  fix(label): fix wrong squeeze logic in label layout
 add f1dd46d  enhance(labelLine): optimize smooth in labelLine
 add 306779e  fix(labelLine): only set smooth when it's changed.
 add 804a99c  feat(pie): support overflow wrap
 add 7db0a9c  feat(label): enable darkMode
 add f40e0dd  feat(label): change label default color to black/white, 
'inherit' to set color same with element
 add 27c3cce  fix(labelLine): fix

[incubator-echarts] branch time-formatter updated (cca2853 -> f2d34e0)

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

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


from cca2853  feat(time): remove unnecessary code and update test cases
 add f2d34e0  feat(time): update lang

No new revisions were added by this update.

Summary of changes:
 src/lang.ts | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)


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



[incubator-echarts] branch time-formatter updated (a14c8cd -> cca2853)

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

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


from a14c8cd  feat(time): level formatters
 add 3bee422  feat(time): add half day and more
 add cca2853  feat(time): remove unnecessary code and update test cases

No new revisions were added by this update.

Summary of changes:
 src/export.ts |   2 +
 src/scale/Time.ts |  54 ++-
 src/util/format.ts|  23 +++-
 src/util/time.ts  |  75 +-
 test/timeScale-formatter.html | 123 +++---
 test/timeScale.html   |  16 --
 6 files changed, 192 insertions(+), 101 deletions(-)


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



[incubator-echarts] branch time-formatter updated (e0f0584 -> a14c8cd)

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

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


from e0f0584  feat(time): label style for different levels and units
 add 0466be2  feat(time): fix time axis extent
 add a14c8cd  feat(time): level formatters

No new revisions were added by this update.

Summary of changes:
 src/coord/axisDefault.ts  |  13 +-
 src/scale/Time.ts | 349 +-
 src/util/time.ts  |  90 +++
 test/timeScale-formatter.html | 253 ++
 test/timeScale.html   |  34 ++--
 5 files changed, 511 insertions(+), 228 deletions(-)
 create mode 100644 test/timeScale-formatter.html


-
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 (cb3235c -> 4c8aa89)

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

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


from cb3235c  fix data in sunburst/treemap example
 new 0f93871  feat: update bar description
 new 6436215  Merge branch 'master' of 
github.com:apache/incubator-echarts-doc
 new 4c8aa89  feat: add trademarks

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:
 en/tutorial/aria.md|  2 +-
 en/tutorial/basic-concepts-overview.md |  2 +-
 en/tutorial/custom-build.md|  2 +-
 en/tutorial/custom-series.md   |  4 +++-
 en/tutorial/data-zoom.md   |  2 +-
 en/tutorial/dataset.md |  2 +-
 en/tutorial/drag-example.md|  2 +-
 en/tutorial/dynamic-data.md| 14 +++---
 en/tutorial/echarts-feature.md |  2 +-
 en/tutorial/event.md   |  2 +-
 en/tutorial/getting-started.md |  2 +-
 en/tutorial/headless.md|  2 +-
 en/tutorial/media-query.md |  2 +-
 en/tutorial/npm-webpack.md |  2 +-
 en/tutorial/renderer.md|  2 +-
 en/tutorial/rich-text.md   |  2 +-
 en/tutorial/style-overview.md  |  2 +-
 en/tutorial/styling.md |  2 +-
 en/tutorial/visual-map.md  |  2 +-
 zh/option/series/bar.md|  4 ++--
 zh/tutorial/aria.md|  2 +-
 zh/tutorial/basic-concepts-overview.md |  2 +-
 zh/tutorial/calendar-example.md|  4 ++--
 zh/tutorial/custom-build.md|  2 +-
 zh/tutorial/custom-series.md   |  4 +++-
 zh/tutorial/data-zoom.md   |  2 +-
 zh/tutorial/dataset.md |  2 +-
 zh/tutorial/drag-example.md|  2 +-
 zh/tutorial/dynamic-data.md|  2 +-
 zh/tutorial/echarts-feature.md |  2 +-
 zh/tutorial/echarts-gl.md  |  2 +-
 zh/tutorial/event.md   |  2 +-
 zh/tutorial/getting-started.md |  2 +-
 zh/tutorial/headless.md|  2 +-
 zh/tutorial/media-query.md |  2 +-
 zh/tutorial/npm-webpack.md |  2 +-
 zh/tutorial/renderer.md|  2 +-
 zh/tutorial/rich-text.md   |  2 +-
 zh/tutorial/style-overview.md  |  2 +-
 zh/tutorial/styling.md |  2 +-
 zh/tutorial/sunburst-series.md |  2 +-
 zh/tutorial/visual-map.md  |  2 +-
 zh/tutorial/weixin-application.md  |  2 +-
 43 files changed, 55 insertions(+), 51 deletions(-)


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



[incubator-echarts-doc] 01/03: feat: update bar description

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

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

commit 0f9387155cb85d1c0b87eb2c331975af0e9c6724
Author: Ovilia 
AuthorDate: Thu Jul 16 16:00:54 2020 +0800

feat: update bar description
---
 zh/option/series/bar.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh/option/series/bar.md b/zh/option/series/bar.md
index c9c1b47..1644c1f 100644
--- a/zh/option/series/bar.md
+++ b/zh/option/series/bar.md
@@ -2,9 +2,9 @@
 
 # series.bar(Object)
 
-**柱状/条形图**
+**柱状图**
 
-柱状/条形图 通过 柱形的高度/条形的宽度 来表现数据的大小,用于有至少一个类目轴或时间轴的[直角坐标系](~grid)上。
+柱状图(或称条形图)是一种通过柱形的高度(横向的情况下则是宽度)来表现数据大小的一种常用图表类型。
 
 ## type(string) = 'bar'
 


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



[incubator-echarts-doc] 03/03: feat: add trademarks

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

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

commit 4c8aa89dce882cf6404ae9e78f28757907856f11
Author: Ovilia 
AuthorDate: Thu Jul 16 17:36:53 2020 +0800

feat: add trademarks
---
 en/tutorial/aria.md|  2 +-
 en/tutorial/basic-concepts-overview.md |  2 +-
 en/tutorial/custom-build.md|  2 +-
 en/tutorial/custom-series.md   |  4 +++-
 en/tutorial/data-zoom.md   |  2 +-
 en/tutorial/dataset.md |  2 +-
 en/tutorial/drag-example.md|  2 +-
 en/tutorial/dynamic-data.md| 14 +++---
 en/tutorial/echarts-feature.md |  2 +-
 en/tutorial/event.md   |  2 +-
 en/tutorial/getting-started.md |  2 +-
 en/tutorial/headless.md|  2 +-
 en/tutorial/media-query.md |  2 +-
 en/tutorial/npm-webpack.md |  2 +-
 en/tutorial/renderer.md|  2 +-
 en/tutorial/rich-text.md   |  2 +-
 en/tutorial/style-overview.md  |  2 +-
 en/tutorial/styling.md |  2 +-
 en/tutorial/visual-map.md  |  2 +-
 zh/tutorial/aria.md|  2 +-
 zh/tutorial/basic-concepts-overview.md |  2 +-
 zh/tutorial/calendar-example.md|  4 ++--
 zh/tutorial/custom-build.md|  2 +-
 zh/tutorial/custom-series.md   |  4 +++-
 zh/tutorial/data-zoom.md   |  2 +-
 zh/tutorial/dataset.md |  2 +-
 zh/tutorial/drag-example.md|  2 +-
 zh/tutorial/dynamic-data.md|  2 +-
 zh/tutorial/echarts-feature.md |  2 +-
 zh/tutorial/echarts-gl.md  |  2 +-
 zh/tutorial/event.md   |  2 +-
 zh/tutorial/getting-started.md |  2 +-
 zh/tutorial/headless.md|  2 +-
 zh/tutorial/media-query.md |  2 +-
 zh/tutorial/npm-webpack.md |  2 +-
 zh/tutorial/renderer.md|  2 +-
 zh/tutorial/rich-text.md   |  2 +-
 zh/tutorial/style-overview.md  |  2 +-
 zh/tutorial/styling.md |  2 +-
 zh/tutorial/sunburst-series.md |  2 +-
 zh/tutorial/visual-map.md  |  2 +-
 zh/tutorial/weixin-application.md  |  2 +-
 42 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/en/tutorial/aria.md b/en/tutorial/aria.md
index 11e1b70..f93e761 100644
--- a/en/tutorial/aria.md
+++ b/en/tutorial/aria.md
@@ -2,7 +2,7 @@
 
 # Supporting ARIA in Charts
 
-W3C defined the Accessible Rich Internet Applications Suite 
([WAI-ARIA](https://www.w3.org/WAI/intro/aria)) to make Web content and Web 
applications more accessible to the disabled. From ECharts 4.0, we support ARIA 
by generating description for charts automatically.
+W3C defined the Accessible Rich Internet Applications Suite 
([WAI-ARIA](https://www.w3.org/WAI/intro/aria)) to make Web content and Web 
applications more accessible to the disabled. From Apache ECharts 
(incubating)TM 4.0, we support ARIA by generating description for 
charts automatically.
 
 By default, ARIA is disabled. To enable it, you should set 
[aria.show](~aria.show) to be `true`. After enabling, it will generate 
descriptions based on charts, series, data, and so on. Users may change the 
generated description.
 
diff --git a/en/tutorial/basic-concepts-overview.md 
b/en/tutorial/basic-concepts-overview.md
index 09e6ee5..0dfec62 100644
--- a/en/tutorial/basic-concepts-overview.md
+++ b/en/tutorial/basic-concepts-overview.md
@@ -2,7 +2,7 @@
 
 # ECharts Basic Concepts Overview
 
-This chapter describes some of the common concepts and terms of echarts.
+This chapter describes some of the common concepts and terms of Apache ECharts 
(incubating)TM.
 
 
 ## ECharts instance
diff --git a/en/tutorial/custom-build.md b/en/tutorial/custom-build.md
index f85c6ca..a5cef7c 100644
--- a/en/tutorial/custom-build.md
+++ b/en/tutorial/custom-build.md
@@ -3,7 +3,7 @@
 
 # Create Custom Build of ECharts
 
-In most cases, ECharts builds can be get from  
[CDN](https://www.jsdelivr.com/package/npm/echarts) or from the `echarts/dist` 
directory in our [GitHub 
project](https://github.com/apache/incubator-echarts/releases), where
+In most cases, Apache ECharts (incubating)TM builds can be get from 
 [CDN](https://www.jsdelivr.com/package/npm/echarts) or from the `echarts/dist` 
directory in our [GitHub 
project](https://github.com/apache/incubator-echarts/releases), where
 these pre-builds are provided:
 
 + Complete verion: `echarts/dist/echarts.js`, including all charts and 
components (see `echarts/echarts.all.js` for detail), but has maximum file size.
diff --git a/en/tutorial/custom-series.md b/en/tutorial/custom-series.md
index 6032d6a..f1390d9 100644
--- a/en/tutorial/custom-series.md
+++ b/en/tutorial/custom-series.md
@@ -4,7 +4,9 @@
 
 [custom series](option.html#series-custom) is a type

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

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

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

commit 643621574cc88ee9ba14bb7f61dda77555fa3db4
Merge: 0f93871 cb3235c
Author: Ovilia 
AuthorDate: Thu Jul 16 16:01:05 2020 +0800

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

 asset/img/basic-concepts-overview/components.jpg |  Bin 71677 -> 71127 bytes
 build.js |   86 +-
 en/api/action.md |   39 +-
 en/api/echarts-instance.md   |   31 +-
 en/api/echarts.md|   14 +-
 en/api/events.md |   36 +-
 en/api/version.md|5 +
 en/changelog.md  |   44 +-
 en/coding-standard.md|6 +-
 en/option-gl/partial/shading.md  |2 +-
 en/option-gl/partial/temporal-super-sampling.md  |2 +-
 en/option/component/angle-axis.md|2 +-
 en/option/component/aria.md  |6 +-
 en/option/component/axis-common.md   |   26 +-
 en/option/component/axisPointer.md   |2 +-
 en/option/component/brush.md |   10 +-
 en/option/component/calendar.md  |2 +-
 en/option/component/data-zoom.md |   14 +-
 en/option/component/dataset.md   |2 +-
 en/option/component/geo-common.md|6 +-
 en/option/component/graphic.md   |4 +-
 en/option/component/legend.md|   20 +-
 en/option/component/radar.md |1 +
 en/option/component/toolbox.md   |   13 +-
 en/option/component/tooltip.md   |2 +-
 en/option/component/visual-map-continuous.md |4 +-
 en/option/component/visual-map-piecewise.md  |4 +-
 en/option/component/visual-map.md|   12 +-
 en/option/partial/1d-data.md |2 +-
 en/option/partial/2d-data.md |   14 +-
 en/option/partial/data-id-desc.md|2 +-
 en/option/partial/line-style.md  |2 +-
 en/option/partial/mark-line.md   |4 +-
 en/option/partial/mark-point.md  |6 +-
 en/option/partial/marker.md  |3 +-
 en/option/partial/parallel.md|2 +-
 en/option/partial/symbol.md  |   14 +-
 en/option/partial/text-style.md  |8 +-
 en/option/partial/tooltip-common.md  |2 +-
 en/option/partial/version.md |4 +-
 en/option/partial/zr-graphic.md  |4 +-
 en/option/series/bar.md  |   13 +-
 en/option/series/boxplot.md  |3 +-
 en/option/series/candlestick.md  |9 +-
 en/option/series/custom.md   |8 +-
 en/option/series/effectScatter.md|   10 +-
 en/option/series/funnel.md   |3 +-
 en/option/series/gauge.md|9 +-
 en/option/series/graph.md|   15 +-
 en/option/series/heatmap.md  |3 +-
 en/option/series/line.md |6 +-
 en/option/series/lines.md|3 +-
 en/option/series/map.md  |7 +-
 en/option/series/pictorialBar.md |   11 +-
 en/option/series/pie.md  |   10 +-
 en/option/series/radar.md|1 +
 en/option/series/sankey.md   |   26 +-
 en/option/series/scatter.md  |5 +-
 en/option/series/sunburst.md |2 +-
 en/option/series/themeRiver.md   |2 +
 en/option/series/tree.md |   10 +-
 en/option/series/treemap.md  |6 +-
 en/tutorial/custom-build.md  |6 +-
 en/tutorial/custom-series.md |   28 +-
 en/tutorial/data-zoom.md |9 +-
 en/tutorial/dataset.md   |  111 +-
 en/tutorial/drag-example.md  |   11 +-
 en/tutorial/getting-started.md   |4 +-
 en/tutorial/media-query.md   |   19 +-
 en/tutorial/npm-webpack.md   |2 +-
 en/tutorial/renderer.md  |6 +-
 en/tutorial/rich-text.md |   53 +-
 en/tutorial/style-overview.md|6 +-
 en/tutorial/styling.md   |2 +-
 en/tutorial/visual-map.md|   19 +-
 package-lock.json| 5095 --
 package.j

[incubator-echarts] branch master updated: fix: fix email link in README.

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 08f2033  fix: fix email link in README.
08f2033 is described below

commit 08f2033bb0d7a6f91557d2eb368e32cc5ba75fab
Author: Zhongxiang.Wang 
AuthorDate: Wed Jul 15 20:25:17 2020 +0800

fix: fix email link in README.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b22abb4..7e772b7 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ You may choose one of the following methods:
 ## Get Help
 
 + [GitHub Issues](https://github.com/apache/incubator-echarts/issues) for bug 
report and feature requests
-+ Email [d...@echarts.apache.org](d...@echarts.apache.org) for general 
questions
++ Email [d...@echarts.apache.org](mailto:d...@echarts.apache.org) for general 
questions
 + Subscribe [mailing list](https://echarts.apache.org/en/maillist.html) to get 
updated with the project
 
 ## Build


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



[incubator-echarts] branch time-formatter updated (7f0f8bb -> e0f0584)

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

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


from 7f0f8bb  fix(time): eliminate labels that are not nice
 add 9a80b83  feat(time): include level information in time axis
 add eceee1b  core(ci): only run unit test on master or release branch
 add 6a9f86f  Merge pull request #12848 from apache/ci
 add 55794d0  ci: run on pr opened or synchronized
 add d0e5f43  feat: custom series compat.
 add b65758c  Merge branch 'next' into custom-series-enhance
 add eab38da  Merge branch 'next' into custom-series-enhance
 add 88c51a0  fix: fix custom series api.size in polor.
 add c56e2dc  feature: add duration animation for custom series.
 add 1309317  feature: support text animation on custom series (via in 
`during`)
 add a631dba  feature: support axis label/tick animation on polar radius 
axis, the same as cartesian axis.
 add d0315f2  chore: tweak and make better example for tutorial.
 add 389d643  Merge branch 'next' into custom-series-enhance
 add 1dffebc  feature: support clipPath and clipPath animation in custom 
series.
 add dfad53d  feature: enable "enterFrom" "leaveTo" "transition" animation 
setting in custom series.
 add 2f5de49  test: add test case for clip init.
 add 6c227d3  feature: custom series during callback params re-design.
 add 3a6ffe9  fix: fix custom series merge children strategy (force no 
empty children even thought merging children).
 add 1ee9379  test: add case for color transition in custom series.
 add d0e83c2  fix: little modify in during api: add return this to setter 
and change name from "setAttr" to "setTransform".
 add f42f395  Merge branch 'next' into custom-series-enhance
 add a7d4f69  clean code
 add 9963aa4  Merge pull request #12775 from apache/custom-series-enhance
 add 3376031  fix: the first param of stopAnimation became "scope".
 add c3329e4  fix: rename $transition $enterFrom $leaveTo => transition 
enterFrom leaveTo.
 add 4d76f23  feature: custom series, add "extra" in el options for users 
to config their own properties for animation.
 add 5a6ccc8  fix: fix during call and enhance test cases.
 add a10659c  fix: fix text example.
 add 196935f  Merge branch 'custom-series-enhance' into next
 add 64f2f00  Merge branch 'next' into time-formatter
 add 5da563e  refactor(time): rename variables
 add e0f0584  feat(time): label style for different levels and units

No new revisions were added by this update.

Summary of changes:
 .github/workflows/nodejs.yml   |   12 +-
 src/chart/custom.ts| 1827 
 src/chart/helper/Symbol.ts |2 +-
 src/chart/line/LineView.ts |2 +-
 src/chart/pie/PieView.ts   |8 +-
 src/component/axis/RadiusAxisView.ts   |   11 +-
 src/component/axisPointer/viewHelper.ts|   10 +-
 src/component/dataZoom/SliderZoomView.ts   |4 +-
 src/component/timeline/SliderTimelineView.ts   |   18 +-
 src/component/visualMap/PiecewiseModel.ts  |2 +-
 src/coord/Axis.ts  |8 +-
 src/coord/CoordinateSystem.ts  |3 +
 src/coord/axisCommonTypes.ts   |   22 +-
 src/coord/axisDefault.ts   |2 +-
 src/coord/axisHelper.ts|   48 +-
 src/coord/axisTickLabelBuilder.ts  |   13 +-
 src/coord/polar/prepareCustom.ts   |1 +
 src/echarts.ts |6 +-
 src/export.ts  |1 +
 src/lang.ts|   16 +
 src/langEN.ts  |   16 +
 src/model/Component.ts |5 +
 src/model/mixin/itemStyle.ts   |2 +-
 src/scale/Interval.ts  |   39 +-
 src/scale/Log.ts   |   11 +-
 src/scale/Ordinal.ts   |   12 +-
 src/scale/Scale.ts |6 +-
 src/scale/Time.ts  |  271 ++-
 src/util/format.ts |2 +-
 src/util/graphic.ts|  111 +-
 src/util/styleCompat.ts|  256 +++
 src/util/time.ts   |  203 +++
 src/util/types.ts  |   19 +
 ...-d3.html => circle-packing-with-d3.compat.html} |0
 test/circle-packing-with-d3.html   |   50 +-
 test/custom-feature.html   |  130 +-
 t

[incubator-echarts-doc] branch 4.9.0 updated: doc: add auto curveness apache/incubator-echarts#12590

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

ovilia 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 93088ed  doc: add auto curveness apache/incubator-echarts#12590
93088ed is described below

commit 93088ed326f195f4126c7110367fb107d43e3309
Author: zakwu <123537...@qq.com>
AuthorDate: Thu Jul 9 09:55:34 2020 +0800

doc: add auto curveness apache/incubator-echarts#12590
---
 en/option/series/graph.md |  9 +
 zh/option/series/graph.md | 10 ++
 2 files changed, 19 insertions(+)

diff --git a/en/option/series/graph.md b/en/option/series/graph.md
index 389da59..05effc0 100644
--- a/en/option/series/graph.md
+++ b/en/option/series/graph.md
@@ -213,6 +213,15 @@ The label style of node in this category.
  label(Object)
 {{ use:partial-label(prefix="") }}
 
+## autoCurveness(number|Array) = 20
+
+For the situation where there are multiple links between nodes, the curveness 
of each link is automatically calculated.
+
+When set to `number`, it indicates the length of the edge curvenness array 
between two nodes, and the calculation result is given by the internal 
algorithm.
+
+When set to `Array`, it means that the curveness array is directly specified, 
and the multilateral curveness is directly selected from the array.
+
+**Notice:** if [lineStyle.curveness](~series-graph.lineStyle.curveness) has 
been set, this property is invalid.
 
 
 ## data(Array)
diff --git a/zh/option/series/graph.md b/zh/option/series/graph.md
index 3eacedb..058dde3 100644
--- a/zh/option/series/graph.md
+++ b/zh/option/series/graph.md
@@ -261,6 +261,16 @@ edgeSymbol: ['circle', 'arrow']
 {{ use:partial-label(prefix="") }}
 
 
+## autoCurveness(number|Array) = 20
+
+针对节点之间存在多边的情况,自动计算各边曲率。
+
+设置为 `number` 时,表示两点间边曲率数组的长度,由内部算法给出计算结果。
+
+设置为 `Array` 时,表示直接指定曲率数组,多边曲率会从数组中直接按顺序选取。
+
+**注意:** 如果设置 [lineStyle.curveness](~series-graph.lineStyle.curveness) 则此属性失效。
+
 ## data(Array)
 
 关系图的节点数据列表。


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



[incubator-echarts] branch master updated: feat(bot): added .gitattributes file to exclude files needed to ignore for pull-request-size bot.

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

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


The following commit(s) were added to refs/heads/master by this push:
 new b4b4b8b  feat(bot): added .gitattributes file to exclude files needed 
to ignore for pull-request-size bot.
b4b4b8b is described below

commit b4b4b8bf620fda8ee97a226192f304d7a3e02777
Author: plainheart 
AuthorDate: Tue Jul 7 16:36:23 2020 +0800

feat(bot): added .gitattributes file to exclude files needed to ignore for 
pull-request-size bot.
---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..f6dbe3a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+# for pull request size bot
+# excludes all files from test directory
+test/** linguist-generated=true


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



[incubator-echarts] branch time-formatter updated (e44445d -> 7f0f8bb)

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

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


from e5d  feat(time): improve time axis formatter
 add 6c6917d  WIP
 add 7f0f8bb  fix(time): eliminate labels that are not nice

No new revisions were added by this update.

Summary of changes:
 src/coord/axisDefault.ts |  9 ++---
 src/scale/Time.ts| 10 +++---
 src/util/format.ts   |  2 +-
 test/timeScale.html  |  9 +
 4 files changed, 19 insertions(+), 11 deletions(-)


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



[incubator-echarts] branch time-formatter created (now e44445d)

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

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


  at e5d  feat(time): improve time axis formatter

This branch includes the following new commits:

 new e5d  feat(time): improve time axis formatter

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: feat(time): improve time axis formatter

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

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

commit e5dac2f0efee032d674ee0648d14d31a397e
Author: Ovilia 
AuthorDate: Wed Jun 24 17:42:41 2020 +0800

feat(time): improve time axis formatter
---
 src/coord/axisDefault.ts |   4 +-
 src/scale/Time.ts| 304 ++-
 src/util/format.ts   |  23 +++-
 3 files changed, 319 insertions(+), 12 deletions(-)

diff --git a/src/coord/axisDefault.ts b/src/coord/axisDefault.ts
index 3777855..770b30a 100644
--- a/src/coord/axisDefault.ts
+++ b/src/coord/axisDefault.ts
@@ -163,8 +163,8 @@ const valueAxis: AxisBaseOption = zrUtil.merge({
 
 const timeAxis: AxisBaseOption = zrUtil.defaults({
 scale: true,
-min: 'dataMin',
-max: 'dataMax'
+// min: 'dataMin',
+// max: 'dataMax'
 }, valueAxis);
 
 const logAxis: AxisBaseOption = zrUtil.defaults({
diff --git a/src/scale/Time.ts b/src/scale/Time.ts
index f2f5734..987a9dd 100644
--- a/src/scale/Time.ts
+++ b/src/scale/Time.ts
@@ -82,9 +82,63 @@ class TimeScale extends IntervalScale {
 getLabel(val: number): string {
 const stepLvl = this._stepLvl;
 
-const date = new Date(val);
+const labelFormatType = getLabelFormatType(val, 
this.getSetting('useUTC'), false);
+return formatUtil.formatTime(labelFormatType, val);
+}
+
+/**
+ * @override
+ * @param expandToNicedExtent Whether expand the ticks to niced extent.
+ */
+getTicks(expandToNicedExtent?: boolean): number[] {
+const interval = this._interval;
+const extent = this._extent;
+const niceTickExtent = this._niceExtent;
+
+let ticks = [] as number[];
+// If interval is 0, return [];
+if (!interval) {
+return ticks;
+}
+
+const safeLimit = 1;
 
-return formatUtil.formatTime(stepLvl[0], date, 
this.getSetting('useUTC'));
+if (extent[0] < niceTickExtent[0]) {
+if (expandToNicedExtent) {
+ticks.push(numberUtil.round(niceTickExtent[0] - interval, 0));
+}
+else {
+ticks.push(extent[0]);
+}
+}
+
+const useUTC = this.getSetting('useUTC');
+
+const scaleLevelsLen = primaryScaleLevels.length;
+const idx = bisect(primaryScaleLevels, this._interval, 0, 
scaleLevelsLen);
+const level = primaryScaleLevels[Math.min(idx, scaleLevelsLen - 1)];
+
+const innerTicks = getLevelTicks(
+level[0] as TimeAxisLabelPrimaryLevel,
+useUTC,
+extent
+);
+console.log(innerTicks);
+ticks = ticks.concat(innerTicks);
+
+// Consider this case: the last item of ticks is smaller
+// than niceTickExtent[1] and niceTickExtent[1] === extent[1].
+const lastNiceTick = ticks.length ? ticks[ticks.length - 1] : 
niceTickExtent[1];
+if (extent[1] > lastNiceTick) {
+if (expandToNicedExtent) {
+ticks.push(numberUtil.round(lastNiceTick + interval, 0));
+}
+else {
+ticks.push(extent[1]);
+}
+}
+
+return ticks;
 }
 
 niceExtent(
@@ -115,11 +169,13 @@ class TimeScale extends IntervalScale {
 // let extent = this._extent;
 const interval = this._interval;
 
+const timezoneOffset = this.getSetting('useUTC')
+? 0 : (new Date(+extent[0] || +extent[1])).getTimezoneOffset() * 
60 * 1000;
 if (!opt.fixMin) {
-extent[0] = numberUtil.round(mathFloor(extent[0] / interval) * 
interval);
+extent[0] = numberUtil.round(mathFloor((extent[0] - 
timezoneOffset) / interval) * interval) + timezoneOffset;
 }
 if (!opt.fixMax) {
-extent[1] = numberUtil.round(mathCeil(extent[1] / interval) * 
interval);
+extent[1] = numberUtil.round(mathCeil((extent[1] - timezoneOffset) 
/ interval) * interval) + timezoneOffset;
 }
 }
 
@@ -233,6 +289,246 @@ const scaleLevels = [
 ['year', ONE_DAY * 380]// 1Y
 ] as [string, number][];
 
+const primaryScaleLevels = [
+// Format  interval
+['second', ONE_SECOND],  // 1s
+['minute', ONE_MINUTE],  // 1m
+['hour', ONE_HOUR],// 1h
+['day', ONE_DAY],  // 1d
+['week', ONE_DAY * 7], // 7d
+['month', ONE_DAY * 31],   // 1M
+['year', ONE_DAY * 380]// 1Y
+] as [string, number][];
+
+
+type TimeAxisLabelPrimaryLevel = 'millisecond'
+| 'second' | 'minute' | 'hour'
+| 'day' | 'month' | 'year';
+type TimeAxisLabelLevel = TimeAxisLabelPrimaryLevel
+| 'week' | 'quarter' | 'half-year';
+
+const primaryLevels = ['year', 'month', 'week', 'day', 'hour', 'minute', 
'second', 'millisecond'];
+
+fu

[incubator-echarts] branch master updated: ci: run on pr opened or synchronized

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

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


The following commit(s) were added to refs/heads/master by this push:
 new a9653ea  ci: run on pr opened or synchronized
a9653ea is described below

commit a9653eaeb808fe0c40e5dbdf9686740798e7e641
Author: Wenli Zhang 
AuthorDate: Tue Jun 23 12:13:28 2020 +0800

ci: run on pr opened or synchronized
---
 .github/workflows/nodejs.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 0834a8f..0b8497e 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -1,6 +1,8 @@
 name: Node CI
 
-on: [push]
+on:
+  pull_request:
+types: [opened, synchronize]
 
 jobs:
   build:


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



[incubator-echarts] branch next updated: ci: run on pr opened or synchronized

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

ovilia 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 55794d0  ci: run on pr opened or synchronized
55794d0 is described below

commit 55794d0358aa532774da769b2e5d364431bc26de
Author: Wenli Zhang 
AuthorDate: Tue Jun 23 12:15:03 2020 +0800

ci: run on pr opened or synchronized
---
 .github/workflows/nodejs.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 5c03dfa..fc9985a 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -1,6 +1,8 @@
 name: Node CI
 
-on: [push]
+on:
+  pull_request:
+types: [opened, synchronize]
 
 jobs:
   build:


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



[incubator-echarts] branch ci-master created (now 14f0033)

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

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


  at 14f0033  ci: run on pr opened or synchronized

This branch includes the following new commits:

 new 14f0033  ci: run on pr opened or synchronized

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: ci: run on pr opened or synchronized

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

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

commit 14f0033ad2b5db99d8961ca897f5098cb6593a0f
Author: Wenli Zhang 
AuthorDate: Tue Jun 23 12:13:28 2020 +0800

ci: run on pr opened or synchronized
---
 .github/workflows/nodejs.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 0834a8f..0b8497e 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -1,6 +1,8 @@
 name: Node CI
 
-on: [push]
+on:
+  pull_request:
+types: [opened, synchronize]
 
 jobs:
   build:


-
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 #12848 from apache/ci

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

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

commit 6a9f86fd3f18b35333d8568b4b529ac94e6cac11
Merge: 79fbcb9 eceee1b
Author: Wenli Zhang 
AuthorDate: Tue Jun 23 11:33:58 2020 +0800

Merge pull request #12848 from apache/ci

core(ci): only run unit test on master or release branch

 .github/workflows/nodejs.yml | 8 
 1 file changed, 8 insertions(+)


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



[incubator-echarts] branch next updated (79fbcb9 -> 6a9f86f)

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

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


from 79fbcb9  Merge pull request #12484 from apache/feat-bar-race
 add eceee1b  core(ci): only run unit test on master or release branch
 new 6a9f86f  Merge pull request #12848 from apache/ci

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:
 .github/workflows/nodejs.yml | 8 
 1 file changed, 8 insertions(+)


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



[incubator-echarts] 01/01: core(ci): only run unit test on master or release branch

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

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

commit eceee1b245005bb8d0a34e6b3abe5a2c53c23cda
Author: Ovilia 
AuthorDate: Mon Jun 22 18:06:49 2020 +0800

core(ci): only run unit test on master or release branch
---
 .github/workflows/nodejs.yml | 8 
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 0834a8f..5c03dfa 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -36,6 +36,14 @@ jobs:
   npm run release
 env:
   CI: true
+
+  test:
+runs-on: ubuntu-latest
+needs: build
+
+if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/release'
+
+steps:
   - name: unit test
 run: |
   npm run test


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



[incubator-echarts] branch ci created (now eceee1b)

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

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


  at eceee1b  core(ci): only run unit test on master or release branch

This branch includes the following new commits:

 new eceee1b  core(ci): only run unit test on master or release branch

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 (fe1666d -> 79fbcb9)

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

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


from fe1666d  fix: resolve the circular dependency.
 add e2dac51  WIP(bar-racing): sort axis
 add e256517  WIP(bar-race): most logic without label animation
 add 82c70ab  feat(bar-race): one series done
 add a3afee5  WIP(bar-race): update during
 add 027b1be  WIP(bar-race): update animation
 add 853759b  merge next
 add 5d081d1  Merge branch 'next' into feat-bar-race
 add 5b1485a  feat(bar-race): label value animation
 add 4d41640  feat(bar-race): label formatter
 add fb138d4  test(bar-race): update bar race test
 add 103c9f7  Merge branch 'next' into feat-bar-race
 add 6059708  merge
 add 628dd5c  fix(bar-race): fix merging axis extent from next
 add b526ecf  fix(bar-race): fix according to review comments
 add 3737601  Merge branch 'next' into feat-bar-race
 new 79fbcb9  Merge pull request #12484 from apache/feat-bar-race

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:
 .../sunburst.ts => action/changeAxisOrder.ts}  |  30 +-
 src/chart/bar.ts   |   1 +
 src/chart/bar/BarView.ts   | 238 ++-
 src/chart/helper/labelHelper.ts|  15 +-
 src/coord/Axis.ts  |   2 +-
 src/coord/cartesian/Axis2D.ts  |  15 +-
 src/coord/cartesian/AxisModel.ts   |  11 +-
 src/coord/cartesian/Grid.ts|  10 +
 src/model/mixin/dataFormat.ts  |  19 +-
 src/scale/Ordinal.ts   |  25 +-
 src/scale/Scale.ts |   4 +-
 src/util/graphic.ts| 181 ++--
 src/util/types.ts  |   6 +
 test/bar-race.html | 455 +
 14 files changed, 938 insertions(+), 74 deletions(-)
 copy src/{chart/sunburst.ts => action/changeAxisOrder.ts} (61%)
 create mode 100644 test/bar-race.html


-
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 #12484 from apache/feat-bar-race

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

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

commit 79fbcb9270327d75494eb2b6efac477c7547e938
Merge: fe1666d 3737601
Author: Ovilia 
AuthorDate: Mon Jun 22 17:23:45 2020 +0800

Merge pull request #12484 from apache/feat-bar-race

feat: bar race

 src/{chart/bar.ts => action/changeAxisOrder.ts} |  39 +-
 src/chart/bar.ts|   1 +
 src/chart/bar/BarView.ts| 238 +++--
 src/chart/helper/labelHelper.ts |  15 +-
 src/coord/Axis.ts   |   2 +-
 src/coord/cartesian/Axis2D.ts   |  15 +-
 src/coord/cartesian/AxisModel.ts|  11 +-
 src/coord/cartesian/Grid.ts |  10 +
 src/model/mixin/dataFormat.ts   |  19 +-
 src/scale/Ordinal.ts|  25 +-
 src/scale/Scale.ts  |   4 +-
 src/util/graphic.ts | 181 --
 src/util/types.ts   |   6 +
 test/bar-race.html  | 455 
 14 files changed, 937 insertions(+), 84 deletions(-)


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



[incubator-echarts] branch feat-bar-race updated (103c9f7 -> 3737601)

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

ovilia pushed a change to branch feat-bar-race
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


from 103c9f7  Merge branch 'next' into feat-bar-race
 add bf5c08a  feat: provide elapsedTime in rendered event
 add b116faa  fix: some refactor about dataZoom and axis scale extent 
calculation:
 add 4a5f6d6  feature: Enable category axis min/max to shrink the other 
axis extent in cartesian. After this modification, if some data if out of the 
range of a category axis, the data item will not be filtered, but the extent of 
the other axis will be calculated based on the filtered data. If dataZoom is 
used in either of the xAxis or yAxis in that cartesian, the shrink will not be 
performed.
 add 6b95e3d  fix: fix some typo and comments
 add fca7f98  Merge pull request #12832 from 
apache/extent_filtered_by_other_axis
 add 6059708  merge
 add 628dd5c  fix(bar-race): fix merging axis extent from next
 add b526ecf  fix(bar-race): fix according to review comments
 add 662eea3  ts: fix type.
 add fe1666d  fix: resolve the circular dependency.
 add 3737601  Merge branch 'next' into feat-bar-race

No new revisions were added by this update.

Summary of changes:
 src/chart/bar/BarSeries.ts   |   4 +-
 src/chart/bar/BarView.ts |   3 +-
 src/chart/helper/labelHelper.ts  |   8 +-
 src/component/dataZoom/AxisProxy.ts  | 115 ++
 src/component/dataZoom/DataZoomModel.ts  |   4 +-
 src/component/dataZoom/dataZoomProcessor.ts  |   2 +-
 src/component/dataZoom/helper.ts |   1 +
 src/component/gridSimple.ts  |   1 +
 src/coord/axisCommonTypes.ts |  16 +-
 src/coord/axisHelper.ts  | 155 +++--
 src/coord/axisModelCommonMixin.ts|  57 +--
 src/coord/cartesian/AxisModel.ts |  15 -
 src/coord/cartesian/Grid.ts  |  90 +
 src/coord/cartesian/cartesianAxisHelper.ts   |  35 ++
 src/coord/cartesian/defaultAxisExtentFromData.ts | 262 ++
 src/coord/polar/polarCreator.ts  |  16 +-
 src/coord/radar/Radar.ts |   5 +-
 src/coord/scaleRawExtentInfo.ts  | 321 +
 src/data/List.ts |  14 +-
 src/data/helper/dataProvider.ts  |   7 +-
 src/data/helper/dataStackHelper.ts   |   6 +-
 src/echarts.ts   |  13 +-
 src/helper.ts|   2 -
 src/model/mixin/dataFormat.ts|  13 +-
 src/scale/Scale.ts   |   9 +-
 src/util/graphic.ts  |  43 +--
 src/util/types.ts|   2 +-
 test/axis-filter-extent.html | 422 +++
 test/bar-race.html   |   2 +-
 29 files changed, 1212 insertions(+), 431 deletions(-)
 create mode 100644 src/coord/cartesian/defaultAxisExtentFromData.ts
 create mode 100644 src/coord/scaleRawExtentInfo.ts
 create mode 100644 test/axis-filter-extent.html


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



[incubator-echarts-handbook] 01/02: doc: update contents

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

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

commit d9fdfc9330781bcae6cf74f1846b37bdc1e41560
Author: Ovilia 
AuthorDate: Fri Jun 19 12:55:48 2020 +0800

doc: update contents
---
 contents/zh/application/cross-platform.md  |   1 -
 .../zh/application/cross-platform/baidu-app.md |  19 ++
 contents/zh/application/cross-platform/server.md   |  12 +
 .../zh/application/cross-platform/wechat-app.md|  21 ++
 contents/zh/basics/inspiration.md  |   6 +
 contents/zh/basics/resource.md |  12 +
 contents/zh/best-practice/aria.md  |  60 +
 contents/zh/best-practice/canvas-vs-svg.md |  51 +
 contents/zh/concepts/event.md  | 253 +
 contents/zh/posts.js   |  21 +-
 10 files changed, 454 insertions(+), 2 deletions(-)

diff --git a/contents/zh/application/cross-platform.md 
b/contents/zh/application/cross-platform.md
deleted file mode 100644
index 3979538..000
--- a/contents/zh/application/cross-platform.md
+++ /dev/null
@@ -1 +0,0 @@
-# 跨平台方案
\ No newline at end of file
diff --git a/contents/zh/application/cross-platform/baidu-app.md 
b/contents/zh/application/cross-platform/baidu-app.md
new file mode 100644
index 000..55e13c1
--- /dev/null
+++ b/contents/zh/application/cross-platform/baidu-app.md
@@ -0,0 +1,19 @@
+# 在百度智能小程序中使用 ECharts
+
+[ECharts 
图表-beta](http://smartprogram.baidu.com/docs/develop/framework/echarts/) 
以小程序动态库的形式提供了在百度智能小程序中使用 ECharts 的方式。
+
+[aidu-smart-app-echarts-demo](https://github.com/baidu-smart-app/baidu-smart-app-echarts-demo)
 项目是使用该动态库的一个示例工程,可以作为参考,一般情况下不需要引入自己的项目。
+
+如有使用上的问题,可以在 
[baidu-smart-app-echarts-demo/issues](https://github.com/baidu-smart-app/baidu-smart-app-echarts-demo/issues)
 中咨询。
+
+
+## 使用方式
+
+参见百度智能小程序文档 [ECharts 
图表-beta](http://smartprogram.baidu.com/docs/develop/framework/echarts/)。
+
+
+## 注意事项
+
+百度智能小程序上的 ECharts 以动态库的形式开放,因此开发者的使用方式与[在微信小程序中使用 
ECharts](./zh/application_cross-platform_wechat-app) 
不太相同。尤其需要注意的是,前者需要在指定动态库名称的时候确定 ECharts 
的版本号,而不能自行更换或使用自定义构建。这一点是由底层框架的技术实现决定的。具体来说,在指定百度智能小程序动态库名称的时候,需要通过 `provider` 
指定动态库名称,具体参见[文档](http://smartprogram.baidu.com/docs/develop/framework/echarts/)的「在项目中引用动态库」章节。
+
+请务必查看[文档](http://smartprogram.baidu.com/docs/develop/framework/echarts/)的「兼容性说明」以了解各功能的实现方式。
diff --git a/contents/zh/application/cross-platform/server.md 
b/contents/zh/application/cross-platform/server.md
new file mode 100644
index 000..c0f7907
--- /dev/null
+++ b/contents/zh/application/cross-platform/server.md
@@ -0,0 +1,12 @@
+# ECharts 服务端渲染
+
+ECharts 
可以在服务端进行渲染。例如[官方示例](${mainSitePath}/examples/zh/index.html)里的一个个小截图,就是在服务端预生成出来的。
+
+服务端渲染可以使用流行的 headless 环境,例如 
[puppeteer](https://github.com/GoogleChrome/puppeteer)、[headless 
chrome](https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md)、[node-canvas](https://github.com/Automattic/node-canvas)、[jsdom](https://github.com/jsdom/jsdom)、[PhantomJS](http://phantomjs.org/)
 等。
+
+这是一些社区贡献的 ECharts 服务端渲染方案:
+
+- 
[https://github.com/hellosean1025/node-echarts](https://github.com/hellosean1025/node-echarts)
+- 
[https://github.com/chfw/echarts-scrappeteer](https://github.com/chfw/echarts-scrappeteer)
+- 
[https://github.com/chfw/pyecharts-snapshot/blob/master/pyecharts_snapshot/phantomjs/snapshot.js](https://github.com/chfw/pyecharts-snapshot/blob/master/pyecharts_snapshot/phantomjs/snapshot.js)
+- 
[https://gist.github.com/pissang/4c32ee30e35c91336af72b129a1a4a73](https://gist.github.com/pissang/4c32ee30e35c91336af72b129a1a4a73)
diff --git a/contents/zh/application/cross-platform/wechat-app.md 
b/contents/zh/application/cross-platform/wechat-app.md
new file mode 100644
index 000..332d189
--- /dev/null
+++ b/contents/zh/application/cross-platform/wechat-app.md
@@ -0,0 +1,21 @@
+# 在微信小程序中使用 ECharts
+
+[echarts-for-weixin](https://github.com/ecomfe/echarts-for-weixin) 
项目提供了一个小程序组件,用这种方式可以方便地使用 ECharts。
+
+
+## 使用方式
+
+1. 下载该项目
+2. 如有必要,将 `ec-canvas` 目录下的 `echarts.js` 替换为最新版的 
ECharts。如果希望减小包体积大小,可以使用[自定义构建](${mainSitePath}/build.html)生成并替换 `echarts.js`
+3. `pages` 目录下是使用的示例文件,可以作为参考,或者删除不需要的页面。
+
+更详细的说明请参见 [echarts-for-weixin](https://github.com/ecomfe/echarts-for-weixin) 
项目。
+
+
+## 注意事项
+
+最新版的 ECharts 微信小程序支持微信 Canvas 2d,当用户的基础库版本 >= 2.9.0 且没有设置 
`force-use-old-canvas="true"` 的情况下,使用新的 Canvas 2d(默认)。
+
+使用新的 Canvas 2d 可以提升渲染性能,解决非同层渲染问题,强烈建议开启。
+
+更详细的说明请参见 [Canvas 2d 
版本要求](https://github.com/ecomfe/echarts-for-weixin#canvas-2d-%E7%89%88%E6%9C%AC%E8%A6%81%E6%B1%82)。
diff --git a/contents/zh/basics/inspiration.md 
b/contents/zh/basics/inspiration.md
index f96933e..9823ebd 100644
--- a/contents/zh/basics/inspiration.md
+++ b/contents/zh/basics/inspiration.md
@@ -1 +1,7 @@
 # 获取灵感
+
+当你有“不知道图表应该设计成什么样”或者“不知道如何使用 ECharts 实现某种效果”的疑问的时候,以下列表可以提供一些思路。
+
+- 

[incubator-echarts-handbook] branch master updated (b6a9b9b -> 463402c)

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

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


from b6a9b9b  docs: add bar contents
 new d9fdfc9  doc: update contents
 new 463402c  merge

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.


Summary of changes:
 contents/zh/application/cross-platform.md  |   1 -
 .../zh/application/cross-platform/baidu-app.md |  19 ++
 contents/zh/application/cross-platform/server.md   |  12 +
 .../zh/application/cross-platform/wechat-app.md|  21 ++
 contents/zh/basics/inspiration.md  |   6 +
 contents/zh/basics/resource.md |  12 +
 contents/zh/best-practice/aria.md  |  60 +
 contents/zh/best-practice/canvas-vs-svg.md |  51 +
 contents/zh/concepts/event.md  | 253 +
 contents/zh/posts.js   |  74 +++---
 10 files changed, 480 insertions(+), 29 deletions(-)
 delete mode 100644 contents/zh/application/cross-platform.md
 create mode 100644 contents/zh/application/cross-platform/baidu-app.md
 create mode 100644 contents/zh/application/cross-platform/server.md
 create mode 100644 contents/zh/application/cross-platform/wechat-app.md
 create mode 100644 contents/zh/best-practice/aria.md
 create mode 100644 contents/zh/best-practice/canvas-vs-svg.md
 create mode 100644 contents/zh/concepts/event.md


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



[incubator-echarts-handbook] 02/02: merge

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

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

commit 463402c011375e0977fbe1a6d5cc949b8da7fb6f
Merge: d9fdfc9 b6a9b9b
Author: Ovilia 
AuthorDate: Fri Jun 19 13:16:19 2020 +0800

merge

 .../chart-specificatio/bar/basic-bar.md|  45 
 .../chart-specificatio/bar/bi-directional-bar.md   |  32 ++
 .../chart-specificatio/bar/grouped-bar.md  |  20 +
 .../chart-specificatio/bar/stacked-bar.md  |  22 ++
 .../best-practice/chart-specificatio/line/area.md  |  24 +++
 .../chart-specificatio/line/basic-line.md  |  36 
 .../chart-specificatio/line/stacked-area.md|  46 +
 contents/zh/posts.js   |  33 +++
 pages/helper/contributors.ts   |  23 ++-
 static/images/design/bar/bar01.jpg | Bin 0 -> 84318 bytes
 static/images/design/bar/bar02.jpg | Bin 0 -> 75564 bytes
 static/images/design/bar/bar03.jpg | Bin 0 -> 91679 bytes
 static/images/design/bar/bar04.jpg | Bin 0 -> 70479 bytes
 .../bi-directional-bar/bi-directional-bar01.jpg| Bin 0 -> 75564 bytes
 .../bi-directional-bar/bi-directional-bar02.jpg| Bin 0 -> 86140 bytes
 static/images/design/line/line01.jpg   | Bin 0 -> 89525 bytes
 16 files changed, 280 insertions(+), 1 deletion(-)

diff --cc contents/zh/posts.js
index cb53e4a,18b5808..93bc8d0
--- a/contents/zh/posts.js
+++ b/contents/zh/posts.js
@@@ -163,16 -150,44 +163,49 @@@ export default [
  title: '最佳实践',
  dir: 'best-practice',
  children: [{
 -title: '移动端优化',
 -dir: 'mobile'
 -},{
 +title: '移动端优化',
 +dir: 'mobile'
 +}, {
 +title: 'Canvas vs. SVG',
 +dir: 'canvas-vs-svg'
 +}, {
 +title: '无障碍访问',
 +dir: 'aria'
 +}, {
  title: '可视化设计原则',
  dir: 'design'
 -}, {
++}, {
+ title: '可视化规范',
+ dir: 'chart-specificatio',
+ children: [{
+ title: '折线图',
 -dir: 'line',
 -children: [{
 -title: '基础折线图',
 -dir: 'basic-line'
 -}, {
 -title: '面积图',
 -dir: 'area'
 -}, {
 -title: '堆叠面积图',
 -dir: 'stacked-area'
 -}]
 -},  
 -{
 -title: '柱状图',
 -dir: 'bar',
 -children: [{
 -title: '基础柱状图',
 -dir: 'basic-bar'
 -}, {
++dir: 'line',
++children: [{
++title: '基础折线图',
++dir: 'basic-line'
++}, {
++title: '面积图',
++dir: 'area'
++}, {
++title: '堆叠面积图',
++dir: 'stacked-area'
++}]
++}, {
++title: '柱状图',
++dir: 'bar',
++children: [{
++title: '基础柱状图',
++dir: 'basic-bar'
++}, {
+ title: '堆叠柱状图',
+ dir: 'stacked-bar'
 -}, {
++}, {
+ title: '双向柱状图',
+ dir: 'bi-directiona-bar'
 -}, {
++}, {
+ title: '分组柱状图',
+ dir: 'grouped-bar'
+ }]
 -},]
++}]
  }]
 -}]
 +}];


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



[incubator-echarts-handbook] branch master updated: doc: update content

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

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


The following commit(s) were added to refs/heads/master by this push:
 new fae6ccc  doc: update content
fae6ccc is described below

commit fae6ccc466317c63ec954b1b6f4f7abb93272c95
Author: Ovilia 
AuthorDate: Thu Jun 18 20:21:13 2020 +0800

doc: update content
---
 .../zh/application/chart-types/bar/basic-bar.md|   2 +-
 .../zh/application/chart-types/line/step-line.md   |  18 +-
 .../zh/application/chart-types/pie/basic-pie.md| 104 
 contents/zh/application/chart-types/pie/ring.md|  91 +++
 contents/zh/application/chart-types/pie/rose.md|  31 +++
 .../chart-types/scatter/basic-scatter.md   | 119 ++
 contents/zh/application/custom-build.md| 264 +
 contents/zh/basics/help.md |  42 +++-
 contents/zh/concepts/visual-map.md | 129 ++
 contents/zh/posts.js   |  23 ++
 10 files changed, 812 insertions(+), 11 deletions(-)

diff --git a/contents/zh/application/chart-types/bar/basic-bar.md 
b/contents/zh/application/chart-types/bar/basic-bar.md
index c980e5b..665177c 100644
--- a/contents/zh/application/chart-types/bar/basic-bar.md
+++ b/contents/zh/application/chart-types/bar/basic-bar.md
@@ -1,6 +1,6 @@
 # 基本柱状图
 
-柱状图(或称条形图)是一种通过柱形的高度(横向的情况下则是宽度)来表现数据大小的一种常用图表类型。
+柱状图(或称条形图)是一种通过柱形的长度来表现数据大小的一种常用图表类型。
 
 设置柱状图的方式,是将 `series` 的 `name` 设为 `'bar'`。
 
diff --git a/contents/zh/application/chart-types/line/step-line.md 
b/contents/zh/application/chart-types/line/step-line.md
index 4758ce1..d271602 100644
--- a/contents/zh/application/chart-types/line/step-line.md
+++ b/contents/zh/application/chart-types/line/step-line.md
@@ -15,22 +15,22 @@ option = {
 type: 'value'
 },
 series: [{
-name:'Step Start',
-type:'line',
+name: 'Step Start',
+type: 'line',
 step: 'start',
-data:[120, 132, 101, 134, 90, 230, 210]
+data: [120, 132, 101, 134, 90, 230, 210]
 },
 {
-name:'Step Middle',
-type:'line',
+name: 'Step Middle',
+type: 'line',
 step: 'middle',
-data:[220, 282, 201, 234, 290, 430, 410]
+data: [220, 282, 201, 234, 290, 430, 410]
 },
 {
-name:'Step End',
-type:'line',
+name: 'Step End',
+type: 'line',
 step: 'end',
-data:[450, 432, 401, 454, 590, 530, 510]
+data: [450, 432, 401, 454, 590, 530, 510]
 }]
 };
 ```
diff --git a/contents/zh/application/chart-types/pie/basic-pie.md 
b/contents/zh/application/chart-types/pie/basic-pie.md
new file mode 100644
index 000..eef94a7
--- /dev/null
+++ b/contents/zh/application/chart-types/pie/basic-pie.md
@@ -0,0 +1,104 @@
+# 基础饼图
+
+饼图主要用于表现不同类目的数据在总和中的占比。每个的弧度表示数据数量的比例。
+
+## 最简单的饼图
+
+饼图的配置和折线图、柱状图略有不同,不再需要配置坐标轴,而是把数据名称和值都写在系列中。以下是一个最简单的饼图的例子。
+
+
+```js
+option = {
+series: [{
+type: 'pie',
+data: [{
+value: 335,
+name: '直接访问'
+}, {
+value: 234,
+name: '联盟广告'
+}, {
+value: 1548,
+name: '搜索引擎'
+}]
+}]
+};
+```
+
+需要注意的是,这里是 `value` 不需要是百分比数据,ECharts 会根据所有数据的 `value` ,按比例分配它们在饼图中对应的弧度。
+
+
+## 饼图样式设置
+
+### 饼图的半径
+
+饼图的半径可以通过 [`series.radius`](${optionPath}series-pie.radius) 设置,可以是诸如 `'60%'` 
这样相对的百分比字符串,或是 `200` 
这样的绝对像素数值。当它是百分比字符串时,它是相对于容器宽高中较小的一条边的。也就是说,如果宽度大于高度,则百分比是相对于高度的,反之则反;当它是数值型时,它表示绝对的像素大小。
+
+
+```js
+option = {
+series: [{
+type: 'pie',
+data: [{
+value: 335,
+name: '直接访问'
+}, {
+value: 234,
+name: '联盟广告'
+}, {
+value: 1548,
+name: '搜索引擎'
+}],
+radius: '50%'
+}]
+};
+```
+
+## 如果数据和为0,不显示饼图
+
+在默认情况下,如果数据值和为 0,会显示平均分割的扇形。比如,如果有 4 个数据项,并且每个数据项都是 0,则每个扇形都是 
90°。如果我们希望在这种情况下不显示任何扇形,可以将 
[`series.stillShowZeroSum`](${optionPath}series-pie.stillShowZeroSum) 设为 
`false`。
+
+
+```js
+option = {
+series: [{
+type: 'pie',
+stillShowZeroSum: false,
+data: [{
+value: 0,
+name: '直接访问'
+}, {
+value: 0,
+name: '联盟广告'
+}, {
+value: 0,
+name: '搜索引擎'
+}]
+}]
+};
+```
+
+如果希望扇形对应的标签也不现实,可以将 [`series.label.show`](${optionPath}series-pie.label.show) 
设为 `false`。
+
+
+```js
+option = {
+series: [{
+type: 'pie',
+stillShowZeroSum: false,
+label: {
+show: false
+}
+data: [{
+value: 0,
+name: '直接访问'
+}, {
+value: 0,
+name: '联盟广告'
+}, {
+value: 0,
+name: '搜索引擎'
+}]
+}]
+};
+```
diff --git a/contents/zh/application/chart

[incubator-echarts-handbook] branch master updated (8fabd28 -> 2aa3255)

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

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


from 8fabd28  Merge pull request #1 from apache/wenli
 add 179be6e  feat: support level 4 nav
 new 2aa3255  Merge pull request #2 from apache/wenli

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:
 components/partials/Sidebar.vue|  37 --
 contents/zh/{cookbook => application}/aria.md  |   0
 .../chart-types/bar/bar-race.md}   |   0
 .../chart-types/bar/basic-bar.md}  |   0
 .../{ => application}/chart-types/bar/polar-bar.md |   0
 .../chart-types/bar/stacked-bar.md |   0
 .../chart-types/bar/visual-map.md  |   0
 .../{ => application}/chart-types/bar/waterfall.md |   0
 .../zh/application/chart-types/line/area-line.md   |  27 +
 .../zh/application/chart-types/line/basic-line.md  | 128 +
 .../zh/application/chart-types/line/smooth-line.md |  18 +++
 .../application/chart-types/line/stacked-line.md   |  45 
 .../zh/application/chart-types/line/step-line.md   |  38 ++
 contents/zh/{cookbook => application}/connect.md   |   0
 .../zh/{cookbook => application}/cross-platform.md |   0
 contents/zh/{cookbook => application}/down-play.md |   0
 contents/zh/{cookbook => application}/downplay.md  |   0
 contents/zh/{cookbook => application}/mobile.md|   0
 contents/zh/chart-types/line.md|  26 -
 contents/zh/chart-types/xxx.md |   0
 contents/zh/posts.js   |  79 +++--
 21 files changed, 330 insertions(+), 68 deletions(-)
 rename contents/zh/{cookbook => application}/aria.md (100%)
 rename contents/zh/{chart-types/bar/bar-racing.md => 
application/chart-types/bar/bar-race.md} (100%)
 rename contents/zh/{chart-types/bar/simple-bar.md => 
application/chart-types/bar/basic-bar.md} (100%)
 rename contents/zh/{ => application}/chart-types/bar/polar-bar.md (100%)
 rename contents/zh/{ => application}/chart-types/bar/stacked-bar.md (100%)
 rename contents/zh/{ => application}/chart-types/bar/visual-map.md (100%)
 rename contents/zh/{ => application}/chart-types/bar/waterfall.md (100%)
 create mode 100644 contents/zh/application/chart-types/line/area-line.md
 create mode 100644 contents/zh/application/chart-types/line/basic-line.md
 create mode 100644 contents/zh/application/chart-types/line/smooth-line.md
 create mode 100644 contents/zh/application/chart-types/line/stacked-line.md
 create mode 100644 contents/zh/application/chart-types/line/step-line.md
 rename contents/zh/{cookbook => application}/connect.md (100%)
 rename contents/zh/{cookbook => application}/cross-platform.md (100%)
 rename contents/zh/{cookbook => application}/down-play.md (100%)
 rename contents/zh/{cookbook => application}/downplay.md (100%)
 rename contents/zh/{cookbook => application}/mobile.md (100%)
 delete mode 100644 contents/zh/chart-types/line.md
 delete mode 100644 contents/zh/chart-types/xxx.md


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



[incubator-echarts-handbook] 01/01: Merge pull request #2 from apache/wenli

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

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

commit 2aa3255c1c1b8a9a96ae7b3401309977a3e4ebf4
Merge: 8fabd28 179be6e
Author: Ovilia 
AuthorDate: Thu Jun 18 17:38:40 2020 +0800

Merge pull request #2 from apache/wenli

feat: support level 4 nav

 components/partials/Sidebar.vue|  37 --
 contents/zh/{cookbook => application}/aria.md  |   0
 .../chart-types/bar/bar-race.md}   |   0
 .../chart-types/bar/basic-bar.md}  |   0
 .../{ => application}/chart-types/bar/polar-bar.md |   0
 .../chart-types/bar/stacked-bar.md |   0
 .../chart-types/bar/visual-map.md  |   0
 .../{ => application}/chart-types/bar/waterfall.md |   0
 .../zh/application/chart-types/line/area-line.md   |  27 +
 .../zh/application/chart-types/line/basic-line.md  | 128 +
 .../zh/application/chart-types/line/smooth-line.md |  18 +++
 .../application/chart-types/line/stacked-line.md   |  45 
 .../zh/application/chart-types/line/step-line.md   |  38 ++
 contents/zh/{cookbook => application}/connect.md   |   0
 .../zh/{cookbook => application}/cross-platform.md |   0
 contents/zh/{cookbook => application}/down-play.md |   0
 contents/zh/{cookbook => application}/downplay.md  |   0
 contents/zh/{cookbook => application}/mobile.md|   0
 contents/zh/chart-types/line.md|  26 -
 contents/zh/chart-types/xxx.md |   0
 contents/zh/posts.js   |  79 +++--
 21 files changed, 330 insertions(+), 68 deletions(-)


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



[incubator-echarts-handbook] 01/01: feat: support level 4 nav

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

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

commit 179be6ed316e4ea8c1e3e6d7de6b1f0c0e00b7df
Author: Ovilia 
AuthorDate: Thu Jun 18 17:18:41 2020 +0800

feat: support level 4 nav
---
 components/partials/Sidebar.vue|  37 --
 contents/zh/{cookbook => application}/aria.md  |   0
 .../chart-types/bar/bar-race.md}   |   0
 .../chart-types/bar/basic-bar.md}  |   0
 .../{ => application}/chart-types/bar/polar-bar.md |   0
 .../chart-types/bar/stacked-bar.md |   0
 .../chart-types/bar/visual-map.md  |   0
 .../{ => application}/chart-types/bar/waterfall.md |   0
 .../zh/application/chart-types/line/area-line.md   |  27 +
 .../zh/application/chart-types/line/basic-line.md  | 128 +
 .../zh/application/chart-types/line/smooth-line.md |  18 +++
 .../application/chart-types/line/stacked-line.md   |  45 
 .../zh/application/chart-types/line/step-line.md   |  38 ++
 contents/zh/{cookbook => application}/connect.md   |   0
 .../zh/{cookbook => application}/cross-platform.md |   0
 contents/zh/{cookbook => application}/down-play.md |   0
 contents/zh/{cookbook => application}/downplay.md  |   0
 contents/zh/{cookbook => application}/mobile.md|   0
 contents/zh/chart-types/line.md|  26 -
 contents/zh/chart-types/xxx.md |   0
 contents/zh/posts.js   |  79 +++--
 21 files changed, 330 insertions(+), 68 deletions(-)

diff --git a/components/partials/Sidebar.vue b/components/partials/Sidebar.vue
index fd1bed2..9e94e0a 100644
--- a/components/partials/Sidebar.vue
+++ b/components/partials/Sidebar.vue
@@ -8,14 +8,21 @@
   class="bd-toc-link">{{ level0Post.title }}
 
   
-{{ level1Post.title }}
 
   
-{{ level2Post.title }}
+
+  
+{{ level3Post.title }}
+  
+
   
 
   
@@ -49,16 +56,13 @@ export default Vue.extend({
 
 .bd-sidenav {
   margin-top: 5px;
+  margin-left: 10px;
   display: none;
 }
 
-  .bd-sidenav.level2 {
-margin: 0 0 0 15px;
-  }
-
 .bd-toc-link {
   font-weight: bold;
-  color: #444;
+  color: #222;
 }
 
 .nav {
@@ -67,15 +71,30 @@ export default Vue.extend({
 
   .nav-link {
 padding: 5px;
-color: #666;
+color: #444;
   }
 
 .level1 .nav-link {
   padding: 5px 0;
 }
 
+.level2, .level3 {
+  margin-top: 0;
+}
+
 .level2 .nav-link {
-  color: #444;
+  color: #666;
+}
+
+.level3 {
+  border-left: 1px solid #eee;
+  padding-left: 10px;
+  margin-left: 0;
+}
+
+.level3 .nav-link {
+  margin: 2px 0;
+  color: #888;
 }
 
 .nav-link:hover {
diff --git a/contents/zh/cookbook/aria.md b/contents/zh/application/aria.md
similarity index 100%
rename from contents/zh/cookbook/aria.md
rename to contents/zh/application/aria.md
diff --git a/contents/zh/chart-types/bar/bar-racing.md 
b/contents/zh/application/chart-types/bar/bar-race.md
similarity index 100%
rename from contents/zh/chart-types/bar/bar-racing.md
rename to contents/zh/application/chart-types/bar/bar-race.md
diff --git a/contents/zh/chart-types/bar/simple-bar.md 
b/contents/zh/application/chart-types/bar/basic-bar.md
similarity index 100%
rename from contents/zh/chart-types/bar/simple-bar.md
rename to contents/zh/application/chart-types/bar/basic-bar.md
diff --git a/contents/zh/chart-types/bar/polar-bar.md 
b/contents/zh/application/chart-types/bar/polar-bar.md
similarity index 100%
rename from contents/zh/chart-types/bar/polar-bar.md
rename to contents/zh/application/chart-types/bar/polar-bar.md
diff --git a/contents/zh/chart-types/bar/stacked-bar.md 
b/contents/zh/application/chart-types/bar/stacked-bar.md
similarity index 100%
rename from contents/zh/chart-types/bar/stacked-bar.md
rename to contents/zh/application/chart-types/bar/stacked-bar.md
diff --git a/contents/zh/chart-types/bar/visual-map.md 
b/contents/zh/application/chart-types/bar/visual-map.md
similarity index 100%
rename from contents/zh/chart-types/bar/visual-map.md
rename to contents/zh/application/chart-types/bar/visual-map.md
diff --git a/contents/zh/chart-types/bar/waterfall.md 
b/contents/zh/application/chart-types/bar/waterfall.md
similarity index 100%
rename from contents/zh/chart-types/bar/waterfall.md
rename to contents/zh/application/chart-types/bar/waterfall.md
diff --git a/contents/zh/application/chart-types/line/area-line.md 
b/contents/zh/application/chart-

[incubator-echarts-handbook] branch wenli created (now 179be6e)

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

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


  at 179be6e  feat: support level 4 nav

This branch includes the following new commits:

 new 179be6e  feat: support level 4 nav

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 feat-bar-race updated (fb138d4 -> 103c9f7)

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

ovilia pushed a change to branch feat-bar-race
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


from fb138d4  test(bar-race): update bar race test
 add fbdb003  ts: fix es class usage for inheritance.
 add 750d604  ts: dataset change to ts.
 add de86b1a  ts: export option
 add 103c9f7  Merge branch 'next' into feat-bar-race

No new revisions were added by this update.

Summary of changes:
 option.ts | 107 ++
 src/chart/bar/PictorialBarSeries.ts   |   2 +
 src/chart/graph/GraphSeries.ts|   2 +-
 src/chart/parallel/ParallelSeries.ts  |   2 +
 src/component/dataZoom/InsideZoomModel.ts |   2 +-
 src/component/dataZoom/SliderZoomModel.ts |   2 +-
 src/component/dataset.ts  |  49 ++--
 src/component/timeline/SliderTimelineModel.ts |   2 +-
 src/coord/cartesian/GridModel.ts  |   2 +-
 src/util/clazz.ts |  28 +--
 src/util/types.ts |   2 +-
 11 files changed, 164 insertions(+), 36 deletions(-)
 create mode 100644 option.ts


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



[incubator-echarts] branch feat-bar-race updated (4d41640 -> fb138d4)

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

ovilia pushed a change to branch feat-bar-race
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.


from 4d41640  feat(bar-race): label formatter
 add fb138d4  test(bar-race): update bar race test

No new revisions were added by this update.

Summary of changes:
 test/bar-race.html | 323 -
 1 file changed, 320 insertions(+), 3 deletions(-)


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



[incubator-echarts-bot] branch master updated: update committer

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 5bbfd10  update committer
5bbfd10 is described below

commit 5bbfd102dd75b6b563aba5f152f4b48f56c5ad43
Author: Ovilia 
AuthorDate: Thu Jun 18 13:26:51 2020 +0800

update committer
---
 src/coreCommitters.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/coreCommitters.js b/src/coreCommitters.js
index 10bf89f..7fb05cb 100644
--- a/src/coreCommitters.js
+++ b/src/coreCommitters.js
@@ -5,7 +5,9 @@ const committers = [
 'deqingli',
 'susiwen8',
 'cuijian-dexter',
-'SnailSword'
+'SnailSword',
+'plainheart',
+'wf123537200'
 ];
 
 function getCoreCommitters() {


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



[incubator-echarts] branch next updated: feat: provide elapsedTime in rendered event

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

ovilia 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 bf5c08a  feat: provide elapsedTime in rendered event
bf5c08a is described below

commit bf5c08aa77d4ecdb12f779c5c0563cda14330fbd
Author: Ovilia 
AuthorDate: Tue May 19 14:44:28 2020 +0800

feat: provide elapsedTime in rendered event

See 
https://github.com/ecomfe/zrender/pull/570/files#diff-6a1e2209e77098f03af28277d0045cc2
---
 src/echarts.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/echarts.ts b/src/echarts.ts
index b647380..57d475d 100644
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@ -1632,9 +1632,9 @@ class ECharts extends Eventful {
  * (5) no delayed setOption needs to be processed.
  */
 bindRenderedEvent = function (zr: zrender.ZRenderType, ecIns: 
ECharts): void {
-zr.on('rendered', function () {
+zr.on('rendered', function (params) {
 
-ecIns.trigger('rendered');
+ecIns.trigger('rendered', params);
 
 // The `finished` event should not be triggered repeatly,
 // so it should only be triggered when rendering indeed happend


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



[incubator-echarts-handbook] branch master updated (af7b7f4 -> 8fabd28)

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

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


from af7b7f4  doc: update content
 add bb2b962  doc: update content
 new 8fabd28  Merge pull request #1 from apache/wenli

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:
 configs/config.js |   1 +
 contents/zh/chart-types/bar/bar-racing.md |   3 +
 contents/zh/chart-types/bar/polar-bar.md  |   2 +
 contents/zh/chart-types/bar/simple-bar.md | 124 +-
 contents/zh/posts.js  |   5 +-
 5 files changed, 132 insertions(+), 3 deletions(-)
 create mode 100644 contents/zh/chart-types/bar/bar-racing.md


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



[incubator-echarts-handbook] 01/01: Merge pull request #1 from apache/wenli

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

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

commit 8fabd282b1f83bd03e3b3aecb71ee45e56fa766b
Merge: af7b7f4 bb2b962
Author: Ovilia 
AuthorDate: Thu Jun 18 11:43:48 2020 +0800

Merge pull request #1 from apache/wenli

doc: update content

 configs/config.js |   1 +
 contents/zh/chart-types/bar/bar-racing.md |   3 +
 contents/zh/chart-types/bar/polar-bar.md  |   2 +
 contents/zh/chart-types/bar/simple-bar.md | 124 +-
 contents/zh/posts.js  |   5 +-
 5 files changed, 132 insertions(+), 3 deletions(-)


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



[incubator-echarts-handbook] branch wenli created (now bb2b962)

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

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


  at bb2b962  doc: update content

This branch includes the following new commits:

 new bb2b962  doc: update content

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-handbook] 01/01: doc: update content

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

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

commit bb2b962f6281b9046514018206f5033e8745d63e
Author: Ovilia 
AuthorDate: Thu Jun 18 10:57:29 2020 +0800

doc: update content
---
 configs/config.js |   1 +
 contents/zh/chart-types/bar/bar-racing.md |   3 +
 contents/zh/chart-types/bar/polar-bar.md  |   2 +
 contents/zh/chart-types/bar/simple-bar.md | 124 +-
 contents/zh/posts.js  |   5 +-
 5 files changed, 132 insertions(+), 3 deletions(-)

diff --git a/configs/config.js b/configs/config.js
index 2c2e1f6..e01bb65 100644
--- a/configs/config.js
+++ b/configs/config.js
@@ -2,5 +2,6 @@ export default {
   rootPath: '/echarts-handbook/dist',
   galleryViewPath: 'https://echarts.apache.org/examples/zh/view.html?c=',
   mainSitePath: 'https://echarts.apache.org/',
+  optionPath: 'https://echarts.apache.org/option.html#',
   gitRepo: 'Ovilia/incubator-echarts-handbook'
 };
diff --git a/contents/zh/chart-types/bar/bar-racing.md 
b/contents/zh/chart-types/bar/bar-racing.md
new file mode 100644
index 000..14bb2e0
--- /dev/null
+++ b/contents/zh/chart-types/bar/bar-racing.md
@@ -0,0 +1,3 @@
+# 动态排序柱状图
+
+动态排序柱状图是 ECharts 5.0 新增的功能。
diff --git a/contents/zh/chart-types/bar/polar-bar.md 
b/contents/zh/chart-types/bar/polar-bar.md
index e69de29..1948c92 100644
--- a/contents/zh/chart-types/bar/polar-bar.md
+++ b/contents/zh/chart-types/bar/polar-bar.md
@@ -0,0 +1,2 @@
+# 极坐标系柱状图
+
diff --git a/contents/zh/chart-types/bar/simple-bar.md 
b/contents/zh/chart-types/bar/simple-bar.md
index 5b77706..c980e5b 100644
--- a/contents/zh/chart-types/bar/simple-bar.md
+++ b/contents/zh/chart-types/bar/simple-bar.md
@@ -1,8 +1,14 @@
-# 最简单的柱状图
+# 基本柱状图
 
 柱状图(或称条形图)是一种通过柱形的高度(横向的情况下则是宽度)来表现数据大小的一种常用图表类型。
 
-设置柱状图的方式,是将 `series` 的 `name` 设为 `'bar'`。最简单的柱状图可以这样设置:
+设置柱状图的方式,是将 `series` 的 `name` 设为 `'bar'`。
+
+[[配置项手册]](${optionPath}series-bar)
+
+## 最简单的柱状图
+
+最简单的柱状图可以这样设置:
 
 
 ```js
@@ -41,3 +47,117 @@ option = {
 }]
 };
 ```
+
+
+## 柱状图样式设置
+
+### 柱条样式
+
+柱条的样式可以通过 [`series.itemStyle`](${optionPath}series-bar.itemStyle) 设置,包括:
+
+- 柱条的颜色(`color`);
+- 柱条的描边颜色(`borderColor`)、宽度(`borderWidth`)、样式(`borderType`);
+- 柱条圆角的半径(`barBorderRadius`);
+- 柱条透明度(`opacity`);
+- 阴影(`shadowBlur`、`shadowColor`、`shadowOffsetX`、`shadowOffsetY`)。
+
+
+```js
+option = {
+xAxis: {
+data: ['A', 'B', 'C', 'D', 'E']
+},
+yAxis: {},
+series: [{
+data: [10, 22, 28, 43, 49],
+type: 'bar',
+stack: 'x'
+}, {
+data: [5, 4, 3, 5, 10],
+type: 'bar',
+stack: 'x'
+}]
+};
+```
+
+在这个例子中,我们通过设置柱状图对应 `series` 的`itemStyle`,设置了柱条的样式。完整的配置项及其用法请参见配置项手册 
[`series.itemStyle`](${optionPath}series-bar.itemStyle)。
+
+### 柱条宽度和高度
+
+柱条宽度可以通过 [`barWidth`](${optionPath}#series-bar.barWidth) 设置。比如在下面的例子中,将 
`barWidth` 设为 `'20%'`,表示每个柱条的宽度就是类目宽度的 20%。由于这个例子中,每个系列有 5 个数据,20% 的类目宽度也就是整个 x 
轴宽度的 4%。
+
+
+```js
+option = {
+xAxis: {
+data: ['A', 'B', 'C', 'D', 'E']
+},
+yAxis: {},
+series: [{
+data: [10, 22, 28, 43, 49],
+type: 'bar',
+stack: 'x'
+}, {
+data: [5, 4, 3, 5, 10],
+type: 'bar',
+stack: 'x'
+}]
+};
+```
+
+另外,还可以设置 [`barMaxWidth`](${optionPath}series-bar.barMaxWidth) 
限制柱条的最大宽度。对于一些特别小的数据,我们也可以为柱条指定最小高度 
[`barMinHeight`](${optionPath}series-bar.barMinHeight),当数据对应的柱条高度小于该值时,柱条高度将采用这个最小高度。
+
+### 柱条间距
+
+柱条间距分为两种,一种是不同系列在同一类目下的距离 
[`barWidth`](${optionPath}series-bar.barWidth),另一种是类目与类目的距离 
[`barCategoryGap`](${optionPath}series-bar.barCategoryGap)。
+
+
+```js
+option = {
+xAxis: {
+data: ['A', 'B', 'C', 'D', 'E']
+},
+yAxis: {},
+series: [{
+type: 'bar',
+data: [23, 24, 18, 25, 18],
+barGap: '20%',
+barCategoryGap: '40%'
+}, {
+type: 'bar',
+data: [12, 14, 9, 9, 11]
+}]
+};
+```
+
+在这个例子中,`barGap` 被设为 `'20%'`,这意味着每个类目(比如 `A`)下的两个柱子之间的距离,相对于柱条宽度的百分比。而 
`barCategoryGap` 是 `'40%'`,意味着柱条每侧空余的距离,相对于柱条宽度的百分比。
+
+通常而言,设置 `barGap` 及 `barCategoryGap` 后,就不需要设置 `barWidth` 
了,这时候的宽度会自动调整。如果有需要的话,可以设置 `barMaxWidth` 作为柱条宽度的上限,当图表宽度很大的时候,柱条宽度也不会太宽。
+
+> 在同一坐标系上,此属性会被多个柱状图系列共享。此属性应设置于此坐标系中最后一个柱状图系列上才会生效,并且是对此坐标系中所有柱状图系列生效。
+
+
+### 为柱条添加背景色
+
+有时,我们希望能够为柱条添加背景色。从 ECharts 4.7.0 版本开始,这一功能可以简单地用 
[`showBackground`](${optionPath}series-bar.showBackground) 开启,并且可以通过 
[`backgroundStyle`](${optionPath}series-bar.backgroundStyle) 配置。
+
+
+```js
+option = {
+xAxis: {
+type: 'category',
+data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+},
+yAxis: {
+type: 'value'
+},
+series: [{
+data: [120, 200, 150, 80, 70, 110, 130],
+type: 'bar',
+showBackground: true,
+backgroundStyle: {
+color: 'rgba(220, 220, 220, 0.8)'
+}
+}]
+};
+```
diff --

[incubator-echarts-handbook] 07/11: doc: update post content

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

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

commit 2d943e84211f0720090670961a6721416944b729
Author: Ovilia 
AuthorDate: Thu Apr 16 16:35:24 2020 +0800

doc: update post content
---
 configs/config.js  |  3 +-
 contents/zh/basics/installation.md | 56 ++
 contents/zh/get-started.md | 32 ++
 layouts/default.vue| 14 +-
 4 files changed, 86 insertions(+), 19 deletions(-)

diff --git a/configs/config.js b/configs/config.js
index 2e73436..7f29a80 100644
--- a/configs/config.js
+++ b/configs/config.js
@@ -1,4 +1,5 @@
 export default {
   rootPath: '/echarts-handbook/dist',
-  galleryViewPath: 'https://echarts.apache.org/examples/zh/view.html?c='
+  galleryViewPath: 'https://echarts.apache.org/examples/zh/view.html?c=',
+  mainSitePath: 'https://echarts.apache.org/'
 };
diff --git a/contents/zh/basics/installation.md 
b/contents/zh/basics/installation.md
index 7144b3c..bd3ef3c 100644
--- a/contents/zh/basics/installation.md
+++ b/contents/zh/basics/installation.md
@@ -1 +1,57 @@
 # 安装
+
+Apache ECharts (incubating) 提供了多种安装方式,你可以根据项目的实际情况选择以下任意一种方式安装。
+
+1. 从官网获取
+2. 从 GitHub 获取
+3. 从 CDN 获取
+4. 在线定制
+5. 在线定制
+
+接下来我们将分别介绍这些安装方式,以及下载后的目录结构。
+
+
+
+## 安装方式
+
+### 从官网获取
+
+[Apache ECharts (incubating) 官网下载界面](https://echarts.apache.org/download.html) 
提供了镜像网站下载源码,并且核对签名的方式——这可以保证下载的代码与发布的代码一致。
+
+具体的方法参见[官网下载页面](${mainSitePath}/download.html)。
+
+
+### 从 GitHub 获取
+
+[apache/incubator-echarts](https://github.com/apache/incubator-echarts) 项目的 
[release](https://github.com/apache/incubator-echarts/releases) 
页面可以找到各个版本的链接。点击下载页面下方 Assets 中的 Source code,解压后 `dist` 目录下的 `echarts.js` 
即为包含完整 ECharts 功能的文件。
+
+
+### 从 npm 获取
+
+```sh
+npm install echarts --save
+```
+
+详见[在 webpack 中使用 
echarts](https://echarts.apache.org/tutorial.html#%E5%9C%A8%20webpack%20%E4%B8%AD%E4%BD%BF%E7%94%A8%20ECharts)。
+
+
+### 从 CDN 获取
+
+在 jsDelivr 的 [echarts](https://www.jsdelivr.com/package/npm/echarts) 项目中找到 
`dist/echarts.js`,下载到本地使用。
+
+
+### 在线定制
+
+如果只想引入部分模块以减少包体积,可以使用 [ECharts 在线定制](${mainSitePath}/builder.html)功能。
+
+
+## 目录结构
+
+下面介绍项目 [`dist`](https://github.com/apache/incubator-echarts/tree/master/dist) 
目录下各个文件的意义:
+
+- `echarts.js`:包含了完整 ECharts 功能的代码,没有经过压缩;推荐调试时使用。
+- `echarts.min.js`:`echarts.js` 的压缩结果;推荐线上使用。
+- `echarts.simple.js`:包含折线图、柱状图、饼图的代码;推荐不需要其他系列类型的项目使用。
+- `echarts.common.js`:包含了常用组件和系列类型的代码,完整支持的内容参见 
[echarts.common.js](https://github.com/apache/incubator-echarts/blob/master/echarts.common.js)
+
+带有 `-en` 的文件是对应的英文版本,带有 `.min` 的文件是对应的压缩版本。
diff --git a/contents/zh/get-started.md b/contents/zh/get-started.md
index b2b2db9..6c9dde8 100644
--- a/contents/zh/get-started.md
+++ b/contents/zh/get-started.md
@@ -1,44 +1,42 @@
-# 5 分钟上手 ECharts
+# 快速上手
 
 ## 获取 ECharts
 
-你可以通过以下几种方式获取 ECharts。
+ECharts 支持多种下载方式,可以在下一篇教程[安装](zh/basics_installation)中查看所有方式。这里,我们以从 
[jsDelivr](https://www.jsdelivr.com/package/npm/echarts) CDN 上获取为例,介绍如何快速安装。
 
-* 从 [Apache ECharts (incubating) 
官网下载界面](https://echarts.apache.org/download.html) 获取官方源码包后构建。
+在 
[https://www.jsdelivr.com/package/npm/echarts](https://www.jsdelivr.com/package/npm/echarts)
 选择 `dist/echarts.js`,点击并保存为 `echarts.js` 文件。
 
-* 在 ECharts 的 [GitHub](https://github.com/apache/incubator-echarts/releases) 
获取。
-
-*  通过 npm 获取 echarts,`npm install echarts --save`,详见“[在 webpack 中使用 
echarts](https://echarts.apache.org/tutorial.html#%E5%9C%A8%20webpack%20%E4%B8%AD%E4%BD%BF%E7%94%A8%20ECharts)”
-
-* 通过 [jsDelivr](https://www.jsdelivr.com/package/npm/echarts) 等 CDN 引入
+> 关于这些文件的介绍,可以在下一篇教程[安装](zh/basics_installation)中了解更多信息。
 
 ## 引入 ECharts
 
-通过标签方式直接引入构建好的 echarts 文件
+在刚才保存 `echarts.js` 的目录新建一个 `index.html` 文件,内容如下:
 
 ```html
 
 
 
 
-
-
+
+
 
 
 ```
 
+打开这个 `index.html`,你会看到一片空白。但是不要担心,打开控制台看到没有报错信息,就可以进行下一步。
+
 ## 绘制一个简单的图表
 
-在绘图前我们需要为 ECharts 准备一个具备高宽的 DOM 容器。
+在绘图前我们需要为 ECharts 准备一个定义了高宽的 DOM 容器。在刚才的例子 `` 之后,添加:
 
 ```
 
-
+
 
 
 ```
 
-然后就可以通过 [echarts.init](api.html#echarts.init) 方法初始化一个 echarts 实例并通过 
[setOption](api.html#echartsInstance.setOption) 方法生成一个简单的柱状图,下面是完整代码。
+然后就可以通过 [echarts.init](${mainSitePath}/api.html#echarts.init) 方法初始化一个 echarts 
实例并通过 [setOption](${mainSitePath}/api.html#echartsInstance.setOption) 
方法生成一个简单的柱状图,下面是完整代码。
 
 
 ```html
@@ -47,11 +45,11 @@
 
 
 ECharts
-
+
 
 
 
-
+
 
 

[incubator-echarts-handbook] branch master created (now af7b7f4)

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

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


  at af7b7f4  doc: update content

This branch includes the following new commits:

 new c32db2a  feat: init
 new 894cee7  feat: router completed
 new d2fc73b  WIP: post rounter
 new 7875afb  feat: dynamic nav
 new 2d57243  docs: add example contents
 new d612fb1  feat: code highlighting and iframe demo
 new 2d943e8  doc: update post content
 new e802f7c  doc: add content
 new bb7e1c2  feat: contributors of each file
 new ec93026  doc: update readme and contributions
 new af7b7f4  doc: update content

The 11 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-handbook] 02/11: feat: router completed

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

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

commit 894cee7ab8eae4e91eed90355a0c700c2035d54a
Author: Ovilia 
AuthorDate: Wed Apr 1 14:11:05 2020 +0800

feat: router completed
---
 components/Logo.vue   |  34 
 components/partials/Aside.vue | 159 ++
 components/partials/Navigator.vue |  42 ++
 contents/en/enPosts.js|   1 +
 contents/en/line.md   |   0
 contents/zh/line.md   |  20 +
 contents/zh/zhPosts.js|   1 +
 layouts/default.vue   | 153 +++-
 nuxt.config.js|  36 -
 package-lock.json | 121 +
 package.json  |  11 ++-
 pages/index.vue   |  79 +++
 pages/zh/_post.vue|  29 +++
 store/index.js|  72 +
 tsconfig.json |   4 +-
 types/nuxt.d.ts   |  23 ++
 16 files changed, 677 insertions(+), 108 deletions(-)

diff --git a/components/Logo.vue b/components/Logo.vue
deleted file mode 100644
index 58118db..000
--- a/components/Logo.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-
-  http://www.w3.org/2000/svg;>
-
-  
-  
-  
-
-  
-
-
-.NuxtLogo {
-  animation: 1s appear;
-  margin: auto;
-}
-
-@keyframes appear {
-  0% {
-opacity: 0;
-  }
-  100% {
-opacity: 1;
-  }
-}
-
diff --git a/components/partials/Aside.vue b/components/partials/Aside.vue
new file mode 100644
index 000..cb066d7
--- /dev/null
+++ b/components/partials/Aside.vue
@@ -0,0 +1,159 @@
+
+  
+
+  
+
+
+{{ breadcrumb.group }} 
: {{ breadcrumb.title }}
+  
+  
+
+  {{ $store.state.lang.text.version }} {{ $store.state.docVersion }}
+
+
+  
+{{ group.title }}
+  
+  
+
+  
+{{ link.name }}
+  
+  
+
+  
+{{ content.name }}
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+import throttle from 'lodash/throttle'
+import nuiCaretDown from '@/components/svg/CaretDown'
+import nuiTimes from '@/components/svg/Times'
+
+export default {
+  components: {
+nuiCaretDown,
+nuiTimes
+  },
+  data () {
+return { current: 0, setInter: null, showNav: false }
+  },
+  computed: {
+list () {
+  return this.$store.state.menu[this.$route.params.section] || []
+},
+visible () { return this.$store.state.visibleAffix },
+path () { return this.$route.path.slice(-1) === '/' ? 
this.$route.path.slice(0, -1) : this.$route.path },
+menu () { return '/' + this.$route.params.section },
+breadcrumb () {
+  let breadcrumb = null
+  this.list.forEach((group) => {
+group.links.forEach((link) => {
+  if ((this.$route.params.slug && link.to === '/' + 
this.$route.params.slug) || (!this.$route.params.slug && (link.to === '' || 
link.to === '/'))) {
+breadcrumb = { group: group.title, title: link.name }
+  }
+})
+  })
+  return breadcrumb
+},
+contents () {
+  const c = []
+  this.list.forEach((group) => {
+if (Array.isArray(group.links) && !c.length) {
+  const l = group.links.find((link) => {
+return this.path === this.menu + link.to
+  })
+  if (l && l.contents) {
+l.contents.forEach((content) => {
+  const el = document.getElementById(content.to.slice(1))
+  if (el) {
+c.push(el.offsetTop)
+  }
+})
+  }
+}
+  })
+  return c
+}
+  },
+  watch: {
+'$route.fullPath': 'hashChanged'
+  },
+  mounted () {
+this.$nextTick(() => {
+  window.addEventListener('scroll', throttle(() => this.scrolled(), 100))
+  if (this.$route.hash.length) {
+this.scrollTo(this.$route.hash)
+  }
+  this.scrolled()
+})
+  },
+  methods: {
+hashChanged (toPath, fromPath) {
+  this.showNav = false
+  toPath = toPath.split('#')
+  fromPath = fromPath.split('#')
+  this.$nextTick(() => this.scrollTo(this.$route.hash))
+},
+toggle () { this.$store.commit('toggle', 'visibleAffix') },
+scrolled () {
+  const h = window.innerHeight || document.documentElement.clientHeight || 
document.body.clientHeight
+  const doc = document.documentElement
+  const top = (window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0)
+  const el = this.contents.find((pos) => {
+

[incubator-echarts-handbook] 11/11: doc: update content

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

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

commit af7b7f402dc9a883bf86a02f0554ea6405f7b0bb
Author: Ovilia 
AuthorDate: Wed Jun 17 19:13:22 2020 +0800

doc: update content
---
 contents/zh/chart-types/bar/simple-bar.md  | 42 ++
 contents/zh/chart-types/bar/stacked-bar.md | 29 +
 contents/zh/concepts/chart-size.md |  2 +-
 layouts/default.vue|  1 +
 4 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/contents/zh/chart-types/bar/simple-bar.md 
b/contents/zh/chart-types/bar/simple-bar.md
index 0c004b3..5b77706 100644
--- a/contents/zh/chart-types/bar/simple-bar.md
+++ b/contents/zh/chart-types/bar/simple-bar.md
@@ -1 +1,43 @@
 # 最简单的柱状图
+
+柱状图(或称条形图)是一种通过柱形的高度(横向的情况下则是宽度)来表现数据大小的一种常用图表类型。
+
+设置柱状图的方式,是将 `series` 的 `name` 设为 `'bar'`。最简单的柱状图可以这样设置:
+
+
+```js
+option = {
+xAxis: {
+data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+},
+yAxis: {},
+series: [{
+type: 'bar',
+data: [23, 24, 18, 25, 27, 28, 25]
+}]
+};
+```
+
+在这个例子中,横坐标是类目型的,因此需要在 `xAxis` 中指定对应的值;而纵坐标是数值型的,可以根据 `series` 中的 
`data`,自动生成对应的坐标范围。
+
+
+## 多系列的柱状图
+
+我们可以用一个系列表示一组相关的数据,如果需要实现多系列的柱状图,只需要在 `series` 多添加一项就可以了——
+
+
+```js
+option = {
+xAxis: {
+data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+},
+yAxis: {},
+series: [{
+type: 'bar',
+data: [23, 24, 18, 25, 27, 28, 25]
+}, {
+type: 'bar',
+data: [26, 24, 18, 22, 23, 20, 27]
+}]
+};
+```
diff --git a/contents/zh/chart-types/bar/stacked-bar.md 
b/contents/zh/chart-types/bar/stacked-bar.md
index 0c942d2..246c58b 100644
--- a/contents/zh/chart-types/bar/stacked-bar.md
+++ b/contents/zh/chart-types/bar/stacked-bar.md
@@ -1 +1,30 @@
 # 堆叠柱状图
+
+有时候,我们不仅希望知道不同系列各自的数值,还希望知道它们之和的变化,这时候通常使用堆积柱状图图来表现。顾名思义,堆积柱状图就是一个系列的数值“堆积”在另一个系列上,因而从他们的高度总和就能表达总量的变化。
+
+使用 EChart 实现堆积折线图的方法非常简单,只需要给一个系列的 `stack` 
值设置一个字符串类型的值,这一个值表示该系列堆积的类别。也就是说,拥有同样 `stack` 值的系列将堆积在一组。
+
+
+```js
+option = {
+xAxis: {
+data: ['A', 'B', 'C', 'D', 'E']
+},
+yAxis: {},
+series: [{
+data: [10, 22, 28, 43, 49],
+type: 'bar',
+stack: 'x'
+}, {
+data: [5, 4, 3, 5, 10],
+type: 'bar',
+stack: 'x'
+}]
+};
+```
+
+在这个例子中,第二个系列所在的位置是在第一个系列的位置的基础上,上升了第二个系列数值对应的高度。因此,从第二个系列的位置,就能看出这两者总和的变化趋势。
+
+> `stack` 
的取值用来表明哪些系列将被堆积在一起,理论上只要取值相同即可,具体的取值并没有什么区别。但在实际的应用中,我们建议使用一些有意义的字符串方便阅读。
+>
+>比如,在一个统计男女人数的图中,有四个系列,“成年男性”和“男孩”系列需要进行堆积,“成年女性”和“女孩”系列需要堆积。这时,这两组的的 `stack` 
值就建议分别设为 `'男'` 和 `'女'`。虽然使用 `'a'` 和 `'b'` 这样没有意义的字符串也能实现同样的效果,但是代码的可阅读性就差了。
diff --git a/contents/zh/concepts/chart-size.md 
b/contents/zh/concepts/chart-size.md
index c8fb1e8..27769bc 100644
--- a/contents/zh/concepts/chart-size.md
+++ b/contents/zh/concepts/chart-size.md
@@ -40,7 +40,7 @@
 
 ### 场景三:监听图表容器的大小并改变图表大小
 
-在有些场景下,我们希望当容器大小改变时,图表的大小也响应地改变。
+在有些场景下,我们希望当容器大小改变时,图表的大小也相应地改变。
 
 比如,图表容器是一个高度为 300px、宽度为页面 100% 的节点,你希望在浏览器宽度改变的时候,始终保持图表宽度是页面的 100%。
 
diff --git a/layouts/default.vue b/layouts/default.vue
index ccf1095..9190e71 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -56,6 +56,7 @@ export default Vue.extend({
 
 .post-contributor {
   display: inline-block;
+  margin-right: 15px;
   border: 1px solid #eee;
   border-radius: 5px;
   color: #777;


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



[incubator-echarts-handbook] 10/11: doc: update readme and contributions

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

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

commit ec93026ca43d39dd4be7d2705f8683dcef39ffa3
Author: Ovilia 
AuthorDate: Tue May 12 16:31:19 2020 +0800

doc: update readme and contributions
---
 README.md|   4 ++
 pages/helper/contributors.ts | 102 ++-
 2 files changed, 105 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f779ff9..89b9ab8 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,10 @@ Open in browser: http://localhost:3000/echarts-handbook/dist/
 ## Release
 
 ```bash
+# Update contributors
+npm run prepare
+
+# Generate to `dist`
 npm run generate
 ```
 
diff --git a/pages/helper/contributors.ts b/pages/helper/contributors.ts
index ff8b4c5..84a731a 100644
--- a/pages/helper/contributors.ts
+++ b/pages/helper/contributors.ts
@@ -1 +1,101 @@
-export default {};
+export default {
+"contents/zh/meta/get-started.md": [
+    "Ovilia"
+],
+"contents/zh/get-started.md": [
+"Ovilia"
+],
+"contents/zh/cookbook/mobile.md": [
+"Ovilia"
+],
+"contents/zh/cookbook/downplay.md": [
+"Ovilia"
+],
+"contents/zh/cookbook/down-play.md": [
+"Ovilia"
+],
+"contents/zh/cookbook/cross-platform.md": [
+"Ovilia"
+],
+    "contents/zh/cookbook/connect.md": [
+"Ovilia"
+],
+"contents/zh/cookbook/aria.md": [
+"Ovilia"
+],
+"contents/zh/concepts/visual-map.md": [
+"Ovilia"
+],
+"contents/zh/concepts/tooltip.md": [
+"Ovilia"
+],
+"contents/zh/concepts/series.md": [
+    "Ovilia"
+],
+"contents/zh/concepts/options.md": [
+"Ovilia"
+],
+"contents/zh/concepts/legend.md": [
+"Ovilia"
+],
+    "contents/zh/concepts/coordinate.md": [
+"Ovilia"
+],
+"contents/zh/concepts/chart-size.md": [
+    "Ovilia"
+],
+"contents/zh/concepts/axis.md": [
+"Ovilia"
+],
+"contents/zh/chart-types/xxx.md": [
+"Ovilia"
+],
+"contents/zh/chart-types/line.md": [
+"Ovilia"
+],
+"contents/zh/chart-types/bar/waterfall.md": [
+"Ovilia"
+    ],
+"contents/zh/chart-types/bar/visual-map.md": [
+    "Ovilia"
+],
+"contents/zh/chart-types/bar/stacked-bar.md": [
+"Ovilia"
+],
+"contents/zh/chart-types/bar/simple-bar.md": [
+    "Ovilia"
+],
+"contents/zh/chart-types/bar/polar-bar.md": [
+"Ovilia"
+],
+"contents/zh/best-practice/mobile.md": [
+"Ovilia"
+],
+"contents/zh/best-practice/design.md": [
+"Ovilia"
+],
+"contents/zh/basics/resource.md": [
+"Ovilia"
+],
+"contents/zh/basics/inspiration.md": [
+"Ovilia"
+],
+"contents/zh/basics/help.md": [
+"Ovilia"
+],
+"contents/zh/basics/download.md": [
+"Ovilia"
+],
+"contents/en/posts.js": [
+"Ovilia"
+],
+"contents/en/bar.md": [
+"Ovilia"
+],
+"contents/zh/meta/writing.md": [
+"Ovilia"
+],
+"contents/zh/posts.js": [
+"Ovilia"
+]
+};
\ 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-handbook] 05/11: docs: add example contents

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

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

commit 2d57243be5344553a6a4f7ae8080040bceebfe6b
Author: Ovilia 
AuthorDate: Wed Apr 8 15:22:46 2020 +0800

docs: add example contents
---
 components/partials/Sidebar.vue|  13 +++-
 contents/zh/basics/configuration.md|   1 +
 contents/zh/basics/help.md |   1 +
 contents/zh/basics/inspiration.md  |   1 +
 contents/zh/basics/installation.md |   1 +
 contents/zh/basics/resource.md |   1 +
 contents/zh/best-practice/design.md|   0
 contents/zh/best-practice/mobile.md|   0
 contents/zh/chart-types/bar/polar-bar.md   |   0
 contents/zh/chart-types/bar/stacked-bar.md |   1 +
 contents/zh/chart-types/bar/visual-map.md  |   0
 contents/zh/chart-types/bar/waterfall.md   |   0
 contents/zh/concepts/axis.md   |   0
 contents/zh/concepts/coordinate.md |   0
 contents/zh/concepts/options.md|   0
 contents/zh/concepts/series.md |   0
 contents/zh/concepts/tooltip.md|   0
 contents/zh/concepts/visual-map.md |   0
 contents/zh/cookbook/aria.md   |   0
 contents/zh/cookbook/connect.md|   0
 contents/zh/cookbook/cross-platform.md |   1 +
 contents/zh/cookbook/down-play.md  |   0
 contents/zh/get-started.md |  91 +++
 contents/zh/meta/get-started.md|  40 ++
 contents/zh/meta/writing.md|  22 ++
 contents/zh/posts.js   | 114 +++--
 layouts/default.vue|  11 +++
 pages/zh/_post.vue |   4 +-
 28 files changed, 292 insertions(+), 10 deletions(-)

diff --git a/components/partials/Sidebar.vue b/components/partials/Sidebar.vue
index 61d0162..fd1bed2 100644
--- a/components/partials/Sidebar.vue
+++ b/components/partials/Sidebar.vue
@@ -3,14 +3,19 @@
 
 
   
-{{ level0Post.title }}
-
+{{ level0Post.title }}
+
   
 {{ level1Post.title }}
-
+
   
-{{ level2Post.title }}
+{{ level2Post.title }}
   
 
   
diff --git a/contents/zh/basics/configuration.md 
b/contents/zh/basics/configuration.md
new file mode 100644
index 000..450f307
--- /dev/null
+++ b/contents/zh/basics/configuration.md
@@ -0,0 +1 @@
+# 初始化设置
diff --git a/contents/zh/basics/help.md b/contents/zh/basics/help.md
new file mode 100644
index 000..b61dc29
--- /dev/null
+++ b/contents/zh/basics/help.md
@@ -0,0 +1 @@
+# 寻求帮助
\ No newline at end of file
diff --git a/contents/zh/basics/inspiration.md 
b/contents/zh/basics/inspiration.md
new file mode 100644
index 000..f96933e
--- /dev/null
+++ b/contents/zh/basics/inspiration.md
@@ -0,0 +1 @@
+# 获取灵感
diff --git a/contents/zh/basics/installation.md 
b/contents/zh/basics/installation.md
new file mode 100644
index 000..7144b3c
--- /dev/null
+++ b/contents/zh/basics/installation.md
@@ -0,0 +1 @@
+# 安装
diff --git a/contents/zh/basics/resource.md b/contents/zh/basics/resource.md
new file mode 100644
index 000..88fb670
--- /dev/null
+++ b/contents/zh/basics/resource.md
@@ -0,0 +1 @@
+# 资源列表
diff --git a/contents/zh/best-practice/design.md 
b/contents/zh/best-practice/design.md
new file mode 100644
index 000..e69de29
diff --git a/contents/zh/best-practice/mobile.md 
b/contents/zh/best-practice/mobile.md
new file mode 100644
index 000..e69de29
diff --git a/contents/zh/chart-types/bar/polar-bar.md 
b/contents/zh/chart-types/bar/polar-bar.md
new file mode 100644
index 000..e69de29
diff --git a/contents/zh/chart-types/bar/stacked-bar.md 
b/contents/zh/chart-types/bar/stacked-bar.md
new file mode 100644
index 000..0c942d2
--- /dev/null
+++ b/contents/zh/chart-types/bar/stacked-bar.md
@@ -0,0 +1 @@
+# 堆叠柱状图
diff --git a/contents/zh/chart-types/bar/visual-map.md 
b/contents/zh/chart-types/bar/visual-map.md
new file mode 100644
index 000..e69de29
diff --git a/contents/zh/chart-types/bar/waterfall.md 
b/contents/zh/chart-types/bar/waterfall.md
new file mode 100644
index 000..e69de29
diff --git a/contents/zh/concepts/axis.md b/contents/zh/concepts/axis.md
new file mode 100644
index 000..e69de29
diff --git a/contents/zh/concepts/coordinate.md 
b/contents/zh/concepts/coordinate.md
new file mode 100644
index 000..e69de29
diff --git a/contents/zh/concepts/options.md b/contents/zh/concepts/options.md
new file mode 100644
index 000..e69de29
diff --git a/contents/zh/concepts/series.md b/contents/zh/concepts/series.md
new file mode 100644
index 000..e69de29
diff --git a/contents/zh/concepts/tooltip.md b/contents/zh/concepts/tooltip.md
new file mode 100644
index 000..e69de29
diff --git a/contents/zh

[incubator-echarts-handbook] 09/11: feat: contributors of each file

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

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

commit bb7e1c2a676f9f51ee7febf7a9558084e5575116
Author: Ovilia 
AuthorDate: Tue May 12 16:22:07 2020 +0800

feat: contributors of each file
---
 build/generate-contributors.js   | 38 ++
 configs/config.js|  3 ++-
 contents/zh/chart-types/line.md  |  2 ++
 contents/zh/chart-types/xxx.md   |  0
 contents/zh/concepts/legend.md   |  0
 contents/zh/cookbook/downplay.md |  0
 contents/zh/cookbook/mobile.md   |  0
 layouts/default.vue  | 39 ++-
 package-lock.json| 14 +++---
 package.json |  1 +
 pages/helper/contributors.ts |  1 +
 pages/helper/post.ts |  9 ++---
 pages/zh/_post.vue   | 17 -
 13 files changed, 115 insertions(+), 9 deletions(-)

diff --git a/build/generate-contributors.js b/build/generate-contributors.js
new file mode 100644
index 000..20d615b
--- /dev/null
+++ b/build/generate-contributors.js
@@ -0,0 +1,38 @@
+const { exec } = require('child_process');
+const fs = require('fs');
+
+const dir = './contents';
+
+const entries = {};
+const paths = [];
+
+const loopDir = path => {
+if (fs.lstatSync(path).isDirectory()) {
+const children = fs.readdirSync(path);
+children.forEach(child => loopDir([path, child].join('/')));
+}
+else {
+paths.push(path);
+}
+}
+
+loopDir(dir);
+
+for (let i = 0; i < paths.length; ++i) {
+const cmd = `git log --pretty=format:"%an%x09" ${paths[i]} | sort | uniq`;
+(i => {
+exec(cmd, (err, stdout) => {
+if (err) {
+console.error(err);
+}
+else {
+const key = paths[i].slice(2);
+entries[key] = stdout.trim().replace('\t\n', ',').split(',');
+}
+if (i === paths.length - 1) {
+const text = 'export default ' + JSON.stringify(entries, null, 
'') + ';';
+fs.writeFileSync('pages/helper/contributors.ts', text);
+}
+});
+})(i);
+}
diff --git a/configs/config.js b/configs/config.js
index 7f29a80..2c2e1f6 100644
--- a/configs/config.js
+++ b/configs/config.js
@@ -1,5 +1,6 @@
 export default {
   rootPath: '/echarts-handbook/dist',
   galleryViewPath: 'https://echarts.apache.org/examples/zh/view.html?c=',
-  mainSitePath: 'https://echarts.apache.org/'
+  mainSitePath: 'https://echarts.apache.org/',
+  gitRepo: 'Ovilia/incubator-echarts-handbook'
 };
diff --git a/contents/zh/chart-types/line.md b/contents/zh/chart-types/line.md
index 1424711..f2977ec 100644
--- a/contents/zh/chart-types/line.md
+++ b/contents/zh/chart-types/line.md
@@ -22,3 +22,5 @@ option = {
 引用图片的方法:(这个图片实际存放地址在 `static/images/demo.png`)
 
 ![图片说明](${rootPath}/images/demo.png)
+
+sss
diff --git a/contents/zh/chart-types/xxx.md b/contents/zh/chart-types/xxx.md
new file mode 100644
index 000..e69de29
diff --git a/contents/zh/concepts/legend.md b/contents/zh/concepts/legend.md
new file mode 100644
index 000..e69de29
diff --git a/contents/zh/cookbook/downplay.md b/contents/zh/cookbook/downplay.md
new file mode 100644
index 000..e69de29
diff --git a/contents/zh/cookbook/mobile.md b/contents/zh/cookbook/mobile.md
new file mode 100644
index 000..e69de29
diff --git a/layouts/default.vue b/layouts/default.vue
index 730d495..ccf1095 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -42,10 +42,47 @@ export default Vue.extend({
 
 
 

[incubator-echarts-handbook] 03/11: WIP: post rounter

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

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

commit d2fc73b2f68a1ee35adb1aba68f179f400979da3
Author: Ovilia 
AuthorDate: Tue Apr 7 15:54:57 2020 +0800

WIP: post rounter
---
 README.md |   4 +-
 components/partials/Aside.vue | 159 --
 components/partials/Sidebar.vue   |  90 +++
 contents/en/{line.md => bar.md}   |   0
 contents/en/enPosts.js|   1 -
 contents/en/posts.js  |   1 +
 contents/zh/chart-types/bar.md|   3 +
 contents/zh/{ => chart-types}/line.md |   0
 contents/zh/posts.js  |  10 +++
 contents/zh/zhPosts.js|   1 -
 layouts/README.md |   7 --
 layouts/default.vue   |  93 +++-
 nuxt.config.js|  37 ++--
 package.json  |   4 +-
 pages/index.vue   |  73 
 pages/zh/_post.vue|   5 +-
 16 files changed, 152 insertions(+), 336 deletions(-)

diff --git a/README.md b/README.md
index f583d55..fb7e13b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,4 @@
-# echarts-booklet
-
-> ECharts booklet
+# echarts-handbook
 
 ## Build Setup
 
diff --git a/components/partials/Aside.vue b/components/partials/Aside.vue
deleted file mode 100644
index cb066d7..000
--- a/components/partials/Aside.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-
-  
-
-  
-
-
-{{ breadcrumb.group }} 
: {{ breadcrumb.title }}
-  
-  
-
-  {{ $store.state.lang.text.version }} {{ $store.state.docVersion }}
-
-
-  
-{{ group.title }}
-  
-  
-
-  
-{{ link.name }}
-  
-  
-
-  
-{{ content.name }}
-  
-
-  
-
-  
-
-  
-
-  
-
-
-
-import throttle from 'lodash/throttle'
-import nuiCaretDown from '@/components/svg/CaretDown'
-import nuiTimes from '@/components/svg/Times'
-
-export default {
-  components: {
-nuiCaretDown,
-nuiTimes
-  },
-  data () {
-return { current: 0, setInter: null, showNav: false }
-  },
-  computed: {
-list () {
-  return this.$store.state.menu[this.$route.params.section] || []
-},
-visible () { return this.$store.state.visibleAffix },
-path () { return this.$route.path.slice(-1) === '/' ? 
this.$route.path.slice(0, -1) : this.$route.path },
-menu () { return '/' + this.$route.params.section },
-breadcrumb () {
-  let breadcrumb = null
-  this.list.forEach((group) => {
-group.links.forEach((link) => {
-  if ((this.$route.params.slug && link.to === '/' + 
this.$route.params.slug) || (!this.$route.params.slug && (link.to === '' || 
link.to === '/'))) {
-breadcrumb = { group: group.title, title: link.name }
-  }
-})
-  })
-  return breadcrumb
-},
-contents () {
-  const c = []
-  this.list.forEach((group) => {
-if (Array.isArray(group.links) && !c.length) {
-  const l = group.links.find((link) => {
-return this.path === this.menu + link.to
-  })
-  if (l && l.contents) {
-l.contents.forEach((content) => {
-  const el = document.getElementById(content.to.slice(1))
-  if (el) {
-c.push(el.offsetTop)
-  }
-})
-  }
-}
-  })
-  return c
-}
-  },
-  watch: {
-'$route.fullPath': 'hashChanged'
-  },
-  mounted () {
-this.$nextTick(() => {
-  window.addEventListener('scroll', throttle(() => this.scrolled(), 100))
-  if (this.$route.hash.length) {
-this.scrollTo(this.$route.hash)
-  }
-  this.scrolled()
-})
-  },
-  methods: {
-hashChanged (toPath, fromPath) {
-  this.showNav = false
-  toPath = toPath.split('#')
-  fromPath = fromPath.split('#')
-  this.$nextTick(() => this.scrollTo(this.$route.hash))
-},
-toggle () { this.$store.commit('toggle', 'visibleAffix') },
-scrolled () {
-  const h = window.innerHeight || document.documentElement.clientHeight || 
document.body.clientHeight
-  const doc = document.documentElement
-  const top = (window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0)
-  const el = this.contents.find((pos) => {
-return pos > top + (h / 2)
-  })
-  this.current = (el ? this.contents.indexOf(el) : this.contents.length) - 
1
-},
-scrollTo (id) {
-  if (this._scrolling) {
-return
-  }

[incubator-echarts-handbook] 06/11: feat: code highlighting and iframe demo

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

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

commit d612fb152af11ec342f8bb0fe879e62f9974bb65
Author: Ovilia 
AuthorDate: Thu Apr 16 15:33:22 2020 +0800

feat: code highlighting and iframe demo
---
 .gitignore |  1 +
 README.md  |  2 ++
 configs/config.js  |  3 ++-
 contents/zh/get-started.md |  2 +-
 layouts/default.vue| 13 +
 package-lock.json  | 19 +++
 package.json   |  1 +
 pages/en/_post.vue | 20 
 pages/helper/post.ts   | 25 +
 pages/zh/_post.vue | 16 ++--
 10 files changed, 86 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index e8f682b..e10e71c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.vscode
 
 # Runtime data
 pids
diff --git a/README.md b/README.md
index 717982f..f779ff9 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,8 @@ npm install
 npm run dev
 ```
 
+Open in browser: http://localhost:3000/echarts-handbook/dist/
+
 ## Release
 
 ```bash
diff --git a/configs/config.js b/configs/config.js
index 1300256..2e73436 100644
--- a/configs/config.js
+++ b/configs/config.js
@@ -1,3 +1,4 @@
 export default {
-  rootPath: '/echarts-handbook/dist'
+  rootPath: '/echarts-handbook/dist',
+  galleryViewPath: 'https://echarts.apache.org/examples/zh/view.html?c='
 };
diff --git a/contents/zh/get-started.md b/contents/zh/get-started.md
index d2f6668..b2b2db9 100644
--- a/contents/zh/get-started.md
+++ b/contents/zh/get-started.md
@@ -86,6 +86,6 @@
 
 这样你的第一个图表就诞生了!
 
-~[600x300](${galleryViewPath}doc-example/getting-started=1=1)
+
 
 你也可以直接进入 [ECharts Gallery](${galleryEditorPath}doc-example/getting-started) 
中查看编辑示例
diff --git a/layouts/default.vue b/layouts/default.vue
index 87cedc8..1cc022d 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -13,6 +13,8 @@
 
   
 
+
+
   
 
 
@@ -80,4 +82,15 @@ blockquote {
 blockquote :last-child {
   margin-bottom: 0;
 }
+
+pre code {
+  padding: 10px 15px !important;
+  border-radius: 5px;
+  border: 1px solid #eee;
+}
+
+iframe {
+  border: 1px solid #ddd;
+  margin: 10px 0;
+}
 
diff --git a/package-lock.json b/package-lock.json
index a2b4c2d..eb72400 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6383,6 +6383,11 @@
   "resolved": 
"https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz;,
   "integrity": 
"sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
 },
+"highlight.js": {
+  "version": "9.18.1",
+  "resolved": 
"https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz;,
+  "integrity": 
"sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg=="
+},
 "hmac-drbg": {
   "version": "1.0.1",
   "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz;,
@@ -7308,6 +7313,11 @@
   "integrity": 
"sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==",
   "dev": true
 },
+"lodash.flow": {
+  "version": "3.5.0",
+  "resolved": 
"https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz;,
+  "integrity": "sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o="
+},
 "lodash.get": {
   "version": "4.4.2",
   "resolved": 
"https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz;,
@@ -7446,6 +7456,15 @@
 "uc.micro": "^1.0.5"
   }
 },
+"markdown-it-highlightjs": {
+  "version": "3.1.0",
+  "resolved": 
"https://registry.npmjs.org/markdown-it-highlightjs/-/markdown-it-highlightjs-3.1.0.tgz;,
+  "integrity": 
"sha512-SYy8fXlZ7Bk+Q+bc9JmHHcMCUFsKR3nr1JjkpPnq0gsmLOyIaxJfRoIAVqWF/AIuN7CZlJWQuSFwQoBb6dZmnQ==",
+  "requires": {
+"highlight.js": "^9.18.1",
+"lodash.flow": "^3.5.0"
+  }
+},
 "md5.js": {
   "version": "1.3.5",
   "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz;,
diff --git a/package.json b/package.json
index 0537008..1af90e3 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
   "dependencies": {
 "bootstrap": "^4.1.3",
 "bootstrap-vue": "^2.0.0",
+"markdown-

  1   2   3   4   5   6   >