From 38c734c1bee89d1e7c19c3140487335c07dc1c06 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 18 Aug 2025 16:29:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E2=80=9D=E9=A6=96=E9=A1=B9=E2=80=9C=E6=90=AD=E9=85=8D=E8=A1=8C?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BD=BF=E7=94=A8=E6=97=B6=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E4=BD=BF=E5=BE=97=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/v-query/Select.vue     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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 4361462428..4aa20c5e5d 100644
--- a/core/core-frontend/src/custom-component/v-query/Select.vue
+++ b/core/core-frontend/src/custom-component/v-query/Select.vue
@@ -350,6 +350,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]
@@ -369,6 +377,7 @@ const handleFieldIdChange = (val: EnumValue) => {
         config.value.mapValue = setDefaultMapValue(
           Array.isArray(selectValue.value) ? [...selectValue.value] : [selectValue.value]
         )
+
         if (shouldReSearch) {
           queryDataForId(config.value.id)
         }
@@ -377,14 +386,6 @@ const handleFieldIdChange = (val: EnumValue) => {
           ? [...selectValue.value]
           : selectValue.value
       }
-
-      if (disabledFirstItem.value) {
-        time = setTimeout(() => {
-          clearTimeout(time)
-          setDefaultValueFirstItem()
-        }, 300)
-      }
-
       isFromRemote.value = false
     })
 }