From 89e56a4048f448348b996aff76c052d6f2cfe693 Mon Sep 17 00:00:00 2001
From: kevin <kevin@lmve.net>
Date: Fri, 21 Aug 2026 21:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=81=9A=E5=90=88=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8B=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=98=BE=E7=A4=BA=E7=9A=84=E8=8A=82=E7=82=B9:?=
 =?UTF-8?q?=E8=A7=86=E5=8F=A3=E6=8E=A5=E5=8F=A3=E8=81=9A=E5=90=88=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=AA=E8=BF=94=E5=9B=9E=E8=81=9A=E5=90=88=E7=82=B9?=
 =?UTF-8?q?(=E6=97=A0=20node=5Fid),=E5=88=A0=E9=99=A4=E5=89=8D=E6=8C=89?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E8=A7=86=E9=87=8E=20bounds=20=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=8B=89=E5=8F=96=E5=85=A8=E9=83=A8=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=20ID=20=E5=86=8D=E9=80=90=E4=B8=AA=E5=88=A0=E9=99=A4,=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=20v0.3.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 meshmap_frontend/src/App.vue | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/meshmap_frontend/src/App.vue b/meshmap_frontend/src/App.vue
index 349773e..653cfaf 100644
--- a/meshmap_frontend/src/App.vue
+++ b/meshmap_frontend/src/App.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
-import { adminLogout, createNodeBlockingRule, deleteNode, deleteTextMessage, getAdminMe, getChannels, getHealth, getMapReportViewport, getNodeInfo, getPositions, getTextMessages, purgeNode } from './api'
+import { adminLogout, createNodeBlockingRule, deleteNode, deleteTextMessage, getAdminMe, getChannels, getHealth, getMapReportViewport, getMapReports, getNodeInfo, getPositions, getTextMessages, purgeNode } from './api'
 import AdminBlockingManagement from './components/AdminBlockingManagement.vue'
 import AdminBot from './components/AdminBot.vue'
 import AdminBotDirect from './components/AdminBotDirect.vue'
@@ -476,20 +476,32 @@ function requestPurgeNode(nodeId: string) {
   pendingDeleteAction.value = { kind: 'purge-node', nodeId }
 }
 
-function requestDeleteDisplayedNodes() {
+async function requestDeleteDisplayedNodes() {
   // 收集当前地图上正在显示的节点 ID（仅 type=node，跳过聚合点），并按筛选后的视图顺序去重。
-  const nodeIds = Array.from(
-    new Set(
-      mapItems.value
-        .filter((item): item is Extract<MapRenderable, { type: 'node' }> => item.type === 'node')
-        .map((item) => item.node_id),
-    ),
+  const nodeIds = new Set(
+    mapItems.value
+      .filter((item): item is Extract<MapRenderable, { type: 'node' }> => item.type === 'node')
+      .map((item) => item.node_id),
   )
-  if (nodeIds.length === 0) {
+  // 聚合状态下视口接口只返回聚合点（无 node_id），改按当前视野 bounds 分页拉取全部节点 ID。
+  if (mapViewportMode.value === 'clusters' && currentMapBounds.value) {
+    const pageSize = 500
+    for (let offset = 0; ; offset += pageSize) {
+      const response = await getMapReports(pageSize, offset, currentMapBounds.value)
+      for (const report of response.items) {
+        nodeIds.add(report.node_id)
+      }
+      const loaded = offset + response.items.length
+      if (response.items.length === 0 || loaded >= (response.total ?? loaded)) {
+        break
+      }
+    }
+  }
+  if (nodeIds.size === 0) {
     error.value = '当前地图上没有可删除的节点。'
     return
   }
-  pendingDeleteAction.value = { kind: 'delete-displayed-nodes', nodeIds }
+  pendingDeleteAction.value = { kind: 'delete-displayed-nodes', nodeIds: Array.from(nodeIds) }
 }
 
 function requestDeleteAndBlockNode(payload: NodeActionRequest) {