fix(form): Fixed a bug with nested FormList

close #5997
ant-design · Oct 14, 2022 · 2100074 · 2100074
1 parent 2235842
commit 2100074
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/packages/field/src/components/Digit/index.tsx b/packages/field/src/components/Digit/index.tsx
@@ -33,7 +33,7 @@ const FieldDigit: ProFieldFC<FieldDigitProps> = (
         val = val?.toFixed?.(fieldProps.precision ?? 0);
         val = Number(val);
       }
-      return fieldProps?.onChange(val);
+      return fieldProps?.onChange?.(val);
     },
     [fieldProps],
   );

diff --git a/packages/form/src/components/List/ListItem.tsx b/packages/form/src/components/List/ListItem.tsx
@@ -351,13 +351,12 @@ const ProFormListItem: React.FC<
             className={`${prefixCls}-action-icon action-copy ${hashId}`}
             onClick={async () => {
               setLoadingCopy(true);
-              await action.add(
-                formInstance?.getFieldValue(
-                  [listContext.listName, rest.name, field.name]
-                    .filter((item) => item !== undefined)
-                    .flat(1),
-                ),
+              const row = formInstance?.getFieldValue(
+                [listContext.listName, originName, field.name]
+                  .filter((item) => item !== undefined)
+                  .flat(1),
               );
+              await action.add(row);
               setLoadingCopy(false);
             }}
           />
@@ -371,11 +370,11 @@ const ProFormListItem: React.FC<
     loadingCopy,
     prefixCls,
     hashId,
-    action,
     formInstance,
     listContext.listName,
-    rest.name,
     field.name,
+    originName,
+    action,
   ]);
 
   const deleteIcon = useMemo(() => {
@@ -414,7 +413,7 @@ const ProFormListItem: React.FC<
     field,
     index,
     record: formInstance?.getFieldValue?.(
-      [listContext.listName, rest.name, field.name].filter((item) => item !== undefined).flat(1),
+      [listContext.listName, originName, field.name].filter((item) => item !== undefined).flat(1),
     ),
     fields,
     operation: action,

diff --git a/packages/form/src/components/ModalForm/demos/drawer-form.tsx b/packages/form/src/components/ModalForm/demos/drawer-form.tsx
@@ -53,7 +53,17 @@ export default () => {
           tooltip="最长为 24 位"
           placeholder="请输入名称"
         />
-        <ProFormText width="md" name="company" label="我方公司名称" placeholder="请输入名称" />
+        <ProFormText
+          rules={[
+            {
+              required: true,
+            },
+          ]}
+          width="md"
+          name="company"
+          label="我方公司名称"
+          placeholder="请输入名称"
+        />
       </ProForm.Group>
       <ProForm.Group>
         <ProFormText width="md" name="contract" label="合同名称" placeholder="请输入名称" />