From 1bc33546a044cbc84dd9595c19dbcd9a4e309fc9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期六, 10 一月 2026 14:06:10 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 19 +++++++++++++------
1 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 a28cf21..4981505 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -218,6 +218,7 @@
if (!mapContainer) {
return;
}
+ setAreaListVisible(false);
Tool.removeSelectedEffect();
if (curSprite) {
if (mode === MAP_MODE.OBSERVER_MODE) {
@@ -375,11 +376,14 @@
{translate('page.map.action.areaList')}
</Button>
<Button
- variant={areaDrawing ? "outlined" : "contained"}
- color="primary"
- sx={{}}
- disabled={areaDrawing}
+ variant="contained"
+ color={areaDrawing ? "error" : "primary"}
onClick={() => {
+ if (areaDrawing) {
+ Tool.cancelAreaDrawing();
+ setAreaDrawing(false);
+ return;
+ }
setCurSprite(null);
const started = Tool.startAreaDrawing({
promptText: translate('page.map.area.prompt.nameInput'),
@@ -402,7 +406,9 @@
}
}}
>
- {translate('page.map.action.addArea')}
+ {areaDrawing
+ ? translate('page.map.action.cancelAddArea')
+ : translate('page.map.action.addArea')}
</Button>
</>
)}
@@ -576,7 +582,8 @@
zoneId={curZone}
open={areaListVisible}
onClose={() => setAreaListVisible(false)}
- width={400}
+ setCurSprite={setCurSprite}
+ width={378}
/>
</Box>
--
Gitblit v1.9.1