vxe-table 3.7.0-beta.1 → 3.7.0-beta.10

package/lib/table/src/methods.js

@@ -434,6 +434,7 @@ var Methods = {
       oldScrollYLoad = this.scrollYLoad,
       sXOpts = this.sXOpts,
       sYOpts = this.sYOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var treeData = [];
     var fullData = datas ? datas.slice(0) : [];
     if (treeConfig) {
@@ -446,26 +447,26 @@ var Methods = {
           if (!treeOpts.parentField) {
             (0, _log.errLog)('vxe.error.reqProp', ['table.tree-config.parentField']);
           }
-          if (!treeOpts.children) {
-            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.children']);
+          if (!childrenField) {
+            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.childrenField']);
           }
-          if (!treeOpts.mapChildren) {
-            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.mapChildren']);
+          if (!treeOpts.mapChildrenField) {
+            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.mapChildrenField']);
           }
-          if (treeOpts.children === treeOpts.mapChildren) {
-            (0, _log.errLog)('vxe.error.errConflicts', ['tree-config.children', 'tree-config.mapChildren']);
+          if (childrenField === treeOpts.mapChildrenField) {
+            (0, _log.errLog)('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
           }
           fullData.forEach(function (row) {
-            if (row[treeOpts.children] && row[treeOpts.children].length) {
-              (0, _log.warnLog)('vxe.error.errConflicts', ['tree-config.transform', "row.".concat(treeOpts.children)]);
+            if (row[childrenField] && row[childrenField].length) {
+              (0, _log.warnLog)('vxe.error.errConflicts', ['tree-config.transform', "row.".concat(childrenField)]);
             }
           });
         }
         treeData = _xeUtils["default"].toArrayTree(fullData, {
           key: treeOpts.rowField,
           parentKey: treeOpts.parentField,
-          children: treeOpts.children,
-          mapChildren: treeOpts.mapChildren
+          children: childrenField,
+          mapChildren: treeOpts.mapChildrenField
         });
         fullData = treeData.slice(0);
       } else {
@@ -491,7 +492,7 @@ var Methods = {
     this.tableSynchData = datas;
     // 克隆原数据，用于显示编辑状态，与编辑值做对比
     if (keepSource) {
-      this.tableSourceData = _xeUtils["default"].clone(fullData, true);
+      this.cacheSourceMap(fullData);
     }
     if (process.env.NODE_ENV === 'development') {
       if (sYLoad) {
@@ -691,6 +692,8 @@ var Methods = {
       tableFullTreeData = this.tableFullTreeData;
     var fullDataRowIdData = this.fullDataRowIdData,
       fullAllDataRowIdData = this.fullAllDataRowIdData;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     var rowkey = (0, _util.getRowkey)(this);
     var isLazy = treeConfig && treeOpts.lazy;
     var handleCache = function handleCache(row, index, items, path, parent, nodes) {
@@ -701,8 +704,8 @@ var Methods = {
         rowid = getRowUniqueId();
         _xeUtils["default"].set(row, rowkey, rowid);
       }
-      if (isLazy && row[treeOpts.hasChild] && _xeUtils["default"].isUndefined(row[treeOpts.children])) {
-        row[treeOpts.children] = null;
+      if (isLazy && row[hasChildField] && _xeUtils["default"].isUndefined(row[childrenField])) {
+        row[childrenField] = null;
       }
       var rest = {
         row: row,
@@ -734,8 +737,35 @@ var Methods = {
       tableFullData.forEach(handleCache);
     }
   },
-  loadTreeChildren: function loadTreeChildren(row, childRecords) {
+  cacheSourceMap: function cacheSourceMap(fullData) {
     var _this11 = this;
+    var treeConfig = this.treeConfig,
+      treeOpts = this.treeOpts,
+      sourceDataRowIdData = this.sourceDataRowIdData;
+    var sourceData = _xeUtils["default"].clone(fullData, true);
+    var rowkey = (0, _util.getRowkey)(this);
+    sourceDataRowIdData = this.sourceDataRowIdData = {};
+    var handleSourceRow = function handleSourceRow(row) {
+      var rowid = (0, _util.getRowid)(_this11, row);
+      if ((0, _utils.eqEmptyValue)(rowid)) {
+        rowid = getRowUniqueId();
+        _xeUtils["default"].set(row, rowkey, rowid);
+      }
+      sourceDataRowIdData[rowid] = {
+        row: row,
+        rowid: rowid
+      };
+    };
+    // 源数据缓存
+    if (treeConfig && !treeOpts.transform) {
+      _xeUtils["default"].eachTree(sourceData, handleSourceRow, treeOpts);
+    } else {
+      sourceData.forEach(handleSourceRow);
+    }
+    this.tableSourceData = sourceData;
+  },
+  loadTreeChildren: function loadTreeChildren(row, childRecords) {
+    var _this12 = this;
     var keepSource = this.keepSource,
       tableSourceData = this.tableSourceData,
       treeOpts = this.treeOpts,
@@ -744,22 +774,22 @@ var Methods = {
       fullAllDataRowMap = this.fullAllDataRowMap,
       fullAllDataRowIdData = this.fullAllDataRowIdData;
     var transform = treeOpts.transform,
-      children = treeOpts.children,
-      mapChildren = treeOpts.mapChildren;
+      mapChildrenField = treeOpts.mapChildrenField;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var rest = fullAllDataRowIdData[(0, _util.getRowid)(this, row)];
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
       if (keepSource) {
-        var rowid = (0, _util.getRowid)(_this11, row);
+        var rowid = (0, _util.getRowid)(_this12, row);
         var matchObj = _xeUtils["default"].findTree(tableSourceData, function (item) {
-          return rowid === (0, _util.getRowid)(_this11, item);
+          return rowid === (0, _util.getRowid)(_this12, item);
         }, treeOpts);
         if (matchObj) {
-          matchObj.item[children] = _xeUtils["default"].clone(rows, true);
+          matchObj.item[childrenField] = _xeUtils["default"].clone(rows, true);
         }
       }
       _xeUtils["default"].eachTree(rows, function (childRow, index, items, path, parent, nodes) {
-        var rowid = (0, _util.getRowid)(_this11, childRow);
+        var rowid = (0, _util.getRowid)(_this12, childRow);
         var rest = {
           row: childRow,
           rowid: rowid,
@@ -776,11 +806,11 @@ var Methods = {
         fullAllDataRowIdData[rowid] = rest;
         fullAllDataRowMap.set(childRow, rest);
       }, treeOpts);
-      row[children] = rows;
+      row[childrenField] = rows;
       if (transform) {
-        row[mapChildren] = rows;
+        row[mapChildrenField] = rows;
       }
-      _this11.updateAfterDataIndex();
+      _this12.updateAfterDataIndex();
       return rows;
     });
   },
@@ -789,7 +819,7 @@ var Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheColumnMap: function cacheColumnMap() {
-    var _this12 = this;
+    var _this13 = this;
     var tableFullColumn = this.tableFullColumn,
       collectColumn = this.collectColumn,
       fullColumnMap = this.fullColumnMap,
@@ -870,14 +900,14 @@ var Methods = {
         }
       }
       if (process.env.NODE_ENV === 'development') {
-        if (_this12.showOverflow && column.showOverflow === false) {
-          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-overflow=".concat(_this12.showOverflow), "column.show-overflow=".concat(column.showOverflow)]);
+        if (_this13.showOverflow && column.showOverflow === false) {
+          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-overflow=".concat(_this13.showOverflow), "column.show-overflow=".concat(column.showOverflow)]);
         }
-        if (_this12.showHeaderOverflow && column.showHeaderOverflow === false) {
-          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-header-overflow=".concat(_this12.showHeaderOverflow), "column.show-header-overflow=".concat(column.showHeaderOverflow)]);
+        if (_this13.showHeaderOverflow && column.showHeaderOverflow === false) {
+          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-header-overflow=".concat(_this13.showHeaderOverflow), "column.show-header-overflow=".concat(column.showHeaderOverflow)]);
         }
-        if (_this12.showFooterOverflow && column.showFooterOverflow === false) {
-          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-footer-overflow=".concat(_this12.showFooterOverflow), "column.show-footer-overflow=".concat(column.showFooterOverflow)]);
+        if (_this13.showFooterOverflow && column.showFooterOverflow === false) {
+          (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-footer-overflow=".concat(_this13.showFooterOverflow), "column.show-footer-overflow=".concat(column.showFooterOverflow)]);
         }
       }
       if (process.env.NODE_ENV === 'development') {
@@ -1057,18 +1087,19 @@ var Methods = {
    * @param {Row} records 行数据
    */
   defineField: function defineField(records) {
-    var _this13 = this;
+    var _this14 = this;
     var radioOpts = this.radioOpts,
       checkboxOpts = this.checkboxOpts,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
       expandOpts = this.expandOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var rowkey = (0, _util.getRowkey)(this);
     if (!_xeUtils["default"].isArray(records)) {
       records = [records || {}];
     }
     return records.map(function (record) {
-      _this13.tableFullColumn.forEach(function (column) {
+      _this14.tableFullColumn.forEach(function (column) {
         var field = column.field,
           editRender = column.editRender;
         if (field && !_xeUtils["default"].has(record, field)) {
@@ -1092,8 +1123,8 @@ var Methods = {
           _xeUtils["default"].set(record, key, null);
         }
       });
-      if (treeConfig && treeOpts.lazy && _xeUtils["default"].isUndefined(record[treeOpts.children])) {
-        record[treeOpts.children] = null;
+      if (treeConfig && treeOpts.lazy && _xeUtils["default"].isUndefined(record[childrenField])) {
+        record[childrenField] = null;
       }
       // 必须有行数据的唯一主键，可以自行设置；也可以默认生成一个随机数
       if ((0, _utils.eqEmptyValue)(_xeUtils["default"].get(record, rowkey))) {
@@ -1108,9 +1139,9 @@ var Methods = {
    * @param {Array} records 新数据
    */
   createData: function createData(records) {
-    var _this14 = this;
+    var _this15 = this;
     return this.$nextTick().then(function () {
-      return _this14.defineField(records);
+      return _this15.defineField(records);
     });
   },
   /**
@@ -1135,7 +1166,7 @@ var Methods = {
    * 如果还额外传了 field 则还原指定的单元格数据
    */
   revertData: function revertData(rows, field) {
-    var _this15 = this;
+    var _this16 = this;
     var keepSource = this.keepSource,
       tableSourceData = this.tableSourceData,
       treeConfig = this.treeConfig;
@@ -1155,8 +1186,8 @@ var Methods = {
     }
     if (targetRows.length) {
       targetRows.forEach(function (row) {
-        if (!_this15.isInsertByRow(row)) {
-          var rowIndex = _this15.getRowIndex(row);
+        if (!_this16.isInsertByRow(row)) {
+          var rowIndex = _this16.getRowIndex(row);
           if (treeConfig && rowIndex === -1) {
             (0, _log.errLog)('vxe.error.noTree', ['revertData']);
           }
@@ -1230,39 +1261,24 @@ var Methods = {
    * @param {String} field 字段名
    */
   isUpdateByRow: function isUpdateByRow(row, field) {
-    var _this16 = this;
     var tableFullColumn = this.tableFullColumn,
       keepSource = this.keepSource,
-      treeConfig = this.treeConfig,
-      treeOpts = this.treeOpts,
-      tableSourceData = this.tableSourceData,
+      sourceDataRowIdData = this.sourceDataRowIdData,
       fullDataRowIdData = this.fullDataRowIdData;
     if (keepSource) {
-      var oRow, property;
       var rowid = (0, _util.getRowid)(this, row);
       // 新增的数据不需要检测
       if (!fullDataRowIdData[rowid]) {
         return false;
       }
-      if (treeConfig) {
-        var children = treeOpts.children;
-        var matchObj = _xeUtils["default"].findTree(tableSourceData, function (item) {
-          return rowid === (0, _util.getRowid)(_this16, item);
-        }, treeOpts);
-        row = Object.assign({}, row, _defineProperty({}, children, null));
-        if (matchObj) {
-          oRow = Object.assign({}, matchObj.item, _defineProperty({}, children, null));
-        }
-      } else {
-        var oRowIndex = fullDataRowIdData[rowid].index;
-        oRow = tableSourceData[oRowIndex];
-      }
-      if (oRow) {
+      var oldRest = sourceDataRowIdData[rowid];
+      if (oldRest) {
+        var oRow = oldRest.row;
         if (arguments.length > 1) {
           return !eqCellValue(oRow, row, field);
         }
         for (var index = 0, len = tableFullColumn.length; index < len; index++) {
-          property = tableFullColumn[index].field;
+          var property = tableFullColumn[index].field;
           if (property && !eqCellValue(oRow, row, property)) {
             return true;
           }
@@ -1327,9 +1343,9 @@ var Methods = {
       tableFullTreeData = this.tableFullTreeData,
       afterTreeFullData = this.afterTreeFullData;
     var transform = treeOpts.transform,
-      children = treeOpts.children,
-      mapChildren = treeOpts.mapChildren;
+      mapChildrenField = treeOpts.mapChildrenField;
     var checkField = checkboxOpts.checkField;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
     var rowList = [];
     if (checkField) {
@@ -1337,7 +1353,7 @@ var Methods = {
         rowList = _xeUtils["default"].filterTree(currTableData, function (row) {
           return _xeUtils["default"].get(row, checkField);
         }, {
-          children: transform ? mapChildren : children
+          children: transform ? mapChildrenField : childrenField
         });
       } else {
         rowList = currTableData.filter(function (row) {
@@ -1345,16 +1361,16 @@ var Methods = {
         });
       }
     } else {
-      var selection = this.selection;
+      var selectCheckboxRows = this.selectCheckboxRows;
       if (treeConfig) {
         rowList = _xeUtils["default"].filterTree(currTableData, function (row) {
-          return _this17.findRowIndexOf(selection, row) > -1;
+          return _this17.findRowIndexOf(selectCheckboxRows, row) > -1;
         }, {
-          children: transform ? mapChildren : children
+          children: transform ? mapChildrenField : childrenField
         });
       } else {
         rowList = currTableData.filter(function (row) {
-          return _this17.findRowIndexOf(selection, row) > -1;
+          return _this17.findRowIndexOf(selectCheckboxRows, row) > -1;
         });
       }
     }
@@ -1379,7 +1395,7 @@ var Methods = {
           fullData.push(row);
         }
       }, {
-        children: treeOpts.mapChildren
+        children: treeOpts.mapChildrenField
       });
       this.afterFullData = fullData;
       this.updateScrollYStatus(fullData);
@@ -1604,6 +1620,7 @@ var Methods = {
       fullAllDataRowIdData = this.fullAllDataRowIdData,
       afterTreeFullData = this.afterTreeFullData,
       treeOpts = this.treeOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     if (treeConfig) {
       _xeUtils["default"].eachTree(afterTreeFullData, function (row, index, items, path) {
         var rowid = (0, _util.getRowid)(_this19, row);
@@ -1630,7 +1647,7 @@ var Methods = {
           fullDataRowIdData[rowid] = rest;
         }
       }, {
-        children: treeOpts.transform ? treeOpts.mapChildren : treeOpts.children
+        children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField
       });
     } else {
       afterFullData.forEach(function (row, index) {
@@ -1795,7 +1812,7 @@ var Methods = {
    */
   showColumn: function showColumn(fieldOrColumn) {
     var column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
-    if (column & !column.visible) {
+    if (column && column.visible) {
       column.visible = true;
       return this.handleCustom();
     }
@@ -2445,6 +2462,7 @@ var Methods = {
   },
   updateHeight: function updateHeight() {
     this.customHeight = calcHeight(this, 'height');
+    this.customMinHeight = calcHeight(this, 'minHeight');
     this.customMaxHeight = calcHeight(this, 'maxHeight');
   },
   updateStyle: function updateStyle() {
@@ -2454,6 +2472,7 @@ var Methods = {
       fullColumnIdData = this.fullColumnIdData,
       tableColumn = this.tableColumn,
       customHeight = this.customHeight,
+      customMinHeight = this.customMinHeight,
       customMaxHeight = this.customMaxHeight,
       border = this.border,
       headerHeight = this.headerHeight,
@@ -2562,15 +2581,22 @@ var Methods = {
         } else if (layout === 'body') {
           var emptyBlockElem = elemStore["".concat(name, "-").concat(layout, "-emptyBlock")];
           if (isNodeElement(wrapperElem)) {
+            var bodyMinHeight = fixedType ? customMinHeight - headerHeight - footerHeight - (showFooter ? 0 : scrollbarHeight) : customMinHeight - headerHeight - footerHeight;
+            var bodyMaxHeight = 0;
             if (customMaxHeight) {
-              wrapperElem.style.maxHeight = "".concat(fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight, "px");
-            } else {
-              if (customHeight > 0) {
-                wrapperElem.style.height = "".concat(fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight, "px");
-              } else {
-                wrapperElem.style.height = '';
+              bodyMaxHeight = Math.max(bodyMinHeight, fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight);
+              wrapperElem.style.maxHeight = "".concat(bodyMaxHeight, "px");
+            }
+            if (customHeight > 0) {
+              var bodyHeight = fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight;
+              if (bodyMaxHeight) {
+                bodyHeight = Math.min(bodyMaxHeight, bodyHeight);
               }
+              wrapperElem.style.height = "".concat(Math.max(bodyMinHeight, bodyHeight), "px");
+            } else {
+              wrapperElem.style.height = '';
             }
+            wrapperElem.style.minHeight = "".concat(bodyMinHeight, "px");
           }
 
           // 如果是固定列
@@ -3452,12 +3478,12 @@ var Methods = {
     return this.handleCheckedCheckboxRow(rows, value, true);
   },
   isCheckedByCheckboxRow: function isCheckedByCheckboxRow(row) {
-    var selection = this.selection;
+    var selectCheckboxRows = this.selectCheckboxRows;
     var checkField = this.checkboxOpts.checkField;
     if (checkField) {
       return _xeUtils["default"].get(row, checkField);
     }
-    return this.findRowIndexOf(selection, row) > -1;
+    return this.findRowIndexOf(selectCheckboxRows, row) > -1;
   },
   isIndeterminateByCheckboxRow: function isIndeterminateByCheckboxRow(row) {
     var treeIndeterminates = this.treeIndeterminates;
@@ -3470,7 +3496,7 @@ var Methods = {
   handleSelectRow: function handleSelectRow(_ref6, value, isForce) {
     var _this33 = this;
     var row = _ref6.row;
-    var selection = this.selection,
+    var selectCheckboxRows = this.selectCheckboxRows,
       afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
@@ -3542,7 +3568,7 @@ var Methods = {
           if (this.findRowIndexOf(treeIndeterminates, row) === -1) {
             treeIndeterminates.push(row);
           }
-          _xeUtils["default"].remove(selection, function (item) {
+          _xeUtils["default"].remove(selectCheckboxRows, function (item) {
             return _this33.eqRow(item, row);
           });
         } else {
@@ -3552,9 +3578,9 @@ var Methods = {
               row: item
             })) {
               if (value) {
-                selection.push(item);
+                selectCheckboxRows.push(item);
               } else {
-                _xeUtils["default"].remove(selection, function (select) {
+                _xeUtils["default"].remove(selectCheckboxRows, function (select) {
                   return _this33.eqRow(select, item);
                 });
               }
@@ -3583,7 +3609,7 @@ var Methods = {
             _parentStatus = -1;
           } else {
             var _selectItems = _matchObj.items.filter(function (item) {
-              return _this33.findRowIndexOf(selection, item) > -1;
+              return _this33.findRowIndexOf(selectCheckboxRows, item) > -1;
             });
             _parentStatus = _selectItems.filter(function (item) {
               return _this33.findRowIndexOf(_vItems, item) > -1;
@@ -3598,11 +3624,11 @@ var Methods = {
           row: row
         })) {
           if (value) {
-            if (this.findRowIndexOf(selection, row) === -1) {
-              selection.push(row);
+            if (this.findRowIndexOf(selectCheckboxRows, row) === -1) {
+              selectCheckboxRows.push(row);
             }
           } else {
-            _xeUtils["default"].remove(selection, function (item) {
+            _xeUtils["default"].remove(selectCheckboxRows, function (item) {
               return _this33.eqRow(item, row);
             });
           }
@@ -3613,11 +3639,11 @@ var Methods = {
     this.checkSelectionStatus();
   },
   handleToggleCheckRowEvent: function handleToggleCheckRowEvent(evnt, params) {
-    var selection = this.selection,
+    var selectCheckboxRows = this.selectCheckboxRows,
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField;
     var row = params.row;
-    var value = checkField ? !_xeUtils["default"].get(row, checkField) : this.findRowIndexOf(selection, row) === -1;
+    var value = checkField ? !_xeUtils["default"].get(row, checkField) : this.findRowIndexOf(selectCheckboxRows, row) === -1;
     if (evnt) {
       this.triggerCheckRowEvent(evnt, params, value);
     } else {
@@ -3642,10 +3668,10 @@ var Methods = {
    * 多选，切换某一行的选中状态
    */
   toggleCheckboxRow: function toggleCheckboxRow(row) {
-    var selection = this.selection,
+    var selectCheckboxRows = this.selectCheckboxRows,
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField;
-    var value = checkField ? !_xeUtils["default"].get(row, checkField) : this.findRowIndexOf(selection, row) === -1;
+    var value = checkField ? !_xeUtils["default"].get(row, checkField) : this.findRowIndexOf(selectCheckboxRows, row) === -1;
     this.handleSelectRow({
       row: row
     }, value, true);
@@ -3656,7 +3682,7 @@ var Methods = {
     var afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
-      selection = this.selection,
+      selectCheckboxRows = this.selectCheckboxRows,
       checkboxReserveRowMap = this.checkboxReserveRowMap,
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField,
@@ -3664,7 +3690,7 @@ var Methods = {
       checkStrictly = checkboxOpts.checkStrictly,
       checkMethod = checkboxOpts.checkMethod;
     var selectRows = [];
-    var beforeSelection = treeConfig ? [] : selection.filter(function (row) {
+    var beforeSelection = treeConfig ? [] : selectCheckboxRows.filter(function (row) {
       return _this34.findRowIndexOf(afterFullData, row) === -1;
     });
     if (checkStrictly) {
@@ -3719,7 +3745,7 @@ var Methods = {
               _xeUtils["default"].eachTree(afterFullData, function (row) {
                 if (checkMethod({
                   row: row
-                }) ? 0 : _this34.findRowIndexOf(selection, row) > -1) {
+                }) ? 0 : _this34.findRowIndexOf(selectCheckboxRows, row) > -1) {
                   selectRows.push(row);
                 }
               }, treeOpts);
@@ -3734,7 +3760,7 @@ var Methods = {
              */
             if (!isForce && checkMethod) {
               selectRows = afterFullData.filter(function (row) {
-                return _this34.findRowIndexOf(selection, row) > -1 || checkMethod({
+                return _this34.findRowIndexOf(selectCheckboxRows, row) > -1 || checkMethod({
                   row: row
                 });
               });
@@ -3751,7 +3777,7 @@ var Methods = {
               selectRows = afterFullData.filter(function (row) {
                 return checkMethod({
                   row: row
-                }) ? 0 : _this34.findRowIndexOf(selection, row) > -1;
+                }) ? 0 : _this34.findRowIndexOf(selectCheckboxRows, row) > -1;
               });
             }
           }
@@ -3768,7 +3794,7 @@ var Methods = {
           });
         }
       }
-      this.selection = checkField ? [] : beforeSelection.concat(selectRows);
+      this.selectCheckboxRows = checkField ? [] : beforeSelection.concat(selectRows);
     }
     this.treeIndeterminates = [];
     this.checkSelectionStatus();
@@ -3784,7 +3810,7 @@ var Methods = {
   checkSelectionStatus: function checkSelectionStatus() {
     var _this35 = this;
     var afterFullData = this.afterFullData,
-      selection = this.selection,
+      selectCheckboxRows = this.selectCheckboxRows,
       treeIndeterminates = this.treeIndeterminates,
       checkboxOpts = this.checkboxOpts,
       treeConfig = this.treeConfig;
@@ -3844,22 +3870,22 @@ var Methods = {
             disableRows.push(row);
             return true;
           }
-          if (_this35.findRowIndexOf(selection, row) > -1) {
+          if (_this35.findRowIndexOf(selectCheckboxRows, row) > -1) {
             checkRows.push(row);
             return true;
           }
           return false;
         } : function (row) {
-          return _this35.findRowIndexOf(selection, row) > -1;
+          return _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
         });
         isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
         if (treeConfig) {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-            return _this35.findRowIndexOf(treeIndeterminates, row) > -1 || _this35.findRowIndexOf(selection, row) > -1;
+            return _this35.findRowIndexOf(treeIndeterminates, row) > -1 || _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
           });
         } else {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-            return _this35.findRowIndexOf(selection, row) > -1;
+            return _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
           });
         }
       }
@@ -3879,7 +3905,7 @@ var Methods = {
       radioReserveRow = this.radioReserveRow,
       radioOpts = this.radioOpts,
       checkboxOpts = this.checkboxOpts,
-      selection = this.selection,
+      selectCheckboxRows = this.selectCheckboxRows,
       rowExpandeds = this.rowExpandeds,
       treeExpandeds = this.treeExpandeds,
       expandOpts = this.expandOpts;
@@ -3895,7 +3921,7 @@ var Methods = {
       }
     }
     // 复选框
-    this.selection = getRecoverRow(this, selection); // 刷新多选行状态
+    this.selectCheckboxRows = getRecoverRow(this, selectCheckboxRows); // 刷新多选行状态
     // 还原保留选中状态
     if (checkboxOpts.reserve) {
       this.handleCheckedCheckboxRow(handleReserveRow(this, this.checkboxReserveRowMap), true, true);
@@ -4065,7 +4091,7 @@ var Methods = {
     }
     this.isAllSelected = false;
     this.isIndeterminate = false;
-    this.selection = [];
+    this.selectCheckboxRows = [];
     this.treeIndeterminates = [];
     return this.$nextTick();
   },
@@ -4486,12 +4512,18 @@ var Methods = {
         });
       }
       var params = {
+        $table: this,
+        $event: evnt,
         column: column,
         field: field,
         property: field,
         order: column.order,
-        sortList: this.getSortColumns()
+        sortList: this.getSortColumns(),
+        sortTime: column.sortTime
       };
+      if (this.mouseConfig && this.mouseOpts.area && this.handleSortEvent) {
+        return this.handleSortEvent(evnt, params);
+      }
       this.emitEvent('sort-change', params, evnt);
     }
   },
@@ -4541,7 +4573,10 @@ var Methods = {
       if (!remote || firstSortColumn && firstSortColumn.remoteSort) {
         this.handleTableData(true);
       }
-      return this.$nextTick().then(this.updateStyle);
+      return this.$nextTick().then(function () {
+        _this41.updateCellAreas();
+        return _this41.updateStyle();
+      });
     }
     return this.$nextTick();
   },
@@ -4748,7 +4783,19 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setAllRowExpand: function setAllRowExpand(expanded) {
-    return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
+    var treeConfig = this.treeConfig,
+      treeOpts = this.treeOpts,
+      tableFullData = this.tableFullData,
+      tableFullTreeData = this.tableFullTreeData;
+    var expandedRows = [];
+    if (treeConfig) {
+      _xeUtils["default"].eachTree(tableFullTreeData, function (row) {
+        expandedRows.push(row);
+      }, treeOpts);
+    } else {
+      expandedRows = tableFullData;
+    }
+    return this.setRowExpand(expandedRows, expanded);
   },
   handleAsyncRowExpand: function handleAsyncRowExpand(row) {
     var _this44 = this;
@@ -4940,9 +4987,9 @@ var Methods = {
     var treeOpts = this.treeOpts,
       treeLazyLoadeds = this.treeLazyLoadeds;
     var transform = treeOpts.transform,
-      lazy = treeOpts.lazy,
-      hasChild = treeOpts.hasChild;
-    if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
+      lazy = treeOpts.lazy;
+    var hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+    if (lazy && row[hasChildField] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(function () {
         return _this47.handleAsyncTreeExpandChilds(row);
       }).then(function () {
@@ -5082,11 +5129,11 @@ var Methods = {
   setAllTreeExpand: function setAllTreeExpand(expanded) {
     var tableFullData = this.tableFullData,
       treeOpts = this.treeOpts;
-    var lazy = treeOpts.lazy,
-      children = treeOpts.children;
+    var lazy = treeOpts.lazy;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var expandeds = [];
     _xeUtils["default"].eachTree(tableFullData, function (row) {
-      var rowChildren = row[children];
+      var rowChildren = row[childrenField];
       if (lazy || rowChildren && rowChildren.length) {
         expandeds.push(row);
       }
@@ -5109,10 +5156,10 @@ var Methods = {
       treeNodeColumn = this.treeNodeColumn;
     var reserve = treeOpts.reserve,
       lazy = treeOpts.lazy,
-      hasChild = treeOpts.hasChild,
-      children = treeOpts.children,
       accordion = treeOpts.accordion,
       toggleMethod = treeOpts.toggleMethod;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     var result = [];
     var columnIndex = this.getColumnIndex(treeNodeColumn);
     var $columnIndex = this.getVMColumnIndex(treeNodeColumn);
@@ -5141,12 +5188,12 @@ var Methods = {
       validRows.forEach(function (row) {
         if (treeExpandeds.indexOf(row) === -1) {
           var rest = fullAllDataRowMap.get(row);
-          var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1;
+          var isLoad = lazy && row[hasChildField] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1;
           // 是否使用懒加载
           if (isLoad) {
             result.push(_this49.handleAsyncTreeExpandChilds(row));
           } else {
-            if (row[children] && row[children].length) {
+            if (row[childrenField] && row[childrenField].length) {
               treeExpandeds.push(row);
             }
           }
@@ -5631,16 +5678,16 @@ var Methods = {
    * 如果组件值 v-model 发生 change 时，调用改函数用于更新某一列编辑状态
    * 如果单元格配置了校验规则，则会进行校验
    */
-  updateStatus: function updateStatus(scope, cellValue) {
+  updateStatus: function updateStatus(slotParams, cellValue) {
     var _this57 = this;
     var customVal = !_xeUtils["default"].isUndefined(cellValue);
     return this.$nextTick().then(function () {
       var $refs = _this57.$refs,
         editRules = _this57.editRules,
         validStore = _this57.validStore;
-      if (scope && $refs.tableBody && editRules) {
-        var row = scope.row,
-          column = scope.column;
+      if (slotParams && $refs.tableBody && editRules) {
+        var row = slotParams.row,
+          column = slotParams.column;
         var type = 'change';
         if (_this57.hasCellRules(type, row, column)) {
           var cell = _this57.getCell(row, column);
@@ -5831,11 +5878,11 @@ var Methods = {
         columnIndex: this.getColumnIndex(column)
       };
       if (_xeUtils["default"].isString(formatter)) {
-        var globalFunc = _formats.formats.get(formatter);
-        cellLabel = globalFunc ? globalFunc(formatParams) : '';
+        var gFormatOpts = _formats.formats.get(formatter);
+        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
       } else if (_xeUtils["default"].isArray(formatter)) {
-        var _globalFunc = _formats.formats.get(formatter[0]);
-        cellLabel = _globalFunc ? _globalFunc.apply(void 0, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
+        var _gFormatOpts = _formats.formats.get(formatter[0]);
+        cellLabel = _gFormatOpts && _gFormatOpts.cellFormatMethod ? _gFormatOpts.cellFormatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
       } else {
         cellLabel = formatter(formatParams);
       }