module-menu 0.3.8 → 0.3.9

package/package.json

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

package/src/pages/ModuleMenu/constData.jsx

@@ -1,35 +1,3 @@
-// 数据管理子菜单
-const getDataManageChildrenMenus = (stash = '') => [
-  {
-    childName: '数据治理',
-    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'),
-  },
-  {
-    childName: '元数据管理',
-    path: '/metadata',
-    // url: require('../../assets/metadata_slogo.svg'),
-    url: stash !=='LNRD' ? require('../../assets/metadata_slogo.svg') : require('../../assets/metadata_slogo_LNRD.svg'),
-  },
-  {
-    childName: '数据质量',
-    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'),
-  },
-  {
-    childName: "指标管理",
-    path: "/indicator",
-    url: require('../../assets/dataApp/indicator.png'),
-  },
-  {
-    childName: "知识图谱",
-    path: "/knowledge",
-    url: require('../../assets/ic_zhishitupu.png'),
-  }
-]
-
 export const menuList = (stash = '') => [
   {
     name: '首页',
@@ -58,12 +26,36 @@ export const menuList = (stash = '') => [
     name: '数据治理',
     url: stash !=='LNRD' ? require('../../assets/ic_shujuzhili_m.svg') : require('../../assets/ic_shujuzhili_m_LNRD.svg'),
     // url: require('../../assets/ic_shujuzhili_m.svg'),
-    children: stash === 'HBJK' ? getDataManageChildrenMenus(stash).push({
-      childName: '标签管理',
-      // 仅占位
-      path: '/tag-manage',
-      url: require('../../assets/tag_manage_HBJK.png'),
-    }) : getDataManageChildrenMenus(stash),
+    children: [
+      {
+        childName: '数据治理',
+        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'),
+      },
+      {
+        childName: '元数据管理',
+        path: '/metadata',
+        // url: require('../../assets/metadata_slogo.svg'),
+        url: stash !=='LNRD' ? require('../../assets/metadata_slogo.svg') : require('../../assets/metadata_slogo_LNRD.svg'),
+      },
+      {
+        childName: '数据质量',
+        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'),
+      },
+      {
+        childName: "指标管理",
+        path: "/indicator",
+        url: require('../../assets/dataApp/indicator.png'),
+      },
+      {
+        childName: "知识图谱",
+        path: "/knowledge",
+        url: require('../../assets/ic_zhishitupu.png'),
+      }
+    ],
   },
   {
     name: '数据开发',
@@ -207,7 +199,7 @@ export const menuList = (stash = '') => [
             path: '/datasecurity',
             // url: require('../../assets/datasecurity_slogo.png'),
             url: stash !=='LNRD' ? require('../../assets/datasecurity_slogo.png') : require('../../assets/datasecurity_slogo_LNRD.svg'),
-
+            
           },
           {
             childName: '平台运行总览',
@@ -215,7 +207,7 @@ export const menuList = (stash = '') => [
             url: require('../../assets/ic_zonglan.png'),
           },
         ]
-      : (stash === 'GZW'?
+      : (stash === 'GZW'? 
       [
         {
           childName: '运维中心',
@@ -241,7 +233,7 @@ export const menuList = (stash = '') => [
           path: '/datasecurity',
           url: require('../../assets/datasecurity_slogo.png'),
         },
-      ] :
+      ] : 
       [
           {
             childName: '运维中心',

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,15 +118,6 @@ 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) => {
@@ -242,8 +233,6 @@ 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];
@@ -253,13 +242,7 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
           index_ch--
         ) {
           const child = menuItem.children[index_ch];
-
-          // 对于HBJK的标签管理，使用名称匹配而不是path匹配
-          const hasPermission = (stash === 'HBJK' && child.childName === '标签管理')
-            ? nameList.includes('标签管理')
-            : pathList.includes(child.path);
-
-          if (!hasPermission) {
+          if (!pathList.includes(child.path)) {
             newMenuList[index].children.splice(index_ch, 1);
           }
         }
@@ -305,7 +288,7 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
           }}
         >
           <img src={item.url} className={
-            stash === 'HBJK' ? 'middle_HBJK' :
+            stash === 'HBJK' ? 'middle_HBJK' : 
             stash !== 'LNRD' ? 'middle' : 'middle_LNRD'
           } />
           <span
@@ -358,7 +341,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')}
@@ -396,14 +379,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>