Skip to content

I
incubator-echarts

x649585723 / incubator-echarts
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
I
incubator-echarts

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 3cc10491 编写于 作者: D deqingli
浏览文件
操作

fix #11644

上级 2264b0d3
隐藏空白更改
内联 并排
Showing with 12 addition and 142 deletion
src/chart/sankey/sankeyLayout.js
浏览文件 @ 3cc10491
......@@ -87,7 +87,8 @@ function computeNodeValues(nodes) {
zrUtil.each(nodes, function (node) {
var value1 = sum(node.outEdges, getEdgeValue);
var value2 = sum(node.inEdges, getEdgeValue);
var value = Math.max(value1, value2);
var nodeRawValue = node.getValue() || 0;
var value = Math.max(value1, value2, nodeRawValue);
node.setLayout({value: value}, true);
});
}
......@@ -431,12 +432,12 @@ function getEdgeValue(edge) {
return edge.getValue();
}
function sum(array, f, orient) {
function sum(array, cb, orient) {
var sum = 0;
var len = array.length;
var i = -1;
while (++i < len) {
var value = +f.call(array, array[i], orient);
var value = +cb.call(array, array[i], orient);
if (!isNaN(value)) {
sum += value;
}
......
test/sankey-horizontal.html 已删除 100644 → 0
浏览文件 @ 2264b0d3
<!--
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'], function (echarts) {
var chart = echarts.init(document.getElementById('main'), null, {});
window.onresize = function () {
chart.resize();
};
var testData = {
nodes: [
{
name: 'a'
},
{
name: 'b'
},
{
name: 'a1'
},
{
name: 'b1'
},
{
name: 'c'
},
{
name: 'e'
}
],
links: [
{
source: 'a',
target: 'a1',
value: 5
},
{
source: 'e',
target: 'b',
value: 3
},
{
source: 'a',
target: 'b1',
value: 3
},
{
source: 'b1',
target: 'a1',
value: 1
},
{
source: 'b1',
target: 'c',
value: 2
},
{
source: 'b',
target: 'c',
value: 1
}
]
};
chart.setOption({
color: ['#67001f', '#b2182b', '#d6604d', '#f4a582', '#fddbc7', '#d1e5f0', '#92c5de', '#4393c3', '#2166ac', '#053061'],
tooltip: {
trigger: 'item',
triggerOn: 'mousemove'
},
animation: false,
series: [
{
type: 'sankey',
bottom: '10%',
focusNodeAdjacency: true,
data: testData.nodes,
links: testData.links,
label: {
position: 'left'
},
// Used to test when the data is null whether it is work well.
// data: [],
// links: [],
lineStyle: {
normal: {
color: 'source',
curveness: 0.5
}
}
}
]
});
});
</script>
</body>
</html>
\ No newline at end of file
test/sankey-vertical.html
浏览文件 @ 3cc10491
......@@ -121,7 +121,8 @@ under the License.
}
},
{
name: 'b'
name: 'b',
value: 4
},
{
name: 'a1'
......@@ -133,7 +134,8 @@ under the License.
name: 'c'
},
{
name: 'e'
name: 'e',
value: 10
}
],
links: [
......@@ -208,9 +210,10 @@ under the License.
var chart = testHelper.create(echarts, 'main' , {
title: [
'1. when hover on node a1 the edge a1-a is green with opacity 0.2 and the node a is yellow with opacity 0.6',
'2. when hover on edge a1-a the color is green with opacity 0.2 and the node a is yellow with opacity 0.6',
'3. when hover on node a the color is yellow with opacity 0.6 and the edge a1-a is green with opacity 0.2'
"1. when hover on node 'a1' the edge 'a1-a' is green with opacity 0.2 and the node 'a' is yellow with opacity 0.6.",
"2. when hover on edge 'a1-a' the color is green with opacity 0.2 and the node 'a' is yellow with opacity 0.6.",
"3. when hover on node 'a' the color is yellow with opacity 0.6 and the edge 'a1-a' is green with opacity 0.2.",
"4. node 'e' and node 'b''s value is customized which is longer than the max sum of inEdges or outEdges."
],
option: option,
height: 700
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或