Merge pull request #5914 from Digipex/fix/issue-5330
fix: TreeNode selectable not being used when in checkbox selectionModepull/6163/head
commit
2fa7e77121
|
@ -142,7 +142,9 @@ export default {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.isCheckboxSelectionMode()) {
|
if (this.isCheckboxSelectionMode()) {
|
||||||
this.toggleCheckbox();
|
if (this.node.selectable != false) {
|
||||||
|
this.toggleCheckbox();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
this.$emit('node-click', {
|
this.$emit('node-click', {
|
||||||
originalEvent: event,
|
originalEvent: event,
|
||||||
|
@ -336,7 +338,7 @@ export default {
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
propagateDown(node, check, selectionKeys) {
|
propagateDown(node, check, selectionKeys) {
|
||||||
if (check) selectionKeys[node.key] = { checked: true, partialChecked: false };
|
if (check && node.selectable != false) selectionKeys[node.key] = { checked: true, partialChecked: false };
|
||||||
else delete selectionKeys[node.key];
|
else delete selectionKeys[node.key];
|
||||||
|
|
||||||
if (node.children && node.children.length) {
|
if (node.children && node.children.length) {
|
||||||
|
|
Loading…
Reference in New Issue