From fd5fc8e8557456cf108dec3efc04383eb0e201d9 Mon Sep 17 00:00:00 2001 From: Chen <30278419+nothing-sy@users.noreply.github.com> Date: Sun, 29 Oct 2023 21:54:44 +0800 Subject: [PATCH] fix(components): [dialog] fix el-dialog z-index bug (#14373) * Fix el-dialog z-index bug * Update packages/components/dialog/src/use-dialog.ts Co-authored-by: btea <2356281422@qq.com> * chore: lint error --------- Co-authored-by: qiang Co-authored-by: btea <2356281422@qq.com> --- packages/components/dialog/src/use-dialog.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/components/dialog/src/use-dialog.ts b/packages/components/dialog/src/use-dialog.ts index 2763f556f0..961a9e9aae 100644 --- a/packages/components/dialog/src/use-dialog.ts +++ b/packages/components/dialog/src/use-dialog.ts @@ -8,6 +8,7 @@ import { } from 'vue' import { useTimeoutFn } from '@vueuse/core' +import { isUndefined } from 'lodash' import { defaultNamespace, useId, @@ -35,7 +36,7 @@ export const useDialog = ( const visible = ref(false) const closed = ref(false) const rendered = ref(false) // when desctroyOnClose is true, we initialize it as false vise versa - const zIndex = ref(props.zIndex || nextZIndex()) + const zIndex = ref(props.zIndex ?? nextZIndex()) let openTimer: (() => void) | undefined = undefined let closeTimer: (() => void) | undefined = undefined @@ -161,7 +162,7 @@ export const useDialog = ( closed.value = false open() rendered.value = true // enables lazy rendering - zIndex.value = props.zIndex ? zIndex.value++ : nextZIndex() + zIndex.value = isUndefined(props.zIndex) ? nextZIndex() : zIndex.value++ // this.$el.addEventListener('scroll', this.updatePopper) nextTick(() => { emit('open')