#

luxiaotao1123

2024-03-13 d0fb2d77c9070d7a55551f13d9cbd83d61a819e0

#

 zy-asrs-flow/src/pages/map/components/configSettings.jsx

@@ -60,8 +60,25 @@
    const onFinishFailed = (errorInfo) => {
    };

    const handleFinish = async (values) => {
        props.onSubmit({ ...values });
    const handleFinish = (values) => {
        // execute where the form was finished
        const confirmSettings = () => {
            if (curSprite && curSprite?.data?.type) {
                switch (curSprite.data.type) {
                    case Utils.SENSOR_TYPE.SHELF:
                        curSprite.data.shelfNo = values.shelfNo;
                        curSprite.data.row = values.row;
                        curSprite.data.bay = values.bay;
                        break;
                    case Utils.SENSOR_TYPE.AGV:
                        break;
                    default:
                        break;
                }
            }
        }

        props.onSubmit({ ...values }, confirmSettings);
    }

    return (
@@ -163,7 +180,7 @@
                        offset: 4,
                        span: 16,
                    }}>
                    <Button type="primary" onClick={handleFinish}>
                    <Button type="primary" htmlType="submit">
                        <FormattedMessage id='common.submit' defaultMessage='保存' />
                    </Button>
                </Form.Item>

 zy-asrs-flow/src/pages/map/index.jsx

@@ -196,7 +196,8 @@
    }, [spriteBySettings])
    const prevSpriteBySettings = prevSpriteBySettingsRef.current;

    const settingsFinish = () => {
    const settingsFinish = (values, fn) => {
        fn();
        setSettingsVisible(false);
        setSpriteBySettings(null);
    }