From 0d04bc5d8080b82338302fba0a59fccff2eaedfc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 06 七月 2025 11:28:29 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/components/mapSettings.jsx | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 100 insertions(+), 12 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx b/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
index ff3a782..f196974 100644
--- a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
+++ b/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({
@@ -117,6 +131,25 @@
copiedSprite.data.bay = curSprite.data.bay + i + 1;
}
}
+ // reference value
+ if (copiedSprite.data.refx && copiedSprite.data.refy) {
+ switch (values.copyDire) {
+ case 'left':
+ copiedSprite.data.refx -= curSprite.data.left * (i + 1);
+ break;
+ case 'right':
+ copiedSprite.data.refx += curSprite.data.right * (i + 1);
+ break;
+ case 'top':
+ copiedSprite.data.refy -= curSprite.data.top * (i + 1);
+ break;
+ case 'bottom':
+ copiedSprite.data.refy += curSprite.data.bottom * (i + 1);
+ break;
+ default:
+ break;
+ }
+ }
if (copiedSprite.data.row && copiedSprite.data.bay) {
copiedSprite.data.no = Utils.pureNumStr(copiedSprite.data.row) + '-' + Utils.pureNumStr(copiedSprite.data.bay);
}
@@ -138,6 +171,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 +309,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 +333,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}
--
Gitblit v1.9.1