From 487f4e8f7eaf1a2de60512198870c0a0ff25593e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 三月 2024 14:34:53 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/locales/en-US/map.ts | 2
zy-asrs-flow/src/pages/map/components/configSettings.jsx | 3
zy-asrs-flow/src/pages/map/components/mapSettings.jsx | 188 ++++++++++++++++++++++-------------------------
3 files changed, 91 insertions(+), 102 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US/map.ts b/zy-asrs-flow/src/locales/en-US/map.ts
index edb9dd7..b14533a 100644
--- a/zy-asrs-flow/src/locales/en-US/map.ts
+++ b/zy-asrs-flow/src/locales/en-US/map.ts
@@ -39,7 +39,7 @@
'': '',
'': '',
'': '',
- 'map.settings.sub.copy.undo.last.copies': 'Undo Last Copies',
+ 'map.settings.sub.copy.reverse': 'Reverse',
'map.settings.sub.copy.rule': 'Copy Rule',
'map.settings.sub.copy.dire': 'Direction',
'map.settings.sub.copy.count': 'Count',
diff --git a/zy-asrs-flow/src/pages/map/components/configSettings.jsx b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
index 453d0a0..7a6a67a 100644
--- a/zy-asrs-flow/src/pages/map/components/configSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
@@ -89,7 +89,8 @@
span: 20,
}}
>
-
+ <br />
+
<Form.Item
label={intl.formatMessage({ id: 'map.settings.type', defaultMessage: '绫诲瀷' })}
>
diff --git a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx b/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
index c260a46..d38b787 100644
--- a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
@@ -149,6 +149,7 @@
}}
>
<Row gutter={[24, 16]}>
+ <Col span={24} />
<Col span={24}>
<Form.Item
@@ -281,112 +282,99 @@
{/* copy */}
<Col span={24}>
<Row gutter={0}>
- <Col span={20}>
- <Form.Item
- label={intl.formatMessage({ id: 'map.settings.copy', defaultMessage: '澶嶅埗' })}
- labelCol={{ span: 4 }}
- >
- <Space.Compact>
- <Form.Item
- noStyle
- name="copyDire"
- >
- <Select
- style={{ width: 100 }}
- options={[
- { value: 'left', label: intl.formatMessage({ id: 'map.settings.left', defaultMessage: '宸�' }) },
- { value: 'right', label: intl.formatMessage({ id: 'map.settings.right', defaultMessage: '鍙�' }) },
- { value: 'top', label: intl.formatMessage({ id: 'map.settings.top', defaultMessage: '涓�' }) },
- { value: 'bottom', label: intl.formatMessage({ id: 'map.settings.bottom', defaultMessage: '涓�' }) },
- ]}
- />
- </Form.Item>
- <Form.Item
- name='copyCount'
- noStyle
- rules={[
- {
- required: true,
- },
- ]}
- >
- <InputNumber
- addonBefore={<Space.Compact></Space.Compact>}
- style={{
- width: '50%',
- }}
- min={1}
- step={1}
- />
- </Form.Item>
- <Form.Item>
- <Button
- onClick={() => {
- setChildrenDrawer(true);
- }}
- >
- <FormattedMessage id='common.execute' defaultMessage='鎵ц' />
- </Button>
- <MapCopySettings
- open={childrenDrawer}
- refCurr={props.refCurr}
- curSprite={props.curSprite}
- values={form.getFieldsValue()}
- submit={handleOnCopy}
- onClose={() => {
- setChildrenDrawer(false)
- }}
- />
- </Form.Item>
-
- </Space.Compact>
- </Form.Item>
- </Col>
- </Row>
- <Row gutter={0}>
- <Col offset={16} span={8}>
- <Form.Item>
- <Button
- type="dashed"
- onClick={() => {
- if (lastCopiedSprites) {
- lastCopiedSprites.forEach(copiedSprite => {
- Utils.getMapContainer().removeChild(copiedSprite);
- })
- setLastCopiedSprites([]);
- }
- }}
+ <Form.Item
+ label={intl.formatMessage({ id: 'map.settings.copy', defaultMessage: '澶嶅埗' })}
+ >
+ <Space.Compact>
+ <Form.Item
+ noStyle
+ name="copyDire"
>
- <FormattedMessage id='map.settings.sub.copy.undo.last.copies' defaultMessage='鎾ゅ洖澶嶅埗' />
- </Button>
- </Form.Item>
- </Col>
+ <Select
+ style={{ width: 100 }}
+ options={[
+ { value: 'left', label: intl.formatMessage({ id: 'map.settings.left', defaultMessage: '宸�' }) },
+ { value: 'right', label: intl.formatMessage({ id: 'map.settings.right', defaultMessage: '鍙�' }) },
+ { value: 'top', label: intl.formatMessage({ id: 'map.settings.top', defaultMessage: '涓�' }) },
+ { value: 'bottom', label: intl.formatMessage({ id: 'map.settings.bottom', defaultMessage: '涓�' }) },
+ ]}
+ />
+ </Form.Item>
+ <Form.Item
+ name='copyCount'
+ noStyle
+ rules={[
+ {
+ required: true,
+ },
+ ]}
+ >
+ <InputNumber
+ addonBefore={<Space.Compact></Space.Compact>}
+ style={{
+ width: '50%',
+ }}
+ min={1}
+ step={1}
+ />
+ </Form.Item>
+ <Form.Item>
+ <Button
+ onClick={() => {
+ setChildrenDrawer(true);
+ }}
+ >
+ <FormattedMessage id='common.execute' defaultMessage='鎵ц' />
+ </Button>
+ <MapCopySettings
+ open={childrenDrawer}
+ refCurr={props.refCurr}
+ curSprite={props.curSprite}
+ values={form.getFieldsValue()}
+ submit={handleOnCopy}
+ onClose={() => {
+ setChildrenDrawer(false)
+ }}
+ />
+ </Form.Item>
+ <Form.Item>
+ <Button
+ type="dashed"
+ onClick={() => {
+ if (lastCopiedSprites) {
+ lastCopiedSprites.forEach(copiedSprite => {
+ Utils.getMapContainer().removeChild(copiedSprite);
+ })
+ setLastCopiedSprites([]);
+ }
+ }}
+ >
+ <FormattedMessage id='map.settings.sub.copy.reverse' defaultMessage='鎾ら攢' />
+ </Button>
+ </Form.Item>
+ </Space.Compact>
+ </Form.Item>
</Row>
</Col>
{/* more */}
<Col span={24}>
- <Row gutter={24}>
- <Col span={18}>
- <Form.Item
- label={intl.formatMessage({ id: 'map.settings.more', defaultMessage: '鏇村' })}
- labelCol={{ span: 4 }}
- >
- <Button
- type="dashed"
- danger
- onClick={() => {
- Utils.getMapContainer().removeChild(curSprite);
- props.setSpriteBySettings(null);
- Utils.removeSelectedEffect();
- form.resetFields();
- }}
- >
- <FormattedMessage id='map.settings.delete' defaultMessage='鍒犻櫎' />
- </Button>
- </Form.Item>
- </Col>
- </Row>
+ <Form.Item
+ label={intl.formatMessage({ id: 'map.settings.more', defaultMessage: '鏇村' })}
+ >
+ <Button
+ type="dashed"
+ danger
+ onClick={() => {
+ Utils.getMapContainer().removeChild(curSprite);
+ props.setSpriteBySettings(null);
+ Utils.removeSelectedEffect();
+ form.resetFields();
+ }}
+ >
+ <FormattedMessage id='map.settings.delete' defaultMessage='鍒犻櫎' />
+ </Button>
+ </Form.Item>
</Col>
</Row>
--
Gitblit v1.9.1