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.
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
showLoading align center #12414
Changes from 1 commit
ecb4de9
b0c950b
0f63426
84b1066
d26cd1a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
|
||
|
@@ -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)', | ||
showAnimation: true, | ||
color: '#c23531', | ||
arcRadius: 10, | ||
lineWidth: 5, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
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.showAnimation) { | ||
var arc = new graphic.Arc({ | ||
shape: { | ||
startAngle: -PI / 2, | ||
endAngle: -PI / 2 + 0.1, | ||
r: opts.arcRadius | ||
}, | ||
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.showAnimation ? arc.shape.r : 0; | ||
// cx = (containerWidth - (arcDiameter + labelRectWidth) - textDistance - textWidth) / 2 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. arc is in the scope of |
||
// textDistance needs to be calculated when both animation and text exist | ||
var cx = (api.getWidth() - r * 4 - (opts.showAnimation && textWidth ? 10 : 0) - textWidth) / 2 | ||
// only show the text | ||
- (opts.showAnimation ? 0 : textWidth / 2); | ||
var cy = api.getHeight() / 2; | ||
arc.setShape({ | ||
opts.showAnimation && arc.setShape({ | ||
cx: cx, | ||
cy: cy | ||
}); | ||
var r = arc.shape.r; | ||
labelRect.setShape({ | ||
x: cx - r, | ||
y: cy - r, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
[{"name":"Action 1","ops":[],"scrollY":0,"scrollX":0,"timestamp":1586513969778},{"name":"Action 2","ops":[],"scrollY":502,"scrollX":0,"timestamp":1586514012325}] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It seems there is nothing in the action. Please remove it. |
There was a problem hiding this comment.
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
?