Commit f75c946e authored by 张瑶's avatar 张瑶

fix: 修复免密加载登录

parent f2b485df
Pipeline #41980 passed with stages
in 1 minute 52 seconds
...@@ -6,6 +6,7 @@ import { connect } from 'react-redux'; ...@@ -6,6 +6,7 @@ import { connect } from 'react-redux';
import { useHistory, withRouter } from '@wisdom-utils/runtime'; import { useHistory, withRouter } from '@wisdom-utils/runtime';
import { actionCreators } from '@/containers/App/store'; import { actionCreators } from '@/containers/App/store';
import LoginAction from './login'; import LoginAction from './login';
import { initMicroApps } from '../../../micro';
const Login = forwardRef((props, _ref) => { const Login = forwardRef((props, _ref) => {
const history = useHistory(); const history = useHistory();
const [action, setAction] = useState( const [action, setAction] = useState(
...@@ -13,7 +14,6 @@ const Login = forwardRef((props, _ref) => { ...@@ -13,7 +14,6 @@ const Login = forwardRef((props, _ref) => {
); );
useEffect(() => { useEffect(() => {
action.globalConfig = props.global; action.globalConfig = props.global;
}, [props.global]); }, [props.global]);
...@@ -26,15 +26,11 @@ const Login = forwardRef((props, _ref) => { ...@@ -26,15 +26,11 @@ const Login = forwardRef((props, _ref) => {
// })); // }));
// 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}`);
window.share.event.emit('triggerMicro', props.global); // window.share.event.emit('triggerMicro', props.global);
initMicroApps();
}); });
}, [props.globalConfig && props.globalConfig.userInfo]) }, [props.globalConfig && props.globalConfig.userInfo])
// action &&
// action.events.on('loginError', event => {
// // setVisible(false);
// // setSubmitting(false);
// });
return <div>{props.children}</div>; return <div>{props.children}</div>;
}); });
......
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