Merge branch 'release' of https://github.com/apache/incubator-echarts into release

4e0d145f · sushuang · 1cf30c4f · 9fe4ef5c · 4e0d145f · 4e0d145f
5 changed file
--- a/src/chart/sankey/sankeyLayout.js
+++ b/src/chart/sankey/sankeyLayout.js
@@ -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);

--- a/test/appendData.html
+++ b/test/appendData.html
@@ -145,7 +145,7 @@ under the License.
                    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 @@ under the License.

                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,

--- a/test/bmap.html
+++ b/test/bmap.html
@@ -450,7 +450,6 @@ under the License.
                var myChart = echarts.init(document.getElementById('main'));

                myChart.setOption({
-                    backgroundColor: '#404a59',
                    title: {
                        text: '全国主要城市空气质量',
                        subtext: 'data from PM25.in',

--- a/test/sankey-vertical-energy.html
+++ b/test/sankey-vertical-energy.html
+
+<!--
+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>
\ No newline at end of file
--- a/test/sankey-vertical.html
+++ b/test/sankey-vertical.html
@@ -44,6 +44,7 @@ under the License.
                    chart.resize();
                };

+                // Data used to test the circle
                // var data = {
                //     nodes: [
                //         {name: 'Brazil'},
@@ -180,16 +181,13 @@ under the License.
                            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',