From f314826230d5c584edd95ac6f7905f454f311e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=AA=E5=BF=86?= <1455668754@qq.com>
Date: Mon, 29 Jul 2024 15:18:30 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20ApiSelect=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 56c5dce99f8285f3ca13d18e6c8bd139d27313ca.
---
 .../Form/src/components/ApiSelect.vue         | 68 ++-----------------
 1 file changed, 6 insertions(+), 62 deletions(-)

diff --git a/src/components/Form/src/components/ApiSelect.vue b/src/components/Form/src/components/ApiSelect.vue
index 8a444e15..df59336d 100644
--- a/src/components/Form/src/components/ApiSelect.vue
+++ b/src/components/Form/src/components/ApiSelect.vue
@@ -3,7 +3,6 @@
     @dropdown-visible-change="handleFetch"
     v-bind="$attrs"
     @change="handleChange"
-    @search="debounceSearchFn"
     :options="getOptions"
     v-model:value="state"
   >
@@ -21,37 +20,26 @@
     </template>
   </Select>
 </template>
-
 <script lang="ts" setup>
-  import { computed, PropType, ref, unref, watch } from 'vue';
+  import { PropType, ref, computed, unref, watch } from 'vue';
   import { Select } from 'ant-design-vue';
   import type { SelectValue } from 'ant-design-vue/es/select';
-  import { isEmpty, isFunction } from '@/utils/is';
+  import { isFunction } from '@/utils/is';
   import { useRuleFormItem } from '@/hooks/component/useFormItem';
-  import { assignIn, get, isEqual, omit } from 'lodash-es';
+  import { get, omit, isEqual } from 'lodash-es';
   import { LoadingOutlined } from '@ant-design/icons-vue';
   import { useI18n } from '@/hooks/web/useI18n';
   import { propTypes } from '@/utils/propTypes';
-  import { useDebounceFn } from '@vueuse/core';
 
   type OptionsItem = { label?: string; value?: string; disabled?: boolean; [name: string]: any };
 
-  type ApiSearchOption = {
-    // 待搜索字段名
-    searchName?: string;
-    // 搜索前置方法
-    beforeFetch?: (value?: string) => Promise<string>;
-    // 拦截方法
-    interceptFetch?: (value?: string) => Promise<boolean>;
-  };
-
   defineOptions({ name: 'ApiSelect', inheritAttrs: false });
 
   const props = defineProps({
     value: { type: [Array, Object, String, Number] as PropType<SelectValue> },
     numberToString: propTypes.bool,
     api: {
-      type: Function as PropType<(arg?: any) => Promise<OptionsItem[] | Recordable>>,
+      type: Function as PropType<(arg?: any) => Promise<OptionsItem[] | Recordable<any>>>,
       default: null,
     },
     // api params
@@ -66,10 +54,6 @@
       type: Array<OptionsItem>,
       default: [],
     },
-    apiSearch: {
-      type: Object as PropType<ApiSearchOption>,
-      default: () => null,
-    },
     beforeFetch: {
       type: Function as PropType<Fn>,
       default: null,
@@ -88,7 +72,6 @@
   // 首次是否加载过了
   const isFirstLoaded = ref(false);
   const emitData = ref<OptionsItem[]>([]);
-  const searchParams = ref<any>({});
   const { t } = useI18n();
 
   // Embedded in the form, just use the hook binding to perform form verification
@@ -127,29 +110,16 @@
     { deep: true, immediate: props.immediate },
   );
 
-  watch(
-    () => searchParams.value,
-    (value, oldValue) => {
-      if (isEmpty(value) || isEqual(value, oldValue)) return;
-      (async () => {
-        await fetch();
-        searchParams.value = {};
-      })();
-    },
-    { deep: true, immediate: props.immediate },
-  );
-
   async function fetch() {
     let { api, beforeFetch, afterFetch, params, resultField } = props;
     if (!api || !isFunction(api) || loading.value) return;
     optionsRef.value = [];
     try {
       loading.value = true;
-      let apiParams = assignIn({}, params, searchParams.value);
       if (beforeFetch && isFunction(beforeFetch)) {
-        apiParams = (await beforeFetch(apiParams)) || apiParams;
+        params = (await beforeFetch(params)) || params;
       }
-      let res = await api(apiParams);
+      let res = await api(params);
       if (afterFetch && isFunction(afterFetch)) {
         res = (await afterFetch(res)) || res;
       }
@@ -182,32 +152,6 @@
     }
   }
 
-  let debounceSearchFn = useDebounceFn(handleSearch, 500);
-
-  async function handleSearch(value: any) {
-    if (!props.apiSearch) {
-      return;
-    }
-    const { searchName, beforeFetch, interceptFetch } = props.apiSearch;
-    if (!searchName) {
-      return;
-    }
-
-    value = value || undefined;
-    if (beforeFetch && isFunction(beforeFetch)) {
-      value = (await beforeFetch(value)) || value;
-    }
-
-    if (interceptFetch && isFunction(interceptFetch)) {
-      if (!(await interceptFetch(value))) {
-        return;
-      }
-    }
-    searchParams.value = {
-      [searchName]: value,
-    };
-  }
-
   function emitChange() {
     emit('options-change', unref(getOptions));
   }