From 517086c2ce1fe065e60d8c240a72e5f64766adfa Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 三月 2024 16:34:33 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/locales/en-US/map.ts | 4 ++++
zy-asrs-flow/src/pages/map/components/configSettings.jsx | 6 +++---
zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx | 18 +++++++++++++++++-
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US/map.ts b/zy-asrs-flow/src/locales/en-US/map.ts
index 52b38d8..0d081f4 100644
--- a/zy-asrs-flow/src/locales/en-US/map.ts
+++ b/zy-asrs-flow/src/locales/en-US/map.ts
@@ -53,6 +53,10 @@
'': '',
'': '',
'': '',
+ 'map.settings.sub.copy.warn.config.shelf': 'Please set the shelf parameters first!',
+ '': '',
+ '': '',
+ '': '',
'': '',
'': '',
'': '',
diff --git a/zy-asrs-flow/src/pages/map/components/configSettings.jsx b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
index 3d0cda3..6cf6cc5 100644
--- a/zy-asrs-flow/src/pages/map/components/configSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
@@ -143,7 +143,7 @@
label={intl.formatMessage({ id: 'map.settings.shelf.row', defaultMessage: '鎺�' })}
rules={[
{
- required: true,
+ required: false,
},
]}
>
@@ -158,7 +158,7 @@
label={intl.formatMessage({ id: 'map.settings.shelf.bay', defaultMessage: '鍒�' })}
rules={[
{
- required: true,
+ required: false,
},
]}
>
@@ -173,7 +173,7 @@
label={intl.formatMessage({ id: 'map.settings.shelf.no', defaultMessage: '璐ф灦鍙�' })}
rules={[
{
- required: true,
+ required: false,
},
]}
>
diff --git a/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx b/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
index f81fb2c..f134d3e 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, Switch, Slider, Select, Drawer, Space, Button, InputNumber, Segmented } from 'antd';
+import { Col, Form, Input, Row, Switch, Slider, message, Drawer, Space, Button, InputNumber, Segmented } from 'antd';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import { createStyles } from 'antd-style';
import * as Utils from '../utils'
@@ -26,6 +26,22 @@
}
}, [form, props]);
+ useEffect(() => {
+ if (autoIncrement === true && curSprite) {
+ switch (curSprite.data?.type) {
+ case Utils.SENSOR_TYPE.SHELF:
+ console.log(1);
+ if (!curSprite.data?.row || !curSprite.data?.bay) {
+ message.warning(intl.formatMessage({ id: 'map.settings.sub.copy.warn.config.shelf', defaultMessage: '璇峰厛璁剧疆璐ф灦鍙傛暟!' }))
+ }
+ break;
+ default:
+ break;
+ }
+
+ }
+ }, [autoIncrement])
+
const handleCancel = () => {
props.onClose();
}
--
Gitblit v1.9.1