Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
z1593
incubator-echarts
提交
73af4bf7
I
incubator-echarts
项目概览
z1593
/
incubator-echarts
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
73af4bf7
编写于
12月 30, 2018
作者:
S
sushuang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #9657 (label is not always at center when pie label position 'center')
上级
e7a9e503
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
168 addition
and
17 deletion
+168
-17
src/chart/pie/labelLayout.js
src/chart/pie/labelLayout.js
+19
-14
test/pie-label.html
test/pie-label.html
+148
-0
test/tmp-base.html
test/tmp-base.html
+1
-3
未找到文件。
src/chart/pie/labelLayout.js
浏览文件 @
73af4bf7
...
@@ -26,7 +26,6 @@ function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
...
@@ -26,7 +26,6 @@ function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
return
a
.
y
-
b
.
y
;
return
a
.
y
-
b
.
y
;
});
});
// 压
function
shiftDown
(
start
,
end
,
delta
,
dir
)
{
function
shiftDown
(
start
,
end
,
delta
,
dir
)
{
for
(
var
j
=
start
;
j
<
end
;
j
++
)
{
for
(
var
j
=
start
;
j
<
end
;
j
++
)
{
list
[
j
].
y
+=
delta
;
list
[
j
].
y
+=
delta
;
...
@@ -42,7 +41,6 @@ function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
...
@@ -42,7 +41,6 @@ function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
shiftUp
(
end
-
1
,
delta
/
2
);
shiftUp
(
end
-
1
,
delta
/
2
);
}
}
// 弹
function
shiftUp
(
end
,
delta
)
{
function
shiftUp
(
end
,
delta
)
{
for
(
var
j
=
end
;
j
>=
0
;
j
--
)
{
for
(
var
j
=
end
;
j
>=
0
;
j
--
)
{
list
[
j
].
y
-=
delta
;
list
[
j
].
y
-=
delta
;
...
@@ -56,18 +54,14 @@ function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
...
@@ -56,18 +54,14 @@ function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
function
changeX
(
list
,
isDownList
,
cx
,
cy
,
r
,
dir
)
{
function
changeX
(
list
,
isDownList
,
cx
,
cy
,
r
,
dir
)
{
var
lastDeltaX
=
dir
>
0
var
lastDeltaX
=
dir
>
0
?
isDownList
//
右侧
?
isDownList
//
right-side
?
Number
.
MAX_VALUE
//
下
?
Number
.
MAX_VALUE
//
down
:
0
//
上
:
0
//
up
:
isDownList
//
左侧
:
isDownList
//
left-side
?
Number
.
MAX_VALUE
//
下
?
Number
.
MAX_VALUE
//
down
:
0
;
//
上
:
0
;
//
up
for
(
var
i
=
0
,
l
=
list
.
length
;
i
<
l
;
i
++
)
{
for
(
var
i
=
0
,
l
=
list
.
length
;
i
<
l
;
i
++
)
{
// Not change x for center label
if
(
list
[
i
].
position
===
'
center
'
)
{
continue
;
}
var
deltaY
=
Math
.
abs
(
list
[
i
].
y
-
cy
);
var
deltaY
=
Math
.
abs
(
list
[
i
].
y
-
cy
);
var
length
=
list
[
i
].
len
;
var
length
=
list
[
i
].
len
;
var
length2
=
list
[
i
].
len2
;
var
length2
=
list
[
i
].
len2
;
...
@@ -78,11 +72,11 @@ function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
...
@@ -78,11 +72,11 @@ function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
)
)
:
Math
.
abs
(
list
[
i
].
x
-
cx
);
:
Math
.
abs
(
list
[
i
].
x
-
cx
);
if
(
isDownList
&&
deltaX
>=
lastDeltaX
)
{
if
(
isDownList
&&
deltaX
>=
lastDeltaX
)
{
//
右下,左下
//
right-down, left-down
deltaX
=
lastDeltaX
-
10
;
deltaX
=
lastDeltaX
-
10
;
}
}
if
(
!
isDownList
&&
deltaX
<=
lastDeltaX
)
{
if
(
!
isDownList
&&
deltaX
<=
lastDeltaX
)
{
//
右上,左上
//
right-up, left-up
deltaX
=
lastDeltaX
+
10
;
deltaX
=
lastDeltaX
+
10
;
}
}
...
@@ -122,6 +116,9 @@ function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight) {
...
@@ -122,6 +116,9 @@ function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight) {
var
leftList
=
[];
var
leftList
=
[];
var
rightList
=
[];
var
rightList
=
[];
for
(
var
i
=
0
;
i
<
labelLayoutList
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
labelLayoutList
.
length
;
i
++
)
{
if
(
isPositionCenter
(
labelLayoutList
[
i
]))
{
continue
;
}
if
(
labelLayoutList
[
i
].
x
<
cx
)
{
if
(
labelLayoutList
[
i
].
x
<
cx
)
{
leftList
.
push
(
labelLayoutList
[
i
]);
leftList
.
push
(
labelLayoutList
[
i
]);
}
}
...
@@ -134,6 +131,9 @@ function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight) {
...
@@ -134,6 +131,9 @@ function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight) {
adjustSingleSide
(
leftList
,
cx
,
cy
,
r
,
-
1
,
viewWidth
,
viewHeight
);
adjustSingleSide
(
leftList
,
cx
,
cy
,
r
,
-
1
,
viewWidth
,
viewHeight
);
for
(
var
i
=
0
;
i
<
labelLayoutList
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
labelLayoutList
.
length
;
i
++
)
{
if
(
isPositionCenter
(
labelLayoutList
[
i
]))
{
continue
;
}
var
linePoints
=
labelLayoutList
[
i
].
linePoints
;
var
linePoints
=
labelLayoutList
[
i
].
linePoints
;
if
(
linePoints
)
{
if
(
linePoints
)
{
var
dist
=
linePoints
[
1
][
0
]
-
linePoints
[
2
][
0
];
var
dist
=
linePoints
[
1
][
0
]
-
linePoints
[
2
][
0
];
...
@@ -149,6 +149,11 @@ function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight) {
...
@@ -149,6 +149,11 @@ function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight) {
}
}
}
}
function
isPositionCenter
(
layout
)
{
// Not change x for center label
return
layout
.
position
===
'
center
'
;
}
export
default
function
(
seriesModel
,
r
,
viewWidth
,
viewHeight
)
{
export
default
function
(
seriesModel
,
r
,
viewWidth
,
viewHeight
)
{
var
data
=
seriesModel
.
getData
();
var
data
=
seriesModel
.
getData
();
var
labelLayoutList
=
[];
var
labelLayoutList
=
[];
...
...
test/pie-label.html
0 → 100644
浏览文件 @
73af4bf7
<!DOCTYPE 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>
<script
src=
"lib/facePrint.js"
></script>
<script
src=
"lib/testHelper.js"
></script>
<link
rel=
"stylesheet"
href=
"lib/reset.css"
/>
</head>
<body>
<style>
.test-title
{
background
:
#146402
;
color
:
#fff
;
}
</style>
<div
id=
"main0"
></div>
<div
id=
"main1"
></div>
<script>
require
([
'
echarts
'
/*, 'map/js/china' */
],
function
(
echarts
)
{
var
value2
=
400
;
var
total
=
1000
;
function
getData
()
{
return
[{
name
:
''
,
value
:
total
-
value2
,
itemStyle
:
{
color
:
'
rgb(8,90,150)
'
},
label
:
{
show
:
false
}
},
{
name
:
'
50%
'
,
value
:
value2
,
itemStyle
:
{
color
:
'
rgb(23,235,255)
'
},
label
:
{
position
:
'
center
'
,
color
:
'
#999
'
,
fontSize
:
'
100
'
}
}]
}
var
option
=
{
animation
:
false
,
series
:
[{
type
:
'
pie
'
,
radius
:
[
'
60%
'
,
'
80%
'
],
labelLine
:
{
show
:
false
},
hoverAnimation
:
false
,
data
:
getData
()
}]
};
var
chart
=
testHelper
.
create
(
echarts
,
'
main0
'
,
{
title
:
'
Label should be always at center of the pie
'
,
option
:
option
,
info
:
{
data
:
[{
label
:
{
position
:
'
center
'
}
}]
}
});
setInterval
(
function
()
{
value2
+=
3
;
if
(
value2
>
total
)
{
value2
=
0
;
}
chart
.
setOption
({
series
:
[{
data
:
getData
()
}]
});
},
20
);
});
</script>
<script>
require
([
'
echarts
'
/*, 'map/js/china' */
],
function
(
echarts
)
{
var
count
=
60
;
var
data
=
[];
for
(
var
i
=
0
;
i
<
count
;
i
++
)
{
var
label
=
i
===
30
?
{
position
:
'
center
'
,
fontSize
:
30
,
color
:
'
#fff
'
}
:
null
;
data
.
push
({
name
:
i
+
'
A
'
,
value
:
Math
.
random
(),
label
:
label
});
}
var
option
=
{
series
:
[{
type
:
'
pie
'
,
radius
:
'
50%
'
,
data
:
data
}]
};
var
chart
=
testHelper
.
create
(
echarts
,
'
main1
'
,
{
title
:
'
Too many
'
,
option
:
option
});
});
</script>
</body>
</html>
\ No newline at end of file
test/tmp-base.html
浏览文件 @
73af4bf7
...
@@ -44,8 +44,6 @@ under the License.
...
@@ -44,8 +44,6 @@ under the License.
<script>
<script>
var
chart
;
var
myChart
;
var
option
;
var
option
;
require
([
require
([
...
@@ -55,7 +53,7 @@ under the License.
...
@@ -55,7 +53,7 @@ under the License.
// $.getJSON('./data/nutrients.json', function (data) {
// $.getJSON('./data/nutrients.json', function (data) {
// });
// });
chart
=
myC
hart
=
testHelper
.
create
(
echarts
,
'
main0
'
,
{
var
c
hart
=
testHelper
.
create
(
echarts
,
'
main0
'
,
{
option
:
option
option
:
option
});
});
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录