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/settings.jsx | 63 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/settings.jsx b/zy-asrs-flow/src/pages/map/components/settings.jsx
index 377aaaf..0362981 100644
--- a/zy-asrs-flow/src/pages/map/components/settings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/settings.jsx
@@ -1,6 +1,10 @@
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';
@@ -18,28 +22,8 @@
const [mapForm] = Form.useForm();
const [configForm] = Form.useForm();
- const contentList = {
- map: (
- <MapSettings
- refCurr={props.refCurr}
- curSprite={props.curSprite}
- setSpriteBySettings={props.setSpriteBySettings}
- setDidClickSprite={props.setDidClickSprite}
- onSubmit={props.onSubmit}
- mapForm={mapForm}
- />
- ),
- config: (
- <ConfigSettings
- refCurr={props.refCurr}
- curSprite={props.curSprite}
- setSpriteBySettings={props.setSpriteBySettings}
- setDidClickSprite={props.setDidClickSprite}
- onSubmit={props.onSubmit}
- configForm={configForm}
- />
- ),
- };
+ useEffect(() => {
+ }, []);
const handleCancel = () => {
props.onCancel();
@@ -53,6 +37,31 @@
configForm.submit();
}
}
+
+ const finishSettings = (values, fn) => {
+ fn();
+ }
+
+ const contentList = {
+ map: (
+ <MapSettings
+ refCurr={props.refCurr}
+ curSprite={props.curSprite}
+ setSpriteBySettings={props.setSpriteBySettings}
+ onSubmit={finishSettings}
+ mapForm={mapForm}
+ />
+ ),
+ config: (
+ <ConfigSettings
+ refCurr={props.refCurr}
+ curSprite={props.curSprite}
+ setSpriteBySettings={props.setSpriteBySettings}
+ onSubmit={finishSettings}
+ configForm={configForm}
+ />
+ ),
+ };
return (
<>
@@ -68,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>
@@ -77,14 +86,18 @@
<Card
hoverable
bordered={false}
+ type='inner'
tabList={[
{
key: 'map',
- tab: intl.formatMessage({ id: 'map.settings.map.param', defaultMessage: '鍦板浘鍙傛暟' })
+ tab: intl.formatMessage({ id: 'map.settings.map.param', defaultMessage: '鍦板浘鍙傛暟' }),
+ icon: <BorderOuterOutlined />
+
},
{
key: 'config',
- tab: intl.formatMessage({ id: 'map.settings.config.param', defaultMessage: '绯荤粺鍙傛暟' })
+ tab: intl.formatMessage({ id: 'map.settings.config.param', defaultMessage: '绯荤粺鍙傛暟' }),
+ icon: <BranchesOutlined />
},
]}
activeTabKey={activeTabKey}
--
Gitblit v1.9.1