vxe-table 3.7.0-beta.11 → 3.7.0-beta.13

package/lib/index.umd.js

@@ -10783,13 +10783,13 @@ var iconPrefix = 'vxe-icon-';
       isReplace: true
     },
     scrollX: {
-      enabled: true,
+      // enabled: false,
       gt: 60
       // oSize: 0
     },
 
     scrollY: {
-      enabled: true,
+      // enabled: false,
       gt: 100
       // oSize: 0
     }
@@ -11045,7 +11045,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.7.0-beta.10", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.7.0-beta.12", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12401,7 +12401,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.7.0-beta.10",
+  version: "3.7.0-beta.12",
   reg: reg,
   use: use,
   setup: setup,
@@ -13027,7 +13027,7 @@ function countTreeExpand(prevRow, params) {
   var treeOpts = $table.treeOpts;
   var childrenField = treeOpts.children || treeOpts.childrenField;
   var rowChildren = prevRow[childrenField];
-  if ($table.isTreeExpandByRow(prevRow)) {
+  if (rowChildren && $table.isTreeExpandByRow(prevRow)) {
     for (var index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params);
     }
@@ -13200,7 +13200,7 @@ function getSlotVNs(vns) {
 var renderType = 'body';
 
 // 滚动、拖动过程中不需要触发
-function isOperateMouse($xetable) {
+function isVMScrollProcess($xetable) {
   return $xetable._isResize || $xetable.lastScrollTime && Date.now() < $xetable.lastScrollTime + $xetable.delayHover;
 }
 function renderLine(h, _vm, $xetable, params) {
@@ -13339,7 +13339,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   // hover 进入事件
   if (showTitle || showTooltip || showAllTip || bindMouseenter || tooltipConfig) {
     tdOns.mouseenter = function (evnt) {
-      if (isOperateMouse($xetable)) {
+      if (isVMScrollProcess($xetable)) {
         return;
       }
       if (showTitle) {
@@ -13358,7 +13358,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   // hover 退出事件
   if (showTooltip || showAllTip || bindMouseleave || tooltipConfig) {
     tdOns.mouseleave = function (evnt) {
-      if (isOperateMouse($xetable)) {
+      if (isVMScrollProcess($xetable)) {
         return;
       }
       if (showTooltip || showAllTip) {
@@ -13512,7 +13512,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
     // 事件绑定
     if (rowOpts.isHover || highlightHoverRow) {
       trOn.mouseenter = function (evnt) {
-        if (isOperateMouse($xetable)) {
+        if (isVMScrollProcess($xetable)) {
           return;
         }
         $xetable.triggerHoverEvent(evnt, {
@@ -13521,7 +13521,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
         });
       };
       trOn.mouseleave = function () {
-        if (isOperateMouse($xetable)) {
+        if (isVMScrollProcess($xetable)) {
           return;
         }
         $xetable.clearHoverRow();
@@ -15271,17 +15271,17 @@ var Cell = {
       column = params.column,
       isHidden = params.isHidden;
     var treeConfig = $table.treeConfig,
-      treeIndeterminates = $table.treeIndeterminates;
-    var _$table$checkboxOpts2 = $table.checkboxOpts,
-      labelField = _$table$checkboxOpts2.labelField,
-      checkField = _$table$checkboxOpts2.checkField,
-      halfField = _$table$checkboxOpts2.halfField,
-      checkMethod = _$table$checkboxOpts2.checkMethod,
-      visibleMethod = _$table$checkboxOpts2.visibleMethod;
+      treeIndeterminates = $table.treeIndeterminates,
+      checkboxOpts = $table.checkboxOpts;
+    var labelField = checkboxOpts.labelField,
+      checkField = checkboxOpts.checkField,
+      checkMethod = checkboxOpts.checkMethod,
+      visibleMethod = checkboxOpts.visibleMethod;
+    var indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     var slots = column.slots;
     var defaultSlot = slots ? slots["default"] : null;
     var checkboxSlot = slots ? slots.checkbox : null;
-    var indeterminate = false;
+    var isIndeterminate = false;
     var isChecked = false;
     var isVisible = !visibleMethod || visibleMethod({
       row: row
@@ -15304,14 +15304,14 @@ var Cell = {
         });
       }
       if (treeConfig) {
-        indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1;
+        isIndeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1;
       }
     }
     var checkboxParams = _objectSpread2(_objectSpread2({}, params), {}, {
       checked: isChecked,
       disabled: isDisabled,
       visible: isVisible,
-      indeterminate: indeterminate
+      indeterminate: isIndeterminate
     });
     if (checkboxSlot) {
       return $table.callSlot(checkboxSlot, checkboxParams, h);
@@ -15319,7 +15319,7 @@ var Cell = {
     var checkVNs = [];
     if (isVisible) {
       checkVNs.push(h('span', {
-        "class": ['vxe-checkbox--icon', indeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
+        "class": ['vxe-checkbox--icon', isIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
       }));
     }
     if (defaultSlot || labelField) {
@@ -15331,7 +15331,7 @@ var Cell = {
       "class": ['vxe-cell--checkbox', {
         'is--checked': isChecked,
         'is--disabled': isDisabled,
-        'is--indeterminate': halfField && !isChecked ? row[halfField] : indeterminate
+        'is--indeterminate': indeterminateField && !isChecked ? row[indeterminateField] : isIndeterminate
       }],
       on: on
     }, checkVNs)];
@@ -19136,9 +19136,29 @@ var Methods = {
     }
   },
   triggerCheckRowEvent: function triggerCheckRowEvent(evnt, params, value) {
-    var checkMethod = this.checkboxOpts.checkMethod;
+    var checkboxOpts = this.checkboxOpts,
+      afterFullData = this.afterFullData;
+    var checkMethod = checkboxOpts.checkMethod;
+    var row = params.row;
+    if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
+      var checkboxRecords = this.getCheckboxRecords();
+      if (checkboxRecords.length) {
+        var firstRow = checkboxRecords[0];
+        var _rowIndex = this.getVTRowIndex(row);
+        var _firstRowIndex = this.getVTRowIndex(firstRow);
+        if (_rowIndex !== _firstRowIndex) {
+          this.setAllCheckboxRow(false);
+          var rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1);
+          this.handleCheckedCheckboxRow(rangeRows, true, false);
+          this.emitEvent('checkbox-range-select', Object.assign({
+            rangeRecords: rangeRows
+          }, params), evnt);
+          return;
+        }
+      }
+    }
     if (!checkMethod || checkMethod({
-      row: params.row
+      row: row
     })) {
       this.handleSelectRow(params, value);
       this.emitEvent('checkbox-change', Object.assign({
@@ -19174,6 +19194,7 @@ var Methods = {
       reserve = checkboxOpts.reserve,
       checkStrictly = checkboxOpts.checkStrictly,
       checkMethod = checkboxOpts.checkMethod;
+    var indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     var selectRows = [];
     var beforeSelection = treeConfig ? [] : selectCheckboxRows.filter(function (row) {
       return _this34.findRowIndexOf(afterFullData, row) === -1;
@@ -19195,6 +19216,9 @@ var Methods = {
             }
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, value);
           }
+          if (treeConfig && indeterminateField) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, false);
+          }
         };
         // 如果存在选中方法
         // 如果方法成立，则更新值，否则忽略该数据
@@ -19300,9 +19324,9 @@ var Methods = {
       checkboxOpts = this.checkboxOpts,
       treeConfig = this.treeConfig;
     var checkField = checkboxOpts.checkField,
-      halfField = checkboxOpts.halfField,
       checkStrictly = checkboxOpts.checkStrictly,
       checkMethod = checkboxOpts.checkMethod;
+    var indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (!checkStrictly) {
       var disableRows = [];
       var checkRows = [];
@@ -19327,9 +19351,9 @@ var Methods = {
         });
         isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
         if (treeConfig) {
-          if (halfField) {
+          if (indeterminateField) {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, halfField) || _this35.findRowIndexOf(treeIndeterminates, row) > -1;
+              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, indeterminateField) || _this35.findRowIndexOf(treeIndeterminates, row) > -1;
             });
           } else {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
@@ -19337,9 +19361,9 @@ var Methods = {
             });
           }
         } else {
-          if (halfField) {
+          if (indeterminateField) {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, halfField);
+              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, indeterminateField);
             });
           } else {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
@@ -19558,15 +19582,18 @@ var Methods = {
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField,
       reserve = checkboxOpts.reserve;
+    var indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (checkField) {
+      var handleClearChecked = function handleClearChecked(item) {
+        if (treeConfig && indeterminateField) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, indeterminateField, false);
+        }
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, false);
+      };
       if (treeConfig) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullData, function (item) {
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, false);
-        }, treeOpts);
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullData, handleClearChecked, treeOpts);
       } else {
-        tableFullData.forEach(function (item) {
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, false);
-        });
+        tableFullData.forEach(handleClearChecked);
       }
     }
     if (reserve) {
@@ -21398,7 +21425,7 @@ var Methods = {
 };
 
 // Module methods
-var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',');
+var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',');
 funcs.forEach(function (name) {
   Methods[name] = function () {
     if (false) {}
@@ -23758,6 +23785,7 @@ var es_array_unshift = __webpack_require__(541);
 
 
 
+
 
 
 function insertTreeRow(_vm, newRecords, isAppend) {
@@ -23784,10 +23812,15 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       var parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)];
       var parentLevel = parentRest ? parentRest.level : 0;
       var parentChilds = parentRow[childrenField];
+      var mapChilds = parentRow[mapChildrenField];
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(parentChilds)) {
         parentChilds = parentRow[childrenField] = [];
       }
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(mapChilds)) {
+        mapChilds = parentRow[childrenField] = [];
+      }
       parentChilds[funcName](item);
+      mapChilds[funcName](item);
       var rest = {
         row: item,
         rowid: rowid,
@@ -23821,6 +23854,181 @@ function insertTreeRow(_vm, newRecords, isAppend) {
     }
   });
 }
+function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
+  var tableFullTreeData = _vm.tableFullTreeData,
+    mergeList = _vm.mergeList,
+    afterFullData = _vm.afterFullData,
+    editStore = _vm.editStore,
+    tableFullData = _vm.tableFullData,
+    treeConfig = _vm.treeConfig,
+    fullDataRowIdData = _vm.fullDataRowIdData,
+    fullAllDataRowIdData = _vm.fullAllDataRowIdData,
+    treeOpts = _vm.treeOpts;
+  var transform = treeOpts.transform,
+    rowField = treeOpts.rowField,
+    mapChildrenField = treeOpts.mapChildrenField;
+  var childrenField = treeOpts.children || treeOpts.childrenField;
+  if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
+    records = [records];
+  }
+  var newRecords = _vm.defineField(records.map(function (record) {
+    var _ref;
+    return Object.assign(treeConfig && transform ? (_ref = {}, _defineProperty(_ref, mapChildrenField, []), _defineProperty(_ref, childrenField, []), _ref) : {}, record);
+  }));
+  if (!row) {
+    // 如果为虚拟树
+    if (treeConfig && transform) {
+      insertTreeRow(_vm, newRecords, false);
+    } else {
+      afterFullData.unshift.apply(afterFullData, _toConsumableArray(newRecords));
+      tableFullData.unshift.apply(tableFullData, _toConsumableArray(newRecords));
+      // 刷新单元格合并
+      mergeList.forEach(function (mergeItem) {
+        var mergeRowIndex = mergeItem.row;
+        if (mergeRowIndex > 0) {
+          mergeItem.row = mergeRowIndex + newRecords.length;
+        }
+      });
+    }
+  } else {
+    if (row === -1) {
+      // 如果为虚拟树
+      if (treeConfig && transform) {
+        insertTreeRow(_vm, newRecords, true);
+      } else {
+        afterFullData.push.apply(afterFullData, _toConsumableArray(newRecords));
+        tableFullData.push.apply(tableFullData, _toConsumableArray(newRecords));
+        // 刷新单元格合并
+        mergeList.forEach(function (mergeItem) {
+          var mergeRowIndex = mergeItem.row,
+            mergeRowspan = mergeItem.rowspan;
+          if (mergeRowIndex + mergeRowspan > afterFullData.length) {
+            mergeItem.rowspan = mergeRowspan + newRecords.length;
+          }
+        });
+      }
+    } else {
+      // 如果为虚拟树
+      if (treeConfig && transform) {
+        var matchMapObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
+          return row[rowField] === item[rowField];
+        }, {
+          children: mapChildrenField
+        });
+        if (matchMapObj) {
+          var parentRow = matchMapObj.parent;
+          var parentMapChilds = parentRow ? parentRow[mapChildrenField] : tableFullTreeData;
+          var parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)];
+          var parentLevel = parentRest ? parentRest.level : 0;
+          newRecords.forEach(function (item, i) {
+            var rowid = getRowid(_vm, item);
+            if (false) {}
+            if (parentRow) {
+              item[treeOpts.parentField] = parentRow[rowField];
+            }
+            var targetIndex = matchMapObj.index + i;
+            if (isInsertNextRow) {
+              targetIndex = targetIndex + 1;
+            }
+            parentMapChilds.splice(targetIndex, 0, item);
+            var rest = {
+              row: item,
+              rowid: rowid,
+              seq: -1,
+              index: -1,
+              _index: -1,
+              $index: -1,
+              items: parentMapChilds,
+              parent: parentRow,
+              level: parentLevel + 1
+            };
+            fullDataRowIdData[rowid] = rest;
+            fullAllDataRowIdData[rowid] = rest;
+          });
+
+          // 源
+          if (parentRow) {
+            var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
+              return row[rowField] === item[rowField];
+            }, {
+              children: childrenField
+            });
+            if (matchObj) {
+              var parentChilds = matchObj.items;
+              var targetIndex = matchObj.index;
+              if (isInsertNextRow) {
+                targetIndex = targetIndex + 1;
+              }
+              parentChilds.splice.apply(parentChilds, [targetIndex, 0].concat(_toConsumableArray(newRecords)));
+            }
+          }
+        } else {
+          if (false) {}
+          insertTreeRow(_vm, newRecords, true);
+        }
+      } else {
+        if (treeConfig) {
+          throw new Error(getLog('vxe.error.noTree', ['insert']));
+        }
+        var afIndex = -1;
+        // 如果是可视索引
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(row)) {
+          if (row < afterFullData.length) {
+            afIndex = row;
+          }
+        } else {
+          afIndex = _vm.findRowIndexOf(afterFullData, row);
+        }
+        // 如果是插入指定行的下一行
+        if (isInsertNextRow) {
+          afIndex = Math.max(afterFullData.length, afIndex + 1);
+        }
+        if (afIndex === -1) {
+          throw new Error(errLog('vxe.error.unableInsert'));
+        }
+        afterFullData.splice.apply(afterFullData, [afIndex, 0].concat(_toConsumableArray(newRecords)));
+        tableFullData.splice.apply(tableFullData, [_vm.findRowIndexOf(tableFullData, row), 0].concat(_toConsumableArray(newRecords)));
+        // 刷新单元格合并
+        mergeList.forEach(function (mergeItem) {
+          var mergeRowIndex = mergeItem.row,
+            mergeRowspan = mergeItem.rowspan;
+          if (mergeRowIndex > afIndex) {
+            mergeItem.row = mergeRowIndex + newRecords.length;
+          } else if (mergeRowIndex + mergeRowspan > afIndex) {
+            mergeItem.rowspan = mergeRowspan + newRecords.length;
+          }
+        });
+      }
+    }
+  }
+  var insertList = editStore.insertList,
+    insertMaps = editStore.insertMaps;
+  newRecords.forEach(function (newRow) {
+    var rowid = getRowid(_vm, newRow);
+    insertMaps[rowid] = newRow;
+  });
+  insertList.unshift.apply(insertList, _toConsumableArray(newRecords));
+  _vm.cacheRowMap();
+  _vm.updateScrollYStatus();
+  _vm.handleTableData(treeConfig && transform);
+  if (!(treeConfig && transform)) {
+    _vm.updateAfterDataIndex();
+  }
+  _vm.updateFooter();
+  _vm.checkSelectionStatus();
+  if (_vm.scrollYLoad) {
+    _vm.updateScrollYSpace();
+  }
+  return _vm.$nextTick().then(function () {
+    _vm.updateCellAreas();
+    return _vm.recalculate();
+  }).then(function () {
+    return {
+      row: newRecords.length ? newRecords[newRecords.length - 1] : null,
+      rows: newRecords
+    };
+  });
+}
 /* harmony default export */ const edit_src_mixin = ({
   methods: {
     /**
@@ -23829,7 +24037,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * @param {*} records
      */
     _insert: function _insert(records) {
-      return this.insertAt(records);
+      return handleInsertRowAt(this, records, null);
     },
     /**
      * 往表格指定行中插入临时数据
@@ -23838,155 +24046,13 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 如果 row 为有效行则插入到该行的位置
      * @param {Object/Array} records 新的数据
      * @param {Row} row 指定行
+     * @returns
      */
     _insertAt: function _insertAt(records, row) {
-      var _this = this;
-      var tableFullTreeData = this.tableFullTreeData,
-        mergeList = this.mergeList,
-        afterFullData = this.afterFullData,
-        editStore = this.editStore,
-        tableFullData = this.tableFullData,
-        treeConfig = this.treeConfig,
-        fullDataRowIdData = this.fullDataRowIdData,
-        fullAllDataRowIdData = this.fullAllDataRowIdData,
-        treeOpts = this.treeOpts;
-      var transform = treeOpts.transform,
-        rowField = treeOpts.rowField,
-        mapChildrenField = treeOpts.mapChildrenField;
-      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
-        records = [records];
-      }
-      var newRecords = this.defineField(records.map(function (record) {
-        return Object.assign({}, record);
-      }));
-      if (!row) {
-        // 如果为虚拟树
-        if (treeConfig && transform) {
-          insertTreeRow(this, newRecords, false);
-        } else {
-          afterFullData.unshift.apply(afterFullData, _toConsumableArray(newRecords));
-          tableFullData.unshift.apply(tableFullData, _toConsumableArray(newRecords));
-          // 刷新单元格合并
-          mergeList.forEach(function (mergeItem) {
-            var mergeRowIndex = mergeItem.row;
-            if (mergeRowIndex > 0) {
-              mergeItem.row = mergeRowIndex + newRecords.length;
-            }
-          });
-        }
-      } else {
-        if (row === -1) {
-          // 如果为虚拟树
-          if (treeConfig && transform) {
-            insertTreeRow(this, newRecords, true);
-          } else {
-            afterFullData.push.apply(afterFullData, _toConsumableArray(newRecords));
-            tableFullData.push.apply(tableFullData, _toConsumableArray(newRecords));
-            // 刷新单元格合并
-            mergeList.forEach(function (mergeItem) {
-              var mergeRowIndex = mergeItem.row,
-                mergeRowspan = mergeItem.rowspan;
-              if (mergeRowIndex + mergeRowspan > afterFullData.length) {
-                mergeItem.rowspan = mergeRowspan + newRecords.length;
-              }
-            });
-          }
-        } else {
-          // 如果为虚拟树
-          if (treeConfig && transform) {
-            var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
-              return row[rowField] === item[rowField];
-            }, {
-              children: mapChildrenField
-            });
-            if (matchObj) {
-              var parentRow = matchObj.parent;
-              var parentChilds = matchObj.items;
-              var parentRest = fullAllDataRowIdData[getRowid(this, parentRow)];
-              var parentLevel = parentRest ? parentRest.level : 0;
-              newRecords.forEach(function (item, i) {
-                var rowid = getRowid(_this, item);
-                if (false) {}
-                if (parentRow) {
-                  item[treeOpts.parentField] = parentRow[rowField];
-                }
-                parentChilds.splice(matchObj.index + i, 0, item);
-                var rest = {
-                  row: item,
-                  rowid: rowid,
-                  seq: -1,
-                  index: -1,
-                  _index: -1,
-                  $index: -1,
-                  items: parentChilds,
-                  parent: parentRow,
-                  level: parentLevel + 1
-                };
-                fullDataRowIdData[rowid] = rest;
-                fullAllDataRowIdData[rowid] = rest;
-              });
-            } else {
-              if (false) {}
-              insertTreeRow(this, newRecords, true);
-            }
-          } else {
-            if (treeConfig) {
-              throw new Error(getLog('vxe.error.noTree', ['insert']));
-            }
-            var afIndex = -1;
-            // 如果是可视索引
-            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(row)) {
-              if (row < afterFullData.length) {
-                afIndex = row;
-              }
-            } else {
-              afIndex = this.findRowIndexOf(afterFullData, row);
-            }
-            if (afIndex === -1) {
-              throw new Error(errLog('vxe.error.unableInsert'));
-            }
-            afterFullData.splice.apply(afterFullData, [afIndex, 0].concat(_toConsumableArray(newRecords)));
-            tableFullData.splice.apply(tableFullData, [this.findRowIndexOf(tableFullData, row), 0].concat(_toConsumableArray(newRecords)));
-            // 刷新单元格合并
-            mergeList.forEach(function (mergeItem) {
-              var mergeRowIndex = mergeItem.row,
-                mergeRowspan = mergeItem.rowspan;
-              if (mergeRowIndex > afIndex) {
-                mergeItem.row = mergeRowIndex + newRecords.length;
-              } else if (mergeRowIndex + mergeRowspan > afIndex) {
-                mergeItem.rowspan = mergeRowspan + newRecords.length;
-              }
-            });
-          }
-        }
-      }
-      var insertList = editStore.insertList,
-        insertMaps = editStore.insertMaps;
-      newRecords.forEach(function (newRow) {
-        var rowid = getRowid(_this, newRow);
-        insertMaps[rowid] = newRow;
-      });
-      insertList.unshift.apply(insertList, _toConsumableArray(newRecords));
-      this.cacheRowMap();
-      this.updateScrollYStatus();
-      this.handleTableData(treeConfig && transform);
-      if (!(treeConfig && transform)) {
-        this.updateAfterDataIndex();
-      }
-      this.updateFooter();
-      this.checkSelectionStatus();
-      if (this.scrollYLoad) {
-        this.updateScrollYSpace();
-      }
-      return this.$nextTick().then(function () {
-        _this.updateCellAreas();
-        return _this.recalculate();
-      }).then(function () {
-        return {
-          row: newRecords.length ? newRecords[newRecords.length - 1] : null,
-          rows: newRecords
-        };
-      });
+      return handleInsertRowAt(this, records, row);
+    },
+    _insertNextAt: function _insertNextAt(records, row) {
+      return handleInsertRowAt(this, records, row, true);
     },
     /**
      * 删除指定行数据
@@ -23995,7 +24061,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 如果为空则删除所有
      */
     _remove: function _remove(rows) {
-      var _this2 = this;
+      var _this = this;
       var afterFullData = this.afterFullData,
         tableFullData = this.tableFullData,
         tableFullTreeData = this.tableFullTreeData,
@@ -24006,13 +24072,15 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         selectCheckboxRows = this.selectCheckboxRows,
         isInsertByRow = this.isInsertByRow,
         treeOpts = this.treeOpts;
-      var transform = treeOpts.transform;
+      var transform = treeOpts.transform,
+        mapChildrenField = treeOpts.mapChildrenField;
+      var childrenField = treeOpts.children || treeOpts.childrenField;
       var actived = editStore.actived,
         removeList = editStore.removeList,
         insertList = editStore.insertList,
         insertMaps = editStore.insertMaps;
       var checkField = checkboxOpts.checkField;
-      var rest = [];
+      var delList = [];
       if (!rows) {
         rows = tableFullData;
       } else if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
@@ -24027,7 +24095,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       // 如果绑定了多选属性，则更新状态
       if (!checkField) {
         rows.forEach(function (row) {
-          var sIndex = _this2.findRowIndexOf(selectCheckboxRows, row);
+          var sIndex = _this.findRowIndexOf(selectCheckboxRows, row);
           if (sIndex > -1) {
             selectCheckboxRows.splice(sIndex, 1);
           }
@@ -24035,7 +24103,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       }
       // 从数据源中移除
       if (tableFullData === rows) {
-        rows = rest = tableFullData.slice(0);
+        rows = delList = tableFullData.slice(0);
         this.tableFullData = [];
         this.afterFullData = [];
         this.clearMergeCells();
@@ -24043,27 +24111,37 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         // 如果为虚拟树
         if (treeConfig && transform) {
           rows.forEach(function (row) {
-            var rowid = getRowid(_this2, row);
+            var rowid = getRowid(_this, row);
+            var matchMapObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
+              return rowid === getRowid(_this, item);
+            }, {
+              children: mapChildrenField
+            });
+            if (matchMapObj) {
+              var rItems = matchMapObj.items.splice(matchMapObj.index, 1);
+              delList.push(rItems[0]);
+            }
             var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
-              return rowid === getRowid(_this2, item);
-            }, treeOpts);
+              return rowid === getRowid(_this, item);
+            }, {
+              children: childrenField
+            });
             if (matchObj) {
-              var rItems = matchObj.items.splice(matchObj.index, 1);
-              rest.push(rItems[0]);
+              matchObj.items.splice(matchObj.index, 1);
             }
-            var afIndex = _this2.findRowIndexOf(afterFullData, row);
+            var afIndex = _this.findRowIndexOf(afterFullData, row);
             if (afIndex > -1) {
               afterFullData.splice(afIndex, 1);
             }
           });
         } else {
           rows.forEach(function (row) {
-            var tfIndex = _this2.findRowIndexOf(tableFullData, row);
+            var tfIndex = _this.findRowIndexOf(tableFullData, row);
             if (tfIndex > -1) {
               var rItems = tableFullData.splice(tfIndex, 1);
-              rest.push(rItems[0]);
+              delList.push(rItems[0]);
             }
-            var afIndex = _this2.findRowIndexOf(afterFullData, row);
+            var afIndex = _this.findRowIndexOf(afterFullData, row);
             if (afIndex > -1) {
               // 刷新单元格合并
               mergeList.forEach(function (mergeItem) {
@@ -24086,8 +24164,8 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       }
       // 从新增中移除已删除的数据
       rows.forEach(function (row) {
-        var rowid = getRowid(_this2, row);
-        var iIndex = _this2.findRowIndexOf(insertList, row);
+        var rowid = getRowid(_this, row);
+        var iIndex = _this.findRowIndexOf(insertList, row);
         if (iIndex > -1) {
           insertList.splice(iIndex, 1);
         }
@@ -24104,12 +24182,12 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         this.updateScrollYSpace();
       }
       return this.$nextTick().then(function () {
-        _this2.updateCellAreas();
-        return _this2.recalculate();
+        _this.updateCellAreas();
+        return _this.recalculate();
       }).then(function () {
         return {
-          row: rest.length ? rest[rest.length - 1] : null,
-          rows: rest
+          row: delList.length ? delList[delList.length - 1] : null,
+          rows: delList
         };
       });
     },
@@ -24117,9 +24195,9 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 删除复选框选中的数据
      */
     _removeCheckboxRow: function _removeCheckboxRow() {
-      var _this3 = this;
+      var _this2 = this;
       return this.remove(this.getCheckboxRecords()).then(function (params) {
-        _this3.clearCheckboxRow();
+        _this2.clearCheckboxRow();
         return params;
       });
     },
@@ -24127,10 +24205,10 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 删除单选框选中的数据
      */
     _removeRadioRow: function _removeRadioRow() {
-      var _this4 = this;
+      var _this3 = this;
       var radioRecord = this.getRadioRecord();
       return this.remove(radioRecord || []).then(function (params) {
-        _this4.clearRadioRow();
+        _this3.clearRadioRow();
         return params;
       });
     },
@@ -24138,10 +24216,10 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 删除当前行选中的数据
      */
     _removeCurrentRow: function _removeCurrentRow() {
-      var _this5 = this;
+      var _this4 = this;
       var currentRecord = this.getCurrentRecord();
       return this.remove(currentRecord || []).then(function (params) {
-        _this5.clearCurrentRow();
+        _this4.clearCurrentRow();
         return params;
       });
     },
@@ -24159,12 +24237,12 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 获取新增的临时数据
      */
     _getInsertRecords: function _getInsertRecords() {
-      var _this6 = this;
+      var _this5 = this;
       var fullAllDataRowIdData = this.fullAllDataRowIdData;
       var insertList = this.editStore.insertList;
       var insertRecords = [];
       insertList.forEach(function (row) {
-        var rowid = getRowid(_this6, row);
+        var rowid = getRowid(_this5, row);
         if (fullAllDataRowIdData[rowid]) {
           insertRecords.push(row);
         }
@@ -24211,7 +24289,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 处理激活编辑
      */
     handleActived: function handleActived(params, evnt) {
-      var _this7 = this;
+      var _this6 = this;
       var editStore = this.editStore,
         editOpts = this.editOpts,
         tableColumn = this.tableColumn,
@@ -24247,13 +24325,13 @@ function insertTreeRow(_vm, newRecords, isAppend) {
             actived.column = column;
             if (mode === 'row') {
               tableColumn.forEach(function (column) {
-                return _this7._getColumnModel(row, column);
+                return _this6._getColumnModel(row, column);
               });
             } else {
               this._getColumnModel(row, column);
             }
             this.$nextTick(function () {
-              _this7.handleFocus(params, evnt);
+              _this6.handleFocus(params, evnt);
             });
           }
           this.emitEvent(type, {
@@ -24282,7 +24360,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
           actived.args = params;
           actived.column = column;
           setTimeout(function () {
-            _this7.handleFocus(params, evnt);
+            _this6.handleFocus(params, evnt);
           });
         }
         this.focus();
@@ -24307,7 +24385,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       }
     },
     _syncActivedCell: function _syncActivedCell() {
-      var _this8 = this;
+      var _this7 = this;
       var tableColumn = this.tableColumn,
         editStore = this.editStore,
         editOpts = this.editOpts;
@@ -24317,7 +24395,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       if (row || column) {
         if (editOpts.mode === 'row') {
           tableColumn.forEach(function (column) {
-            return _this8._setColumnModel(row, column);
+            return _this7._setColumnModel(row, column);
           });
         } else {
           this._setColumnModel(row, column);
@@ -24460,22 +24538,22 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 激活单元格编辑
      */
     _setEditCell: function _setEditCell(row, fieldOrColumn) {
-      var _this9 = this;
+      var _this8 = this;
       var editConfig = this.editConfig;
       var column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
       if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
         return this.scrollToRow(row, true).then(function () {
-          var cell = _this9.getCell(row, column);
+          var cell = _this8.getCell(row, column);
           if (cell) {
-            _this9.handleActived({
+            _this8.handleActived({
               row: row,
-              rowIndex: _this9.getRowIndex(row),
+              rowIndex: _this8.getRowIndex(row),
               column: column,
-              columnIndex: _this9.getColumnIndex(column),
+              columnIndex: _this8.getColumnIndex(column),
               cell: cell,
-              $table: _this9
+              $table: _this8
             });
-            _this9.lastCallTime = Date.now();
+            _this8.lastCallTime = Date.now();
           }
         });
       }
@@ -24509,7 +24587,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 处理选中源
      */
     handleSelected: function handleSelected(params, evnt) {
-      var _this10 = this;
+      var _this9 = this;
       var mouseConfig = this.mouseConfig,
         mouseOpts = this.mouseOpts,
         editOpts = this.editOpts,
@@ -24522,23 +24600,23 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       var selectMethod = function selectMethod() {
         if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
           if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
-            _this10.clearActived(evnt);
-            _this10.clearSelected(evnt);
-            _this10.clearCellAreas(evnt);
-            _this10.clearCopyCellArea(evnt);
+            _this9.clearActived(evnt);
+            _this9.clearSelected(evnt);
+            _this9.clearCellAreas(evnt);
+            _this9.clearCopyCellArea(evnt);
             selected.args = params;
             selected.row = row;
             selected.column = column;
             if (isMouseSelected) {
-              _this10.addColSdCls();
+              _this9.addColSdCls();
             }
-            _this10.focus();
+            _this9.focus();
             if (evnt) {
-              _this10.emitEvent('cell-selected', params, evnt);
+              _this9.emitEvent('cell-selected', params, evnt);
             }
           }
         }
-        return _this10.$nextTick();
+        return _this9.$nextTick();
       };
       return selectMethod();
     },