module-menu 0.2.29 → 0.2.31

package/package.json

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

package/src/.umi/core/history.ts

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import { createBrowserHistory, History } from 'D:/chinamobile/compact-bigdata/module-menu/node_modules/umi/node_modules/@umijs/runtime';
+import { createBrowserHistory, History } from 'D:/chinamobile/compact-bigdata/module-menu1/node_modules/umi/node_modules/@umijs/runtime';
 
 let options = {
   "basename": "/"

package/src/.umi/core/plugin.ts

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import { Plugin } from 'D:/chinamobile/compact-bigdata/module-menu/node_modules/umi/node_modules/@umijs/runtime';
+import { Plugin } from 'D:/chinamobile/compact-bigdata/module-menu1/node_modules/umi/node_modules/@umijs/runtime';
 
 const plugin = new Plugin({
   validKeys: ['modifyClientRenderOpts','patchRoutes','rootContainer','render','onRouteChange','__mfsu','getInitialState','initialStateConfig','request',],

package/src/.umi/core/routes.ts

@@ -1,6 +1,6 @@
 // @ts-nocheck
 import React from 'react';
-import { ApplyPluginsType } from 'D:/chinamobile/compact-bigdata/module-menu/node_modules/umi/node_modules/@umijs/runtime';
+import { ApplyPluginsType } from 'D:/chinamobile/compact-bigdata/module-menu1/node_modules/umi/node_modules/@umijs/runtime';
 import * as umiExports from './umiExports';
 import { plugin } from './plugin';
 

package/src/.umi/plugin-helmet/exports.ts

@@ -1,3 +1,3 @@
 // @ts-nocheck
 // @ts-ignore
-export { Helmet } from 'D:/chinamobile/compact-bigdata/module-menu/node_modules/react-helmet';
+export { Helmet } from 'D:/chinamobile/compact-bigdata/module-menu1/node_modules/react-helmet';

package/src/.umi/plugin-model/Provider.tsx

@@ -1,6 +1,6 @@
 // @ts-nocheck
 import React from 'react';
-import initialState from 'D:/chinamobile/compact-bigdata/module-menu/src/.umi/plugin-initial-state/models/initialState';
+import initialState from 'D:/chinamobile/compact-bigdata/module-menu1/src/.umi/plugin-initial-state/models/initialState';
 
 // @ts-ignore
 import Dispatcher from './helpers/dispatcher';

package/src/.umi/plugin-model/useModel.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import { useState, useEffect, useContext, useRef } from 'react';
 // @ts-ignore
-import isEqual from 'D:/chinamobile/compact-bigdata/module-menu/node_modules/@umijs/plugin-model/node_modules/fast-deep-equal/index.js';
+import isEqual from 'D:/chinamobile/compact-bigdata/module-menu1/node_modules/@umijs/plugin-model/node_modules/fast-deep-equal/index.js';
 // @ts-ignore
 import { UmiContext } from './helpers/constant';
 import { Model, models } from './Provider';

package/src/.umi/plugin-request/request.ts

@@ -1,6 +1,6 @@
 // @ts-nocheck
 /**
- * Base on https://github.com/umijs/D:/chinamobile/compact-bigdata/module-menu/node_modules/umi-request
+ * Base on https://github.com/umijs/D:/chinamobile/compact-bigdata/module-menu1/node_modules/umi-request
  */
 import {
   extend,
@@ -13,7 +13,7 @@ import {
   RequestResponse,
   RequestInterceptor,
   ResponseInterceptor,
-} from 'D:/chinamobile/compact-bigdata/module-menu/node_modules/umi-request';
+} from 'D:/chinamobile/compact-bigdata/module-menu1/node_modules/umi-request';
 // @ts-ignore
 
 import { ApplyPluginsType } from 'umi';
@@ -22,7 +22,7 @@ import { history, plugin } from '../core/umiExports';
 // decoupling with antd UI library, you can using `alias` modify the ui methods
 // @ts-ignore
 import { message, notification } from '@umijs/plugin-request/lib/ui';
-import useUmiRequest, { UseRequestProvider } from 'D:/chinamobile/compact-bigdata/module-menu/node_modules/@ahooksjs/use-request';
+import useUmiRequest, { UseRequestProvider } from 'D:/chinamobile/compact-bigdata/module-menu1/node_modules/@ahooksjs/use-request';
 import {
   BaseOptions,
   BasePaginatedOptions,
@@ -38,7 +38,7 @@ import {
   PaginatedOptionsWithFormat,
   PaginatedParams,
   PaginatedResult,
-} from 'D:/chinamobile/compact-bigdata/module-menu/node_modules/@ahooksjs/use-request/lib/types';
+} from 'D:/chinamobile/compact-bigdata/module-menu1/node_modules/@ahooksjs/use-request/lib/types';
 
 type ResultWithData<T = any> = { data?: T; [key: string]: any };
 

package/src/.umi/umi.ts

@@ -4,8 +4,8 @@ import '@@/core/devScripts';
 import { plugin } from './core/plugin';
 import './core/pluginRegister';
 import { createHistory } from './core/history';
-import { ApplyPluginsType } from 'D:/chinamobile/compact-bigdata/module-menu/node_modules/umi/node_modules/@umijs/runtime';
-import { renderClient } from 'D:/chinamobile/compact-bigdata/module-menu/node_modules/@umijs/renderer-react/dist/index.js';
+import { ApplyPluginsType } from 'D:/chinamobile/compact-bigdata/module-menu1/node_modules/umi/node_modules/@umijs/runtime';
+import { renderClient } from 'D:/chinamobile/compact-bigdata/module-menu1/node_modules/@umijs/renderer-react/dist/index.js';
 import { getRoutes } from './core/routes';
 
 

package/src/pages/ModuleMenu/index.jsx

@@ -86,7 +86,6 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
 
   // 获取系统logo及title
   const getLogoAndTitle = () => {
-    sysName = 'datacollection'
     let sysInfo = sysNameMap(stash).find((item) => item.sysName === sysName);
     let logoAndTitle = { logoSrc: '', title: '' };
     if (sysInfo) {

package/src/pages/ModuleUser/index.jsx

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

package/src/pages/ModuleUser/index.less

@@ -51,6 +51,13 @@
 :global(.right-select> .ant-select-arrow>.anticon) {
   color: #000000 !important;
 }
+:global(.right-select_LNRD> .ant-select-selector) {
+  border: none !important;
+  box-shadow: none !important;
+}
+:global(.right-select_LNRD> .ant-select-arrow>.anticon) {
+  color: #FFFFFF !important;
+}
 
 .menu {
   :global(.anticon) {
@@ -61,3 +68,10 @@
     min-width: 160px;
   }
 }
+.fwmh_color_LNRD{
+  color: #FFE347 ;
+}
+.right_size_LNRD > .ant-btn-link:hover,
+.right_size_LNRD > .ant-btn-link:focus{
+  color:#FFE347
+}

package/src/pages/index.jsx

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