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

---
 zy-acs-flow/src/map/settings/ConfigSettings.jsx |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/zy-acs-flow/src/map/settings/ConfigSettings.jsx b/zy-acs-flow/src/map/settings/ConfigSettings.jsx
index 15b695c..75aee21 100644
--- a/zy-acs-flow/src/map/settings/ConfigSettings.jsx
+++ b/zy-acs-flow/src/map/settings/ConfigSettings.jsx
@@ -36,8 +36,9 @@
     const notify = useNotification();
     const translate = useTranslate();
 
-    const { control, handleSubmit, reset, watch, setValue } = useForm({
+    const { control, handleSubmit, reset, watch, setValue, unregister } = useForm({
         defaultValues: getFormDefaultValues(sprite?.data),
+        shouldUnregister: true,
     });
 
     useEffect(() => {
@@ -50,6 +51,13 @@
 
     const rowValue = watch('row');
     const bayValue = watch('bay');
+
+    useEffect(() => {
+        if (deviceType !== DEVICE_TYPE.SHELF) {
+            unregister('row');
+            unregister('bay');
+        }
+    }, [deviceType, unregister]);
 
     useEffect(() => {
         if (deviceType === DEVICE_TYPE.SHELF) {
@@ -94,6 +102,7 @@
                                             {...field}
                                             label={translate('page.map.settings.config.shelf.row')}
                                             type="number"
+                                            value={field.value ?? ''}
                                             fullWidth
                                             onChange={(e) => {
                                                 field.onChange(e);
@@ -111,6 +120,7 @@
                                             {...field}
                                             label={translate('page.map.settings.config.shelf.bay')}
                                             type="number"
+                                            value={field.value ?? ''}
                                             fullWidth
                                             onChange={(e) => {
                                                 field.onChange(e);
@@ -156,7 +166,7 @@
                                         {...field}
                                         label="No"
                                         type="text"
-                                        value={field.value || ''}
+                                        value={field.value ?? ''}
                                         fullWidth
                                         onChange={(e) => {
                                             field.onChange(e);

--
Gitblit v1.9.1