From b7476238fdba5788c7b307ff22b081af3fc4e613 Mon Sep 17 00:00:00 2001
From: Tom Zhai <zhaishengjia@shein.com>
Date: Mon, 29 Jun 2026 17:15:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E7=B1=BB=E7=BB=84=E4=BB=B6=E5=BC=80=E5=90=AF=20absolute=20?=
 =?UTF-8?q?=E5=90=8E=E5=9C=A8=E9=9D=9E=20Modal=20=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E4=B8=8B=E8=A2=AB=E8=87=AA=E5=8A=A8=E6=B3=A8=E5=85=A5=20z-inde?=
 =?UTF-8?q?x=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=94=A8=E6=88=B7=20CSS=20?=
 =?UTF-8?q?=E5=B1=82=E7=BA=A7=E8=A6=86=E7=9B=96=E5=A4=B1=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=88Regression:=20since=202.0.23?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 site/pages/documentation/changelog/2.x.x.md |  1 +
 src/Modal/Panel.tsx                         |  3 ++-
 src/Modal/context.tsx                       | 10 ++++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/site/pages/documentation/changelog/2.x.x.md b/site/pages/documentation/changelog/2.x.x.md
index 09c114e2e..87412d05a 100644
--- a/site/pages/documentation/changelog/2.x.x.md
+++ b/site/pages/documentation/changelog/2.x.x.md
@@ -6,6 +6,7 @@
 - 修复 `Table` 使用 `treeExpandKeys` 展开树形行时，若数据中包含 DOM 引用等不可序列化字段会导致页面崩溃的问题
 - 修复 `Grid` 组件动态生成的样式在微前端场景下被错误劫持导致样式失效的问题
 - 修复 `Dropdown` 嵌套使用 `absolute` 时子级菜单项点击无法触发 onClick 的问题（Regression: since 2.0.29）
+- 修复弹出类组件开启 `absolute` 后在非 `Modal` 场景下被自动注入 `z-index`，导致用户 CSS 层级覆盖失效的问题（Regression: since 2.0.23）
 
 ### 2.0.31
 - 新增 RTL 模式下 `Modal`、`Popover`、`Tooltip` 组件的位置自动镜像转换功能
diff --git a/src/Modal/Panel.tsx b/src/Modal/Panel.tsx
index 9211bab30..9d46f58de 100644
--- a/src/Modal/Panel.tsx
+++ b/src/Modal/Panel.tsx
@@ -224,7 +224,8 @@ export default class Panel extends PureComponent<ModalPanelProps> {
     const showClose = typeof hideClose === 'boolean' ? !hideClose : maskCloseAble || maskCloseAble === null
     const maskStyle = { paddingBottom: fullScreen ? 0 : top }
     return (
-      <ZProvider value>
+      <ZProvider value={{}}>
+
         <Provider value={{ element: undefined }}>
           <div
             {...events}
diff --git a/src/Modal/context.tsx b/src/Modal/context.tsx
index 18b0a2fb5..21366f66f 100644
--- a/src/Modal/context.tsx
+++ b/src/Modal/context.tsx
@@ -1,7 +1,13 @@
 import React from 'react'
 import createReactContext from '../context'
 
-const context = createReactContext({})
+// 默认值为 null，表示"不在 Modal 内部"。
+// 修复：原来默认值为 {}（truthy），导致所有开启 absolute 的弹出类组件（Dropdown/Select 等）
+// 无论是否在 Modal 内，都会被自动注入 zIndex: 1051（inline style），
+// 使用户通过 CSS 覆盖 z-index 的方式完全失效（Breaking Change since 2.0.23）。
+// 现改为 null，只有在 Modal Provider 内部时（value != null）才注入 zIndex，
+// 与 v1 行为保持一致。
+const context = createReactContext<object | null>(null)
 
 // eslint-disable-next-line
 export const Provider = context.Provider
@@ -11,7 +17,7 @@ const consumer = <Props extends {}>(Origin: React.ComponentType<Props>) => (
 ) => (
   <context.Consumer>
     {value => {
-      const mp = Object.assign({}, props, value && props.absolute && props.zIndex === undefined && { zIndex: 1051 })
+      const mp = Object.assign({}, props, value != null && props.absolute && props.zIndex === undefined && { zIndex: 1051 })
       return <Origin {...mp} />
     }}
   </context.Consumer>

From f0af708e704a1680764ff2252a80e36a108d4bdd Mon Sep 17 00:00:00 2001
From: Tom Zhai <zhaishengjia@shein.com>
Date: Mon, 29 Jun 2026 17:19:01 +0800
Subject: [PATCH 2/2] chore: bump version to 2.0.32-beta.7

---
 package.json | 2 +-
 src/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index eb4796b84..da6fe36f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shineout",
-  "version": "2.0.32-beta.6",
+  "version": "2.0.32-beta.7",
   "description": "Shein 前端组件库",
   "main": "./lib/index.js",
   "module": "./es/index.js",
diff --git a/src/index.js b/src/index.js
index 837769efd..196ca10e1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,7 +2,7 @@
 
 import * as utils from './utils'
 
-export default { utils, version: '2.0.32-beta.6' }
+export default { utils, version: '2.0.32-beta.7' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'