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

Tree: fix defaultCheckedKeys and emptyText bug (#11971)

pull/11977/head
hetech 2018-07-12 19:17:23 +08:00 committed by GitHub
parent 5e32b4c772
commit b18642f716
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/tree/src/tree.vue
View File

@ -18,7 +18,7 @@
:render-content="renderContent" :render-content="renderContent"
@node-expand="handleNodeExpand"> @node-expand="handleNodeExpand">
</el-tree-node> </el-tree-node>
<div class="el-tree__empty-block" v-if="!root.childNodes || root.childNodes.length === 0"> <div class="el-tree__empty-block" v-if="isEmpty">
<span class="el-tree__empty-text">{{ emptyText }}</span> <span class="el-tree__empty-text">{{ emptyText }}</span>
</div> </div>
<div <div
@ -141,12 +141,16 @@
treeItemArray() { treeItemArray() {
return Array.prototype.slice.call(this.treeItems); return Array.prototype.slice.call(this.treeItems);
},
isEmpty() {
const { childNodes } = this.root;
return !childNodes || childNodes.length === 0 || childNodes.every(({visible}) => !visible);
} }
}, },
watch: { watch: {
defaultCheckedKeys(newVal) { defaultCheckedKeys(newVal) {
this.store.defaultCheckedKeys = newVal;
this.store.setDefaultCheckedKey(newVal); this.store.setDefaultCheckedKey(newVal);
}, },