module-menu 0.2.50 → 0.2.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "module-menu",
-  "version": "0.2.50",
+  "version": "0.2.52",
   "description": "城市大数据平台公共头部及尾部",
   "main": "src/pages/index.jsx",
   "scripts": {

package/src/pages/ModuleMenu/constData.jsx

@@ -11,7 +11,7 @@ export const menuList = (stash = '') => [
     children: [
       {
         childName: '数据集成',
-        path: ['integration', 'LNRD'].includes(stash) ? '/datacollect' : '/datacollection',
+        path: ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/datacollect' : '/datacollection',
         // url: require('../../assets/datacollection_slogo.svg'),
         url: stash !=='LNRD' ? require('../../assets/datacollection_slogo.svg') : require('../../assets/datacollection_slogo_LNRD.svg'),
       },
@@ -29,7 +29,7 @@ export const menuList = (stash = '') => [
     children: [
       {
         childName: '数据治理',
-        path: ['integration', 'LNRD'].includes(stash) ? '/datamanage' : '/dataManager',
+        path: ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/datamanage' : '/dataManager',
         // url: require('../../assets/datamanager_slogo.svg'),
         url: stash !=='LNRD' ? require('../../assets/datamanager_slogo.svg') : require('../../assets/datamanager_slogo_LNRD.svg'),
       },
@@ -41,7 +41,7 @@ export const menuList = (stash = '') => [
       },
       {
         childName: '数据质量',
-        path: ['integration', 'LNRD'].includes(stash) ? '/quality' : '/quality/',
+        path: ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/quality' : '/quality/',
         // url: require('../../assets/quality_slogo.svg'),
         url: stash !=='LNRD' ? require('../../assets/quality_slogo.svg') : require('../../assets/quality_slogo_LNRD.svg'),
       },
@@ -64,7 +64,7 @@ export const menuList = (stash = '') => [
     children: [
       {
         childName: '离线开发',
-        path: ['integration', 'LNRD'].includes(stash) ? '/datadev' : '/datadev/',
+        path: ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/datadev' : '/datadev/',
         // url: require('../../assets/datadev_slogo.svg'),
         url: stash !=='LNRD' ? require('../../assets/datadev_slogo.svg') : require('../../assets/datadev_slogo_LNRD.svg'),
       },
@@ -169,7 +169,7 @@ export const menuList = (stash = '') => [
     name: '公共模块',
     url: stash !=='LNRD' ? require('../../assets/ic_gonggongmokuai_m.svg') : require('../../assets/ic_gonggongmokuai_m_LNRD.svg'),
     // url: require('../../assets/ic_gonggongmokuai_m.svg'),
-    children: ['integration', 'LNRD'].includes(stash)
+    children: ['integration', 'LNRD', 'HBJK'].includes(stash)
       ? [
           {
             childName: '运维中心',

package/src/pages/ModuleMenu/index.jsx

@@ -11,6 +11,7 @@ import cn from 'classnames'
 *stash： 
      一体化 integration
      一体化 - 辽宁人大  LNRD
+     一体化 - 河北疾控  HBJK
      轻量级 不传
      轻量级-国资委 GZW
 *
@@ -26,7 +27,7 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
   }, []);
 
   const getSessionMenu = () => {
-    if(['integration', 'LNRD'].includes(stash)){
+    if(['integration', 'LNRD', 'HBJK'].includes(stash)){
       Axios(
         'get',
         '/admin-api/system/user/get-user-menu-List?menuName=数据平台',
@@ -222,7 +223,7 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
   // 跳转首页
   const toHomePage = (index) => {
     if (index === 0) {
-      window.location.href = ['integration', 'LNRD'].includes(stash) ? '/dataadmin/#/index' : (stash === 'GZW' ? '/data-platform/#/index' : '/#/index')
+      window.location.href = ['integration', 'LNRD', 'HBJK'].includes(stash) ? '/dataadmin/#/index' : (stash === 'GZW' ? '/data-platform/#/index' : '/#/index')
     }
   };
   const getNewMenuList = (menuGet) => {
@@ -362,7 +363,8 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
             backgroundRepeat: 'no-repeat',
             backgroundSize: '50%',
             backgroundPosition: 'center',
-            backgroundColor: stash !== 'LNRD'? '#4091F7':'#EA1A1A'
+            backgroundColor: stash === 'LNRD'? '#EA1A1A': stash === 'HBJK'? '#1890ff' : '#4091F7'
+
           }}
         >
           <img src={menuIconSrc} className={cn(stash !== 'LNRD'? null:'menuIcon_img')}></img>
@@ -370,13 +372,13 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
         <div className={cn(stash !== 'LNRD'? 'menu_title_content_size':'menu_title_content_size_LNRD', 'menu_title_content')}
         
         >
-          <img
+          {stash !== 'HBJK' && <img
             className="menu_title_content_img"
             src={getLogoAndTitle().logoSrc}
             alt="logo"
-          />
+          />}
           <span 
-          className={cn(stash !== 'LNRD'? 'menu_title_color':'menu_title_color_LNRD', 'menu_title')}
+          className={cn(['LNRD','HBJK'].includes(stash)? 'menu_title_color_LNRD':'menu_title_color', 'menu_title')}
           // className="menu_title"
           >{getLogoAndTitle().title}</span>
         </div>

package/src/pages/ModuleMenu/index.less

@@ -113,7 +113,7 @@
 }
 .menuIcon_size{
   width: 60px;
-  height: 49px;
+  height: 48px;
 }
 .menuIcon_size_LNRD{
   width: 75px;

package/src/pages/ModuleUser/index.jsx

@@ -19,7 +19,7 @@ const ModuleUser = ({ stash = '' }) => {
   const [haveAppSystemPermission, setHaveAppSystemPermission] = useState(false);
   useEffect(() => {
     localStorage.setItem('stash', stash)
-    if (['integration', 'LNRD'].includes(stash)) {
+    if (['integration', 'LNRD', 'HBJK'].includes(stash)) {
       getTenantList();
       allSystemList();
     }
@@ -28,7 +28,7 @@ const ModuleUser = ({ stash = '' }) => {
     window.location.href = url;
   };  
   const handleClickSysManage = () => {
-    if(['integration', 'LNRD'].includes(stash)){
+    if(['integration', 'LNRD', 'HBJK'].includes(stash)){
       Axios('get', '/admin-api/system/auth/homePage', '', {})
         .then((res) => {
           if (res.data.code === 0) {
@@ -52,20 +52,20 @@ const ModuleUser = ({ stash = '' }) => {
     AppSystemSrc,
   } = userMenuIcon;
 
-  const isHaveSystemManagementPermission = (['integration', 'LNRD'].includes(stash))
+  const isHaveSystemManagementPermission = (['integration', 'LNRD', 'HBJK'].includes(stash))
     ? true
     : getStore({ name: 'isHaveSystemManagementPermission' });
-  const DEFAULT_LOGOUT_URL = (['integration', 'LNRD'].includes(stash)) ? '/admin-ui/login' : (stash === 'GZW'? '/data-platform/#/login' : '/#/login');
+  const DEFAULT_LOGOUT_URL = (['integration', 'LNRD', 'HBJK'].includes(stash)) ? '/admin-ui/login' : (stash === 'GZW'? '/data-platform/#/login' : '/#/login');
 
   // 跳转服务门户
   const jumpToExterHome = () => {
     handleClickmenu('/admin-ui/data-share-portal/homePage');
   };
 
-  const curTenantId = ['integration', 'LNRD'].includes(stash)
+  const curTenantId = ['integration', 'LNRD', 'HBJK'].includes(stash)
     ? getStore({ name: 'tenantId' }) && parseInt(getStore({ name: 'tenantId' }))
     : '';
-  const curTenantName = ['integration', 'LNRD'].includes(stash) ? getStore({ name: 'tenantName' }) : '';
+  const curTenantName = ['integration', 'LNRD', 'HBJK'].includes(stash) ? getStore({ name: 'tenantName' }) : '';
 
   const getTenantList = () => {
     Axios('get', '/admin-api/system/user/getUserTenant', '', {})
@@ -113,10 +113,10 @@ const ModuleUser = ({ stash = '' }) => {
 
   // 退出登录
   const logout = () => {
-      const logoutUrl = (['integration', 'LNRD'].includes(stash))
+      const logoutUrl = (['integration', 'LNRD', 'HBJK'].includes(stash))
       ? '/admin-api/system/auth/logout'
       : (stash === 'GZW' ? '/data-platform/auth/token/logout' : '/auth/token/logout');
-    const logouType = (['integration', 'LNRD'].includes(stash)) ? 'post' : 'delete';
+    const logouType = (['integration', 'LNRD', 'HBJK'].includes(stash)) ? 'post' : 'delete';
     Axios(logouType, logoutUrl, '', {})
       .then(() => {
         console.log('退出登录接口调用成功');
@@ -158,7 +158,7 @@ const ModuleUser = ({ stash = '' }) => {
         key="personalCenter"
         onClick={() =>
           handleClickmenu(
-            ['integration', 'LNRD'].includes(stash) ? 
+            ['integration', 'LNRD', 'HBJK'].includes(stash) ? 
             '/admin-ui/data-share-portal/personal/info':
             (stash === 'GZW'? '/data-platform/#/info/index' : '/#/info/index')
           )
@@ -169,7 +169,7 @@ const ModuleUser = ({ stash = '' }) => {
           alt=""
           style={{ marginRight: '10px', marginTop: '-3px' }}
         />
-        <span>{['integration', 'LNRD'].includes(stash) ? '用户中心' : '个人中心'}</span>
+        <span>{['integration', 'LNRD', 'HBJK'].includes(stash) ? '用户中心' : '个人中心'}</span>
       </Menu.Item>
       {isHaveSystemManagementPermission && (
         <Menu.Item key="systemManage" onClick={handleClickSysManage}>
@@ -207,13 +207,14 @@ const ModuleUser = ({ stash = '' }) => {
 
   return (
     <div className={cn(stash !== 'LNRD'? 'right_size':'right_size_LNRD', 'right')}>
-      {['integration', 'LNRD'].includes(stash) && [
-        <Button type="link" onClick={jumpToExterHome} className={cn(stash !== 'LNRD'? null:'fwmh_color_LNRD')}>
+      {['integration', 'LNRD', 'HBJK'].includes(stash) && [
+        <Button type="link" onClick={jumpToExterHome} 
+        className={cn(stash === 'LNRD'? 'fwmh_color_LNRD': stash === 'HBJK'? 'fwmh_color_HBJK' : null)}>
           服务门户
         </Button>,
         <Select
           defaultValue={curTenantId}
-          className={stash !== 'LNRD'? 'right-select':'right-select_LNRD'}
+          className={stash === 'LNRD'? 'right-select_LNRD': stash === 'HBJK'? 'right-select_HBJK' : 'right-select'}
           style={{
             width: 150,
             border: 'none',
@@ -232,13 +233,14 @@ const ModuleUser = ({ stash = '' }) => {
                 verticalAlign: '-2px',
                 fontSize: '16px',
                 fontWeight: '500',
-                color: stash !== 'LNRD'? null: '#FFFFFF'
+                // color: stash !== 'LNRD'? null: '#FFFFFF'
+                color: ['LNRD','HBJK'].includes(stash)? '#FFFFFF' : null
               }}
             >
               {getUserName()}
             </span>
             <CaretDownOutlined
-              style={{ marginLeft: '10px', fontSize: '8px', color: stash !== 'LNRD'? '#333333': '#FFFFFF'}}
+              style={{ marginLeft: '10px', fontSize: '8px', color: ['LNRD','HBJK'].includes(stash)? '#FFFFFF': '#333333'}}
             />
           </span>
         </HeaderDropdown>

package/src/pages/ModuleUser/index.less

@@ -55,12 +55,24 @@
   border: none !important;
   box-shadow: none !important;
 }
+:global(.right-select_HBJK> .ant-select-selector) {
+  border: none !important;
+  box-shadow: none !important;
+  background-color: #ffffff00 !important;
+  text-align: end !important;
+}
 :global(.right-select_LNRD> .ant-select-arrow>.anticon) {
   color: #FFFFFF !important;
 }
+:global(.right-select_HBJK> .ant-select-arrow>.anticon) {
+  color: #FFFFFF !important;
+}
 .right-select_LNRD .ant-select-selection-item{
   color: #FFFFFF !important;
 }
+.right-select_HBJK .ant-select-selection-item{
+  color: #FFFFFF !important;
+}
 
 .menu {
   :global(.anticon) {
@@ -77,6 +89,9 @@
 .fwmh_color_LNRD  .ant-btn-link{
   color: #FFE347 ;
 }
+.fwmh_color_HBJK.ant-btn-link{
+  color: #FFF ;
+}
 .right_size_LNRD .ant-btn-link:hover,
 .right_size_LNRD .ant-btn-link:focus{
   color:#FFE347