lu-lowcode-package-form 0.10.42 → 0.10.43

package/package.json

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

package/src/App.jsx

@@ -259,7 +259,11 @@ function App() {
             <Layout.FormRow layout={'1'}>
               <Field.Number label="测试规则" isRequired={true} __id="ceshi_rule1" />
             </Layout.FormRow>
-
+            <Layout.FormRow layout={'1'}>
+              <Field.Table label="子表格" __id="table2" >
+                <Field.Number label="测试规则2"  __id="ceshi_rule2" />
+              </Field.Table>
+            </Layout.FormRow>
             <Layout.FormRow layout={'1'}>
               <Field.Table label="子表格" __id="table"  >
 

package/src/components/field/base.jsx

@@ -24,7 +24,7 @@ export const BaseWrapper = ({
     hidePrompt = false,
     subTableIndex,
     addWrapper = true,
-    calcHidden,
+    calcHidden = false,
     defaultValue,
     value,
     onChange,

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

@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from "react";
-import { Button, Form, Input } from "antd";
-import { DeleteOutlined } from "@ant-design/icons";
+import { Button, Form, Input,Popconfirm } from "antd";
+import { CopyOutlined, DeleteOutlined } from "@ant-design/icons";
 import { BaseWrapper } from "../base.jsx"
 import { type } from "@testing-library/user-event/dist/type/index.js";
 import { nanoid } from "nanoid";
@@ -11,7 +11,7 @@ const TableAction = ({ label, subTableIndex, children, subTableHead = false, ...
     return <div className="fw-12  ">
         <div className="frelative fw-full fh-full fflex fflex-col foverflow-hidden">
             {label && subTableHead && <div className='fh-12 ffont-semibold fbg-[#fafafa] ftext-sm fflex fflex-nowrap ftext-nowrap fjustify-between fitems-center fpx-2 fborder-b'>{label}</div>}
-            <div className="fw-full fflex-1 fflex fitems-center fjustify-center fp-2 fbox-border ">
+            <div className="fw-full fflex-1 fflex fitems-center fjustify-center fp-2 fbox-border fgap-2 ">
                 {children}
             </div>
         </div>
@@ -30,7 +30,7 @@ const TableCol = ({ children, width, hidden, ...props }) => {
     </div>
 }
 
-const Table = ({ children, onTableAddRow, disabled, readonly, onTableRemoveRow, form, fieldName, initializeFormRender,recordFieldsChange, mode, ...props }) => {
+const Table = ({ children, onTableAddRow, disabled, readonly, onTableRemoveRow, form, fieldName, initializeFormRender, recordFieldsChange, mode, ...props }) => {
     useEffect(() => {
         // console.log("Table form reload", form)
     }, [form])
@@ -169,10 +169,24 @@ 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={"操作"}>
-                                <DeleteOutlined className="fcursor-pointer" onClick={() => {
-                                    remove(index)
-                                    typeof onTableRemoveRow === "function" && onTableRemoveRow(childrenIds);
+                                <CopyOutlined className="fcursor-pointer" onClick={() => {
+                                    let tableValues = form.getFieldValue(fieldName)
+                                    const copyRow = {...tableValues[index]}
+                                    tableValues.splice(index + 1, 0, copyRow)
+                                    form?.setFieldValue(fieldName, tableValues)
                                 }} />
+                                <Popconfirm
+                                    title="删除确认"
+                                    description="确定要删除这一行吗？"
+                                    onConfirm={() => {
+                                        remove(index)
+                                        typeof onTableRemoveRow === "function" && onTableRemoveRow(childrenIds);
+                                    }}
+                                    okText="确定"
+                                    cancelText="取消"
+                                >
+                                    <DeleteOutlined className="fcursor-pointer ftext-red-500" />
+                                </Popconfirm>
                             </TableAction>}
                         </div>
                     ))}