fix: 含有右侧固定列场景中，内容过少不需要滚动条bug

build/ColumnManager.js

@@ -243,7 +243,7 @@ var ColumnManager = function () {
         if (column.fixed === 'left' || column.fixed === true) {
           var width = column.width;
           if (typeof width == 'string' && width.includes('%')) {
-            width = contentWidth * parseInt(col.width) / 100;
+            width = contentWidth * parseInt(column.width) / 100;
           }
           leftColumnsWidth += parseInt(width);
         }
@@ -263,7 +263,7 @@ var ColumnManager = function () {
         if (column.fixed === 'right') {
           var width = column.width;
           if (typeof width == 'string' && width.includes('%')) {
-            width = contentWidth * parseInt(col.width) / 100;
+            width = contentWidth * parseInt(column.width) / 100;
           }
           rightColumnsWidth += parseInt(width);
         }

build/Table.js

@@ -328,6 +328,8 @@ var Table = function (_Component) {
     if (prevProps.data.length === 0 || this.props.data.length === 0) {
       this.resetScrollX();
     }
+    // 是否传入 scroll中的y属性，如果传入判断是否是整数，如果是则进行比较 。bodyTable 的clientHeight进行判断
+    this.isShowScrollY();
   };
 
   Table.prototype.componentWillUnmount = function componentWillUnmount() {
@@ -375,6 +377,23 @@ var Table = function (_Component) {
       this.setState({ contentWidthDiff: 0, lastShowIndex: lastShowIndex }); //重新渲染，为了显示滚动条
     }
   };
+  //根据内容动态的判断是否显示纵向滚动条
+
+
+  Table.prototype.isShowScrollY = function isShowScrollY() {
+    var props = this.props;
+    var y = props.scroll && props.scroll.y;
+    if (y) {
+      var bodyH = this.refs.bodyTable.clientHeight;
+      var bodyContentH = this.refs.bodyTable.querySelector('table').clientHeight;
+      var rightBodyTable = this.refs.fixedColumnsBodyRight;
+      if (bodyContentH <= bodyH) {
+        this.refs.bodyTable.style.overflowY = 'auto';
+        this.refs.headTable.style.overflowY = 'auto';
+        rightBodyTable && (rightBodyTable.style.overflowY = 'auto');
+      }
+    }
+  };
 
   Table.prototype.onExpandedRowsChange = function onExpandedRowsChange(expandedRowKeys) {
     if (!this.props.expandedRowKeys) {

dist/demo.css

@@ -5284,7 +5284,7 @@ a, .mdl-accordion, .mdl-button, .mdl-card, .mdl-checkbox, .mdl-dropdown-menu,
   box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1);
   background-color: #fff;
   border: 1px solid transparent;
-  border-radius: 3px; }
+  border-radius: 4px; }
   .u-panel .u-panel-heading {
     border-top-left-radius: 3px;
     border-top-right-radius: 3px;
@@ -6054,7 +6054,7 @@ input.u-button[type="submit"] {
   color: #333;
   background-color: #fff;
   border-color: #ccc; }
-  .u-button-default:hover, .u-button-default:active {
+  .u-button-default:hover, .u-button-default:focus, .u-button-default:active {
     background-color: #e6e6e6;
     border-color: #adadad; }
 
@@ -6070,17 +6070,18 @@ input.u-button[type="submit"] {
     color: rgb(0,0,0);
     background-color: rgb(189,189,189);
     border-color: rgb(165, 173, 186); }
+  .u-button-border:focus:not(:active) {
+    color: rgb(0,0,0);
+    background-color: rgb(238,238,238);
+    border-color: rgb(165, 173, 186); }
 
 .u-button.u-button-primary {
   color: rgb(255,255,255);
   background-color: rgb(245, 60, 50);
   border: 1px rgb(245, 60, 50) solid; }
-  .u-button.u-button-primary:hover {
+  .u-button.u-button-primary.focus, .u-button.u-button-primary:focus, .u-button.u-button-primary:hover {
     background-color: rgb(230, 0, 18);
     border-color: rgb(230, 0, 18); }
-  .u-button.u-button-primary.focus, .u-button.u-button-primary:focus, .u-button.u-button-primary.u-button[disabled]:hover {
-    background-color: rgb(245, 60, 50);
-    border-color: rgb(245, 60, 50); }
   .u-button.u-button-primary.active, .u-button.u-button-primary:active {
     background-color: rgb(230, 0, 18);
     border-color: rgb(230, 0, 18); }
@@ -6089,12 +6090,9 @@ input.u-button[type="submit"] {
   color: rgb(0,0,0);
   background-color: rgb(224,224,224);
   border: 1px rgb(224,224,224) solid; }
-  .u-button.u-button-secondary:hover {
+  .u-button.u-button-secondary.focus, .u-button.u-button-secondary:focus, .u-button.u-button-secondary:hover {
-    background-color: rgb(189,189,189);
+    background-color: rgb(238,238,238);
-    border-color: rgb(189,189,189); }
+    border-color: rgb(238,238,238); }
-  .u-button.u-button-secondary.focus, .u-button.u-button-secondary:focus, .u-button.u-button-secondary.u-button[disabled]:hover {
-    background-color: rgb(224,224,224);
-    border-color: rgb(224,224,224); }
   .u-button.u-button-secondary.active, .u-button.u-button-secondary:active {
     background-color: rgb(189,189,189);
     border-color: rgb(189,189,189); }
@@ -6103,12 +6101,9 @@ input.u-button[type="submit"] {
   color: rgb(255,255,255);
   background-color: rgb(244,67,54);
   border: 1px rgb(244,67,54) solid; }
-  .u-button.u-button-danger:hover {
+  .u-button.u-button-danger.focus, .u-button.u-button-danger:focus, .u-button.u-button-danger:hover {
     background-color: rgb(229,115,115);
     border-color: rgb(229,115,115); }
-  .u-button.u-button-danger.focus, .u-button.u-button-danger:focus, .u-button.u-button-danger.u-button[disabled]:hover {
-    background-color: rgb(244,67,54);
-    border-color: rgb(244,67,54); }
   .u-button.u-button-danger.active, .u-button.u-button-danger:active {
     background-color: rgb(211,47,47);
     border-color: rgb(211,47,47); }
@@ -6117,12 +6112,9 @@ input.u-button[type="submit"] {
   color: rgb(255,255,255);
   background-color: rgb(0,188,212);
   border: 1px rgb(0,188,212) solid; }
-  .u-button.u-button-info:hover {
+  .u-button.u-button-info.focus, .u-button.u-button-info:focus, .u-button.u-button-info:hover {
     background-color: rgb(77,208,225);
     border-color: rgb(77,208,225); }
-  .u-button.u-button-info.focus, .u-button.u-button-info:focus, .u-button.u-button-info.u-button[disabled]:hover {
-    background-color: rgb(0,188,212);
-    border-color: rgb(0,188,212); }
   .u-button.u-button-info.active, .u-button.u-button-info:active {
     background-color: rgb(0,151,167);
     border-color: rgb(0,151,167); }
@@ -6131,12 +6123,9 @@ input.u-button[type="submit"] {
   color: rgb(255,255,255);
   background-color: rgb(255,152,0);
   border: 1px rgb(255,152,0) solid; }
-  .u-button.u-button-warning:hover {
+  .u-button.u-button-warning.focus, .u-button.u-button-warning:focus, .u-button.u-button-warning:hover {
     background-color: rgb(255,183,77);
     border-color: rgb(255,183,77); }
-  .u-button.u-button-warning.focus, .u-button.u-button-warning:focus, .u-button.u-button-warning.u-button[disabled]:hover {
-    background-color: rgb(255,152,0);
-    border-color: rgb(255,152,0); }
   .u-button.u-button-warning.active, .u-button.u-button-warning:active {
     background-color: rgb(245,124,0);
     border-color: rgb(245,124,0); }
@@ -6145,12 +6134,9 @@ input.u-button[type="submit"] {
   color: rgb(255,255,255);
   background-color: rgb(76,175,80);
   border: 1px rgb(76,175,80) solid; }
-  .u-button.u-button-success:hover {
+  .u-button.u-button-success.focus, .u-button.u-button-success:focus, .u-button.u-button-success:hover {
     background-color: rgb(129,199,132);
     border-color: rgb(129,199,132); }
-  .u-button.u-button-success.focus, .u-button.u-button-success:focus, .u-button.u-button-success.u-button[disabled]:hover {
-    background-color: rgb(76,175,80);
-    border-color: rgb(76,175,80); }
   .u-button.u-button-success.active, .u-button.u-button-success:active {
     background-color: rgb(56,142,60);
     border-color: rgb(56,142,60); }
@@ -6159,12 +6145,9 @@ input.u-button[type="submit"] {
   color: rgb(255,255,255);
   background-color: rgb(97,97,97);
   border: 1px rgb(97,97,97) solid; }
-  .u-button.u-button-dark:hover {
+  .u-button.u-button-dark.focus, .u-button.u-button-dark:focus, .u-button.u-button-dark:hover {
     background-color: rgb(117,117,117);
     border-color: rgb(117,117,117); }
-  .u-button.u-button-dark.focus, .u-button.u-button-dark:focus, .u-button.u-button-dark.u-button[disabled]:hover {
-    background-color: rgb(97,97,97);
-    border-color: rgb(97,97,97); }
   .u-button.u-button-dark.active, .u-button.u-button-dark:active {
     background-color: rgb(66,66,66);
     border-color: rgb(66,66,66); }
@@ -6173,12 +6156,9 @@ input.u-button[type="submit"] {
   color: rgb(97,97,97);
   background-color: rgb(255,255,255);
   border: 1px rgb(255,255,255) solid; }
-  .u-button.u-button-light:hover {
+  .u-button.u-button-light.focus, .u-button.u-button-light:focus, .u-button.u-button-light:hover {
     background-color: rgb(238,238,238);
     border-color: rgb(238,238,238); }
-  .u-button.u-button-light.focus, .u-button.u-button-light:focus, .u-button.u-button-light.u-button[disabled]:hover {
-    background-color: rgb(255,255,255);
-    border-color: rgb(255,255,255); }
   .u-button.u-button-light.active, .u-button.u-button-light:active {
     background-color: rgb(189,189,189);
     border-color: rgb(189,189,189); }
@@ -6187,14 +6167,10 @@ input.u-button[type="submit"] {
   color: rgb(76,175,80);
   background-color: #fff;
   border: 1px rgb(76,175,80) solid; }
-  .u-button-border.u-button-success:hover {
+  .u-button-border.u-button-success.focus, .u-button-border.u-button-success:focus, .u-button-border.u-button-success:hover {
     background-color: rgb(129,199,132);
     border-color: rgb(129,199,132);
     color: #fff; }
-  .u-button-border.u-button-success.focus, .u-button-border.u-button-success:focus, .u-button-border.u-button-success.u-button[disabled]:hover {
-    color: rgb(76,175,80);
-    background-color: #fff;
-    border-color: rgb(76,175,80); }
   .u-button-border.u-button-success.active, .u-button-border.u-button-success:active {
     color: #fff;
     background-color: rgb(56,142,60);
@@ -6204,14 +6180,10 @@ input.u-button[type="submit"] {
   color: rgb(255,152,0);
   background-color: #fff;
   border: 1px rgb(255,152,0) solid; }
-  .u-button-border.u-button-warning:hover {
+  .u-button-border.u-button-warning.focus, .u-button-border.u-button-warning:focus, .u-button-border.u-button-warning:hover {
     background-color: rgb(255,183,77);
     border-color: rgb(255,183,77);
     color: #fff; }
-  .u-button-border.u-button-warning.focus, .u-button-border.u-button-warning:focus, .u-button-border.u-button-warning.u-button[disabled]:hover {
-    color: rgb(255,152,0);
-    background-color: #fff;
-    border-color: rgb(255,152,0); }
   .u-button-border.u-button-warning.active, .u-button-border.u-button-warning:active {
     color: #fff;
     background-color: rgb(245,124,0);
@@ -6221,14 +6193,10 @@ input.u-button[type="submit"] {
   color: rgb(244,67,54);
   background-color: #fff;
   border: 1px rgb(244,67,54) solid; }
-  .u-button-border.u-button-danger:hover {
+  .u-button-border.u-button-danger.focus, .u-button-border.u-button-danger:focus, .u-button-border.u-button-danger:hover {
     background-color: rgb(229,115,115);
     border-color: rgb(229,115,115);
     color: #fff; }
-  .u-button-border.u-button-danger.focus, .u-button-border.u-button-danger:focus, .u-button-border.u-button-danger.u-button[disabled]:hover {
-    color: rgb(244,67,54);
-    background-color: #fff;
-    border-color: rgb(244,67,54); }
   .u-button-border.u-button-danger.active, .u-button-border.u-button-danger:active {
     color: #fff;
     background-color: rgb(211,47,47);
@@ -6238,14 +6206,10 @@ input.u-button[type="submit"] {
   color: rgb(0,188,212);
   background-color: #fff;
   border: 1px rgb(0,188,212) solid; }
-  .u-button-border.u-button-info:hover {
+  .u-button-border.u-button-info.focus, .u-button-border.u-button-info:focus, .u-button-border.u-button-info:hover {
     background-color: rgb(77,208,225);
     border-color: rgb(77,208,225);
     color: #fff; }
-  .u-button-border.u-button-info.focus, .u-button-border.u-button-info:focus, .u-button-border.u-button-info.u-button[disabled]:hover {
-    color: rgb(0,188,212);
-    background-color: #fff;
-    border-color: rgb(0,188,212); }
   .u-button-border.u-button-info.active, .u-button-border.u-button-info:active {
     color: #fff;
     background-color: rgb(0,151,167);
@@ -6255,14 +6219,10 @@ input.u-button[type="submit"] {
   color: rgb(245, 60, 50);
   background-color: #fff;
   border: 1px rgb(245, 60, 50) solid; }
-  .u-button-border.u-button-primary:hover {
+  .u-button-border.u-button-primary.focus, .u-button-border.u-button-primary:focus, .u-button-border.u-button-primary:hover {
     background-color: rgb(230, 0, 18);
     border-color: rgb(230, 0, 18);
     color: #fff; }
-  .u-button-border.u-button-primary.focus, .u-button-border.u-button-primary:focus, .u-button-border.u-button-primary.u-button[disabled]:hover {
-    color: rgb(245, 60, 50);
-    background-color: #fff;
-    border-color: rgb(245, 60, 50); }
   .u-button-border.u-button-primary.active, .u-button-border.u-button-primary:active {
     color: #fff;
     background-color: rgb(230, 0, 18);
@@ -6272,14 +6232,10 @@ input.u-button[type="submit"] {
   color: rgb(224,224,224);
   background-color: #fff;
   border: 1px rgb(224,224,224) solid; }
-  .u-button-border.u-button-secondary:hover {
+  .u-button-border.u-button-secondary.focus, .u-button-border.u-button-secondary:focus, .u-button-border.u-button-secondary:hover {
-    background-color: rgb(189,189,189);
+    background-color: rgb(238,238,238);
-    border-color: rgb(189,189,189);
+    border-color: rgb(238,238,238);
     color: #fff; }
-  .u-button-border.u-button-secondary.focus, .u-button-border.u-button-secondary:focus, .u-button-border.u-button-secondary.u-button[disabled]:hover {
-    color: rgb(224,224,224);
-    background-color: #fff;
-    border-color: rgb(224,224,224); }
   .u-button-border.u-button-secondary.active, .u-button-border.u-button-secondary:active {
     color: #fff;
     background-color: rgb(189,189,189);
@@ -6289,14 +6245,10 @@ input.u-button[type="submit"] {
   color: rgb(97,97,97);
   background-color: #fff;
   border: 1px rgb(97,97,97) solid; }
-  .u-button-border.u-button-dark:hover {
+  .u-button-border.u-button-dark.focus, .u-button-border.u-button-dark:focus, .u-button-border.u-button-dark:hover {
     background-color: rgb(117,117,117);
     border-color: rgb(117,117,117);
     color: #fff; }
-  .u-button-border.u-button-dark.focus, .u-button-border.u-button-dark:focus, .u-button-border.u-button-dark.u-button[disabled]:hover {
-    color: rgb(97,97,97);
-    background-color: #fff;
-    border-color: rgb(97,97,97); }
   .u-button-border.u-button-dark.active, .u-button-border.u-button-dark:active {
     color: #fff;
     background-color: rgb(66,66,66);
@@ -6306,14 +6258,10 @@ input.u-button[type="submit"] {
   color: rgb(97,97,97);
   background-color: #fff;
   border: 1px rgb(255,255,255) solid; }
-  .u-button-border.u-button-light:hover {
+  .u-button-border.u-button-light.focus, .u-button-border.u-button-light:focus, .u-button-border.u-button-light:hover {
     background-color: rgb(238,238,238);
     border-color: rgb(238,238,238);
     color: #fff; }
-  .u-button-border.u-button-light.focus, .u-button-border.u-button-light:focus, .u-button-border.u-button-light.u-button[disabled]:hover {
-    color: rgb(97,97,97);
-    background-color: #fff;
-    border-color: rgb(255,255,255); }
   .u-button-border.u-button-light.active, .u-button-border.u-button-light:active {
     color: #fff;
     background-color: rgb(189,189,189);
@@ -6404,7 +6352,7 @@ input.u-button[type="submit"] {
   background-color: #fff;
   background-clip: padding-box;
   border: 1px solid rgb(165, 173, 186);
-  border-radius: 3px;
+  border-radius: 6px;
   box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); }
   .u-popconfirm-dark {
     background-color: rgb(66,66,66);
@@ -6635,11 +6583,7 @@ input.u-button[type="submit"] {
       list-style-type: none; }
       .u-pagination-list > li > a:hover, .u-pagination-list > li > span:hover, .u-pagination-list > li > a:focus, .u-pagination-list > li > span:focus {
         color: #666;
-<<<<<<< HEAD
         background-color: #EBECF0;
-=======
-        background-color: rgb(235, 236, 240);
->>>>>>> 5c0c3b70aa3b33affbf43755c6d8059633c9bf6a
         border-color: #d7d7d7;
         cursor: pointer; }
       .u-pagination-list > li > a > i {
@@ -7369,8 +7313,7 @@ ul {
   text-overflow: ellipsis;
   white-space: nowrap;
   max-width: 100%;
-  padding-right: 14px;
+  padding-right: 14px; }
-  padding-left: 5px; }
 
 .u-select-disabled {
   color: #ccc; }
@@ -7397,16 +7340,16 @@ ul {
     color: #ccc; }
 
 .u-select-selection--single {
-  height: 32px;
+  height: 30px;
   position: relative;
   cursor: pointer; }
 
 .u-select-selection-rendered {
   display: block;
-  margin-left: 2px;
+  margin-left: 8px;
-  margin-right: 2px;
+  margin-right: 8px;
   position: relative;
-  line-height: 30px; }
+  line-height: 28px; }
   .u-select-selection-rendered:after {
     content: '.';
     visibility: hidden;
@@ -7415,29 +7358,29 @@ ul {
     width: 0; }
 
 .u-select-lg .u-select-selection--single {
-  height: 40px; }
+  height: 38px; }
 
 .u-select-lg .u-select-selection-rendered {
-  line-height: 40px; }
+  line-height: 36px; }
 
 .u-select-lg .u-select-selection--multiple {
-  min-height: 40px; }
+  min-height: 32px; }
 
 .u-select-lg .u-select-selection--multiple .u-select-selection-rendered li {
   height: 24px;
   line-height: 24px; }
 
 .u-select-sm .u-select-selection {
-  border-radius: 3px; }
+  border-radius: 2px; }
 
 .u-select-sm .u-select-selection--single {
-  height: 26px; }
+  height: 24px; }
 
 .u-select-sm .u-select-selection-rendered {
-  line-height: 24px; }
+  line-height: 22px; }
 
 .u-select-sm .u-select-selection--multiple {
-  min-height: 24px; }
+  min-height: 22px; }
 
 .u-select-sm .u-select-selection--multiple .u-select-selection-rendered li {
   height: 14px;
@@ -7451,7 +7394,7 @@ ul {
 .u-select-search-field-placeholder {
   position: absolute;
   top: 50%;
-  left: 5px;
+  left: 0;
   right: 9px;
   color: #ccc;
   line-height: 20px;
@@ -7479,7 +7422,7 @@ ul {
     width: 100%;
     background: transparent;
     outline: 0;
-    border-radius: 3px; }
+    border-radius: 4px; }
   .u-select-search--inline .u-select-search-field-mirror {
     position: absolute;
     top: 0;
@@ -7492,6 +7435,7 @@ ul {
 .u-select-selection--multiple {
   min-height: 28px;
   cursor: text;
+  padding-bottom: 3px;
   zoom: 1; }
   .u-select-selection--multiple:before, .u-select-selection--multiple:after {
     content: " ";
@@ -7509,20 +7453,20 @@ ul {
     .u-select-selection--multiple .u-select-search--inline .u-select-search-field {
       width: 0.75em; }
   .u-select-selection--multiple .u-select-selection-rendered {
-    margin-left: 4px;
+    margin-left: 5px;
+    margin-bottom: -3px;
     height: auto; }
   .u-select-selection--multiple > ul > li, .u-select-selection--multiple .u-select-selection-rendered > ul > li {
     margin-top: 3px;
-    margin-bottom: 3px;
+    height: 20px;
-    height: 24px;
+    line-height: 20px; }
-    line-height: 24px; }
   .u-select-selection--multiple .u-select-selection-choice {
     background-color: #f3f3f3;
-    border-radius: 3px;
+    border-radius: 4px;
     cursor: default;
     float: left;
     padding: 0 16px;
-    margin-right: 3px;
+    margin-right: 4px;
     max-width: 99%;
     position: relative;
     overflow: hidden;
@@ -7562,7 +7506,7 @@ ul {
     position: absolute;
     right: 4px;
     padding: 0 0 0 8px;
-    top: -4px; }
+    top: -3px; }
   .u-select-selection--multiple .u-select-selection-choice-remove:before {
     display: block;
     font-family: "uf"; }
@@ -7607,13 +7551,12 @@ ul {
   position: relative;
   z-index: 1;
   transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-  box-shadow: none;
+  box-shadow: none; }
-  padding-left: 5px; }
 
 .u-select-dropdown {
   background-color: white;
   box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
-  border-radius: 3px;
+  border-radius: 4px;
   box-sizing: border-box;
   z-index: 1800;
   left: -9999px;
@@ -7652,7 +7595,6 @@ ul {
     position: relative;
     display: block;
     padding: 7px 16px;
-    padding-left: 6px;
     font-weight: normal;
     color: #666;
     cursor: pointer;
@@ -7664,8 +7606,7 @@ ul {
     white-space: nowrap; }
   .u-select-dropdown .u-select-dropdown-menu-item:hover,
   .u-select-dropdown .u-select-dropdown-menu-item-active {
-    background-color: rgb(235, 236, 240);
+    background-color: rgb(235, 236, 240); }
-    color: rgb(245, 60, 50); }
   .u-select-dropdown .u-select-dropdown-menu-item-disabled {
     color: #ccc;
     cursor: not-allowed; }
@@ -7752,7 +7693,7 @@ ul {
   vertical-align: middle; }
 
 .u-search-input.u-input-group .u-input:first-child, .u-search-input.u-input-group .u-select:first-child {
-  border-radius: 3px;
+  border-radius: 4px;
   position: absolute;
   top: -1px;
   width: 100%; }
@@ -8045,7 +7986,7 @@ ul {
   background-color: #fff;
   background-clip: padding-box;
   border: 1px solid #ccc;
-  border-radius: 3px;
+  border-radius: 6px;
   box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); }
   .u-popover > .arrow, .u-popover > .arrow:after {
     position: absolute;
@@ -8174,7 +8115,7 @@ ul {
     padding: 3px 8px;
     color: #fff;
     background-color: #000;
-    border-radius: 3px;
+    border-radius: 4px;
     word-wrap: break-word; }
   .u-tooltip.right {
     padding: 0 5px; }
@@ -8240,7 +8181,7 @@ ul {
     border-top-width: 0;
     border-bottom-color: #fff; }
   .u-tooltip.inverse.bottom .tooltip-arrow {
-    border-bottom-color: rgb(165, 173, 186); }
+    border-bottom-color: #d9d9d9; }
   .u-tooltip.inverse-arrow.inverse.top .tooltip-arrow::after {
     top: 1px;
     margin-left: -5px;
@@ -8248,14 +8189,14 @@ ul {
     border-bottom-color: #fff;
     border-bottom-width: inherit; }
   .u-tooltip.inverse-arrow.inverse.top .tooltip-arrow {
-    border-bottom-color: rgb(165, 173, 186); }
+    border-bottom-color: #d9d9d9; }
   .u-tooltip.inverse.left .tooltip-arrow::after {
     border-right-width: 0;
     top: -5px;
     margin-left: -6px;
     border-left-color: #fff; }
   .u-tooltip.inverse.left .tooltip-arrow {
-    border-left-color: rgb(165, 173, 186); }
+    border-left-color: #d9d9d9; }
   .u-tooltip.inverse-arrow.inverse.right .tooltip-arrow::after {
     border-right-width: 0;
     top: -5px;
@@ -8263,14 +8204,14 @@ ul {
     border-left-color: #fff;
     border-left-width: inherit; }
   .u-tooltip.inverse-arrow.inverse.right .tooltip-arrow {
-    border-left-color: rgb(165, 173, 186); }
+    border-left-color: #d9d9d9; }
   .u-tooltip.inverse.right .tooltip-arrow::after {
     border-left-width: 0;
     top: -5px;
     margin-left: 1px;
     border-right-color: #fff; }
   .u-tooltip.inverse.right .tooltip-arrow {
-    border-right-color: rgb(165, 173, 186); }
+    border-right-color: #d9d9d9; }
   .u-tooltip.inverse-arrow.inverse.left .tooltip-arrow::after {
     border-left-width: 0;
     top: -5px;
@@ -8278,7 +8219,7 @@ ul {
     border-right-color: #fff;
     border-right-width: inherit; }
   .u-tooltip.inverse-arrow.inverse.left .tooltip-arrow {
-    border-right-color: rgb(165, 173, 186); }
+    border-right-color: #d9d9d9; }
   .u-tooltip.inverse.top .tooltip-arrow::after {
     top: -6px;
     margin-left: -5px;
@@ -8286,7 +8227,7 @@ ul {
     border-bottom-color: #d9d9d9;
     border-top-color: #fff; }
   .u-tooltip.inverse.top .tooltip-arrow {
-    border-top-color: rgb(165, 173, 186); }
+    border-top-color: #d9d9d9; }
   .u-tooltip.inverse-arrow.inverse.bottom .tooltip-arrow::after {
     top: -6px;
     margin-left: -5px;
@@ -8295,11 +8236,11 @@ ul {
     border-top-color: #fff;
     border-top-width: inherit; }
   .u-tooltip.inverse-arrow.inverse.bottom .tooltip-arrow {
-    border-top-color: rgb(165, 173, 186); }
+    border-top-color: #d9d9d9; }
   .u-tooltip.inverse .tooltip-inner {
     background-color: #fff;
     color: #333333;
-    border: 1px solid rgb(165, 173, 186); }
+    border: 1px solid #d9d9d9; }
   .u-tooltip.inverse .tooltip-arrow::after {
     position: absolute;
     display: block;
@@ -10516,17 +10457,10 @@ li.rc-time-picker-panel-select-option-disabled:hover {
   top: -2px; }
 
 .datepicker-input-group.u-input-group:hover > input {
-<<<<<<< HEAD
   border-color: rgb(245, 60, 50); }
 
 .calendar-picker.u-input-group:hover > input {
   border-color: rgb(245, 60, 50); }
-=======
-  border-color: #66afe9; }
-
-.calendar-picker.u-input-group:hover > input {
-  border-color: #66afe9; }
->>>>>>> 5c0c3b70aa3b33affbf43755c6d8059633c9bf6a
 
 .selected {
   background: #e3f2fd; }

src/Table.js

@@ -276,9 +276,12 @@ class Table extends Component {
     if(y){
       const bodyH = this.refs.bodyTable.clientHeight;
       const bodyContentH = this.refs.bodyTable.querySelector('table').clientHeight;
+      const rightBodyTable = this.refs.fixedColumnsBodyRight;
       if(bodyContentH <= bodyH){
         this.refs.bodyTable.style.overflowY='auto';
         this.refs.headTable.style.overflowY='auto';
+        rightBodyTable && (rightBodyTable.style.overflowY='auto');
+
       }
     }
   }