From d0fb2d77c9070d7a55551f13d9cbd83d61a819e0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 三月 2024 16:09:50 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/components/configSettings.jsx | 25 +++++++++++++++++++++----
zy-asrs-flow/src/pages/map/index.jsx | 3 ++-
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/configSettings.jsx b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
index 7a6a67a..3bb598e 100644
--- a/zy-asrs-flow/src/pages/map/components/configSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
@@ -60,8 +60,25 @@
const onFinishFailed = (errorInfo) => {
};
- const handleFinish = async (values) => {
- props.onSubmit({ ...values });
+ const handleFinish = (values) => {
+ // execute where the form was finished
+ const confirmSettings = () => {
+ if (curSprite && curSprite?.data?.type) {
+ switch (curSprite.data.type) {
+ case Utils.SENSOR_TYPE.SHELF:
+ curSprite.data.shelfNo = values.shelfNo;
+ curSprite.data.row = values.row;
+ curSprite.data.bay = values.bay;
+ break;
+ case Utils.SENSOR_TYPE.AGV:
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ props.onSubmit({ ...values }, confirmSettings);
}
return (
@@ -90,7 +107,7 @@
}}
>
<br />
-
+
<Form.Item
label={intl.formatMessage({ id: 'map.settings.type', defaultMessage: '绫诲瀷' })}
>
@@ -163,7 +180,7 @@
offset: 4,
span: 16,
}}>
- <Button type="primary" onClick={handleFinish}>
+ <Button type="primary" htmlType="submit">
<FormattedMessage id='common.submit' defaultMessage='淇濆瓨' />
</Button>
</Form.Item>
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 9e56171..1cecc5c 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -196,7 +196,8 @@
}, [spriteBySettings])
const prevSpriteBySettings = prevSpriteBySettingsRef.current;
- const settingsFinish = () => {
+ const settingsFinish = (values, fn) => {
+ fn();
setSettingsVisible(false);
setSpriteBySettings(null);
}
--
Gitblit v1.9.1