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

fix tree bugs

pull/34/head
Leopoldthecoder 2016-09-08 11:37:30 +08:00
parent 0b91eafb1b
commit 01138a5bf7
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/tree/src/model/node.js
View File

@ -9,10 +9,10 @@ const reInitChecked = function(node) {
for (let i = 0, j = siblings.length; i < j; i++) {
const sibling = siblings[i];
if (sibling.checked !== true) {
if (sibling.checked !== true || sibling.indeterminate) {
all = false;
}
if (sibling.checked !== false) {
if (sibling.checked !== false || sibling.indeterminate) {
none = false;
}
}

12
packages/tree/src/tree-node.vue
View File

@ -6,7 +6,7 @@
<span class="el-tree-node__expand-icon"
:class="{ 'is-leaf': node.isLeaf, expanded: !node.isLeaf && expanded }"
></span>
<el-checkbox v-if="showCheckbox" :indeterminate="node.indeterminate" v-model="node.checked" @change="handleCheckChange"></el-checkbox>
<el-checkbox v-if="showCheckbox" :indeterminate="node.indeterminate" v-model="node.checked" @change="handleCheckChange" @click.native="handleUserClick"></el-checkbox>
<span
v-if="node.loading"
class="el-tree-node__icon el-icon-loading"
@ -67,8 +67,16 @@
}
},
handleUserClick() {
if (this.node.indeterminate) {
this.node.setChecked(this.node.checked, true);
}
},
handleCheckChange(checked) {
this.node.setChecked(checked, true);
if (!this.node.indeterminate) {
this.node.setChecked(checked, true);
}
}
},