From d811f4d83ffa60d19643ec929f42891764d61e62 Mon Sep 17 00:00:00 2001
From: dagongren <53748875+wang-liang0615@users.noreply.github.com>
Date: Fri, 19 Apr 2024 13:32:12 +0800
Subject: [PATCH] fix(cmdb-ui):service tree search (#487)

---
 .../cmdb/views/relation_views/index.vue       | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue b/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue
index 7495342..c898c9c 100644
--- a/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue
+++ b/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue
@@ -1762,12 +1762,29 @@ export default {
         }
         if (node.children) {
           node.children = node.children.filter((child) => {
-            if (predicateCiIds.some((id) => child.key.includes(String(id)))) {
+            if (
+              predicateCiIds.some(
+                (id) =>
+                  child.key
+                    .split('@^@')
+                    .map((item) => Number(item.split('%')[0]))
+                    .indexOf(id) > -1
+              )
+            ) {
               return true
             }
             return filterTree(child, predicate)
           })
-          if (node.children.length && !predicateCiIds.some((id) => node.key.includes(String(id)))) {
+          if (
+            node.children.length &&
+            !predicateCiIds.some(
+              (id) =>
+                node.key
+                  .split('@^@')
+                  .map((item) => Number(item.split('%')[0]))
+                  .indexOf(id) > -1
+            )
+          ) {
             _expandedKeys.push(node.key)
           }
           return node.children.length > 0