Skip to content

Commit 2196b5f

Browse files
author
liyuan-meng
committed
[PageHeader]页头UI验收问题修改
1 parent 4f82a3b commit 2196b5f

2 files changed

Lines changed: 52 additions & 40 deletions

File tree

src/components/pageHeader/index.js

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,40 @@ import './index.less';
77
const classSelector = `${prefixCls}-page-header`;
88

99
export default function PageHeader(props) {
10-
const { title, subTitle, className, size, style, onBack, breadcrumb } = props;
11-
const hasBreadCrumbElement = React.isValidElement(breadcrumb);
12-
const splitWrap = <span className="split"> | </span>;
10+
const { title, subTitle, className, size, style, onBack, breadcrumb } = props;
11+
const hasBreadCrumbElement = React.isValidElement(breadcrumb);
12+
const splitWrap = <span className="split">|</span>;
1313

14-
return (
15-
<div>
16-
{hasBreadCrumbElement && breadcrumb}
17-
<div
18-
className={classnames(`${classSelector}`,
19-
`${classSelector}-${size}`,
20-
className)}
21-
style={style}
22-
>
23-
{onBack && <i className={classnames(`${classSelector}-icon`, 'cloud-icon icon-left')} onClick={onBack}/>}
24-
<span>{title}</span>
25-
{subTitle && splitWrap}
26-
{subTitle && <span className={`${classSelector}-subtitle`}>{subTitle}</span>}
27-
</div>
28-
</div>
29-
30-
);
14+
return (
15+
<div>
16+
{hasBreadCrumbElement && breadcrumb}
17+
<div
18+
className={classnames(`${classSelector}`,
19+
`${classSelector}-${size}`,
20+
className)}
21+
style={style}
22+
>
23+
{onBack && <i className={classnames(`${classSelector}-icon`, 'cloud-icon icon-left')} onClick={onBack} />}
24+
<span>{title}</span>
25+
{subTitle && splitWrap}
26+
{subTitle && <span className={`${classSelector}-subtitle`}>{subTitle}</span>}
27+
</div>
28+
</div>
29+
30+
);
3131
}
3232

3333
PageHeader.propTypes = {
34-
title: PropTypes.string,
35-
subTitle: PropTypes.string,
36-
onBack: PropTypes.func,
37-
size: PropTypes.string,
38-
breadcrumb: PropTypes.element
34+
title: PropTypes.string,
35+
subTitle: PropTypes.string,
36+
onBack: PropTypes.func,
37+
size: PropTypes.string,
38+
breadcrumb: PropTypes.element,
3939
};
4040
PageHeader.defaultProps = {
41-
title: '',
42-
subTitle: '',
43-
onBack: null,
44-
breadcrumb: null,
45-
size: 'default'
41+
title: '',
42+
subTitle: '',
43+
onBack: null,
44+
breadcrumb: null,
45+
size: 'default',
4646
};

src/components/pageHeader/index.less

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,42 @@
33
@breadcrumbs-prefix-cls: ~'@{prefix}-page-header';
44

55
.@{prefix}-breadcrumbs {
6-
margin-bottom: 8px;
6+
margin-bottom: 20px;
77
}
88
.@{breadcrumbs-prefix-cls} {
9+
display: flex;
10+
align-items: center;
911
font-size: 16px;
1012
font-family: PingFangSC-Medium, PingFang SC;
1113
font-weight: 500;
1214
color: rgba(0, 0, 0, 0.85);
13-
&.@{breadcrumbs-prefix-cls}-large,
14-
&.@{breadcrumbs-prefix-cls}-large .@{breadcrumbs-prefix-cls}-icon {
15-
font-size: 20px;
16-
}
17-
&.@{breadcrumbs-prefix-cls}-default,
18-
&.@{breadcrumbs-prefix-cls}-default .@{breadcrumbs-prefix-cls}-icon {
15+
&.@{breadcrumbs-prefix-cls}-large {
1916
font-size: 16px;
2017
}
21-
&.@{breadcrumbs-prefix-cls}-small,
22-
&.@{breadcrumbs-prefix-cls}-small .@{breadcrumbs-prefix-cls}-icon {
18+
&.@{breadcrumbs-prefix-cls}-default {
2319
font-size: 14px;
2420
}
21+
&.@{breadcrumbs-prefix-cls}-small {
22+
font-size: 12px;
23+
}
2524
.@{breadcrumbs-prefix-cls}-icon {
2625
cursor: pointer;
26+
font-size: 16px;
27+
margin-right: 4px;
28+
color: @gray-7;
2729
}
2830
.@{breadcrumbs-prefix-cls}-subtitle {
29-
color: rgba(0, 0, 0, 0.25);
31+
color: @gray-7;
3032
font-weight: normal;
3133
}
34+
.split {
35+
display: inline-block;
36+
text-align: center;
37+
width: 16px;
38+
height: 16px;
39+
margin-left: 4px;
40+
margin-right: 4px;
41+
color: @gray-6;
42+
cursor: default;
43+
}
3244
}

0 commit comments

Comments
 (0)