Tree: fix ElemeFE#15538 by adding more detect logic.

VanMess · May 19, 2019 · 0413904 · 0413904
1 parent 8933a05
commit 0413904
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/tree/src/model/node.js b/packages/tree/src/model/node.js
@@ -1,5 +1,6 @@
 import objectAssign from 'element-ui/src/utils/merge';
 import { markNodeData, NODE_KEY } from './util';
+import { arrayContains } from 'element-ui/src/utils/util';
 
 export const getChildState = node => {
   let all = true;
@@ -435,8 +436,10 @@ export default class Node {
     const newNodes = [];
 
     newData.forEach((item, index) => {
-      if (item[NODE_KEY]) {
-        newDataMap[item[NODE_KEY]] = { index, data: item };
+      const key = item[NODE_KEY];
+      const isNodeExists = !!key && arrayContains(oldData, data => data[NODE_KEY] === key);
+      if (isNodeExists) {
+        newDataMap[key] = { index, data: item };
       } else {
         newNodes.push({ index, data: item });
       }

diff --git a/src/utils/util.js b/src/utils/util.js
@@ -97,6 +97,10 @@ export const arrayFindIndex = function(arr, pred) {
   return -1;
 };
 
+export const arrayContains = function(arr, pred) {
+  return arrayFindIndex(arr, pred) >= 0;
+};
+
 export const arrayFind = function(arr, pred) {
   const idx = arrayFindIndex(arr, pred);
   return idx !== -1 ? arr[idx] : undefined;