fix(form): FieldSet igrone no Element

tangweikun · Nov 17, 2020 · aa40d77 · aa40d77
1 parent a181f48
commit aa40d77
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 12 deletions.
diff --git a/packages/form/src/components/FieldSet/index.tsx b/packages/form/src/components/FieldSet/index.tsx
@@ -33,19 +33,24 @@ const FieldSet: React.FC<ProFromFieldSetProps> = ({
     onChange?.(newValues);
   };
 
-  const list = toArray(children).map((item, index) => {
-    return React.cloneElement(item, {
-      key: index,
-      ignoreFormItem: true,
-      ...item.props,
-      value: value[index],
-      onChange: (itemValue: any) => {
-        fieldSetOnChange(itemValue, index);
-        item.props.onChange?.(itemValue);
-      },
-    });
+  let itemIndex = -1;
+  const list = toArray(children).map((item: any) => {
+    if (React.isValidElement(item)) {
+      itemIndex += 1;
+      const index = itemIndex;
+      return React.cloneElement(item, {
+        key: index,
+        ignoreFormItem: true,
+        ...((item.props as any) || {}),
+        value: value[index],
+        onChange: (itemValue: any) => {
+          fieldSetOnChange(itemValue, index);
+          (item as any).props.onChange?.(itemValue);
+        },
+      });
+    }
+    return item;
   });
-
   return <Space {...space}>{list}</Space>;
 };
 

diff --git a/packages/form/src/demos/components-other-readonly.tsx b/packages/form/src/demos/components-other-readonly.tsx
@@ -211,7 +211,9 @@ const Demo = () => (
         transform={(value: any) => ({ startTime: value[0], endTime: value[1] })}
       >
         <ProFormText width="m" readonly />
+        -
         <ProFormText width="m" readonly />
+        -
         <ProFormText width="m" readonly />
       </ProFromFieldSet>
       <ProForm.Group title="日期相关分组">

diff --git a/tests/form/__snapshots__/demo.test.ts.snap b/tests/form/__snapshots__/demo.test.ts.snap
@@ -3967,12 +3967,24 @@ exports[`form demos renders ./packages/form/src/demos/components-other-readonly.
               >
                 1
               </div>
+              <div
+                class="ant-space-item"
+                style="margin-right: 8px;"
+              >
+                -
+              </div>
               <div
                 class="ant-space-item"
                 style="margin-right: 8px;"
               >
                 2
               </div>
+              <div
+                class="ant-space-item"
+                style="margin-right: 8px;"
+              >
+                -
+              </div>
               <div
                 class="ant-space-item"
               >