lu-lowcode-package-form 0.11.40 → 0.11.41

package/package.json

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

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="取消"