From 833d74709859cc2573dc1cca79e88b88047d8ae8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 14 十月 2024 14:25:35 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/settings/ConfigSettings.jsx | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/zy-acs-flow/src/map/settings/ConfigSettings.jsx b/zy-acs-flow/src/map/settings/ConfigSettings.jsx
index b33dead..2ac2917 100644
--- a/zy-acs-flow/src/map/settings/ConfigSettings.jsx
+++ b/zy-acs-flow/src/map/settings/ConfigSettings.jsx
@@ -27,7 +27,7 @@
const notify = useNotification();
const translate = useTranslate();
- const { control, handleSubmit, reset, watch, setValue } = useForm({
+ const { control, handleSubmit, reset, watch, setValue, formState: { errors } } = useForm({
defaultValues: { ...sprite?.data },
});
@@ -60,7 +60,7 @@
]);
const onFormSubmit = (data) => {
- if (sprite && sprite.data) {
+ if (sprite?.data) {
Object.keys(data).forEach((key) => {
sprite.data[key] = data[key];
});
@@ -68,7 +68,6 @@
if (onSubmit) {
onSubmit(data);
}
- console.log(sprite.data);
notify.info(translate('common.response.success'));
};
@@ -76,6 +75,7 @@
<>
<Box component="form" onSubmit={handleSubmit(onFormSubmit)} noValidate sx={{ mt: 0 }}>
<Grid container spacing={1.4}>
+
{deviceType === DEVICE_TYPE.SHELF && (
<>
<Grid item xs={6}>
@@ -90,7 +90,7 @@
value={field.value ?? ''}
fullWidth
onChange={(e) => {
- field.onChange(e);
+ field.onChange(e.target.value === '' ? '' : Number(e.target.value));
}}
/>
)}
@@ -108,7 +108,7 @@
value={field.value ?? ''}
fullWidth
onChange={(e) => {
- field.onChange(e);
+ field.onChange(e.target.value === '' ? '' : Number(e.target.value));
}}
/>
)}
@@ -140,13 +140,18 @@
<Controller
name="no"
control={control}
+ rules={{
+ required: translate('ra.validation.required') // warn msg
+ }}
render={({ field }) => {
return (
<TextField
{...field}
- label="No"
+ label={translate('page.map.settings.config.base.no')}
type="text"
value={field.value ?? ''}
+ error={!!errors.no} // show red warn
+ helperText={errors.no ? errors.no.message : null} // show warn msg
fullWidth
onChange={(e) => {
field.onChange(e);
--
Gitblit v1.9.1