Skip to content

Commit

Permalink
fix(antd): fix labelCol/wrapperCol can not be overwriten (#850)
Browse files Browse the repository at this point in the history
* fix(schema-renderer): fix onBlur throw errors #839

* fix(antd): fix labelCol/wrapperCol can not overwrite
  • Loading branch information
janryWang authored May 18, 2020
1 parent f53d02a commit 4f87465
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions packages/antd/src/adaptor/FormItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ export const AntdSchemaFieldAdaptor: React.FC<ISchemaFieldAdaptorProps> = props
) : (
<FormItemShallowProvider>{props.children}</FormItemShallowProvider>
)

return (
<Form.Item
prefixCls={prefixCls}
Expand All @@ -102,9 +101,11 @@ export const AntdSchemaFieldAdaptor: React.FC<ISchemaFieldAdaptorProps> = props
extra={extra ? <p>{extra}</p> : undefined}
{...mergedProps}
required={props.editable === false ? undefined : props.required}
labelCol={mergedProps.label ? normalizeCol(labelCol || contextLabelCol) : undefined}
labelCol={
mergedProps.label ? normalizeCol(labelCol || contextLabelCol) : {}
}
wrapperCol={
mergedProps.label ? normalizeCol(wrapperCol || contextWrapperCol) : undefined
mergedProps.label ? normalizeCol(wrapperCol || contextWrapperCol) : {}
}
>
{children}
Expand Down

0 comments on commit 4f87465

Please sign in to comment.