module-menu 0.3.9 → 0.3.12

package/src/pages/ModuleMenu/index.jsx

@@ -8,7 +8,7 @@ import _ from 'lodash';
 import './index.less';
 import cn from 'classnames'
 /*
-*stash： 
+*stash：
      一体化 integration
      一体化 - 辽宁人大  LNRD
      一体化 - 河北疾控  HBJK
@@ -118,6 +118,15 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
       return;
     }
 
+    // 针对HBJK的标签管理，从菜单权限数据中获取动态路径
+    if (stash === 'HBJK' && nameStr === '标签管理') {
+      const menuItem = sessionMenu?.find(item => item.name === '标签管理');
+      if (menuItem && menuItem.path) {
+        window.open(menuItem.path, '_blank');
+        return;
+      }
+    }
+
     if (nameStr === '政务共享交换平台') {
       Axios('get', '/admin/social/logoutUri', '', {})
         .then((res) => {
@@ -233,6 +242,8 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
     let newMenuList = _.cloneDeep(menuListInit(stash));
     if (menuGet) {
       const pathList = menuGet.map((item) => item.path);
+      const nameList = menuGet.map((item) => item.name); // 添加按名称匹配的列表
+
       // 过滤掉没有权限的子菜单(PS：如果模块下面子菜单都没有，则不显示该模块)
       for (let index = newMenuList.length - 1; index >= 0; index--) {
         const menuItem = newMenuList[index];
@@ -242,7 +253,13 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
           index_ch--
         ) {
           const child = menuItem.children[index_ch];
-          if (!pathList.includes(child.path)) {
+
+          // 对于HBJK的标签管理，使用名称匹配而不是path匹配
+          const hasPermission = (stash === 'HBJK' && child.childName === '标签管理')
+            ? nameList.includes('标签管理')
+            : pathList.includes(child.path);
+
+          if (!hasPermission) {
             newMenuList[index].children.splice(index_ch, 1);
           }
         }
@@ -288,7 +305,7 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
           }}
         >
           <img src={item.url} className={
-            stash === 'HBJK' ? 'middle_HBJK' : 
+            stash === 'HBJK' ? 'middle_HBJK' :
             stash !== 'LNRD' ? 'middle' : 'middle_LNRD'
           } />
           <span
@@ -341,7 +358,7 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
                 <span key={child.childName}>
                   <img src={child.url}
                   className ={cn(stash !== 'LNRD'? 'middle': 'middle_LNRD',  'iconPad')}
-                  //  className="middle iconPad" 
+                  //  className="middle iconPad"
                   />
                   <span
                   className ={cn(stash !== 'LNRD'? 'childMenu' : 'childMenu_LNRD', stash !== 'LNRD'? 'middle' : 'middle_LNRD','textPad')}
@@ -379,14 +396,14 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
           <img src={menuIconSrc} className={cn(stash !== 'LNRD'? null:'menuIcon_img')}></img>
         </div>
         <div className={cn(stash !== 'LNRD'? 'menu_title_content_size':'menu_title_content_size_LNRD', 'menu_title_content')}
-        
+
         >
           {stash !== 'HBJK' && <img
             className="menu_title_content_img"
             src={getLogoAndTitle().logoSrc}
             alt="logo"
           />}
-          <span 
+          <span
           className={cn(['LNRD','HBJK'].includes(stash)? 'menu_title_color_LNRD':'menu_title_color', 'menu_title')}
           // className="menu_title"
           >{getLogoAndTitle().title}</span>

package/src/pages/index.jsx

@@ -2,4 +2,5 @@ import ModuleMenu from './ModuleMenu';
 import ModuleUser from './ModuleUser';
 import Footer from './Footer';
 export { ModuleMenu, ModuleUser, Footer };
+// 开发环境，手动打开，并且屏蔽上面的导出
 // export default ModuleMenu;

package/src/pages/util/axios.js

@@ -2,53 +2,65 @@ import { message } from 'antd';
 import axios from 'axios';
 import baseCof from './config';
 import getStore from './userInfo';
-import { checkToken} from './permessionUtils';
+import { checkToken } from './permessionUtils';
 
-let tokenValue='5de3ef8171364d6ba756221655fe1310';
+let tokenValue = '5de3ef8171364d6ba756221655fe1310';
 // 轻量级tokenInSessionStor存在（GZW跳/data-platform/#/login，否则/#/login）,一体化tokenInSessionStor不存在
-const tokenInSessionStor = window.sessionStorage.getItem('bigdata-access_token');
-// stash=GZW为轻量级国资委 stash=integration 为一体化，其余为其他轻量级 
-const stash = localStorage.getItem('stash')
+const tokenInSessionStor = window.sessionStorage.getItem(
+  'bigdata-access_token',
+);
+// stash=GZW为轻量级国资委 stash=integration 为一体化，其余为其他轻量级
+const stash = localStorage.getItem('stash');
 
 axios.interceptors.response.use(
   (response) => {
     if (response.status === 200) {
       return response;
-    } else if (response.status === 401 || response.status === 302 || response.status === 403) {
+    } else if (
+      response.status === 401 ||
+      response.status === 302 ||
+      response.status === 403
+    ) {
       // 一体化需要调接口判断token是否过期，轻量级直接退出
-      if(!tokenInSessionStor){
-        if (process.env.NODE_ENV === 'production') {
+      if (!tokenInSessionStor) {
+        if (process.env.NODE_ENV === 'production') {
           tokenValue = getStore({ name: 'access_token' });
         }
         checkToken(tokenValue);
-      }else{
-        message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
-          localStorage.clear();
-          sessionStorage.clear();
-          window.location.href = stash==='GZW'?'/data-platform/#/login': '/#/login';
-        }});
+      } else {
+        message.error({
+          content: '用户凭证已过期，请重新登录',
+          onClose: () => {
+            localStorage.clear();
+            sessionStorage.clear();
+            window.location.href =
+              stash === 'GZW' ? '/data-platform/#/login' : '/#/login';
+          },
+        });
       }
-      
     } else {
       console.log('接口异常 response');
       return Promise.reject('error');
     }
   },
   (error) => {
-    console.log('error', error)
+    console.log('error', error);
     if (error.response) {
       if (error.response.status === 401) {
-        if(tokenInSessionStor){
-          if (process.env.NODE_ENV === 'production') {
+        if (tokenInSessionStor) {
+          if (process.env.NODE_ENV === 'production') {
             tokenValue = getStore({ name: 'access_token' });
           }
           checkToken(tokenValue);
-        }else{
-          message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
-            localStorage.clear();
-            sessionStorage.clear();
-            window.location.href = DEFAULT_LOGOUT_URL;
-          }});
+        } else {
+          message.error({
+            content: '用户凭证已过期，请重新登录',
+            onClose: () => {
+              localStorage.clear();
+              sessionStorage.clear();
+              window.location.href = DEFAULT_LOGOUT_URL;
+            },
+          });
         }
       } else if (error.response.status === 403) {
         // 提示无权限等
@@ -94,7 +106,7 @@ function Axios(method, api, params, map) {
   let httpDefult;
   // 几个外部特殊接口
   // 退出登录
-  if(api.includes('/auth/token/logout')){
+  if (api.includes('/auth/token/logout')) {
     httpDefult = {
       method: method,
       url: `${baseCof.baseSever}${api}`,
@@ -108,21 +120,21 @@ function Axios(method, api, params, map) {
       params: params,
       ...map,
     };
-  }else if(api.search("/admin-api") !== -1){
+  } else if (api.search('/admin-api') !== -1) {
     httpDefult = {
       method: method,
       url: `${baseCof.baseSever}${api}`,
       params: params,
       ...map,
     };
-  }else if(api.search("check_token") !== -1){
+  } else if (api.search('check_token') !== -1) {
     httpDefult = {
       method: method,
       url: `${baseCof.baseSever}${api}`,
       params: params,
       ...map,
     };
-  }else if (method === 'get') {
+  } else if (method === 'get') {
     httpDefult = {
       method: method,
       url: `${baseCof.baseSever}${baseCof.basePath}${api}`,