From ff7b069ad9762867a99b30d6585510b2543cd6f7 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 19 四月 2024 10:29:16 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/index.jsx | 203 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 170 insertions(+), 33 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 0a16c21..0d84c56 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -1,13 +1,14 @@
import * as React from 'react'
import * as PIXI from 'pixi.js';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
-import { Layout, Button, Flex, Row, Col, FloatButton, Select } from 'antd';
+import { Layout, Button, Flex, Row, Col, FloatButton, Select, Spin, AutoComplete } from 'antd';
const { Header, Content } = Layout;
import {
AppstoreAddOutlined,
FileAddOutlined,
CompressOutlined,
SettingOutlined,
+ CloseOutlined
} from '@ant-design/icons';
import './index.css'
import { createStyles } from 'antd-style';
@@ -15,6 +16,8 @@
import Settings from './components/settings'
import * as Utils from './utils'
import Player from './player';
+import MapSearch from './header/search';
+import MapDrawer from './drawer';
const useStyles = createStyles(({ token }) => {
let dark = token.colorBgBase === '#000';
@@ -41,6 +44,9 @@
select: {
color: 'red',
fontWeight: 'bold',
+ },
+ headerCol: {
+ paddingLeft: '50px'
}
};
});
@@ -60,7 +66,7 @@
const mapRef = React.useRef();
const contentRef = React.useRef();
- const [model, setModel] = React.useState(() => MapModel.OBSERVER_MODEL);
+ const [model, setModel] = React.useState(null);
const [deviceVisible, setDeviceVisible] = React.useState(false);
const [settingsVisible, setSettingsVisible] = React.useState(false);
const [windowSize, setWindowSize] = React.useState({
@@ -71,22 +77,36 @@
const [mapContainer, setMapContainer] = React.useState(null);
const [didClickSprite, setDidClickSprite] = React.useState(false);
const [spriteBySettings, setSpriteBySettings] = React.useState(null);
+ const prevSpriteBySettingsRef = React.useRef();
+ const [drawerVisible, setDrawerVisible] = React.useState(false);
+ const [dataFetched, setDataFetched] = React.useState(false);
+ const [curSprite, setCurSPrite] = React.useState(null);
+ const prevCurSpriteRef = React.useRef();
// init func
React.useEffect(() => {
- player = new Player(mapRef.current, styles.dark, didClickSprite);
- setApp(player.app);
- setMapContainer(player.mapContainer);
- Utils.syncApp(player.app);
- Utils.syncMapContainer(player.mapContainer);
+ const initialize = async () => {
+ player = new Player(mapRef.current, styles.dark, didClickSprite);
+ setApp(player.app);
+ setMapContainer(player.mapContainer);
+ Utils.syncApp(player.app);
+ Utils.syncMapContainer(player.mapContainer);
- const handleResize = () => {
- setWindowSize({
- width: window.innerWidth,
- height: window.innerHeight,
- });
- };
- window.addEventListener('resize', handleResize);
+ const handleResize = () => {
+ setWindowSize({
+ width: window.innerWidth,
+ height: window.innerHeight,
+ });
+ };
+ window.addEventListener('resize', handleResize);
+ await Utils.fetchMapData(intl);
+ setDataFetched(true);
+ setModel(MapModel.OBSERVER_MODEL)
+ setTimeout(() => {
+ player.adaptScreen();
+ }, 200)
+ }
+ initialize();
}, []);
// resize
@@ -97,11 +117,14 @@
const width = contentRef.current.offsetWidth;
const height = contentRef.current.offsetHeight;
app.renderer.resize(width, height);
+ if (model !== MapModel.OBSERVER_MODEL) {
+ player.showGridlines();
+ }
}, [app, mapContainer, windowSize])
// model
React.useEffect(() => {
- if (!mapContainer) {
+ if (!mapContainer && !dataFetched) {
return;
}
switch (model) {
@@ -113,14 +136,12 @@
player.activateMapEvent(null);
Utils.removeSelectedEffect();
+ setCurSPrite(null);
setDeviceVisible(false);
setSettingsVisible(false);
mapContainer.children.forEach(child => {
- child.off('pointerup');
- child.off('pointermove');
- child.off('pointerdown');
- child.off('click');
+ Utils.viewFeature(child, setCurSPrite);
})
break
case MapModel.MOVABLE_MODEL:
@@ -131,7 +152,9 @@
player.activateMapEvent(Utils.MapEvent.SELECTION_BOX);
Utils.removeSelectedEffect();
+ setSpriteBySettings(null);
setSettingsVisible(false);
+ setDrawerVisible(false);
mapContainer.children.forEach(child => {
Utils.beMovable(child, setDidClickSprite);
@@ -145,6 +168,7 @@
player.activateMapEvent(null);
setDeviceVisible(false);
+ setDrawerVisible(false);
mapContainer.children.forEach(child => {
Utils.beSettings(child, setSpriteBySettings, setDidClickSprite);
@@ -156,24 +180,49 @@
}, [model]);
// Add New Device
- const onDrop = (sprite, x, y) => {
+ const onDrop = (sprite, type, x, y) => {
const { mapX, mapY } = Utils.getRealPosition(x, y, mapContainer);
sprite.x = mapX;
sprite.y = mapY;
- Utils.initSprite(sprite);
+ Utils.initSprite(sprite, type);
mapContainer.addChild(sprite);
Utils.beMovable(sprite, setDidClickSprite);
};
+
+ // watch curSprite
+ React.useEffect(() => {
+ if (!mapContainer) {
+ return;
+ }
+ prevCurSpriteRef.current = curSprite;
+ if (curSprite && prevCurSprite !== curSprite) {
+ Utils.removeSelectedEffect();
+ }
+ if (curSprite) {
+ if (model === MapModel.OBSERVER_MODEL) {
+ Utils.showSelectedEffect(curSprite)
+ setDrawerVisible(true)
+ }
+ } else {
+ Utils.removeSelectedEffect();
+ }
+ }, [curSprite]);
+ const prevCurSprite = prevCurSpriteRef.current;
// didClickSprite, stop triggers both sprite click and play's selection boxs
React.useEffect(() => {
player.updateDidClickSprite(didClickSprite);
}, [didClickSprite])
+ // watch spriteBySettings
React.useEffect(() => {
if (!mapContainer) {
return;
+ }
+ prevSpriteBySettingsRef.current = spriteBySettings;
+ if (spriteBySettings && prevSpriteBySettings !== spriteBySettings) {
+ Utils.removeSelectedEffect();
}
if (spriteBySettings) {
Utils.showSelectedEffect(spriteBySettings)
@@ -182,9 +231,12 @@
Utils.removeSelectedEffect();
}
}, [spriteBySettings])
+ const prevSpriteBySettings = prevSpriteBySettingsRef.current;
- const settingsFinish = () => {
- setSpriteBySettings(null);
+ const settingsFinish = (values, fn) => {
+ fn();
+ // setSettingsVisible(false);
+ // setSpriteBySettings(null);
}
return (
@@ -192,11 +244,76 @@
<Layout className={styles.layout}>
<Header className={styles.header}>
<Row style={{ height: '100%' }}>
- <Col span={8} style={{ backgroundColor: '#3C40C6' }}></Col>
- <Col span={16} style={{ backgroundColor: '#3C40C6' }}>
+ <Col className={styles.headerCol} span={12} style={{}}>
+ {dataFetched && (
+ <MapSearch
+ model={model}
+ setModel={setModel}
+ ModelEnum={MapModel}
+ curSprite={curSprite}
+ setCurSPrite={setCurSPrite}
+ setSpriteBySettings={setSpriteBySettings}
+ />
+ )}
+ </Col>
+ <Col span={12} style={{ backgroundColor: styles.dark ? '#2C3A47' : '#4a69bd' }}>
<Flex className={styles.flex} gap={'large'} justify={'flex-end'} align={'center'}>
+
+ {model === MapModel.OBSERVER_MODEL && (
+ <>
+ <Button
+ className='map-header-button'
+ size={'large'}
+ onClick={async () => {
+ await Utils.fetchMapData(intl);
+
+ player.hideGridlines();
+ player.hideStarryBackground();
+
+ player.activateMapEvent(null);
+
+ Utils.removeSelectedEffect();
+ setCurSPrite(null);
+ setDeviceVisible(false);
+ setSettingsVisible(false);
+ setDrawerVisible(false);
+
+ mapContainer.children.forEach(child => {
+ Utils.viewFeature(child, setCurSPrite);
+ })
+
+ }}
+ >
+ <FormattedMessage id='map.load' defaultMessage='鍔犺浇鍦板浘' />
+ </Button>
+ </>
+ )}
+
+ {model !== MapModel.OBSERVER_MODEL && (
+ <>
+ <Button
+ className='map-header-button'
+ size={'large'}
+ onClick={() => {
+ Utils.clearMapData(intl);
+ }}
+ >
+ <FormattedMessage id='map.clear' defaultMessage='娓呴櫎鍦板浘' />
+ </Button>
+ <Button
+ className='map-header-button'
+ size={'large'}
+ onClick={() => {
+ Utils.saveMapData(intl);
+ }}
+ >
+ <FormattedMessage id='map.save' defaultMessage='淇濆瓨鍦板浘' />
+ </Button>
+ </>
+ )}
+
<Select
- className={styles.select}
+ className='map-header-select'
size={'large'}
defaultValue={MapModel.OBSERVER_MODEL}
style={{
@@ -229,25 +346,32 @@
>
<FloatButton
icon={<CompressOutlined />}
+ onClick={() => {
+ player.adaptScreen();
+ }}
/>
- <FloatButton.BackTop visibilityHeight={0} />
</FloatButton.Group>
<FloatButton.Group
hidden={model === MapModel.OBSERVER_MODEL}
- // trigger="hover"
style={{
- right: 35,
- bottom: 35
+ left: 35,
+ bottom: window.innerHeight / 2
}}
icon={<AppstoreAddOutlined />}
>
<FloatButton
hidden={model === MapModel.OBSERVER_MODEL}
+ type={deviceVisible ? 'primary' : 'default'}
tooltip={<div><FormattedMessage id='map.device.add' defaultMessage='娣诲姞璁惧' /></div>}
icon={<FileAddOutlined />}
onClick={() => {
- setDeviceVisible(true);
+ if (deviceVisible) {
+ setDeviceVisible(false);
+ } else {
+ setDeviceVisible(true);
+ setModel(MapModel.MOVABLE_MODEL);
+ }
}}
/>
<FloatButton
@@ -262,7 +386,17 @@
</FloatButton.Group>
</div>
</Content>
- </Layout>
+ </Layout >
+
+ <MapDrawer
+ open={drawerVisible}
+ curSprite={curSprite}
+ refCurr={mapRef.current}
+ onCancel={() => {
+ setCurSPrite(null);
+ setDrawerVisible(false);
+ }}
+ />
<Edit
open={deviceVisible}
@@ -275,12 +409,15 @@
<Settings
open={settingsVisible}
+ curSprite={spriteBySettings}
onCancel={() => {
setSettingsVisible(false);
setSpriteBySettings(null);
}}
+ setSpriteBySettings={setSpriteBySettings}
+ setDidClickSprite={setDidClickSprite}
refCurr={mapRef.current}
- onDrop={settingsFinish}
+ onSubmit={settingsFinish}
/>
</>
)
--
Gitblit v1.9.1