vxe-table 4.1.4 → 4.1.7

package/lib/index.umd.js

@@ -8420,6 +8420,7 @@ var GlobalConfig = {
     showHeader: true,
     animat: true,
     delayHover: 250,
+    autoResize: true,
     // keepSource: false,
     // showOverflow: null,
     // showHeaderOverflow: null,
@@ -8427,7 +8428,6 @@ var GlobalConfig = {
     // resizeInterval: 500,
     // size: null,
     // zIndex: null,
-    // autoResize: false,
     // stripe: false,
     // border: false,
     // round: false,
@@ -8500,6 +8500,9 @@ var GlobalConfig = {
     mouseConfig: {
       extension: true
     },
+    keyboardConfig: {
+      isEsc: true
+    },
     areaConfig: {
       selectCellByHeader: true
     },
@@ -8927,9 +8930,6 @@ var es_regexp_exec = __webpack_require__("ac1f");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__("5319");
 
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
-var es_object_assign = __webpack_require__("cca6");
-
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__("99af");
 
@@ -8954,9 +8954,6 @@ var es_array_slice = __webpack_require__("fb6a");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
 var es_object_to_string = __webpack_require__("d3b7");
 
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
-var es_promise = __webpack_require__("e6cf");
-
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.fixed.js
 var es_string_fixed = __webpack_require__("c7cd");
 
@@ -8971,7 +8968,6 @@ var es_string_fixed = __webpack_require__("c7cd");
 
 
 
-
 var columnInfo_ColumnInfo = /*#__PURE__*/function () {
   /* eslint-disable @typescript-eslint/no-use-before-define */
   function ColumnInfo($xetable, _vm) {
@@ -9348,7 +9344,6 @@ function dom_triggerEvent(targetElem, type) {
 
 
 
-
 function restoreScrollLocation($xetable, scrollLeft, scrollTop) {
   var internalData = $xetable.internalData;
   return $xetable.clearScroll().then(function () {
@@ -9730,7 +9725,6 @@ function getOnName(type) {
 
 
 
-
 var componentDefaultModelProp = 'modelValue';
 var defaultCompProps = {
   transfer: true
@@ -10520,7 +10514,6 @@ var renderer = {
 
 
 
-
 /**
  * 创建数据仓库
  */
@@ -10578,7 +10571,6 @@ var store_Store = /*#__PURE__*/function () {
 /* harmony default export */ var store = (store_Store);
 // CONCATENATED MODULE: ./packages/v-x-e-table/src/commands.ts
 
-
 var commands = new store();
 
 if (true) {
@@ -10588,7 +10580,6 @@ if (true) {
 }
 // CONCATENATED MODULE: ./packages/v-x-e-table/src/menus.ts
 
-
 var menus = new store();
 
 if (true) {
@@ -10598,7 +10589,6 @@ if (true) {
 }
 // CONCATENATED MODULE: ./packages/v-x-e-table/src/formats.ts
 
-
 var formats = new store();
 
 if (true) {
@@ -10748,7 +10738,6 @@ var Icon = {
 
 
 
-
 /* harmony default export */ var panel = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeTableFilter',
   props: {
@@ -10971,7 +10960,6 @@ var Icon = {
 
 
 
-
 var tableFilterMethodKeys = ['setFilter', 'clearFilter', 'getCheckedFilters'];
 var tableFilterHook = {
   setupTable: function setupTable($xetable) {
@@ -11556,7 +11544,6 @@ if (browse.isDoc) {
 
 
 
-
 var tableMenuMethodKeys = ['closeMenu'];
 var tableMenuHook = {
   setupTable: function setupTable($xetable) {
@@ -11981,9 +11968,6 @@ var es_symbol_description = __webpack_require__("e01a");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.symbol.iterator.js
 var es_symbol_iterator = __webpack_require__("d28b");
 
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.iterator.js
-var es_array_iterator = __webpack_require__("e260");
-
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.iterator.js
 var es_string_iterator = __webpack_require__("3ca3");
 
@@ -12001,7 +11985,6 @@ var es_array_from = __webpack_require__("a630");
 
 
 
-
 function _iterableToArray(iter) {
   if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -12049,7 +12032,6 @@ function _toConsumableArray(arr) {
 
 
 
-
 var tableEditMethodKeys = ['insert', 'insertAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getActiveRecord', 'getSelectedCell', 'clearActived', 'clearSelected', 'isActiveByRow', 'setActiveRow', 'setActiveCell', 'setSelectCell'];
 var editHook = {
   setupTable: function setupTable($xetable) {
@@ -12122,6 +12104,69 @@ var editHook = {
       }
     }
 
+    function insertTreeRow(newRecords, isAppend) {
+      var treeFullData = internalData.treeFullData,
+          afterFullData = internalData.afterFullData,
+          fullDataRowIdData = internalData.fullDataRowIdData,
+          fullAllDataRowIdData = internalData.fullAllDataRowIdData;
+      var treeOpts = computeTreeOpts.value;
+      var funcName = isAppend ? 'push' : 'unshift';
+      newRecords.forEach(function (item) {
+        var parentRowId = item[treeOpts.parentField];
+        var rowid = util_getRowid($xetable, item);
+        var matchObj = parentRowId ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(treeFullData, function (item) {
+          return parentRowId === item[treeOpts.rowField];
+        }, treeOpts) : null;
+
+        if (matchObj) {
+          var parentRow = matchObj.item;
+          var parentRest = fullAllDataRowIdData[util_getRowid($xetable, parentRow)];
+          var parentLevel = parentRest ? parentRest.level : 0;
+          var parentChilds = parentRow[treeOpts.children];
+
+          if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(parentChilds)) {
+            parentChilds = parentRow[treeOpts.children] = [];
+          }
+
+          parentChilds[funcName](item);
+          var rest = {
+            row: item,
+            rowid: rowid,
+            index: -1,
+            _index: -1,
+            $index: -1,
+            items: parentChilds,
+            parent: parent,
+            level: parentLevel + 1
+          };
+          fullDataRowIdData[rowid] = rest;
+          fullAllDataRowIdData[rowid] = rest;
+        } else {
+          if (true) {
+            if (parentRowId) {
+              warnLog('vxe.error.unableInsert');
+            }
+          }
+
+          afterFullData[funcName](item);
+          treeFullData[funcName](item);
+          var _rest = {
+            row: item,
+            rowid: rowid,
+            index: -1,
+            _index: -1,
+            $index: -1,
+            items: treeFullData,
+            parent: null,
+            level: 0
+          };
+          fullDataRowIdData[rowid] = _rest;
+          fullAllDataRowIdData[rowid] = _rest;
+        }
+      });
+      $xetable.updateVirtualTreeData();
+    }
+
     editMethods = {
       /**
        * 往表格中插入临时数据
@@ -12134,9 +12179,9 @@ var editHook = {
 
       /**
        * 往表格指定行中插入临时数据
-       * 如果 row 为空则从插入到顶部
-       * 如果 row 为 -1 则从插入到底部
-       * 如果 row 为有效行则插入到该行的位置
+       * 如果 row 为空则从插入到顶部，如果为树结构，则插入到目标节点顶部
+       * 如果 row 为 -1 则从插入到底部，如果为树结构，则插入到目标节点底部
+       * 如果 row 为有效行则插入到该行的位置，如果为树结构，则有插入到效的目标节点该行的位置
        * @param {Object/Array} records 新的数据
        * @param {Row} row 指定行
        */
@@ -12147,9 +12192,14 @@ var editHook = {
         var mergeList = reactData.mergeList,
             editStore = reactData.editStore,
             scrollYLoad = reactData.scrollYLoad;
-        var afterFullData = internalData.afterFullData,
-            tableFullData = internalData.tableFullData;
+        var treeFullData = internalData.treeFullData,
+            afterFullData = internalData.afterFullData,
+            tableFullData = internalData.tableFullData,
+            fullDataRowIdData = internalData.fullDataRowIdData,
+            fullAllDataRowIdData = internalData.fullAllDataRowIdData;
         var sYOpts = computeSYOpts.value;
+        var treeOpts = computeTreeOpts.value;
+        var transform = treeOpts.transform;
 
         if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(records)) {
           records = [records];
@@ -12160,53 +12210,113 @@ var editHook = {
         });
 
         if (!row) {
-          afterFullData.unshift.apply(afterFullData, _toConsumableArray(newRecords));
-          tableFullData.unshift.apply(tableFullData, _toConsumableArray(newRecords)); // 刷新单元格合并
+          // 如果为虚拟树
+          if (treeConfig && transform) {
+            insertTreeRow(newRecords, false);
+          } else {
+            afterFullData.unshift.apply(afterFullData, _toConsumableArray(newRecords));
+            tableFullData.unshift.apply(tableFullData, _toConsumableArray(newRecords)); // 刷新单元格合并
 
-          mergeList.forEach(function (mergeItem) {
-            var mergeRowIndex = mergeItem.row;
+            mergeList.forEach(function (mergeItem) {
+              var mergeRowIndex = mergeItem.row;
 
-            if (mergeRowIndex > 0) {
-              mergeItem.row = mergeRowIndex + newRecords.length;
-            }
-          });
+              if (mergeRowIndex > 0) {
+                mergeItem.row = mergeRowIndex + newRecords.length;
+              }
+            });
+          }
         } else {
           if (row === -1) {
-            afterFullData.push.apply(afterFullData, _toConsumableArray(newRecords));
-            tableFullData.push.apply(tableFullData, _toConsumableArray(newRecords)); // 刷新单元格合并
+            // 如果为虚拟树
+            if (treeConfig && transform) {
+              insertTreeRow(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;
+              mergeList.forEach(function (mergeItem) {
+                var mergeRowIndex = mergeItem.row,
+                    mergeRowspan = mergeItem.rowspan;
 
-              if (mergeRowIndex + mergeRowspan > afterFullData.length) {
-                mergeItem.rowspan = mergeRowspan + newRecords.length;
-              }
-            });
-          } else {
-            if (treeConfig) {
-              throw new Error(getLog('vxe.error.noTree', ['insert']));
+                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.a.findTree(treeFullData, function (item) {
+                return row[treeOpts.rowField] === item[treeOpts.rowField];
+              }, treeOpts);
 
-            var afIndex = $xetable.findRowIndexOf(afterFullData, row);
+              if (matchObj) {
+                var parentRow = matchObj.parent;
+                var parentChilds = matchObj.items;
+                var parentRest = fullAllDataRowIdData[util_getRowid($xetable, parentRow)];
+                var parentLevel = parentRest ? parentRest.level : 0;
+                newRecords.forEach(function (item, i) {
+                  var rowid = util_getRowid($xetable, item);
+
+                  if (true) {
+                    if (item[treeOpts.parentField]) {
+                      if (parentRow && item[treeOpts.parentField] !== parentRow[treeOpts.rowField]) {
+                        errLog('vxe.error.errProp', ["".concat(treeOpts.parentField, "=").concat(item[treeOpts.parentField]), "".concat(treeOpts.parentField, "=").concat(parentRow[treeOpts.rowField])]);
+                      }
+                    }
+                  }
 
-            if (afIndex === -1) {
-              throw new Error(errLog('vxe.error.unableInsert'));
-            }
+                  if (parentRow) {
+                    item[treeOpts.parentField] = parentRow[treeOpts.rowField];
+                  }
+
+                  parentChilds.splice(matchObj.index + i, 0, item);
+                  var rest = {
+                    row: item,
+                    rowid: rowid,
+                    index: -1,
+                    _index: -1,
+                    $index: -1,
+                    items: parentChilds,
+                    parent: parentRow,
+                    level: parentLevel + 1
+                  };
+                  fullDataRowIdData[rowid] = rest;
+                  fullAllDataRowIdData[rowid] = rest;
+                });
+                $xetable.updateVirtualTreeData();
+              } else {
+                if (true) {
+                  warnLog('vxe.error.unableInsert');
+                }
 
-            afterFullData.splice.apply(afterFullData, [afIndex, 0].concat(_toConsumableArray(newRecords)));
-            tableFullData.splice.apply(tableFullData, [$xetable.findRowIndexOf(tableFullData, row), 0].concat(_toConsumableArray(newRecords))); // 刷新单元格合并
+                insertTreeRow(newRecords, true);
+              }
+            } else {
+              if (treeConfig) {
+                throw new Error(getLog('vxe.error.noTree', ['insert']));
+              }
 
-            mergeList.forEach(function (mergeItem) {
-              var mergeRowIndex = mergeItem.row,
-                  mergeRowspan = mergeItem.rowspan;
+              var afIndex = $xetable.findRowIndexOf(afterFullData, row);
 
-              if (mergeRowIndex > afIndex) {
-                mergeItem.row = mergeRowIndex + newRecords.length;
-              } else if (mergeRowIndex + mergeRowspan > afIndex) {
-                mergeItem.rowspan = mergeRowspan + newRecords.length;
+              if (afIndex === -1) {
+                throw new Error(errLog('vxe.error.unableInsert'));
               }
-            });
+
+              afterFullData.splice.apply(afterFullData, [afIndex, 0].concat(_toConsumableArray(newRecords)));
+              tableFullData.splice.apply(tableFullData, [$xetable.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;
+                }
+              });
+            }
           }
         }
 
@@ -12215,7 +12325,7 @@ var editHook = {
         reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
         $xetable.updateFooter();
         $xetable.cacheRowMap();
-        $xetable.handleTableData();
+        $xetable.handleTableData(transform);
         $xetable.updateAfterDataIndex();
         $xetable.checkSelectionStatus();
 
@@ -12246,10 +12356,13 @@ var editHook = {
             editStore = reactData.editStore,
             selection = reactData.selection,
             scrollYLoad = reactData.scrollYLoad;
-        var afterFullData = internalData.afterFullData,
+        var treeFullData = internalData.treeFullData,
+            afterFullData = internalData.afterFullData,
             tableFullData = internalData.tableFullData;
         var checkboxOpts = computeCheckboxOpts.value;
         var sYOpts = computeSYOpts.value;
+        var treeOpts = computeTreeOpts.value;
+        var transform = treeOpts.transform;
         var actived = editStore.actived,
             removeList = editStore.removeList,
             insertList = editStore.insertList;
@@ -12286,31 +12399,54 @@ var editHook = {
           internalData.afterFullData = [];
           $xetable.clearMergeCells();
         } else {
-          rows.forEach(function (row) {
-            var tfIndex = $xetable.findRowIndexOf(tableFullData, row);
+          // 如果为虚拟树
+          if (treeConfig && transform) {
+            rows.forEach(function (row) {
+              var rowid = util_getRowid($xetable, row);
+              var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(treeFullData, function (item) {
+                return rowid === util_getRowid($xetable, item);
+              }, treeOpts);
 
-            if (tfIndex > -1) {
-              var rItems = tableFullData.splice(tfIndex, 1);
-              rest.push(rItems[0]);
-            }
+              if (matchObj) {
+                var rItems = matchObj.items.splice(matchObj.index, 1);
+                rest.push(rItems[0]);
+              }
 
-            var afIndex = $xetable.findRowIndexOf(afterFullData, row);
+              var afIndex = $xetable.findRowIndexOf(afterFullData, row);
 
-            if (afIndex > -1) {
-              // 刷新单元格合并
-              mergeList.forEach(function (mergeItem) {
-                var mergeRowIndex = mergeItem.row,
-                    mergeRowspan = mergeItem.rowspan;
+              if (afIndex > -1) {
+                afterFullData.splice(afIndex, 1);
+              }
 
-                if (mergeRowIndex > afIndex) {
-                  mergeItem.row = mergeRowIndex - 1;
-                } else if (mergeRowIndex + mergeRowspan > afIndex) {
-                  mergeItem.rowspan = mergeRowspan - 1;
-                }
-              });
-              afterFullData.splice(afIndex, 1);
-            }
-          });
+              $xetable.updateVirtualTreeData();
+            });
+          } else {
+            rows.forEach(function (row) {
+              var tfIndex = $xetable.findRowIndexOf(tableFullData, row);
+
+              if (tfIndex > -1) {
+                var rItems = tableFullData.splice(tfIndex, 1);
+                rest.push(rItems[0]);
+              }
+
+              var afIndex = $xetable.findRowIndexOf(afterFullData, row);
+
+              if (afIndex > -1) {
+                // 刷新单元格合并
+                mergeList.forEach(function (mergeItem) {
+                  var mergeRowIndex = mergeItem.row,
+                      mergeRowspan = mergeItem.rowspan;
+
+                  if (mergeRowIndex > afIndex) {
+                    mergeItem.row = mergeRowIndex - 1;
+                  } else if (mergeRowIndex + mergeRowspan > afIndex) {
+                    mergeItem.rowspan = mergeRowspan - 1;
+                  }
+                });
+                afterFullData.splice(afIndex, 1);
+              }
+            });
+          }
         } // 如果当前行被激活编辑，则清除激活状态
 
 
@@ -12329,7 +12465,7 @@ var editHook = {
         reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
         $xetable.updateFooter();
         $xetable.cacheRowMap();
-        $xetable.handleTableData();
+        $xetable.handleTableData(transform);
         $xetable.updateAfterDataIndex();
         $xetable.checkSelectionStatus();
 
@@ -12395,17 +12531,34 @@ var editHook = {
        * 获取新增的临时数据
        */
       getInsertRecords: function getInsertRecords() {
+        var treeConfig = props.treeConfig;
         var editStore = reactData.editStore;
-        var tableFullData = internalData.tableFullData;
+        var treeFullData = internalData.treeFullData,
+            tableFullData = internalData.tableFullData;
+        var treeOpts = computeTreeOpts.value;
         var insertList = editStore.insertList;
         var insertRecords = [];
 
         if (insertList.length) {
-          tableFullData.forEach(function (row) {
-            if ($xetable.findRowIndexOf(insertList, row) > -1) {
-              insertRecords.push(row);
-            }
-          });
+          // 如果为虚拟树
+          if (treeConfig && treeOpts.transform) {
+            insertList.forEach(function (row) {
+              var rowid = util_getRowid($xetable, row);
+              var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(treeFullData, function (item) {
+                return rowid === util_getRowid($xetable, item);
+              }, treeOpts);
+
+              if (matchObj) {
+                insertRecords.push(row);
+              }
+            });
+          } else {
+            insertList.forEach(function (row) {
+              if ($xetable.findRowIndexOf(tableFullData, row) > -1) {
+                insertRecords.push(row);
+              }
+            });
+          }
         }
 
         return insertRecords;
@@ -12825,7 +12978,6 @@ function _arrayWithHoles(arr) {
 
 
 
-
 function _iterableToArrayLimit(arr, i) {
   var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
 
@@ -12896,7 +13048,6 @@ function useSize(props) {
 
 
 
-
 /* harmony default export */ var src_button = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeButton',
   props: {
@@ -13373,8 +13524,6 @@ function useSize(props) {
 
 
 
-
-
 
 var allActivedModals = [];
 var msgQueue = [];
@@ -14591,7 +14740,6 @@ var es_string_pad_start = __webpack_require__("4d90");
 
 
 
-
 var yearSize = 20;
 var monthSize = 20;
 var quarterSize = 8;
@@ -15231,12 +15379,20 @@ function toStringTimeDate(str) {
       return immediate || !(type === 'text' || type === 'number' || type === 'integer' || type === 'float');
     });
 
+    function toFloatValueFixed(inputValue, digitsValue) {
+      if (/^-/.test('' + inputValue)) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.ceil(inputValue, digitsValue), digitsValue);
+      }
+
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.floor(inputValue, digitsValue), digitsValue);
+    }
+
     function getNumberValue(val) {
       var type = props.type,
           exponential = props.exponential;
       var inpMaxlength = computeInpMaxlength.value;
       var digitsValue = computeDigitsValue.value;
-      var restVal = type === 'float' ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.floor(val, digitsValue), digitsValue) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(val);
+      var restVal = type === 'float' ? toFloatValueFixed(val, digitsValue) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(val);
 
       if (exponential && (val === restVal || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(val).toLowerCase() === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(restVal).toExponential())) {
         return val;
@@ -15408,7 +15564,7 @@ function toStringTimeDate(str) {
         changeValue();
       } else if (type === 'float') {
         if (inputValue) {
-          var validValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.floor(inputValue, digitsValue), digitsValue);
+          var validValue = toFloatValueFixed(inputValue, digitsValue);
 
           if (inputValue !== validValue) {
             emitModel(validValue, {
@@ -17042,7 +17198,6 @@ var es_string_includes = __webpack_require__("2532");
 
 
 
-
 /* harmony default export */ var src_checkbox = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeCheckbox',
   props: {
@@ -17168,7 +17323,6 @@ var es_string_includes = __webpack_require__("2532");
 
 
 
-
 function isOptionVisible(option) {
   return option.visible !== false;
 }
@@ -18108,7 +18262,6 @@ function getOptUniqueId() {
 
 
 
-
 /* harmony default export */ var export_panel = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeExportPanel',
   props: {
@@ -18479,7 +18632,6 @@ function getOptUniqueId() {
 
 
 
-
 /* harmony default export */ var src_group = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeRadioGroup',
   props: {
@@ -18543,7 +18695,6 @@ function getOptUniqueId() {
 
 
 
-
 /* harmony default export */ var src_radio = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeRadio',
   props: {
@@ -18660,7 +18811,6 @@ function getOptUniqueId() {
 
 
 
-
 /* harmony default export */ var import_panel = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeImportPanel',
   props: {
@@ -18849,9 +18999,6 @@ var web_url_search_params = __webpack_require__("9861");
 
 
 
-
-
-
  // 导入
 
 var fileForm;
@@ -19077,8 +19224,6 @@ var util_saveLocalFile = function saveLocalFile(options) {
 
 
 
-
-
 
 
 
@@ -20797,7 +20942,6 @@ var tableExportHook = {
 
 
 
-
 var export_print = function print(options) {
   var opts = Object.assign({}, options, {
     type: 'html'
@@ -20836,7 +20980,6 @@ var Export = {
 
 
 
-
 function getTargetOffset(target, container) {
   var offsetTop = 0;
   var offsetLeft = 0;
@@ -21343,9 +21486,6 @@ var Keyboard = {
 
 
 
-
-
-
 /**
  * 校验规则
  */
@@ -21520,7 +21660,7 @@ var validatorHook = {
           var ruleProps = Object.keys(validRest);
           return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])().then(function () {
             if (ruleProps.length) {
-              return Promise.reject(validRest[ruleProps[0]][0]);
+              return validRest[ruleProps[0]][0];
             }
 
             if (cb) {
@@ -21528,14 +21668,14 @@ var validatorHook = {
             }
           });
         }).catch(function (firstErrParams) {
-          return new Promise(function (resolve, reject) {
+          return new Promise(function (resolve) {
             var finish = function finish() {
               Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
                 if (cb) {
                   cb(validRest);
                   resolve();
                 } else {
-                  reject(validRest);
+                  resolve(validRest);
                 }
               });
             };
@@ -22261,7 +22401,6 @@ var renderType = 'header';
 
 
 
-
 var Header = Object.assign(header, {
   install: function install(app) {
     dynamicApp.component(header.name, header);
@@ -22279,7 +22418,6 @@ var Header = Object.assign(header, {
 
 
 
-
 var footer_renderType = 'footer';
 
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
@@ -22639,7 +22777,6 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
 
 
 
-
 var Footer = Object.assign(footer, {
   install: function install(app) {
     dynamicApp.component(footer.name, footer);
@@ -22659,7 +22796,6 @@ var Footer = Object.assign(footer, {
 
 
 
-
 function renderHelpIcon(params) {
   var $table = params.$table,
       column = params.column;
@@ -23758,7 +23894,6 @@ var columnProps = {
 
 
 
-
 var Column = Object.assign(src_column, {
   install: function install(app) {
     dynamicApp.component(src_column.name, src_column);
@@ -23817,7 +23952,6 @@ var Column = Object.assign(src_column, {
 
 
 
-
 var Colgroup = Object.assign(table_src_group, {
   install: function install(app) {
     dynamicApp.component(table_src_group.name, table_src_group);
@@ -23915,35 +24049,35 @@ var es_array_sort = __webpack_require__("4e82");
       return conf.table.showHeader;
     }
   },
-  // 是否要高亮当前选中行
+  // （即将废弃）是否要高亮当前选中行
   highlightCurrentRow: {
     type: Boolean,
     default: function _default() {
       return conf.table.highlightCurrentRow;
     }
   },
-  // 鼠标移到行是否要高亮显示
+  // （即将废弃）鼠标移到行是否要高亮显示
   highlightHoverRow: {
     type: Boolean,
     default: function _default() {
       return conf.table.highlightHoverRow;
     }
   },
-  // 是否要高亮当前选中列
+  // （即将废弃）是否要高亮当前选中列
   highlightCurrentColumn: {
     type: Boolean,
     default: function _default() {
       return conf.table.highlightCurrentColumn;
     }
   },
-  // 鼠标移到列是否要高亮显示
+  // （即将废弃）鼠标移到列是否要高亮显示
   highlightHoverColumn: {
     type: Boolean,
     default: function _default() {
       return conf.table.highlightHoverColumn;
     }
   },
-  // 激活单元格编辑时是否高亮显示
+  // （即将废弃）激活单元格编辑时是否高亮显示
   highlightCell: Boolean,
   // 是否显示表尾合计
   showFooter: Boolean,
@@ -24089,7 +24223,7 @@ var es_array_sort = __webpack_require__("4e82");
   scrollX: Object,
   // 纵向虚拟滚动配置项
   scrollY: Object,
-  // 优化相关
+  // （即将废弃）优化相关
   animat: {
     type: Boolean,
     default: function _default() {
@@ -24126,8 +24260,6 @@ var es_array_sort = __webpack_require__("4e82");
 
 
 
-
-
 
 
 var tableComponentPropKeys = Object.keys(src_props);
@@ -25521,7 +25653,6 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
 
 
 
-
 var Grid = Object.assign(grid, {
   install: function install(app) {
     dynamicApp.component(grid.name, grid);
@@ -25544,8 +25675,6 @@ var Grid = Object.assign(grid, {
 
 
 
-
-
 /* harmony default export */ var toolbar = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeToolbar',
   props: {
@@ -26296,7 +26425,6 @@ var Grid = Object.assign(grid, {
 
 
 
-
 var Toolbar = Object.assign(toolbar, {
   install: function install(app) {
     dynamicApp.component(toolbar.name, toolbar);
@@ -26315,7 +26443,6 @@ var Toolbar = Object.assign(toolbar, {
 
 
 
-
 /* harmony default export */ var pager = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxePager',
   props: {
@@ -26878,7 +27005,6 @@ var Toolbar = Object.assign(toolbar, {
 
 
 
-
 var Pager = Object.assign(pager, {
   install: function install(app) {
     dynamicApp.component(pager.name, pager);
@@ -26890,7 +27016,6 @@ var Pager = Object.assign(pager, {
 
 
 
-
 var Checkbox = Object.assign(src_checkbox, {
   install: function install(app) {
     dynamicApp.component(src_checkbox.name, src_checkbox);
@@ -26904,7 +27029,6 @@ var Checkbox = Object.assign(src_checkbox, {
 
 
 
-
 /* harmony default export */ var checkbox_src_group = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeCheckboxGroup',
   props: {
@@ -26974,7 +27098,6 @@ var Checkbox = Object.assign(src_checkbox, {
 
 
 
-
 var CheckboxGroup = Object.assign(checkbox_src_group, {
   install: function install(app) {
     dynamicApp.component(checkbox_src_group.name, checkbox_src_group);
@@ -26986,7 +27109,6 @@ var CheckboxGroup = Object.assign(checkbox_src_group, {
 
 
 
-
 var Radio = Object.assign(src_radio, {
   install: function install(app) {
     dynamicApp.component(src_radio.name, src_radio);
@@ -26998,7 +27120,6 @@ var Radio = Object.assign(src_radio, {
 
 
 
-
 var RadioGroup = Object.assign(src_group, {
   install: function install(app) {
     dynamicApp.component(src_group.name, src_group);
@@ -27015,7 +27136,6 @@ var RadioGroup = Object.assign(src_group, {
 
 
 
-
 /* harmony default export */ var radio_src_button = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeRadioButton',
   props: {
@@ -27119,7 +27239,6 @@ var RadioGroup = Object.assign(src_group, {
 
 
 
-
 var RadioButton = Object.assign(radio_src_button, {
   install: function install(app) {
     dynamicApp.component(radio_src_button.name, radio_src_button);
@@ -27131,7 +27250,6 @@ var RadioButton = Object.assign(radio_src_button, {
 
 
 
-
 var Input = Object.assign(input, {
   install: function install(app) {
     dynamicApp.component(input.name, input);
@@ -27152,7 +27270,6 @@ var Input = Object.assign(input, {
 
 
 
-
 var autoTxtElem;
 /* harmony default export */ var src_textarea = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeTextarea',
@@ -27436,7 +27553,6 @@ var autoTxtElem;
 
 
 
-
 var Textarea = Object.assign(src_textarea, {
   install: function install(app) {
     dynamicApp.component(src_textarea.name, src_textarea);
@@ -27448,7 +27564,6 @@ var Textarea = Object.assign(src_textarea, {
 
 
 
-
 var Button = Object.assign(src_button, {
   install: function install(app) {
     dynamicApp.component(src_button.name, src_button);
@@ -27470,9 +27585,6 @@ var Button = Object.assign(src_button, {
 
 
 
-
-
-
 function modal_openModal(options) {
   // 使用动态组件渲染动态弹框
   checkDynamic();
@@ -27594,7 +27706,6 @@ var Modal = Object.assign(modal, {
 
 
 
-
 /* harmony default export */ var tooltip = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeTooltip',
   props: {
@@ -27962,7 +28073,6 @@ var Modal = Object.assign(modal, {
 
 
 
-
 var Tooltip = Object.assign(tooltip, {
   install: function install(app) {
     VXETable.tooltip = true;
@@ -27975,7 +28085,6 @@ var Tooltip = Object.assign(tooltip, {
 
 
 
-
 var itemInfo_ItemInfo = /*#__PURE__*/function () {
   function ItemInfo($xeform, item) {
     _classCallCheck(this, ItemInfo);
@@ -28166,9 +28275,6 @@ function renderTitle($xeform, item) {
 
 
 
-
-
-
 
 
 
@@ -28687,7 +28793,7 @@ function getResetValue(value, resetValue) {
             callback();
           }
         }).catch(function () {
-          return new Promise(function (resolve, reject) {
+          return new Promise(function (resolve) {
             showErrTime = window.setTimeout(function () {
               itemList.forEach(function (item) {
                 if (item.errRule) {
@@ -28706,7 +28812,7 @@ function getResetValue(value, resetValue) {
               callback(validRest);
               resolve();
             } else {
-              reject(validRest);
+              resolve(validRest);
             }
           });
         });
@@ -29066,7 +29172,6 @@ function getResetValue(value, resetValue) {
 
 
 
-
 var Form = Object.assign(src_form, {
   install: function install(app) {
     dynamicApp.component(src_form.name, src_form);
@@ -29262,7 +29367,6 @@ var formItemProps = {
 
 
 
-
 var FormItem = Object.assign(form_item, {
   install: function install(app) {
     dynamicApp.component(form_item.name, form_item);
@@ -29319,7 +29423,6 @@ var FormItem = Object.assign(form_item, {
 
 
 
-
 var FormGather = Object.assign(form_gather, {
   install: function install(app) {
     dynamicApp.component(form_gather.name, form_gather);
@@ -29331,7 +29434,6 @@ var FormGather = Object.assign(form_gather, {
 
 
 
-
 var Select = Object.assign(src_select, {
   install: function install(app) {
     dynamicApp.component(src_select.name, src_select);
@@ -29343,7 +29445,6 @@ var Select = Object.assign(src_select, {
 
 
 
-
 var optionInfo_OptionInfo = /*#__PURE__*/function () {
   function OptionInfo($xeselect, _vm) {
     _classCallCheck(this, OptionInfo);
@@ -29463,7 +29564,6 @@ function destroyOption($xeselect, option) {
 
 
 
-
 var Optgroup = Object.assign(src_optgroup, {
   install: function install(app) {
     dynamicApp.component(src_optgroup.name, src_optgroup);
@@ -29515,7 +29615,6 @@ var Optgroup = Object.assign(src_optgroup, {
 
 
 
-
 var Option = Object.assign(src_option, {
   install: function install(app) {
     dynamicApp.component(src_option.name, src_option);
@@ -29531,7 +29630,6 @@ var Option = Object.assign(src_option, {
 
 
 
-
 /* harmony default export */ var src_switch = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeSwitch',
   props: {
@@ -29682,7 +29780,6 @@ var Option = Object.assign(src_option, {
 
 
 
-
 var Switch = Object.assign(src_switch, {
   install: function install(app) {
     dynamicApp.component(src_switch.name, src_switch);
@@ -29819,8 +29916,6 @@ function createResizeEvent(callback) {
 
 
 
-
-
 /* harmony default export */ var src_list = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeList',
   props: {
@@ -30220,7 +30315,6 @@ function createResizeEvent(callback) {
 
 
 
-
 var List = Object.assign(src_list, {
   install: function install(app) {
     dynamicApp.component(src_list.name, src_list);
@@ -30238,8 +30332,6 @@ var List = Object.assign(src_list, {
 
 
 
-
-
 /* harmony default export */ var pulldown = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxePulldown',
   props: {
@@ -30561,7 +30653,6 @@ var List = Object.assign(src_list, {
 
 
 
-
 var Pulldown = Object.assign(pulldown, {
   install: function install(app) {
     dynamicApp.component(pulldown.name, pulldown);
@@ -30569,6 +30660,15 @@ var Pulldown = Object.assign(pulldown, {
   }
 });
 /* harmony default export */ var packages_pulldown = (Pulldown);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
+var es_object_assign = __webpack_require__("cca6");
+
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
+var es_promise = __webpack_require__("e6cf");
+
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.iterator.js
+var es_array_iterator = __webpack_require__("e260");
+
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.map.js
 var es_map = __webpack_require__("4ec9");
 
@@ -30588,7 +30688,6 @@ var es_map = __webpack_require__("4ec9");
 
 
 
-
 var body_renderType = 'body';
 var lineOffsetSizes = {
   mini: 3,
@@ -30982,6 +31081,7 @@ var lineOffsetSizes = {
       var radioOpts = computeRadioOpts.value;
       var treeOpts = computeTreeOpts.value;
       var editOpts = computeEditOpts.value;
+      var rowOpts = computeRowOpts.value;
       var rows = [];
       tableData.forEach(function (row, $rowIndex) {
         var trOn = {};
@@ -30997,7 +31097,7 @@ var lineOffsetSizes = {
 
         rowIndex = $xetable.getRowIndex(row); // 事件绑定
 
-        if (highlightHoverRow) {
+        if (rowOpts.isHover || highlightHoverRow) {
           trOn.onMouseenter = function (evnt) {
             if (isOperateMouse()) {
               return;
@@ -31147,6 +31247,7 @@ var lineOffsetSizes = {
       var elemStore = tableInternalData.elemStore,
           lastScrollTop = tableInternalData.lastScrollTop,
           lastScrollLeft = tableInternalData.lastScrollLeft;
+      var rowOpts = computeRowOpts.value;
       var tableHeader = refTableHeader.value;
       var tableBody = refTableBody.value;
       var tableFooter = refTableFooter.value;
@@ -31171,7 +31272,7 @@ var lineOffsetSizes = {
       tableInternalData.lastScrollLeft = scrollLeft;
       tableInternalData.lastScrollTime = Date.now();
 
-      if (highlightHoverRow) {
+      if (rowOpts.isHover || highlightHoverRow) {
         $xetable.clearHoverRow();
       }
 
@@ -31305,6 +31406,7 @@ var lineOffsetSizes = {
       var scrollYLoad = tableReactData.scrollYLoad;
       var lastScrollTop = tableInternalData.lastScrollTop,
           lastScrollLeft = tableInternalData.lastScrollLeft;
+      var rowOpts = computeRowOpts.value;
       var tableBody = refTableBody.value;
       var scrollBodyElem = refElem.value;
       var bodyElem = tableBody.$el;
@@ -31327,7 +31429,7 @@ var lineOffsetSizes = {
         tableInternalData.lastScrollLeft = scrollLeft;
         tableInternalData.lastScrollTime = Date.now();
 
-        if (highlightHoverRow) {
+        if (rowOpts.isHover || highlightHoverRow) {
           $xetable.clearHoverRow();
         }
 
@@ -31526,6 +31628,9 @@ var lineOffsetSizes = {
 
 
 
+
+
+
 
 
 
@@ -34327,16 +34432,12 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 
           if (oRow && row) {
             if (field) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(oRow, field, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(record || row, field));
+              var newValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(record || row, field);
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(row, field, newValue);
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(oRow, field, newValue);
             } else {
-              if (record) {
-                tableSourceData[rowIndex] = record;
-                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clear(row, undefined);
-                Object.assign(row, tablePrivateMethods.defineField(Object.assign({}, record)));
-                tablePrivateMethods.cacheRowMap(true);
-              } else {
-                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.destructuring(oRow, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clone(row, true));
-              }
+              var newRecord = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clone(_objectSpread2({}, record), true);
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.destructuring(oRow, Object.assign(row, newRecord));
             }
           }
 
@@ -34361,9 +34462,9 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         var treeOpts = computeTreeOpts.value;
         var children = treeOpts.children;
 
-        var rest = fullAllDataRowIdData[util_getRowid($xetable, row)];
+        var parentRest = fullAllDataRowIdData[util_getRowid($xetable, row)];
 
-        var parentLevel = rest ? rest.level : 0;
+        var parentLevel = parentRest ? parentRest.level : 0;
         return tableMethods.createData(childRecords).then(function (rows) {
           if (keepSource) {
             var rowid = util_getRowid($xetable, row);
@@ -35341,6 +35442,18 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         var reserveSelection = [];
 
         if (checkboxOpts.reserve) {
+          var afterFullIdMaps = {};
+
+          if (treeConfig) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterFullData, function (row) {
+              afterFullIdMaps[util_getRowid($xetable, row)] = 1;
+            }, treeOpts);
+          } else {
+            afterFullData.forEach(function (row) {
+              afterFullIdMaps[util_getRowid($xetable, row)] = 1;
+            });
+          }
+
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.each(checkboxReserveRowMap, function (oldRow, oldRowid) {
             if (oldRow) {
               if (isFull) {
@@ -35348,18 +35461,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                   reserveSelection.push(oldRow);
                 }
               } else {
-                if (treeConfig) {
-                  if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(afterFullData, function (row) {
-                    return util_getRowid($xetable, row) === oldRowid;
-                  }, treeOpts)) {
-                    reserveSelection.push(oldRow);
-                  }
-                } else {
-                  if (!afterFullData.some(function (row) {
-                    return util_getRowid($xetable, row) === oldRowid;
-                  })) {
-                    reserveSelection.push(oldRow);
-                  }
+                if (!afterFullIdMaps[oldRowid]) {
+                  reserveSelection.push(oldRow);
                 }
               }
             }
@@ -35423,12 +35526,13 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        * @param {Row} row 行对象
        */
       setCurrentRow: function setCurrentRow(row) {
+        var rowOpts = computeRowOpts.value;
         var el = refElem.value;
         tableMethods.clearCurrentRow();
         tableMethods.clearCurrentColumn();
         reactData.currentRow = row;
 
-        if (props.highlightCurrentRow) {
+        if (rowOpts.isCurrent || props.highlightCurrentRow) {
           if (el) {
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach(el.querySelectorAll("[rowid=\"".concat(util_getRowid($xetable, row), "\"]")), function (elem) {
               return addClass(elem, 'row--current');
@@ -35489,7 +35593,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        * 用于当前行，获取当前行的数据
        */
       getCurrentRecord: function getCurrentRecord() {
-        return props.highlightCurrentRow ? reactData.currentRow : null;
+        var rowOpts = computeRowOpts.value;
+        return rowOpts.isCurrent || props.highlightCurrentRow ? reactData.currentRow : null;
       },
 
       /**
@@ -35520,7 +35625,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                 return selectRow;
               }
             } else {
-              if (afterFullData.indexOf(selectRow) > -1) {
+              if ($xetable.findRowIndexOf(afterFullData, selectRow) > -1) {
                 return selectRow;
               }
             }
@@ -35530,7 +35635,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         return null;
       },
       getCurrentColumn: function getCurrentColumn() {
-        return props.highlightCurrentColumn ? reactData.currentColumn : null;
+        var columnOpts = computeColumnOpts.value;
+        return columnOpts.isCurrent || props.highlightCurrentColumn ? reactData.currentColumn : null;
       },
 
       /**
@@ -36489,6 +36595,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           ctxMenuStore = reactData.ctxMenuStore,
           editStore = reactData.editStore;
       var mouseOpts = computeMouseOpts.value;
+      var keyboardOpts = computeKeyboardOpts.value;
       var actived = editStore.actived;
       var isEsc = hasEventKey(evnt, EVENT_KEYS.ESCAPE);
 
@@ -36503,16 +36610,19 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               $xetable.closeMenu();
             }
 
-            tableMethods.closeFilter(); // 如果是激活编辑状态，则取消编辑
+            tableMethods.closeFilter();
 
-            if (actived.row) {
-              var params = actived.args;
-              $xetable.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+            if (keyboardConfig && keyboardOpts.isEsc) {
+              // 如果是激活编辑状态，则取消编辑
+              if (actived.row) {
+                var params = actived.args;
+                $xetable.clearActived(evnt); // 如果配置了选中功能，则为选中状态
 
-              if (mouseOpts.selected) {
-                Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
-                  return $xetable.handleSelected(params, evnt);
-                });
+                if (mouseOpts.selected) {
+                  Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
+                    return $xetable.handleSelected(params, evnt);
+                  });
+                }
               }
             }
           }
@@ -36545,6 +36655,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           var editOpts = computeEditOpts.value;
           var treeOpts = computeTreeOpts.value;
           var menuList = computeMenuList.value;
+          var rowOpts = computeRowOpts.value;
           var selected = editStore.selected,
               actived = editStore.actived;
           var keyCode = evnt.keyCode;
@@ -36588,7 +36699,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 
             tableMethods.closeFilter();
 
-            if (actived.row) {
+            if (keyboardConfig && keyboardOpts.isEsc) {
               // 如果是激活编辑状态，则取消编辑
               if (actived.row) {
                 var _params = actived.args;
@@ -36625,7 +36736,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             keyCtxTimeout = setTimeout(function () {
               internalData._keyCtx = false;
             }, 1000);
-          } else if (isEnter && !isAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && highlightCurrentRow && currentRow)) {
+          } else if (isEnter && !isAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
             // 退出选中
             if (hasCtrlKey) {
               // 如果是激活编辑状态，则取消编辑
@@ -36657,7 +36768,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                     $xetable.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
                   }
                 }
-              } else if (treeConfig && highlightCurrentRow && currentRow) {
+              } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
                 // 如果是树形表格当前行回车移动到子节点
                 var childrens = currentRow[treeOpts.children];
 
@@ -36683,7 +36794,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               // 如果按下了方向键
               if (selected.row && selected.column) {
                 $xetable.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
-              } else if ((isUpArrow || isDwArrow) && highlightCurrentRow) {
+              } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
                 // 当前行按键上下移动
                 $xetable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
               }
@@ -36695,7 +36806,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             } else if (actived.row || actived.column) {
               $xetable.moveTabSelected(actived.args, hasShiftKey, evnt);
             }
-          } else if (keyboardConfig && isEnableConf(editConfig) && (isDel || (treeConfig && highlightCurrentRow && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+          } else if (keyboardConfig && isEnableConf(editConfig) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
             if (!isEditStatus) {
               var delMethod = keyboardOpts.delMethod,
                   backMethod = keyboardOpts.backMethod; // 如果是删除键
@@ -36729,7 +36840,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                   // 如果按下 del 键，更新表尾数据
                   tableMethods.updateFooter();
                 }
-              } else if (isBack && keyboardOpts.isArrow && treeConfig && highlightCurrentRow && currentRow) {
+              } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
                 // 如果树形表格回退键关闭当前行返回父节点
                 var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(internalData.afterFullData, function (item) {
                   return item === currentRow;
@@ -37569,6 +37680,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       triggerHeaderCellClickEvent: function triggerHeaderCellClickEvent(evnt, params) {
         var _lastResizeTime = internalData._lastResizeTime;
         var sortOpts = computeSortOpts.value;
+        var columnOpts = computeColumnOpts.value;
         var column = params.column;
         var cell = evnt.currentTarget;
 
@@ -37588,7 +37700,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           cell: cell
         }, params), evnt);
 
-        if (props.highlightCurrentColumn) {
+        if (columnOpts.isCurrent || props.highlightCurrentColumn) {
           tableMethods.setCurrentColumn(column);
         }
       },
@@ -37612,6 +37724,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         var treeOpts = computeTreeOpts.value;
         var radioOpts = computeRadioOpts.value;
         var checkboxOpts = computeCheckboxOpts.value;
+        var rowOpts = computeRowOpts.value;
         var actived = editStore.actived;
         var _params2 = params,
             row = _params2.row,
@@ -37650,7 +37763,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         if (!triggerTreeNode) {
           if (!triggerExpandNode) {
             // 如果是高亮行
-            if (highlightCurrentRow) {
+            if (rowOpts.isCurrent || highlightCurrentRow) {
               if (!triggerCheckbox && !triggerRadio) {
                 tablePrivateMethods.triggerCurrentRowEvent(evnt, params);
               }
@@ -38043,6 +38156,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         tablePrivateMethods.handleTableData();
         tablePrivateMethods.updateScrollYSpace();
       },
+      updateVirtualTreeData: updateVirtualTreeData,
 
       /**
        * 处理固定列的显示状态
@@ -38677,6 +38791,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           rightList = columnStore.rightList;
       var tooltipOpts = computeTooltipOpts.value;
       var treeOpts = computeTreeOpts.value;
+      var rowOpts = computeRowOpts.value;
+      var columnOpts = computeColumnOpts.value;
       var vSize = computeSize.value;
       var tableBorder = computeTableBorder.value;
       var mouseOpts = computeMouseOpts.value;
@@ -38685,7 +38801,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       var isMenu = computeIsMenu.value;
       return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
         ref: refElem,
-        class: ['vxe-table', 'vxe-table--render-default', "tid_".concat(xID), "border--".concat(tableBorder), (_ref7 = {}, _defineProperty(_ref7, "size--".concat(vSize), vSize), _defineProperty(_ref7, 'vxe-editable', !!editConfig), _defineProperty(_ref7, 'cell--highlight', highlightCell), _defineProperty(_ref7, 'cell--selected', mouseConfig && mouseOpts.selected), _defineProperty(_ref7, 'cell--area', mouseConfig && mouseOpts.area), _defineProperty(_ref7, 'row--highlight', highlightHoverRow), _defineProperty(_ref7, 'column--highlight', highlightHoverColumn), _defineProperty(_ref7, 'is--header', showHeader), _defineProperty(_ref7, 'is--footer', showFooter), _defineProperty(_ref7, 'is--group', isGroup), _defineProperty(_ref7, 'is--tree-line', treeConfig && treeOpts.line), _defineProperty(_ref7, 'is--fixed-left', leftList.length), _defineProperty(_ref7, 'is--fixed-right', rightList.length), _defineProperty(_ref7, 'is--animat', !!props.animat), _defineProperty(_ref7, 'is--round', props.round), _defineProperty(_ref7, 'is--stripe', !treeConfig && stripe), _defineProperty(_ref7, 'is--loading', loading), _defineProperty(_ref7, 'is--empty', !loading && !tableData.length), _defineProperty(_ref7, 'is--scroll-y', overflowY), _defineProperty(_ref7, 'is--scroll-x', overflowX), _defineProperty(_ref7, 'is--virtual-x', scrollXLoad), _defineProperty(_ref7, 'is--virtual-y', scrollYLoad), _ref7)],
+        class: ['vxe-table', 'vxe-table--render-default', "tid_".concat(xID), "border--".concat(tableBorder), (_ref7 = {}, _defineProperty(_ref7, "size--".concat(vSize), vSize), _defineProperty(_ref7, 'vxe-editable', !!editConfig), _defineProperty(_ref7, 'cell--highlight', highlightCell), _defineProperty(_ref7, 'cell--selected', mouseConfig && mouseOpts.selected), _defineProperty(_ref7, 'cell--area', mouseConfig && mouseOpts.area), _defineProperty(_ref7, 'row--highlight', rowOpts.isHover || highlightHoverRow), _defineProperty(_ref7, 'column--highlight', columnOpts.isHover || highlightHoverColumn), _defineProperty(_ref7, 'is--header', showHeader), _defineProperty(_ref7, 'is--footer', showFooter), _defineProperty(_ref7, 'is--group', isGroup), _defineProperty(_ref7, 'is--tree-line', treeConfig && treeOpts.line), _defineProperty(_ref7, 'is--fixed-left', leftList.length), _defineProperty(_ref7, 'is--fixed-right', rightList.length), _defineProperty(_ref7, 'is--animat', !!props.animat), _defineProperty(_ref7, 'is--round', props.round), _defineProperty(_ref7, 'is--stripe', !treeConfig && stripe), _defineProperty(_ref7, 'is--loading', loading), _defineProperty(_ref7, 'is--empty', !loading && !tableData.length), _defineProperty(_ref7, 'is--scroll-y', overflowY), _defineProperty(_ref7, 'is--scroll-x', overflowX), _defineProperty(_ref7, 'is--virtual-x', scrollXLoad), _defineProperty(_ref7, 'is--virtual-y', scrollYLoad), _ref7)],
         onKeydown: keydownEvent
       }, [
       /**
@@ -38831,7 +38947,6 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 
 
 
-
 var Table = Object.assign(table, {
   install: function install(app) {
     dynamicApp.component(table.name, table);
@@ -39409,4 +39524,5 @@ module.exports = global.Promise;
 /***/ })
 
 /******/ });
-});
+});
+//# sourceMappingURL=index.umd.js.map