From 040d5d0d2c7f5a857c7d57e56dd6050940f62e4a Mon Sep 17 00:00:00 2001
From: parisma <parisma@tencent.com>
Date: Thu, 8 Sep 2022 17:32:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(form):=20select=E5=8A=A8=E6=80=81=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC=E4=BA=8B=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/form/src/fields/Select.vue | 47 +++++++++++------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/packages/form/src/fields/Select.vue b/packages/form/src/fields/Select.vue
index d9f0c054..3770222d 100644
--- a/packages/form/src/fields/Select.vue
+++ b/packages/form/src/fields/Select.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, inject, onBeforeMount, onMounted, PropType, Ref, ref, watch } from 'vue';
+import { defineComponent, inject, onBeforeMount, onMounted, PropType, Ref, ref, watchEffect } from 'vue';
 
 import { FormState, SelectConfig, SelectGroupOption, SelectOption } from '../schema';
 import { getConfig } from '../utils/config';
@@ -264,35 +264,24 @@ export default defineComponent({
     };
 
     if (typeof props.config.options === 'function') {
-      watch(
-        () => mForm?.values,
-        () => {
-          typeof props.config.options === 'function' &&
-            Promise.resolve(
-              props.config.options(mForm, {
-                model: props.model,
-                prop: props.prop,
-                formValues: mForm?.values,
-                formValue: mForm?.values,
-                config: props.config,
-              }),
-            ).then((data) => {
-              options.value = data;
-            });
-        },
-        {
-          deep: true,
-          immediate: true,
-        },
-      );
+      watchEffect(() => {
+        typeof props.config.options === 'function' &&
+          Promise.resolve(
+            props.config.options(mForm, {
+              model: props.model,
+              prop: props.prop,
+              formValues: mForm?.values,
+              formValue: mForm?.values,
+              config: props.config,
+            }),
+          ).then((data) => {
+            options.value = data;
+          });
+      });
     } else if (Array.isArray(props.config.options)) {
-      watch(
-        () => props.config.options,
-        () => {
-          options.value = props.config.options as SelectOption[] | SelectGroupOption[];
-        },
-        { immediate: true },
-      );
+      watchEffect(() => {
+        options.value = props.config.options as SelectOption[] | SelectGroupOption[];
+      });
     } else if (props.config.option) {
       onBeforeMount(() => {
         if (!props.model) return;