From 5d832761f64cb2d0e33ac991c4400545f8e87d2d Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Fri, 13 Sep 2024 15:17:50 +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

---
 .../components/select/WGridSelect.vue         |  9 +++++-
 .../platform/components/select/WOrgSelect.vue | 31 ++++++++++++++-----
 .../components/select/WUserSelect.vue         | 31 ++++++++++++++-----
 3 files changed, 54 insertions(+), 17 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 069ea535..1c84d237 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
@@ -236,7 +236,14 @@ watch(
     if (Tools.isEmpty(newVal)) {
       fieldMethodsClass.clearObjectValue();
     } else if (newVal !== oldVal) {
-      setObjectValueByValue(newVal);
+      if (modelObjectValue.value.length > 0) {
+        const tempValue = modelObjectValue.value.find((item) => item.value === newVal);
+        if (!tempValue) {
+          setObjectValueByValue(newVal);
+        }
+      } else {
+        setObjectValueByValue(newVal);
+      }
     }
   },
 );
diff --git a/io.sc.platform.core.frontend/src/platform/components/select/WOrgSelect.vue b/io.sc.platform.core.frontend/src/platform/components/select/WOrgSelect.vue
index eecdb136..6dcbb453 100644
--- a/io.sc.platform.core.frontend/src/platform/components/select/WOrgSelect.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/select/WOrgSelect.vue
@@ -15,7 +15,6 @@
       :readonly="fieldMethodsClass.getReadOnly(props, { value: modelValue, displayValue: displayValueComputed })"
       :disable="fieldMethodsClass.getDisable(props, { value: modelValue, displayValue: displayValueComputed })"
       :clearable="false"
-      @update:model-value="fieldMethodsClass.updateValue"
       @focus="
         () => {
           textSelectRef?.blur();
@@ -64,7 +63,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, useAttrs, onBeforeMount, toRaw } from 'vue';
+import { ref, computed, useAttrs, toRaw, watch } from 'vue';
 import { Tools, axios, Environment, Formater } from '@/platform';
 import { FormFieldProps } from '@/platform/components/form/FormField.ts';
 import { FormFieldMethods } from '../form/FormField';
@@ -213,9 +212,31 @@ const rowClick = (args) => {
   isShow.value = false;
 };
 
+watch(
+  () => modelValue.value,
+  (newVal, oldVal) => {
+    if (newVal !== oldVal) {
+      fieldMethodsClass.updateValue(newVal);
+    }
+    if (Tools.isEmpty(newVal)) {
+      fieldMethodsClass.clearObjectValue();
+    } else if (newVal !== oldVal) {
+      if (modelObjectValue.value.length > 0) {
+        const tempValue = modelObjectValue.value.find((item) => item.value === newVal);
+        if (!tempValue) {
+          setObjectValueByValue(newVal);
+        }
+      } else {
+        setObjectValueByValue(newVal);
+      }
+    }
+  },
+);
+
 // 根据实际值设置显示值
 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',
@@ -231,12 +252,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) });
         });
@@ -245,10 +264,6 @@ const setObjectValueByValue = async (value) => {
   }
 };
 
-onBeforeMount(() => {
-  setObjectValueByValue(modelValue.value);
-});
-
 defineExpose({
   validate: fieldMethodsClass.validate,
   setValue: fieldMethodsClass.setValue,
diff --git a/io.sc.platform.core.frontend/src/platform/components/select/WUserSelect.vue b/io.sc.platform.core.frontend/src/platform/components/select/WUserSelect.vue
index 0e7f1415..87f4f897 100644
--- a/io.sc.platform.core.frontend/src/platform/components/select/WUserSelect.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/select/WUserSelect.vue
@@ -15,7 +15,6 @@
       :readonly="fieldMethodsClass.getReadOnly(props, { value: modelValue, displayValue: displayValueComputed })"
       :disable="fieldMethodsClass.getDisable(props, { value: modelValue, displayValue: displayValueComputed })"
       :clearable="false"
-      @update:model-value="fieldMethodsClass.updateValue"
       @focus="
         () => {
           textSelectRef?.blur();
@@ -85,7 +84,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, useAttrs, onBeforeMount, toRaw } from 'vue';
+import { ref, computed, useAttrs, toRaw, watch } from 'vue';
 import { Tools, axios, Environment, Formater } from '@/platform';
 import { FormFieldProps } from '@/platform/components/form/FormField.ts';
 import { FormFieldMethods } from '../form/FormField';
@@ -258,9 +257,31 @@ const orgRowClick = (args) => {
   userGridRef.value.refresh();
 };
 
+watch(
+  () => modelValue.value,
+  (newVal, oldVal) => {
+    if (newVal !== oldVal) {
+      fieldMethodsClass.updateValue(newVal);
+    }
+    if (Tools.isEmpty(newVal)) {
+      fieldMethodsClass.clearObjectValue();
+    } else if (newVal !== oldVal) {
+      if (modelObjectValue.value.length > 0) {
+        const tempValue = modelObjectValue.value.find((item) => item.value === newVal);
+        if (!tempValue) {
+          setObjectValueByValue(newVal);
+        }
+      } else {
+        setObjectValueByValue(newVal);
+      }
+    }
+  },
+);
+
 // 根据实际值设置显示值
 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',
@@ -276,12 +297,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) });
         });
@@ -290,10 +309,6 @@ const setObjectValueByValue = async (value) => {
   }
 };
 
-onBeforeMount(() => {
-  setObjectValueByValue(modelValue.value);
-});
-
 defineExpose({
   validate: fieldMethodsClass.validate,
   setValue: fieldMethodsClass.setValue,