vsyswin-ui 0.2.85 → 0.2.87

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "vsyswin-ui",
-    "version": "0.2.85",
+    "version": "0.2.87",
     "main": "lib/vsyswin-ui.umd.min.js",
     "private": false,
     "description": "Vue2.x的应用组件库.",

package/packages/search-bar/src/search-bar.vue

@@ -389,7 +389,6 @@
 import _ from 'lodash'
 import moment from 'moment'
 import saveLocal from './save-local'
-import XEUtils from 'xe-utils'
 
 function deepCopyFunction(arr1, arr2) {
   for (let i = 0; i < arr1.length; i++) {
@@ -405,6 +404,31 @@ function deepCopyFunction(arr1, arr2) {
     }
   }
 }
+function findTree(allData, fn) {
+  function loopFn(arr, pNode) {
+    for (let i = 0; i < arr.length; i++) {
+      // debugger
+      let result = null
+      const item = arr[i]
+      item.nodes = [item]
+      if (pNode) {
+        item.nodes = [...pNode.nodes, item]
+      }
+      // findTree(item.options, tItem => tItem.value === lastValue)
+      const flag = fn(item)
+      if (flag) {
+        result = item
+        if (result) return result
+      }
+      if (item.children) {
+        result = loopFn(item.children, item)
+      }
+      if (result) return result
+    }
+  }
+  const res = loopFn(allData)
+  return res
+}
 
 export default {
   name: 'SySearchbar',
@@ -630,14 +654,14 @@ export default {
                   const valueOptions = item.value.map((x) => {
                     // console.log('xxxxxxxxxxxxx', x) // 这里的x是个数组
                     const lastValue = x[x.length - 1]
-                    const find = XEUtils.findTree(item.options, tItem => tItem.value === lastValue)
+                    const find = findTree(item.options, tItem => tItem.value === lastValue)
                     return find
                   })
                   obj.name = valueOptions.map((x) => x.nodes.map(y => y.label).join('/')).join(',')
                 } else {
                   const lastValue = item.value[item.value.length - 1]
-                  const find = XEUtils.findTree(item.options, tItem => tItem.value === lastValue)
-                  obj.name = find.nodes.map(y => y.label).join('/')
+                  const find = findTree(item.options, tItem => tItem.value === lastValue)
+                  obj.name = find ? find.nodes.map(y => y.label).join('/') : ''
                 }
               } else if (item.type === 'slot') {
                 if (!item.getValue) return