From 27357b49d165b9dd078b6d13dd7be851e095adf5 Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Fri, 13 Sep 2024 14:43:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dw-grid-select=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E8=AE=BE=E7=BD=AE=E6=A8=A1=E5=9E=8B=E5=80=BC=EF=BC=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=80=BC=E6=9C=AA=E6=9B=B4=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/platform/components/select/WGridSelect.vue         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/io.sc.platform.core.frontend/src/platform/components/select/WGridSelect.vue b/io.sc.platform.core.frontend/src/platform/components/select/WGridSelect.vue
index 0450303f..069ea535 100644
--- a/io.sc.platform.core.frontend/src/platform/components/select/WGridSelect.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/select/WGridSelect.vue
@@ -233,7 +233,9 @@ watch(
     if (newVal !== oldVal) {
       fieldMethodsClass.updateValue(newVal);
     }
-    if (!modelObjectValue.value || (modelObjectValue.value.length === 0 && newVal !== oldVal)) {
+    if (Tools.isEmpty(newVal)) {
+      fieldMethodsClass.clearObjectValue();
+    } else if (newVal !== oldVal) {
       setObjectValueByValue(newVal);
     }
   },
@@ -242,6 +244,7 @@ watch(
 // 根据实际值设置显示值
 const setObjectValueByValue = async (value) => {
   if ((Array.isArray(value) && value.length > 0) || (typeof value === 'string' && !Tools.isEmpty(value))) {
+    fieldMethodsClass.clearObjectValue();
     const urlSearchParams = new URLSearchParams();
     urlSearchParams.append(
       'criteria',
@@ -257,12 +260,10 @@ const setObjectValueByValue = async (value) => {
     if (resp && resp.data) {
       const responseData = resp.data;
       if (Array.isArray(responseData) && responseData.length > 0) {
-        fieldMethodsClass.clearObjectValue();
         responseData.forEach((item) => {
           modelObjectValue.value.push({ value: item[valueUseColumnName], displayValue: getActualDisplayValue(item) });
         });
       } else if (typeof responseData === 'object' && responseData.content?.length > 0) {
-        fieldMethodsClass.clearObjectValue();
         responseData.content.forEach((item) => {
           modelObjectValue.value.push({ value: item[valueUseColumnName], displayValue: getActualDisplayValue(item) });
         });