Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Descriptions组件不设置label的显示问题 #17337

Merged
merged 2 commits into from Jun 27, 2019
Merged

fix: Descriptions组件不设置label的显示问题 #17337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5432622
fixed https://github.com/ant-design/ant-design/issues/17290
Jun 27, 2019
6575501
fixed #17290
Jun 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion components/descriptions/__tests__/index.test.js
View file
Open in desktop
Expand Up @@ -42,9 +42,11 @@ describe('Descriptions', () => {
<Descriptions.Item label="Billing">Prepaid</Descriptions.Item>
<Descriptions.Item label="time">18:00:00</Descriptions.Item>
<Descriptions.Item label="Amount">$80.00</Descriptions.Item>
<Descriptions.Item>No-Label</Descriptions.Item>
</Descriptions>,
);
expect(wrapper.find('tr')).toHaveLength(4);
expect(wrapper.find('tr')).toHaveLength(5);
expect(wrapper.find('.ant-descriptions-item-no-label')).toHaveLength(1);

enquire.callunmatch();
wrapper.unmount();
Expand Down
14 changes: 12 additions & 2 deletions components/descriptions/index.tsx
View file
Open in desktop
Expand Up @@ -82,7 +82,12 @@ const renderCol = (child: React.ReactElement<DescriptionsItemProps>, bordered: b
const { prefixCls, label, className, children, span = 1 } = child.props;
if (bordered) {
return [
<th className={classNames(`${prefixCls}-item-label`, className)} key="label">
<th
className={classNames(`${prefixCls}-item-label`, className, {
[`${prefixCls}-item-no-label`]: !label,
})}
key="label"
>
{label}
</th>,
<td
Expand All @@ -96,7 +101,12 @@ const renderCol = (child: React.ReactElement<DescriptionsItemProps>, bordered: b
}
return (
<td colSpan={span} className={classNames(`${prefixCls}-item`, className)}>
<span className={`${prefixCls}-item-label`} key="label">
<span
className={classNames(`${prefixCls}-item-label`, {
[`${prefixCls}-item-no-label`]: !label,
})}
key="label"
>
{label}
</span>
<span className={`${prefixCls}-item-content`} key="content">
Expand Down
7 changes: 7 additions & 0 deletions components/descriptions/style/index.less
View file
Open in desktop
Expand Up @@ -51,6 +51,13 @@
}
}

&-item-no-label {
&::after {
content: '';
margin: 0;
}
}

&-item-content {
display: table-cell;
color: @text-color;
Expand Down