From 05fb7a627de48467e78c929d4e84beaa2177bf1f Mon Sep 17 00:00:00 2001
From: yangsy <ysy@ittc.sh.cn>
Date: Wed, 10 Jun 2026 19:25:20 +0800
Subject: [PATCH] =?UTF-8?q?refactor(vimp=E7=BB=84=E4=BB=B6=E6=A0=91):=20?=
 =?UTF-8?q?=E6=8F=90=E5=8F=96=E9=BB=98=E8=AE=A4=E5=B1=95=E5=BC=80=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=B8=BA=E8=AE=A1=E7=AE=97=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

统一告警树和摄像头树的展开行为，当搜索关键词不为空时自动展开所有节点，移除重复的内联计算代码，提升代码可维护性
---
 src/pages/vimp/components/alarm-tree.vue  | 8 +++++---
 src/pages/vimp/components/camera-tree.vue | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/pages/vimp/components/alarm-tree.vue b/src/pages/vimp/components/alarm-tree.vue
index 46de4b0..4e7c916 100644
--- a/src/pages/vimp/components/alarm-tree.vue
+++ b/src/pages/vimp/components/alarm-tree.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { NIcon, NTabPane, NTabs, NTree, type TreeOverrideNodeClickBehavior, type TreeProps } from 'naive-ui';
-import { h, type CSSProperties } from 'vue';
+import { computed, h, type CSSProperties } from 'vue';
 import { useAlarmStore, useResourcePanelStore } from '../stores';
 import { storeToRefs } from 'pinia';
 import { useChannelsQuery } from '../composables';
@@ -99,6 +99,8 @@ const renderNodeSuffix: TreeProps['renderSuffix'] = ({ option }) => {
 const resourcePanelStore = useResourcePanelStore();
 const { searchPattern } = storeToRefs(resourcePanelStore);
 
+const defaultExpandAll = computed(() => searchPattern.value.trim().length > 0);
+
 const searchFilter: TreeProps['filter'] = (pattern, node) => {
   if (!isAlarmNode(node)) return false;
   return node.alarm.name.includes(pattern);
@@ -119,7 +121,7 @@ const searchFilter: TreeProps['filter'] = (pattern, node) => {
       :render-label="renderNodeLabel"
       :render-suffix="renderNodeSuffix"
       :override-default-node-click-behavior="overrideNodeClickBehavior"
-      :default-expand-all="searchPattern.trim().length > 0"
+      :default-expand-all="defaultExpandAll"
       :show-irrelevant-nodes="false"
       :data="lineTabPanes.at(0)?.alarmTree"
       :pattern="searchPattern"
@@ -156,7 +158,7 @@ const searchFilter: TreeProps['filter'] = (pattern, node) => {
             :render-label="renderNodeLabel"
             :render-suffix="renderNodeSuffix"
             :override-default-node-click-behavior="overrideNodeClickBehavior"
-            :default-expand-all="false"
+            :default-expand-all="defaultExpandAll"
             :show-irrelevant-nodes="false"
             :data="alarmTree"
             :pattern="searchPattern"
diff --git a/src/pages/vimp/components/camera-tree.vue b/src/pages/vimp/components/camera-tree.vue
index 061af59..7ecb1c9 100644
--- a/src/pages/vimp/components/camera-tree.vue
+++ b/src/pages/vimp/components/camera-tree.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { NIcon, NTabPane, NTabs, NTree, type TreeOverrideNodeClickBehavior, type TreeProps } from 'naive-ui';
-import { h, type CSSProperties } from 'vue';
+import { computed, h, type CSSProperties } from 'vue';
 import { useCameraStore, useResourcePanelStore } from '../stores';
 import { storeToRefs } from 'pinia';
 import { useChannelsQuery } from '../composables';
@@ -102,6 +102,8 @@ const renderNodeSuffix: TreeProps['renderSuffix'] = ({ option }) => {
 const resourcePanelStore = useResourcePanelStore();
 const { searchPattern } = storeToRefs(resourcePanelStore);
 
+const defaultExpandAll = computed(() => searchPattern.value.trim().length > 0);
+
 const searchFilter: TreeProps['filter'] = (pattern, node) => {
   if (!isCameraNode(node)) return false;
   return node.camera.name.includes(pattern);
@@ -122,7 +124,7 @@ const searchFilter: TreeProps['filter'] = (pattern, node) => {
       :render-label="renderNodeLabel"
       :render-suffix="renderNodeSuffix"
       :override-default-node-click-behavior="overrideNodeClickBehavior"
-      :default-expand-all="searchPattern.trim().length > 0"
+      :default-expand-all="defaultExpandAll"
       :show-irrelevant-nodes="false"
       :data="lineTabPanes.at(0)?.cameraTree"
       :pattern="searchPattern"
@@ -159,7 +161,7 @@ const searchFilter: TreeProps['filter'] = (pattern, node) => {
             :render-label="renderNodeLabel"
             :render-suffix="renderNodeSuffix"
             :override-default-node-click-behavior="overrideNodeClickBehavior"
-            :default-expand-all="false"
+            :default-expand-all="defaultExpandAll"
             :show-irrelevant-nodes="false"
             :data="cameraTree"
             :pattern="searchPattern"