module-menu 0.2.52-dev-hubjt.4 → 0.2.52-dev-hubjt.6

package/package.json

@@ -1,47 +1,47 @@
-{
-  "name": "module-menu",
-  "version": "0.2.52-dev-hubjt.4",
-  "description": "城市大数据平台公共头部及尾部",
-  "main": "src/pages/index.jsx",
-  "scripts": {
-    "start": "set REACT_APP_ENV=dev && umi dev",
-    "build": "set REACT_APP_ENV=production && umi build",
-    "postinstall": "umi generate tmp",
-    "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
-  },
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "lint-staged": {
-    "**/*.less": "stylelint --syntax less",
-    "**/*.{js,jsx,ts,tsx}": "npm run lint-staged:js",
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@ant-design/pro-layout": "^6.5.0",
-    "@umijs/preset-react": "^1.8.17",
-    "antd": "^4.17.0",
-    "axios": "^0.27.2",
-    "classnames": "^2.5.1",
-    "lodash": "^4.17.0",
-    "react": "^17.0.0",
-    "react-dom": "^17.0.0",
-    "umi": "^3.5.0"
-  },
-  "devDependencies": {
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
-    "@umijs/test": "^3.5.41",
-    "lint-staged": "^10.0.0",
-    "prettier": "^2.3.2",
-    "typescript": "^4.2.2",
-    "yorkie": "^2.0.0"
-  }
-}
+{
+  "name": "module-menu",
+  "version": "0.2.52-dev-hubjt.6",
+  "description": "城市大数据平台公共头部及尾部",
+  "main": "src/pages/index.jsx",
+  "scripts": {
+    "start": "set REACT_APP_ENV=dev && umi dev",
+    "build": "set REACT_APP_ENV=production && umi build",
+    "postinstall": "umi generate tmp",
+    "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
+  },
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "lint-staged": {
+    "**/*.less": "stylelint --syntax less",
+    "**/*.{js,jsx,ts,tsx}": "npm run lint-staged:js",
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@ant-design/pro-layout": "^6.5.0",
+    "@umijs/preset-react": "^1.8.17",
+    "antd": "^4.17.0",
+    "axios": "^0.27.2",
+    "classnames": "^2.5.1",
+    "lodash": "^4.17.0",
+    "react": "^17.0.0",
+    "react-dom": "^17.0.0",
+    "umi": "^3.5.0"
+  },
+  "devDependencies": {
+    "@types/react": "^17.0.0",
+    "@types/react-dom": "^17.0.0",
+    "@umijs/test": "^3.5.41",
+    "lint-staged": "^10.0.0",
+    "prettier": "^2.3.2",
+    "typescript": "^4.2.2",
+    "yorkie": "^2.0.0"
+  }
+}

package/src/pages/ModuleMenu/index.less

@@ -59,11 +59,11 @@
 }
 
 .childMenu {
-  width: 29%;
+  width: 30%;
   display: inline-block;
 }
 .childMenu_LNRD {
-  width: 29%;
+  width: 30%;
   display: inline-block;
 }
 

package/src/pages/ModuleUser/index.jsx

@@ -1,262 +1,262 @@
-import React, { Component, useEffect, useState } from 'react';
-import { Popconfirm, message, Dropdown, Button, Select } from 'antd';
-import { userMenuIcon } from './constData';
-import {
-  HomeOutlined,
-  UserOutlined,
-  CaretDownOutlined,
-} from '@ant-design/icons';
-import { Spin, Menu, Avatar } from 'antd';
-import HeaderDropdown from './HeaderDropdown';
-import Axios from '../util/axios';
-import getStore, { getUserName } from '../util/userInfo';
-import './index.less';
-import cn from 'classnames'
-
-// stash存在则为一体化，否则为轻量级
-const ModuleUser = ({ stash = '' }) => {
-  const [tenantList, setTenantList] = useState([]);
-  const [haveAppSystemPermission, setHaveAppSystemPermission] = useState(false);
-  useEffect(() => {
-    localStorage.setItem('stash', stash)
-    if (['integration', 'LNRD', 'HBJK'].includes(stash)) {
-      getTenantList();
-      allSystemList();
-    }
-  }, []);
-  const handleClickmenu = (url) => {
-    window.location.href = url;
-  };  
-  const handleClickSysManage = () => {
-    if(['integration', 'LNRD', 'HBJK'].includes(stash)){
-      Axios('get', '/admin-api/system/auth/homePage', '', {})
-        .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 {
-    PersonalCenterSrc,
-    MessageCenterSrc,
-    SystemManageSrc,
-    LogoutSrc,
-    AppSystemSrc,
-  } = userMenuIcon;
-
-  const isHaveSystemManagementPermission = (['integration', 'LNRD', 'HBJK'].includes(stash))
-    ? true
-    : getStore({ name: 'isHaveSystemManagementPermission' });
-  const DEFAULT_LOGOUT_URL = (['integration', 'LNRD', 'HBJK'].includes(stash)) ? '/admin-ui/login' : (stash === 'GZW'? '/data-platform/#/login' : '/#/login');
-
-  // 跳转服务门户
-  const jumpToExterHome = () => {
-    handleClickmenu('/admin-ui/data-share-portal/homePage');
-  };
-
-  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 getTenantList = () => {
-    Axios('get', '/admin-api/system/user/getUserTenant', '', {})
-      .then((res) => {
-        if (res.data.code === 0) {
-          let tenantLists =
-            res.data.data &&
-            res.data.data.map((item) => {
-              return {
-                id: item.id,
-                value: item.id,
-                label: item.name,
-              };
-            });
-          setTenantList(tenantLists || []);
-        }
-      })
-      .catch((e) => console.log('e', e));
-  };
-  const allSystemList = () => {
-    Axios(
-      'get',
-      '/admin-api/system/user/get-user-menu-List?menuName=数据平台',
-      '',
-      {},
-    )
-      .then((res) => {
-        if (res.data.code === 0) {
-          let menuGet =
-            res.data.data &&
-            res.data.data[0]?.routes?.map((item) => {
-              return {
-                ...item,
-                path:
-                  item.path.indexOf('/') !== -1 ? item.path : '/' + item.path,
-              };
-            });
-          let haveAppSystem_Permission =
-            menuGet?.some((item) => item.name === '应用系统配置') || false;
-          setHaveAppSystemPermission(haveAppSystem_Permission);
-        }
-      })
-      .catch((e) => console.log('e', e));
-  };
-
-  // 退出登录
-  const logout = () => {
-      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';
-    Axios(logouType, logoutUrl, '', {})
-      .then(() => {
-        console.log('退出登录接口调用成功');
-        localStorage.clear();
-        sessionStorage.clear();
-        window.location.href = DEFAULT_LOGOUT_URL;
-      })
-      .catch((error) => {
-        console.error('Error while logging out, error:', error);
-        message.error('服务器错误，请稍后重试');
-      });
-  };
-
-  // 切换租户改缓存、调接口、刷界面
-  const handleChangeTenant = (e) => {
-    let token = getStore({ name: 'access_token' });
-    Axios('post', `/admin-api/system/auth/setRedisTokenOfTenant`, '', {
-      data: { token, tenantId: e },
-    })
-      .then((res) => {
-        if (res.data.code === 0) {
-          console.log('接口调用成功');
-          window.localStorage.setItem('curTenantId', e);
-          window.localStorage.setItem(
-            'curTenantName',
-            tenantList.find((item) => item.id === e)?.label,
-          );
-          window.location.reload();
-        } else {
-          message.warning(res.data.msg || '租户切换失败');
-        }
-      })
-      .catch((e) => console.log('e', e));
-  };
-
-  const menu = (
-    <Menu className="menu" selectedKeys={[]}>
-      <Menu.Item
-        key="personalCenter"
-        onClick={() =>
-          handleClickmenu(
-            ['integration', 'LNRD', 'HBJK'].includes(stash) ? 
-            '/admin-ui/data-share-portal/personal/info':
-            (stash === 'GZW'? '/data-platform/#/info/index' : '/#/info/index')
-          )
-        }
-      >
-        <img
-          src={PersonalCenterSrc}
-          alt=""
-          style={{ marginRight: '10px', marginTop: '-3px' }}
-        />
-        <span>{['integration', 'LNRD', 'HBJK'].includes(stash) ? '用户中心' : '个人中心'}</span>
-      </Menu.Item>
-      {isHaveSystemManagementPermission && (
-        <Menu.Item key="systemManage" onClick={handleClickSysManage}>
-          <img
-            src={SystemManageSrc}
-            alt=""
-            style={{ marginRight: '10px', marginTop: '-3px' }}
-          />
-          <span>系统管理</span>
-        </Menu.Item>
-      )}
-      {haveAppSystemPermission && (
-        <Menu.Item
-          key="appSystem"
-          onClick={() => handleClickmenu('/dataadmin/#/appSystem/index')}
-        >
-          <img
-            src={AppSystemSrc}
-            alt=""
-            style={{ marginRight: '10px', marginTop: '-3px' }}
-          />
-          <span>应用系统配置</span>
-        </Menu.Item>
-      )}
-      <Menu.Item key="logout" onClick={() => logout()}>
-        <img
-          src={LogoutSrc}
-          alt=""
-          style={{ width: '15px', height: '15px', marginRight: '10px' }}
-        />
-        <span>退出登录</span>
-      </Menu.Item>
-    </Menu>
-  );
-
-  return (
-    <div className={cn(stash !== 'LNRD'? 'right_size':'right_size_LNRD', 'right')}>
-      {['integration', 'LNRD', 'HBJK'].includes(stash) && [
-        // <Button type="link" onClick={jumpToExterHome} 
-        // className={cn(stash === 'LNRD'? 'fwmh_color_LNRD': stash === 'HBJK'? 'fwmh_color_HBJK' : null)}>
-        //   服务门户
-        // </Button>,
-        <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' }}>
-            <Avatar size="small" icon={<UserOutlined />} />
-            <span
-              style={{
-                marginLeft: '10px',
-                verticalAlign: '-2px',
-                fontSize: '16px',
-                fontWeight: '500',
-                // color: stash !== 'LNRD'? null: '#FFFFFF'
-                color: ['LNRD','HBJK'].includes(stash)? '#FFFFFF' : null
-              }}
-            >
-              {getUserName()}
-            </span>
-            <CaretDownOutlined
-              style={{ marginLeft: '10px', fontSize: '8px', color: ['LNRD','HBJK'].includes(stash)? '#FFFFFF': '#333333'}}
-            />
-          </span>
-        </HeaderDropdown>
-      ) : (
-        <Spin
-          size="small"
-          style={{
-            marginLeft: 8,
-            marginRight: 8,
-            lineHeight: '57px',
-            textAlign: 'center',
-          }}
-        />
-      )}
-    </div>
-  );
-};
-
-export default ModuleUser;
+import React, { Component, useEffect, useState } from 'react';
+import { Popconfirm, message, Dropdown, Button, Select } from 'antd';
+import { userMenuIcon } from './constData';
+import {
+  HomeOutlined,
+  UserOutlined,
+  CaretDownOutlined,
+} from '@ant-design/icons';
+import { Spin, Menu, Avatar } from 'antd';
+import HeaderDropdown from './HeaderDropdown';
+import Axios from '../util/axios';
+import getStore, { getUserName } from '../util/userInfo';
+import './index.less';
+import cn from 'classnames'
+
+// stash存在则为一体化，否则为轻量级
+const ModuleUser = ({ stash = '' }) => {
+  const [tenantList, setTenantList] = useState([]);
+  const [haveAppSystemPermission, setHaveAppSystemPermission] = useState(false);
+  useEffect(() => {
+    localStorage.setItem('stash', stash)
+    if (['integration', 'LNRD', 'HBJK'].includes(stash)) {
+      getTenantList();
+      allSystemList();
+    }
+  }, []);
+  const handleClickmenu = (url) => {
+    window.location.href = url;
+  };  
+  const handleClickSysManage = () => {
+    if(['integration', 'LNRD', 'HBJK'].includes(stash)){
+      Axios('get', '/admin-api/system/auth/homePage', '', {})
+        .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 {
+    PersonalCenterSrc,
+    MessageCenterSrc,
+    SystemManageSrc,
+    LogoutSrc,
+    AppSystemSrc,
+  } = userMenuIcon;
+
+  const isHaveSystemManagementPermission = (['integration', 'LNRD', 'HBJK'].includes(stash))
+    ? true
+    : getStore({ name: 'isHaveSystemManagementPermission' });
+  const DEFAULT_LOGOUT_URL = (['integration', 'LNRD', 'HBJK'].includes(stash)) ? '/admin-ui/login' : (stash === 'GZW'? '/data-platform/#/login' : '/#/login');
+
+  // 跳转服务门户
+  const jumpToExterHome = () => {
+    handleClickmenu('/admin-ui/data-share-portal/homePage');
+  };
+
+  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 getTenantList = () => {
+    Axios('get', '/admin-api/system/user/getUserTenant', '', {})
+      .then((res) => {
+        if (res.data.code === 0) {
+          let tenantLists =
+            res.data.data &&
+            res.data.data.map((item) => {
+              return {
+                id: item.id,
+                value: item.id,
+                label: item.name,
+              };
+            });
+          setTenantList(tenantLists || []);
+        }
+      })
+      .catch((e) => console.log('e', e));
+  };
+  const allSystemList = () => {
+    Axios(
+      'get',
+      '/admin-api/system/user/get-user-menu-List?menuName=数据平台',
+      '',
+      {},
+    )
+      .then((res) => {
+        if (res.data.code === 0) {
+          let menuGet =
+            res.data.data &&
+            res.data.data[0]?.routes?.map((item) => {
+              return {
+                ...item,
+                path:
+                  item.path.indexOf('/') !== -1 ? item.path : '/' + item.path,
+              };
+            });
+          let haveAppSystem_Permission =
+            menuGet?.some((item) => item.name === '应用系统配置') || false;
+          setHaveAppSystemPermission(haveAppSystem_Permission);
+        }
+      })
+      .catch((e) => console.log('e', e));
+  };
+
+  // 退出登录
+  const logout = () => {
+      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';
+    Axios(logouType, logoutUrl, '', {})
+      .then(() => {
+        console.log('退出登录接口调用成功');
+        localStorage.clear();
+        sessionStorage.clear();
+        window.location.href = DEFAULT_LOGOUT_URL;
+      })
+      .catch((error) => {
+        console.error('Error while logging out, error:', error);
+        message.error('服务器错误，请稍后重试');
+      });
+  };
+
+  // 切换租户改缓存、调接口、刷界面
+  const handleChangeTenant = (e) => {
+    let token = getStore({ name: 'access_token' });
+    Axios('post', `/admin-api/system/auth/setRedisTokenOfTenant`, '', {
+      data: { token, tenantId: e },
+    })
+      .then((res) => {
+        if (res.data.code === 0) {
+          console.log('接口调用成功');
+          window.localStorage.setItem('curTenantId', e);
+          window.localStorage.setItem(
+            'curTenantName',
+            tenantList.find((item) => item.id === e)?.label,
+          );
+          window.location.reload();
+        } else {
+          message.warning(res.data.msg || '租户切换失败');
+        }
+      })
+      .catch((e) => console.log('e', e));
+  };
+
+  const menu = (
+    <Menu className="menu" selectedKeys={[]}>
+      <Menu.Item
+        key="personalCenter"
+        onClick={() =>
+          handleClickmenu(
+            ['integration', 'LNRD', 'HBJK'].includes(stash) ? 
+            '/admin-ui/data-share-portal/personal/info':
+            (stash === 'GZW'? '/data-platform/#/info/index' : '/#/info/index')
+          )
+        }
+      >
+        <img
+          src={PersonalCenterSrc}
+          alt=""
+          style={{ marginRight: '10px', marginTop: '-3px' }}
+        />
+        <span>{['integration', 'LNRD', 'HBJK'].includes(stash) ? '用户中心' : '个人中心'}</span>
+      </Menu.Item>
+      {isHaveSystemManagementPermission && (
+        <Menu.Item key="systemManage" onClick={handleClickSysManage}>
+          <img
+            src={SystemManageSrc}
+            alt=""
+            style={{ marginRight: '10px', marginTop: '-3px' }}
+          />
+          <span>系统管理</span>
+        </Menu.Item>
+      )}
+      {haveAppSystemPermission && (
+        <Menu.Item
+          key="appSystem"
+          onClick={() => handleClickmenu('/dataadmin/#/appSystem/index')}
+        >
+          <img
+            src={AppSystemSrc}
+            alt=""
+            style={{ marginRight: '10px', marginTop: '-3px' }}
+          />
+          <span>应用系统配置</span>
+        </Menu.Item>
+      )}
+      <Menu.Item key="logout" onClick={() => logout()}>
+        <img
+          src={LogoutSrc}
+          alt=""
+          style={{ width: '15px', height: '15px', marginRight: '10px' }}
+        />
+        <span>退出登录</span>
+      </Menu.Item>
+    </Menu>
+  );
+
+  return (
+    <div className={cn(stash !== 'LNRD'? 'right_size':'right_size_LNRD', 'right')}>
+      {['integration', 'LNRD', 'HBJK'].includes(stash) && [
+        // <Button type="link" onClick={jumpToExterHome} 
+        // className={cn(stash === 'LNRD'? 'fwmh_color_LNRD': stash === 'HBJK'? 'fwmh_color_HBJK' : null)}>
+        //   服务门户
+        // </Button>,
+        <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' }}>
+            <Avatar size="small" icon={<UserOutlined />} />
+            <span
+              style={{
+                marginLeft: '10px',
+                verticalAlign: '-2px',
+                fontSize: '16px',
+                fontWeight: '500',
+                // color: stash !== 'LNRD'? null: '#FFFFFF'
+                color: ['LNRD','HBJK'].includes(stash)? '#FFFFFF' : null
+              }}
+            >
+              {getUserName()}
+            </span>
+            <CaretDownOutlined
+              style={{ marginLeft: '10px', fontSize: '8px', color: ['LNRD','HBJK'].includes(stash)? '#FFFFFF': '#333333'}}
+            />
+          </span>
+        </HeaderDropdown>
+      ) : (
+        <Spin
+          size="small"
+          style={{
+            marginLeft: 8,
+            marginRight: 8,
+            lineHeight: '57px',
+            textAlign: 'center',
+          }}
+        />
+      )}
+    </div>
+  );
+};
+
+export default ModuleUser;