Commit d1f4cd0b authored by 邓晓峰's avatar 邓晓峰

fix: 修复退出登录generateType获取异常

parent 570540c6
Pipeline #43371 passed with stages
in 1 minute 52 seconds
...@@ -333,7 +333,7 @@ const BasicLayout = props => { ...@@ -333,7 +333,7 @@ const BasicLayout = props => {
if (!Cookies.get('token')) { if (!Cookies.get('token')) {
let client = props.global && props.global.client; let client = props.global && props.global.client;
client = client !== 'undefined' && !_.isNull(client) && !_.isUndefined(client) ? client: 'city'; client = client !== 'undefined' && !_.isNull(client) && !_.isUndefined(client) ? client: 'city';
let generateType = props.global && props.global.get('generateType'); let generateType = props.global && props.global.hasOwnProperty('get') && props.global.get('generateType');
generateType = !_.isNull(generateType) && !_.isUndefined(generateType) && generateType !== 'undefined' ? `&generateType=${generateType}` : ''; generateType = !_.isNull(generateType) && !_.isUndefined(generateType) && generateType !== 'undefined' ? `&generateType=${generateType}` : '';
history.replace(`/user/login?client=${client}${generateType}`); history.replace(`/user/login?client=${client}${generateType}`);
props.logout(); props.logout();
...@@ -696,6 +696,7 @@ const BasicLayout = props => { ...@@ -696,6 +696,7 @@ const BasicLayout = props => {
</SecurityLayout>); </SecurityLayout>);
}; };
const mapStateToProps = state => ({ const mapStateToProps = state => ({
global: state.getIn(['global', 'globalConfig']), global: state.getIn(['global', 'globalConfig']),
settings: state.getIn(['global', 'defaultSetting']), settings: state.getIn(['global', 'defaultSetting']),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment