You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2018/09/03 04:56:12 UTC
[incubator-echarts] 02/03: Merge branch 'master' of
https://github.com/apache/incubator-echarts
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit e9026568eb0e3f8208760a3ec2f583818fc9231c
Merge: 0cdd084 fab18f3
Author: sushuang <su...@gmail.com>
AuthorDate: Mon Sep 3 12:14:46 2018 +0800
Merge branch 'master' of https://github.com/apache/incubator-echarts
src/chart/sankey/SankeySeries.js | 16 +-
src/chart/sankey/SankeyView.js | 98 +++++--
src/chart/sankey/sankeyLayout.js | 317 ++++++++++++++--------
src/chart/sunburst/SunburstSeries.js | 5 +
src/chart/themeRiver/ThemeRiverSeries.js | 3 +-
src/chart/tree/TreeSeries.js | 2 +-
src/chart/tree/TreeView.js | 69 ++---
src/chart/tree/layoutHelper.js | 9 +-
src/chart/tree/traversalHelper.js | 4 +-
src/chart/tree/treeAction.js | 2 +-
src/chart/tree/treeLayout.js | 8 +-
src/component/tooltip/TooltipRichContent.js | 24 +-
src/component/tooltip/TooltipView.js | 14 +-
src/coord/axisTickLabelBuilder.js | 1 -
src/coord/polar/AngleAxis.js | 71 ++++-
src/layout/barPolar.js | 5 +-
src/model/Series.js | 20 +-
src/model/mixin/dataFormat.js | 4 +-
src/util/model.js | 11 +
src/util/{array => }/nest.js | 14 +-
test/bar-polar-basic-radial.html | 1 +
test/{sankey-test.html => sankey-horizontal.html} | 7 +-
test/{sankey-test.html => sankey-vertical.html} | 7 +-
test/singleAxisScales.html | 4 +-
test/tooltip-rich.html | 2 +-
test/tree-basic.html | 2 +-
26 files changed, 482 insertions(+), 238 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org