From 902008a91af3c2f911319168ccb89f24a93da79b Mon Sep 17 00:00:00 2001
From: lizhensheng <lizhensheng@actionsky.com>
Date: Mon, 23 Mar 2026 16:34:34 +0800
Subject: [PATCH] fix(dms-kit): allow custom getPopupContainer in
 BasicRangePicker

---
 .../Modal/CompanyNoticeModal/CompanyNoticeForm/index.tsx    | 1 +
 packages/dms-kit/docs/CHANGELOG.md                          | 6 +++++-
 packages/dms-kit/package.json                               | 4 ++--
 .../src/components/BasicRangePicker/BasicRangePicker.tsx    | 5 ++---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/CompanyNoticeForm/index.tsx b/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/CompanyNoticeForm/index.tsx
index ebb46a9386..9351f6152b 100644
--- a/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/CompanyNoticeForm/index.tsx
+++ b/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/CompanyNoticeModal/CompanyNoticeForm/index.tsx
@@ -132,6 +132,7 @@ export const CompanyNoticeForm: React.FC<{
           ]}
           disabled={disabled}
           className="company-notice-date-picker"
+          getPopupContainer={() => document.body}
         />
       </Form.Item>
     </Form>
diff --git a/packages/dms-kit/docs/CHANGELOG.md b/packages/dms-kit/docs/CHANGELOG.md
index c700e95300..1dad5ab123 100644
--- a/packages/dms-kit/docs/CHANGELOG.md
+++ b/packages/dms-kit/docs/CHANGELOG.md
@@ -57,4 +57,8 @@ nav:
 
 ## 1.0.9
 
-- 路由数据变更
\ No newline at end of file
+- 路由数据变更
+
+## 1.0.10
+
+- [BasicRangePicker] 修复用户无法自定义 `getPopupContainer` 属性的问题
\ No newline at end of file
diff --git a/packages/dms-kit/package.json b/packages/dms-kit/package.json
index 54e36dc1c9..311f8f1ebb 100644
--- a/packages/dms-kit/package.json
+++ b/packages/dms-kit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@actiontech/dms-kit",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "DMS Kit - React UI Components Library",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -58,4 +58,4 @@
     "dumi": "^2.3.8",
     "babel-plugin-import": "^1.13.8"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/dms-kit/src/components/BasicRangePicker/BasicRangePicker.tsx b/packages/dms-kit/src/components/BasicRangePicker/BasicRangePicker.tsx
index c38c0a7277..618ad5d887 100644
--- a/packages/dms-kit/src/components/BasicRangePicker/BasicRangePicker.tsx
+++ b/packages/dms-kit/src/components/BasicRangePicker/BasicRangePicker.tsx
@@ -10,6 +10,7 @@ const BasicRangePicker: React.FC<BasicRangePickerProps> = (props) => {
     suffixIcon,
     prefix,
     hideSuperIcon = true,
+    getPopupContainer,
     ...otherParams
   } = props;
 
@@ -27,9 +28,7 @@ const BasicRangePicker: React.FC<BasicRangePickerProps> = (props) => {
         //todo allowClear={{clearIcon: <IconClose />}} need antd 5.8.0
         clearIcon={<CloseOutlined fill="currentColor" />}
         separator={<RightOutlined width={14} height={14} fill="currentColor" />}
-        getPopupContainer={(trigger) => {
-          return trigger;
-        }}
+        getPopupContainer={getPopupContainer ?? ((trigger) => trigger)}
         nextIcon={
           <span className="next-icon">
             <RightOutlined width={14} height={14} />