lu-lowcode-package-form 0.10.59 → 0.10.61

package/package.json

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

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

@@ -12,7 +12,7 @@ const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsVal
 
     const currentPageRef = useRef(1);
     const currentPageSize = 10
-    const [isAllLoaded, setIsAllLoaded] = useState(false)
+    const isAllLoadedRef = useRef(false)
     useEffect(() => {
         // console.log("SearchSelect useEffect props", props)
         if (value) {
@@ -79,6 +79,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)
         }
@@ -192,12 +193,16 @@ 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]);
-            currentPageRef.current = currentPageRef.current + 1;
+        } else {
+            isAllLoadedRef.current = true
         }
+        currentPageRef.current = currentPageRef.current + 1;
     };
     return addWrapper ? (
         <BaseWrapper {...props}>