From 8566185de1231ce7e0846cc5f34e57244a9b8d7e Mon Sep 17 00:00:00 2001
From: LiuJiaNan <15703339975@163.com>
Date: Wed, 24 Jun 2026 14:33:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(history):=20=E6=94=AF=E6=8C=81=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E5=AE=9E=E7=8E=B0=E8=BF=94=E5=9B=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- FormBuilder 组件新增 history 属性，允许注入自定义历史记录对象
- 优化 FormBuilder 的取消操作，优先调用 history.goBack 方法
- HeaderBack 组件修改返回点击事件，支持使用自定义 history 对象
- Page 组件返回按钮支持自定义历史记录回退行为
- README 更新，新增版本信息及 antd6 升级说明
---
 README.md                                   | 6 +++++-
 src/components/FormBuilder/FormBuilder.d.ts | 5 +++++
 src/components/FormBuilder/FormBuilder.js   | 3 ++-
 src/components/HeaderBack/index.js          | 4 +++-
 src/components/Page/index.js                | 6 +++++-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index ff87c9f..33cc635 100644
--- a/README.md
+++ b/README.md
@@ -15,4 +15,8 @@ yarn add zy-react-library
 
 ### v1.1.2 (2025-12-25)
 
-- 🎉 优化编译效果
\ No newline at end of file
+- 🎉 优化编译效果
+
+### v2.0.0 (2026-06-22)
+
+- 🎉 升级到antd6
\ No newline at end of file
diff --git a/src/components/FormBuilder/FormBuilder.d.ts b/src/components/FormBuilder/FormBuilder.d.ts
index 66ea894..0e29410 100644
--- a/src/components/FormBuilder/FormBuilder.d.ts
+++ b/src/components/FormBuilder/FormBuilder.d.ts
@@ -44,6 +44,11 @@ export interface FormBuilderProps<Values = any> extends Omit<FormProps, "form" |
   form: FormInstance<Values>;
   /** 表单提交时的回调函数 */
   onFinish?: (values: Values) => void;
+  /** 历史记录对象，用于返回上一页，默认使用 window.history.back */
+  history?: {
+    goBack?: () => void;
+    [key: string]: any;
+  };
 }
 
 /**
diff --git a/src/components/FormBuilder/FormBuilder.js b/src/components/FormBuilder/FormBuilder.js
index f2c0e0f..e2ba47e 100644
--- a/src/components/FormBuilder/FormBuilder.js
+++ b/src/components/FormBuilder/FormBuilder.js
@@ -21,6 +21,7 @@ const FormBuilder = (props) => {
     showCancelButton = true,
     customActionButtons,
     extraActionButtons,
+    history,
     loading = false,
     ...restProps
   } = props;
@@ -51,7 +52,7 @@ const FormBuilder = (props) => {
   }, [showActionButtons]);
 
   const handleCancel = () => {
-    window.history.back();
+    history?.goBack ? history.goBack() : window.history.back();
   };
 
   return (
diff --git a/src/components/HeaderBack/index.js b/src/components/HeaderBack/index.js
index b070a6b..3eeac59 100644
--- a/src/components/HeaderBack/index.js
+++ b/src/components/HeaderBack/index.js
@@ -17,7 +17,9 @@ function HeaderBack(props) {
             <>
               <div
                 className="back"
-                onClick={() => history?.goBack?.() || window.history.back()}
+                onClick={() => {
+                  history?.goBack ? history.goBack() : window.history.back();
+                }}
               >
                 <ArrowLeftOutlined style={{ fontSize: 14 }} />
                 <span>返回</span>
diff --git a/src/components/Page/index.js b/src/components/Page/index.js
index a023b4e..7fc529f 100644
--- a/src/components/Page/index.js
+++ b/src/components/Page/index.js
@@ -61,7 +61,11 @@ function Page(props) {
                   {customActionButtons || (
                     <Space>
                       {extraActionButtons}
-                      <Button onClick={() => history?.goBack?.() || window.history.back()}>
+                      <Button
+                        onClick={() => {
+                          history?.goBack ? history.goBack() : window.history.back();
+                        }}
+                      >
                         {backButtonText}
                       </Button>
                     </Space>