Commit 12c539fd authored by 张瑶's avatar 张瑶

fix: 免密登录传递generateType

parent a9c3df42
Pipeline #42679 passed with stages
in 1 minute 50 seconds
...@@ -43,10 +43,14 @@ class Login { ...@@ -43,10 +43,14 @@ class Login {
let { password } = this.globalConfig; let { password } = this.globalConfig;
loginName = params.getParams('loginName') ? params.getParams('loginName'): loginName; loginName = params.getParams('loginName') ? params.getParams('loginName'): loginName;
const redirect = params.getParams('redirect'); const redirect = params.getParams('redirect');
const generateType = params.getParams('generateType');
if(redirect) { if(redirect) {
this.globalConfig.homepage = redirect; this.globalConfig.homepage = redirect;
// this.globalConfig.layout = 'blank'; // this.globalConfig.layout = 'blank';
} }
if(generateType) {
this.globalConfig.generateType = generateType;
}
self.updateConfig && self.updateConfig(self.globalConfig); self.updateConfig && self.updateConfig(self.globalConfig);
password = params.getParams('password') ? params.getParams('password'): password; password = params.getParams('password') ? params.getParams('password'): password;
......
...@@ -25,7 +25,7 @@ const Login = forwardRef((props, _ref) => { ...@@ -25,7 +25,7 @@ const Login = forwardRef((props, _ref) => {
// homepage: params.getParams('redirect') // homepage: params.getParams('redirect')
// })); // }));
// props.history.push('/' + params.getParams('redirect')) // props.history.push('/' + params.getParams('redirect'))
props.history.push(`/?client=${props.global.client}`); props.history.push(`/?client=${props.global.client}&generateType=${props.global.generateType}`);
// window.share.event.emit('triggerMicro', props.global); // window.share.event.emit('triggerMicro', props.global);
initMicroApps(); initMicroApps();
}); });
......
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