diff --git a/core/core-frontend/src/custom-component/v-query/Select.vue b/core/core-frontend/src/custom-component/v-query/Select.vue index 4ce1f3538a..e7c245db7e 100644 --- a/core/core-frontend/src/custom-component/v-query/Select.vue +++ b/core/core-frontend/src/custom-component/v-query/Select.vue @@ -349,6 +349,14 @@ const handleFieldIdChange = (val: EnumValue) => { }) .finally(() => { loading.value = false + if (disabledFirstItem.value) { + time = setTimeout(() => { + clearTimeout(time) + setDefaultValueFirstItem() + }, 300) + return + } + if (config.value.defaultValueCheck && !isFromRemote.value) { selectValue.value = Array.isArray(config.value.defaultValue) ? [...config.value.defaultValue] @@ -368,6 +376,7 @@ const handleFieldIdChange = (val: EnumValue) => { config.value.mapValue = setDefaultMapValue( Array.isArray(selectValue.value) ? [...selectValue.value] : [selectValue.value] ) + if (shouldReSearch) { queryDataForId(config.value.id) } @@ -376,14 +385,6 @@ const handleFieldIdChange = (val: EnumValue) => { ? [...selectValue.value] : selectValue.value } - - if (disabledFirstItem.value) { - time = setTimeout(() => { - clearTimeout(time) - setDefaultValueFirstItem() - }, 300) - } - isFromRemote.value = false }) }