From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/components/settings.jsx | 52 ++++++++++++++++++++++++++++------------------------
1 files changed, 28 insertions(+), 24 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..0362981 100644
--- a/zy-asrs-flow/src/pages/map/components/settings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/settings.jsx
@@ -19,32 +19,11 @@
const intl = useIntl();
const { styles } = useStyles();
const [activeTabKey, setActiveTabKey] = useState('map');
-
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}
- />
- ),
- };
+ useEffect(() => {
+ }, []);
const handleCancel = () => {
props.onCancel();
@@ -58,6 +37,31 @@
configForm.submit();
}
}
+
+ const finishSettings = (values, fn) => {
+ fn();
+ }
+
+ const contentList = {
+ map: (
+ <MapSettings
+ refCurr={props.refCurr}
+ curSprite={props.curSprite}
+ setSpriteBySettings={props.setSpriteBySettings}
+ onSubmit={finishSettings}
+ mapForm={mapForm}
+ />
+ ),
+ config: (
+ <ConfigSettings
+ refCurr={props.refCurr}
+ curSprite={props.curSprite}
+ setSpriteBySettings={props.setSpriteBySettings}
+ 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