From 517f36f9f4e36432f073196e84986532fc6c5926 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 26 三月 2024 11:10:43 +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 |   57 +++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 8da3286..7158df3 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);
@@ -87,12 +87,17 @@
     const prevCurSpriteRef = React.useRef();
     const hasFloor = true;
     // const [hasFloor, setHasFloor] = React.useState(true);
-    const [curFloor, setCurFloor] = React.useState(1);
+    const [curFloor, setCurFloor] = React.useState(() => {
+        const storedValue = localStorage.getItem('curFloor');
+        return storedValue !== null ? JSON.parse(storedValue) : 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);
@@ -139,6 +144,8 @@
         setDrawerVisible(false);
         setSpriteBySettings(null);
         setSettingsVisible(false);
+        setBatchSprites([]);
+        setBatchDrawerVisible(false);
 
         switch (model) {
             case MapModel.OBSERVER_MODEL:
@@ -147,7 +154,7 @@
 
                 setDeviceVisible(false);
                 player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, resetFn) => {
-                    // resetFn();
+                    setBatchSprites(selectedSprites);
                 });
 
                 mapContainer.children.forEach(child => {
@@ -165,7 +172,7 @@
                 });
 
                 mapContainer.children.forEach(child => {
-                    Utils.beMovable(child, setDidClickSprite);
+                    Utils.beMovable(child);
                 })
                 break
             case MapModel.SETTINGS_MODEL:
@@ -174,10 +181,7 @@
 
                 setDeviceVisible(false);
                 player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, resetFn) => {
-                    console.log(selectedSprites);
-                    if (selectedSprites.length > 0) {
-                        setDrawerVisible(true);
-                    }
+                    setBatchSprites(selectedSprites);
                 });
 
                 mapContainer.children.forEach(child => {
@@ -205,7 +209,7 @@
 
         Utils.initSprite(sprite, type);
         mapContainer.addChild(sprite);
-        Utils.beMovable(sprite, setDidClickSprite);
+        Utils.beMovable(sprite);
     };
 
     // watch curSprite
@@ -245,12 +249,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,6 +270,19 @@
     }, [spriteBySettings])
     const prevSpriteBySettings = prevSpriteBySettingsRef.current;
 
+    // watch batchSprites
+    React.useEffect(() => {
+        if (!mapContainer) {
+            return;
+        }
+        if (batchSprites?.length > 0) {
+            setBatchDrawerVisible(true)
+        } else {
+            player.clearSelectedSprites();
+            setBatchDrawerVisible(false)
+        }
+    }, [batchSprites])
+
     return (
         <>
             {contextHolder}
@@ -282,6 +295,7 @@
                                     model={model}
                                     setModel={setModel}
                                     ModelEnum={MapModel}
+                                    curFloor={curFloor}
                                     curSprite={curSprite}
                                     setCurSPrite={setCurSPrite}
                                     setSpriteBySettings={setSpriteBySettings}
@@ -421,6 +435,18 @@
                 }}
             />
 
+            <BatchDrawer
+                open={batchDrawerVisible}
+                batchSprites={batchSprites}
+                refCurr={mapRef.current}
+                model={model}
+                ModelEnum={MapModel}
+                onCancel={() => {
+                    setBatchSprites([]);
+                    setBatchDrawerVisible(false);
+                }}
+            />
+
             <Edit
                 open={deviceVisible}
                 onCancel={() => {
@@ -438,7 +464,6 @@
                     setSpriteBySettings(null);
                 }}
                 setSpriteBySettings={setSpriteBySettings}
-                setDidClickSprite={setDidClickSprite}
                 refCurr={mapRef.current}
             />
         </>

--
Gitblit v1.9.1