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

luxiaotao1123

2024-04-08 9d0acfb65c80c4948c305ca01338f894b87346a0

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

@@ -1,6 +1,10 @@
import React, { useState, useRef, useEffect } from 'react';
import { Col, Form, Input, Row, Checkbox, Slider, Select, Drawer, Space, Button, InputNumber, Card } from 'antd';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import {
    BranchesOutlined,
    BorderOuterOutlined,
} from '@ant-design/icons';
import { createStyles } from 'antd-style';
import * as Utils from '../utils'
import Http from '@/utils/http';
@@ -18,28 +22,8 @@
    const [mapForm] = Form.useForm();
    const [configForm] = Form.useForm();

    const contentList = {
        map: (
            <MapSettings
                refCurr={props.refCurr}
                curSprite={props.curSprite}
                setSpriteBySettings={props.setSpriteBySettings}
                setDidClickSprite={props.setDidClickSprite}
                onSubmit={props.onSubmit}
                mapForm={mapForm}
            />
        ),
        config: (
            <ConfigSettings
                refCurr={props.refCurr}
                curSprite={props.curSprite}
                setSpriteBySettings={props.setSpriteBySettings}
                setDidClickSprite={props.setDidClickSprite}
                onSubmit={props.onSubmit}
                configForm={configForm}
            />
        ),
    };
    useEffect(() => {
    }, []);

    const handleCancel = () => {
        props.onCancel();
@@ -53,6 +37,31 @@
            configForm.submit();
        }
    }

    const finishSettings = (values, fn) => {
        fn();
    }

    const contentList = {
        map: (
            <MapSettings
                refCurr={props.refCurr}
                curSprite={props.curSprite}
                setSpriteBySettings={props.setSpriteBySettings}
                onSubmit={finishSettings}
                mapForm={mapForm}
            />
        ),
        config: (
            <ConfigSettings
                refCurr={props.refCurr}
                curSprite={props.curSprite}
                setSpriteBySettings={props.setSpriteBySettings}
                onSubmit={finishSettings}
                configForm={configForm}
            />
        ),
    };

    return (
        <>
@@ -68,7 +77,7 @@
                        <Button onClick={handleCancel}>
                            <FormattedMessage id='common.cancel' defaultMessage='取消' />
                        </Button>
                        <Button onClick={handleOk} type="primary">
                        <Button hidden={activeTabKey === 'map' || activeTabKey === 'config'} onClick={handleOk} type="primary">
                            <FormattedMessage id='common.submit' defaultMessage='保存' />
                        </Button>
                    </Space>
@@ -77,14 +86,18 @@
                <Card
                    hoverable
                    bordered={false}
                    type='inner'
                    tabList={[
                        {
                            key: 'map',
                            tab: intl.formatMessage({ id: 'map.settings.map.param', defaultMessage: '地图参数' })
                            tab: intl.formatMessage({ id: 'map.settings.map.param', defaultMessage: '地图参数' }),
                            icon: <BorderOuterOutlined />

                        },
                        {
                            key: 'config',
                            tab: intl.formatMessage({ id: 'map.settings.config.param', defaultMessage: '系统参数' })
                            tab: intl.formatMessage({ id: 'map.settings.config.param', defaultMessage: '系统参数' }),
                            icon: <BranchesOutlined />
                        },
                    ]}
                    activeTabKey={activeTabKey}