lu-lowcode-package-form 0.10.58 → 0.10.60

package/package.json

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

package/src/App.jsx

@@ -322,6 +322,7 @@ function App() {
             
                     let result =  { code: 0, data: { list: pageData } };
                     console.log("request result", result)
+                    await new Promise(resolve => setTimeout(resolve, 200))
                     return result
                   }}
                   option_label="label"

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

@@ -139,30 +139,32 @@ const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsVal
         }
         return list
     }
+    const handleOptions = async (list) => {
+        if (Array.isArray(list)) {
+            for (let index = 0; index < list.length; index++) {
+                const item = list[index];
+                if (typeof subRequest == "function") {
+                    let subList = []
+                    const { data } = await subRequest(item)
+                    if (data?.list && Array.isArray(data.list)) {
+                        subList = data.list.map(subItem => ({ label: `${item[option_label]}-${subItem[sub_option_label]}`, value: `${item[option_value]}-${subItem[sub_option_value]}` }))
+                    }
+                    list[index] = { ...item, label: item[option_label], title: item[option_label], options: subList }
+                }
+                list[index] = { ...item, label: item[option_label], value: item[option_value] }
+            }
+            if (nOptions.length > 0 && !isEqual(nOptions, list)) {
+                typeof onChange === 'function' && onChange(undefined)
+            }
+        }
+        return list
+    }
 
     const fetchOptions = async (params, ruleParams) => {
         try {
             let list = await fetchList(params, ruleParams)
-
-            if (Array.isArray(list)) {
-                for (let index = 0; index < list.length; index++) {
-                    const item = list[index];
-                    if (typeof subRequest == "function") {
-                        let subList = []
-                        const { data } = await subRequest(item)
-                        if (data?.list && Array.isArray(data.list)) {
-                            subList = data.list.map(subItem => ({ label: `${item[option_label]}-${subItem[sub_option_label]}`, value: `${item[option_value]}-${subItem[sub_option_value]}` }))
-                        }
-                        list[index] = { ...item, label: item[option_label], title: item[option_label], options: subList }
-                    }
-                    list[index] = { ...item, label: item[option_label], value: item[option_value] }
-                }
-                if (nOptions.length > 0 && !isEqual(nOptions, list)) {
-                    typeof onChange === 'function' && onChange(undefined)
-                }
-                setNOptions(list)
-            }
-            else setNOptions([])
+            list = await handleOptions(list)
+            setNOptions(Array.isArray(list) ? list : [])
             return list
         } catch (error) {
             console.error("fetchOptions", error)
@@ -192,6 +194,7 @@ 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;