mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 07:06:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: after success setting for the submit button (#5332)
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Waiting to run
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details

Browse Source 
* fix: submit action should support after uccess setting

* fix: after success
This commit is contained in:
Katherine 2024-09-27 08:52:06 +08:00 committed by GitHub
parent 81d1353511
commit 0924ddfa80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/client/src/block-provider/hooks/index.ts
View File

@ -251,6 +251,13 @@ export const useCreateActionProps = () => {
if (!onSuccess?.successMessage) { if (!onSuccess?.successMessage) {
message.success(t('Saved successfully')); message.success(t('Saved successfully'));
await resetFormCorrectly(form); await resetFormCorrectly(form);
if (onSuccess?.redirecting && onSuccess?.redirectTo) {
if (isURL(onSuccess.redirectTo)) {
window.location.href = onSuccess.redirectTo;
} else {
navigate(onSuccess.redirectTo);
}
}
return; return;
} }
if (onSuccess?.manualClose) { if (onSuccess?.manualClose) {

10
packages/core/client/src/schema-component/antd/action/Action.Designer.tsx
View File

@ -8,7 +8,7 @@
*/ */
import { ArrayTable } from '@formily/antd-v5'; import { ArrayTable } from '@formily/antd-v5';
import { Field, onFieldValueChange } from '@formily/core'; import { onFieldValueChange } from '@formily/core';
import { ISchema, useField, useFieldSchema, useForm, useFormEffects } from '@formily/react'; import { ISchema, useField, useFieldSchema, useForm, useFormEffects } from '@formily/react';
import { isValid, uid } from '@formily/shared'; import { isValid, uid } from '@formily/shared';
import { Alert, Flex, ModalProps, Tag } from 'antd'; import { Alert, Flex, ModalProps, Tag } from 'antd';
@ -258,7 +258,13 @@ export function AfterSuccess() {
return ( return (
<SchemaSettingsModalItem <SchemaSettingsModalItem
title={t('After successful submission')} title={t('After successful submission')}
initialValues={fieldSchema?.['x-action-settings']?.['onSuccess']} initialValues={
fieldSchema?.['x-action-settings']?.['onSuccess'] || {
manualClose: false,
redirecting: false,
successMessage: '{{t("Saved successfully")}}',
}
}
schema={ schema={
{ {
type: 'object', type: 'object',