#

luxiaotao1123

2024-03-12 f4fe7837784c84068a0b43fc9256cacaf6106536

#

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

@@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect } from 'react';
import { Col, Form, Input, Row, Checkbox, Slider, Select, Drawer, Space, Button, InputNumber, Switch } from 'antd';
import { Col, Form, Input, Row, Checkbox, Slider, Select, Drawer, Space, Button, InputNumber, Card } from 'antd';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import { createStyles } from 'antd-style';
import './index.css';
@@ -13,6 +13,86 @@
const useStyles = createStyles(({ token, css }) => {

})

const Settings = (props) => {
    const intl = useIntl();
    const { styles } = useStyles();
    const [activeTabKey, setActiveTabKey] = useState('map');

    const contentList = {
        map: (
            <SpriteSettings
                refCurr={props.refCurr}
                curSprite={props.curSprite}
                setSpriteBySettings={props.setSpriteBySettings}
                setDidClickSprite={props.setDidClickSprite}
                onSubmit={props.onSubmit}
            />
        ),
        config: (
            <h1>Hello</h1>
        ),
    };

    const handleCancel = () => {
        props.onCancel();
    };

    const handleOk = () => {
    }

    return (
        <>
            <Drawer
                open={props.open}
                onClose={handleCancel}
                getContainer={props.refCurr}
                rootStyle={{ position: "absolute" }}
                mask={false}
                width={570}
                extra={
                    <Space>
                        <Button onClick={handleCancel}>
                            <FormattedMessage id='common.cancel' defaultMessage='取消' />
                        </Button>
                        <Button onClick={handleOk} type="primary">
                            <FormattedMessage id='common.submit' defaultMessage='保存' />
                        </Button>
                    </Space>
                }
            >
                <Card
                    hoverable
                    bordered={false}
                    tabList={[
                        {
                            key: 'map',
                            tab: '地图参数',
                        },
                        {
                            key: 'config',
                            tab: '配置参数',
                        },
                    ]}
                    activeTabKey={activeTabKey}
                    onTabChange={(key) => {
                        setActiveTabKey(key)
                    }}
                    tabProps={{
                        centered: true,
                        size: 'large',
                        type: "card",
                        style: {
                        }
                    }}
                >
                    {contentList[activeTabKey]}
                </Card>

            </Drawer >
        </>
    )
}

const SpriteSettings = (props) => {
    const intl = useIntl();
@@ -44,10 +124,6 @@
        }
    }, [form, props])

    const handleCancel = () => {
        props.onCancel();
    };

    const handleOk = () => {
        form.submit();
    }
@@ -66,7 +142,7 @@
                            curSprite.position.x = value;
                            break;
                        case 'y':
                            curSprite.position.x = value;
                            curSprite.position.y = value;
                            break;
                        case 'scaleSlider':
                            form.setFieldsValue({
@@ -138,24 +214,6 @@

    return (
        <>
            <Drawer
                open={props.open}
                onClose={handleCancel}
                getContainer={props.refCurr}
                rootStyle={{ position: "absolute" }}
                mask={false}
                width={570}
                extra={
                    <Space>
                        <Button onClick={handleCancel}>
                            <FormattedMessage id='common.cancel' defaultMessage='取消' />
                        </Button>
                        <Button onClick={handleOk} type="primary">
                            <FormattedMessage id='common.submit' defaultMessage='保存' />
                        </Button>
                    </Space>
                }
            >
                <Form
                    form={form}
                    onFieldsChange={formValuesChange}
@@ -430,9 +488,8 @@

                    </Row>
                </Form>
            </Drawer >
        </>
    )
}

export default SpriteSettings;
export default Settings;

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

@@ -163,7 +163,6 @@

    // Add New Device
    const onDrop = (sprite, type, x, y) => {
        console.log(sprite);
        const { mapX, mapY } = Utils.getRealPosition(x, y, mapContainer);
        sprite.x = mapX;
        sprite.y = mapY;