From 099adb098bb0e4be70561e270266e178b6fc0cb4 Mon Sep 17 00:00:00 2001
From: JoJo_ <92574547+JoJohw@users.noreply.github.com>
Date: Fri, 22 Nov 2024 14:37:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E7=BD=AE=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=20(#1986)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/organization/components/search-org.vue  |  4 +++-
 .../organization/components/search-result-tree.vue    | 10 +++++++---
 src/pages/src/views/organization/index.vue            | 11 +++++++++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/pages/src/views/organization/components/search-org.vue b/src/pages/src/views/organization/components/search-org.vue
index 9a326a346..f7e54320d 100644
--- a/src/pages/src/views/organization/components/search-org.vue
+++ b/src/pages/src/views/organization/components/search-org.vue
@@ -117,7 +117,7 @@
 
 <script setup lang="ts">
 import { bkTooltips as vBkTooltips } from 'bkui-vue';
-import { inject, reactive, ref } from 'vue';
+import { defineEmits, inject, reactive, ref } from 'vue';
 
 import ViewUser from './view-user.vue';
 
@@ -127,6 +127,7 @@ import { getFields } from '@/http/settingFiles';
 import { t } from '@/language/index';
 import useAppStore from '@/store/app';
 
+const emit = defineEmits(['select']);
 const appStore = useAppStore();
 
 const editLeaveBefore = inject('editLeaveBefore');
@@ -193,6 +194,7 @@ const handleOrgSelect = (org) => {
   selected.value = org;
   searchDialogVisible.value = false;
   appStore.currentOrg = { ...org };
+  emit('select');
 };
 
 const handleUserSelect = async (user) => {
diff --git a/src/pages/src/views/organization/components/search-result-tree.vue b/src/pages/src/views/organization/components/search-result-tree.vue
index 61ea953b3..c98e7f627 100644
--- a/src/pages/src/views/organization/components/search-result-tree.vue
+++ b/src/pages/src/views/organization/components/search-result-tree.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue';
+import { defineExpose, ref } from 'vue';
 
 import { getDepartmentsList } from '@/http/organizationFiles';
 import useAppStore from '@/store/app';
@@ -62,10 +62,10 @@ const getData =  (isChildren) => {
 
 const treeData = ref([]);
 
-watch(() => appStore.currentOrg.organization_path, async () => {
+const getTreeData = async () => {
   const { data = [] } = await getDepartmentsList(appStore.currentOrg.id, appStore.currentOrg.tenant_id);
   treeData.value = getData(Boolean(data?.length));
-});
+};
 
 const formatTreeData = (data = []) => data.map(item => ({ ...item, async: item.has_children }));
 
@@ -87,4 +87,8 @@ const getPrefixIcon = (item: { children?: any[] }, renderType: string) => {
     },
   };
 };
+
+defineExpose({
+  getTreeData,
+});
 </script>
diff --git a/src/pages/src/views/organization/index.vue b/src/pages/src/views/organization/index.vue
index 7e45cacaf..939ae0b46 100644
--- a/src/pages/src/views/organization/index.vue
+++ b/src/pages/src/views/organization/index.vue
@@ -10,9 +10,9 @@
       :max="400"
       :initial-divide="280">
       <template #aside>
-        <search></search>
+        <search @select="handleSearchSelect"></search>
         <div v-show="appStore.isSearchTree">
-          <search-result-tree></search-result-tree>
+          <search-result-tree ref="searchResultTreeRef"></search-result-tree>
         </div>
         <bk-resize-layout
           v-show="!appStore.isSearchTree"
@@ -84,6 +84,13 @@ const importHandle = async () => {
   await getList();
   tableListRef.value.importDialogHandle();
 };
+
+const searchResultTreeRef = ref();
+const handleSearchSelect = () => {
+  if (searchResultTreeRef.value) {
+    searchResultTreeRef.value.getTreeData();
+  }
+};
 </script>
 
 <style lang="postcss" scoped>