From 1ea4008998d9d2781014b28531c41762ea047e99 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Wed, 18 Oct 2023 16:54:24 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/5467=E3=80=91ApiSelect=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=A6=86=E7=9B=96=E4=BA=86=E7=94=A8=E6=88=B7=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Form/src/components/ApiSelect.vue         | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/components/Form/src/components/ApiSelect.vue b/src/components/Form/src/components/ApiSelect.vue
index f52f4d6..8a824aa 100644
--- a/src/components/Form/src/components/ApiSelect.vue
+++ b/src/components/Form/src/components/ApiSelect.vue
@@ -1,5 +1,5 @@
 <template>
-  <Select @dropdownVisibleChange="handleFetch" v-bind="attrs_" @change="handleChange" :options="getOptions" v-model:value="state" :filterOption="filterOption">
+  <Select @dropdownVisibleChange="handleFetch" v-bind="attrs_" @change="handleChange" :options="getOptions" v-model:value="state">
     <template #[item]="data" v-for="item in Object.keys($slots)">
       <slot :name="item" v-bind="data || {}"></slot>
     </template>
@@ -66,11 +66,24 @@
       // update-begin--author:liaozhiyang---date:20230830---for：【QQYUN-6308】解决警告
       let vModalValue: any;
       const attrs_ = computed(() => {
-        let obj: any = unref(attrs);
+        let obj: any = unref(attrs) || {};
         if (obj && obj['onUpdate:value']) {
           vModalValue = obj['onUpdate:value'];
           delete obj['onUpdate:value'];
         }
+        // update-begin--author:liaozhiyang---date:20231017---for：【issues/5467】ApiSelect修复覆盖了用户传递的方法
+        if (obj['filterOption'] === undefined) {
+          // update-begin--author:liaozhiyang---date:20230904---for：【issues/5305】无法按照预期进行搜索
+          obj['filterOption'] = (inputValue, option) => {
+            if (typeof option['label'] === 'string') {
+              return option['label'].toLowerCase().indexOf(inputValue.toLowerCase()) != -1;
+            } else {
+              return true;
+            }
+          };
+          // update-end--author:liaozhiyang---date:20230904---for：【issues/5305】无法按照预期进行搜索
+        }
+        // update-end--author:liaozhiyang---date:20231017---for：【issues/5467】ApiSelect修复覆盖了用户传递的方法
         return obj;
       });
       // update-begin--author:liaozhiyang---date:20230830---for：【QQYUN-6308】解决警告
@@ -154,17 +167,7 @@
         emitData.value = args;
       }
 
-      // update-begin--author:liaozhiyang---date:20230904---for：【issues/5305】无法按照预期进行搜索
-      const filterOption = (inputValue, option) => {
-        if (typeof option['label'] === 'string') {
-          return option['label'].toLowerCase().indexOf(inputValue.toLowerCase()) != -1;
-        } else {
-          return true;
-        }
-      };
-      // update-begin--author:liaozhiyang---date:20230904---for：【issues/5305】无法按照预期进行搜索
-
-      return { state, attrs_, attrs, getOptions, loading, t, handleFetch, handleChange, filterOption };
+      return { state, attrs_, attrs, getOptions, loading, t, handleFetch, handleChange };
     },
   });
 </script>