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

Fix Tree Bug: set data does not work

pull/260/head
furybean 2016-10-08 13:58:31 +08:00 committed by cinwell.li
parent 8af8c8b8fe
commit cd7156cb03
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ const reInitChecked = function(node) {
const getPropertyFromData = function(node, prop) { const getPropertyFromData = function(node, prop) {
const props = node.props; const props = node.props;
const data = node.data; const data = node.data || {};
const config = props[prop]; const config = props[prop];
if (typeof config === 'function') { if (typeof config === 'function') {
@ -69,6 +69,12 @@ export default class Node {
} }
if (this.lazy !== true && this.data) { if (this.lazy !== true && this.data) {
this.setData(this.data);
}
}
setData(data) {
this.data = data;
let children; let children;
if (this.level === -1 && this.data instanceof Array) { if (this.level === -1 && this.data instanceof Array) {
children = this.data; children = this.data;
@ -87,7 +93,6 @@ export default class Node {
})); }));
} }
} }
}
get label() { get label() {
return getPropertyFromData(this, 'label'); return getPropertyFromData(this, 'label');

6
packages/tree/src/tree.vue
View File

@ -68,6 +68,12 @@
} }
}, },
watch: {
data(newVal) {
this.tree.root.setData(newVal);
}
},
methods: { methods: {
getCheckedNodes(leafOnly) { getCheckedNodes(leafOnly) {
return this.tree.getCheckedNodes(leafOnly); return this.tree.getCheckedNodes(leafOnly);