fix: tree extract the public method

hug-sun · Sep 24, 2020 · 3703f77 · 3703f77
1 parent 157b543
commit 3703f77
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/packages/tree/Tree.vue b/packages/tree/Tree.vue
@@ -36,7 +36,8 @@
 import { Tree } from './entity/Tree'
 import ElTreeNode from './TreeNode.vue'
 import { t } from 'element-ui/src/locale'
-import { extractMethods, isFunction } from './libs/util'
+import { isFunction } from 'element-ui/src/utils/types'
+import { extractMethods } from './libs/util'
 
 import {
   reactive,

diff --git a/packages/tree/libs/util.js b/packages/tree/libs/util.js
@@ -1,12 +1,5 @@
-export function isArray(value) {
-  return value instanceof Array
-}
-export function isObject(value) {
-  return value instanceof Object && !(value instanceof Array)
-}
-export function isFunction(value) {
-  return value instanceof Function
-}
+import { isArray, isObject } from 'element-ui/src/utils/types'
+
 /**
  * Deep traversal of the object
  * @param {object} target
@@ -47,9 +40,10 @@ export function nodeEach(
   { childKey = 'children', root = null } = {}
 ) {
   const dfs = (node) => {
-    if (!isObject(node)) {
+    if (!isObject(node) || isArray(node)) {
       return
     }
+
     const child = node[childKey] || []
 
     for (let i = 0; i < child.length; i++) {

diff --git a/src/utils/types.js b/src/utils/types.js
@@ -6,6 +6,9 @@ export function isObject(obj) {
   return Object.prototype.toString.call(obj) === '[object Object]'
 }
 
+export function isArray(value) {
+  return value instanceof Array
+}
 export function isHtmlElement(node) {
   return node && node.nodeType === Node.ELEMENT_NODE
 }