Skip to content
Permalink
Browse files
Merge branch 'master' of github.com:ecomfe/echarts
  • Loading branch information
Ovilia committed Sep 6, 2018
2 parents f30cdc9 + b8af0a9 commit 978f7094db5d591a7d932872a848d4a14db5019b
Showing 7 changed files with 110 additions and 41 deletions.

This file was deleted.

@@ -6,10 +6,10 @@
"visualization",
"canvas"
],
"homepage": "http://echarts.baidu.com/",
"homepage": "http://echarts.apache.org",
"repository": {
"type": "git",
"url": "https://github.com/ecomfe/echarts.git"
"url": "https://github.com/apache/incubator-echarts.git"
},
"scripts": {
"prepublish": "node build/build.js --prepublish"
@@ -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);
@@ -145,7 +145,7 @@
title: [
'(1) Click btn to appendData over limit, should render successfully.',
'(2) Grid extent will not be modified, even if point overflow the extent.',
'(3) Then test click lengend, should be normal.'
'(3) Then test click legend, should be normal.'
],
option: option,
info: option.series,
@@ -279,8 +279,8 @@

var myChart = testHelper.create(echarts, 'main4', {
title: [
'(1) Points over limit, test click lengend, should be normal.',
'(2) Click btn to appendData, test click lengend, should be normal.'
'(1) Points over limit, test click legend, should be normal.',
'(2) Click btn to appendData, test click legend, should be normal.'
],
option: option,
info: option.series,
@@ -450,7 +450,6 @@
var myChart = echarts.init(document.getElementById('main'));

myChart.setOption({
backgroundColor: '#404a59',
title: {
text: '全国主要城市空气质量',
subtext: 'data from PM25.in',
@@ -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 978f709

Please sign in to comment.