lu-lowcode-package-form 0.11.39 → 0.11.41

package/package.json

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

package/src/App.jsx

@@ -631,7 +631,8 @@ function App() {
                 <Field.DatePicker defaultNow={true} label="日期时间" prompt="" datetype="date" __id="datetime2" />
 
                 <Field.WithSingleSelect ref={testRef}
-                  request={async (params) => {
+                  request={async (params, ruleParams, fieldName) => {
+                    console.log("request params", params, ruleParams, fieldName)
                     if (params?.ruleParams?.node_ocm009lpxt2 == 111)
                       return { code: 0, data: { list: [{ label: '选项1', value: '1', product_price11: "1111", product_price12: "2222", product_price1: 111 }, { label: '选项2', value: '2' }, { label: '选项3', value: '3' }] } }
                     else return { code: 0, data: { list: [{ label: '选项1', value: '1', product_price11: "1111", product_price12: "2222", product_price1: 111 }, { label: '选项2', value: '2' },] } }

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

@@ -19,10 +19,6 @@ const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsVal
     }, []);
     const callbackQueue = useRef([]);
 
-    useEffect(() => {
-        console.log("fieldName change props", fieldName)
-    }, [fieldName])
-
     useEffect(() => {
         // console.log("SearchSelect useEffect props", props)
         if (value) {
@@ -109,8 +105,8 @@ const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsVal
         await debounceFetchOptions(params)
     }
 
-    const debounceFetchOptions = debounce((params, ruleParams) => {
-        fetchOptions(params, ruleParams).then(result => {
+    const debounceFetchOptions = useCallback(debounce((params, ruleParams) => {
+        fetchOptions(params, ruleParams, fieldName).then(result => {
             // console.log(`[${props?.label}]debounceFetchOptions result`, result);
             while (callbackQueue.current.length > 0) {
                 const callback = callbackQueue.current.shift();
@@ -119,13 +115,13 @@ const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsVal
                 }
             }
         });
-    }, 200)
+    }, 200), [fieldName]);
 
-    const fetchList = async (params, ruleParams) => {
+    const fetchList = async (params, ruleParams, newFieldName) => {
         let list = []
         if (!(ruleParams && Object.values(ruleParams).some(value => value === "##norequest##"))) {
             setFetching(true)
-            const response = await request({ ...params, ruleParams }, form, fieldName);
+            const response = await request({ ...params, ruleParams }, form, newFieldName);
             setFetching(false)
             if (response.code > 0) {
                 callError && typeof callError === 'function' && callError(response.message);
@@ -155,9 +151,9 @@ const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsVal
         return list
     }
 
-    const fetchOptions = async (params, ruleParams) => {
+    const fetchOptions = async (params, ruleParams, newFieldName) => {
         try {
-            let list = await fetchList(params, ruleParams)
+            let list = await fetchList(params, ruleParams, newFieldName)
             list = await handleOptions(list)
             setNOptions(Array.isArray(list) ? list : [])
             return list

package/src/components/field/table/index.jsx

@@ -4,6 +4,7 @@ import { CopyOutlined, DeleteOutlined } from "@ant-design/icons";
 import { BaseWrapper } from "../base.jsx"
 import { nanoid } from "nanoid";
 import { eventEmitter } from '../../../utils/events'
+import { useMemoizedFn } from 'ahooks';
 
 const TableAction = ({ label, subTableIndex, children, subTableHead = false, ...props }) => {
     //fsticky fright-0 
@@ -83,7 +84,31 @@ const Table = ({ children, onTableAddRow, disabled, readonly, onTableRemoveRow,
         }
         return true
     }
+    const handleCopy = useMemoizedFn((index)=>{
+        let tableValues = form.getFieldValue(fieldName)
+        const copyRow = {...tableValues[index],__id:nanoid()}
+        tableValues.splice(index + 1, 0, copyRow)
+        form?.setFieldValue(fieldName, tableValues)
 
+        let changedFields = {}
+        let tableName = fieldName;
+        for (let i = index + 1; i < tableValues.length; i++) {
+            let value = tableValues[i]
+            for (let key in value) {
+                let changedFieldName = [tableName,i,key]
+                changedFields[changedFieldName] =  { name: changedFieldName, value: value[key] }
+            }
+        }
+        typeof recordFieldsChange == "function" && recordFieldsChange(changedFields,true)
+    })
+
+    const handleRemove = useMemoizedFn((index)=>{
+        let tableValues = form.getFieldValue(fieldName)
+        tableValues.splice(index, 1)
+        form?.setFieldValue(fieldName, tableValues) 
+        typeof onTableRemoveRow === "function" && onTableRemoveRow(childrenIds);
+        typeof removeLastFieldsValues === "function" && removeLastFieldsValues(`${name},${index}`,true)
+    })
     if (props.isRequired)
         rules.push({ required: true, message: `子表[${props.label}]必须填写` });
     return <Form.List name={name} rules={rules}>
@@ -200,31 +225,12 @@ const Table = ({ children, onTableAddRow, disabled, readonly, onTableRemoveRow,
                                 </TableCol>
                             })}
                             {disabled != true && readonly != true && <TableAction subTableHead={index == 0} key={`row_${index}_action`} subTable={true} subTableIndex={index} label={"操作"}>
-                                {isAllowCopy && <CopyOutlined className="fcursor-pointer" onClick={() => {
-                                    let tableValues = form.getFieldValue(fieldName)
-                                    const copyRow = {...tableValues[index],__id:nanoid()}
-                                    tableValues.splice(index + 1, 0, copyRow)
-                                    form?.setFieldValue(fieldName, tableValues)
-
-                                    let changedFields = {}
-                                    let tableName = fieldName;
-                                    for (let i = index + 1; i < tableValues.length; i++) {
-                                        let value = tableValues[i]
-                                        for (let key in value) {
-                                            let changedFieldName = [tableName,i,key]
-                                            changedFields[changedFieldName] =  { name: changedFieldName, value: value[key] }
-                                        }
-                                    }
-                                    typeof recordFieldsChange == "function" && recordFieldsChange(changedFields,true)
-                                }} />}
+                                {isAllowCopy && <CopyOutlined className="fcursor-pointer" onClick={()=>handleCopy(index)} />}
                                 <Popconfirm
                                     title="删除确认"
                                     description="确定要删除这一行吗？"
                                     onConfirm={() => {
-                                        remove(index)
-                                        typeof onTableRemoveRow === "function" && onTableRemoveRow(childrenIds);
-                                        console.log("removeLastFieldsValues", typeof removeLastFieldsValues)
-                                        typeof removeLastFieldsValues === "function" && removeLastFieldsValues(`${name},${index}`,true)
+                                        handleRemove(index)
                                     }}
                                     okText="确定"
                                     cancelText="取消"