From 63b867f9bc9a178587974dcb7bcb129375cb7d32 Mon Sep 17 00:00:00 2001
From: wanyiwei <wan.yiwei@free-sun.com.cn>
Date: Thu, 28 Jul 2022 21:20:47 +0800
Subject: [PATCH] =?UTF-8?q?*=E5=A4=A7=E5=B1=8F=E8=BF=90=E8=90=A5=E4=B8=BAn?=
 =?UTF-8?q?ull=E5=88=A4=E6=96=AD=EF=BC=8C=E6=9D=A1=E4=BB=B6=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E9=80=BB=E8=BE=91=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containers/footer/operation/left.js       | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/web/client/src/sections/quanju/containers/footer/operation/left.js b/web/client/src/sections/quanju/containers/footer/operation/left.js
index 2966deaf..4faa15ba 100644
--- a/web/client/src/sections/quanju/containers/footer/operation/left.js
+++ b/web/client/src/sections/quanju/containers/footer/operation/left.js
@@ -5,8 +5,6 @@ import Module from '../../public/module'
 import { getBusTierList } from '../../../actions/example'
 import './style.less'
 
-
-
 const Left = (props) => {
     const [treeData, setTreeData] = useState([])
     const [treeDataList, setTreeDataList] = useState([])
@@ -29,12 +27,12 @@ const Left = (props) => {
 
     const onChange = (e) => {
         const { value } = e.target;
-        let keys = []
-        const newExpandedKeys = treeDataList.filter(e => e.key.match(value))
+        let titles = []
+        const newExpandedKeys = treeDataList.filter(e => e.title != null && e.title.match(value))
         newExpandedKeys.forEach(e => {
-            keys.push(e.key)
+            titles.push(e.title)
         })
-        setExpandedKeys(keys);
+        setExpandedKeys(titles);
         setSearchValue(value);
         setAutoExpandParent(true);
     };
@@ -78,51 +76,53 @@ const Left = (props) => {
         let busTierOpen = []
         let dataList = []
         let busTierNewList = []
-        if (busTier && busTier.data && busTier.data.length > 0) {
-            busTierNewList.push(busTier && busTier.data && busTier.data[0])
-        }
-        if (busTierNewList.length > 0) {
-            busTierNewList.forEach((e, index) => {
-                if (index == 0) {
-                    busTierOpen.push(e.name)
-                }
-                busTierList.push({
-                    key: e.name,
-                    title: e.name,
-                    children: e.child.map(s => {
-                        return {
-                            key: s.name,
-                            title: s.name,
-                            children: s.child.map(i => {
-                                return {
-                                    key: i.name,
-                                    title: i.name,
-                                    children: i.child.map(x => {
-                                        return {
-                                            key: x.name,
-                                            title: x.name,
-                                        }
-                                    })
-                                }
-                            })
-                        }
+        // Math.ceil(Math.random() * 100);
+        // if (busTier && busTier.data && busTier.data.length > 0) {
+        //     busTierNewList.push(busTier && busTier.data && busTier.data[0])
+        // }
+        // if (busTierNewList.length > 0) {
+        // }
+        busTier && busTier.data && busTier.data.forEach((e, index) => {
+            if (index == 0) {
+                busTierOpen.push(e.name)
+            }
+            busTierList.push({
+                key: e.name,
+                title: e.name,
+                children: e.child.map(s => {
+                    return {
+                        key: s.name,
+                        title: s.name,
+                        children: s.child.map(i => {
+                            return {
+                                key: i.name == '--' || i.name == null ? Math.ceil(Math.random() * 100) : i.name,
+                                title: i.name,
+                                children: i.child.map(x => {
+                                    return {
+                                        key: x.name == '--' || x.name == null ? Math.ceil(Math.random() * 100) : x.name,
+                                        title: x.name == null ? '--' : x.name,
+                                    }
+                                })
+
+                            }
+                        })
+                    }
 
-                    })
                 })
             })
-            busTierNewList.forEach(e => {
-                e.child.forEach(i => {
-                    i.child.forEach(s => {
-                        s.child.forEach(x => {
-                            dataList.push({
-                                key: x.name,
-                                title: x.name
-                            })
+        })
+        busTier && busTier.data && busTier.data.forEach(e => {
+            e.child.forEach(i => {
+                i.child.forEach(s => {
+                    s.child.forEach(x => {
+                        dataList.push({
+                            key: x.name,
+                            title: x.name
                         })
                     })
                 })
             })
-        }
+        })
         setTreeData(busTierList)
         setExpandedKeys(busTierOpen)
         setTreeDataList(dataList)