From 1cd63e45d43f29e1aa5c72a0e0cade384642613c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 15 三月 2024 14:17:20 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/drawer/index.jsx | 26 ++++++++++++++++++++++++--
zy-asrs-flow/src/pages/map/index.jsx | 15 +++++++++++++--
2 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/drawer/index.jsx b/zy-asrs-flow/src/pages/map/drawer/index.jsx
index 1394379..66c9a25 100644
--- a/zy-asrs-flow/src/pages/map/drawer/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/index.jsx
@@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Drawer } from 'antd';
+import { Drawer, Space, Button } from 'antd';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import { createStyles } from 'antd-style';
import * as Utils from '../utils'
@@ -13,10 +13,32 @@
const intl = useIntl();
const { styles } = useStyles();
+ const handleCancel = () => {
+ props.onCancel();
+ };
+
+ const handleOk = () => {
+ }
+
return (
<>
<Drawer
-
+ open={props.open}
+ onClose={handleCancel}
+ getContainer={props.refCurr}
+ rootStyle={{ position: "absolute" }}
+ mask={false}
+ width={600}
+ extra={
+ <Space>
+ <Button onClick={handleCancel}>
+ <FormattedMessage id='common.cancel' defaultMessage='鍙栨秷' />
+ </Button>
+ <Button onClick={handleOk} type="primary">
+ <FormattedMessage id='common.submit' defaultMessage='淇濆瓨' />
+ </Button>
+ </Space>
+ }
/>
</>
)
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 2ca4ec5..9eadc47 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -66,7 +66,6 @@
const mapRef = React.useRef();
const contentRef = React.useRef();
- const [curSprite, setCurSPrite] = React.useState(null);
const [model, setModel] = React.useState(() => MapModel.OBSERVER_MODEL);
const [deviceVisible, setDeviceVisible] = React.useState(false);
const [settingsVisible, setSettingsVisible] = React.useState(false);
@@ -79,6 +78,8 @@
const [didClickSprite, setDidClickSprite] = React.useState(false);
const [spriteBySettings, setSpriteBySettings] = React.useState(null);
const prevSpriteBySettingsRef = React.useRef();
+ const [curSprite, setCurSPrite] = React.useState(null);
+ const [drawerVisible, setDrawerVisible] = React.useState(false);
// init func
React.useEffect(() => {
@@ -209,7 +210,9 @@
}
React.useEffect(() => {
- console.log(curSprite);
+ if (curSprite) {
+ setDrawerVisible(true)
+ }
}, [curSprite]);
return (
@@ -305,6 +308,14 @@
</Content>
</Layout >
+ <MapDrawer
+ open={drawerVisible}
+ refCurr={mapRef.current}
+ onCancel={() => {
+ setDrawerVisible(false);
+ }}
+ />
+
<Edit
open={deviceVisible}
onCancel={() => {
--
Gitblit v1.9.1