2.1.4

build/Table.js

@@ -786,6 +786,7 @@ var Table = function (_Component) {
     }
     var lazyCurrentIndex = props.lazyLoad && props.lazyLoad.startIndex ? props.lazyLoad.startIndex : 0;
     var lazyParentIndex = props.lazyLoad && props.lazyLoad.startParentIndex ? props.lazyLoad.startParentIndex : 0;
+    var lazyEndIndex = props.lazyLoad && props.lazyLoad.endIndex ? props.lazyLoad.endIndex : -1;
     for (var i = 0; i < data.length; i++) {
       var isHiddenExpandIcon = void 0;
       var record = data[i];
@@ -884,7 +885,9 @@ var Table = function (_Component) {
         contentTable: this.contentTable,
         tableUid: this.tableUid,
         expandedIcon: props.expandedIcon,
-        collapsedIcon: props.collapsedIcon
+        collapsedIcon: props.collapsedIcon,
+        lazyStartIndex: lazyCurrentIndex,
+        lazyEndIndex: lazyEndIndex
       })));
       this.treeRowIndex++;
       var subVisible = visible && isRowExpanded;

build/TableCell.js

@@ -74,7 +74,9 @@ var TableCell = function (_Component) {
         column = _props2.column,
         fixed = _props2.fixed,
         showSum = _props2.showSum,
-        bodyDisplayInRow = _props2.bodyDisplayInRow;
+        bodyDisplayInRow = _props2.bodyDisplayInRow,
+        lazyStartIndex = _props2.lazyStartIndex,
+        lazyEndIndex = _props2.lazyEndIndex;
     var dataIndex = column.dataIndex,
         render = column.render;
     var _column$className = column.className,
@@ -91,7 +93,7 @@ var TableCell = function (_Component) {
       text = render(text, record, index);
       if (this.isInvalidRenderCellText(text)) {
         tdProps = text.props || {};
-        rowSpan = tdProps.rowSpan;
+        rowSpan = tdProps.rowSpan > lazyEndIndex && lazyEndIndex > 5 ? lazyEndIndex - index : tdProps.rowSpan;
         colSpan = tdProps.colSpan;
         text = text.children;
       }
@@ -106,9 +108,13 @@ var TableCell = function (_Component) {
       className: clsPrefix + '-indent indent-level-' + indent
     }) : null;
 
-    if (rowSpan === 0 || colSpan === 0) {
+    if (lazyStartIndex !== index && (rowSpan === 0 || colSpan === 0)) {
       return null;
     }
+    if (tdProps && tdProps.mergeEndIndex && index < tdProps.mergeEndIndex && rowSpan === 0) {
+      rowSpan = tdProps.mergeEndIndex - index;
+      text = '';
+    }
     //不是固定表格并且当前列是固定，则隐藏当前列
     if (column.fixed && !fixed) {
       className = className + (' ' + clsPrefix + '-fixed-columns-in-body');
@@ -127,6 +133,7 @@ var TableCell = function (_Component) {
         className: className,
         onClick: this.handleClick,
         title: title
+
       },
       indentText,
       expandIcon,

build/TableHeader.js

@@ -590,6 +590,10 @@ var TableHeader = function (_Component) {
 
   TableHeader.prototype.eventListen = function eventListen(events, type, eventSource) {
     if (!this.table) return;
+    if (!eventSource) {
+      console.log("Please set the attributes of column !");
+      return;
+    }
     var tr = this.table.tr;
 
     for (var i = 0; i < events.length; i++) {

build/TableRow.js

@@ -533,7 +533,9 @@ var TableRow = function (_Component) {
         bodyDisplayInRow = _props9.bodyDisplayInRow,
         expandedIcon = _props9.expandedIcon,
         collapsedIcon = _props9.collapsedIcon,
-        hoverKey = _props9.hoverKey;
+        hoverKey = _props9.hoverKey,
+        lazyStartIndex = _props9.lazyStartIndex,
+        lazyEndIndex = _props9.lazyEndIndex;
 
     var showSum = false;
     var className = this.props.className;
@@ -582,7 +584,9 @@ var TableRow = function (_Component) {
         fixed: fixed,
         showSum: showSum,
         expandIcon: isColumnHaveExpandIcon ? expandIcon : null,
-        bodyDisplayInRow: bodyDisplayInRow
+        bodyDisplayInRow: bodyDisplayInRow,
+        lazyStartIndex: lazyStartIndex,
+        lazyEndIndex: lazyEndIndex
       }));
     }
     var style = { height: height };

build/lib/bigData.js

@@ -27,7 +27,7 @@ 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); }
 
 var defaultHeight = 30;
-var rowDiff = 3; //行差值
+var rowDiff = 2; //行差值
 var treeTypeIndex = 0;
 function bigData(Table) {
   var _class, _temp, _initialiseProps;
@@ -284,6 +284,7 @@ function bigData(Table) {
       }
       var lazyLoad = {
         startIndex: startIndex,
+        endIndex: endIndex,
         startParentIndex: startIndex //为树状节点做准备
       };
       if (this.treeType) {
@@ -435,11 +436,12 @@ function bigData(Table) {
           // 向下滚动 下临界值超出缓存的endIndex则重新渲染
           if (rowsInView + index > endIndex - rowDiff && isOrder) {
             startIndex = index - loadBuffer > 0 ? index - loadBuffer : 0;
+            // endIndex = startIndex + rowsInView + loadBuffer*2;
             endIndex = startIndex + loadCount;
             if (endIndex > data.length) {
               endIndex = data.length;
             }
-            if (endIndex !== _this4.endIndex) {
+            if (endIndex > _this4.endIndex) {
               _this4.startIndex = startIndex;
               _this4.endIndex = endIndex;
               _this4.setState({ needRender: !needRender });
@@ -451,7 +453,7 @@ function bigData(Table) {
             if (startIndex < 0) {
               startIndex = 0;
             }
-            if (startIndex !== _this4.startIndex) {
+            if (startIndex < _this4.startIndex) {
               _this4.startIndex = startIndex;
               _this4.endIndex = _this4.startIndex + loadCount;
               _this4.setState({ needRender: !needRender });

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
-* @static
-* @param {array} arr 待处理数组
-* @param {string|function} prop 排序依据属性，获取
-* @param {boolean} desc 降序
-* @return {array} 返回排序后的新数组
+/*
+* 快速排序，按某个属性，或按“获取排序依据的函数”，来排序.
+* @method soryBy
+* @static
+* @param {array} arr 待处理数组
+* @param {string|function} prop 排序依据属性，获取
+* @param {boolean} desc 降序
+* @return {array} 返回排序后的新数组
 */
 
 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;
 };
 
-/**
- * 数组对象排序
- * console.log(arr.sort(compare('age')))
- * @param {} property 
+/**
+ * 数组对象排序
+ * console.log(arr.sort(compare('age')))
+ * @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;
+    };
 }
 
-/**
- * 简单数组数据对象拷贝
- * @param {*} obj 要拷贝的对象 
+/**
+ * 简单数组数据对象拷贝
+ * @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;
 }

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
- * @param Checkbox
- * @param Icon
- * @returns {CheckboxRender}
+/**
+ * 渲染checkbox
+ * @param Checkbox
+ * @param Icon
+ * @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 Input
- * @param Icon
- * @returns {InputRender}
+/**
+ * 渲染输入框
+ * @param Form
+ * @param Input
+ * @param Icon
+ * @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 Icon
- * @returns {SelectRender}
+/**
+ * 渲染下拉框
+ * @param Select
+ * @param Icon
+ * @returns {SelectRender}
  */
 function renderSelect(Select, Icon) {
     var _class, _temp2;

dist/demo.css

@@ -142,6 +142,12 @@
   .u-loading.u-loading-line.u-loading-line-warning > div {
     background-color: #ff9800; }
 
+.u-loading.u-loading-custom > div {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%); }
+
 @keyframes line-scale {
   0% {
     transform: scaley(1); }

package.json

@@ -1,6 +1,6 @@
 {
  "name": "bee-table",
- "version": "2.1.4-alpha.4",
+ "version": "2.1.4",
  "description": "Table ui component for react",
  "keywords": [
   "react",