From aaae6cf85ba8a5ccb46b384bc024df804d3da912 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 06 三月 2024 14:40:09 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/map/components/settings.jsx |    2 +-
 zy-asrs-flow/src/pages/map/index.jsx               |   21 ++++++++++++++++-----
 zy-asrs-flow/src/pages/map/utils.js                |    7 +++----
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/components/settings.jsx b/zy-asrs-flow/src/pages/map/components/settings.jsx
index 277183d..fe3bca2 100644
--- a/zy-asrs-flow/src/pages/map/components/settings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/settings.jsx
@@ -27,7 +27,7 @@
                 getContainer={props.refCurr}
                 rootStyle={{ position: "absolute" }}
                 mask={false}
-                width={378}
+                width={578}
                 extra={
                     <Space>
                         <Button onClick={() => props.onCancel()}><FormattedMessage id='common.cancel' defaultMessage='鍙栨秷' /></Button>
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 0032f74..9ea2013 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -70,6 +70,7 @@
     const [app, setApp] = React.useState(null);
     const [mapContainer, setMapContainer] = React.useState(null);
     const [didClickSprite, setDidClickSprite] = React.useState(false);
+    const [currSpriteBySettings, setCurrSpriteBySettings] = React.useState(null);
 
     // init func
     React.useEffect(() => {
@@ -137,7 +138,7 @@
                 player.activateMapEvent(null);
 
                 mapContainer.children.forEach(child => {
-                    Utils.beSettings(child, setSettingsVisible, setDidClickSprite);
+                    Utils.beSettings(child, setCurrSpriteBySettings, setDidClickSprite);
                 })
                 break
             default:
@@ -156,15 +157,25 @@
         Utils.beMovable(sprite, setDidClickSprite);
     };
 
-    const settingsFinish = () => {
-
-    }
-
     // didClickSprite, stop triggers both sprite click and play's selection boxs
     React.useEffect(() => {
         player.updateDidClickSprite(didClickSprite);
     }, [didClickSprite])
 
+    React.useEffect(() => {
+        if (!mapContainer) {
+            return;
+        }
+        console.log(currSpriteBySettings);
+        if (currSpriteBySettings) {
+            setSettingsVisible(true);
+        }
+    }, [currSpriteBySettings])
+
+    const settingsFinish = () => {
+        setCurrSpriteBySettings(null);
+    }
+    
     return (
         <>
             <Layout className={styles.layout}>
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 9abcd8a..6fbcf0b 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -68,17 +68,16 @@
 }
 
 // sprite be beSettings from sprite click event
-export const beSettings = (sprite, setSettingsVisible, setDidClickSprite) => {
+export const beSettings = (sprite, setCurrSpriteBySettings, setDidClickSprite) => {
     sprite.off('pointerup');
     sprite.off('pointermove');
     sprite.off('pointerdown');
     sprite.off('click');
-
+    
     sprite.on("click", onClick);
 
     function onClick(event) {
-        console.log(1);
-        setSettingsVisible(true);
+        setCurrSpriteBySettings(sprite);
         // setDidClickSprite(true);
     }
 }

--
Gitblit v1.9.1