Quellcode durchsuchen

fix(tree): universality of hide-disabled prop

Casper Dai vor 2 Jahren
Ursprung
Commit
bcabaf2925
2 geänderte Dateien mit 1 neuen und 4 gelöschten Zeilen
  1. 0 3
      src/components/tree/DeviceTree/index.vue
  2. 1 1
      src/components/tree/tree.js

+ 0 - 3
src/components/tree/DeviceTree/index.vue

@@ -244,9 +244,6 @@ export default {
         this.setNodes(subNode, this.onFilter(subNode, children, regx))
         return subNode
       })
-      if (this.hideDisabled) {
-        return childNodes.filter(({ disabled }) => !disabled)
-      }
       return childNodes
     },
     reset () {

+ 1 - 1
src/components/tree/tree.js

@@ -80,7 +80,7 @@ export default {
       }
     },
     setNodes (parent, nodes) {
-      parent.children = nodes
+      parent.children = this.hideDisabled ? nodes.filter(({ disabled }) => !disabled) : nodes
       parent.disabled = !nodes.some(({ disabled }) => !disabled)
     },
     flatNode (node, arr) {