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:10 UTC
[incubator-echarts] branch master updated (fab18f3 -> ba7a252)
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
from fab18f3 fix(sunburst): update normal shadow style #8583
new 0cdd084 Fix eslintrc
new e902656 Merge branch 'master' of https://github.com/apache/incubator-echarts
new ba7a252 reverse code style since eslintrc modified.
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:
.eslintrc.yaml | 6 +++---
src/chart/tree/TreeView.js | 35 ++++++++++++++++++-----------------
2 files changed, 21 insertions(+), 20 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 02/03: Merge branch 'master' of
https://github.com/apache/incubator-echarts
Posted by su...@apache.org.
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
[incubator-echarts] 01/03: Fix eslintrc
Posted by su...@apache.org.
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 0cdd0848815a49b4eb2d1c1ed32e317c22f68f8c
Author: sushuang <su...@gmail.com>
AuthorDate: Mon Sep 3 12:13:40 2018 +0800
Fix eslintrc
---
.eslintrc.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index 212bd64..9126a59 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -33,7 +33,7 @@ rules:
- 2
- "allow-null"
guard-for-in: 1
- no-else-return: 1
+ no-else-return: 0
no-labels:
- 1
-
@@ -52,7 +52,7 @@ rules:
no-octal: 1
no-octal-escape: 1
no-proto: 2
- no-redeclare: 1
+ no-redeclare: 0
no-self-compare: 2
no-unneeded-ternary: 2
no-with: 1
@@ -152,7 +152,7 @@ rules:
ignoreComments: true
max-params:
- 1
- - 6
+ - 15
space-infix-ops: 2
dot-notation:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 03/03: reverse code style since eslintrc
modified.
Posted by su...@apache.org.
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 ba7a25246c9a6a8770c98207fc03cc689327548c
Author: sushuang <su...@gmail.com>
AuthorDate: Mon Sep 3 12:16:37 2018 +0800
reverse code style since eslintrc modified.
---
src/chart/tree/TreeView.js | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/chart/tree/TreeView.js b/src/chart/tree/TreeView.js
index 86b022a..9ded9dd 100644
--- a/src/chart/tree/TreeView.js
+++ b/src/chart/tree/TreeView.js
@@ -467,23 +467,24 @@ function getEdgeShape(seriesScope, sourceLayout, targetLayout) {
cpy2: radialCoor3.y
};
}
-
- x1 = sourceLayout.x;
- y1 = sourceLayout.y;
- x2 = targetLayout.x;
- y2 = targetLayout.y;
-
- if (orient === 'LR' || orient === 'RL') {
- cpx1 = x1 + (x2 - x1) * seriesScope.curvature;
- cpy1 = y1;
- cpx2 = x2 + (x1 - x2) * seriesScope.curvature;
- cpy2 = y2;
- }
- if (orient === 'TB' || orient === 'BT') {
- cpx1 = x1;
- cpy1 = y1 + (y2 - y1) * seriesScope.curvature;
- cpx2 = x2;
- cpy2 = y2 + (y1 - y2) * seriesScope.curvature;
+ else {
+ x1 = sourceLayout.x;
+ y1 = sourceLayout.y;
+ x2 = targetLayout.x;
+ y2 = targetLayout.y;
+
+ if (orient === 'LR' || orient === 'RL') {
+ cpx1 = x1 + (x2 - x1) * seriesScope.curvature;
+ cpy1 = y1;
+ cpx2 = x2 + (x1 - x2) * seriesScope.curvature;
+ cpy2 = y2;
+ }
+ if (orient === 'TB' || orient === 'BT') {
+ cpx1 = x1;
+ cpy1 = y1 + (y2 - y1) * seriesScope.curvature;
+ cpx2 = x2;
+ cpy2 = y2 + (y1 - y2) * seriesScope.curvature;
+ }
}
return {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org