diff --git a/src/chart/sankey/SankeySeries.js b/src/chart/sankey/SankeySeries.js index 167d845d42dc539d7ee4f32aded79fa062b05169..8759bddb58e893307bbb9b4ac5b95f2392aef12b 100644 --- a/src/chart/sankey/SankeySeries.js +++ b/src/chart/sankey/SankeySeries.js @@ -47,6 +47,9 @@ define(function (require) { } return html; } + else { + return SankeySeries.superCall(this, 'formatTooltip', dataIndex, multipleSeries); + } // dataType === 'node' or empty do not show tooltip by default. }, @@ -90,7 +93,7 @@ define(function (require) { itemStyle: { normal: { borderWidth: 1, - borderColor: '#aaa' + borderColor: '#333' } }, @@ -105,12 +108,6 @@ define(function (require) { } }, - - // colorEncoded node - - color: ['#9e0142', '#d53e4f', '#f46d43', '#fdae61', '#fee08b','#ffffbf', - '#e6f598', '#abdda4', '#66c2a5', '#3288bd', '#5e4fa2'], - animationEasing: 'linear', animationDuration: 1000 diff --git a/src/chart/sankey/SankeyView.js b/src/chart/sankey/SankeyView.js index eda14448a44d8f9ed89b8ed0a549e44db1f25dde..9e73dd3a46a29dde3b502d3f7d1e4d098740a8f6 100644 --- a/src/chart/sankey/SankeyView.js +++ b/src/chart/sankey/SankeyView.js @@ -45,6 +45,8 @@ define(function (require) { var graph = seriesModel.getGraph(); var group = this.group; var layoutInfo = seriesModel.layoutInfo; + var nodeData = seriesModel.getData(); + var edgeData = seriesModel.getData('edge'); this._model = seriesModel; @@ -99,11 +101,11 @@ define(function (require) { } )); - rect.dataIndex = node.dataIndex; - rect.seriesIndex = seriesModel.seriesIndex; - rect.dataType = 'node'; - group.add(rect); + + nodeData.setItemGraphicEl(node.dataIndex, rect); + + rect.dataType = 'node'; }); // generate a bezire Curve for each edge @@ -147,6 +149,7 @@ define(function (require) { group.add(curve); + edgeData.setItemGraphicEl(edge.dataIndex, curve); }); if (!this._data && seriesModel.get('animation')) { group.setClipPath(createGridClipShape(group.getBoundingRect(), seriesModel, function () { diff --git a/src/chart/sankey/sankeyVisual.js b/src/chart/sankey/sankeyVisual.js index dd3ed575873d9a098db8fd9d8d0dd2ef1a546207..42c503da7596d376610a35680ce49463d48849e3 100644 --- a/src/chart/sankey/sankeyVisual.js +++ b/src/chart/sankey/sankeyVisual.js @@ -24,8 +24,14 @@ define(function (require) { var mapValueToColor = mapping.mapValueToVisual(node.getLayout().value); node.setVisual('color', mapValueToColor); + // If set itemStyle.normal.color + var itemModel = node.getModel(); + var customColor = itemModel.get('itemStyle.normal.color'); + if (customColor != null) { + node.setVisual('color', customColor); + } }); - }) ; - }; + }) ; + }; }); \ No newline at end of file