merge

dist/demo.css

@@ -6765,7 +6765,15 @@ input.u-button[type="submit"] {
     float: left; }
   .u-pagination .data_per_select {
     margin: 5px;
-    float: left; }
+    float: left;
+    min-width: 120px; }
+    .u-pagination .data_per_select .u-select {
+      width: 50px;
+      margin: 0 6px; }
+      .u-pagination .data_per_select .u-select .u-select-selection {
+        height: 36px; }
+        .u-pagination .data_per_select .u-select .u-select-selection .u-select-selection-rendered {
+          line-height: 36px; }
   .u-pagination .data_select {
     outline: none;
     -webkit-appearance: none;
@@ -9231,7 +9239,8 @@ ul {
   box-shadow: 0 1px 5px #ccc;
   background-clip: padding-box;
   border: 1px solid #ccc;
-  line-height: 1.5; }
+  line-height: 1.5;
+  z-index: 1800; }
 
 .rc-calendar-date-panel,
 .rc-calendar-panel {
@@ -9681,6 +9690,9 @@ ul {
   background: #3fc7fa;
   color: #fff; }
 
+.rc-calendar > .rc-calendar-year-panel {
+  position: relative; }
+
 .rc-calendar-year-panel {
   left: 0;
   top: 0;
@@ -9969,7 +9981,8 @@ ul {
   left: 36px; }
 
 .rc-calendar-range .rc-calendar-year-panel,
-.rc-calendar-range .rc-calendar-month-panel {
+.rc-calendar-range .rc-calendar-month-panel,
+.rc-calendar-range .rc-calendar-decade-panel {
   top: 35px; }
 
 .rc-calendar-range .rc-calendar-month-panel .rc-calendar-year-panel {

src/Table.js

@@ -614,7 +614,7 @@ class Table extends Component {
 
   getTable(options = {}) {
     const { columns, fixed } = options;
-    const { clsPrefix, scroll = {}, getBodyWrapper, footerScroll } = this.props;
+    const { clsPrefix, scroll = {}, getBodyWrapper, footerScroll,headerScroll } = this.props;
     let { useFixedHeader } = this.props;
     const bodyStyle = { ...this.props.bodyStyle };
     const headStyle = {};
@@ -645,8 +645,18 @@ class Table extends Component {
       // Add negative margin bottom for scroll bar overflow bug
       const scrollbarWidth = measureScrollbar();
       if (scrollbarWidth >= 0) {
-        (fixed ? bodyStyle : headStyle).marginBottom = `-${scrollbarWidth}px`;
         (fixed ? bodyStyle : headStyle).paddingBottom = '0px';
+        //显示表头滚动条
+        if(headerScroll){
+          if(fixed){
+            bodyStyle.marginBottom = `-${scrollbarWidth}px`;
+            headStyle.marginBottom = `${scrollbarWidth}px`;
+          }else{
+            headStyle.marginBottom = `0px`;
+          }
+        }else{
+          (fixed ? bodyStyle : headStyle).marginBottom = `-${scrollbarWidth}px`;
+        }
       }
     }