merge

CHANGELOG.md

@@ -1,3 +1,8 @@
+<a name="2.0.23"></a>
+## [2.0.23](https://github.com/tinper-bee/bee-table/compare/v2.0.22...v2.0.23) (2019-05-22)
+
+
+
 <a name="2.0.22"></a>
 ## [2.0.22](https://github.com/tinper-bee/bee-table/compare/v2.0.21...v2.0.22) (2019-05-22)
 

build/Table.css

@@ -273,7 +273,8 @@
   .u-table-fixed-header .u-table-fixed-left .u-table-body-inner {
     padding-right: 0px; }
   .u-table-fixed-header .u-table-body-inner {
-    height: 100%; }
+    height: 100%;
+    overflow: scroll; }
   .u-table-fixed-header .u-table-scroll .u-table-header {
     overflow-x: scroll;
     padding-bottom: 20px;

build/Table.js

@@ -392,7 +392,7 @@ var Table = function (_Component) {
     }
 
     // 是否传入 scroll中的y属性，如果传入判断是否是整数，如果是则进行比较 。bodyTable 的clientHeight进行判断
-    this.isShowScrollY();
+    // this.isShowScrollY();
   };
 
   Table.prototype.componentWillUnmount = function componentWillUnmount() {
@@ -1021,7 +1021,7 @@ var Table = function (_Component) {
 
             if (this.domWidthDiff <= 0) {
               headStyle.marginBottom = scrollbarWidth + 'px';
-              // bodyStyle.marginBottom = `-${scrollbarWidth}px`;
+              bodyStyle.marginBottom = '-' + scrollbarWidth + 'px';
             } else {
               innerBodyStyle.overflowX = 'auto';
             }
@@ -1038,8 +1038,8 @@ var Table = function (_Component) {
               headStyle.overflow = 'hidden';
               innerBodyStyle.overflowX = 'auto'; //兼容expand场景、子表格含有固定列的场景
             } else {
-                // bodyStyle.marginBottom = `-${scrollbarWidth}px`;
+              bodyStyle.marginBottom = '-' + scrollbarWidth + 'px';
-              }
+            }
           } else {
             // 没有数据时，表头滚动条隐藏问题
             if (data.length == 0 && this.domWidthDiff < 0) {

build/lib/multiSelect.js

@@ -105,7 +105,7 @@ function multiSelect(Table, Checkbox) {
         }
       });
 
-      if (data.length == count + disabledCount) {
+      if (data.length == count + disabledCount && count > 0) {
         return "all";
       }
       return count == 0 ? false : "indeter";

build/lib/sum.js

@@ -106,9 +106,9 @@ function sum(Table) {
       return _this;
     }
 
-    /**
+    /**
-     * 获取当前的表格类型。
+     * 获取当前的表格类型。
-     * 
+     * 
      */
 
 

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; };
@@ -9,71 +9,71 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 exports.sortBy = sortBy;
 exports.compare = compare;
 exports.ObjectAssign = ObjectAssign;
-/*
+/*
-* 快速排序，按某个属性，或按“获取排序依据的函数”，来排序.
+* 快速排序，按某个属性，或按“获取排序依据的函数”，来排序.
-* @method soryBy
+* @method soryBy
-* @static
+* @static
-* @param {array} arr 待处理数组
+* @param {array} arr 待处理数组
-* @param {string|function} prop 排序依据属性，获取
+* @param {string|function} prop 排序依据属性，获取
-* @param {boolean} desc 降序
+* @param {boolean} desc 降序
-* @return {array} 返回排序后的新数组
+* @return {array} 返回排序后的新数组
 */
 
 function sortBy(arr, prop, desc) {
-  var props = [],
+    var props = [],
-      ret = [],
+        ret = [],
-      i = 0,
+        i = 0,
-      len = arr.length;
+        len = arr.length;
-  if (typeof prop == 'string') {
+    if (typeof prop == 'string') {
-    for (; i < len; i++) {
+        for (; i < len; i++) {
-      var oI = arr[i];
+            var oI = arr[i];
-      (props[i] = new String(oI && oI[prop] || ''))._obj = oI;
+            (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') {
+    props.sort();
-    for (; i < len; i++) {
+    for (i = 0; i < len; i++) {
-      var _oI = arr[i];
+        ret[i] = props[i]._obj;
-      (props[i] = new String(_oI && prop(_oI) || ''))._obj = _oI;
     }
-  } else {
+    if (desc) ret.reverse();
-    throw '参数类型错误';
+    return ret;
-  }
-  props.sort();
-  for (i = 0; i < len; i++) {
-    ret[i] = props[i]._obj;
-  }
-  if (desc) ret.reverse();
-  return ret;
 };
 
-/**
+/**
- * 数组对象排序
+ * 数组对象排序
- * console.log(arr.sort(compare('age')))
+ * console.log(arr.sort(compare('age')))
- * @param {} property 
+ * @param {} property 
  */
 function compare(property) {
-  return function (a, b) {
+    return function (a, b) {
-    var value1 = a[property];
+        var value1 = a[property];
-    var value2 = b[property];
+        var value2 = b[property];
-    return value1 - value2;
+        return value1 - value2;
-  };
+    };
 }
 
-/**
+/**
- * 简单数组数据对象拷贝
+ * 简单数组数据对象拷贝
- * @param {*} obj 要拷贝的对象 
+ * @param {*} obj 要拷贝的对象 
  */
 function ObjectAssign(obj) {
-  var b = obj instanceof Array;
+    var b = obj instanceof Array;
-  var tagObj = b ? [] : {};
+    var tagObj = b ? [] : {};
-  if (b) {
+    if (b) {
-    //数组
+        //数组
-    obj.forEach(function (da) {
+        obj.forEach(function (da) {
-      var _da = {};
+            var _da = {};
-      _extends(_da, da);
+            _extends(_da, da);
-      tagObj.push(_da);
+            tagObj.push(_da);
-    });
+        });
-  } else {
+    } else {
-    _extends(tagObj, obj);
+        _extends(tagObj, obj);
-  }
+    }
-  return tagObj;
+    return tagObj;
 }

build/render/CheckboxRender.js

@@ -19,11 +19,11 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
 
-/**
+/**
- * 渲染checkbox
+ * 渲染checkbox
- * @param Checkbox
+ * @param Checkbox
- * @param Icon
+ * @param Icon
- * @returns {CheckboxRender}
+ * @returns {CheckboxRender}
  */
 function renderCheckbox(Checkbox, Icon) {
     return function (_Component) {

build/render/InputRender.js

@@ -28,12 +28,12 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
 
-/**
+/**
- * 渲染输入框
+ * 渲染输入框
- * @param Form
+ * @param Form
- * @param Input
+ * @param Input
- * @param Icon
+ * @param Icon
- * @returns {InputRender}
+ * @returns {InputRender}
  */
 function renderInput(Form, Input, Icon) {
     var _class, _temp2;

build/render/SelectRender.js

@@ -26,11 +26,11 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
 
-/**
+/**
- * 渲染下拉框
+ * 渲染下拉框
- * @param Select
+ * @param Select
- * @param Icon
+ * @param Icon
- * @returns {SelectRender}
+ * @returns {SelectRender}
  */
 function renderSelect(Select, Icon) {
     var _class, _temp2;

dist/demo.css

@@ -259,7 +259,8 @@
   .u-table-fixed-header .u-table-fixed-left .u-table-body-inner {
     padding-right: 0px; }
   .u-table-fixed-header .u-table-body-inner {
-    height: 100%; }
+    height: 100%;
+    overflow: scroll; }
   .u-table-fixed-header .u-table-scroll .u-table-header {
     overflow-x: scroll;
     padding-bottom: 20px;

dist/demo.js

@@ -34244,7 +34244,7 @@
 	    }
 	
 	    // 是否传入 scroll中的y属性，如果传入判断是否是整数，如果是则进行比较 。bodyTable 的clientHeight进行判断
-	    this.isShowScrollY();
+	    // this.isShowScrollY();
 	  };
 	
 	  Table.prototype.componentWillUnmount = function componentWillUnmount() {
@@ -34583,7 +34583,6 @@
 	   * 行拖拽结束时触发
 	   * @param currentKey 当前拖拽目标的key
 	   * @param targetKey 拖拽结束时，目标位置的key
-	   * @param dragEvent 拖拽动作的事件对象
 	   */
 	
 	
@@ -34874,7 +34873,7 @@
 	
 	            if (this.domWidthDiff <= 0) {
 	              headStyle.marginBottom = scrollbarWidth + 'px';
-	              // bodyStyle.marginBottom = `-${scrollbarWidth}px`;
+	              bodyStyle.marginBottom = '-' + scrollbarWidth + 'px';
 	            } else {
 	              innerBodyStyle.overflowX = 'auto';
 	            }
@@ -34891,8 +34890,8 @@
 	              headStyle.overflow = 'hidden';
 	              innerBodyStyle.overflowX = 'auto'; //兼容expand场景、子表格含有固定列的场景
 	            } else {
-	                // bodyStyle.marginBottom = `-${scrollbarWidth}px`;
+	              bodyStyle.marginBottom = '-' + scrollbarWidth + 'px';
-	              }
+	            }
 	          } else {
 	            // 没有数据时，表头滚动条隐藏问题
 	            if (data.length == 0 && this.domWidthDiff < 0) {
@@ -250917,7 +250916,7 @@
 	        }
 	      });
 	
-	      if (data.length == count + disabledCount) {
+	      if (data.length == count + disabledCount && count > 0) {
 	        return "all";
 	      }
 	      return count == 0 ? false : "indeter";

package.json

@@ -1,6 +1,6 @@
 {
  "name": "bee-table",
- "version": "2.0.22",
+ "version": "2.0.23",
  "description": "Table ui component for react",
  "keywords": [
   "react",

src/Table.js

@@ -232,7 +232,7 @@ class Table extends Component {
     }
     
     // 是否传入 scroll中的y属性，如果传入判断是否是整数，如果是则进行比较 。bodyTable 的clientHeight进行判断
-    this.isShowScrollY();
+    // this.isShowScrollY();
   }
 
   componentWillUnmount() {
@@ -874,7 +874,7 @@ class Table extends Component {
       
            if(this.domWidthDiff <= 0){
               headStyle.marginBottom = `${scrollbarWidth}px`;
-              // bodyStyle.marginBottom = `-${scrollbarWidth}px`;
+              bodyStyle.marginBottom = `-${scrollbarWidth}px`;
             }else{
               innerBodyStyle.overflowX = 'auto';
             }
@@ -891,7 +891,7 @@ class Table extends Component {
               headStyle.overflow = 'hidden';
               innerBodyStyle.overflowX = 'auto'; //兼容expand场景、子表格含有固定列的场景
             }else{
-              // bodyStyle.marginBottom = `-${scrollbarWidth}px`;
+              bodyStyle.marginBottom = `-${scrollbarWidth}px`;
             }
             
           }else{

src/Table.scss

@@ -212,7 +212,7 @@ $icon-color:#505F79;
 
   &-fixed-header &-body-inner {
     height: 100%;
-    // overflow: scroll;
+    overflow: scroll;
   }
 
 

src/lib/multiSelect.js

@@ -75,7 +75,7 @@ export default function multiSelect(Table, Checkbox) {
         }
       })
 
-      if(data.length == count + disabledCount){
+      if(data.length == count + disabledCount && count>0){
         return "all";
       }
       return count == 0?false:"indeter";