github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Steps: fix progress line for error step

pull/6282/head
wacky6.AriesMBP 2017-07-06 21:45:32 +08:00 committed by 杨奕
parent c928314ac7
commit 2cd3ef4b6f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/steps/src/step.vue
View File

@ -80,6 +80,10 @@ export default {
currentStatus() { currentStatus() {
return this.status || this.internalStatus; return this.status || this.internalStatus;
}, },
prevStatus() {
const prevStep = this.$parent.steps[this.index - 1];
return prevStep ? prevStep.currentStatus : 'wait';
},
isLast: function() { isLast: function() {
const parent = this.$parent; const parent = this.$parent;
return parent.steps[parent.steps.length - 1] === this; return parent.steps[parent.steps.length - 1] === this;
@ -114,7 +118,7 @@ export default {
if (val > this.index) { if (val > this.index) {
this.internalStatus = this.$parent.finishStatus; this.internalStatus = this.$parent.finishStatus;
} else if (val === this.index) { } else if (val === this.index && this.prevStatus !== 'error') {
this.internalStatus = this.$parent.processStatus; this.internalStatus = this.$parent.processStatus;
} else { } else {
this.internalStatus = 'wait'; this.internalStatus = 'wait';
@ -129,7 +133,7 @@ export default {
style.transitionDelay = 150 * this.index + 'ms'; style.transitionDelay = 150 * this.index + 'ms';
if (status === this.$parent.processStatus) { if (status === this.$parent.processStatus) {
step = 50; step = this.currentStatus !== 'error' ? 50 : 0;
} else if (status === 'wait') { } else if (status === 'wait') {
step = 0; step = 0;
style.transitionDelay = (-150 * this.index) + 'ms'; style.transitionDelay = (-150 * this.index) + 'ms';