From 4eda6a49f886824517ff2f3a6817efac27e58bf2 Mon Sep 17 00:00:00 2001
From: ocean-gao <gaopandyx@163.com>
Date: Tue, 19 Nov 2024 17:50:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(Popper):=20=E4=BF=AE=E5=A4=8D=20popperS?=
 =?UTF-8?q?tyle=20=E6=AF=94=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E4=BC=98?=
 =?UTF-8?q?=E5=85=88=E7=BA=A7=E4=BD=8E=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/popper/popper.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/popper/popper.tsx b/components/popper/popper.tsx
index 4c132434..6cd0abf1 100644
--- a/components/popper/popper.tsx
+++ b/components/popper/popper.tsx
@@ -144,7 +144,7 @@ export default defineComponent({
                     <div
                         ref={popperRef}
                         class={`${prefixCls}-wrapper`}
-                        style={{ ...props.popperStyle, ...popperStyle }}
+                        style={{ ...popperStyle, ...props.popperStyle }}
                         role={'tooltip'}
                         onMouseenter={onPopperMouseEnter}
                         onMouseleave={onPopperMouseLeave}

From 3800d10fdb38e4343d8a63b85c296bcd77f0dcf5 Mon Sep 17 00:00:00 2001
From: ocean-gao <gaopandyx@163.com>
Date: Tue, 19 Nov 2024 17:52:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?docs(Popper):=20=E8=A1=A5=E5=85=85=20popper?=
 =?UTF-8?q?Style=20=E6=A1=88=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/.vitepress/components/popper/visible.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/.vitepress/components/popper/visible.vue b/docs/.vitepress/components/popper/visible.vue
index f7a5b36a..f564a51a 100644
--- a/docs/.vitepress/components/popper/visible.vue
+++ b/docs/.vitepress/components/popper/visible.vue
@@ -16,7 +16,7 @@
 
     <FDivider />
 
-    <FPopper v-model="visible" placement="bottom" trigger="click" :arrow="true">
+    <FPopper v-model="visible" placement="bottom" trigger="click" :arrow="true" :popperStyle="{ zIndex: 1500 }">
         <template #trigger>
             <FButton>Click to activate</FButton>
         </template>