Merge pull request #908 from WeBankFinTech/fix-popper-popperStyle-pri…

…ority fix(Popper): 修复 popperStyle 配置项比默认设置优先级低的问题
WeBankFinTech · Nov 22, 2024 · c987055 · c987055
2 parents fed1dfc + 3800d10
commit c987055
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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}

diff --git 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>