From 678f2a03b56e6d3b377d7b870215c63b911d0537 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 6 Jun 2024 12:15:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E5=88=86=E5=B8=83=E5=BC=8FX-Pac?= =?UTF-8?q?k=E7=99=BB=E5=BD=95=E6=97=A0=E6=B3=95=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/views/login/index.vue | 8 ++++++-- de-xpack | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/core-frontend/src/views/login/index.vue b/core/core-frontend/src/views/login/index.vue index 83b14b8432..59082c2bb7 100644 --- a/core/core-frontend/src/views/login/index.vue +++ b/core/core-frontend/src/views/login/index.vue @@ -117,8 +117,12 @@ const handleLogin = () => { if (!xpackLoadFail.value && xpackInvalidPwd.value?.invokeMethod) { const param = { methodName: 'init', - args: () => { - duringLogin.value = false + args: r => { + duringLogin.value = !!r + if (r) { + const queryRedirectPath = getCurLocation() + router.push({ path: queryRedirectPath }) + } } } xpackInvalidPwd?.value.invokeMethod(param) diff --git a/de-xpack b/de-xpack index e55d5ef12d..a12eea394d 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit e55d5ef12d98a142487a29b62343332f4884a3a2 +Subproject commit a12eea394d8d5edf2941988819b08676e512a11e