Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master in...

luxiaotao1123

2024-04-08 53f4cc4d271fc723f7a9a2f3de89c4ea8ede49a2

 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;
        }