From 9f4a1cf5f91f85c49d3e609f19c9e833a08ca8ee Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 22 三月 2024 08:29:48 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/map/components/settings.jsx |   50 +++++++++++++++++++++++++++-----------------------
 1 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/components/settings.jsx b/zy-asrs-flow/src/pages/map/components/settings.jsx
index 2bb2233..4409fd7 100644
--- a/zy-asrs-flow/src/pages/map/components/settings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/settings.jsx
@@ -23,28 +23,9 @@
     const [mapForm] = Form.useForm();
     const [configForm] = Form.useForm();
 
-    const contentList = {
-        map: (
-            <MapSettings
-                refCurr={props.refCurr}
-                curSprite={props.curSprite}
-                setSpriteBySettings={props.setSpriteBySettings}
-                setDidClickSprite={props.setDidClickSprite}
-                onSubmit={props.onSubmit}
-                mapForm={mapForm}
-            />
-        ),
-        config: (
-            <ConfigSettings
-                refCurr={props.refCurr}
-                curSprite={props.curSprite}
-                setSpriteBySettings={props.setSpriteBySettings}
-                setDidClickSprite={props.setDidClickSprite}
-                onSubmit={props.onSubmit}
-                configForm={configForm}
-            />
-        ),
-    };
+    const finishSettings = (values, fn) => {
+        fn();
+    }
 
     const handleCancel = () => {
         props.onCancel();
@@ -58,6 +39,29 @@
             configForm.submit();
         }
     }
+
+    const contentList = {
+        map: (
+            <MapSettings
+                refCurr={props.refCurr}
+                curSprite={props.curSprite}
+                setSpriteBySettings={props.setSpriteBySettings}
+                setDidClickSprite={props.setDidClickSprite}
+                onSubmit={finishSettings}
+                mapForm={mapForm}
+            />
+        ),
+        config: (
+            <ConfigSettings
+                refCurr={props.refCurr}
+                curSprite={props.curSprite}
+                setSpriteBySettings={props.setSpriteBySettings}
+                setDidClickSprite={props.setDidClickSprite}
+                onSubmit={finishSettings}
+                configForm={configForm}
+            />
+        ),
+    };
 
     return (
         <>
@@ -73,7 +77,7 @@
                         <Button onClick={handleCancel}>
                             <FormattedMessage id='common.cancel' defaultMessage='鍙栨秷' />
                         </Button>
-                        <Button hidden={activeTabKey === 'map'} onClick={handleOk} type="primary">
+                        <Button hidden={activeTabKey === 'map' || activeTabKey === 'config'} onClick={handleOk} type="primary">
                             <FormattedMessage id='common.submit' defaultMessage='淇濆瓨' />
                         </Button>
                     </Space>

--
Gitblit v1.9.1