From e53c0e1ce531f94cc1a2a6b8f15cbc24a9261519 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Thu, 15 Aug 2024 16:11:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(design):=20popover=20zindex=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/design/src/Popover.vue | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/packages/design/src/Popover.vue b/packages/design/src/Popover.vue
index 9bee8834..a56066d4 100644
--- a/packages/design/src/Popover.vue
+++ b/packages/design/src/Popover.vue
@@ -39,8 +39,6 @@ const props = withDefaults(defineProps<PopoverProps>(), {
   visible: undefined,
 });
 
-const zIndex = useZIndex();
-const curZIndex = ref<number>(2);
 const popoverVisible = ref(false);
 
 const visibleWatch = watch(
@@ -85,11 +83,12 @@ onMounted(() => {
   referenceElementRef.value = getCurrentInstance()?.proxy?.$el.nextElementSibling;
 });
 
+const zIndex = useZIndex();
 watch([referenceElementRef, popperElementRef], ([referenceElement, popperElement]) => {
   destroy();
   if (!referenceElement || !popperElement) return;
 
-  popperElement.style.zIndex = `${curZIndex.value}`;
+  popperElement.style.zIndex = `${zIndex.nextZIndex()}`;
   popperElement.focus();
 
   instanceRef.value = createPopper(referenceElement, popperElement, {
@@ -132,7 +131,7 @@ const mouseleaveHandler = () => {
 
   timer = setTimeout(() => {
     popoverVisible.value = false;
-  }, 300);
+  }, 500);
 };
 
 if (props.trigger === 'click' && typeof props.visible === 'undefined') {
@@ -170,21 +169,6 @@ if (props.trigger === 'hover' && typeof props.visible === 'undefined') {
   });
 }
 
-watch(
-  popoverVisible,
-  (popoverVisible) => {
-    if (!popoverVisible) {
-      return;
-    }
-    nextTick().then(() => {
-      curZIndex.value = zIndex.nextZIndex();
-    });
-  },
-  {
-    immediate: true,
-  },
-);
-
 const destroy = () => {
   if (!instanceRef.value) return;