From 53e5f901803f85acc1c50b791c4c1eb58e86ba9a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 17:46:05 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx b/rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx
index a52a4c2..e0f2fbe 100644
--- a/rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx
+++ b/rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx
@@ -19,6 +19,9 @@
required,
useRecordContext,
DeleteButton,
+ useNotify,
+ useRedirect,
+ useEditContext,
} from 'react-admin';
import { useWatch, useFormContext } from "react-hook-form";
import { Stack, Grid, Box, Typography } from '@mui/material';
@@ -30,11 +33,14 @@
import StatusSelectInput from "../../../components/StatusSelectInput";
const FormToolbar = () => {
- const { getValues } = useFormContext();
-
+ const form = useFormContext();
+ const { record, isPending } = useEditContext();
+ const redirect = useRedirect();
return (
- <Toolbar sx={{ justifyContent: 'space-between' }}>
- <SaveButton />
+ <Toolbar sx={{ justifyContent: 'end' }}>
+ <SaveButton type="button" mutationOptions={{onSuccess:() => {
+ redirect('/dictType/' + record?.dictTypeId)
+ } }}/>
<DeleteButton mutationMode="optimistic" />
</Toolbar>
)
@@ -43,17 +49,15 @@
const DictDataEdit = () => {
const translate = useTranslate();
-
return (
<Edit
redirect="list"
+ resource="dictData"
mutationMode={EDIT_MODE}
actions={<CustomerTopToolBar backPrevious={true} />}
aside={<EditBaseAside />}
>
<SimpleForm
- shouldUnregister
- warnWhenUnsavedChanges
toolbar={<FormToolbar />}
mode="onTouched"
defaultValues={{}}
@@ -68,8 +72,8 @@
<TextInput
label="table.field.dictData.dictTypeId"
source="dictTypeId"
+ readOnly
parse={v => v}
- autoFocus
validate={required()}
/>
</Stack>
@@ -77,6 +81,7 @@
<TextInput
label="table.field.dictData.dictTypeCode"
source="dictTypeCode"
+ readOnly
parse={v => v}
validate={required()}
/>
@@ -93,6 +98,7 @@
<TextInput
label="table.field.dictData.label"
source="label"
+ validate={required()}
parse={v => v}
/>
</Stack>
--
Gitblit v1.9.1