Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
半栈学徒
incubator-echarts
提交
1d0e57c3
I
incubator-echarts
项目概览
半栈学徒
/
incubator-echarts
与 Fork 源项目一致
从无法访问的项目Fork
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
incubator-echarts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
1d0e57c3
编写于
1月 14, 2020
作者:
D
Deqing Li
提交者:
GitHub
1月 14, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12045 from deqingli/sankey
Fix #11644 support node raw value
上级
2264b0d3
3cc10491
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
142 deletion
+12
-142
src/chart/sankey/sankeyLayout.js
src/chart/sankey/sankeyLayout.js
+4
-3
test/sankey-horizontal.html
test/sankey-horizontal.html
+0
-134
test/sankey-vertical.html
test/sankey-vertical.html
+8
-5
未找到文件。
src/chart/sankey/sankeyLayout.js
浏览文件 @
1d0e57c3
...
...
@@ -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
浏览文件 @
1d0e57c3
...
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录