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

Progress: fix missing icon when status is exception (#11172)

pull/11175/head
杨奕 2018-05-15 18:50:18 +08:00 committed by GitHub
parent d6b65f9400
commit d537906ac6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/progress/src/progress.vue
View File

@ -123,7 +123,7 @@
}, },
iconClass() { iconClass() {
if (this.type === 'line') { if (this.type === 'line') {
return this.status === 'success' ? 'el-icon-circle-check' : 'el-icon-circle-cross'; return this.status === 'success' ? 'el-icon-circle-check' : 'el-icon-circle-close';
} else { } else {
return this.status === 'success' ? 'el-icon-check' : 'el-icon-close'; return this.status === 'success' ? 'el-icon-check' : 'el-icon-close';
} }

2
test/unit/specs/progress.spec.js
View File

@ -39,7 +39,7 @@ describe('Progress', () => {
expect(vm.$refs.lineSuccess.$el.classList.contains('is-success')).to.be.true; expect(vm.$refs.lineSuccess.$el.classList.contains('is-success')).to.be.true;
expect(vm.$refs.lineSuccess.$el.querySelector('.el-progress__text .el-icon-circle-check')).to.be.exist; expect(vm.$refs.lineSuccess.$el.querySelector('.el-progress__text .el-icon-circle-check')).to.be.exist;
expect(vm.$refs.lineException.$el.classList.contains('is-exception')).to.be.true; expect(vm.$refs.lineException.$el.classList.contains('is-exception')).to.be.true;
expect(vm.$refs.lineException.$el.querySelector('.el-progress__text .el-icon-circle-cross')).to.be.exist; expect(vm.$refs.lineException.$el.querySelector('.el-progress__text .el-icon-circle-close')).to.be.exist;
expect(vm.$refs.circleSuccess.$el.classList.contains('is-success')).to.be.true; expect(vm.$refs.circleSuccess.$el.classList.contains('is-success')).to.be.true;
expect(vm.$refs.circleSuccess.$el.querySelector('.el-progress__text .el-icon-check')).to.be.exist; expect(vm.$refs.circleSuccess.$el.querySelector('.el-progress__text .el-icon-check')).to.be.exist;