From 857c2d495bb0b66f9c89b74de15d7fb78bfc75e8 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 10 Oct 2023 11:17:14 +0800
Subject: [PATCH] =?UTF-8?q?fix(ApiSelect):=20=E7=A7=BB=E9=99=A4watchEffect?=
 =?UTF-8?q?=E5=BC=95=E5=8F=91=E7=9A=84=E9=87=8D=E5=A4=8D=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Form/src/components/ApiSelect.vue         | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/components/Form/src/components/ApiSelect.vue b/src/components/Form/src/components/ApiSelect.vue
index 2104bba..22afd70 100644
--- a/src/components/Form/src/components/ApiSelect.vue
+++ b/src/components/Form/src/components/ApiSelect.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, ref, unref, watch, watchEffect } from 'vue'
+import { computed, ref, unref, watch } from 'vue'
 import { Select } from 'ant-design-vue'
 import { get, omit } from 'lodash-es'
 import { LoadingOutlined } from '@ant-design/icons-vue'
@@ -39,7 +39,8 @@ interface OptionsItem { label: string; value: string; disabled?: boolean }
 
 const options = ref<OptionsItem[]>([])
 const loading = ref(false)
-const isFirstLoad = ref(true)
+// 首次是否加载过了
+const isFirstLoaded = ref(false)
 const emitData = ref<any[]>([])
 const { t } = useI18n()
 
@@ -62,10 +63,6 @@ const getOptions = computed(() => {
   }, [] as OptionsItem[])
 })
 
-watchEffect(() => {
-  props.immediate && !props.alwaysLoad && fetch()
-})
-
 watch(
   () => state.value,
   (v) => {
@@ -80,19 +77,20 @@ watch(
       fetch()
 
     else
-      !unref(isFirstLoad) && fetch()
+      !unref(isFirstLoaded) && fetch()
   },
-  { deep: true },
+  { deep: true, immediate: props.immediate },
 )
 
 async function fetch() {
   const api = props.api
-  if (!api || !isFunction(api))
+  if (!api || !isFunction(api) || loading.value)
     return
   options.value = []
   try {
     loading.value = true
     const res = await api(props.params)
+    isFirstLoaded.value = true
     if (Array.isArray(res)) {
       options.value = res
       emitChange()
@@ -111,14 +109,14 @@ async function fetch() {
   }
 }
 
-async function handleFetch(open) {
+async function handleFetch(open: boolean) {
   if (open) {
     if (props.alwaysLoad) {
       await fetch()
     }
-    else if (!props.immediate && unref(isFirstLoad)) {
+    else if (!props.immediate && !unref(isFirstLoaded)) {
       await fetch()
-      isFirstLoad.value = false
+      isFirstLoaded.value = false
     }
   }
 }