Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance funnel chart label display policy #8759

Merged
merged 10 commits into from
Sep 21, 2018
Merged

Enhance funnel chart label display policy #8759

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
140e409
在series.label下增加limitScale参数，参数值为大于0小于1的数值。以保证饼图在小于一定值的扇页不显示label和lab…
Jul 26, 2018
2b7466d
为漏斗图position增加insideLeft和insideRight
Jul 26, 2018
cac531c
remove the pie-related code
Sep 3, 2018
99e995c
revert pieLayout.js
Sep 4, 2018
ed7e86e
Update pieLayout.js
cuijian-dexter Sep 4, 2018
d2ae3e8
Delete this file to modify
cuijian-dexter Sep 4, 2018
d71ed30
Add pieLayout.js again
Sep 4, 2018
df1b901
Add space:
cuijian-dexter Sep 10, 2018
eb2cfab
add space
cuijian-dexter Sep 10, 2018
332caae
Add space
cuijian-dexter Sep 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/chart/funnel/funnelLayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,19 @@ function labelLayout(data) {
var linePoints;

if (isLabelInside) {
textX = (points[0][0] + points[1][0] + points[2][0] + points[3][0]) / 4;
textY = (points[0][1] + points[1][1] + points[2][1] + points[3][1]) / 4;
textAlign = 'center';
if (labelPosition === 'insideLeft') {
textX = (points[0][0] + points[3][0]) / 2 + 5;
textY = (points[0][1] + points[3][1]) / 2;
textAlign = 'left';
} else if (labelPosition === 'insideRight') {
textX = (points[1][0] + points[2][0]) / 2 - 5;
textY = (points[1][1] + points[2][1]) / 2;
textAlign = 'right';
} else {
textX = (points[0][0] + points[1][0] + points[2][0] + points[3][0]) / 4;
textY = (points[0][1] + points[1][1] + points[2][1] + points[3][1]) / 4;
textAlign = 'center';
}
linePoints = [
[textX, textY], [textX, textY]
];
Expand Down Expand Up @@ -202,4 +212,4 @@ export default function (ecModel, api, payload) {

labelLayout(data);
});
}
}