module-menu 0.2.26 → 0.2.28

package/package.json

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

package/src/pages/ModuleMenu/constData.jsx

@@ -1,4 +1,4 @@
-export const menuList = (stash) => [
+export const menuList = (stash = '') => [
   {
     name: '首页',
     url: require('../../assets/home.svg'),
@@ -10,7 +10,7 @@ export const menuList = (stash) => [
     children: [
       {
         childName: '数据集成',
-        path: stash ? '/datacollect' : '/datacollection',
+        path: stash === 'integration' ? '/datacollect' : '/datacollection',
         url: require('../../assets/datacollection_slogo.svg'),
       },
     ],
@@ -21,7 +21,7 @@ export const menuList = (stash) => [
     children: [
       {
         childName: '数据治理',
-        path: stash ? '/datamanage' : '/dataManager',
+        path: stash === 'integration' ? '/datamanage' : '/dataManager',
         url: require('../../assets/datamanager_slogo.svg'),
       },
       {
@@ -31,7 +31,7 @@ export const menuList = (stash) => [
       },
       {
         childName: '数据质量',
-        path: stash ? '/quality' : '/quality/',
+        path: stash === 'integration' ? '/quality' : '/quality/',
         url: require('../../assets/quality_slogo.svg'),
       },
     ],
@@ -42,7 +42,7 @@ export const menuList = (stash) => [
     children: [
       {
         childName: '离线开发',
-        path: stash ? '/datadev' : '/datadev/',
+        path: stash === 'integration' ? '/datadev' : '/datadev/',
         url: require('../../assets/datadev_slogo.svg'),
       },
       {
@@ -55,7 +55,7 @@ export const menuList = (stash) => [
   {
     name: '数据共享',
     url: require('../../assets/ic_shujukaifang_m.svg'),
-    children: stash
+    children: stash === 'integration'
       ? [
           {
             childName: '数据服务',
@@ -130,7 +130,7 @@ export const menuList = (stash) => [
   {
     name: '公共模块',
     url: require('../../assets/ic_gonggongmokuai_m.svg'),
-    children: stash
+    children: stash === 'integration'
       ? [
           {
             childName: '运维中心',
@@ -162,7 +162,34 @@ export const menuList = (stash) => [
             url: require('../../assets/ic_zonglan.png'),
           },
         ]
-      : [
+      : (stash === 'GZW'? 
+      [
+        {
+          childName: '运维中心',
+          path: '/operate',
+          url: require('../../assets/operate_slogo.svg'),
+        },
+        {
+          childName: '系统管理',
+          path: '/data-platform/#/admin/user/index',
+          url: require('../../assets/admin_slogo.svg'),
+        },
+        {
+          childName: '工单管理',
+          url: require('../../assets/workorder_slogo.svg'),
+        },
+        {
+          childName: '消息中心',
+          path: '/alert',
+          url: require('../../assets/alert_slogo.svg'),
+        },
+        {
+          childName: '数据安全',
+          path: '/datasecurity',
+          url: require('../../assets/datasecurity_slogo.png'),
+        },
+      ] : 
+      [
           {
             childName: '运维中心',
             path: '/operate',
@@ -187,7 +214,7 @@ export const menuList = (stash) => [
             path: '/datasecurity',
             url: require('../../assets/datasecurity_slogo.png'),
           },
-        ],
+        ]),
   },
 ];
 export const menuIconSrc = require('../../assets/menuIcon.svg');

package/src/pages/ModuleMenu/index.jsx

@@ -5,30 +5,25 @@ import HeaderDropdown from '../ModuleUser/HeaderDropdown';
 import Axios from '../util/axios';
 import _ from 'lodash';
 import './index.less';
-
-const ModuleMenu = ({ sysName, stash }) => {
+/*
+*stash： 
+     一体化 integration
+     轻量级 不传
+     轻量级-国资委 GZW
+*
+*/
+const ModuleMenu = ({ sysName, stash = '' }) => {
   const [sessionMenu, setSessionMenu] = useState([]);
   const [showMenuList, setshowMenuList] = useState(false);
   const [menuList, setMenuList] = useState([]);
   const [canOperatExchange, setCanOperatExchange] = useState(false); //是否具有政务共享平台权限
-
   useEffect(() => {
+    localStorage.setItem('stash', stash)
     getSessionMenu();
   }, []);
 
   const getSessionMenu = () => {
-    if (!stash) {
-      const menuObj = JSON.parse(sessionStorage.getItem('bigdata-menu'));
-      let menuGet = menuObj?.content || [];
-      setSessionMenu(menuGet);
-      const menuLists = getNewMenuList(menuGet);
-      setMenuList(menuLists);
-      let exchangeInfo =
-        menuGet && menuGet.find((item) => item.path === '/exchange');
-      if (exchangeInfo) {
-        setCanOperatExchange(true);
-      }
-    } else {
+    if(stash === 'integration'){
       Axios(
         'get',
         '/admin-api/system/user/get-user-menu-List?menuName=数据平台',
@@ -55,6 +50,17 @@ const ModuleMenu = ({ sysName, stash }) => {
           }
         })
         .catch((e) => console.log('e', e));
+    }else{
+      const menuObj = JSON.parse(sessionStorage.getItem('bigdata-menu'));
+      let menuGet = menuObj?.content || [];
+      setSessionMenu(menuGet);
+      const menuLists = getNewMenuList(menuGet);
+      setMenuList(menuLists);
+      let exchangeInfo =
+        menuGet && menuGet.find((item) => item.path === '/exchange');
+      if (exchangeInfo) {
+        setCanOperatExchange(true);
+      }
     }
   };
 
@@ -161,7 +167,7 @@ const ModuleMenu = ({ sysName, stash }) => {
   // 跳转首页
   const toHomePage = (index) => {
     if (index === 0) {
-      window.location.href = !stash ? '/#/index' : '/dataadmin/#/index';
+      window.location.href = stash === 'integration'? '/dataadmin/#/index' : (stash === 'GZW' ? '/data-platform/#/index' : '/#/index')
     }
   };
   const getNewMenuList = (menuGet) => {

package/src/pages/ModuleUser/index.jsx

@@ -12,25 +12,21 @@ import Axios from '../util/axios';
 import getStore, { getUserName } from '../util/userInfo';
 import './index.less';
 // stash存在则为一体化，否则为轻量级
-const ModuleUser = ({ stash }) => {
+const ModuleUser = ({ stash = '' }) => {
   const [tenantList, setTenantList] = useState([]);
   const [haveAppSystemPermission, setHaveAppSystemPermission] = useState(false);
   useEffect(() => {
-    if (stash) {
+    localStorage.setItem('stash', stash)
+    if (stash === 'integration') {
       getTenantList();
       allSystemList();
     }
   }, []);
   const handleClickmenu = (url) => {
     window.location.href = url;
-  };
+  };  
   const handleClickSysManage = () => {
-    if (!stash) {
-      const menuList = getStore({name: 'menu'});
-      const sysManagePath= menuList?.find(item=>item.name === '权限管理').children[0].path
-      window.location.href = '/#'+ sysManagePath
-      // '/#/admin/user/index';
-    } else {
+    if(stash === 'integration'){
       Axios('get', '/admin-api/system/auth/homePage', '', {})
         .then((res) => {
           if (res.data.code === 0) {
@@ -40,6 +36,10 @@ const ModuleUser = ({ stash }) => {
           }
         })
         .catch((e) => console.log('e', e));
+    }else{
+      const menuList = getStore({name: 'menu'});
+      const sysManagePath= menuList?.find(item=>item.name === '权限管理').children[0].path
+      window.location.href = stash === 'GZW' ? '/data-platform/#'+ sysManagePath : '/#'+ sysManagePath
     }
   };
   const {
@@ -50,20 +50,20 @@ const ModuleUser = ({ stash }) => {
     AppSystemSrc,
   } = userMenuIcon;
 
-  const isHaveSystemManagementPermission = stash
+  const isHaveSystemManagementPermission = (stash === 'integration')
     ? true
     : getStore({ name: 'isHaveSystemManagementPermission' });
-  const DEFAULT_LOGOUT_URL = !stash ? '/#/login' : '/admin-ui/login';
+  const DEFAULT_LOGOUT_URL = (stash === 'integration') ? '/admin-ui/login' : (stash === 'GZW'? '/data-platform/#/login' : '/#/login');
 
   // 跳转服务门户
   const jumpToExterHome = () => {
     handleClickmenu('/admin-ui/data-share-portal/homePage');
   };
 
-  const curTenantId = stash
+  const curTenantId = stash === 'integration'
     ? getStore({ name: 'tenantId' }) && parseInt(getStore({ name: 'tenantId' }))
     : '';
-  const curTenantName = stash ? getStore({ name: 'tenantName' }) : '';
+  const curTenantName = stash === 'integration' ? getStore({ name: 'tenantName' }) : '';
 
   const getTenantList = () => {
     Axios('get', '/admin-api/system/user/getUserTenant', '', {})
@@ -111,10 +111,10 @@ const ModuleUser = ({ stash }) => {
 
   // 退出登录
   const logout = () => {
-    const logoutUrl = !stash
-      ? '/auth/token/logout'
-      : '/admin-api/system/auth/logout';
-    const logouType = !stash ? 'delete' : 'post';
+      const logoutUrl = (stash === 'integration')
+      ? '/admin-api/system/auth/logout'
+      : (stash === 'GZW' ? '/data-platform/auth/token/logout' : '/auth/token/logout');
+    const logouType = (stash === 'integration') ? 'post' : 'delete';
     Axios(logouType, logoutUrl, '', {})
       .then(() => {
         console.log('退出登录接口调用成功');
@@ -156,9 +156,9 @@ const ModuleUser = ({ stash }) => {
         key="personalCenter"
         onClick={() =>
           handleClickmenu(
-            !stash
-              ? '/#/info/index'
-              : '/admin-ui/data-share-portal/personal/info',
+            stash === 'integration' ? 
+            '/admin-ui/data-share-portal/personal/info':
+            (stash === 'GZW'? '/data-platform/#/info/index' : '/#/info/index')
           )
         }
       >
@@ -167,7 +167,7 @@ const ModuleUser = ({ stash }) => {
           alt=""
           style={{ marginRight: '10px', marginTop: '-3px' }}
         />
-        <span>{!stash ? '个人中心' : '用户中心'}</span>
+        <span>{stash === 'integration' ? '用户中心' : '个人中心'}</span>
       </Menu.Item>
       {isHaveSystemManagementPermission && (
         <Menu.Item key="systemManage" onClick={handleClickSysManage}>
@@ -205,7 +205,7 @@ const ModuleUser = ({ stash }) => {
 
   return (
     <div className="right">
-      {stash && [
+      {stash === 'integration' && [
         <Button type="link" onClick={jumpToExterHome}>
           服务门户
         </Button>,

package/src/pages/util/axios.js

@@ -4,10 +4,11 @@ import baseCof from './config';
 import getStore from './userInfo';
 import { checkToken} from './permessionUtils';
 
-let tokenValue='dfd39d55-4c49-4862-8400-46f2a57f25ac';
-// tokenInSessionStor存在为一体化，不存在为轻量级
+let tokenValue='a39090d9-bf94-4342-9a1d-1b885cc5385b';
+// tokenInSessionStor存在为一体化，不存在为轻量级（GZW跳/data-platform/#/login，否则/#/login）
 const tokenInSessionStor = window.sessionStorage.getItem('bigdata-access_token');
-const DEFAULT_LOGOUT_URL = tokenInSessionStor? '/#/login':'/admin-ui/login'
+// stash=GZW为轻量级国资委 stash=integration 为一体化，其余为其他轻量级 
+const stash = localStorage.getItem('stash')
 
 axios.interceptors.response.use(
   (response) => {
@@ -24,7 +25,7 @@ axios.interceptors.response.use(
         message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
           localStorage.clear();
           sessionStorage.clear();
-          window.location.href = DEFAULT_LOGOUT_URL;
+          window.location.href = stash==='GZW'?'/data-platform/#/login': '/#/login';
         }});
       }
       
@@ -93,14 +94,14 @@ function Axios(method, api, params, map) {
   let httpDefult;
   // 几个外部特殊接口
   // 退出登录
-  if(api === '/auth/token/logout'){
+  if(api.includes('/auth/token/logout')){
     httpDefult = {
       method: method,
       url: `${baseCof.baseSever}${api}`,
       params: params,
       ...map,
     };
-  } else if (api === '/admin/social/logoutUri') {
+  } else if (api.includes('/admin/social/logoutUri')) {
     httpDefult = {
       method: method,
       url: `${baseCof.baseSever}${api}`,

package/src/pages/util/permessionUtils.js

@@ -9,7 +9,7 @@ export const checkToken = (token) => {
         message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
           localStorage.clear();
           sessionStorage.clear();
-          window.location.href = '/#/login';
+          window.location.href = '/admin-ui/login';
         }});
       })
 }