fix: '消息平台推送模板配置新增WEB，APP配置'

src/components/ExpendableTree/index.jsx

@@ -2,7 +2,7 @@
  * @Description:
  * @Author: leizhe
  * @Date: 2022-03-04 18:33:24
- * @LastEditTime: 2022-03-24 17:41:25
+ * @LastEditTime: 2022-04-27 14:26:14
  * @LastEditors: leizhe
  */
 import { Tree } from 'antd';
@@ -18,7 +18,8 @@ export default props => {
   const { expandedKeys, onExpand, onSelect, selectedKeys, keepTree, ...rest } = props;
   const [epKeys, setEpKeys] = useState([expandedKeys]);
   useEffect(() => {
-    console.log(expandedKeys, 'expandedKeys');
+    console.log(expandedKeys);
+    console.log(selectedKeys);
     setEpKeys([expandedKeys]);
   }, [expandedKeys]);
 

src/pages/bsmanager/base/standingBook/standingBook.jsx

@@ -31,6 +31,7 @@ const StandingBook = props => {
   const [allData, setAllData] = useState([]);
   const [tableData, setTableData] = useState([]);
   const [treeLoading, setTreeLoading] = useState(false);
+  const [tableLoading, setTableLoading] = useState(false);
   const [maxLength, setMaxLength] = useState(0);
   const [treeVisible, setTreeVisible] = useState(true); // 左边列表是否可见
   const [formObj, setFormObj] = useState('');
@@ -180,7 +181,7 @@ const StandingBook = props => {
         setShowSearchStyle(false);
         // 第一次进入展示第一页 不是第一次进入根据当前选择的来进行展示
         flag === 0 ? setPickItem(newArr[0]) : setPickItem(pickItem);
-        // pickItem ? setPickItem(pickItem) : setPickItem(newArr[0]);
+        setPickItem(newArr[0]);
         console.log(newArr, 'newArr');
         setTableData(newArr);
       }
@@ -257,9 +258,9 @@ const StandingBook = props => {
   const onSearch = () => {
     console.log(searchWord);
     console.log(pickItem);
-    setTreeLoading(true);
+    setTableLoading(true);
     GetCM_Ledger_LoadLedgers({ accountName: searchWord }).then(res => {
-      setTreeLoading(false);
+      setTableLoading(false);
       if (res.msg === 'Ok' && res.data.root) {
         console.log(res.data.root);
         setMaxLength(res.data.root.length + 1);
@@ -270,7 +271,7 @@ const StandingBook = props => {
         });
         console.log(arr);
         setShowSearchStyle(true);
-        setAllData(arr);
+        // setAllData(arr);
         setSearchData(res.data.root);
         setPickItem('');
         // 第一次进入展示第一页 不是第一次进入根据当前选择的来进行展示
@@ -285,7 +286,27 @@ const StandingBook = props => {
     console.log(e.target.value);
     setSearchWord(e.target.value);
     if (e.target.value == '') {
-      handleReset();
+      setTableLoading(true);
+      GetCM_Ledger_LoadLedgers().then(res => {
+        setTableLoading(false);
+        if (res.msg === 'Ok' && res.data.root) {
+          console.log(res.data.root);
+          setMaxLength(res.data.root.length + 1);
+          let arr = formateArrDataA(res.data.root, 'type');
+          let newArr = [];
+          Object.keys(arr).map((item, index) => {
+            newArr.push(item);
+          });
+          console.log(arr);
+          setAllData(arr);
+          setShowSearchStyle(false);
+          // 第一次进入展示第一页 不是第一次进入根据当前选择的来进行展示
+          flag === 0 ? setPickItem(newArr[0]) : setPickItem(pickItem);
+          setPickItem(newArr[0]);
+          console.log(newArr, 'newArr');
+          setTableData(newArr);
+        }
+      });
     }
   };
 
@@ -301,7 +322,6 @@ const StandingBook = props => {
   };
   const handleReset = () => {
     setFlag(flag + 1);
-    setSearchWord('');
   };
   return (
     <PageContainer className={styles.userManageContainer}>
@@ -354,7 +374,10 @@ const StandingBook = props => {
                               [styles.pickItem]: item === pickItem,
                               [styles.listHover]: item !== pickItem && item === hoverItemIndex,
                             })}
-                            onClick={e => setPickItem(item)}
+                            onClick={() => {
+                              setPickItem(item);
+                              setSearchWord('');
+                            }}
                             onMouseEnter={() => {
                               setHoverItemIndex(item);
                             }}
@@ -422,6 +445,7 @@ const StandingBook = props => {
                 };
               }}
               columns={columns}
+              loading={tableLoading}
               dataSource={pickItem ? allData[pickItem] : searchData}
               // loading={tableLoading}
               scroll={{ x: 'max-content', y: 'calc(100vh - 180px)' }}