cxd 样式优化

This commit is contained in:
liaoxuezhi 2019-09-04 15:44:43 +08:00
parent 4dba7e561d
commit 84cafd0755
5 changed files with 19 additions and 5 deletions

View File

@ -1285,6 +1285,7 @@ $Panel-borderWidth: px2rem(1px) !default;
$Panel-footerButtomMarginLeft: $gap-sm !default; $Panel-footerButtomMarginLeft: $gap-sm !default;
$Panel-btnToolbarTextAlign: right !default; $Panel-btnToolbarTextAlign: right !default;
$Panel-fixedBottom-boxShadow: 0 -0.5rem 1rem rgba($black, 0.15) !default; $Panel-fixedBottom-boxShadow: 0 -0.5rem 1rem rgba($black, 0.15) !default;
$Panel-fixedBottom-borderTop: none !default;
// Pagination // Pagination
$Pagination-height: px2rem(30px) !default; $Pagination-height: px2rem(30px) !default;

View File

@ -3,4 +3,8 @@
border-bottom: $borderWidth dashed $borderColor; border-bottom: $borderWidth dashed $borderColor;
height: px2rem(2px); height: px2rem(2px);
font-size: 0; font-size: 0;
&--solid {
border-bottom-style: solid;
}
} }

View File

@ -12,6 +12,7 @@
z-index: $zindex-affix; z-index: $zindex-affix;
bottom: 999999px; bottom: 999999px;
box-shadow: $Panel-fixedBottom-boxShadow; box-shadow: $Panel-fixedBottom-boxShadow;
border-top: $Panel-fixedBottom-borderTop;
&.in { &.in {
position: fixed; position: fixed;
@ -165,6 +166,7 @@
} }
&-btnToolbar { &-btnToolbar {
@include clearfix();
text-align: $Panel-btnToolbarTextAlign; text-align: $Panel-btnToolbarTextAlign;
.#{$ns}Button { .#{$ns}Button {

View File

@ -348,6 +348,7 @@ $Pagination-onActive-border: px2rem(1px) solid $primary;
// Panel // Panel
$Panel-borderRadius: 0; $Panel-borderRadius: 0;
$Panel-fixedBottom-boxShadow: 0 -2px 10px 0 rgba(0,0,0,0.05);
// Nav // Nav
$Nav-item-fontSize: px2rem(16px); $Nav-item-fontSize: px2rem(16px);

View File

@ -4,17 +4,23 @@ import {ServiceStore, IServiceStore} from '../store/service';
import {filter} from '../utils/tpl'; import {filter} from '../utils/tpl';
import cx from 'classnames'; import cx from 'classnames';
export interface DividerProps extends RendererProps {} export interface DividerProps extends RendererProps {
lineStyle: 'dashed' | 'solid'
}
export default class Divider extends React.Component<DividerProps, object> { export default class Divider extends React.Component<DividerProps, object> {
static defaultProps: Partial<DividerProps> = { static defaultProps:Pick<DividerProps, 'className' | 'lineStyle'> = {
className: '', className: '',
lineStyle: 'dashed'
}; };
render() { render() {
const cx = this.props.classnames; const {
const className = this.props.className; classnames: cx,
return <div className={cx('Divider', className)} />; className,
lineStyle
} = this.props;
return <div className={cx('Divider', lineStyle ? `Divider--${lineStyle}` : '', className)} />;
} }
} }