From 366c41a13dbf90c423875fa56a3ecf3a33aa969b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 26 三月 2024 11:10:41 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/batch/modify.jsx | 31 +++++++++++++++++--------------
zy-asrs-flow/src/pages/map/utils.js | 10 +++++++++-
2 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/batch/modify.jsx b/zy-asrs-flow/src/pages/map/batch/modify.jsx
index cde6fea..b21bcd0 100644
--- a/zy-asrs-flow/src/pages/map/batch/modify.jsx
+++ b/zy-asrs-flow/src/pages/map/batch/modify.jsx
@@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Drawer, Space, Button, Card, Select, InputNumber, Input, Result, Form } from 'antd';
+import { message, Space, Button, Card, Select, InputNumber, Input, Result, Form } from 'antd';
import {
ProForm,
StepsForm,
@@ -18,36 +18,39 @@
useEffect(() => {
form.resetFields();
form.setFieldsValue({
- shelfType: Utils.SHELF_TYPE.STORE
+ shelfType: null
})
setCurrentStep(0);
}, [batchSprites]);
const handleOk = (values) => {
- console.log(values);
if (batchSprites?.length > 0) {
- // loading
+ const closeLoading = message.loading(intl.formatMessage({ id: 'common.loading.api.message', defaultMessage: '绛夊緟鏈嶅姟鍣�......' }));
batchSprites.forEach(sprite => {
- console.log(sprite); // ?? why shelfType be undefined
if (sprite.data?.type === Utils.SENSOR_TYPE.SHELF) {
- if (values.shelfType !== null) {
+ if (!Utils.isNullOfUndefined(values.shelfType)) {
sprite.data.shelfType = values.shelfType;
- console.log(sprite.data);
+ Utils.showSheflType(sprite);
}
- if (values.top !== null) {
+ if (!Utils.isNullOfUndefined(values.top)) {
+ sprite.data.top = values.top;
}
- if (values.right !== null) {
+ if (!Utils.isNullOfUndefined(values.right)) {
+ sprite.data.right = values.right;
}
- if (values.bottom !== null) {
+ if (!Utils.isNullOfUndefined(values.bottom)) {
+ sprite.data.bottom = values.bottom;
}
- if (values.left !== null) {
+ if (!Utils.isNullOfUndefined(values.left)) {
+ sprite.data.left = values.left;
}
- if (values.value !== null) {
+ if (!Utils.isNullOfUndefined(values.value)) {
+ sprite.data.value = values.value;
}
- Utils.showSheflType(sprite);
}
});
- return false;
+ closeLoading();
+ return true;
} else {
return false;
}
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 0eb32f1..a54f4b1 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -501,4 +501,12 @@
resolve(true);
}, time);
});
-};
\ No newline at end of file
+};
+
+export const isNullOfUndefined = (param) => {
+ if (null === param || undefined === param) {
+ return true;
+ } else {
+ return false;
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.1