From 0d5321b4a070862fc9862af9ca17251b1f441c4b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 15 十月 2024 14:01:58 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/header/MapSearch.jsx | 7 ++++---
zy-acs-flow/src/map/MapPage.jsx | 12 +++++++++---
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 1d34847..73f59a0 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -31,7 +31,7 @@
import WebSocketClient from './websocket'
import ConfirmButton from "../page/components/ConfirmButton";
import { FitScreen } from '@mui/icons-material';
-
+import MapSearch from "./header/MapSearch";
let player;
let websocket;
@@ -249,7 +249,13 @@
boxShadow: theme.shadows[1],
}}
>
- <TextField
+ <MapSearch
+ mode={mode}
+ setMode={setMode}
+ curZone={curZone}
+ setSpriteSettings={setSpriteSettings}
+ />
+ {/* <TextField
variant="outlined"
size="small"
placeholder="鎼滅储..."
@@ -258,7 +264,7 @@
backgroundColor: theme.palette.background.paper,
borderRadius: 1,
}}
- />
+ /> */}
<Box sx={{ flexGrow: 1 }} />
{mode === MAP_MODE.OBSERVER_MODE && (
diff --git a/zy-acs-flow/src/map/header/MapSearch.jsx b/zy-acs-flow/src/map/header/MapSearch.jsx
index f5e5e16..c3f0e09 100644
--- a/zy-acs-flow/src/map/header/MapSearch.jsx
+++ b/zy-acs-flow/src/map/header/MapSearch.jsx
@@ -65,10 +65,11 @@
const MapSearch = (props) => {
const {
- setCurSprite,
- setSpriteSettings,
mode,
setMode,
+ curZone,
+ setCurSprite,
+ setSpriteSettings,
} = props;
const theme = useTheme();
@@ -99,7 +100,7 @@
setTimeout(() => {
resetSearch();
}, 200);
- }, [curDeviceType, props.curZone]);
+ }, [curDeviceType, curZone]);
useEffect(() => {
if (!Tool.getMapContainer()) return;
--
Gitblit v1.9.1