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 @@