From 12d9f4e03c0331efc9a656356e78b9f314639707 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 18 三月 2026 17:07:57 +0800
Subject: [PATCH] lsh#

---
 rsf-admin/src/page/components/DictionarySelect.jsx |   67 +++++++++++++++++++++++----------
 1 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/rsf-admin/src/page/components/DictionarySelect.jsx b/rsf-admin/src/page/components/DictionarySelect.jsx
index 41101ee..316efe5 100644
--- a/rsf-admin/src/page/components/DictionarySelect.jsx
+++ b/rsf-admin/src/page/components/DictionarySelect.jsx
@@ -3,27 +3,28 @@
 import {
     Button, useListContext, SelectInput,
     required, SelectArrayInput,
-    useTranslate, useNotify
+    useTranslate, useNotify,
+    AutocompleteInput, AutocompleteArrayInput
 } from 'react-admin';
 import { useFormContext } from 'react-hook-form';
 import request from '@/utils/request';
 
 const DictionarySelect = (props) => {
-    const { 
-        dictTypeCode, 
-        name, 
+    const {
+        dictTypeCode,
+        name,
         group,
-        multiple = false, 
+        multiple = false,
         perPage = 100,  // 榛樿姣忛〉鏄剧ず100鏉℃暟鎹�
         page = 1,       // 榛樿绗竴椤�
-        ...parmas 
+        ...parmas
     } = props;
     const translate = useTranslate();
     const notify = useNotify();
     const { watch } = useFormContext();
     const [list, setList] = useState([]);
     const [loading, setLoading] = useState(false);
-    
+
     // 鑾峰彇褰撳墠琛ㄥ崟鍊�
     const currentValue = watch(name);
 
@@ -34,13 +35,13 @@
     const http = async () => {
         setLoading(true);
         try {
-            const res = await request.post('/dictData/page', { 
+            const res = await request.post('/dictData/page', {
                 dictTypeCode,
                 group,
                 current: page,
                 pageSize: perPage
             });
-            
+
             if (res?.data?.code === 200) {
                 setList(res.data.data.records.map((item) => {
                     return {
@@ -64,29 +65,53 @@
         if (!list || list.length === 0) {
             // 濡傛灉鍒楄〃涓虹┖浣嗗綋鍓嶆湁鍊硷紝娣诲姞鍗犱綅閫夐」浠ラ伩鍏嶈鍛�
             if (currentValue !== undefined && currentValue !== null && currentValue !== '') {
+                if (multiple && Array.isArray(currentValue)) {
+                    return currentValue.map(v => ({ id: v, name: String(v) }));
+                }
                 return [{ id: currentValue, name: String(currentValue) }];
             }
             return [];
         }
-        
-        // 妫�鏌ュ綋鍓嶅�兼槸鍚﹀湪閫夐」涓�
-        const valueExists = list.some(item => String(item.id) === String(currentValue));
-        
-        // 濡傛灉褰撳墠鍊间笉鍦ㄩ�夐」涓紝娣诲姞瀹冿紙鍙兘鏄姞杞藉欢杩熷鑷寸殑锛�
-        if (currentValue !== undefined && currentValue !== null && currentValue !== '' && !valueExists) {
-            return [...list, { id: currentValue, name: String(currentValue) }];
-        }
-        
-        return list;
-    }, [list, currentValue]);
 
-    const InputComponent = multiple ? SelectArrayInput : SelectInput;
+        if (currentValue !== undefined && currentValue !== null && currentValue !== '') {
+            if (multiple && Array.isArray(currentValue)) {
+                let newChoices = [...list];
+                currentValue.forEach(val => {
+                    const exists = newChoices.some(item => String(item.id) === String(val));
+                    if (!exists) {
+                        newChoices.push({ id: val, name: String(val) });
+                    }
+                });
+                return newChoices;
+            } else {
+                // 妫�鏌ュ綋鍓嶅�兼槸鍚﹀湪閫夐」涓�
+                const valueExists = list.some(item => String(item.id) === String(currentValue));
+
+                // 濡傛灉褰撳墠鍊间笉鍦ㄩ�夐」涓紝娣诲姞瀹冿紙鍙兘鏄姞杞藉欢杩熷鑷寸殑锛�
+                if (!valueExists) {
+                    return [...list, { id: currentValue, name: String(currentValue) }];
+                }
+            }
+        }
+
+        return list;
+    }, [list, currentValue, multiple]);
+
+    const InputComponent = multiple ? AutocompleteArrayInput : AutocompleteInput;
 
     return (
         <InputComponent
             source={name}
             choices={choices}
             isLoading={loading}
+            options={{
+                ListboxProps: {
+                    style: {
+                        maxHeight: '200px',
+                    }
+                },
+                ...(parmas.options || {})
+            }}
             {...parmas}
         />
     );

--
Gitblit v1.9.1