From b9bc4f5dbdce2c24190ccf59da66326405c00d72 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 28 Jul 2025 10:04:21 +0800 Subject: [PATCH 1/3] Update LoggedOut.js --- .../Pages/Account/LoggedOut.js | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js index afac70c9f4..3491167e47 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js @@ -1,12 +1,20 @@ document.addEventListener("DOMContentLoaded", function (event) { - setTimeout(function () { + var timer = setTimeout(function () { var redirectButton = document.getElementById("redirectButton"); - - if(!redirectButton){ + if (!redirectButton) { + clearTimeout(timer); return; } - - redirectButton.getAttribute("cname"); - redirectButton.getAttribute("href"); - }, 3000) + var clientName = redirectButton.getAttribute("cname"); + if (!clientName) { + window.clientName = clientName; + } + var href = redirectButton.getAttribute("href"); + if (!href) { + clearTimeout(timer); + return; + } + window.location = href; + clearTimeout(timer); + }, 3000); }); From 1137d91df6fbdd51034d3266f284f3fcec53e810 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 28 Jul 2025 10:08:10 +0800 Subject: [PATCH 2/3] Update LoggedOut.js --- .../src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js index 3491167e47..4c86d11ffd 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js @@ -1,8 +1,7 @@ document.addEventListener("DOMContentLoaded", function (event) { - var timer = setTimeout(function () { + setTimeout(function () { var redirectButton = document.getElementById("redirectButton"); if (!redirectButton) { - clearTimeout(timer); return; } var clientName = redirectButton.getAttribute("cname"); @@ -11,10 +10,8 @@ document.addEventListener("DOMContentLoaded", function (event) { } var href = redirectButton.getAttribute("href"); if (!href) { - clearTimeout(timer); return; } window.location = href; - clearTimeout(timer); }, 3000); }); From 87c069e307f8c1a5578cc819be5c2b8cfa70e37b Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 28 Jul 2025 14:55:47 +0800 Subject: [PATCH 3/3] Update LoggedOut.js --- .../account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js index 4c86d11ffd..c2c311b1c2 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js @@ -5,7 +5,7 @@ document.addEventListener("DOMContentLoaded", function (event) { return; } var clientName = redirectButton.getAttribute("cname"); - if (!clientName) { + if (clientName) { window.clientName = clientName; } var href = redirectButton.getAttribute("href");