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/mapCopySettings.jsx | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 109 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx b/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
index 779cc64..61e2dd2 100644
--- a/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
@@ -37,6 +37,13 @@
setAutoIncrementError(null);
}
break;
+ case Utils.SENSOR_TYPE.POINT:
+ if (!curSprite.data?.vertical || !curSprite.data?.horizontal) {
+ setAutoIncrementError(intl.formatMessage({ id: 'map.settings.sub.copy.warn.config.point', defaultMessage: '璇峰厛璁剧疆瀹氫綅鐐瑰弬鏁帮紒' }));
+ } else {
+ setAutoIncrementError(null);
+ }
+ break;
default:
break;
}
@@ -54,12 +61,6 @@
}
const handleFinish = (values) => {
- console.log({
- ...values
- , ...props.values
- , autoIncrement: autoIncrement
- , type: curSprite?.data?.type
- });
props.submit({
...values
, ...props.values
@@ -145,7 +146,7 @@
{/* switch auto increment */}
<Col span={24}>
<Form.Item
- label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.auto-increment', defaultMessage: '鑷闀�' })}
+ label={intl.formatMessage({ id: 'map.settings.sub.copy.auto-increment', defaultMessage: '鑷闀�' })}
labelCol={{ span: 8 }}
help={autoIncrementError}
validateStatus={autoIncrementError ? "error" : null}
@@ -154,12 +155,60 @@
</Form.Item>
</Col>
+ {autoIncrement && curSprite?.data?.type === Utils.SENSOR_TYPE.SHUTTLE && (
+ <>
+ <Col span={24}>
+ <Form.Item
+ name='incrementValue'
+ label={intl.formatMessage({ id: 'map.settings.sub.copy.increment-value', defaultMessage: '鑷闀垮��' })}
+ labelCol={{ span: 8 }}
+ initialValue='no'
+ >
+ <Segmented
+ block
+ options={[
+ {
+ label: intl.formatMessage({ id: 'map.settings.no', defaultMessage: '缂栧彿' }),
+ value: 'no'
+ },
+ ]}
+ onChange={(value) => {
+ }}
+ />
+ </Form.Item>
+ </Col>
+ <Col span={24}>
+ <Form.Item
+ name='incrementMode'
+ label={intl.formatMessage({ id: 'map.settings.sub.copy.increment.mode', defaultMessage: '澧為暱鏂瑰紡' })}
+ labelCol={{ span: 8 }}
+ >
+ <Segmented
+ block
+ options={[
+ {
+ label: intl.formatMessage({ id: 'map.settings.sub.copy.ascend', defaultMessage: '鍗囧簭' }),
+ value: 'ascending'
+ },
+ {
+ label: intl.formatMessage({ id: 'map.settings.sub.copy.descend', defaultMessage: '闄嶅簭' }),
+ value: 'descending'
+ },
+ ]}
+ onChange={(value) => {
+ }}
+ />
+ </Form.Item>
+ </Col>
+ </>
+ )}
+
{autoIncrement && curSprite?.data?.type === Utils.SENSOR_TYPE.AGV && (
<>
<Col span={24}>
<Form.Item
name='incrementValue'
- label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.increment-value', defaultMessage: '鑷闀垮��' })}
+ label={intl.formatMessage({ id: 'map.settings.sub.copy.increment-value', defaultMessage: '鑷闀垮��' })}
labelCol={{ span: 8 }}
initialValue='no'
>
@@ -207,7 +256,7 @@
<Col span={24}>
<Form.Item
name='incrementValue'
- label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.increment-value', defaultMessage: '鑷闀垮��' })}
+ label={intl.formatMessage({ id: 'map.settings.sub.copy.increment-value', defaultMessage: '鑷闀垮��' })}
labelCol={{ span: 8 }}
initialValue='row'
>
@@ -254,6 +303,57 @@
</>
)}
+ {autoIncrement && curSprite?.data?.type === Utils.SENSOR_TYPE.POINT && (
+ <>
+ <Col span={24}>
+ <Form.Item
+ name='incrementValue'
+ label={intl.formatMessage({ id: 'map.settings.sub.copy.increment-value', defaultMessage: '鑷闀垮��' })}
+ labelCol={{ span: 8 }}
+ initialValue='vertical'
+ >
+ <Segmented
+ block
+ options={[
+ {
+ label: intl.formatMessage({ id: 'map.settings.point.vertical', defaultMessage: '绾靛悜' }),
+ value: 'vertical'
+ },
+ {
+ label: intl.formatMessage({ id: 'map.settings.point.horizontal', defaultMessage: '妯悜' }),
+ value: 'horizontal'
+ },
+ ]}
+ onChange={(value) => {
+ }}
+ />
+ </Form.Item>
+ </Col>
+ <Col span={24}>
+ <Form.Item
+ name='incrementMode'
+ label={intl.formatMessage({ id: 'map.settings.sub.copy.increment.mode', defaultMessage: '澧為暱鏂瑰紡' })}
+ labelCol={{ span: 8 }}
+ >
+ <Segmented
+ block
+ options={[
+ {
+ label: intl.formatMessage({ id: 'map.settings.sub.copy.ascend', defaultMessage: '鍗囧簭' }),
+ value: 'ascending'
+ },
+ {
+ label: intl.formatMessage({ id: 'map.settings.sub.copy.descend', defaultMessage: '闄嶅簭' }),
+ value: 'descending'
+ },
+ ]}
+ onChange={(value) => {
+ }}
+ />
+ </Form.Item>
+ </Col>
+ </>
+ )}
</Row>
</Form>
</Drawer>
--
Gitblit v1.9.1