From 4fa5b2087056690c41184e607178cc395aaa2e6f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 三月 2024 15:35:42 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/locales/en-US/map.ts | 3 ++-
zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx | 30 +++++++++++++++++++++++-------
2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US/map.ts b/zy-asrs-flow/src/locales/en-US/map.ts
index 45de220..52b38d8 100644
--- a/zy-asrs-flow/src/locales/en-US/map.ts
+++ b/zy-asrs-flow/src/locales/en-US/map.ts
@@ -45,7 +45,8 @@
'map.settings.sub.copy.count': 'Count',
'map.settings.sub.copy.gap': 'Gap',
'map.settings.sub.copy.id': 'ID',
- 'map.settings.sub.copy.shelf.auto-increment-value': 'Increment Value',
+ 'map.settings.sub.copy.shelf.auto-increment': 'Auto Increment',
+ 'map.settings.sub.copy.shelf.increment-value': 'Increment Value',
'map.settings.sub.copy.increment.mode': 'Increment Mode',
'map.settings.sub.copy.ascend': 'Ascending',
'map.settings.sub.copy.descend': 'Descending',
diff --git a/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx b/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
index c51b37c..1820264 100644
--- a/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
@@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Col, Form, Input, Row, Checkbox, Slider, Select, Drawer, Space, Button, InputNumber, Segmented } from 'antd';
+import { Col, Form, Input, Row, Switch, Slider, Select, Drawer, Space, Button, InputNumber, Segmented } from 'antd';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import { createStyles } from 'antd-style';
import * as Utils from '../utils'
@@ -20,7 +20,6 @@
if (curSprite && props) {
form.setFieldsValue({
...props.values,
- copyGap: 0
});
}
}, [form, props]);
@@ -34,11 +33,12 @@
}
const handleFinish = (values) => {
+ console.log(values); return
props.submit({ ...values, ...props.values })
}
- const formValuesChange = () => {
-
+ const formValuesChange = (value) => {
+ console.log(value);
}
return (
@@ -66,6 +66,10 @@
form={form}
onFieldsChange={formValuesChange}
initialValues={{
+ copyGap: 0,
+ autoIncrement: false,
+ incrementValue: 'row',
+ incrementMode: 'Ascending',
}}
onFinish={handleFinish}
autoComplete="off"
@@ -113,7 +117,17 @@
</Form.Item>
</Col>
- {curSprite?.data?.type === Utils.SENSOR_TYPE.AGV && (
+ <Col span={24}>
+ <Form.Item
+ name='autoIncrement'
+ label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.auto-increment', defaultMessage: '鑷闀�' })}
+ labelCol={{ span: 8 }}
+ >
+ <Switch />
+ </Form.Item>
+ </Col>
+
+ {form.getFieldValue('autoIncrement') === true && curSprite?.data?.type === Utils.SENSOR_TYPE.AGV && (
<>
<Col span={24}>
<Form.Item
@@ -132,11 +146,12 @@
</>
)}
- {curSprite?.data?.type === Utils.SENSOR_TYPE.SHELF && (
+ {form.getFieldValue('autoIncrement') === true && curSprite?.data?.type === Utils.SENSOR_TYPE.SHELF && (
<>
<Col span={24}>
<Form.Item
- label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.auto-increment-value', defaultMessage: '鑷闀垮��' })}
+ name='incrementValue'
+ label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.increment-value', defaultMessage: '鑷闀垮��' })}
labelCol={{ span: 8 }}
>
<Segmented
@@ -158,6 +173,7 @@
</Col>
<Col span={24}>
<Form.Item
+ name='incrementMode'
label={intl.formatMessage({ id: 'map.settings.sub.copy.increment.mode', defaultMessage: '澧為暱鏂瑰紡' })}
labelCol={{ span: 8 }}
>
--
Gitblit v1.9.1