#

Junjie

2024-04-23 2d07710d47f88a1d76e12cda1144cb2f288bf5ae

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

@@ -28,8 +28,10 @@
            form.setFieldsValue({
                x: curSprite.position.x,
                y: curSprite.position.y,
                scale: Math.max(curSprite.scale.x, curSprite.scale.y),
                scaleSlider: Math.max(curSprite.scale.x, curSprite.scale.y),
                scaleX: curSprite.scale.x,
                scaleSliderX: curSprite.scale.x,
                scaleY: curSprite.scale.y,
                scaleSliderY: curSprite.scale.y,
                rotation: curSprite.rotation * 180 / Math.PI,
                rotationSlider: curSprite.rotation * 180 / Math.PI,

@@ -55,17 +57,29 @@
                        case 'y':
                            curSprite.position.y = value;
                            break;
                        case 'scaleSlider':
                        case 'scaleSliderX':
                            form.setFieldsValue({
                                scale: value
                                scaleX: value
                            })
                            curSprite.scale.set(value);
                            curSprite.scale.x = value;
                            break;
                        case 'scale':
                        case 'scaleX':
                            form.setFieldsValue({
                                scaleSlider: value
                                scaleSliderX: value
                            })
                            curSprite.scale.set(value);
                            curSprite.scale.x = value;
                            break;
                        case 'scaleSliderY':
                            form.setFieldsValue({
                                scaleY: value
                            })
                            curSprite.scale.y = value;
                            break;
                        case 'scaleY':
                            form.setFieldsValue({
                                scaleSliderY: value
                            })
                            curSprite.scale.y = value;
                            break;
                        case 'rotationSlider':
                            form.setFieldsValue({
@@ -138,6 +152,24 @@
                        }
                        if (copiedSprite.data.vertical && copiedSprite.data.horizontal) {
                            copiedSprite.data.no = Utils.pureNumStr(copiedSprite.data.vertical) + '-' + Utils.pureNumStr(copiedSprite.data.horizontal);
                        }
                        break;
                    case Utils.SENSOR_TYPE.CONVEYOR:
                        if (values.incrementValue === 'no') {
                            if (values.incrementMode === 'descending') {
                                copiedSprite.data.no = Number(curSprite.data.no) - i - 1;
                            } else {
                                copiedSprite.data.no = Number(curSprite.data.no) + i + 1;
                            }
                        }
                        break;
                    case Utils.SENSOR_TYPE.SHUTTLE:
                        if (values.incrementValue === 'no') {
                            if (values.incrementMode === 'descending') {
                                copiedSprite.data.no = Number(curSprite.data.no) - i - 1;
                            } else {
                                copiedSprite.data.no = Number(curSprite.data.no) + i + 1;
                            }
                        }
                        break;
                    case Utils.SENSOR_TYPE.AGV:
@@ -258,11 +290,11 @@
                        </Form.Item>
                    </Col>

                    {/* scale */}
                    {/* scale x */}
                    <Col span={18}>
                        <Form.Item
                            name="scaleSlider"
                            label={intl.formatMessage({ id: 'map.settings.scale', defaultMessage: '缩放' })}
                            name="scaleSliderX"
                            label={intl.formatMessage({ id: 'map.settings.scale.x', defaultMessage: '缩放-x' })}
                            labelCol={{ span: 5 }}
                        >
                            <Slider
@@ -282,7 +314,44 @@
                    </Col>
                    <Col span={6}>
                        <Form.Item
                            name="scale"
                            name="scaleX"
                        >
                            <InputNumber
                                min={0.1} max={10} step={0.1}
                                rules={[
                                    {
                                        required: true,
                                    },
                                ]}
                            />
                        </Form.Item>
                    </Col>

                    {/* scale */}
                    <Col span={18}>
                        <Form.Item
                            name="scaleSliderY"
                            label={intl.formatMessage({ id: 'map.settings.scale.y', defaultMessage: '缩放-y' })}
                            labelCol={{ span: 5 }}
                        >
                            <Slider
                                min={0.1}
                                max={10}
                                step={0.1}
                                marks={{
                                    0.1: '0.1',
                                    1: '1',
                                    10: '10',
                                }}
                                style={{
                                    width: '100%'
                                }}
                            />
                        </Form.Item>
                    </Col>
                    <Col span={6}>
                        <Form.Item
                            name="scaleY"
                        >
                            <InputNumber
                                min={0.1} max={10} step={0.1}