From 0e9ab352541f2743d7ba8f3e8674c8dc56137ca4 Mon Sep 17 00:00:00 2001 From: katherinehhh Date: Thu, 19 Oct 2023 15:42:13 +0800 Subject: [PATCH] fix: after successful submission failed to config redirectTo (#2867) --- .../client/src/block-provider/hooks/index.ts | 28 +++++++++++++++++++ .../antd/action/Action.Designer.tsx | 3 -- .../hooks/useIsAllowToSetDefaultValue.tsx | 2 -- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/packages/core/client/src/block-provider/hooks/index.ts b/packages/core/client/src/block-provider/hooks/index.ts index 7c0c35462..e2ece264f 100644 --- a/packages/core/client/src/block-provider/hooks/index.ts +++ b/packages/core/client/src/block-provider/hooks/index.ts @@ -245,6 +245,13 @@ export const useCreateActionProps = () => { }); } else { message.success(compile(onSuccess?.successMessage)); + if (onSuccess?.redirecting && onSuccess?.redirectTo) { + if (isURL(onSuccess.redirectTo)) { + window.location.href = onSuccess.redirectTo; + } else { + navigate(onSuccess.redirectTo); + } + } } } catch (error) { actionField.data.loading = false; @@ -554,6 +561,13 @@ export const useCustomizeUpdateActionProps = () => { }); } else { message.success(compile(onSuccess?.successMessage)); + if (onSuccess?.redirecting && onSuccess?.redirectTo) { + if (isURL(onSuccess.redirectTo)) { + window.location.href = onSuccess.redirectTo; + } else { + navigate(onSuccess.redirectTo); + } + } } }, }; @@ -658,6 +672,13 @@ export const useCustomizeBulkUpdateActionProps = () => { }); } else { message.success(compile(onSuccess?.successMessage)); + if (onSuccess?.redirecting && onSuccess?.redirectTo) { + if (isURL(onSuccess.redirectTo)) { + window.location.href = onSuccess.redirectTo; + } else { + navigate(onSuccess.redirectTo); + } + } } }, async onCancel() { @@ -949,6 +970,13 @@ export const useUpdateActionProps = () => { }); } else { message.success(compile(onSuccess?.successMessage)); + if (onSuccess?.redirecting && onSuccess?.redirectTo) { + if (isURL(onSuccess.redirectTo)) { + window.location.href = onSuccess.redirectTo; + } else { + navigate(onSuccess.redirectTo); + } + } } } catch (error) { actionField.data.loading = false; diff --git a/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx b/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx index 3aa6f932d..8128dc1b2 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx @@ -621,7 +621,6 @@ function AfterSuccess() { const { dn } = useDesignable(); const { t } = useTranslation(); const fieldSchema = useFieldSchema(); - return (