From 84cafd0755bbfb9dc7758ab98f0a9aa1fba3a781 Mon Sep 17 00:00:00 2001
From: liaoxuezhi <liaoxuezhi@baidu.com>
Date: Wed, 4 Sep 2019 15:44:43 +0800
Subject: [PATCH] =?UTF-8?q?cxd=20=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scss/_variables.scss          |  1 +
 scss/components/_divider.scss |  4 ++++
 scss/components/_panel.scss   |  2 ++
 scss/themes/cxd.scss          |  1 +
 src/renderers/Divider.tsx     | 16 +++++++++++-----
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 0500d9ed9..56b255517 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1285,6 +1285,7 @@ $Panel-borderWidth: px2rem(1px) !default;
 $Panel-footerButtomMarginLeft: $gap-sm !default;
 $Panel-btnToolbarTextAlign: right !default;
 $Panel-fixedBottom-boxShadow: 0 -0.5rem 1rem rgba($black, 0.15) !default;
+$Panel-fixedBottom-borderTop: none !default;
 
 // Pagination
 $Pagination-height: px2rem(30px) !default;
diff --git a/scss/components/_divider.scss b/scss/components/_divider.scss
index 35c78f718..9717bfca9 100644
--- a/scss/components/_divider.scss
+++ b/scss/components/_divider.scss
@@ -3,4 +3,8 @@
     border-bottom: $borderWidth dashed $borderColor;
     height: px2rem(2px);
     font-size: 0;
+
+    &--solid {
+        border-bottom-style: solid;
+    }
 }
diff --git a/scss/components/_panel.scss b/scss/components/_panel.scss
index 2159a1712..34fd7db61 100644
--- a/scss/components/_panel.scss
+++ b/scss/components/_panel.scss
@@ -12,6 +12,7 @@
         z-index: $zindex-affix;
         bottom: 999999px;
         box-shadow: $Panel-fixedBottom-boxShadow;
+        border-top: $Panel-fixedBottom-borderTop;
 
         &.in {
             position: fixed;
@@ -165,6 +166,7 @@
     }
 
     &-btnToolbar {
+        @include clearfix();
         text-align: $Panel-btnToolbarTextAlign;
 
         .#{$ns}Button {
diff --git a/scss/themes/cxd.scss b/scss/themes/cxd.scss
index dd4bd866a..c6bb71404 100644
--- a/scss/themes/cxd.scss
+++ b/scss/themes/cxd.scss
@@ -348,6 +348,7 @@ $Pagination-onActive-border: px2rem(1px) solid $primary;
 
 // Panel
 $Panel-borderRadius: 0;
+$Panel-fixedBottom-boxShadow: 0 -2px 10px 0 rgba(0,0,0,0.05);
 
 // Nav
 $Nav-item-fontSize: px2rem(16px);
diff --git a/src/renderers/Divider.tsx b/src/renderers/Divider.tsx
index 573b5be3a..8800c4c9b 100644
--- a/src/renderers/Divider.tsx
+++ b/src/renderers/Divider.tsx
@@ -4,17 +4,23 @@ import {ServiceStore, IServiceStore} from '../store/service';
 import {filter} from '../utils/tpl';
 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> {
-    static defaultProps: Partial<DividerProps> = {
+    static defaultProps:Pick<DividerProps, 'className' | 'lineStyle'> = {
         className: '',
+        lineStyle: 'dashed'
     };
 
     render() {
-        const cx = this.props.classnames;
-        const className = this.props.className;
-        return <div className={cx('Divider', className)} />;
+        const {
+            classnames: cx,
+            className,
+            lineStyle
+        } = this.props;
+        return <div className={cx('Divider', lineStyle ? `Divider--${lineStyle}` : '', className)} />;
     }
 }