From 4a295a216f23fbb974e2eaa57c4077d216f3a053 Mon Sep 17 00:00:00 2001
From: "bai.jingfeng" <bai.jingfeng@foxmail.com>
Date: Mon, 25 Mar 2024 21:34:08 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=BE=93=E5=85=A5=E8=B7=9F=E8=B8=AA=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E7=AD=9B=E9=80=89=E9=A1=B9=E9=A1=B6=E9=83=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E7=94=A8=E6=88=B7=E7=9A=84=E5=8E=9F?=
 =?UTF-8?q?=E5=A7=8B=E8=BE=93=E5=85=A5=20(#491)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-on: https://git.daoyoucloud.com/daoyoucloud/tachycode/pulls/491
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
---
 .../plugins/@hera/plugin-core/package.json    |  2 +-
 .../auto-complete/AutoComplete.tsx            | 50 ++++++++++++-------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/packages/plugins/@hera/plugin-core/package.json b/packages/plugins/@hera/plugin-core/package.json
index c01d46650..e53750b03 100644
--- a/packages/plugins/@hera/plugin-core/package.json
+++ b/packages/plugins/@hera/plugin-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hera/plugin-core",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "displayName": "Hera platform",
   "displayName.zh-CN": "赫拉平台",
   "description": "Hera platform as nocobase plugin.",
diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-components/auto-complete/AutoComplete.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-components/auto-complete/AutoComplete.tsx
index de3fa1f19..65fbc413d 100644
--- a/packages/plugins/@hera/plugin-core/src/client/schema-components/auto-complete/AutoComplete.tsx
+++ b/packages/plugins/@hera/plugin-core/src/client/schema-components/auto-complete/AutoComplete.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import { AutoComplete as AntdAutoComplete } from 'antd';
 import { connect, useFieldSchema } from '@formily/react';
 import { useAPIClient } from '@nocobase/client';
@@ -8,42 +8,54 @@ import { fuzzysearch } from '../../utils';
 export const AutoComplete = connect((props) => {
   const { fieldNames, params: fieldFilter } = props;
   const fieldSchema = useFieldSchema();
-  const [defultValue, setDefultValue] = useState([]);
+  const targetKey = fieldNames.value;
   const api = useAPIClient();
+  const [defultOptions, setDefultOptions] = useState([]);
   const [options, setOptions] = useState([]);
+
+  const getNoDuplicateTextOptions = (rawOptions) => {
+    const targetOptions = rawOptions.filter((option, index, self) => {
+      return self.findIndex((item) => item[targetKey] === option[targetKey]) === index;
+    });
+    return targetOptions;
+  };
+
   useAsyncEffect(async () => {
-    const defultOptions = await api.request({
+    const {
+      data: { data: rawOptions },
+    } = await api.request({
       url: fieldSchema['collectionName'] + ':list',
       params: {
         pageSize: 99999,
         filter: fieldFilter ? { ...fieldFilter.filter } : {},
       },
     });
-    changLable(defultOptions?.data?.data);
+    const targetOptions = getNoDuplicateTextOptions(rawOptions);
+    setDefultOptions(targetOptions);
+    setOptions(targetOptions);
   }, [fieldFilter?.filter, fieldSchema['collectionName']]);
 
-  useEffect(() => {
-    changLable(defultValue);
-  }, [fieldNames?.label]);
-
-  const changLable = (defultOptions) => {
-    if (defultOptions) {
-      const items = [];
-      defultOptions.forEach((item) => {
-        if (!items.filter((option) => option[fieldNames.value] === item[fieldNames.value]).length) {
-          items.push(item);
-        }
-      });
-      setDefultValue(items);
-      setOptions(items);
+  const onSearch = (value) => {
+    // 在筛选项开头跟踪用户的原始输入值
+    if (value) {
+      setOptions([
+        {
+          [targetKey]: value,
+        },
+        ...defultOptions,
+      ]);
+    } else {
+      setOptions(defultOptions);
     }
   };
+
   return (
     <AntdAutoComplete
       {...props}
       options={options}
-      filterOption={(inputValue, option) => fuzzysearch(inputValue, option[fieldNames.value].toString())}
+      filterOption={(inputValue, option) => fuzzysearch(inputValue, option[targetKey].toString())}
       allowClear
+      onSearch={onSearch}
     />
   );
 });