feat: 集成报表菜单

src/containers/App/store/actions.js

@@ -204,7 +204,8 @@ export function logout(data) {
   localStorage.removeItem('access_token');
   // eslint-disable-next-line no-undef,no-restricted-globals
   createStoreage.remove(`__PANDA_STORE__${location.hostname}`);
-  createStoreage.remove(`__PANDA_STORE__MICRO_${location.hostname}`)
+  createStoreage.remove(`__PANDA_STORE__MICRO_${location.hostname}`);
+  localStorage.removeItem('JmReport-Access-Token');
   return {
     type: LOGINOUT,
     data: {

src/layouts/BasicLayout1.js

@@ -333,7 +333,7 @@ const BasicLayout = props => {
     if (!Cookies.get('token')) {
       let client = props.global && props.global.client;
       client = client !== 'undefined' && !_.isNull(client) && !_.isUndefined(client) ? client: 'city';
-      let generateType = props.global.get('generateType');
+      let generateType = props.global && props.global.get('generateType');
       generateType = !_.isNull(generateType) && !_.isUndefined(generateType) && generateType !== 'undefined' ? `&generateType=${generateType}` : '';
       history.replace(`/user/login?client=${client}${generateType}`);
       props.logout();

src/pages/iframe/index.js

@@ -7,7 +7,7 @@ export default props => {
         return null;
     }
     return (
-        <Iframe url={`${state.linkUrl}?token=${window.globalConfig.token}`}
+        <Iframe url={`${state.linkUrl}?token=${window.globalConfig.token}&loginName=${window.globalConfig.userInfo.loginName}`}
                 width="100%"
                 height="100%"
                 id="myId"