mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-01-19 14:53:16 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Merge pull request #17337 from kairi1227/master

Browse Source 
fix: Descriptions组件不设置label的显示问题
This commit is contained in:
偏右 2019-06-27 21:54:23 +08:00 committed by GitHub
commit b0fb5336fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/descriptions/__tests__/index.test.js
View File

@ -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();

14
components/descriptions/index.tsx
View File

@ -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
@ -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">

7
components/descriptions/style/index.less
View File

@ -51,6 +51,13 @@
}
}
&-item-no-label {
&::after {
content: '';
margin: 0;
}
}
&-item-content {
display: table-cell;
color: @text-color;