From 7f56a5e2cd30276f1d3ee792384fb51586c05d51 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 三月 2024 17:17:12 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/batch/modify.jsx | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 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..cde6fea 100644
--- a/zy-asrs-flow/src/pages/map/batch/modify.jsx
+++ b/zy-asrs-flow/src/pages/map/batch/modify.jsx
@@ -3,29 +3,13 @@
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();
@@ -44,9 +28,21 @@
if (batchSprites?.length > 0) {
// loading
batchSprites.forEach(sprite => {
+ console.log(sprite); // ?? why shelfType be undefined
if (sprite.data?.type === Utils.SENSOR_TYPE.SHELF) {
- if (values.shelfType) {
-
+ if (values.shelfType !== null) {
+ sprite.data.shelfType = values.shelfType;
+ console.log(sprite.data);
+ }
+ if (values.top !== null) {
+ }
+ if (values.right !== null) {
+ }
+ if (values.bottom !== null) {
+ }
+ if (values.left !== null) {
+ }
+ if (values.value !== null) {
}
Utils.showSheflType(sprite);
}
@@ -62,10 +58,6 @@
<StepsForm
current={currentStep}
onCurrentChange={setCurrentStep}
- onFinish={async () => {
- await waitTime(1000);
- message.success('鎻愪氦鎴愬姛');
- }}
formProps={{
variant: 'filled',
layout: 'horizontal',
@@ -115,13 +107,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 +131,6 @@
value: Utils.SHELF_TYPE.DISABLE
},
]}
- defaultValue={0}
/>
</ProForm.Item>
<ProForm.Item
--
Gitblit v1.9.1