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

Table: `defaultExpandAll` works when expand column exists (#14935) 

* Table: `defaultExpandAll` works when expand column exists

* fix
pull/14939/head
hetech 2019-04-02 15:26:46 +08:00 committed by GitHub
parent d38ab315fa
commit b851242a5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,7 @@ export default {
}) })
} }
</tr>); </tr>);
if (this.store.isRowExpanded(row)) { if (this.hasExpandColumn && this.store.isRowExpanded(row)) {
return [ return [
tr, tr,
<tr> <tr>
@ -185,6 +185,10 @@ export default {
return this.store.states.columns; return this.store.states.columns;
}, },
hasExpandColumn() {
return this.columns.some(({ type }) => type === 'expand');
},
firstDefaultColumnIndex() { firstDefaultColumnIndex() {
for (let index = 0; index < this.columns.length; index++) { for (let index = 0; index < this.columns.length; index++) {
if (this.columns[index].type === 'default') { if (this.columns[index].type === 'default') {

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

@ -949,7 +949,7 @@ describe('Table', () => {
<template slot-scope="props"> <template slot-scope="props">
<div>{{props.row.name}}</div> <div>{{props.row.name}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="release" label="release" /> <el-table-column prop="release" label="release" />
<el-table-column prop="director" label="director" /> <el-table-column prop="director" label="director" />
<el-table-column prop="runtime" label="runtime" /> <el-table-column prop="runtime" label="runtime" />