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

Merge pull request #2242 from Kingwl/table-align 

Table: fix header-align bug, Fixed #2220
pull/2263/head
baiyaaaaa 2017-01-06 15:05:08 +08:00 committed by GitHub
parent ca2d7f7ac6 3e3001a8dc
commit 10a9f948f8
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/table/src/table-column.js
View File

@ -335,12 +335,16 @@ export default {
align(newVal) {
if (this.columnConfig) {
this.columnConfig.align = newVal ? 'is-' + newVal : null;
if (!this.headerAlign) {
this.columnConfig.headerAlign = newVal ? 'is-' + newVal : null;
}
}
},
headerAlign(newVal) {
if (this.columnConfig) {
this.columnConfig.headerAlign = newVal ? 'is-' + newVal : this.align;
this.columnConfig.headerAlign = 'is-' + (newVal ? newVal : this.align);
}
},

29
test/unit/specs/table.spec.js
View File

@ -1359,21 +1359,30 @@ describe('Table', () => {
}
}, true);
setTimeout(() => {
expect(vm.$el.querySelectorAll('.el-table__header th.is-left').length > 0).to.be.true;
expect(vm.$el.querySelectorAll('.el-table__header td.is-center').length === 0).to.be.true;
vm.$nextTick(() => {
expect(vm.$el.querySelectorAll('.el-table__header th.is-left').length).to.above(0);
expect(vm.$el.querySelectorAll('.el-table__header th.is-center').length).to.equal(0);
expect(vm.$el.querySelectorAll('.el-table__header th.is-right').length).to.equal(0);
vm.align = 'right';
vm.$nextTick(() => {
expect(vm.$el.querySelectorAll('.el-table__header th.is-right').length > 0).to.be.true;
expect(vm.$el.querySelectorAll('.el-table__header td.is-center').length === 0).to.be.true;
expect(vm.$el.querySelectorAll('.el-table__header th.is-left').length).to.equal(0);
expect(vm.$el.querySelectorAll('.el-table__header th.is-center').length).to.equal(0);
expect(vm.$el.querySelectorAll('.el-table__header th.is-right').length).to.above(0);
vm.headerAlign = 'center';
vm.$nextTick(() => {
expect(vm.$el.querySelectorAll('.el-table__header th.is-right').length === 0).to.be.true;
expect(vm.$el.querySelectorAll('.el-table__header td.is-center').length > 0).to.be.true;
});
});
expect(vm.$el.querySelectorAll('.el-table__header th.is-left').length).to.equal(0);
expect(vm.$el.querySelectorAll('.el-table__header th.is-center').length).to.above(0);
expect(vm.$el.querySelectorAll('.el-table__header th.is-right').length).to.equal(0);
vm.headerAlign = null;
vm.$nextTick(() => {
expect(vm.$el.querySelectorAll('.el-table__header th.is-left').length).to.equal(0);
expect(vm.$el.querySelectorAll('.el-table__header th.is-center').length).to.equal(0);
expect(vm.$el.querySelectorAll('.el-table__header th.is-right').length).to.above(0);
done();
}, DELAY);
});
});
});
});
});
it('width', (done) => {