Merge branch 'feature/maolipeng/youhua' into dev

src/modules/root/App.tsx

@@ -7,7 +7,7 @@
  */
 import React, { useContext, useEffect, useState } from 'react';
 import { withRouter } from 'react-router-dom';
-import { ConfigProvider, message } from 'antd';
+import { ConfigProvider, message, Layout } from 'antd';
 import Header from './Header'
 import Menu from './Menu'
 import Main from './Main'
@@ -21,6 +21,8 @@ import Service from "@/common/js/service";
 import Bus from '@/core/tbus';
 import { func } from 'prop-types';
 
+const { Footer, Sider, Content } = Layout;
+
 declare var window: any;
 
 const App: React.FC = (props: any) => {
@@ -124,6 +126,15 @@ const App: React.FC = (props: any) => {
 
   return (
     <div id="home">
+      {/* <Layout>
+        <Sider><Menu menuType={menuType} handleMenuType={handleMenuType} /></Sider>
+        <Layout>
+        <Header id="app" handleMenuType={handleMenuType} menuType={menuType} />
+        <ConfigProvider locale={zhCN} autoInsertSpaceInButton={false}>
+        <Main menuType={menuType} />
+        </ConfigProvider>
+        </Layout>
+      </Layout> */}
       <Header id="app" handleMenuType={handleMenuType} menuType={menuType} />
       <ConfigProvider locale={zhCN} autoInsertSpaceInButton={false}>
         <Main menuType={menuType} />

src/modules/root/Menu.tsx

@@ -130,6 +130,7 @@ function Aside(props: any) {
   const [selectKey, setSelectKey] = useState();
   const [openKeys, setOpenKeys] = useState(['']);
   const [topLogoUrl, setTopLogoUrl] = useState("")
+  const [collapsed, setCollapsed] = useState(false)
   const rootSubmenuKeys = _.pluck(menuList, 'groupCode');
   useEffect(() => {
     const link = props.location.pathname;
@@ -149,7 +150,7 @@ function Aside(props: any) {
   }, [props.location.pathname])
   useEffect(()=> {
     getTopLeftLogo()
-  })
+  },[])
   function getTopLeftLogo() {
     if (User.getToken()) {
       StoreService.getStoreDetail({storeId:User.getStoreId()})
@@ -165,9 +166,9 @@ function Aside(props: any) {
   }
   function toggleMenu(item: any) {
     window.RCHistory.push(item.link)
-    if (!menuType) {
-      setOpenKeys([])
-    }
+    // if (!menuType) {
+    //   setOpenKeys([])
+    // }
   }
   function onOpenChange(key: any) {
     if (openKeys.includes(key)) {
@@ -188,6 +189,7 @@ function Aside(props: any) {
   }
   function handleMenu() {
     handleMenuType();
+    setCollapsed(!collapsed)
   }
 
   return (
@@ -225,9 +227,7 @@ function Aside(props: any) {
 
         <Menu
           style={{ minHeight: "100%", background: '#0E1935' }}
-          selectedKeys={selectKey}
-          openKeys={openKeys}
-          inlineCollapsed={false}
+          inlineCollapsed={collapsed}
           mode={menuType ? "inline" : "vertical"}
         >
           {
@@ -236,13 +236,11 @@ function Aside(props: any) {
                 return null;
               }
               if (item.children) {
-                return <SubMenu onTitleMouseEnter={() => onOpenChangeForHover(item.groupCode)} key={item.groupCode} style={{ marginTop: 0 }} className="first-menu-item" title={<div > 
-                    {/* <span style={{ marginRight: 16 }} className="iconfont icon" dangerouslySetInnerHTML={{ __html:item.icon}}></span> */}
-                    <img src={item.img} className="icon-img"></img>
-                    {menuType &&
-                      <span>{item.groupName}</span>
-                    }</div>
-                  } onTitleClick={() => onOpenChange(item.groupCode)}>
+                return <SubMenu 
+                        key={item.groupCode} 
+                        style={{ marginTop: 0 }} 
+                        title={<div><img src={item.img} className="icon-img"></img><span>{item.groupName}</span></div> } 
+                        onTitleClick={() => onOpenChange(item.groupCode)}>
                   {
                     item.children.map((_item: any, _index: any) => {
                       if (ctx.xmState.storeUserPermissionList.indexOf(_item.groupCode) === -1) {
@@ -256,18 +254,12 @@ function Aside(props: any) {
                   }
                 </SubMenu>
               } else {
-                return <Menu.Item onClick={() => { toggleMenu(item) }} key={item.groupCode} className="first-menu-item">
-                  {/* <span style={{ marginRight: 16 }} className="iconfont icon" dangerouslySetInnerHTML={{ __html:item.icon}}></span> */}
-                  {selectKey === item.groupCode ?
-                    <img src={item.selectImg} className="icon-img"></img>
-                    :
-                    <img src={item.img} className="icon-img"></img>
-                  }
-                  
-
-                  {menuType &&
-                    <span>{item.groupName}</span>
-                  }
+                return <Menu.Item 
+                        onClick={() => { toggleMenu(item) }} 
+                        key={item.groupCode} 
+                        icon={selectKey === item.groupCode ? <img src={item.selectImg} className="icon-img"></img>:<img src={item.img} className="icon-img"></img>}
+                        >
+                    {item.groupName}
                 </Menu.Item>
               }
             })