diff --git a/src/components/Form/src/components/SelectDepartmentTreeV2.vue b/src/components/Form/src/components/SelectDepartmentTreeV2.vue
index 5c0879a..256eee4 100644
--- a/src/components/Form/src/components/SelectDepartmentTreeV2.vue
+++ b/src/components/Form/src/components/SelectDepartmentTreeV2.vue
@@ -9,13 +9,11 @@
@search="searchDepart">
@@ -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
}
}