fix: arrayTable style (#813)

alibaba · Apr 23, 2020 · fe913dd · fe913dd
1 parent fab2230
commit fe913dd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/packages/antd-components/src/array-table/index.tsx b/packages/antd-components/src/array-table/index.tsx
@@ -81,6 +81,8 @@ export const ArrayTable: any = styled(
               <FormItemShallowProvider
                 key={newPath.toString()}
                 label={undefined}
+                labelCol={undefined}
+                wrapperCol={undefined}
               >
                 <SchemaField path={newPath} schema={props} />
               </FormItemShallowProvider>

diff --git a/packages/antd/src/adaptor/FormItem.tsx b/packages/antd/src/adaptor/FormItem.tsx
@@ -72,6 +72,7 @@ export const AntdSchemaFieldAdaptor: React.FC<ISchemaFieldAdaptorProps> = props
   const formItemShallowProps = useShallowFormItem()
 
   const mergedProps = {
+    label,
     ...formItemShallowProps,
     ...itemProps,
     ...schemaItemProps
@@ -95,16 +96,15 @@ export const AntdSchemaFieldAdaptor: React.FC<ISchemaFieldAdaptorProps> = props
   return (
     <Form.Item
       prefixCls={prefixCls}
-      label={label}
       labelAlign={labelAlign}
       help={help}
       validateStatus={status}
       extra={extra ? <p>{extra}</p> : undefined}
       {...mergedProps}
       required={props.editable === false ? undefined : props.required}
-      labelCol={label ? normalizeCol(labelCol || contextLabelCol) : undefined}
+      labelCol={mergedProps.label ? normalizeCol(labelCol || contextLabelCol) : undefined}
       wrapperCol={
-        label ? normalizeCol(wrapperCol || contextWrapperCol) : undefined
+        mergedProps.label ? normalizeCol(wrapperCol || contextWrapperCol) : undefined
       }
     >
       {children}

diff --git a/packages/next-components/src/array-table/index.tsx b/packages/next-components/src/array-table/index.tsx
@@ -167,6 +167,8 @@ export const ArrayTable = styled(
                 <FormItemShallowProvider
                   key={newPath.toString()}
                   label={undefined}
+                  labelCol={undefined}
+                  wrapperCol={undefined}
                 >
                   <SchemaField path={newPath} schema={props} />
                 </FormItemShallowProvider>

diff --git a/packages/next/src/adaptor/FormItem.tsx b/packages/next/src/adaptor/FormItem.tsx
@@ -73,6 +73,7 @@ export const NextSchemaFieldAdaptor: React.FC<ISchemaFieldAdaptorProps> = props
   const schemaItemProps = computeSchemaExtendProps(props)
 
   const mergedProps = {
+    label,
     ...formItemShallowProps,
     ...itemProps,
     ...schemaItemProps
@@ -96,7 +97,6 @@ export const NextSchemaFieldAdaptor: React.FC<ISchemaFieldAdaptorProps> = props
   return (
     <Form.Item
       prefix={prefix}
-      label={label}
       labelTextAlign={labelTextAlign}
       labelAlign={labelAlign || 'left'}
       size={size}
@@ -105,9 +105,9 @@ export const NextSchemaFieldAdaptor: React.FC<ISchemaFieldAdaptorProps> = props
       extra={<p>{extra}</p>}
       {...mergedProps}
       required={props.editable === false ? undefined : props.required}
-      labelCol={label ? normalizeCol(labelCol || contextLabelCol) : undefined}
+      labelCol={mergedProps.label ? normalizeCol(labelCol || contextLabelCol) : undefined}
       wrapperCol={
-        label ? normalizeCol(wrapperCol || contextWrapperCol) : undefined
+        mergedProps.label ? normalizeCol(wrapperCol || contextWrapperCol) : undefined
       }
     >
       {children}