Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/chart/pie/labelLayout.js
#	src/chart/sunburst/SunburstPiece.js
  • Loading branch information
100pah committed Jan 12, 2019
2 parents e0393f2 + 8dad11f commit 856a285
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/chart/sunburst/SunburstPiece.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ SunburstPieceProto.updateData = function (
var itemModel = node.getModel();
var layout = node.getLayout();
// if (!layout) {
// console.log(node.getLayout());
// console.log(node.getLayout());
// }
var sectorShape = zrUtil.extend({}, layout);
sectorShape.label = null;

var visualColor = getNodeColor(node, seriesModel, ecModel);

fillDefaultColor(node, seriesModel, visualColor)
fillDefaultColor(node, seriesModel, visualColor);

var normalStyle = itemModel.getModel('itemStyle').getItemStyle();
var style;
Expand Down Expand Up @@ -414,7 +414,7 @@ function isNodeHighlighted(node, activeNode, policy) {
}
}

// Fix tooltip callback function params.color incorrect when pick a default color
// Fix tooltip callback function params.color incorrect when pick a default color
function fillDefaultColor(node, seriesModel, color) {
var data = seriesModel.getData();
data.setItemVisual(node.dataIndex, 'color', color);
Expand Down

0 comments on commit 856a285

Please sign in to comment.