lu-lowcode-package-form 0.10.60 → 0.10.62

package/package.json

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

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

@@ -12,7 +12,9 @@ const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsVal
 
     const currentPageRef = useRef(1);
     const currentPageSize = 10
-    const [isAllLoaded, setIsAllLoaded] = useState(false)
+    const isAllLoadedRef = useRef(false)
+    const isLoadingRef = useRef(false);
+    
     useEffect(() => {
         // console.log("SearchSelect useEffect props", props)
         if (value) {
@@ -79,6 +81,7 @@ const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsVal
         let item = null
         const ruleParams = {}
         currentPageRef.current = 1
+        isAllLoadedRef.current = false
         if (request && typeof request === 'function') {
             debounceFetchOptions(params, ruleParams)
         }
@@ -191,13 +194,26 @@ const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsVal
         }
     };
 
+
     const loadMoreOptions = async () => {
-        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]);
-            currentPageRef.current = currentPageRef.current + 1;
+        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 => [...prevOptions, ...newOptions]);
+            } else {
+                isAllLoadedRef.current = true;
+            }
+            currentPageRef.current += 1;
+        } catch (error) {
+            console.error("加载更多选项时出错", error);
+        } finally {
+            isLoadingRef.current = false; // 重置加载状态
         }
     };
     return addWrapper ? (