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 extends Omit; /** 表单提交时的回调函数 */ 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 93df5b6..c19a211 100644 --- a/src/components/HeaderBack/index.js +++ b/src/components/HeaderBack/index.js @@ -17,7 +17,9 @@ function HeaderBack(props) { <>
history?.goBack?.() || window.history.back()} + onClick={() => { + history?.goBack ? history.goBack() : window.history.back(); + }} > 返回 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 || ( {extraActionButtons} -