Merge branch 'ga-2025-07' into 'dev'

feat: 组织树多次点击后展开下级消失修复

See merge request itc-framework/ma/2024/front!101

src/components/Form/src/components/SelectDepartmentTreeV2.vue

@@ -9,13 +9,11 @@
       @search="searchDepart">
     </a-input-search>
     <div class="select-department-tree">
-      <a-tree v-model:expandedKeys="expandedKeys" v-model:selectedKeys="selectedKeys" v-model:checkedKeys="checkedKeys"
+      <a-tree v-model:expandedKeys="expandedKeys" :key="treeKey" v-model:selectedKeys="selectedKeys" v-model:checkedKeys="checkedKeys"
         :selectable="props.selectable" :multiple="props.multiple" v-model:checkable="checkable"
         v-model:tree-data="treeData" :load-data="loadData" @select="selectData">
         <template #title="{ title, key }">
           <span v-html="highLightSearch(title)"></span>
-          <!-- <span v-if="key === '0-0-1-0'" style="color: #1890ff">{{key}}{{ title }}</span>
-          <template v-else>{{ title }}</template> -->
         </template>
       </a-tree>
     </div>
@@ -61,6 +59,7 @@ const selectedKeys = ref([]);
 const checkedKeys = ref([]);
 const checkable = ref(false)
 const treeData = ref([])
+const treeKey = ref(0)
 const params = ref({
   id: '',
   code: '',
@@ -109,9 +108,11 @@ function searchDepart() {
 async function getList(type = 'default') {
   if (props.parentNode) {
     params.value.id = props.parentNode
+
   }
   let list = resetTreeList(await getQueryDeptTrees(params.value), type, true)
   treeData.value = list
+  treeKey.value++
   emit('query-completed');
 }
 function resetTreeList(list, type='default', isFirst = false) {
@@ -119,14 +120,14 @@ function resetTreeList(list, type='default', isFirst = false) {
     expandedKeys.value = []
   }
   const result = list.map(item => {
-    if(type == 'search' && item.children && item.children.length) {
+    if(type == 'search' && item.children && item.children.length && params.value.name) {
       expandedKeys.value.push(item.id)
     }
     return {
       ...item,
       ...{
         key: item.id,
-        children: resetTreeList(item.children, type),
+        children: item.children.length ? resetTreeList(item.children, type) : [],
         title: item.name
       }
     }