From 24d81e04e08ef9fce8163af8754046e257a5aaf6 Mon Sep 17 00:00:00 2001
From: Huarch <huarch97@outlook.com>
Date: Thu, 30 Apr 2026 13:42:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E5=85=B7=E6=A0=8F?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E5=85=B3=E9=97=AD=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../olmap/core/Controls/Toolbar.tsx           | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/components/olmap/core/Controls/Toolbar.tsx b/src/components/olmap/core/Controls/Toolbar.tsx
index 4a5e07d..58b6721 100644
--- a/src/components/olmap/core/Controls/Toolbar.tsx
+++ b/src/components/olmap/core/Controls/Toolbar.tsx
@@ -877,7 +877,15 @@ const Toolbar: React.FC<ToolbarProps> = ({
           />
         )}
       </div>
-      {showPropertyPanel && <PropertyPanel {...getFeatureProperties()} />}
+      {showPropertyPanel && (
+        <PropertyPanel
+          {...getFeatureProperties()}
+          onClose={() => {
+            deactivateTool("info");
+            setActiveTools((prev) => prev.filter((t) => t !== "info"));
+          }}
+        />
+      )}
       {showDrawPanel && map && <DrawPanel />}
       <div style={{ display: showStyleEditor ? "block" : "none" }}>
         <StyleEditorPanel
@@ -892,6 +900,10 @@ const Toolbar: React.FC<ToolbarProps> = ({
             visible={showHistoryPanel}
             start_time={chatPanelTimeRange?.startTime}
             end_time={chatPanelTimeRange?.endTime}
+            onClose={() => {
+              deactivateTool("history");
+              setActiveTools((prev) => prev.filter((t) => t !== "history"));
+            }}
           />
         ) : HistoryPanel ? (
           <HistoryPanel
@@ -936,6 +948,10 @@ const Toolbar: React.FC<ToolbarProps> = ({
             type={chatPanelFeatureInfos ? chatPanelType : (queryType as "realtime" | "scheme" | "none")}
             start_time={chatPanelTimeRange?.startTime}
             end_time={chatPanelTimeRange?.endTime}
+            onClose={() => {
+              deactivateTool("history");
+              setActiveTools((prev) => prev.filter((t) => t !== "history"));
+            }}
           />
         ) : (
           <HistoryDataPanel
@@ -980,6 +996,10 @@ const Toolbar: React.FC<ToolbarProps> = ({
             type={chatPanelFeatureInfos ? chatPanelType : (queryType as "realtime" | "scheme" | "none")}
             start_time={chatPanelTimeRange?.startTime}
             end_time={chatPanelTimeRange?.endTime}
+            onClose={() => {
+              deactivateTool("history");
+              setActiveTools((prev) => prev.filter((t) => t !== "history"));
+            }}
           />
         ))}