表头横向滚动条根据内容动态显示

build/Table.js

@@ -447,9 +447,17 @@ var Table = function (_Component) {
       var bodyH = this.bodyTable.clientHeight;
       var bodyContentH = this.bodyTable.querySelector('table').clientHeight;
       var rightBodyTable = this.refs.fixedColumnsBodyRight;
+      var leftBodyTable = this.refs.fixedColumnsBodyLeft;
       var overflowy = bodyContentH <= bodyH ? 'auto' : 'scroll';
       this.bodyTable.style.overflowY = overflowy;
+
       this.refs.headTable.style.overflowY = overflowy;
+      // 没有纵向滚动条时，表头横向滚动条根据内容动态显示
+      if (overflowy == 'auto') {
+        this.refs.fixedHeadTable && (this.refs.fixedHeadTable.style.overflowX = 'auto');
+        rightBodyTable && (rightBodyTable.style.overflowX = 'auto');
+        leftBodyTable && (leftBodyTable.style.overflowX = 'auto');
+      }
       rightBodyTable && (rightBodyTable.style.overflowY = overflowy);
     }
   };
@@ -1065,7 +1073,7 @@ var Table = function (_Component) {
         'div',
         {
           className: clsPrefix + '-header',
-          ref: fixed ? null : 'headTable',
+          ref: fixed ? 'fixedHeadTable' : 'headTable',
           style: headStyle,
           onMouseOver: this.detectScrollTarget,
           onTouchStart: this.detectScrollTarget,

build/lib/util.js

@@ -1,7 +1,7 @@
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -20,29 +20,29 @@ exports.ObjectAssign = ObjectAssign;
 */
 
 function sortBy(arr, prop, desc) {
-  var props = [],
-      ret = [],
-      i = 0,
-      len = arr.length;
-  if (typeof prop == 'string') {
-    for (; i < len; i++) {
-      var oI = arr[i];
-      (props[i] = new String(oI && oI[prop] || ''))._obj = oI;
+    var props = [],
+        ret = [],
+        i = 0,
+        len = arr.length;
+    if (typeof prop == 'string') {
+        for (; i < len; i++) {
+            var oI = arr[i];
+            (props[i] = new String(oI && oI[prop] || ''))._obj = oI;
+        }
+    } else if (typeof prop == 'function') {
+        for (; i < len; i++) {
+            var _oI = arr[i];
+            (props[i] = new String(_oI && prop(_oI) || ''))._obj = _oI;
+        }
+    } else {
+        throw '参数类型错误';
     }
-  } else if (typeof prop == 'function') {
-    for (; i < len; i++) {
-      var _oI = arr[i];
-      (props[i] = new String(_oI && prop(_oI) || ''))._obj = _oI;
+    props.sort();
+    for (i = 0; i < len; i++) {
+        ret[i] = props[i]._obj;
     }
-  } else {
-    throw '参数类型错误';
-  }
-  props.sort();
-  for (i = 0; i < len; i++) {
-    ret[i] = props[i]._obj;
-  }
-  if (desc) ret.reverse();
-  return ret;
+    if (desc) ret.reverse();
+    return ret;
 };
 
 /**
@@ -51,11 +51,11 @@ function sortBy(arr, prop, desc) {
  * @param {} property 
  */
 function compare(property) {
-  return function (a, b) {
-    var value1 = a[property];
-    var value2 = b[property];
-    return value1 - value2;
-  };
+    return function (a, b) {
+        var value1 = a[property];
+        var value2 = b[property];
+        return value1 - value2;
+    };
 }
 
 /**
@@ -63,17 +63,17 @@ function compare(property) {
  * @param {*} obj 要拷贝的对象 
  */
 function ObjectAssign(obj) {
-  var b = obj instanceof Array;
-  var tagObj = b ? [] : {};
-  if (b) {
-    //数组
-    obj.forEach(function (da) {
-      var _da = {};
-      _extends(_da, da);
-      tagObj.push(_da);
-    });
-  } else {
-    _extends(tagObj, obj);
-  }
-  return tagObj;
+    var b = obj instanceof Array;
+    var tagObj = b ? [] : {};
+    if (b) {
+        //数组
+        obj.forEach(function (da) {
+            var _da = {};
+            _extends(_da, da);
+            tagObj.push(_da);
+        });
+    } else {
+        _extends(tagObj, obj);
+    }
+    return tagObj;
 }

src/Table.js

@@ -303,10 +303,19 @@ class Table extends Component {
       const bodyH = this.bodyTable.clientHeight;
       const bodyContentH = this.bodyTable.querySelector('table').clientHeight;
       const rightBodyTable = this.refs.fixedColumnsBodyRight;
+      const leftBodyTable = this.refs.fixedColumnsBodyLeft;
       const overflowy = bodyContentH <= bodyH ? 'auto':'scroll';
       this.bodyTable.style.overflowY = overflowy;
+    
       this.refs.headTable.style.overflowY = overflowy;
       rightBodyTable && (rightBodyTable.style.overflowY = overflowy);
+      // 没有纵向滚动条时，表头横向滚动条根据内容动态显示 待验证
+      // if(overflowy == 'auto'){
+      //   this.refs.fixedHeadTable && (this.refs.fixedHeadTable.style.overflowX = 'auto');
+      //   rightBodyTable && (rightBodyTable.style.overflowX = 'auto');
+      //   leftBodyTable && (leftBodyTable.style.overflowX = 'auto');
+      // }
+     
       
     }
   }
@@ -915,7 +924,7 @@ class Table extends Component {
       headTable = (
         <div
           className={`${clsPrefix}-header`}
-          ref={fixed ? null : 'headTable'}
+          ref={fixed ? 'fixedHeadTable' : 'headTable'}
           style={headStyle}
           onMouseOver={this.detectScrollTarget}
           onTouchStart={this.detectScrollTarget}