by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix LoginExpiredModal in some cases, message may be obscured (#6086)

Browse Source
This commit is contained in:
ming4762 2025-05-01 10:40:42 +08:00 committed by GitHub
parent add1e61b6f
commit 5de954baa4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/effects/common-ui/src/ui/authentication/login-expired-modal.vue
View File

@ -35,6 +35,16 @@ const getZIndex = computed(() => {
return props.zIndex || calcZIndex(); return props.zIndex || calcZIndex();
}); });
/**
* 排除ant-message和loading:9999的z-index
*/
const zIndexExcludeClass = ['ant-message', 'loading'];
function isZIndexExcludeClass(element: Element) {
return zIndexExcludeClass.some((className) =>
element.classList.contains(className),
);
}
/** /**
* 获取最大的zIndex值 * 获取最大的zIndex值
*/ */
@ -44,7 +54,11 @@ function calcZIndex() {
[...elements].forEach((element) => { [...elements].forEach((element) => {
const style = window.getComputedStyle(element); const style = window.getComputedStyle(element);
const zIndex = style.getPropertyValue('z-index'); const zIndex = style.getPropertyValue('z-index');
if (zIndex && !Number.isNaN(Number.parseInt(zIndex))) { if (
zIndex &&
!Number.isNaN(Number.parseInt(zIndex)) &&
!isZIndexExcludeClass(element)
) {
maxZ = Math.max(maxZ, Number.parseInt(zIndex)); maxZ = Math.max(maxZ, Number.parseInt(zIndex));
} }
}); });