Skip to content
Permalink
Browse files
Merge remote-tracking branch 'origin/master' into release
  • Loading branch information
deqingli committed Sep 4, 2018
2 parents 9dd2545 + 2cc14b4 commit 9fe4ef5c479776c0630e736436782122b20072c5
Showing 3 changed files with 105 additions and 6 deletions.
@@ -166,7 +166,7 @@ function computeNodeBreadths(nodes, edges, nodeWidth, width, height, orient) {
}
}

moveSinksRight(nodes, x);
moveSinksRight(nodes, x, orient);

if (orient === 'vertical') {
kx = (height - nodeWidth) / (x - 1);
@@ -0,0 +1,101 @@

<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->

<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<script src="lib/esl.js"></script>
<script src="lib/config.js"></script>
<script src="lib/jquery.min.js"></script>
</head>
<body>
<style>
html, body, #main {
width: 100%;
height: 100%;
/*border: 1px solid #000;*/
}
</style>
<div id="main"><div>
<script>
require([
'echarts'
// 'echarts/chart/sankey',
// 'echarts/component/tooltip'
], function (echarts) {

var chart = echarts.init(document.getElementById('main'), null, {

});

window.onresize = function () {
chart.resize();
};

chart.on('click', function (params) {
console.log(params, params.data);
});


$.getJSON('./data/energy.json')
.done(function(data) {

data.nodes[0].itemStyle = {
normal: {
color: 'red'
}
};
chart.setOption({
tooltip: {
trigger: 'item',
triggerOn: 'mousemove'
},
animation: false,
series: [
{
type: 'sankey',
bottom: '18%',
left: '10%',
layout:'none',
focusNodeAdjacency: 'inEdges',
orient: 'vertical',
label: {
position: 'bottom',
rotate: -90,
verticalAlign: 'middle',
align: 'left'
},
data: data.nodes,
links: data.links,
lineStyle: {
normal: {
color: 'source',
curveness: 0.5
}
}
}
]
});
});
});
</script>
</body>
</html>
@@ -44,6 +44,7 @@
chart.resize();
};

// Data used to test the circle
// var data = {
// nodes: [
// {name: 'Brazil'},
@@ -180,16 +181,13 @@
type: 'sankey',
layout:'none',
bottom: '10%',
// focusNodeAdjacency: 'allEdges',
focusNodeAdjacency: 'allEdges',
data: testData.nodes,
links: testData.links,
orient: 'vertical',
label: {
position: 'left'
position: 'top'
},
// Used to test when the data is null whether it is work well.
// data: [],
// links: [],
lineStyle: {
normal: {
color: 'source',

0 comments on commit 9fe4ef5

Please sign in to comment.