Merge pull request #165 from betterRunner/bug-fix-hasInGenerations

halower · web-flow · commit 95bc05803e51 · 2019-07-03T14:37:00.000+08:00
Bug fix hasInGenerations
diff --git a/src/components/mixins.js b/src/components/mixins.js
@@ -17,13 +17,14 @@ function getDragNode (guid) {
 }
 
 function hasInGenerations (root, node) {
+  let ret = false
   if (root.hasOwnProperty('children') && root.children) {
     for (let rn of root.children) {
       if (rn === node) return true
-      if (rn.children) return hasInGenerations(rn, node)
+      if (rn.children) ret |= hasInGenerations(rn, node)
     }
-    return false
   }
+  return ret
 }
 
 export default {

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,14 @@ function getDragNode (guid) {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`function hasInGenerations (root, node) {`
	`20`	`+ let ret = false`
`20`	`21`	`if (root.hasOwnProperty('children') && root.children) {`
`21`	`22`	`for (let rn of root.children) {`
`22`	`23`	`if (rn === node) return true`
`23`		`- if (rn.children) return hasInGenerations(rn, node)`
	`24`	`+ if (rn.children) ret \|= hasInGenerations(rn, node)`
`24`	`25`	`}`
`25`		`- return false`
`26`	`26`	`}`
	`27`	`+ return ret`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`export default {`