From 612f952804c15b88fcef756b43b50bce68c6d6a7 Mon Sep 17 00:00:00 2001 From: wangjingf <1464255286@qq.com> Date: Thu, 31 May 2018 14:31:57 +0800 Subject: [PATCH 1/5] Update node.js --- packages/tree/src/model/node.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/tree/src/model/node.js b/packages/tree/src/model/node.js index 3e81c0bae..911900b72 100644 --- a/packages/tree/src/model/node.js +++ b/packages/tree/src/model/node.js @@ -111,7 +111,9 @@ export default class Node { } else if (this.level > 0 && store.lazy && store.defaultExpandAll) { this.expand(); } - + if (!Array.isArray(data)) { + markNodeData(this, this.data); + } if (!this.data) return; const defaultExpandedKeys = store.defaultExpandedKeys; const key = store.key; From 07af6acf6f43a407a1215b52fa3d9e49390f6f5e Mon Sep 17 00:00:00 2001 From: wangjingf <1464255286@qq.com> Date: Thu, 31 May 2018 14:55:57 +0800 Subject: [PATCH 2/5] Update node.js --- packages/tree/src/model/node.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tree/src/model/node.js b/packages/tree/src/model/node.js index 911900b72..ee1eccfa4 100644 --- a/packages/tree/src/model/node.js +++ b/packages/tree/src/model/node.js @@ -111,7 +111,7 @@ export default class Node { } else if (this.level > 0 && store.lazy && store.defaultExpandAll) { this.expand(); } - if (!Array.isArray(data)) { + if (!Array.isArray(this.data)) { markNodeData(this, this.data); } if (!this.data) return; From 87d591c3562014458853f9477f6dbd6df7a42792 Mon Sep 17 00:00:00 2001 From: wangjingf <1464255286@qq.com> Date: Thu, 31 May 2018 15:08:55 +0800 Subject: [PATCH 3/5] Update node.js --- packages/tree/src/model/node.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tree/src/model/node.js b/packages/tree/src/model/node.js index ee1eccfa4..36afeaf74 100644 --- a/packages/tree/src/model/node.js +++ b/packages/tree/src/model/node.js @@ -112,7 +112,7 @@ export default class Node { this.expand(); } if (!Array.isArray(this.data)) { - markNodeData(this, this.data); + markNodeData(this, this.data); } if (!this.data) return; const defaultExpandedKeys = store.defaultExpandedKeys; From eaba7846679f31579ae4f32b949105e5ecc3c991 Mon Sep 17 00:00:00 2001 From: wangjingf <1464255286@qq.com> Date: Mon, 4 Jun 2018 10:38:02 +0800 Subject: [PATCH 4/5] Update node.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this.data可能为undefined,需要判断一下 --- packages/tree/src/model/node.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tree/src/model/node.js b/packages/tree/src/model/node.js index 36afeaf74..1d3e5485e 100644 --- a/packages/tree/src/model/node.js +++ b/packages/tree/src/model/node.js @@ -111,7 +111,7 @@ export default class Node { } else if (this.level > 0 && store.lazy && store.defaultExpandAll) { this.expand(); } - if (!Array.isArray(this.data)) { + if (this.data && !Array.isArray(this.data)) { markNodeData(this, this.data); } if (!this.data) return; From 34471f76e9fbdb416a6612bb2c5a1a5a3d0ce539 Mon Sep 17 00:00:00 2001 From: hetech Date: Mon, 4 Jun 2018 11:05:54 +0800 Subject: [PATCH 5/5] Update node.js --- packages/tree/src/model/node.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tree/src/model/node.js b/packages/tree/src/model/node.js index 1d3e5485e..36afeaf74 100644 --- a/packages/tree/src/model/node.js +++ b/packages/tree/src/model/node.js @@ -111,7 +111,7 @@ export default class Node { } else if (this.level > 0 && store.lazy && store.defaultExpandAll) { this.expand(); } - if (this.data && !Array.isArray(this.data)) { + if (!Array.isArray(this.data)) { markNodeData(this, this.data); } if (!this.data) return;