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 4ad251e fix: sunburst roll-up piece update
new 828a085 Merge branch 'master' of github.com:ecomfe/echarts
4ad251e is described below
commit 4ad251e4223dc0a1f2c8abe60ef8fe424c6c279f
Author: Ovilia <zwl.s...@gmail.com>
AuthorDate: Fri Apr 13 10:52:11 2018 +0800
fix: sunburst roll-up piece update
#8132
---
src/chart/sunburst/SunburstPiece.js | 5 +++++
src/chart/sunburst/SunburstView.js | 18 +++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/chart/sunburst/SunburstPiece.js
b/src/chart/sunburst/SunburstPiece.js
index 6fc1474..963fe93 100644
--- a/src/chart/sunburst/SunburstPiece.js
+++ b/src/chart/sunburst/SunburstPiece.js
@@ -23,6 +23,8 @@ function SunburstPiece(node, seriesModel, ecModel) {
var sector = new graphic.Sector({
z2: DEFAULT_SECTOR_Z
});
+ sector.seriesIndex = seriesModel.seriesIndex;
+
var text = new graphic.Text({
z2: DEFAULT_TEXT_Z,
silent: node.getModel('label').get('silent')
@@ -65,6 +67,9 @@ SunburstPieceProto.updateData = function (
var itemModel = node.getModel();
var layout = node.getLayout();
+ if (!layout) {
+ console.log(node.getLayout());
+ }
var sectorShape = zrUtil.extend({}, layout);
sectorShape.label = null;
diff --git a/src/chart/sunburst/SunburstView.js
b/src/chart/sunburst/SunburstView.js
index 8a86bcf..7ac2312 100644
--- a/src/chart/sunburst/SunburstView.js
+++ b/src/chart/sunburst/SunburstView.js
@@ -43,7 +43,7 @@ var SunburstView = ChartView.extend({
payload.highlight.piece.onEmphasis(highlightPolicy);
}
else if (payload && payload.unhighlight) {
- var piece = virtualRoot.piece;
+ var piece = this.virtualPiece;
if (!piece && virtualRoot.children.length) {
piece = virtualRoot.children[0].piece;
}
@@ -129,19 +129,19 @@ var SunburstView = ChartView.extend({
function renderRollUp(virtualRoot, viewRoot) {
if (viewRoot.depth > 0) {
// Render
- if (virtualRoot.piece) {
+ if (that.virtualPiece) {
// Update
- virtualRoot.piece.updateData(
+ that.virtualPiece.updateData(
false, virtualRoot, 'normal', seriesModel, ecModel);
}
else {
// Add
- virtualRoot.piece = new SunburstPiece(
+ that.virtualPiece = new SunburstPiece(
virtualRoot,
seriesModel,
ecModel
);
- group.add(virtualRoot.piece);
+ group.add(that.virtualPiece);
}
if (viewRoot.piece._onclickEvent) {
@@ -151,12 +151,12 @@ var SunburstView = ChartView.extend({
that._rootToNode(viewRoot.parentNode);
};
viewRoot.piece._onclickEvent = event;
- virtualRoot.piece.on('click', event);
+ that.virtualPiece.on('click', event);
}
- else if (virtualRoot.piece) {
+ else if (that.virtualPiece) {
// Remove
- group.remove(virtualRoot.piece);
- virtualRoot.piece = null;
+ group.remove(that.virtualPiece);
+ that.virtualPiece = null;
}
}
},
--
To stop receiving notification emails like this one, please contact
ovi...@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
