A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
refactor: Cancels the delayed handling of jump actions.
haitaood2924fab4f56
diff --git a/ui/src/pages/Users/Login/index.tsx b/ui/src/pages/Users/Login/index.tsxindex 56bcec78..69981843 100644--- a/ui/src/pages/Users/Login/index.tsx+++ b/ui/src/pages/Users/Login/index.tsx@@ -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) {diff --git a/ui/src/utils/floppyNavigation.ts b/ui/src/utils/floppyNavigation.tsindex 707d5c48..7ed3a77b 100644--- a/ui/src/utils/floppyNavigation.ts+++ b/ui/src/utils/floppyNavigation.ts@@ -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);+ }};/**