module-menu 0.3.30 → 0.3.32

package/config/config.js

@@ -5,7 +5,7 @@ module.exports = defineConfig({
     // localhost:8000/cmcc/data/** -> http://192.168.108.88:30808/cmcc/data/**
     '/cmcc/data/': {
       // 要代理的地址
-      target: 'https://192.168.108.81:31950',
+      target: 'https://192.168.108.203:31950',
       // target: 'http://10.136.106.82:30808',
       // target: 'http://192.168.200.122:28088',
       // target: 'http://10.136.106.148:32678',
@@ -17,7 +17,7 @@ module.exports = defineConfig({
     },
     '/admin/': {
       // 要代理的地址
-      target: 'https://192.168.108.81:31950',
+      target: 'https://192.168.108.203:31950',
       // target: 'http://10.136.106.82:30808',
       // target: 'http://192.168.200.122:28088',
       // target: 'http://10.136.106.148:32678',
@@ -29,7 +29,7 @@ module.exports = defineConfig({
     },
     '/admin-api/': {
       // 要代理的地址
-      target: 'https://192.168.108.81:31950',
+      target: 'https://192.168.108.203:31950',
       // target: 'http://10.136.106.82:30808',
       // target: 'http://192.168.200.122:28088',
       // target: 'http://10.136.106.148:32678',

package/package.json

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

package/src/pages/ModuleUser/index.jsx

@@ -12,16 +12,20 @@ import Axios from '../util/axios';
 import getStore, { getUserName } from '../util/userInfo';
 import { getLoginUrl } from '../util/permessionUtils';
 import './index.less';
-import cn from 'classnames'
+import cn from 'classnames';
 import userLogo1 from '../../assets/userLogo1.png';
 
 // stash存在则为一体化，否则为轻量级
-const ModuleUser = ({ stash = '', isBigDataFoundationPlatform = false, PZCS = false }) => {
+const ModuleUser = ({
+  stash = '',
+  isBigDataFoundationPlatform = false,
+  PZCS = false,
+}) => {
   const [tenantList, setTenantList] = useState([]);
   const [haveAppSystemPermission, setHaveAppSystemPermission] = useState(false);
   const [getSystemPermission, setGetSystemPermission] = useState(false);
   useEffect(() => {
-    localStorage.setItem('stash', stash)
+    localStorage.setItem('stash', stash);
     if (['integration', 'LNRD', 'HBJK'].includes(stash)) {
       getTenantList();
       allSystemList();
@@ -32,7 +36,7 @@ const ModuleUser = ({ stash = '', isBigDataFoundationPlatform = false, PZCS = fa
     window.location.href = url;
   };
   const handleClickSysManage = () => {
-    if(['integration', 'LNRD', 'HBJK'].includes(stash)){
+    if (['LNRD', 'HBJK'].includes(stash)) {
       Axios('get', '/admin-api/system/auth/homePage', '', {})
         .then((res) => {
           if (res.data.code === 0) {
@@ -42,10 +46,24 @@ const ModuleUser = ({ stash = '', isBigDataFoundationPlatform = false, PZCS = fa
           }
         })
         .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
+    } else if (stash === 'integration') {
+      Axios('get', '/admin-api/system/auth/systemPage', '', {})
+        .then((res) => {
+          if (res.data.code === 0) {
+            window.location.href = `/admin-ui${res.data.data.path}`;
+          } else {
+            message.warning(res.data.msg || '获取系统管理页面路由信息失败');
+          }
+        })
+        .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 {
@@ -56,10 +74,16 @@ const ModuleUser = ({ stash = '', isBigDataFoundationPlatform = false, PZCS = fa
     AppSystemSrc,
   } = userMenuIcon;
 
-  const isHaveSystemManagementPermission = (['LNRD', 'HBJK'].includes(stash))
-    ? true : stash === 'integration' ? getSystemPermission 
+  const isHaveSystemManagementPermission = ['LNRD', 'HBJK'].includes(stash)
+    ? true
+    : stash === 'integration'
+    ? getSystemPermission
     : getStore({ name: 'isHaveSystemManagementPermission' });
-  const DEFAULT_LOGOUT_URL = (['integration', 'LNRD', 'HBJK'].includes(stash)) ? '/admin-ui/login' : (stash === 'GZW'? '/data-platform/#/login' : '/#/login');
+  const DEFAULT_LOGOUT_URL = ['integration', 'LNRD', 'HBJK'].includes(stash)
+    ? '/admin-ui/login'
+    : stash === 'GZW'
+    ? '/data-platform/#/login'
+    : '/#/login';
 
   // 跳转服务门户
   const jumpToExterHome = () => {
@@ -69,7 +93,9 @@ const ModuleUser = ({ stash = '', isBigDataFoundationPlatform = false, PZCS = fa
   const curTenantId = ['integration', 'LNRD', 'HBJK'].includes(stash)
     ? getStore({ name: 'tenantId' }) && parseInt(getStore({ name: 'tenantId' }))
     : '';
-  const curTenantName = ['integration', 'LNRD', 'HBJK'].includes(stash) ? getStore({ name: 'tenantName' }) : '';
+  const curTenantName = ['integration', 'LNRD', 'HBJK'].includes(stash)
+    ? getStore({ name: 'tenantName' })
+    : '';
 
   const getTenantList = () => {
     Axios('get', '/admin-api/system/user/getUserTenant', '', {})
@@ -108,7 +134,7 @@ const ModuleUser = ({ stash = '', isBigDataFoundationPlatform = false, PZCS = fa
               };
             });
           let haveAppSystem_Permission =
-            menuGet?.some((item) => item.name === '应用系统配置') || false;
+            menuGet?.some((item) => item.name === '数据源管理') || false;
           setHaveAppSystemPermission(haveAppSystem_Permission);
         }
       })
@@ -138,14 +164,18 @@ const ModuleUser = ({ stash = '', isBigDataFoundationPlatform = false, PZCS = fa
         }
       })
       .catch((e) => console.log('e', e));
-  }
+  };
 
   // 退出登录
   const logout = () => {
-      const logoutUrl = (['integration', 'LNRD', 'HBJK'].includes(stash))
+    const logoutUrl = ['integration', 'LNRD', 'HBJK'].includes(stash)
       ? '/admin-api/system/auth/logout'
-      : (stash === 'GZW' ? '/data-platform/auth/token/logout' : '/auth/token/logout');
-    const logouType = (['integration', 'LNRD', 'HBJK'].includes(stash)) ? 'post' : 'delete';
+      : stash === 'GZW'
+      ? '/data-platform/auth/token/logout'
+      : '/auth/token/logout';
+    const logouType = ['integration', 'LNRD', 'HBJK'].includes(stash)
+      ? 'post'
+      : 'delete';
     Axios(logouType, logoutUrl, '', {})
       .then(() => {
         console.log('退出登录接口调用成功');
@@ -158,7 +188,9 @@ const ModuleUser = ({ stash = '', isBigDataFoundationPlatform = false, PZCS = fa
                 console.log('Login URL found:', res.data.data.loginoutUrl);
                 window.location.href = res.data.data.loginoutUrl;
               } else {
-                console.log('No login URL found, redirect to default login page.');
+                console.log(
+                  'No login URL found, redirect to default login page.',
+                );
                 window.location.href = '/admin-ui/login';
               }
             })
@@ -206,9 +238,11 @@ const ModuleUser = ({ stash = '', isBigDataFoundationPlatform = false, PZCS = fa
           handleClickmenu(
             isBigDataFoundationPlatform
               ? '/admin-ui/user/profile'
-              : (['integration', 'LNRD', 'HBJK'].includes(stash)
-                ? '/admin-ui/data-share-portal/personal/info'
-                : (stash === 'GZW' ? '/data-platform/#/info/index' : '/#/info/index'))
+              : ['integration', 'LNRD', 'HBJK'].includes(stash)
+              ? '/admin-ui/data-share-portal/personal/info'
+              : stash === 'GZW'
+              ? '/data-platform/#/info/index'
+              : '/#/info/index',
           )
         }
       >
@@ -217,7 +251,11 @@ const ModuleUser = ({ stash = '', isBigDataFoundationPlatform = false, PZCS = fa
           alt=""
           style={{ marginRight: '10px', marginTop: '-3px' }}
         />
-        <span>{['integration', 'LNRD', 'HBJK'].includes(stash) ? '用户中心' : '个人中心'}</span>
+        <span>
+          {['integration', 'LNRD', 'HBJK'].includes(stash)
+            ? '用户中心'
+            : '个人中心'}
+        </span>
       </Menu.Item>
       {isHaveSystemManagementPermission && (
         <Menu.Item key="systemManage" onClick={handleClickSysManage}>
@@ -232,14 +270,20 @@ const ModuleUser = ({ stash = '', isBigDataFoundationPlatform = false, PZCS = fa
       {haveAppSystemPermission && (
         <Menu.Item
           key="appSystem"
-          onClick={() => handleClickmenu(PZCS ? '/dataadmin/#/appManager/index' : '/dataadmin/#/appSystem/index')}
+          onClick={() =>
+            handleClickmenu(
+              PZCS
+                ? '/dataadmin/#/appManager/index'
+                : '/dataadmin/#/appSystem/index',
+            )
+          }
         >
           <img
             src={AppSystemSrc}
             alt=""
             style={{ marginRight: '10px', marginTop: '-3px' }}
           />
-          <span>应用系统配置</span>
+          <span>数据源管理</span>
         </Menu.Item>
       )}
       <Menu.Item key="logout" onClick={() => logout()}>
@@ -254,29 +298,51 @@ const ModuleUser = ({ stash = '', isBigDataFoundationPlatform = false, PZCS = fa
   );
 
   return (
-    <div className={cn(stash !== 'LNRD'? 'right_size':'right_size_LNRD', 'right')}>
+    <div
+      className={cn(
+        stash !== 'LNRD' ? 'right_size' : 'right_size_LNRD',
+        'right',
+      )}
+    >
       {['integration', 'LNRD', 'HBJK'].includes(stash) && [
         !isBigDataFoundationPlatform && !PZCS && (
-          <Button type="link" onClick={jumpToExterHome}
-            className={cn(stash === 'LNRD'? 'fwmh_color_LNRD': stash === 'HBJK'? 'fwmh_color_HBJK' : null)}>
+          <Button
+            type="link"
+            onClick={jumpToExterHome}
+            className={cn(
+              stash === 'LNRD'
+                ? 'fwmh_color_LNRD'
+                : stash === 'HBJK'
+                ? 'fwmh_color_HBJK'
+                : null,
+            )}
+          >
             服务门户
           </Button>
         ),
-        !PZCS && <Select
-          defaultValue={curTenantId}
-          className={stash === 'LNRD'? 'right-select_LNRD': stash === 'HBJK'? 'right-select_HBJK' : 'right-select'}
-          style={{
-            width: 150,
-            border: 'none',
-          }}
-          onChange={handleChangeTenant}
-          options={tenantList}
-        />,
+        !PZCS && (
+          <Select
+            defaultValue={curTenantId}
+            className={
+              stash === 'LNRD'
+                ? 'right-select_LNRD'
+                : stash === 'HBJK'
+                ? 'right-select_HBJK'
+                : 'right-select'
+            }
+            style={{
+              width: 150,
+              border: 'none',
+            }}
+            onChange={handleChangeTenant}
+            options={tenantList}
+          />
+        ),
       ]}
       {getUserName() ? (
         <HeaderDropdown overlay={menu}>
           <span style={{ display: 'inline-block', marginLeft: '12px' }}>
-           {stash === 'HBJK' ? (
+            {stash === 'HBJK' ? (
               <Avatar size="small" src={userLogo1} />
             ) : (
               <Avatar size="small" icon={<UserOutlined />} />
@@ -288,13 +354,17 @@ const ModuleUser = ({ stash = '', isBigDataFoundationPlatform = false, PZCS = fa
                 fontSize: '16px',
                 fontWeight: '500',
                 // color: stash !== 'LNRD'? null: '#FFFFFF'
-                color: ['LNRD','HBJK'].includes(stash)? '#FFFFFF' : null
+                color: ['LNRD', 'HBJK'].includes(stash) ? '#FFFFFF' : null,
               }}
             >
               {getUserName()}
             </span>
             <CaretDownOutlined
-              style={{ marginLeft: '10px', fontSize: '8px', color: ['LNRD','HBJK'].includes(stash)? '#FFFFFF': '#333333'}}
+              style={{
+                marginLeft: '10px',
+                fontSize: '8px',
+                color: ['LNRD', 'HBJK'].includes(stash) ? '#FFFFFF' : '#333333',
+              }}
             />
           </span>
         </HeaderDropdown>

package/src/pages/index.jsx

@@ -1,18 +1,6 @@
 import ModuleMenu from './ModuleMenu';
 import ModuleUser from './ModuleUser';
 import Footer from './Footer';
-
 export { ModuleMenu, ModuleUser, Footer };
-
-export default function IndexPage() {
-  return (
-    <div>
-      <ModuleMenu  stash="integration" />
-      <ModuleUser stash="integration" PZCS={true} />
-      <div style={{ padding: '50px', marginTop: '100px' }}>
-        <h1>测试页面</h1>
-        <p>ModuleMenu 组件已加载</p>
-      </div>
-    </div>
-  );
-}
+// 开发环境，手动打开，并且屏蔽上面的导出
+// export default ModuleMenu;

package/src/pages/util/axios.js

@@ -5,7 +5,7 @@ import getStore from './userInfo';
 import { checkToken } from './permessionUtils';
 import CONSTANT from './constant';
 
-let tokenValue = '4e564b370fc8400982358cd88e73a566';
+let tokenValue = '5de3ef8171364d6ba756221655fe1310';
 // 轻量级tokenInSessionStor存在（GZW跳/data-platform/#/login，否则/#/login）,一体化tokenInSessionStor不存在
 const tokenInSessionStor = window.sessionStorage.getItem(
   'bigdata-access_token',