From 4b0ea0e7958398dd72b7bf411157cd3eb49e0ab6 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 12 十二月 2025 15:27:09 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/tool.js | 5 +++--
zy-acs-flow/src/map/MapPage.jsx | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index d403ee9..7f9f35a 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -133,6 +133,7 @@
setDeviceVisible(false);
setSettingsVisible(false);
setBatchSelectionVisible(false);
+ setAreaDrawing(false);
setCurSprite(null);
setBatchSprites([]);
@@ -361,6 +362,7 @@
sx={{}}
disabled={areaDrawing}
onClick={() => {
+ setCurSprite(null);
const started = Tool.startAreaDrawing({
promptText: translate('page.map.prompt.areaName'),
onComplete: ({ name, start, end, color }) => {
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index 371e60e..380fbf3 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -906,6 +906,7 @@
let areaDrawingCleanup = null;
const AREA_COLOR = 0x3498db;
+const AREA_BORDER_COLOR = 0x6c7a89;
const addAreaLabel = (draft, text, from, to) => {
const centerX = (from.x + to.x) / 2;
@@ -961,7 +962,7 @@
const draft = new PIXI.Graphics();
draft.name = id ? `area_${id}` : 'area_' + generateID();
draft.zIndex = DEVICE_Z_INDEX.AREA;
- draft.lineStyle(2 / Math.abs(mapContainer.scale.x || 1), 0x6c7a89, 0.9);
+ draft.lineStyle(2 / Math.abs(mapContainer.scale.x || 1), AREA_BORDER_COLOR, 0.9);
draft.beginFill(areaColor, 0.18);
draft.drawRect(
Math.min(from.x, to.x),
@@ -1004,7 +1005,7 @@
const drawRect = (from, to) => {
draft.clear();
const strokeColor = areaColor;
- draft.lineStyle(2 / Math.abs(mapContainer.scale.x || 1), 0x6c7a89, 0.9);
+ draft.lineStyle(2 / Math.abs(mapContainer.scale.x || 1), AREA_BORDER_COLOR, 0.9);
draft.beginFill(strokeColor, 0.18);
draft.drawRect(
Math.min(from.x, to.x),
--
Gitblit v1.9.1