From 73f923ea4ececa98dcbf091903ddbe91efe0a8c0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 29 五月 2024 16:21:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs
---
zy-asrs-flow/src/pages/map/components/mapSettings.jsx | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx b/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
index d38b787..e01c7f2 100644
--- a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
@@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Col, Form, Input, Row, Checkbox, Slider, Select, Drawer, Space, Button, InputNumber, Card } from 'antd';
+import { Col, Form, Input, Row, message, Slider, Select, Drawer, Space, Button, InputNumber, Card } from 'antd';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import { createStyles } from 'antd-style';
import * as Utils from '../utils'
@@ -99,6 +99,42 @@
setLastCopiedSprites([]);
for (let i = 0; i < values.copyCount; i++) {
const copiedSprite = Utils.copySprite(curSprite);
+ // auto-increment-value
+ if (values.autoIncrement && values.type) {
+ switch (values.type) {
+ case Utils.SENSOR_TYPE.SHELF:
+ if (values.incrementValue === 'row') {
+ if (values.incrementMode === 'descending') {
+ copiedSprite.data.row = curSprite.data.row - i - 1;
+ } else {
+ copiedSprite.data.row = curSprite.data.row + i + 1;
+ }
+ }
+ if (values.incrementValue === 'bay') {
+ if (values.incrementMode === 'descending') {
+ copiedSprite.data.bay = curSprite.data.bay - i - 1;
+ } else {
+ copiedSprite.data.bay = curSprite.data.bay + i + 1;
+ }
+ }
+ if (copiedSprite.data.row && copiedSprite.data.bay) {
+ copiedSprite.data.no = Utils.pureNumStr(copiedSprite.data.row) + '-' + Utils.pureNumStr(copiedSprite.data.bay);
+ }
+ break;
+ case Utils.SENSOR_TYPE.AGV:
+ 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;
+ default:
+ break;
+ }
+ }
+ // graph copy
switch (values.copyDire) {
case 'left':
copiedSprite.position.x -= (i + 1) * (values.copyGap + copiedSprite.width);
@@ -128,8 +164,6 @@
<Form
form={form}
onFieldsChange={formValuesChange}
- initialValues={{
- }}
onFinish={handleFinish}
onFinishFailed={onFinishFailed}
autoComplete="off"
@@ -146,6 +180,10 @@
}}
wrapperCol={{
span: 20,
+ }}
+ initialValues={{
+ scale: 1,
+ rotation: 1
}}
>
<Row gutter={[24, 16]}>
@@ -228,8 +266,7 @@
name="scale"
>
<InputNumber
- changeOnWheel
- min={0.1} max={10} defaultValue={1} step={0.1}
+ min={0.1} max={10} step={0.1}
rules={[
{
required: true,
@@ -268,8 +305,7 @@
name="rotation"
>
<InputNumber
- changeOnWheel
- min={0} max={360} defaultValue={0}
+ min={0} max={360}
rules={[
{
required: true,
@@ -339,7 +375,7 @@
</Form.Item>
<Form.Item>
<Button
- type="dashed"
+ type="link"
onClick={() => {
if (lastCopiedSprites) {
lastCopiedSprites.forEach(copiedSprite => {
--
Gitblit v1.9.1