From 2931c080fd30685b6e4291d0028b0a7d2098b01d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 12 十月 2024 14:46:56 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/i18n/en.js | 1 +
zy-acs-flow/src/page/login/Login.jsx | 1 +
zy-acs-flow/src/map/tool.js | 1 -
zy-acs-flow/src/i18n/zh.js | 1 +
zy-acs-flow/src/map/MapPage.jsx | 17 +++++++++++++++++
5 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 42823d1..bc6fc42 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -631,6 +631,7 @@
},
action: {
save: 'Save Map',
+ clear: 'Clear Map',
},
settings: {
title: 'Settings',
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index b0bbe0f..8ecab94 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -629,6 +629,7 @@
},
action: {
save: '淇濆瓨鍦板浘',
+ clear: '娓呯┖鍦板浘',
},
settings: {
title: '璁剧疆',
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 613becc..3b24d81 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -246,6 +246,23 @@
<>
<Button
variant="contained"
+ sx={{ mr: 2 }}
+ onClick={() => {
+ Tool.clearMapData();
+ }}
+ >
+ {translate('page.map.action.clear')}
+ </Button>
+ <ConfirmButton
+ label="page.map.action.save"
+ variant="contained"
+ sx={{ mr: 2 }}
+ onConfirm={() => {
+ Http.saveMapData(curZone);
+ }}
+ />
+ <Button
+ variant="contained"
color="primary"
sx={{ mr: 1 }}
onClick={() => setDeviceVisible(!deviceVisible)}
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index 04a40b6..58e6aaf 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -245,7 +245,6 @@
}
}
-
export const showSelectedEffect = (sprite) => {
if (!sprite?.texture || !sprite?.texture?.valid) {
return;
diff --git a/zy-acs-flow/src/page/login/Login.jsx b/zy-acs-flow/src/page/login/Login.jsx
index 91eee35..c744003 100644
--- a/zy-acs-flow/src/page/login/Login.jsx
+++ b/zy-acs-flow/src/page/login/Login.jsx
@@ -30,6 +30,7 @@
const handleSubmit = (auth) => {
setLoading(true);
+ // js native confirm && root
login(
auth,
location.state ? (location.state).nextPathname : '/'
--
Gitblit v1.9.1