You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by GitBox <gi...@apache.org> on 2020/04/13 02:09:14 UTC
[GitHub] [incubator-echarts] yufeng04 commented on a change in pull request
#12414: showLoading align center
yufeng04 commented on a change in pull request #12414: showLoading align center
URL: https://github.com/apache/incubator-echarts/pull/12414#discussion_r407286066
##########
File path: src/loading/default.js
##########
@@ -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',
+ spinnerRadius: 10,
+ lineWidth: 5,
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 ? arc.shape.r : 0;
+ // cx = (containerWidth - (arcDiameter + labelRectWidth) - textDistance - textWidth) / 2
+ // textDistance needs to be calculated when both animation and text exist
+ var cx = (api.getWidth() - r * 4 - (opts.showSpinner && textWidth ? 10 : 0) - textWidth) / 2
Review comment:
`4 * r === arcDiameter + labelRectWidth`
1. the diameter of spinner is 2*r
2. `labelRect.setShape({..., width: r * 2, ...})`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org