module-menu 0.3.32 → 0.3.34

package/package.json

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

package/src/pages/ModuleMenu/index.jsx

@@ -21,7 +21,7 @@ import cn from 'classnames';
      轻量级-国资委 GZW
 *
 */
-const ModuleMenu = ({ sysName, stash = '' }) => {
+const ModuleMenu = ({ sysName, stash = '', xiangtan = false }) => {
   const [sessionMenu, setSessionMenu] = useState([]);
   const [showMenuList, setshowMenuList] = useState(false);
   const [menuList, setMenuList] = useState([]);
@@ -172,7 +172,11 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
         .then((res) => {
           if (res.data.code === 0) {
             if (res.data.data.search('http') !== -1) {
-              window.location.href = res.data.data;
+              if (xiangtan) {
+                window.open(res.data.data, '_blank');
+              } else {
+                window.location.href = res.data.data;
+              }
             }
           } else {
             message.warning(res.data.msg || '获取信息失败');
@@ -298,6 +302,8 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
         ].includes(nameStr)
       ) {
         window.open(thirdPartyServiceJumpPath, '_blank');
+      } else if (xiangtan) {
+        window.open(thirdPartyServiceJumpPath, '_blank');
       } else {
         window.location.href = thirdPartyServiceJumpPath;
       }
@@ -306,11 +312,16 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
   // 跳转首页
   const toHomePage = (index) => {
     if (index === 0) {
-      window.location.href = ['integration', 'LNRD', 'HBJK'].includes(stash)
+      const homeUrl = ['integration', 'LNRD', 'HBJK'].includes(stash)
         ? '/dataadmin/#/index'
         : stash === 'GZW'
         ? '/data-platform/#/index'
         : '/#/index';
+      if (xiangtan) {
+        window.open(homeUrl, '_blank');
+      } else {
+        window.location.href = homeUrl;
+      }
     }
   };
   const getNewMenuList = (menuGet) => {

package/src/pages/ModuleUser/index.jsx

@@ -352,7 +352,7 @@ const ModuleUser = ({
                 marginLeft: '10px',
                 verticalAlign: '-2px',
                 fontSize: '16px',
-                fontWeight: '500',
+                fontWeight: '400',
                 // color: stash !== 'LNRD'? null: '#FFFFFF'
                 color: ['LNRD', 'HBJK'].includes(stash) ? '#FFFFFF' : null,
               }}