From 9b78832f6bc69c9832c1bf08366870c788479df6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 11 十月 2024 11:11:23 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/map/settings/ConfigSettings.jsx |   24 +++++++-----------------
 1 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/zy-acs-flow/src/map/settings/ConfigSettings.jsx b/zy-acs-flow/src/map/settings/ConfigSettings.jsx
index 15b695c..b33dead 100644
--- a/zy-acs-flow/src/map/settings/ConfigSettings.jsx
+++ b/zy-acs-flow/src/map/settings/ConfigSettings.jsx
@@ -22,27 +22,20 @@
 } from '../constants';
 import { useNotification } from '../Notification';
 
-export const getFormDefaultValues = (data) => {
-    return {
-        row: data?.row ?? '',
-        bay: data?.bay ?? '',
-        no: data?.no ?? '',
-        ...data,
-    }
-};
-
 const ConfigSettings = (props) => {
     const { sprite, onSubmit } = props;
     const notify = useNotification();
     const translate = useTranslate();
 
     const { control, handleSubmit, reset, watch, setValue } = useForm({
-        defaultValues: getFormDefaultValues(sprite?.data),
+        defaultValues: { ...sprite?.data },
     });
 
     useEffect(() => {
         if (sprite?.data) {
-            reset(getFormDefaultValues(sprite.data));
+            reset({
+                ...sprite.data
+            });
         }
     }, [sprite, reset]);
 
@@ -94,6 +87,7 @@
                                             {...field}
                                             label={translate('page.map.settings.config.shelf.row')}
                                             type="number"
+                                            value={field.value ?? ''}
                                             fullWidth
                                             onChange={(e) => {
                                                 field.onChange(e);
@@ -111,6 +105,7 @@
                                             {...field}
                                             label={translate('page.map.settings.config.shelf.bay')}
                                             type="number"
+                                            value={field.value ?? ''}
                                             fullWidth
                                             onChange={(e) => {
                                                 field.onChange(e);
@@ -141,11 +136,6 @@
                         <Divider />
                     </Grid>
 
-                    {/* <Grid item xs={12}>
-                        <Typography variant="inherit">
-                            {translate('page.map.settings.config.base.no')}
-                        </Typography>
-                    </Grid> */}
                     <Grid item xs={6}>
                         <Controller
                             name="no"
@@ -156,7 +146,7 @@
                                         {...field}
                                         label="No"
                                         type="text"
-                                        value={field.value || ''}
+                                        value={field.value ?? ''}
                                         fullWidth
                                         onChange={(e) => {
                                             field.onChange(e);

--
Gitblit v1.9.1