modify move sink left in sankey layout

ebf21655 · deqingli · 45c77281 · ebf21655 · ebf21655
隐藏空白更改
内联并排

Showing with 134 addition and 1 deletion

src/chart/sankey/sankeyLayout.js src/chart/sankey/sankeyLayout.js +1 -1

test/sankey-test.html test/sankey-test.html +133 -0

未找到文件。
--- a/src/chart/sankey/sankeyLayout.js
+++ b/src/chart/sankey/sankeyLayout.js
@@ -102,7 +102,7 @@ function computeNodeBreadths(nodes, nodeWidth, width) {
        ++x;
    }

-    moveSinksRight(nodes, x);
+    // moveSinksRight(nodes, x);
    kx = (width - nodeWidth) / (x - 1);

    scaleNodeBreadths(nodes, kx);

--- a/test/sankey-test.html
+++ b/test/sankey-test.html
+<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: 90%;
+                /*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);
+                    });
+
+                    var data = {
+                        nodes: [
+                            {name: 'Brazil'},
+                            {name: 'Canada'},
+                            {name: 'Mexico'},
+                            {name: 'USA'},
+                            {name: 'Portugal'},
+                            {name: 'France'},
+                            {name: 'Spain'},
+                            {name: 'England'},
+                            {name: 'Angola'},
+                            {name: 'Senegal'},
+                            {name: 'Morocco'},
+                            {name: 'South Africa'},
+                            {name: 'Mali'},
+                            {name: 'China'},
+                            {name: 'India'},
+                            {name: 'Japan'}
+                        ],
+                        links: [
+                            {source: 'Brazil', target: 'Portugal', value: 5},
+                            {source: 'Brazil', target: 'France', value: 1},
+                            {source: 'Brazil', target: 'Spain', value: 1},
+                            {source: 'Brazil', target: 'England', value: 1},
+                            {source: 'Canada', target: 'Portugal', value: 1},
+                            {source: 'Canada', target: 'France', value: 5},
+                            {source: 'Canada', target: 'England', value: 1},
+                            {source: 'Mexico', target: 'Portugal', value: 1},
+                            {source: 'Mexico', target: 'France', value: 1},
+                            {source: 'Mexico', target: 'Spain', value: 5},
+                            {source: 'Mexico', target: 'England', value: 1},
+                            {source: 'USA', target: 'Portugal', value: 1},
+                            {source: 'USA', target: 'France', value: 1},
+                            {source: 'USA', target: 'Spain', value: 1},
+                            {source: 'USA', target: 'England', value: 5},
+                            {source: 'Portugal', target: 'Angola', value: 2},
+                            {source: 'Portugal', target: 'Senegal', value: 1},
+                            {source:'Portugal', target: 'Morocco', value: 1},
+                            {source: 'Portugal', target: 'South Africa', value: 3},
+                            {source: 'France', target: 'Angola', value: 1},
+                            {source: 'France', target: 'Senegal', value: 3},
+                            {source: 'France', target: 'Mali', value: 3},
+                            {source: 'France', target: 'Morocco', value: 3},
+                            {source: 'France', target: 'South Africa', value: 1},
+                            {source: 'Spain', target: 'Senegal', value: 1},
+                            {source: 'Spain', target: 'Morocco', value: 3},
+                            {source: 'Spain', target: 'South Africa', value: 1},
+                            {source: 'England', target: 'Angola', value: 1},
+                            {source: 'England', target: 'Senegal', value: 1},
+                            {source: 'England', target: 'Morocco', value: 2},
+                            {source: 'England', target: 'South Africa', value: 7},
+                            {source: 'South Africa', target: 'China', value: 5},
+                            {source: 'South Africa', target: 'India', value: 1},
+                            {source: 'South Africa', target: 'Japan', value: 3},
+                            {source: 'Angola', target: 'China', value: 5},
+                            {source: 'Angola', target: 'India', value: 1},
+                            {source: 'Angola', target: 'Japan', value: 3},
+                            {source: 'Senegal', target: 'China', value: 5},
+                            {source: 'Senegal', target: 'India', value: 1},
+                            {source: 'Senegal', target: 'Japan', value: 3},
+                            {source: 'Mali', target: 'China', value: 5},
+                            {source: 'Mali', target: 'India', value: 1},
+                            {source: 'Mali', target: 'Japan', value: 3},
+                            {source: 'Morocco', target: 'China', value: 5},
+                            {source: 'Morocco', target: 'India', value: 1},
+                            {source: 'Morocco', target: 'Japan', value: 3}
+                        ]
+                    };
+
+                    chart.setOption({
+                        color: ['#67001f', '#b2182b', '#d6604d', '#f4a582', '#fddbc7', '#d1e5f0', '#92c5de', '#4393c3', '#2166ac', '#053061'],
+                        tooltip: {
+                            trigger: 'item',
+                            triggerOn: 'mousemove'
+                        },
+                        animation: false,
+                        series: [
+                            {
+                                type: 'sankey',
+                                layout:'none',
+                                data: data.nodes,
+                                links: data.links,
+                                // data: [],
+                                // links: [],
+                                lineStyle: {
+                                    normal: {
+                                        color: 'source',
+                                        curveness: 0.5
+                                    }
+                                }
+                            }
+                        ]
+                    });
+                });
+        </script>
+    </body>
+</html>
\ No newline at end of file