fix: login expired modal z-index (#5145)

* fix: login expired modal z-index

* feat: support custom z-index
dev-v5
Netfan 2024-12-15 23:25:40 +08:00 committed by GitHub
parent f446cbf9e5
commit ce4af37fd8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 2 deletions

View File

@ -1,21 +1,23 @@
<script setup lang="ts"> <script setup lang="ts">
import type { AuthenticationProps } from './types'; import type { AuthenticationProps } from './types';
import { watch } from 'vue'; import { computed, watch } from 'vue';
import { useVbenModal } from '@vben-core/popup-ui'; import { useVbenModal } from '@vben-core/popup-ui';
import { Slot, VbenAvatar } from '@vben-core/shadcn-ui'; import { Slot, VbenAvatar } from '@vben-core/shadcn-ui';
interface Props extends AuthenticationProps { interface Props extends AuthenticationProps {
avatar?: string; avatar?: string;
zIndex?: number;
} }
defineOptions({ defineOptions({
name: 'LoginExpiredModal', name: 'LoginExpiredModal',
}); });
withDefaults(defineProps<Props>(), { const props = withDefaults(defineProps<Props>(), {
avatar: '', avatar: '',
zIndex: 0,
}); });
const open = defineModel<boolean>('open'); const open = defineModel<boolean>('open');
@ -28,6 +30,26 @@ watch(
modalApi.setState({ isOpen: val }); modalApi.setState({ isOpen: val });
}, },
); );
const getZIndex = computed(() => {
return props.zIndex || calcZIndex();
});
/**
* 获取最大的zIndex值
*/
function calcZIndex() {
let maxZ = 0;
const elements = document.querySelectorAll('*');
[...elements].forEach((element) => {
const style = window.getComputedStyle(element);
const zIndex = style.getPropertyValue('z-index');
if (zIndex && !Number.isNaN(Number.parseInt(zIndex))) {
maxZ = Math.max(maxZ, Number.parseInt(zIndex));
}
});
return maxZ + 1;
}
</script> </script>
<template> <template>
@ -39,6 +61,7 @@ watch(
:footer="false" :footer="false"
:fullscreen-button="false" :fullscreen-button="false"
:header="false" :header="false"
:z-index="getZIndex"
class="border-none px-10 py-6 text-center shadow-xl sm:w-[600px] sm:rounded-2xl md:h-[unset]" class="border-none px-10 py-6 text-center shadow-xl sm:w-[600px] sm:rounded-2xl md:h-[unset]"
> >
<VbenAvatar :src="avatar" class="mx-auto mb-6 size-20" /> <VbenAvatar :src="avatar" class="mx-auto mb-6 size-20" />