From 9d4f7226888a9daa9a8967045f91ed4926a96309 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 三月 2024 16:36:54 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/locales/en-US.ts | 1 +
zy-asrs-flow/src/pages/map/batch/modify.jsx | 24 ++++++++++++++++++------
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US.ts b/zy-asrs-flow/src/locales/en-US.ts
index 7c9b0c6..c2c138d 100644
--- a/zy-asrs-flow/src/locales/en-US.ts
+++ b/zy-asrs-flow/src/locales/en-US.ts
@@ -16,6 +16,7 @@
'common.undefined':'Undefined',
'common.phone':'Phone',
'common.email':'Email',
+ 'common.select.cancel':'Cancel Selection',
'common.realname':'Real Name',
'common.idcard':'ID Number',
'common.introduction':'Introduction',
diff --git a/zy-asrs-flow/src/pages/map/batch/modify.jsx b/zy-asrs-flow/src/pages/map/batch/modify.jsx
index 0ff5f59..2d481fa 100644
--- a/zy-asrs-flow/src/pages/map/batch/modify.jsx
+++ b/zy-asrs-flow/src/pages/map/batch/modify.jsx
@@ -24,13 +24,22 @@
}, [batchSprites]);
const handleOk = (values) => {
- console.log(values); return true;
+ console.log(values);
if (batchSprites?.length > 0) {
// loading
batchSprites.forEach(sprite => {
if (sprite.data?.type === Utils.SENSOR_TYPE.SHELF) {
- if (values.shelfType) {
-
+ if (values.shelfType !== null) {
+ }
+ if (values.top !== null) {
+ }
+ if (values.right !== null) {
+ }
+ if (values.bottom !== null) {
+ }
+ if (values.left !== null) {
+ }
+ if (values.value !== null) {
}
Utils.showSheflType(sprite);
}
@@ -95,13 +104,17 @@
label={intl.formatMessage({ id: 'map.settings.shelf.type', defaultMessage: '绫诲瀷' })}
rules={[
{
- required: true,
+ required: false,
},
]}
>
<Select
- style={{ width: 120 }}
+ style={{ width: 160 }}
options={[
+ {
+ label: intl.formatMessage({ id: 'common.select.cancel', defaultMessage: '鍙栨秷閫夋嫨' }),
+ value: null
+ },
{
label: intl.formatMessage({ id: 'map.settings.shelf.store', defaultMessage: '搴撲綅' }),
value: Utils.SHELF_TYPE.STORE
@@ -115,7 +128,6 @@
value: Utils.SHELF_TYPE.DISABLE
},
]}
- defaultValue={0}
/>
</ProForm.Item>
<ProForm.Item
--
Gitblit v1.9.1