diff --git a/core/core-frontend/src/views/login/index.vue b/core/core-frontend/src/views/login/index.vue index 2ba4b36101..84b01a4ae7 100644 --- a/core/core-frontend/src/views/login/index.vue +++ b/core/core-frontend/src/views/login/index.vue @@ -113,14 +113,7 @@ const handleLogin = () => { userStore.setExp(exp) if (!xpackLoadFail.value && xpackInvalidPwd.value?.invokeMethod) { const param = { - methodName: 'init', - args: r => { - duringLogin.value = !!r - if (r) { - const queryRedirectPath = getCurLocation() - router.push({ path: queryRedirectPath }) - } - } + methodName: 'init' } xpackInvalidPwd?.value.invokeMethod(param) return @@ -146,6 +139,13 @@ const ldapValidate = callback => { const ldapFeedback = () => { duringLogin.value = false } +const invalidPwdCb = val => { + duringLogin.value = !!val + if (val) { + const queryRedirectPath = getCurLocation() + router.push({ path: queryRedirectPath }) + } +} const xpackLoadFail = ref(false) const loadingText = ref('登录中...') const loginContainer = ref() @@ -376,6 +376,7 @@ onMounted(async () => { ref="xpackInvalidPwd" jsname="L2NvbXBvbmVudC9sb2dpbi9JbnZhbGlkUHdk" @load-fail="() => (xpackLoadFail = true)" + @call-back="invalidPwdCb" /> diff --git a/de-xpack b/de-xpack index bf9cd45f20..303250e24b 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit bf9cd45f206458e3bfa385e451f56e74dea334ee +Subproject commit 303250e24bf9c59dffe5d88898e7428ba8657751