lu-lowcode-package-form 0.10.61 → 0.10.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lu-lowcode-package-form",
-  "version": "0.10.61",
+  "version": "0.10.63",
   "dependencies": {
     "@ant-design/icons": "^4.8.1",
     "@dnd-kit/core": "^6.1.0",

package/src/components/field/select/search-select.jsx

@@ -13,6 +13,8 @@ const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsVal
     const currentPageRef = useRef(1);
     const currentPageSize = 10
     const isAllLoadedRef = useRef(false)
+    const isLoadingRef = useRef(false);
+    
     useEffect(() => {
         // console.log("SearchSelect useEffect props", props)
         if (value) {
@@ -192,17 +194,31 @@ const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsVal
         }
     };
 
+
     const loadMoreOptions = async () => {
-        if (isAllLoadedRef.current) return
-        const nextPageParams = { ...requestParams, page: currentPageRef.current + 1, pageSize: currentPageSize };
-        let newOptions = await fetchList(nextPageParams, null)
-        newOptions = await handleOptions(newOptions)
-        if (Array.isArray(newOptions) && newOptions.length > 0) {
-            setNOptions(prevOptions => [...prevOptions, ...newOptions]);
-        } else {
-            isAllLoadedRef.current = true
+        if (isAllLoadedRef.current || isLoadingRef.current) return; // 检查是否已加载完毕或正在加载
+
+        isLoadingRef.current = true; // 设置加载状态为 true
+
+        try {
+            const nextPageParams = { ...requestParams, page: currentPageRef.current + 1, pageSize: currentPageSize };
+            let newOptions = await fetchList(nextPageParams, null);
+            newOptions = await handleOptions(newOptions);
+            if (Array.isArray(newOptions) && newOptions.length > 0) {
+                setNOptions(prevOptions => {
+                    const existingValues = new Set(prevOptions.map(option => option.value));
+                    const filteredNewOptions = newOptions.filter(option => !existingValues.has(option.value));
+                    return [...prevOptions, ...filteredNewOptions];
+                });
+            } else {
+                isAllLoadedRef.current = true;
+            }
+            currentPageRef.current += 1;
+        } catch (error) {
+            console.error("加载更多选项时出错", error);
+        } finally {
+            isLoadingRef.current = false; // 重置加载状态
         }
-        currentPageRef.current = currentPageRef.current + 1;
     };
     return addWrapper ? (
         <BaseWrapper {...props}>