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

showLoading align center #12414

Merged
merged 5 commits into from
Apr 15, 2020
Merged

showLoading align center #12414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ecb4de9
showLoading align center #11790
yufeng04 Apr 10, 2020
b0c950b
adapt pr: showLoading align center
yufeng04 Apr 10, 2020
0f63426
update pr: change arc.shape.r to opts.spinnerRadius
yufeng04 Apr 13, 2020
84b1066
update pr: change 4*r to 2*r
yufeng04 Apr 13, 2020
d26cd1a
update pr: modify the __meta__.json
yufeng04 Apr 13, 2020
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
80 changes: 46 additions & 34 deletions src/loading/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import * as zrUtil from 'zrender/src/core/util';
import * as graphic from '../util/graphic';
import * as textContain from 'zrender/src/contain/text';

var PI = Math.PI;

Expand All @@ -34,69 +35,80 @@ export default function (api, opts) {
opts = opts || {};
zrUtil.defaults(opts, {
text: 'loading',
color: '#c23531',
textColor: '#000',
fontSize: '12px',
maskColor: 'rgba(255, 255, 255, 0.8)',
showSpinner: true,
color: '#c23531',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps the name is better to be showSpinner?

spinnerRadius: 10,
lineWidth: 5,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spinnerRadius?

zlevel: 0
});
var group = new graphic.Group();
var mask = new graphic.Rect({
style: {
fill: opts.maskColor
},
zlevel: opts.zlevel,
z: 10000
});
var arc = new graphic.Arc({
shape: {
startAngle: -PI / 2,
endAngle: -PI / 2 + 0.1,
r: 10
},
style: {
stroke: opts.color,
lineCap: 'round',
lineWidth: 5
},
zlevel: opts.zlevel,
z: 10001
});
group.add(mask);
var font = opts.fontSize + ' sans-serif';
var labelRect = new graphic.Rect({
style: {
fill: 'none',
text: opts.text,
font: font,
textPosition: 'right',
textDistance: 10,
textFill: opts.textColor
},
zlevel: opts.zlevel,
z: 10001
});

arc.animateShape(true)
.when(1000, {
endAngle: PI * 3 / 2
})
.start('circularInOut');
arc.animateShape(true)
.when(1000, {
startAngle: PI * 3 / 2
})
.delay(300)
.start('circularInOut');

var group = new graphic.Group();
group.add(arc);
group.add(labelRect);
group.add(mask);
if (opts.showSpinner) {
var arc = new graphic.Arc({
shape: {
startAngle: -PI / 2,
endAngle: -PI / 2 + 0.1,
r: opts.spinnerRadius
},
style: {
stroke: opts.color,
lineCap: 'round',
lineWidth: opts.lineWidth
},
zlevel: opts.zlevel,
z: 10001
});
arc.animateShape(true)
.when(1000, {
endAngle: PI * 3 / 2
})
.start('circularInOut');
arc.animateShape(true)
.when(1000, {
startAngle: PI * 3 / 2
})
.delay(300)
.start('circularInOut');
group.add(arc);
}
// Inject resize
group.resize = function () {
var cx = api.getWidth() / 2;
var textWidth = textContain.getWidth(opts.text, font);
var r = opts.showSpinner ? opts.spinnerRadius : 0;
// cx = (containerWidth - arcDiameter - textDistance - textWidth) / 2
// textDistance needs to be calculated when both animation and text exist
var cx = (api.getWidth() - r * 2 - (opts.showSpinner && textWidth ? 10 : 0) - textWidth) / 2
// only show the text
- (opts.showSpinner ? 0 : textWidth / 2);
var cy = api.getHeight() / 2;
arc.setShape({
opts.showSpinner && arc.setShape({
cx: cx,
cy: cy
});
var r = arc.shape.r;
labelRect.setShape({
x: cx - r,
y: cy - r,
Expand Down
55 changes: 44 additions & 11 deletions test/loading.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,60 @@
</head>
<body>
<style>
html, body, #main {
width: 100%;
height: 100%;
margin: 0;
.chart {
height: 200px;
}
#main {
background: #fff;
h1 {
font-size: 20px;
text-align: center;
background: #bbb;
padding: 10px 0;
}
</style>
<div id="main"></div>

<h1>use the default values </h1>
<div class="chart" id="main0"></div>
<h1>only show the animation </h1>
<div class="chart" id="main1"></div>
<h1>only show the text </h1>
<div class="chart" id="main2"></div>
<h1>fontSzie: 25px, arcRadius: 12, lineWidth: 8</h1>
<div class="chart" id="main3"></div>
<script>

require([
'echarts'
], function (echarts) {

var chart = echarts.init(document.getElementById('main'));
chart.showLoading({
text: '暂无数据'
var chart0 = echarts.init(document.getElementById('main0'));
chart0.showLoading();

var chart1 = echarts.init(document.getElementById('main1'));
chart1.showLoading({
text: ''
});

var chart2 = echarts.init(document.getElementById('main2'));
chart2.showLoading({
showAnimation: false
});
var chart3 = echarts.init(document.getElementById('main3'));
chart3.showLoading({
text: '暂无数据',
textColor: '#000',
fontSize: '25px',
maskColor: 'rgba(255, 255, 255, 0.8)',
color: '#c23531',
arcRadius: 12,
lineWidth: 8,
zlevel: 0
});
window.onresize = chart.resize;
window.onresize = function () {
chart0.resize();
chart1.resize();
chart2.resize();
chart3.resize();
};
});
</script>
</body>
Expand Down