From 3512ff73239775ff866e73f3da2c5eac2f8e2494 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 四月 2024 08:50:04 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/index.jsx | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 9d4895f..03d7388 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -79,23 +79,24 @@
});
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);
const [dataFetched, setDataFetched] = React.useState(false);
const [curSprite, setCurSPrite] = React.useState(null);
const prevCurSpriteRef = React.useRef();
- const hasFloor = true;
- // const [hasFloor, setHasFloor] = React.useState(true);
- const [curFloor, setCurFloor] = React.useState(1);
+ const [floorList, setFloorList] = React.useState([]);
+ const [curFloor, setCurFloor] = React.useState(() => {
+ const storedValue = localStorage.getItem('curFloor');
+ return storedValue !== null ? JSON.parse(storedValue) : null;
+ });
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);
@@ -110,7 +111,11 @@
};
window.addEventListener('resize', handleResize);
- await Utils.fetchMapData(curFloor);
+ const mapFloorData = await Utils.fetchMapFloor();
+ setFloorList(mapFloorData);
+ let defaultFloor = curFloor || mapFloorData?.[0]?.value;
+ setCurFloor(defaultFloor);
+ await Utils.fetchMapData(defaultFloor);
setDataFetched(true);
setModel(MapModel.OBSERVER_MODEL)
setTimeout(() => {
@@ -142,6 +147,8 @@
setDrawerVisible(false);
setSpriteBySettings(null);
setSettingsVisible(false);
+ setBatchSprites([]);
+ setBatchDrawerVisible(false);
switch (model) {
case MapModel.OBSERVER_MODEL:
@@ -168,7 +175,7 @@
});
mapContainer.children.forEach(child => {
- Utils.beMovable(child, setDidClickSprite);
+ Utils.beMovable(child);
})
break
case MapModel.SETTINGS_MODEL:
@@ -205,7 +212,7 @@
Utils.initSprite(sprite, type);
mapContainer.addChild(sprite);
- Utils.beMovable(sprite, setDidClickSprite);
+ Utils.beMovable(sprite);
};
// watch curSprite
@@ -245,12 +252,8 @@
return;
}
switchFloor(curFloor);
+ localStorage.setItem('curFloor', JSON.stringify(curFloor));
}, [curFloor]);
-
- // didClickSprite, stop triggers both sprite click and play's selection boxs
- React.useEffect(() => {
- player.updateDidClickSprite(didClickSprite);
- }, [didClickSprite])
// watch spriteBySettings
React.useEffect(() => {
@@ -270,10 +273,15 @@
}, [spriteBySettings])
const prevSpriteBySettings = prevSpriteBySettingsRef.current;
+ // watch batchSprites
React.useEffect(() => {
+ if (!mapContainer) {
+ return;
+ }
if (batchSprites?.length > 0) {
setBatchDrawerVisible(true)
} else {
+ player.clearSelectedSprites();
setBatchDrawerVisible(false)
}
}, [batchSprites])
@@ -290,6 +298,7 @@
model={model}
setModel={setModel}
ModelEnum={MapModel}
+ curFloor={curFloor}
curSprite={curSprite}
setCurSPrite={setCurSPrite}
setSpriteBySettings={setSpriteBySettings}
@@ -362,8 +371,9 @@
<Content ref={contentRef} className={styles.content}>
<div ref={mapRef} />
- {hasFloor && (
+ {floorList.length > 0 && (
<MapFloor
+ floorList={floorList}
curFloor={curFloor}
setCurFloor={setCurFloor}
/>
@@ -422,6 +432,7 @@
<MapDrawer
open={drawerVisible}
curSprite={curSprite}
+ curFloor={curFloor}
refCurr={mapRef.current}
onCancel={() => {
setCurSPrite(null);
@@ -433,8 +444,10 @@
open={batchDrawerVisible}
batchSprites={batchSprites}
refCurr={mapRef.current}
+ model={model}
+ ModelEnum={MapModel}
onCancel={() => {
- setBatchSprites(null);
+ setBatchSprites([]);
setBatchDrawerVisible(false);
}}
/>
@@ -456,7 +469,6 @@
setSpriteBySettings(null);
}}
setSpriteBySettings={setSpriteBySettings}
- setDidClickSprite={setDidClickSprite}
refCurr={mapRef.current}
/>
</>
--
Gitblit v1.9.1