p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #441 from answerdev/feat/1.1.1/ui 

refactor: Cancels the delayed handling of jump actions.
This commit is contained in:
haitao.jarvis 2023-07-21 19:03:30 +08:00 committed by GitHub
parent 3423212b80 d2924fab4f
commit 64c97219cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/pages/Users/Login/index.tsx
View File

@ -93,8 +93,8 @@ const Index: React.FC = () => {
}
login(params)
.then((res) => {
passwordCaptcha.close();
.then(async (res) => {
await passwordCaptcha.close();
updateUser(res);
const userStat = guard.deriveLoginState();
if (userStat.isNotActivated) {

60
ui/src/utils/floppyNavigation.ts
View File

@ -94,42 +94,36 @@ export interface NavigateConfig {
}
const navigate = (to: string | number, config: NavigateConfig = {}) => {
let { handler = 'href' } = config;
/**
* Note: Synchronised navigation can result in asynchronous actions such as page animations and state modifications not being completed.
*/
setTimeout(() => {
if (to && typeof to === 'string') {
if (equalToCurrentHref(to)) {
return;
}
/**
* 1. Blocking redirection of two login pages
* 2. Auto storage login redirect
* Note: The or judgement cannot be missing here, both jumps will be used
*/
if (to === RouteAlias.login || to === getLoginUrl()) {
storageLoginRedirect();
}
if (!isRoutableLink(to) && handler !== 'href' && handler !== 'replace') {
handler = 'href';
}
if (handler === 'href' && config.options?.replace) {
handler = 'replace';
}
if (handler === 'href') {
window.location.href = to;
} else if (handler === 'replace') {
window.location.replace(to);
} else if (typeof handler === 'function') {
handler(to, config.options);
}
if (to && typeof to === 'string') {
if (equalToCurrentHref(to)) {
return;
}
/**
* 1. Blocking redirection of two login pages
* 2. Auto storage login redirect
* Note: The or judgement cannot be missing here, both jumps will be used
*/
if (to === RouteAlias.login || to === getLoginUrl()) {
storageLoginRedirect();
}
if (typeof to === 'number' && typeof handler === 'function') {
handler(to);
if (!isRoutableLink(to) && handler !== 'href' && handler !== 'replace') {
handler = 'href';
}
});
if (handler === 'href' && config.options?.replace) {
handler = 'replace';
}
if (handler === 'href') {
window.location.href = to;
} else if (handler === 'replace') {
window.location.replace(to);
} else if (typeof handler === 'function') {
handler(to, config.options);
}
}
if (typeof to === 'number' && typeof handler === 'function') {
handler(to);
}
};
/**