From d6dbab5e4d6a70dfbec172cf74d54772cf9d8e5b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 17 十二月 2025 16:55:10 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/i18n/en.js | 1 +
zy-acs-flow/src/i18n/zh.js | 1 +
zy-acs-flow/src/map/MapPage.jsx | 15 ++++++++++-----
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 7e1a863..c62a1e9 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -676,6 +676,7 @@
oneClickPatrol: 'One-click Patrol',
cancelPatrol: 'Cancel Patrol',
addArea: 'Add Area',
+ cancelAddArea: 'Cancel Add',
areaList: 'Area List',
},
mode: {
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 27d4219..31de76b 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -676,6 +676,7 @@
oneClickPatrol: '涓�閿贰閫�',
cancelPatrol: '鍙栨秷宸￠��',
addArea: '娣诲姞鍖哄煙',
+ cancelAddArea: '鍙栨秷娣诲姞',
areaList: '鍖哄煙鍒楄〃',
},
mode: {
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index ad0e245..4981505 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -376,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'),
@@ -403,7 +406,9 @@
}
}}
>
- {translate('page.map.action.addArea')}
+ {areaDrawing
+ ? translate('page.map.action.cancelAddArea')
+ : translate('page.map.action.addArea')}
</Button>
</>
)}
--
Gitblit v1.9.1