From c951ecc9fbdec69687b1cb6dd923193185cde4e0 Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Mon, 27 May 2024 18:23:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=84=E4=BB=B6MsTree=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=B8=8D=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E7=9A=84=E5=AD=90=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1040934 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001040934
---
 .../src/components/business/ms-tree/index.vue | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/business/ms-tree/index.vue b/frontend/src/components/business/ms-tree/index.vue
index 8461e800fc..99baad53cc 100644
--- a/frontend/src/components/business/ms-tree/index.vue
+++ b/frontend/src/components/business/ms-tree/index.vue
@@ -92,7 +92,7 @@
 <script setup lang="ts">
   import { nextTick, onBeforeMount, Ref, ref, watch } from 'vue';
   import { TreeInstance } from '@arco-design/web-vue';
-  import { debounce } from 'lodash-es';
+  import { cloneDeep, debounce } from 'lodash-es';
 
   import MsTableMoreAction from '@/components/pure/ms-table-more-action/index.vue';
   import type { ActionsItem } from '@/components/pure/ms-table-more-action/types';
@@ -227,17 +227,20 @@
     const search = (_data: MsTreeNodeData[]) => {
       const result: MsTreeNodeData[] = [];
       _data.forEach((item) => {
-        if (item[props.fieldNames.title].toLowerCase().includes(keyword.toLowerCase())) {
-          result.push({ ...item, expanded: true });
-        } else if (item[props.fieldNames.children]) {
-          const filterData = search(item[props.fieldNames.children]);
-          if (filterData.length) {
-            result.push({
-              ...item,
-              expanded: true,
-              [props.fieldNames.children]: filterData,
-            });
-          }
+        // 判断当前节点是否符合搜索关键字
+        const titleMatches = item[props.fieldNames.title].toLowerCase().includes(keyword.toLowerCase());
+        // 递归搜索子节点
+        let filteredChildren: MsTreeNodeData[] = [];
+        if (item[props.fieldNames.children]) {
+          filteredChildren = search(item[props.fieldNames.children]);
+        }
+        // 当前节点符合关键字，或有符合关键字的子节点
+        if (titleMatches || filteredChildren.length > 0) {
+          result.push({
+            ...item,
+            expanded: titleMatches || filteredChildren.length > 0,
+            [props.fieldNames.children]: filteredChildren,
+          });
         }
       });
       return result;
@@ -356,7 +359,11 @@
    * 处理树节点选中（非复选框）
    */
   function select(_selectedKeys: Array<string | number>, _data: MsTreeSelectedData) {
-    emit('select', _selectedKeys, _data.selectedNodes[0]);
+    const selectNode: MsTreeNodeData = cloneDeep(_data.selectedNodes[0]);
+    loop(data.value, selectNode[props.fieldNames.key], (item) => {
+      selectNode.children = item.children;
+    });
+    emit('select', _selectedKeys, selectNode);
   }
 
   function checked(_checkedKeys: Array<string | number>) {