From ac2518b326fd3d742180fa96b3121bbe3b230178 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 三月 2024 09:10:32 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/index.jsx | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 273a85e..a0745fd 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -19,6 +19,7 @@
import MapSearch from './header/search';
import MapFloor from './header/floor';
import MapDrawer from './drawer';
+import BatchDrawer from './batch';
const useStyles = createStyles(({ token }) => {
let dark = token.colorBgBase === '#000';
@@ -78,7 +79,6 @@
});
const [app, setApp] = React.useState(null);
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);
@@ -88,11 +88,13 @@
const hasFloor = true;
// const [hasFloor, setHasFloor] = React.useState(true);
const [curFloor, setCurFloor] = React.useState(1);
+ const [batchSprites, setBatchSprites] = React.useState([]);
+ const [batchDrawerVisible, setBatchDrawerVisible] = React.useState(false);
// init func
React.useEffect(() => {
const initialize = async () => {
- player = new Player(mapRef.current, styles.dark, didClickSprite);
+ player = new Player(mapRef.current, styles.dark);
setApp(player.app);
setMapContainer(player.mapContainer);
Utils.syncApp(player.app);
@@ -146,7 +148,9 @@
player.hideStarryBackground();
setDeviceVisible(false);
- player.activateMapEvent(null);
+ player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, resetFn) => {
+ setBatchSprites(selectedSprites);
+ });
mapContainer.children.forEach(child => {
Utils.viewFeature(child, setCurSPrite);
@@ -156,14 +160,14 @@
player.showGridlines();
player.hideStarryBackground();
- player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, scale, resetFn) => {
- Utils.spriteListBeMovable(selectedSprites, scale, () => {
+ player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, resetFn) => {
+ Utils.spriteListBeMovable(selectedSprites, () => {
resetFn();
});
});
mapContainer.children.forEach(child => {
- Utils.beMovable(child, setDidClickSprite);
+ Utils.beMovable(child);
})
break
case MapModel.SETTINGS_MODEL:
@@ -171,11 +175,8 @@
player.showStarryBackground();
setDeviceVisible(false);
- player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, scale, resetFn) => {
- console.log(selectedSprites);
- if (selectedSprites.length > 0) {
- setDrawerVisible(true);
- }
+ player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, resetFn) => {
+ setBatchSprites(selectedSprites);
});
mapContainer.children.forEach(child => {
@@ -203,7 +204,7 @@
Utils.initSprite(sprite, type);
mapContainer.addChild(sprite);
- Utils.beMovable(sprite, setDidClickSprite);
+ Utils.beMovable(sprite);
};
// watch curSprite
@@ -245,11 +246,6 @@
switchFloor(curFloor);
}, [curFloor]);
- // didClickSprite, stop triggers both sprite click and play's selection boxs
- React.useEffect(() => {
- player.updateDidClickSprite(didClickSprite);
- }, [didClickSprite])
-
// watch spriteBySettings
React.useEffect(() => {
if (!mapContainer) {
@@ -267,6 +263,14 @@
}
}, [spriteBySettings])
const prevSpriteBySettings = prevSpriteBySettingsRef.current;
+
+ React.useEffect(() => {
+ if (batchSprites?.length > 0) {
+ setBatchDrawerVisible(true)
+ } else {
+ setBatchDrawerVisible(false)
+ }
+ }, [batchSprites])
return (
<>
@@ -419,6 +423,16 @@
}}
/>
+ <BatchDrawer
+ open={batchDrawerVisible}
+ batchSprites={batchSprites}
+ refCurr={mapRef.current}
+ onCancel={() => {
+ setBatchSprites(null);
+ setBatchDrawerVisible(false);
+ }}
+ />
+
<Edit
open={deviceVisible}
onCancel={() => {
@@ -436,7 +450,6 @@
setSpriteBySettings(null);
}}
setSpriteBySettings={setSpriteBySettings}
- setDidClickSprite={setDidClickSprite}
refCurr={mapRef.current}
/>
</>
--
Gitblit v1.9.1