lu-lowcode-package-form 0.10.77 → 0.10.79

package/package.json

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

package/src/App.jsx

@@ -370,7 +370,7 @@ function App() {
 
               ]} label="发票类型" options={[{ label: '选项1', value: '1', shuilv: 15, }, { label: '选项2', value: '2', shuilv: 50 }, { label: '选项3', value: '3', shuilv: 2 }]} __id="fapiaoleixing" />
 
-            <Field.Number label="税率（%）" __id="shuilv" calcHidden={true} />
+            <Field.Number label="税率（%）" __id="shuilv"  />
 
             <Field.WithSingleSelect ref={testRef} fillRules={[
               {
@@ -468,94 +468,7 @@ function App() {
             <Layout.FormRow layout={'1'}>
               <Field.Table label="子表格" __id="table" isAllowAdd={true} isAllowCopy={false} >
 
-                <Field.WithSingleSelect
-                  ref={testRef}
-                  request={async (params) => {
-                    console.log("request params", params)
-                    return { code: 0, data: { list: [{ label: '选项1', value: '1', tianchong2: { label: '选项2', value: '2' }, tcinput1: "1111", }, { label: '选项2', value: '2' }, { label: '选项3', value: '3' }] } }
-                  }}
-                  option_label="label"
-                  option_value="value"
-                  fillRules={[
-                    {
-                      "id": "636d3924-0298-4e9b-809a-26d4a10d7b19",
-                      "type": 0,
-                      "source": "tianchong2",
-                      "target": "tianchong2",
-                      "subRules": [
-                      ]
-                    },
-                    {
-                      "id": "636d3924-0298-4e9b-809a-26d4a10d7b11",
-                      "type": 0,
-                      "source": "tcinput1",
-                      "target": "tcinput1",
-                      "subRules": [
-                      ]
-                    },
-
-                  ]} label="测试填充1" __id="tianchong1" />
-                <Field.WithSingleSelect
-                  ref={testRef}
-                  request={async (params) => {
-                    if (!params?.value) return { code: 0, data: { list: [{ label: '选项1', value: '1', }] } }
-                    await new Promise(resolve => setTimeout(resolve, 200))
-                    return { code: 0, data: { list: [{ label: '选项1', value: '1', }, { label: '选项2', value: '2', tcinput1: "8989", tcinput2: "2222" }, { label: '选项3', value: '3' }] } }
-                  }}
-                  option_label="label"
-                  option_value="value"
-                  option_search="label"
-                  fillRules={[
-                    {
-                      "id": "636d3924-0298-4e9b-809a-16d4a10d7b29",
-                      "type": 0,
-                      "source": "tcinput1",
-                      "target": "tcinput1",
-                      "subRules": [
-                      ]
-                    },
-                    {
-                      "id": "636d3924-0298-4e9b-809a-26d4a10d7b29",
-                      "type": 0,
-                      "source": "tcinput2",
-                      "target": "tcinput2",
-                      "subRules": [
-                      ]
-                    },
-
-                  ]} label="测试填充2" __id="tianchong2" />
-                <Field.Input label="测试被填充1" __id="tcinput1" />
-                <Field.Input label="测试被填充2" __id="tcinput2" />
-                <Field.Input label="测试被填充计算" __id="tcinput3"
-                  withIds={["table.tcinput2"]}
-                  withFill={{
-                    "value": [
-                      {
-                        "insert": {
-                          "span": true
-                        },
-                        "attributes": {
-                          "id": "table.tcinput2",
-                          "color": "blue",
-                          "tagKey": "fieldsValue",
-                          "content": "当前表单.测试被填充2"
-                        }
-                      },
-                      {
-                        "insert": "* 0.5"
-                      },
-                      {
-                        "insert": "\n\n"
-                      }
-                    ],
-                    "version": 1719296886283,
-                    "withData": [
-
-                    ]
-                  }}
-                />
-
-                <Field.Number label="税率（%）" calcHidden={true} __id="shuilv_table" withIds={[
+                <Field.Number label="税率（%）"  __id="shuilv_table" withIds={[
                   "shuilv"
                 ]}
                   withFill={{

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

@@ -8,7 +8,7 @@ import { createPromiseWrapper } from "../../../utils"
 import { useCreation } from 'ahooks';
 
 
-const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsValue, shouldUpdateKey, value, type, defaultValue, onChange, option_label, option_value, option_search, options, request, requestParams, callError, subRequest, sub_option_label = "label", mode = "single", sub_option_value = "id", rightIconRender, rightIcon, rightIconClick, recordFieldsChange, ...props }, ref) => {
+const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsValue, shouldUpdateKey, value, type, defaultValue, onChange, option_label, option_value, option_search, options, request, requestParams, callError, subRequest, sub_option_label = "label", mode = "single", sub_option_value = "id", rightIconRender, rightIcon, rightIconClick, recordFieldsChange, getAllWithIds,removeLastFieldsValues, ...props }, ref) => {
     const [nOptions, setNOptions] = React.useState([])
     const [fetching, setFetching] = useState(false);
 
@@ -221,7 +221,7 @@ const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsVal
 
             </OriginalSelect>
             {!props?.disabled && rightIcon}
-            {!props?.disabled && typeof rightIconRender === 'function' && rightIconRender({ value, onChange, form, fieldName, recordFieldsChange })}
+            {!props?.disabled && typeof rightIconRender === 'function' && rightIconRender({ value, onChange, form, fieldName, recordFieldsChange,getAllWithIds ,removeLastFieldsValues})}
         </BaseWrapper>
     ) : (<>
         <OriginalSelect
@@ -240,7 +240,7 @@ const SearchSelect = forwardRef(({ addWrapper = true, form, fieldName, fieldsVal
 
         </OriginalSelect>
         {!props?.disabled && rightIcon}
-        {!props?.disabled && typeof rightIconRender === 'function' && rightIconRender({ value, onChange, form, fieldName, recordFieldsChange })}
+        {!props?.disabled && typeof rightIconRender === 'function' && rightIconRender({ value, onChange, form, fieldName, recordFieldsChange,getAllWithIds,removeLastFieldsValues })}
     </>
     )
 

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

@@ -33,7 +33,7 @@ const TableCol = ({ children, width, hidden, ...props }) => {
     </div>
 }
 
-const Table = ({ children, onTableAddRow, disabled, readonly, onTableRemoveRow, form, fieldName, initializeFormRender, recordFieldsChange, mode, isAllowCopy=false, isAllowAdd=true, ...props }) => {
+const Table = ({ children, onTableAddRow, disabled, readonly, onTableRemoveRow, form, fieldName, initializeFormRender, recordFieldsChange, getTableWithIds,removeLastFieldsValues, mode, isAllowCopy=false, isAllowAdd=true, ...props }) => {
     useEffect(() => {
         // console.log("Table form reload", form)
     }, [form])
@@ -61,7 +61,12 @@ const Table = ({ children, onTableAddRow, disabled, readonly, onTableRemoveRow,
         }
 
     }, [])
-
+    const getAllWithIds = () => {
+        if (typeof getTableWithIds === 'function') {
+            return getTableWithIds(childrenIds)
+        }
+        return []
+    }
     if (props.isRequired)
         rules.push({ required: true, message: `子表[${props.label}]必须填写` });
     return <Form.List name={name} rules={rules}>
@@ -164,7 +169,9 @@ const Table = ({ children, onTableAddRow, disabled, readonly, onTableRemoveRow,
                                                     fieldName: [fieldName, field.name, col_id],
                                                     fieldsValue: fieldsValue,
                                                     initializeFormRender,
-                                                    recordFieldsChange
+                                                    recordFieldsChange,
+                                                    getAllWithIds: getAllWithIds,
+                                                    removeLastFieldsValues
                                                 })}
                                             </Form.Item>
                                         }}

package/src/components/form-container/index.jsx

@@ -167,8 +167,8 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
 
     // 计算字段级联关系
     const handleFieldsWith = (identifier, fieldValues, init = false) => {
+        console.log("handleFieldsWith identifier", identifier)
         let needRefresh = false;
-
         let parentIdentifier = [];
         if (Array.isArray(identifier)) {
             parentIdentifier = [...(identifier.slice(0, -1))]
@@ -322,6 +322,8 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
     // 处理级联数据源
     // 处理级联填充
     const handleFieldsWithFill = async (fieldValues, child, parentIdentifier, componentName) => {
+        console.log("handleFieldsWithFill child.identifier", child.identifier)
+        console.log("handleFieldsWithFill parentIdentifier", parentIdentifier)
         const withFill = child?.component?.props.withFill;
         const withDataFetch = child?.component?.props.withDataFetch;
         let withFillIndex = 0
@@ -479,7 +481,8 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
 
         debounceHandleFieldsChange();
     }
-    const handleTableAddRow = (ids) => {
+
+    const getTableWithIds = (ids) => {
         let withAllIds = []
         ids.forEach(id => {
             if (!dependencyMap.current.has(id)) return
@@ -492,6 +495,10 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
             if (typeof withValue != "number" && !withValue) return false
             return true
         })
+        return withAllIds
+    }
+    const handleTableAddRow = (ids) => {
+        let withAllIds = getTableWithIds(ids)
         const fieldValues = form.getFieldsValue();
         setTimeout(() => {
             withAllIds.forEach(withid => {
@@ -553,7 +560,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
 
                     let childComponent
                     if (isTable || isLayoutComponent) {
-                        childComponent = React.cloneElement(child, { onTableAddRow: handleTableAddRow, onTableRemoveRow: handleTableRemoveRow, form: form, fieldName: identifier, onCustomChange, initializeFormRender, mode, recordFieldsChange })
+                        childComponent = React.cloneElement(child, { onTableAddRow: handleTableAddRow, getTableWithIds, onTableRemoveRow: handleTableRemoveRow,removeLastFieldsValues, form: form, fieldName: identifier, onCustomChange, initializeFormRender, mode, recordFieldsChange })
                     }
                     else if (componentName === "Field.WithSingleSelect" || componentName === "Field.WithMultipleSelect" || componentName === "Show.WithTable") {
                         childComponent = <Form.Item
@@ -587,7 +594,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                             {({ getFieldsValue }) => {
                                 const fieldsValue = getFieldsValue();
                                 let element = React.cloneElement(child, {
-                                    onTableAddRow: handleTableAddRow, onTableRemoveRow: handleTableRemoveRow, form: form, fieldName: identifier, onCustomChange, fieldsValue, initializeFormRender, recordFieldsChange,
+                                    onTableAddRow: handleTableAddRow, onTableRemoveRow: handleTableRemoveRow,removeLastFieldsValues, form: form, fieldName: identifier, onCustomChange, fieldsValue, initializeFormRender, recordFieldsChange,
                                     shouldUpdateKey: shouldUpdateKey.current[identifier],
                                 })
                                 return componentName === "show.WithTable" ? <>{element}</> : <Form.Item
@@ -608,7 +615,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                             name={identifier}
                             rules={rules}
                         >
-                            {React.cloneElement(child, { form: form, fieldName: identifier, onCustomChange, initializeFormRender, recordFieldsChange })}
+                            {React.cloneElement(child, { form: form, fieldName: identifier, onCustomChange, initializeFormRender, recordFieldsChange,removeLastFieldsValues })}
                         </Form.Item>
                     }
                     return (