From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/components/settings.jsx | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/settings.jsx b/zy-asrs-flow/src/pages/map/components/settings.jsx
index b344e80..0362981 100644
--- a/zy-asrs-flow/src/pages/map/components/settings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/settings.jsx
@@ -1,10 +1,15 @@
import React, { useState, useRef, useEffect } from 'react';
import { Col, Form, Input, Row, Checkbox, Slider, Select, Drawer, Space, Button, InputNumber, Card } from 'antd';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
+import {
+ BranchesOutlined,
+ BorderOuterOutlined,
+} from '@ant-design/icons';
import { createStyles } from 'antd-style';
import * as Utils from '../utils'
import Http from '@/utils/http';
import MapSettings from './mapSettings';
+import ConfigSettings from './configSettings';
const useStyles = createStyles(({ token, css }) => {
@@ -15,6 +20,27 @@
const { styles } = useStyles();
const [activeTabKey, setActiveTabKey] = useState('map');
const [mapForm] = Form.useForm();
+ const [configForm] = Form.useForm();
+
+ useEffect(() => {
+ }, []);
+
+ const handleCancel = () => {
+ props.onCancel();
+ };
+
+ const handleOk = () => {
+ if (activeTabKey === 'map') {
+ mapForm.submit();
+ }
+ if (activeTabKey === 'config') {
+ configForm.submit();
+ }
+ }
+
+ const finishSettings = (values, fn) => {
+ fn();
+ }
const contentList = {
map: (
@@ -22,23 +48,20 @@
refCurr={props.refCurr}
curSprite={props.curSprite}
setSpriteBySettings={props.setSpriteBySettings}
- setDidClickSprite={props.setDidClickSprite}
- onSubmit={props.onSubmit}
+ onSubmit={finishSettings}
mapForm={mapForm}
/>
),
config: (
- <h1>Hello</h1>
+ <ConfigSettings
+ refCurr={props.refCurr}
+ curSprite={props.curSprite}
+ setSpriteBySettings={props.setSpriteBySettings}
+ onSubmit={finishSettings}
+ configForm={configForm}
+ />
),
};
-
- const handleCancel = () => {
- props.onCancel();
- };
-
- const handleOk = () => {
- mapForm.submit();
- }
return (
<>
@@ -54,7 +77,7 @@
<Button onClick={handleCancel}>
<FormattedMessage id='common.cancel' defaultMessage='鍙栨秷' />
</Button>
- <Button onClick={handleOk} type="primary">
+ <Button hidden={activeTabKey === 'map' || activeTabKey === 'config'} onClick={handleOk} type="primary">
<FormattedMessage id='common.submit' defaultMessage='淇濆瓨' />
</Button>
</Space>
@@ -63,14 +86,18 @@
<Card
hoverable
bordered={false}
+ type='inner'
tabList={[
{
key: 'map',
- tab: '鍦板浘鍙傛暟',
+ tab: intl.formatMessage({ id: 'map.settings.map.param', defaultMessage: '鍦板浘鍙傛暟' }),
+ icon: <BorderOuterOutlined />
+
},
{
key: 'config',
- tab: '閰嶇疆鍙傛暟',
+ tab: intl.formatMessage({ id: 'map.settings.config.param', defaultMessage: '绯荤粺鍙傛暟' }),
+ icon: <BranchesOutlined />
},
]}
activeTabKey={activeTabKey}
--
Gitblit v1.9.1