module-menu 0.2.28 → 0.2.30

package/src/pages/ModuleMenu/index.jsx

@@ -5,9 +5,11 @@ import HeaderDropdown from '../ModuleUser/HeaderDropdown';
 import Axios from '../util/axios';
 import _ from 'lodash';
 import './index.less';
+import cn from 'classnames'
 /*
 *stash： 
      一体化 integration
+     一体化 - 辽宁人大  LNRD
      轻量级 不传
      轻量级-国资委 GZW
 *
@@ -23,7 +25,7 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
   }, []);
 
   const getSessionMenu = () => {
-    if(stash === 'integration'){
+    if(['integration', 'LNRD'].includes(stash)){
       Axios(
         'get',
         '/admin-api/system/user/get-user-menu-List?menuName=数据平台',
@@ -31,6 +33,23 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
         {},
       )
         .then((res) => {
+          // const resD = JSON.parse(localStorage.getItem('moduleRoutes'))
+          //   let menuGet =
+          //     (resD?.map((item) => {
+          //         return {
+          //           ...item,
+          //           path:
+          //             item.path.indexOf('/') !== -1
+          //               ? item.path
+          //               : '/' + item.path,
+          //         };
+          //       })) ||
+          //     [];
+          //     console.log('menuGet', menuGet)
+          //   setSessionMenu(menuGet);
+          //   const menuLists = getNewMenuList(menuGet);
+          //   setMenuList(menuLists);
+
           if (res.data.code === 0) {
             let menuGet =
               (res.data.data &&
@@ -44,6 +63,7 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
                   };
                 })) ||
               [];
+              console.log('menuGet', menuGet)
             setSessionMenu(menuGet);
             const menuLists = getNewMenuList(menuGet);
             setMenuList(menuLists);
@@ -66,7 +86,7 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
 
   // 获取系统logo及title
   const getLogoAndTitle = () => {
-    let sysInfo = sysNameMap.find((item) => item.sysName === sysName);
+    let sysInfo = sysNameMap(stash).find((item) => item.sysName === sysName);
     let logoAndTitle = { logoSrc: '', title: '' };
     if (sysInfo) {
       logoAndTitle.logoSrc = sysInfo.logoSrc;
@@ -167,7 +187,7 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
   // 跳转首页
   const toHomePage = (index) => {
     if (index === 0) {
-      window.location.href = stash === 'integration'? '/dataadmin/#/index' : (stash === 'GZW' ? '/data-platform/#/index' : '/#/index')
+      window.location.href = ['integration', 'LNRD'].includes(stash) ? '/dataadmin/#/index' : (stash === 'GZW' ? '/data-platform/#/index' : '/#/index')
     }
   };
   const getNewMenuList = (menuGet) => {
@@ -225,9 +245,10 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
                 : '70px',
           }}
         >
-          <img src={item.url} className="middle" />
+          <img src={item.url} className={stash !== 'LNRD'? 'middle' : 'middle_LNRD'} />
           <span
-            className="middle textPad"
+          className={cn(stash !== 'LNRD'? 'middle' : 'middle_LNRD', 'textPad')}
+            // className=`${{stash !== 'LNRD'? 'middle' : 'middle_LNRD'}} textPad`
             onClick={() => {
               toHomePage(index);
             }}
@@ -273,9 +294,13 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
             item.children.map((child, idx) => {
               return (
                 <span key={child.childName}>
-                  <img src={child.url} className="middle iconPad" />
+                  <img src={child.url}
+                  className ={cn(stash !== 'LNRD'? 'middle': 'middle_LNRD',  'iconPad')}
+                  //  className="middle iconPad" 
+                  />
                   <span
-                    className="childMenu textPad middle"
+                  className ={cn(stash !== 'LNRD'? 'childMenu' : 'childMenu_LNRD', stash !== 'LNRD'? 'middle' : 'middle_LNRD','textPad')}
+                    // className="childMenu textPad middle"
                     onClick={() => {
                       toModulePage(child.childName);
                     }}
@@ -295,22 +320,28 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
     <div>
       <div className="menuPopupAndTitle">
         <div
-          className="menuIcon"
+          className={cn(stash !== 'LNRD'? 'menuIcon_size':'menuIcon_size_LNRD', 'menuIcon')}
           onMouseOver={() => setshowMenuList(true)}
           style={{
             backgroundImage: `url(${menuIconSrc})`,
             backgroundRepeat: 'no-repeat',
             backgroundSize: '50%',
             backgroundPosition: 'center',
+            backgroundColor: stash !== 'LNRD'? '#4091F7':'#EA1A1A'
           }}
         ></div>
-        <div className="menu_title_content">
+        <div className={cn(stash !== 'LNRD'? 'menu_title_content_size':'menu_title_content_size_LNRD', 'menu_title_content')}
+        
+        >
           <img
             className="menu_title_content_img"
             src={getLogoAndTitle().logoSrc}
             alt="logo"
           />
-          <span className="menu_title">{getLogoAndTitle().title}</span>
+          <span 
+          className={cn(stash !== 'LNRD'? 'menu_title_color':'menu_title_color_LNRD', 'menu_title')}
+          // className="menu_title"
+          >{getLogoAndTitle().title}</span>
         </div>
       </div>
       <div

package/src/pages/ModuleMenu/index.less

@@ -1,124 +1,153 @@
-.menu_list_content {
-  border: 1px solid #E9E9E9;
-  z-index: 2;
-  float: left;
-  position: fixed;
-  top: 50px;
-  left: 0;
-  background-color: #FFF;
-  box-shadow: rgba(0, 0, 0, 0.2) 1px 2px 10px;
-  padding-left: 35px;
-  padding-bottom: 35px;
-}
-
-.cardLine {
-  padding: 5px 0px;
-}
-
-.iconPad {
-  width: 16px;
-  height: 16px;
-}
-
-.textPad {
-  padding-left: 10px;
-}
-
-.leftMenu {
-  width: 100px;
-  float: left;
-  color: rgba(0, 0, 0, 0.85);
-  font-size: 16px;
-  cursor: pointer;
-  text-align: left;
-  font-weight: 400;
-}
-
-.rightMenu {
-  width: 460px;
-  float: left;
-  vertical-align: middle;
-  font-size: 14px;
-  color: rgba(0, 0, 0, 0.65);
-  font-weight: 400;
-  margin-left: 15px;
-}
-
-.childMenu:hover {
-  cursor: pointer;
-  color: #4091F7;
-}
-
-.childMenu {
-  width: 29%;
-  display: inline-block;
-}
-
-.middle {
-  vertical-align: middle;
-}
-
-.exchangeIcon {
-  width: 20px;
-  height: 20px;
-}
-
-.exchangeCss {
-  width: 140px;
-  color: rgba(0, 0, 0, 0.85);
-  font-size: 16px;
-  cursor: pointer;
-  text-align: left;
-  font-weight: 400;
-  padding-left: 10px;
-}
-
-.middle:hover {
-  color: #4091F7;
-}
-
-.menuPopupAndTitle {
-  display: flex;
-  justify-content: flex-start;
-}
-
-.menuIcon {
-  text-align: center;
-  line-height: 49px;
-  display: inline-block;
-  cursor: pointer;
-  width: 60px;
-  height: 49px;
-  background-color: #4091F7;
-}
-
-.menuIcon_img {
-  height: 25px;
-  width: 25px;
-}
-
-.menu_title_content {
-  height: 32px;
-  margin: 0 0 0 12px;
-  font-weight: 600;
-  font-size: 18px;
-  line-height: 49px;
-  vertical-align: middle;
-  animation: pro-layout-title-hide .3s;
-}
-
-.menu_title_content_img {
-  height: 32px;
-  width: 32px;
-}
-
-.menu_title {
-  color: #1890ff;
-  height: 32px;
-  margin: 0 0 0 12px;
-  font-weight: 600;
-  font-size: 18px;
-  line-height: 32px;
-  vertical-align: middle;
-  animation: pro-layout-title-hide .3s;
-}
+.menu_list_content {
+  border: 1px solid #E9E9E9;
+  z-index: 2;
+  float: left;
+  position: fixed;
+  top: 50px;
+  left: 0;
+  background-color: #FFF;
+  box-shadow: rgba(0, 0, 0, 0.2) 1px 2px 10px;
+  padding-left: 35px;
+  padding-bottom: 35px;
+}
+
+.cardLine {
+  padding: 5px 0px;
+}
+
+.iconPad {
+  width: 16px;
+  height: 16px;
+}
+
+.textPad {
+  padding-left: 10px;
+}
+
+.leftMenu {
+  width: 100px;
+  float: left;
+  color: rgba(0, 0, 0, 0.85);
+  font-size: 16px;
+  cursor: pointer;
+  text-align: left;
+  font-weight: 400;
+}
+
+.rightMenu {
+  width: 460px;
+  float: left;
+  vertical-align: middle;
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.65);
+  font-weight: 400;
+  margin-left: 15px;
+}
+
+.childMenu:hover {
+  cursor: pointer;
+  color: #4091F7;
+}
+.childMenu_LNRD:hover {
+  cursor: pointer;
+  color: #C50000;
+}
+
+.childMenu {
+  width: 29%;
+  display: inline-block;
+}
+.childMenu_LNRD {
+  width: 29%;
+  display: inline-block;
+}
+
+.middle, .middle_LNRD {
+  vertical-align: middle;
+}
+
+.exchangeIcon {
+  width: 20px;
+  height: 20px;
+}
+
+.exchangeCss {
+  width: 140px;
+  color: rgba(0, 0, 0, 0.85);
+  font-size: 16px;
+  cursor: pointer;
+  text-align: left;
+  font-weight: 400;
+  padding-left: 10px;
+}
+
+.middle:hover {
+  color: #4091F7;
+}
+.middle_LNRD:hover{
+  color: #C50000;
+}
+
+.menuPopupAndTitle {
+  display: flex;
+  justify-content: flex-start;
+}
+
+.menuIcon {
+  text-align: center;
+  line-height: 49px;
+  display: inline-block;
+  cursor: pointer;
+}
+.menuIcon_size{
+  width: 60px;
+  height: 49px;
+}
+.menuIcon_size_LNRD{
+  width: 75px;
+  height: 75px;
+}
+
+
+.menuIcon_img {
+  height: 25px;
+  width: 25px;
+}
+
+.menu_title_content {
+  margin: 0 0 0 12px;
+  font-weight: 600;
+  font-size: 18px;
+  
+  vertical-align: middle;
+  animation: pro-layout-title-hide .3s;
+}
+.menu_title_content_size{
+  height: 32px;
+  line-height: 49px;
+}
+.menu_title_content_size_LNRD{
+  height: 75px;
+  line-height: 75px;
+}
+
+.menu_title_content_img {
+  height: 32px;
+  width: 32px;
+}
+
+.menu_title {
+  height: 32px;
+  margin: 0 0 0 12px;
+  font-weight: 600;
+  font-size: 18px;
+  line-height: 32px;
+  vertical-align: middle;
+  animation: pro-layout-title-hide .3s;
+}
+.menu_title_color {
+  color: #1890ff;
+}
+.menu_title_color_LNRD{
+  color: #FFFFFF ;
+}

package/src/pages/ModuleUser/HeaderDropdown.jsx

@@ -1,10 +1,10 @@
-import { Dropdown } from 'antd';
-import React from 'react';
-import classNames from 'classnames';
-import styles from './index.less';
-
-const HeaderDropdown = ({ overlayClassName: cls, ...restProps }) => (
-  <Dropdown overlayClassName={classNames(styles.container, cls)} {...restProps} />
-);
-
-export default HeaderDropdown;
+import { Dropdown } from 'antd';
+import React from 'react';
+import classNames from 'classnames';
+import styles from './index.less';
+
+const HeaderDropdown = ({ overlayClassName: cls, ...restProps }) => (
+  <Dropdown overlayClassName={classNames(styles.container, cls)} {...restProps} />
+);
+
+export default HeaderDropdown;

package/src/pages/ModuleUser/constData.jsx

@@ -1,8 +1,8 @@
-// 图标位置
-export const userMenuIcon = {
-  PersonalCenterSrc: require('../../assets/personalCenter.svg'),
-  MessageCenterSrc: require('../../assets/messageCenter.svg'),
-  SystemManageSrc: require('../../assets/systemManage.svg'),
-  LogoutSrc: require('../../assets/logout.png'),
-  AppSystemSrc: require('../../assets/appsystemSrc.svg'),
-};
+// 图标位置
+export const userMenuIcon = {
+  PersonalCenterSrc: require('../../assets/personalCenter.svg'),
+  MessageCenterSrc: require('../../assets/messageCenter.svg'),
+  SystemManageSrc: require('../../assets/systemManage.svg'),
+  LogoutSrc: require('../../assets/logout.png'),
+  AppSystemSrc: require('../../assets/appsystemSrc.svg'),
+};

package/src/pages/ModuleUser/index.jsx

@@ -11,6 +11,8 @@ import HeaderDropdown from './HeaderDropdown';
 import Axios from '../util/axios';
 import getStore, { getUserName } from '../util/userInfo';
 import './index.less';
+import cn from 'classnames'
+
 // stash存在则为一体化，否则为轻量级
 const ModuleUser = ({ stash = '' }) => {
   const [tenantList, setTenantList] = useState([]);
@@ -204,7 +206,7 @@ const ModuleUser = ({ stash = '' }) => {
   );
 
   return (
-    <div className="right">
+    <div className={cn(stash !== 'LNRD'? 'right_size':'right_size_LNRD', 'right')}>
       {stash === 'integration' && [
         <Button type="link" onClick={jumpToExterHome}>
           服务门户

package/src/pages/ModuleUser/index.less

@@ -1,58 +1,63 @@
-.right {
-  display: flex;
-  float: right;
-  height: 48px;
-  margin-left: auto;
-  overflow: hidden;
-  align-items: center;
-  padding-right: 30px;
-
-  .action {
-    display: flex;
-    align-items: center;
-    height: 48px;
-    padding: 0 12px;
-    cursor: pointer;
-    transition: all 0.3s;
-
-    >span {
-      vertical-align: middle;
-    }
-  }
-
-  .search {
-    padding: 0 12px;
-
-    &:hover {
-      background: transparent;
-    }
-  }
-
-  .account {
-    .avatar {
-      margin-right: 8px;
-      // color: @primary-color;
-      vertical-align: top;
-      background: rgba(255, 255, 255, 0.85);
-    }
-  }
-}
-
-:global(.right-select> .ant-select-selector) {
-  border: none !important;
-  box-shadow: none !important;
-}
-
-:global(.right-select> .ant-select-arrow>.anticon) {
-  color: #000000 !important;
-}
-
-.menu {
-  :global(.anticon) {
-    margin-right: 8px;
-  }
-
-  :global(.ant-dropdown-menu-item) {
-    min-width: 160px;
-  }
-}
+.right {
+  display: flex;
+  float: right;
+  margin-left: auto;
+  overflow: hidden;
+  align-items: center;
+  padding-right: 30px;
+
+  .action {
+    display: flex;
+    align-items: center;
+    height: 48px;
+    padding: 0 12px;
+    cursor: pointer;
+    transition: all 0.3s;
+
+    >span {
+      vertical-align: middle;
+    }
+  }
+
+  .search {
+    padding: 0 12px;
+
+    &:hover {
+      background: transparent;
+    }
+  }
+
+  .account {
+    .avatar {
+      margin-right: 8px;
+      // color: @primary-color;
+      vertical-align: top;
+      background: rgba(255, 255, 255, 0.85);
+    }
+  }
+}
+.right_size{
+  height: 48px;
+}
+.right_size_LNRD{
+  height: 75px;
+}
+
+:global(.right-select> .ant-select-selector) {
+  border: none !important;
+  box-shadow: none !important;
+}
+
+:global(.right-select> .ant-select-arrow>.anticon) {
+  color: #000000 !important;
+}
+
+.menu {
+  :global(.anticon) {
+    margin-right: 8px;
+  }
+
+  :global(.ant-dropdown-menu-item) {
+    min-width: 160px;
+  }
+}

package/src/pages/index.jsx

@@ -1,5 +1,5 @@
-import ModuleMenu from './ModuleMenu';
-import ModuleUser from './ModuleUser';
-import Footer from './Footer';
-export { ModuleMenu, ModuleUser, Footer };
-// export default ModuleMenu;
+import ModuleMenu from './ModuleMenu';
+import ModuleUser from './ModuleUser';
+import Footer from './Footer';
+export { ModuleMenu, ModuleUser, Footer };
+// export default ModuleMenu;