From 77ac6b72ed82d51d0d45bf156ac1b5bb3cb15782 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 19 三月 2024 14:01:43 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/index.jsx | 273 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 222 insertions(+), 51 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index dc38816..9e56171 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -1,18 +1,21 @@
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 } from 'antd';
+import { Layout, Button, Flex, Row, Col, FloatButton, Select, Spin } from 'antd';
const { Header, Content } = Layout;
import {
AppstoreAddOutlined,
FileAddOutlined,
CompressOutlined,
+ SettingOutlined,
} from '@ant-design/icons';
import './index.css'
import { createStyles } from 'antd-style';
-import Edit from './components/device'
+import Edit from './components/device';
+import Settings from './components/settings'
import * as Utils from './utils'
import Player from './player';
+import MapDrawer from './drawer';
const useStyles = createStyles(({ token }) => {
let dark = token.colorBgBase === '#000';
@@ -36,28 +39,44 @@
backgroundColor: '#F8FAFB',
height: 'calc(100vh - 120px)'
},
+ select: {
+ color: 'red',
+ fontWeight: 'bold',
+ }
};
});
+
+export const MapModel = Object.freeze({
+ OBSERVER_MODEL: "1",
+ MOVABLE_MODEL: "2",
+ SETTINGS_MODEL: "3",
+})
let player;
const Map = () => {
+ const intl = useIntl();
const { initialState, setInitialState } = useModel('@@initialState');
const { styles } = useStyles();
const mapRef = React.useRef();
const contentRef = React.useRef();
+ const [model, setModel] = React.useState(() => MapModel.OBSERVER_MODEL);
const [deviceVisible, setDeviceVisible] = React.useState(false);
+ const [settingsVisible, setSettingsVisible] = React.useState(false);
const [windowSize, setWindowSize] = React.useState({
width: window.innerWidth,
height: window.innerHeight,
});
const [app, setApp] = React.useState(null);
const [mapContainer, setMapContainer] = React.useState(null);
- const [mapEditModel, setMapEditModel] = React.useState(false);
+ const [didClickSprite, setDidClickSprite] = React.useState(false);
+ const [spriteBySettings, setSpriteBySettings] = React.useState(null);
+ const prevSpriteBySettingsRef = React.useRef();
+ // init func
React.useEffect(() => {
- player = new Player(mapRef.current, styles.dark);
+ player = new Player(mapRef.current, styles.dark, didClickSprite);
setApp(player.app);
setMapContainer(player.mapContainer);
Utils.syncApp(player.app);
@@ -72,6 +91,7 @@
window.addEventListener('resize', handleResize);
}, []);
+ // resize
React.useEffect(() => {
if (!app) {
return;
@@ -79,80 +99,218 @@
const width = contentRef.current.offsetWidth;
const height = contentRef.current.offsetHeight;
app.renderer.resize(width, height);
+ if (model !== MapModel.OBSERVER_MODEL) {
+ player.hideGridlines();
+ player.showGridlines();
+ }
}, [app, mapContainer, windowSize])
+ // model
React.useEffect(() => {
if (!mapContainer) {
return;
}
- if (mapEditModel) {
- player.showGridlines();
- } else {
- player.hideGridlines();
- }
- }, [mapEditModel]);
+ switch (model) {
+ case MapModel.OBSERVER_MODEL:
- const onDrop = (sprite, x, y) => {
+ player.hideGridlines();
+ player.hideStarryBackground();
+
+ player.activateMapEvent(null);
+
+ Utils.removeSelectedEffect();
+ setDeviceVisible(false);
+ setSettingsVisible(false);
+
+ mapContainer.children.forEach(child => {
+ child.off('pointerup');
+ child.off('pointermove');
+ child.off('pointerdown');
+ child.off('click');
+ })
+ break
+ case MapModel.MOVABLE_MODEL:
+
+ player.showGridlines();
+ player.hideStarryBackground();
+
+ player.activateMapEvent(Utils.MapEvent.SELECTION_BOX);
+
+ Utils.removeSelectedEffect();
+ setSpriteBySettings(null);
+ setSettingsVisible(false);
+
+ mapContainer.children.forEach(child => {
+ Utils.beMovable(child, setDidClickSprite);
+ })
+ break
+ case MapModel.SETTINGS_MODEL:
+
+ player.showGridlines();
+ player.showStarryBackground();
+
+ player.activateMapEvent(null);
+
+ setDeviceVisible(false);
+
+ mapContainer.children.forEach(child => {
+ Utils.beSettings(child, setSpriteBySettings, setDidClickSprite);
+ })
+ break
+ default:
+ break
+ }
+ }, [model]);
+
+ // Add New Device
+ 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);
+ Utils.beMovable(sprite, setDidClickSprite);
};
+
+ // 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)
+ setSettingsVisible(true);
+ } else {
+ Utils.removeSelectedEffect();
+ }
+ }, [spriteBySettings])
+ const prevSpriteBySettings = prevSpriteBySettingsRef.current;
+
+ const settingsFinish = () => {
+ setSettingsVisible(false);
+ setSpriteBySettings(null);
+ }
return (
<>
<Layout className={styles.layout}>
<Header className={styles.header}>
<Row style={{ height: '100%' }}>
- <Col span={8} style={{ backgroundColor: '#3C40C6' }}></Col>
+ <Col span={8} style={{ backgroundColor: '#dcdde1' }}>
+
+
+ <Select
+ defaultValue="agv"
+ style={{
+ width: 120,
+ }}
+ size={'large'}
+ onChange={(value, option) => {
+ console.log(value, option);
+ }}
+ options={[
+ {
+ value: 'agv',
+ label: 'agv',
+ },
+ {
+ value: 'crn',
+ label: 'crn',
+ },
+ ]}
+ />
+
+ <Select
+
+ // notFoundContent={loading ? <Spin size="small" /> : null}
+
+ />
+
+
+ </Col>
<Col span={16} style={{ backgroundColor: '#3C40C6' }}>
<Flex className={styles.flex} gap={'large'} justify={'flex-end'} align={'center'}>
- <Button onClick={() => setMapEditModel(!mapEditModel)} size={'large'}>
- {!mapEditModel
- ? <span style={{ fontWeight: 'bold' }}><FormattedMessage id='map.edit' defaultMessage='缂栬緫鍦板浘' /></span>
- : <span style={{ color: 'red', fontWeight: 'bold' }}><FormattedMessage id='map.edit.close' defaultMessage='閫�鍑虹紪杈�' /></span>
- }
- </Button>
+ <Select
+ className={styles.select}
+ size={'large'}
+ defaultValue={MapModel.OBSERVER_MODEL}
+ style={{
+ width: 180,
+ }}
+ onChange={setModel}
+ options={[
+ {
+ value: MapModel.OBSERVER_MODEL,
+ label: intl.formatMessage({ id: 'map.model.observer', defaultMessage: '瑙傚療鑰呮ā寮�' }),
+ },
+ {
+ value: MapModel.MOVABLE_MODEL,
+ label: intl.formatMessage({ id: 'map.model.editor', defaultMessage: '缂栬緫鑰呮ā寮�' }),
+ },
+ ]}
+ />
</Flex>
</Col>
</Row>
</Header>
<Content ref={contentRef} className={styles.content}>
- <div ref={mapRef} style={{ position: "relative" }} />
-
- <FloatButton.Group
- shape="square"
- style={{
- left: 35,
- bottom: 35
- }}
- >
- <FloatButton
- icon={<CompressOutlined />}
- />
- <FloatButton.BackTop visibilityHeight={0} />
- </FloatButton.Group>
-
- <FloatButton.Group
- hidden={!mapEditModel}
- trigger="hover"
- style={{
- right: 35,
- bottom: 35
- }}
- icon={<AppstoreAddOutlined />}
- >
- <FloatButton
- tooltip={<div><FormattedMessage id='map.device.add' defaultMessage='娣诲姞璁惧' /></div>}
- icon={<FileAddOutlined />}
- onClick={() => {
- setDeviceVisible(true);
+ <div ref={mapRef} style={{ position: "relative" }} >
+ <FloatButton.Group
+ shape="square"
+ style={{
+ left: 35,
+ bottom: 35
}}
- />
- </FloatButton.Group>
+ >
+ <FloatButton
+ icon={<CompressOutlined />}
+ />
+ <FloatButton.BackTop visibilityHeight={0} />
+ </FloatButton.Group>
+
+ <FloatButton.Group
+ hidden={model === MapModel.OBSERVER_MODEL}
+ style={{
+ 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={() => {
+ if (deviceVisible) {
+ setDeviceVisible(false);
+ } else {
+ setDeviceVisible(true);
+ setModel(MapModel.MOVABLE_MODEL);
+ }
+ }}
+ />
+ <FloatButton
+ hidden={model === MapModel.OBSERVER_MODEL}
+ type={model === MapModel.SETTINGS_MODEL ? 'primary' : 'default'}
+ tooltip={<div><FormattedMessage id='map.device.oper' defaultMessage='鍙傛暟璁剧疆' /></div>}
+ icon={<SettingOutlined />}
+ onClick={() => {
+ setModel(model === MapModel.SETTINGS_MODEL ? MapModel.MOVABLE_MODEL : MapModel.SETTINGS_MODEL)
+ }}
+ />
+ </FloatButton.Group>
+ </div>
</Content>
</Layout>
@@ -164,6 +322,19 @@
refCurr={mapRef.current}
onDrop={onDrop}
/>
+
+ <Settings
+ open={settingsVisible}
+ curSprite={spriteBySettings}
+ onCancel={() => {
+ setSettingsVisible(false);
+ setSpriteBySettings(null);
+ }}
+ setSpriteBySettings={setSpriteBySettings}
+ setDidClickSprite={setDidClickSprite}
+ refCurr={mapRef.current}
+ onSubmit={settingsFinish}
+ />
</>
)
}
--
Gitblit v1.9.1