From 93ece83d6d9c3a01195b64cf28cf943cae029704 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 16 十月 2024 09:39:10 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 40 +++++++++++++---------------------------
1 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 45ea3bb..e1bf3ce 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -1,7 +1,6 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
import { useTranslate, useRefresh, useSidebarState } from "react-admin";
import {
- TextField,
Select,
MenuItem,
Button,
@@ -57,8 +56,6 @@
const [curSprite, setCurSprite] = useState(null);
const prevCurSpriteRef = useRef();
- const [spriteSettings, setSpriteSettings] = useState(null);
- const prevSpriteSettingsRef = useRef();
const [batchSprites, setBatchSprites] = useState([]);
const [curZone, setCurZone] = useState(() => {
@@ -129,11 +126,12 @@
const switchMode = (mode) => {
Tool.removeSelectedEffect();
+ setInsightVisible(false);
setDeviceVisible(false);
setSettingsVisible(false);
setBatchSelectionVisible(false);
- setSpriteSettings(null);
+ setCurSprite(null);
setBatchSprites([]);
switch (mode) {
@@ -172,7 +170,7 @@
});
mapContainer.children.forEach(child => {
- Tool.beSettings(child, setSpriteSettings);
+ Tool.beSettings(child, setCurSprite);
})
break
default:
@@ -211,29 +209,15 @@
Tool.showSelectedEffect(curSprite)
setInsightVisible(true)
}
+ if (mode === MAP_MODE.SETTINGS_MODE) {
+ Tool.showSelectedEffect(curSprite)
+ setSettingsVisible(true)
+ }
} else {
Tool.removeSelectedEffect();
}
}, [curSprite]);
const prevCurSprite = prevCurSpriteRef.current;
-
- // watch spriteSettings
- useEffect(() => {
- if (!mapContainer) {
- return;
- }
- prevSpriteSettingsRef.current = spriteSettings;
- if (spriteSettings && prevSpriteSettings !== spriteSettings) {
- Tool.removeSelectedEffect();
- }
- if (spriteSettings) {
- Tool.showSelectedEffect(spriteSettings)
- setSettingsVisible(true);
- } else {
- Tool.removeSelectedEffect();
- }
- }, [spriteSettings, mapContainer])
- const prevSpriteSettings = prevSpriteSettingsRef.current;
// watch batchSprites
React.useEffect(() => {
@@ -284,7 +268,8 @@
setMode={setMode}
dataFetched={dataFetched}
curZone={curZone}
- setSpriteSettings={setSpriteSettings}
+ curSprite={curSprite}
+ setCurSprite={setCurSprite}
/>
<Box sx={{ flexGrow: 1 }} />
@@ -440,6 +425,7 @@
<Insight
open={insightVisible}
onCancel={() => {
+ setCurSprite(null);
setInsightVisible(false);
}}
sprite={curSprite}
@@ -458,11 +444,11 @@
<Settings
open={settingsVisible}
onCancel={() => {
- setSpriteSettings(null);
+ setCurSprite(null);
setSettingsVisible(false);
}}
- sprite={spriteSettings}
- setSpriteSettings={setSpriteSettings}
+ sprite={curSprite}
+ setSpriteSettings={setCurSprite}
width={570}
/>
--
Gitblit v1.9.1