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/batch/modify.jsx | 60 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/batch/modify.jsx b/zy-asrs-flow/src/pages/map/batch/modify.jsx
index e30a4cc..b21bcd0 100644
--- a/zy-asrs-flow/src/pages/map/batch/modify.jsx
+++ b/zy-asrs-flow/src/pages/map/batch/modify.jsx
@@ -1,31 +1,15 @@
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,
- ProFormSelect
} from '@ant-design/pro-components';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
-import { createStyles } from 'antd-style';
import * as Utils from '../utils'
import ShowJson from '../drawer/showJson';
-const waitTime = (time = 100) => {
- return new Promise((resolve) => {
- setTimeout(() => {
- resolve(true);
- }, time);
- });
-};
-
-const useStyles = createStyles(({ token, css }) => {
- return {
- }
-})
-
const BatchModify = (props) => {
const intl = useIntl();
- const { styles } = useStyles();
const { batchSprites } = props;
const [form] = Form.useForm();
@@ -34,24 +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 => {
if (sprite.data?.type === Utils.SENSOR_TYPE.SHELF) {
- if (values.shelfType) {
-
+ if (!Utils.isNullOfUndefined(values.shelfType)) {
+ sprite.data.shelfType = values.shelfType;
+ Utils.showSheflType(sprite);
}
- Utils.showSheflType(sprite);
+ if (!Utils.isNullOfUndefined(values.top)) {
+ sprite.data.top = values.top;
+ }
+ if (!Utils.isNullOfUndefined(values.right)) {
+ sprite.data.right = values.right;
+ }
+ if (!Utils.isNullOfUndefined(values.bottom)) {
+ sprite.data.bottom = values.bottom;
+ }
+ if (!Utils.isNullOfUndefined(values.left)) {
+ sprite.data.left = values.left;
+ }
+ if (!Utils.isNullOfUndefined(values.value)) {
+ sprite.data.value = values.value;
+ }
}
});
- return false;
+ closeLoading();
+ return true;
} else {
return false;
}
@@ -62,10 +61,6 @@
<StepsForm
current={currentStep}
onCurrentChange={setCurrentStep}
- onFinish={async () => {
- await waitTime(1000);
- message.success('鎻愪氦鎴愬姛');
- }}
formProps={{
variant: 'filled',
layout: 'horizontal',
@@ -115,13 +110,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
@@ -135,7 +134,6 @@
value: Utils.SHELF_TYPE.DISABLE
},
]}
- defaultValue={0}
/>
</ProForm.Item>
<ProForm.Item
--
Gitblit v1.9.1