vxe-table 3.5.9 → 3.6.0-beta.2

package/lib/index.umd.js

@@ -8447,7 +8447,7 @@ function _createClass(Constructor, protoProps, staticProps) {
   return Constructor;
 }
 // CONCATENATED MODULE: ./packages/v-x-e-table/src/conf.js
-var iconPrefix = 'vxe-icon--';
+var iconPrefix = 'vxe-icon-';
 /* harmony default export */ var src_conf = ({
   size: null,
   // 全局尺寸
@@ -8457,8 +8457,7 @@ var iconPrefix = 'vxe-icon--';
   // 版本号，对于某些带数据缓存的功能有用到，上升版本号可以用于重置数据
   // resizeInterval: 500,
   emptyCell: '　',
-  loadingText: null,
-  // 自定义loading提示内容，如果为null则不显示文本
+  // loadingText: null, // 自定义loading提示内容，如果为null则不显示文本
   table: {
     fit: true,
     showHeader: true,
@@ -8577,65 +8576,65 @@ var iconPrefix = 'vxe-icon--';
   },
   icon: {
     // loading
-    // LOADING: iconPrefix + 'refresh roll vxe-loading--default-icon',
+    LOADING: iconPrefix + 'spinner roll vxe-loading--default-icon',
     // table
-    TABLE_SORT_ASC: iconPrefix + 'caret-top',
-    TABLE_SORT_DESC: iconPrefix + 'caret-bottom',
+    TABLE_SORT_ASC: iconPrefix + 'caret-up',
+    TABLE_SORT_DESC: iconPrefix + 'caret-down',
     TABLE_FILTER_NONE: iconPrefix + 'funnel',
     TABLE_FILTER_MATCH: iconPrefix + 'funnel',
-    TABLE_EDIT: iconPrefix + 'edit-outline',
-    TABLE_HELP: iconPrefix + 'question',
-    TABLE_TREE_LOADED: iconPrefix + 'refresh roll',
+    TABLE_EDIT: iconPrefix + 'edit',
+    TABLE_HELP: iconPrefix + 'question-circle-fill',
+    TABLE_TREE_LOADED: iconPrefix + 'spinner roll',
     TABLE_TREE_OPEN: iconPrefix + 'caret-right rotate90',
     TABLE_TREE_CLOSE: iconPrefix + 'caret-right',
-    TABLE_EXPAND_LOADED: iconPrefix + 'refresh roll',
+    TABLE_EXPAND_LOADED: iconPrefix + 'spinner roll',
     TABLE_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
     TABLE_EXPAND_CLOSE: iconPrefix + 'arrow-right',
     // button
-    BUTTON_DROPDOWN: iconPrefix + 'arrow-bottom',
-    BUTTON_LOADING: iconPrefix + 'refresh roll',
+    BUTTON_DROPDOWN: iconPrefix + 'arrow-down',
+    BUTTON_LOADING: iconPrefix + 'spinner roll',
     // select
-    SELECT_LOADED: iconPrefix + 'refresh roll',
-    SELECT_OPEN: iconPrefix + 'caret-bottom rotate180',
-    SELECT_CLOSE: iconPrefix + 'caret-bottom',
+    SELECT_LOADED: iconPrefix + 'spinner roll',
+    SELECT_OPEN: iconPrefix + 'caret-down rotate180',
+    SELECT_CLOSE: iconPrefix + 'caret-down',
     // pager
-    PAGER_JUMP_PREV: iconPrefix + 'd-arrow-left',
-    PAGER_JUMP_NEXT: iconPrefix + 'd-arrow-right',
+    PAGER_JUMP_PREV: iconPrefix + 'arrow-double-left',
+    PAGER_JUMP_NEXT: iconPrefix + 'arrow-double-right',
     PAGER_PREV_PAGE: iconPrefix + 'arrow-left',
     PAGER_NEXT_PAGE: iconPrefix + 'arrow-right',
-    PAGER_JUMP_MORE: iconPrefix + 'more',
+    PAGER_JUMP_MORE: iconPrefix + 'ellipsis-h',
     // input
-    INPUT_CLEAR: iconPrefix + 'close',
-    INPUT_PWD: iconPrefix + 'eye-slash',
-    INPUT_SHOW_PWD: iconPrefix + 'eye',
-    INPUT_PREV_NUM: iconPrefix + 'caret-top',
-    INPUT_NEXT_NUM: iconPrefix + 'caret-bottom',
+    INPUT_CLEAR: iconPrefix + 'error-circle-fill',
+    INPUT_PWD: iconPrefix + 'eye-fill',
+    INPUT_SHOW_PWD: iconPrefix + 'eye-fill-close',
+    INPUT_PREV_NUM: iconPrefix + 'caret-up',
+    INPUT_NEXT_NUM: iconPrefix + 'caret-down',
     INPUT_DATE: iconPrefix + 'calendar',
     INPUT_SEARCH: iconPrefix + 'search',
     // modal
     MODAL_ZOOM_IN: iconPrefix + 'square',
-    MODAL_ZOOM_OUT: iconPrefix + 'zoomout',
+    MODAL_ZOOM_OUT: iconPrefix + 'maximize',
     MODAL_CLOSE: iconPrefix + 'close',
-    MODAL_INFO: iconPrefix + 'info',
-    MODAL_SUCCESS: iconPrefix + 'success',
-    MODAL_WARNING: iconPrefix + 'warning',
-    MODAL_ERROR: iconPrefix + 'error',
-    MODAL_QUESTION: iconPrefix + 'question',
-    MODAL_LOADING: iconPrefix + 'refresh roll',
+    MODAL_INFO: iconPrefix + 'info-circle-fill',
+    MODAL_SUCCESS: iconPrefix + 'success-circle-fill',
+    MODAL_WARNING: iconPrefix + 'warnion-circle-fill',
+    MODAL_ERROR: iconPrefix + 'error-circle-fill',
+    MODAL_QUESTION: iconPrefix + 'question-circle-fill',
+    MODAL_LOADING: iconPrefix + 'spinner roll',
     // toolbar
-    TOOLBAR_TOOLS_REFRESH: iconPrefix + 'refresh',
-    TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'refresh roll',
+    TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
+    TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'repeat roll',
     TOOLBAR_TOOLS_IMPORT: iconPrefix + 'upload',
     TOOLBAR_TOOLS_EXPORT: iconPrefix + 'download',
     TOOLBAR_TOOLS_PRINT: iconPrefix + 'print',
-    TOOLBAR_TOOLS_ZOOM_IN: iconPrefix + 'zoomin',
-    TOOLBAR_TOOLS_ZOOM_OUT: iconPrefix + 'zoomout',
-    TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'menu',
+    TOOLBAR_TOOLS_FULLSCREEN: iconPrefix + 'fullscreen',
+    TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
+    TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
     // form
-    FORM_PREFIX: iconPrefix + 'question',
-    FORM_SUFFIX: iconPrefix + 'question',
-    FORM_FOLDING: iconPrefix + 'arrow-top rotate180',
-    FORM_UNFOLDING: iconPrefix + 'arrow-top'
+    FORM_PREFIX: iconPrefix + 'question-circle-fill',
+    FORM_SUFFIX: iconPrefix + 'question-circle-fill',
+    FORM_FOLDING: iconPrefix + 'arrow-up rotate180',
+    FORM_UNFOLDING: iconPrefix + 'arrow-up'
   },
   grid: {
     // size: null,
@@ -8808,7 +8807,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.9", "] ").concat(src_conf.i18n(message, params));
+  return "[vxe-table v".concat("3.6.0-beta.1", "] ").concat(src_conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10089,7 +10088,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.9",
+  version: "3.6.0-beta.1",
   reg: reg,
   use: use,
   setup: setup,
@@ -12787,10 +12786,10 @@ var Cell = {
     }
 
     if (!isHidden) {
-      isAceived = treeExpandeds.indexOf(row) > -1;
+      isAceived = $table.findRowIndexOf(treeExpandeds, row) > -1;
 
       if (lazy) {
-        isLazyLoaded = treeLazyLoadeds.indexOf(row) > -1;
+        isLazyLoaded = $table.findRowIndexOf(treeLazyLoadeds, row) > -1;
         hasLazyChilds = row[hasChild];
       }
     }
@@ -13002,7 +13001,8 @@ var Cell = {
         column = params.column,
         isHidden = params.isHidden;
     var treeConfig = $table.treeConfig,
-        treeIndeterminates = $table.treeIndeterminates;
+        treeIndeterminates = $table.treeIndeterminates,
+        selection = $table.selection;
     var _$table$checkboxOpts = $table.checkboxOpts,
         labelField = _$table$checkboxOpts.labelField,
         checkMethod = _$table$checkboxOpts.checkMethod,
@@ -13019,7 +13019,7 @@ var Cell = {
     var on;
 
     if (!isHidden) {
-      isChecked = $table.selection.indexOf(row) > -1;
+      isChecked = $table.findRowIndexOf(selection, row) > -1;
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
@@ -13035,7 +13035,7 @@ var Cell = {
       }
 
       if (treeConfig) {
-        indeterminate = treeIndeterminates.indexOf(row) > -1;
+        indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1;
       }
     }
 
@@ -13121,7 +13121,7 @@ var Cell = {
       }
 
       if (treeConfig) {
-        indeterminate = treeIndeterminates.indexOf(row) > -1;
+        indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1;
       }
     }
 
@@ -13195,10 +13195,10 @@ var Cell = {
     }
 
     if (!isHidden) {
-      isAceived = rowExpandeds.indexOf(params.row) > -1;
+      isAceived = $table.findRowIndexOf(rowExpandeds, params.row) > -1;
 
       if (lazy) {
-        isLazyLoaded = expandLazyLoadeds.indexOf(row) > -1;
+        isLazyLoaded = $table.findRowIndexOf(expandLazyLoadeds, row) > -1;
       }
     }
 
@@ -14856,6 +14856,8 @@ var Methods = {
    * 用于多选行，获取已选中的数据
    */
   getCheckboxRecords: function getCheckboxRecords(isFull) {
+    var _this17 = this;
+
     var tableFullData = this.tableFullData,
         afterFullData = this.afterFullData,
         treeConfig = this.treeConfig,
@@ -14887,13 +14889,13 @@ var Methods = {
 
       if (treeConfig) {
         rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.filterTree(currTableData, function (row) {
-          return selection.indexOf(row) > -1;
+          return _this17.findRowIndexOf(selection, row) > -1;
         }, {
           children: transform ? mapChildren : children
         });
       } else {
         rowList = currTableData.filter(function (row) {
-          return selection.indexOf(row) > -1;
+          return _this17.findRowIndexOf(selection, row) > -1;
         });
       }
     }
@@ -14936,7 +14938,7 @@ var Methods = {
    * 如果存在筛选条件，继续处理
    */
   updateAfterFullData: function updateAfterFullData() {
-    var _this17 = this;
+    var _this18 = this;
 
     var tableFullColumn = this.tableFullColumn,
         tableFullData = this.tableFullData,
@@ -15020,7 +15022,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this17
+                  $table: _this18
                 });
               });
             } else if (compFilterMethod) {
@@ -15031,7 +15033,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this17
+                  $table: _this18
                 });
               });
             } else if (allFilterMethod) {
@@ -15050,7 +15052,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this17
+                  $table: _this18
                 });
               });
             }
@@ -15103,7 +15105,7 @@ var Methods = {
           tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.orderBy(tableTree, orderColumns.map(function (_ref2) {
             var column = _ref2.column,
                 order = _ref2.order;
-            return [getOrderField(_this17, column), order];
+            return [getOrderField(_this18, column), order];
           }));
         }
 
@@ -15127,7 +15129,7 @@ var Methods = {
             tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.orderBy(tableData, orderColumns.map(function (_ref3) {
               var column = _ref3.column,
                   order = _ref3.order;
-              return [getOrderField(_this17, column), order];
+              return [getOrderField(_this18, column), order];
             }));
           } else {
             // 兼容 v2，在 v4 中废弃， sortBy 不能为数组
@@ -15142,7 +15144,7 @@ var Methods = {
             tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.orderBy(tableData, sortByConfs || [firstOrderColumn].map(function (_ref4) {
               var column = _ref4.column,
                   order = _ref4.order;
-              return [getOrderField(_this17, column), order];
+              return [getOrderField(_this18, column), order];
             }));
           }
         }
@@ -15161,7 +15163,7 @@ var Methods = {
    * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
    */
   updateAfterDataIndex: function updateAfterDataIndex() {
-    var _this18 = this;
+    var _this19 = this;
 
     var treeConfig = this.treeConfig,
         afterFullData = this.afterFullData,
@@ -15172,7 +15174,7 @@ var Methods = {
 
     if (treeConfig) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterTreeFullData, function (row, index, items, path) {
-        var rowid = getRowid(_this18, row);
+        var rowid = getRowid(_this19, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = path.map(function (num, i) {
           return i % 2 === 0 ? Number(num) + 1 : '.';
@@ -15201,7 +15203,7 @@ var Methods = {
       });
     } else {
       afterFullData.forEach(function (row, index) {
-        var rowid = getRowid(_this18, row);
+        var rowid = getRowid(_this19, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = index + 1;
 
@@ -15293,7 +15295,7 @@ var Methods = {
    * 默认执行一次，除非被重置
    */
   handleLoadDefaults: function handleLoadDefaults() {
-    var _this19 = this;
+    var _this20 = this;
 
     if (this.checkboxConfig) {
       this.handleDefaultSelectionChecked();
@@ -15320,7 +15322,7 @@ var Methods = {
     }
 
     this.$nextTick(function () {
-      return setTimeout(_this19.recalculate);
+      return setTimeout(_this20.recalculate);
     });
   },
 
@@ -15570,12 +15572,12 @@ var Methods = {
    * 刷新列配置
    */
   refreshColumn: function refreshColumn() {
-    var _this20 = this;
+    var _this21 = this;
 
     return this.parseColumns().then(function () {
-      return _this20.refreshScroll();
+      return _this21.refreshScroll();
     }).then(function () {
-      return _this20.recalculate();
+      return _this21.recalculate();
     });
   },
 
@@ -15584,7 +15586,7 @@ var Methods = {
    * 将固定的列左边、右边分别靠边
    */
   parseColumns: function parseColumns() {
-    var _this21 = this;
+    var _this22 = this;
 
     var leftList = [];
     var centerList = [];
@@ -15691,11 +15693,11 @@ var Methods = {
     this.visibleColumn = visibleColumn;
     this.handleTableColumn();
     return this.updateFooter().then(function () {
-      return _this21.recalculate();
+      return _this22.recalculate();
     }).then(function () {
-      _this21.updateCellAreas();
+      _this22.updateCellAreas();
 
-      return _this21.recalculate();
+      return _this22.recalculate();
     });
   },
 
@@ -15751,7 +15753,7 @@ var Methods = {
    * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
    */
   refreshScroll: function refreshScroll() {
-    var _this22 = this;
+    var _this23 = this;
 
     var lastScrollLeft = this.lastScrollLeft,
         lastScrollTop = this.lastScrollTop;
@@ -15767,7 +15769,7 @@ var Methods = {
     return new Promise(function (resolve) {
       // 还原滚动条位置
       if (lastScrollLeft || lastScrollTop) {
-        return restoreScrollLocation(_this22, lastScrollLeft, lastScrollTop).then(function () {
+        return restoreScrollLocation(_this23, lastScrollLeft, lastScrollTop).then(function () {
           // 存在滚动行为未结束情况
           setTimeout(resolve, 30);
         });
@@ -15788,7 +15790,7 @@ var Methods = {
    * 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
    */
   recalculate: function recalculate(refull) {
-    var _this23 = this;
+    var _this24 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -15804,9 +15806,9 @@ var Methods = {
       if (refull === true) {
         // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
         return this.computeScrollLoad().then(function () {
-          _this23.autoCellWidth(headerElem, bodyElem, footerElem);
+          _this24.autoCellWidth(headerElem, bodyElem, footerElem);
 
-          return _this23.computeScrollLoad();
+          return _this24.computeScrollLoad();
         });
       }
     }
@@ -15954,7 +15956,7 @@ var Methods = {
     this.customMaxHeight = methods_calcHeight(this, 'maxHeight');
   },
   updateStyle: function updateStyle() {
-    var _this24 = this;
+    var _this25 = this;
 
     var $refs = this.$refs,
         isGroup = this.isGroup,
@@ -16058,7 +16060,7 @@ var Methods = {
 
           if (isGroup && listElem) {
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach(listElem.querySelectorAll('.col--group'), function (thElem) {
-              var colNode = _this24.getColumnNode(thElem);
+              var colNode = _this25.getColumnNode(thElem);
 
               if (colNode) {
                 var column = colNode.item;
@@ -16225,10 +16227,10 @@ var Methods = {
 
                   if (cellElem) {
                     if (colspan > 1) {
-                      var columnIndex = _this24.getColumnIndex(column);
+                      var columnIndex = _this25.getColumnIndex(column);
 
                       for (var _index = 1; _index < colspan; _index++) {
-                        var nextColumn = _this24.getColumns(columnIndex + _index);
+                        var nextColumn = _this25.getColumns(columnIndex + _index);
 
                         if (nextColumn) {
                           colWidth += nextColumn.renderWidth;
@@ -16278,15 +16280,15 @@ var Methods = {
     }
   },
   preventEvent: function preventEvent(evnt, type, args, next, end) {
-    var _this25 = this;
+    var _this26 = this;
 
     var evntList = v_x_e_table.interceptor.get(type);
     var rest;
 
     if (!evntList.some(function (func) {
       return func(Object.assign({
-        $grid: _this25.$xegrid,
-        $table: _this25,
+        $grid: _this26.$xegrid,
+        $table: _this26,
         $event: evnt
       }, args)) === false;
     })) {
@@ -16306,7 +16308,7 @@ var Methods = {
    * 全局按下事件处理
    */
   handleGlobalMousedownEvent: function handleGlobalMousedownEvent(evnt) {
-    var _this26 = this;
+    var _this27 = this;
 
     var $el = this.$el,
         $refs = this.$refs,
@@ -16367,7 +16369,7 @@ var Methods = {
                 } // 如果固定了高度且点击了行之外的空白处，则清除激活状态
 
 
-                if (!isClearActived && _this26.height && !_this26.overflowY) {
+                if (!isClearActived && _this27.height && !_this27.overflowY) {
                   var bodyWrapperElem = evnt.target;
 
                   if (methods_hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
@@ -16378,7 +16380,7 @@ var Methods = {
                 if (isClearActived || // 如果点击了当前表格之外
                 !getEventTargetNode(evnt, $el).flag) {
                   setTimeout(function () {
-                    return _this26.clearEdit(evnt);
+                    return _this27.clearEdit(evnt);
                   });
                 }
               });
@@ -16392,9 +16394,9 @@ var Methods = {
 
         if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
           this.preventEvent(evnt, 'event.clearAreas', {}, function () {
-            _this26.clearCellAreas();
+            _this27.clearCellAreas();
 
-            _this26.clearCopyCellArea();
+            _this27.clearCopyCellArea();
           });
         }
       }
@@ -16429,7 +16431,7 @@ var Methods = {
    * 表格键盘事件
    */
   keydownEvent: function keydownEvent(evnt) {
-    var _this27 = this;
+    var _this28 = this;
 
     var filterStore = this.filterStore,
         ctxMenuStore = this.ctxMenuStore,
@@ -16444,37 +16446,37 @@ var Methods = {
 
     if (isEsc) {
       this.preventEvent(evnt, 'event.keydown', null, function () {
-        _this27.emitEvent('keydown-start', {}, evnt);
+        _this28.emitEvent('keydown-start', {}, evnt);
 
-        if (keyboardConfig && mouseConfig && mouseOpts.area && _this27.handleKeyboardEvent) {
-          _this27.handleKeyboardEvent(evnt);
+        if (keyboardConfig && mouseConfig && mouseOpts.area && _this28.handleKeyboardEvent) {
+          _this28.handleKeyboardEvent(evnt);
         } else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
           evnt.stopPropagation(); // 如果按下了 Esc 键，关闭快捷菜单、筛选
 
-          _this27.closeFilter();
+          _this28.closeFilter();
 
-          _this27.closeMenu();
+          _this28.closeMenu();
 
           if (keyboardConfig && keyboardOpts.isEsc) {
             // 如果是激活编辑状态，则取消编辑
             if (actived.row) {
               var params = actived.args;
 
-              _this27.clearEdit(evnt); // 如果配置了选中功能，则为选中状态
+              _this28.clearEdit(evnt); // 如果配置了选中功能，则为选中状态
 
 
               if (mouseConfig && mouseOpts.selected) {
-                _this27.$nextTick(function () {
-                  return _this27.handleSelected(params, evnt);
+                _this28.$nextTick(function () {
+                  return _this28.handleSelected(params, evnt);
                 });
               }
             }
           }
         }
 
-        _this27.emitEvent('keydown', {}, evnt);
+        _this28.emitEvent('keydown', {}, evnt);
 
-        _this27.emitEvent('keydown-end', {}, evnt);
+        _this28.emitEvent('keydown-end', {}, evnt);
       });
     }
   },
@@ -16483,27 +16485,27 @@ var Methods = {
    * 全局键盘事件
    */
   handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
-    var _this28 = this;
+    var _this29 = this;
 
     // 该行为只对当前激活的表格有效
     if (this.isActivated) {
       this.preventEvent(evnt, 'event.keydown', null, function () {
-        var filterStore = _this28.filterStore,
-            isCtxMenu = _this28.isCtxMenu,
-            ctxMenuStore = _this28.ctxMenuStore,
-            editStore = _this28.editStore,
-            editOpts = _this28.editOpts,
-            editConfig = _this28.editConfig,
-            mouseConfig = _this28.mouseConfig,
-            mouseOpts = _this28.mouseOpts,
-            keyboardConfig = _this28.keyboardConfig,
-            keyboardOpts = _this28.keyboardOpts,
-            treeConfig = _this28.treeConfig,
-            treeOpts = _this28.treeOpts,
-            highlightCurrentRow = _this28.highlightCurrentRow,
-            currentRow = _this28.currentRow,
-            bodyCtxMenu = _this28.bodyCtxMenu,
-            rowOpts = _this28.rowOpts;
+        var filterStore = _this29.filterStore,
+            isCtxMenu = _this29.isCtxMenu,
+            ctxMenuStore = _this29.ctxMenuStore,
+            editStore = _this29.editStore,
+            editOpts = _this29.editOpts,
+            editConfig = _this29.editConfig,
+            mouseConfig = _this29.mouseConfig,
+            mouseOpts = _this29.mouseOpts,
+            keyboardConfig = _this29.keyboardConfig,
+            keyboardOpts = _this29.keyboardOpts,
+            treeConfig = _this29.treeConfig,
+            treeOpts = _this29.treeOpts,
+            highlightCurrentRow = _this29.highlightCurrentRow,
+            currentRow = _this29.currentRow,
+            bodyCtxMenu = _this29.bodyCtxMenu,
+            rowOpts = _this29.rowOpts;
         var selected = editStore.selected,
             actived = editStore.actived;
         var keyCode = evnt.keyCode;
@@ -16530,7 +16532,7 @@ var Methods = {
 
         if (filterStore.visible) {
           if (isEsc) {
-            _this28.closeFilter();
+            _this29.closeFilter();
           }
 
           return;
@@ -16541,20 +16543,20 @@ var Methods = {
           evnt.preventDefault();
 
           if (ctxMenuStore.showChild && hasChildrenList(ctxMenuStore.selected)) {
-            _this28.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
+            _this29.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
           } else {
-            _this28.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this28.ctxMenuList);
+            _this29.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this29.ctxMenuList);
           }
-        } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this28.handleKeyboardEvent) {
-          _this28.handleKeyboardEvent(evnt);
+        } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this29.handleKeyboardEvent) {
+          _this29.handleKeyboardEvent(evnt);
         } else if (keyboardConfig && isSpacebar && keyboardOpts.isChecked && selected.row && selected.column && (selected.column.type === 'checkbox' || selected.column.type === 'radio')) {
           // 空格键支持选中复选框
           evnt.preventDefault();
 
           if (selected.column.type === 'checkbox') {
-            _this28.handleToggleCheckRowEvent(evnt, selected.args);
+            _this29.handleToggleCheckRowEvent(evnt, selected.args);
           } else {
-            _this28.triggerRadioRowEvent(evnt, selected.args);
+            _this29.triggerRadioRowEvent(evnt, selected.args);
           }
         } else if (isF2 && isEnableConf(editConfig)) {
           if (!isEditStatus) {
@@ -16563,15 +16565,15 @@ var Methods = {
               evnt.stopPropagation();
               evnt.preventDefault();
 
-              _this28.handleActived(selected.args, evnt);
+              _this29.handleActived(selected.args, evnt);
             }
           }
         } else if (isContextMenu) {
           // 如果按下上下文键
-          _this28._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
-          clearTimeout(_this28.keyCtxTimeout);
-          _this28.keyCtxTimeout = setTimeout(function () {
-            _this28._keyCtx = false;
+          _this29._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
+          clearTimeout(_this29.keyCtxTimeout);
+          _this29.keyCtxTimeout = setTimeout(function () {
+            _this29._keyCtx = false;
           }, 1000);
         } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
           // 退出选中
@@ -16580,12 +16582,12 @@ var Methods = {
             if (actived.row) {
               params = actived.args;
 
-              _this28.clearEdit(evnt); // 如果配置了选中功能，则为选中状态
+              _this29.clearEdit(evnt); // 如果配置了选中功能，则为选中状态
 
 
               if (mouseConfig && mouseOpts.selected) {
-                _this28.$nextTick(function () {
-                  return _this28.handleSelected(params, evnt);
+                _this29.$nextTick(function () {
+                  return _this29.handleSelected(params, evnt);
                 });
               }
             }
@@ -16596,15 +16598,15 @@ var Methods = {
 
               if (hasShiftKey) {
                 if (keyboardOpts.enterToTab) {
-                  _this28.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  _this29.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  _this28.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
+                  _this29.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
                 }
               } else {
                 if (keyboardOpts.enterToTab) {
-                  _this28.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  _this29.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  _this28.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
+                  _this29.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
                 }
               }
             } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
@@ -16615,14 +16617,14 @@ var Methods = {
                 evnt.preventDefault();
                 var targetRow = childrens[0];
                 params = {
-                  $table: _this28,
+                  $table: _this29,
                   row: targetRow
                 };
 
-                _this28.setTreeExpand(currentRow, true).then(function () {
-                  return _this28.scrollToRow(targetRow);
+                _this29.setTreeExpand(currentRow, true).then(function () {
+                  return _this29.scrollToRow(targetRow);
                 }).then(function () {
-                  return _this28.triggerCurrentRowEvent(evnt, params);
+                  return _this29.triggerCurrentRowEvent(evnt, params);
                 });
               }
             }
@@ -16631,18 +16633,18 @@ var Methods = {
           if (!isEditStatus) {
             // 如果按下了方向键
             if (selected.row && selected.column) {
-              _this28.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
+              _this29.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
             } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
               // 当前行按键上下移动
-              _this28.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+              _this29.moveCurrentRow(isUpArrow, isDwArrow, evnt);
             }
           }
         } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
           // 如果按下了 Tab 键切换
           if (selected.row || selected.column) {
-            _this28.moveTabSelected(selected.args, hasShiftKey, evnt);
+            _this29.moveTabSelected(selected.args, hasShiftKey, evnt);
           } else if (actived.row || actived.column) {
-            _this28.moveTabSelected(actived.args, hasShiftKey, evnt);
+            _this29.moveTabSelected(actived.args, hasShiftKey, evnt);
           }
         } else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
           if (!isEditStatus) {
@@ -16653,10 +16655,10 @@ var Methods = {
               if (delMethod) {
                 delMethod({
                   row: selected.row,
-                  rowIndex: _this28.getRowIndex(selected.row),
+                  rowIndex: _this29.getRowIndex(selected.row),
                   column: selected.column,
-                  columnIndex: _this28.getColumnIndex(selected.column),
-                  $table: _this28
+                  columnIndex: _this29.getColumnIndex(selected.column),
+                  $table: _this29
                 });
               } else {
                 methods_setCellValue(selected.row, selected.column, null);
@@ -16666,21 +16668,21 @@ var Methods = {
                 if (backMethod) {
                   backMethod({
                     row: selected.row,
-                    rowIndex: _this28.getRowIndex(selected.row),
+                    rowIndex: _this29.getRowIndex(selected.row),
                     column: selected.column,
-                    columnIndex: _this28.getColumnIndex(selected.column),
-                    $table: _this28
+                    columnIndex: _this29.getColumnIndex(selected.column),
+                    $table: _this29
                   });
                 } else {
-                  _this28.handleActived(selected.args, evnt);
+                  _this29.handleActived(selected.args, evnt);
                 }
               } else if (isDel) {
                 // 如果按下 del 键，更新表尾数据
-                _this28.updateFooter();
+                _this29.updateFooter();
               }
             } 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(_this28.afterFullData, function (item) {
+              var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(_this29.afterFullData, function (item) {
                 return item === currentRow;
               }, treeOpts),
                   parentRow = _XEUtils$findTree.parent;
@@ -16688,14 +16690,14 @@ var Methods = {
               if (parentRow) {
                 evnt.preventDefault();
                 params = {
-                  $table: _this28,
+                  $table: _this29,
                   row: parentRow
                 };
 
-                _this28.setTreeExpand(parentRow, false).then(function () {
-                  return _this28.scrollToRow(parentRow);
+                _this29.setTreeExpand(parentRow, false).then(function () {
+                  return _this29.scrollToRow(parentRow);
                 }).then(function () {
-                  return _this28.triggerCurrentRowEvent(evnt, params);
+                  return _this29.triggerCurrentRowEvent(evnt, params);
                 });
               }
             }
@@ -16711,26 +16713,26 @@ var Methods = {
             var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
 
             if (!beforeEditMethod || beforeEditMethod(_objectSpread2(_objectSpread2({}, selected.args), {}, {
-              $table: _this28
+              $table: _this29
             }))) {
               if (editMethod) {
                 editMethod({
                   row: selected.row,
-                  rowIndex: _this28.getRowIndex(selected.row),
+                  rowIndex: _this29.getRowIndex(selected.row),
                   column: selected.column,
-                  columnIndex: _this28.getColumnIndex(selected.column),
-                  $table: _this28
+                  columnIndex: _this29.getColumnIndex(selected.column),
+                  $table: _this29
                 });
               } else {
                 methods_setCellValue(selected.row, selected.column, null);
 
-                _this28.handleActived(selected.args, evnt);
+                _this29.handleActived(selected.args, evnt);
               }
             }
           }
         }
 
-        _this28.emitEvent('keydown', {}, evnt);
+        _this29.emitEvent('keydown', {}, evnt);
       });
     }
   },
@@ -16812,7 +16814,7 @@ var Methods = {
     }
   },
   handleTargetLeaveEvent: function handleTargetLeaveEvent() {
-    var _this29 = this;
+    var _this30 = this;
 
     var tooltipOpts = this.tooltipOpts;
     var $tooltip = this.$refs.tooltip;
@@ -16823,10 +16825,10 @@ var Methods = {
 
     if (tooltipOpts.enterable) {
       this.tooltipTimeout = setTimeout(function () {
-        $tooltip = _this29.$refs.tooltip;
+        $tooltip = _this30.$refs.tooltip;
 
         if ($tooltip && !$tooltip.isActived()) {
-          _this29.closeTooltip();
+          _this30.closeTooltip();
         }
       }, tooltipOpts.leaveDelay);
     } else {
@@ -17024,13 +17026,15 @@ var Methods = {
    * 获取复选框半选状态的行数据
    */
   getCheckboxIndeterminateRecords: function getCheckboxIndeterminateRecords(isFull) {
+    var _this31 = this;
+
     var treeConfig = this.treeConfig,
         treeIndeterminates = this.treeIndeterminates,
         afterFullData = this.afterFullData;
 
     if (treeConfig) {
       return isFull ? treeIndeterminates.slice(0) : treeIndeterminates.filter(function (row) {
-        return afterFullData.indexOf(row);
+        return _this31.findRowIndexOf(afterFullData, row) > -1;
       });
     }
 
@@ -17065,30 +17069,32 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setCheckboxRow: function setCheckboxRow(rows, value) {
-    var _this30 = this;
+    var _this32 = this;
 
     if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(rows)) {
       rows = [rows];
     }
 
     rows.forEach(function (row) {
-      return _this30.handleSelectRow({
+      return _this32.handleSelectRow({
         row: row
       }, !!value);
     });
     return this.$nextTick();
   },
   isCheckedByCheckboxRow: function isCheckedByCheckboxRow(row) {
+    var selection = this.selection;
     var checkField = this.checkboxOpts.checkField;
 
     if (checkField) {
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField);
     }
 
-    return this.selection.indexOf(row) > -1;
+    return this.findRowIndexOf(selection, row) > -1;
   },
   isIndeterminateByCheckboxRow: function isIndeterminateByCheckboxRow(row) {
-    return this.treeIndeterminates.indexOf(row) > -1 && !this.isCheckedByCheckboxRow(row);
+    var treeIndeterminates = this.treeIndeterminates;
+    return this.findRowIndexOf(treeIndeterminates, row) > -1 && !this.isCheckedByCheckboxRow(row);
   },
 
   /**
@@ -17096,7 +17102,7 @@ var Methods = {
    * value 选中true 不选false 半选-1
    */
   handleSelectRow: function handleSelectRow(_ref6, value) {
-    var _this31 = this;
+    var _this33 = this;
 
     var row = _ref6.row;
     var selection = this.selection,
@@ -17112,7 +17118,7 @@ var Methods = {
     if (checkField) {
       if (treeConfig && !checkStrictly) {
         if (value === -1) {
-          if (treeIndeterminates.indexOf(row) === -1) {
+          if (this.findRowIndexOf(treeIndeterminates, row) === -1) {
             treeIndeterminates.push(row);
           }
 
@@ -17120,22 +17126,22 @@ var Methods = {
         } else {
           // 更新子节点状态
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree([row], function (item) {
-            if (row === item || !checkMethod || checkMethod({
+            if (_this33.eqRow(item, row) || !checkMethod || checkMethod({
               row: item
             })) {
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(item, checkField, value);
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeIndeterminates, function (half) {
-                return half === item;
+                return _this33.eqRow(half, item);
               });
 
-              _this31.handleCheckboxReserveRow(row, value);
+              _this33.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
 
 
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(afterFullData, function (item) {
-          return item === row;
+          return _this33.eqRow(item, row);
         }, treeOpts);
 
         if (matchObj && matchObj.parent) {
@@ -17146,7 +17152,7 @@ var Methods = {
             });
           }) : matchObj.items;
           var indeterminatesItem = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.find(matchObj.items, function (item) {
-            return treeIndeterminates.indexOf(item) > -1;
+            return _this33.findRowIndexOf(treeIndeterminates, item) > -1;
           });
 
           if (indeterminatesItem) {
@@ -17156,7 +17162,7 @@ var Methods = {
               return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(item, checkField);
             });
             parentStatus = selectItems.filter(function (item) {
-              return vItems.indexOf(item) > -1;
+              return _this33.findRowIndexOf(vItems, item) > -1;
             }).length === vItems.length ? true : selectItems.length || value === -1 ? -1 : false;
           }
 
@@ -17175,39 +17181,39 @@ var Methods = {
     } else {
       if (treeConfig && !checkStrictly) {
         if (value === -1) {
-          if (treeIndeterminates.indexOf(row) === -1) {
+          if (this.findRowIndexOf(treeIndeterminates, row) === -1) {
             treeIndeterminates.push(row);
           }
 
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(selection, function (item) {
-            return item === row;
+            return _this33.eqRow(item, row);
           });
         } else {
           // 更新子节点状态
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree([row], function (item) {
-            if (row === item || !checkMethod || checkMethod({
+            if (_this33.eqRow(item, row) || !checkMethod || checkMethod({
               row: item
             })) {
               if (value) {
                 selection.push(item);
               } else {
                 external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(selection, function (select) {
-                  return select === item;
+                  return _this33.eqRow(select, item);
                 });
               }
 
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeIndeterminates, function (half) {
-                return half === item;
+                return _this33.eqRow(half, item);
               });
 
-              _this31.handleCheckboxReserveRow(row, value);
+              _this33.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
 
 
         var _matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(afterFullData, function (item) {
-          return item === row;
+          return _this33.eqRow(item, row);
         }, treeOpts);
 
         if (_matchObj && _matchObj.parent) {
@@ -17220,18 +17226,18 @@ var Methods = {
           }) : _matchObj.items;
 
           var _indeterminatesItem = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.find(_matchObj.items, function (item) {
-            return treeIndeterminates.indexOf(item) > -1;
+            return _this33.findRowIndexOf(treeIndeterminates, item) > -1;
           });
 
           if (_indeterminatesItem) {
             _parentStatus = -1;
           } else {
             var _selectItems = _matchObj.items.filter(function (item) {
-              return selection.indexOf(item) > -1;
+              return _this33.findRowIndexOf(selection, item) > -1;
             });
 
             _parentStatus = _selectItems.filter(function (item) {
-              return _vItems.indexOf(item) > -1;
+              return _this33.findRowIndexOf(_vItems, item) > -1;
             }).length === _vItems.length ? true : _selectItems.length || value === -1 ? -1 : false;
           }
 
@@ -17244,12 +17250,12 @@ var Methods = {
           row: row
         })) {
           if (value) {
-            if (selection.indexOf(row) === -1) {
+            if (this.findRowIndexOf(selection, row) === -1) {
               selection.push(row);
             }
           } else {
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(selection, function (item) {
-              return item === row;
+              return _this33.eqRow(item, row);
             });
           }
 
@@ -17265,7 +17271,7 @@ var Methods = {
         checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField;
     var row = params.row;
-    var value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField) : selection.indexOf(row) === -1;
+    var value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField) : this.findRowIndexOf(selection, row) === -1;
 
     if (evnt) {
       this.triggerCheckRowEvent(evnt, params, value);
@@ -17304,7 +17310,7 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setAllCheckboxRow: function setAllCheckboxRow(value) {
-    var _this32 = this;
+    var _this34 = this;
 
     var afterFullData = this.afterFullData,
         treeConfig = this.treeConfig,
@@ -17318,7 +17324,7 @@ var Methods = {
         checkMethod = checkboxOpts.checkMethod;
     var selectRows = [];
     var beforeSelection = treeConfig ? [] : selection.filter(function (row) {
-      return afterFullData.indexOf(row) === -1;
+      return _this34.findRowIndexOf(afterFullData, row) === -1;
     });
 
     if (checkStrictly) {
@@ -17375,7 +17381,7 @@ var Methods = {
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterFullData, function (row) {
                 if (checkMethod({
                   row: row
-                }) ? 0 : selection.indexOf(row) > -1) {
+                }) ? 0 : _this34.findRowIndexOf(selection, row) > -1) {
                   selectRows.push(row);
                 }
               }, treeOpts);
@@ -17390,7 +17396,7 @@ var Methods = {
              */
             if (checkMethod) {
               selectRows = afterFullData.filter(function (row) {
-                return selection.indexOf(row) > -1 || checkMethod({
+                return _this34.findRowIndexOf(selection, row) > -1 || checkMethod({
                   row: row
                 });
               });
@@ -17407,7 +17413,7 @@ var Methods = {
               selectRows = afterFullData.filter(function (row) {
                 return checkMethod({
                   row: row
-                }) ? 0 : selection.indexOf(row) > -1;
+                }) ? 0 : _this34.findRowIndexOf(selection, row) > -1;
               });
             }
           }
@@ -17417,11 +17423,11 @@ var Methods = {
       if (reserve) {
         if (value) {
           selectRows.forEach(function (row) {
-            checkboxReserveRowMap[getRowid(_this32, row)] = row;
+            checkboxReserveRowMap[getRowid(_this34, row)] = row;
           });
         } else {
           afterFullData.forEach(function (row) {
-            return _this32.handleCheckboxReserveRow(row, false);
+            return _this34.handleCheckboxReserveRow(row, false);
           });
         }
       }
@@ -17433,6 +17439,8 @@ var Methods = {
     this.checkSelectionStatus();
   },
   checkSelectionStatus: function checkSelectionStatus() {
+    var _this35 = this;
+
     var afterFullData = this.afterFullData,
         selection = this.selection,
         treeIndeterminates = this.treeIndeterminates,
@@ -17473,11 +17481,11 @@ var Methods = {
         if (treeConfig) {
           if (halfField) {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, halfField) || treeIndeterminates.indexOf(row) > -1;
+              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, halfField) || _this35.findRowIndexOf(treeIndeterminates, row) > -1;
             });
           } else {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField) || treeIndeterminates.indexOf(row) > -1;
+              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, checkField) || _this35.findRowIndexOf(treeIndeterminates, row) > -1;
             });
           }
         } else {
@@ -17500,24 +17508,24 @@ var Methods = {
             return true;
           }
 
-          if (selection.indexOf(row) > -1) {
+          if (_this35.findRowIndexOf(selection, row) > -1) {
             checkRows.push(row);
             return true;
           }
 
           return false;
         } : function (row) {
-          return selection.indexOf(row) > -1;
+          return _this35.findRowIndexOf(selection, row) > -1;
         });
         isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
 
         if (treeConfig) {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-            return treeIndeterminates.indexOf(row) > -1 || selection.indexOf(row) > -1;
+            return _this35.findRowIndexOf(treeIndeterminates, row) > -1 || _this35.findRowIndexOf(selection, row) > -1;
           });
         } else {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-            return selection.indexOf(row) > -1;
+            return _this35.findRowIndexOf(selection, row) > -1;
           });
         }
       }
@@ -17641,7 +17649,7 @@ var Methods = {
    * 获取复选框保留选中的行
    */
   getCheckboxReserveRecords: function getCheckboxReserveRecords(isFull) {
-    var _this33 = this;
+    var _this36 = this;
 
     var fullDataRowIdData = this.fullDataRowIdData,
         afterFullData = this.afterFullData,
@@ -17656,11 +17664,11 @@ var Methods = {
 
       if (treeConfig) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterFullData, function (row) {
-          afterFullIdMaps[getRowid(_this33, row)] = 1;
+          afterFullIdMaps[getRowid(_this36, row)] = 1;
         }, treeOpts);
       } else {
         afterFullData.forEach(function (row) {
-          afterFullIdMaps[getRowid(_this33, row)] = 1;
+          afterFullIdMaps[getRowid(_this36, row)] = 1;
         });
       }
 
@@ -17726,7 +17734,7 @@ var Methods = {
    * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
    */
   clearCheckboxRow: function clearCheckboxRow() {
-    var _this34 = this;
+    var _this37 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -17749,7 +17757,7 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this34.handleCheckboxReserveRow(row, false);
+        return _this37.handleCheckboxReserveRow(row, false);
       });
     }
 
@@ -18040,13 +18048,13 @@ var Methods = {
    * 如果存在规则，则校验
    */
   handleChangeCell: function handleChangeCell(evnt, params) {
-    var _this35 = this;
+    var _this38 = this;
 
     this.checkValidate('blur').catch(function (e) {
       return e;
     }).then(function () {
-      _this35.handleActived(params, evnt).then(function () {
-        return _this35.checkValidate('change');
+      _this38.handleActived(params, evnt).then(function () {
+        return _this38.checkValidate('change');
       }).catch(function (e) {
         return e;
       });
@@ -18149,7 +18157,7 @@ var Methods = {
    * 如果是双击模式，则激活为编辑状态
    */
   triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
-    var _this36 = this;
+    var _this39 = this;
 
     var editStore = this.editStore,
         editConfig = this.editConfig,
@@ -18164,15 +18172,15 @@ var Methods = {
           this.checkValidate('blur').catch(function (e) {
             return e;
           }).then(function () {
-            _this36.handleActived(params, evnt).then(function () {
-              return _this36.checkValidate('change');
+            _this39.handleActived(params, evnt).then(function () {
+              return _this39.checkValidate('change');
             }).catch(function (e) {
               return e;
             });
           });
         } else if (editOpts.mode === 'cell') {
           this.handleActived(params, evnt).then(function () {
-            return _this36.checkValidate('change');
+            return _this39.checkValidate('change');
           }).catch(function (e) {
             return e;
           });
@@ -18183,7 +18191,7 @@ var Methods = {
     this.emitEvent('cell-dblclick', params, evnt);
   },
   handleDefaultSort: function handleDefaultSort() {
-    var _this37 = this;
+    var _this40 = this;
 
     var sortConfig = this.sortConfig,
         sortOpts = this.sortOpts;
@@ -18200,7 +18208,7 @@ var Methods = {
               order = item.order;
 
           if (field && order) {
-            var column = _this37.getColumnByField(field);
+            var column = _this40.getColumnByField(field);
 
             if (column && column.sortable) {
               column.order = order;
@@ -18246,7 +18254,7 @@ var Methods = {
     }
   },
   sort: function sort(sortConfs, sortOrder) {
-    var _this38 = this;
+    var _this41 = this;
 
     var sortOpts = this.sortOpts;
     var multiple = sortOpts.multiple,
@@ -18279,7 +18287,7 @@ var Methods = {
         var column = field;
 
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(field)) {
-          column = _this38.getColumnByField(field);
+          column = _this41.getColumnByField(field);
         }
 
         if (column && (column.sortable || column.remoteSort)) {
@@ -18288,7 +18296,7 @@ var Methods = {
           }
 
           if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(_this38, column);
+            order = getNextSortOrder(_this41, column);
           }
 
           if (column.order !== order) {
@@ -18429,6 +18437,8 @@ var Methods = {
     return rest && rest.expandLoaded;
   },
   clearRowExpandLoaded: function clearRowExpandLoaded(row) {
+    var _this42 = this;
+
     var expandOpts = this.expandOpts,
         expandLazyLoadeds = this.expandLazyLoadeds,
         fullAllDataRowMap = this.fullAllDataRowMap;
@@ -18438,7 +18448,7 @@ var Methods = {
     if (lazy && rest) {
       rest.expandLoaded = false;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(expandLazyLoadeds, function (item) {
-        return row === item;
+        return _this42.eqRow(item, row);
       });
     }
 
@@ -18450,15 +18460,15 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadRowExpand: function reloadRowExpand(row) {
-    var _this39 = this;
+    var _this43 = this;
 
     var expandOpts = this.expandOpts,
         expandLazyLoadeds = this.expandLazyLoadeds;
     var lazy = expandOpts.lazy;
 
-    if (lazy && expandLazyLoadeds.indexOf(row) === -1) {
+    if (lazy && this.findRowIndexOf(expandLazyLoadeds, row) === -1) {
       this.clearRowExpandLoaded(row).then(function () {
-        return _this39.handleAsyncRowExpand(row);
+        return _this43.handleAsyncRowExpand(row);
       });
     }
 
@@ -18481,7 +18491,7 @@ var Methods = {
     var row = params.row;
     var lazy = expandOpts.lazy;
 
-    if (!lazy || expandLazyLoadeds.indexOf(row) === -1) {
+    if (!lazy || this.findRowIndexOf(expandLazyLoadeds, row) === -1) {
       var expanded = !this.isExpandByRow(row);
       var columnIndex = this.getColumnIndex(column);
       var $columnIndex = this.getVMColumnIndex(column);
@@ -18535,28 +18545,28 @@ var Methods = {
     return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
   },
   handleAsyncRowExpand: function handleAsyncRowExpand(row) {
-    var _this40 = this;
+    var _this44 = this;
 
     var rest = this.fullAllDataRowMap.get(row);
     return new Promise(function (resolve) {
-      _this40.expandLazyLoadeds.push(row);
+      _this44.expandLazyLoadeds.push(row);
 
-      _this40.expandOpts.loadMethod({
-        $table: _this40,
+      _this44.expandOpts.loadMethod({
+        $table: _this44,
         row: row,
-        rowIndex: _this40.getRowIndex(row),
-        $rowIndex: _this40.getVMRowIndex(row)
+        rowIndex: _this44.getRowIndex(row),
+        $rowIndex: _this44.getVMRowIndex(row)
       }).then(function () {
         rest.expandLoaded = true;
 
-        _this40.rowExpandeds.push(row);
+        _this44.rowExpandeds.push(row);
       }).catch(function () {
         rest.expandLoaded = false;
       }).finally(function () {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(_this40.expandLazyLoadeds, function (item) {
-          return item === row;
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(_this44.expandLazyLoadeds, function (item) {
+          return _this44.eqRow(item, row);
         });
-        resolve(_this40.$nextTick().then(_this40.recalculate));
+        resolve(_this44.$nextTick().then(_this44.recalculate));
       });
     });
   },
@@ -18569,7 +18579,7 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand: function setRowExpand(rows, expanded) {
-    var _this41 = this;
+    var _this45 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         expandLazyLoadeds = this.expandLazyLoadeds,
@@ -18602,19 +18612,19 @@ var Methods = {
           columnIndex: columnIndex,
           $columnIndex: $columnIndex,
           row: row,
-          rowIndex: _this41.getRowIndex(row),
-          $rowIndex: _this41.getVMRowIndex(row)
+          rowIndex: _this45.getRowIndex(row),
+          $rowIndex: _this45.getVMRowIndex(row)
         });
       }) : rows;
 
       if (expanded) {
         validRows.forEach(function (row) {
-          if (rowExpandeds.indexOf(row) === -1) {
+          if (_this45.findRowIndexOf(rowExpandeds, row) === -1) {
             var rest = fullAllDataRowMap.get(row);
-            var isLoad = lazy && !rest.expandLoaded && expandLazyLoadeds.indexOf(row) === -1;
+            var isLoad = lazy && !rest.expandLoaded && _this45.findRowIndexOf(expandLazyLoadeds, row) === -1;
 
             if (isLoad) {
-              lazyRests.push(_this41.handleAsyncRowExpand(row));
+              lazyRests.push(_this45.handleAsyncRowExpand(row));
             } else {
               rowExpandeds.push(row);
             }
@@ -18622,13 +18632,13 @@ var Methods = {
         });
       } else {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(rowExpandeds, function (row) {
-          return validRows.indexOf(row) > -1;
+          return _this45.findRowIndexOf(validRows, row) > -1;
         });
       }
 
       if (reserve) {
         validRows.forEach(function (row) {
-          return _this41.handleRowExpandReserve(row, expanded);
+          return _this45.handleRowExpandReserve(row, expanded);
         });
       }
     }
@@ -18642,14 +18652,15 @@ var Methods = {
    * @param {Row} row 行对象
    */
   isExpandByRow: function isExpandByRow(row) {
-    return this.rowExpandeds.indexOf(row) > -1;
+    var rowExpandeds = this.rowExpandeds;
+    return this.findRowIndexOf(rowExpandeds, row) > -1;
   },
 
   /**
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand: function clearRowExpand() {
-    var _this42 = this;
+    var _this46 = this;
 
     var expandOpts = this.expandOpts,
         rowExpandeds = this.rowExpandeds,
@@ -18660,13 +18671,13 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this42.handleRowExpandReserve(row, false);
+        return _this46.handleRowExpandReserve(row, false);
       });
     }
 
     return this.$nextTick().then(function () {
       if (isExists) {
-        _this42.recalculate();
+        _this46.recalculate();
       }
     });
   },
@@ -18745,7 +18756,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadTreeExpand: function reloadTreeExpand(row) {
-    var _this43 = this;
+    var _this47 = this;
 
     var treeOpts = this.treeOpts,
         treeLazyLoadeds = this.treeLazyLoadeds;
@@ -18755,15 +18766,15 @@ var Methods = {
 
     if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(function () {
-        return _this43.handleAsyncTreeExpandChilds(row);
+        return _this47.handleAsyncTreeExpandChilds(row);
       }).then(function () {
         if (transform) {
-          _this43.handleVirtualTreeToList();
+          _this47.handleVirtualTreeToList();
 
-          return _this43.handleTableData();
+          return _this47.handleTableData();
         }
       }).then(function () {
-        return _this43.recalculate();
+        return _this47.recalculate();
       });
     }
 
@@ -18839,7 +18850,7 @@ var Methods = {
     }
   },
   handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
-    var _this44 = this;
+    var _this48 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         treeExpandeds = this.treeExpandeds,
@@ -18853,7 +18864,7 @@ var Methods = {
     return new Promise(function (resolve) {
       treeLazyLoadeds.push(row);
       loadMethod({
-        $table: _this44,
+        $table: _this48,
         row: row
       }).then(function (childRecords) {
         // 响应成功后则展开行，并将子节点挂载到该节点下
@@ -18867,19 +18878,19 @@ var Methods = {
         }
 
         if (childRecords) {
-          return _this44.loadTreeChildren(row, childRecords).then(function (childRows) {
+          return _this48.loadTreeChildren(row, childRecords).then(function (childRows) {
             if (childRows.length && treeExpandeds.indexOf(row) === -1) {
               treeExpandeds.push(row);
             } // 如果当前节点已选中，则展开后子节点也被选中
 
 
-            if (!checkStrictly && _this44.isCheckedByCheckboxRow(row)) {
-              _this44.setCheckboxRow(childRows, true);
+            if (!checkStrictly && _this48.isCheckedByCheckboxRow(row)) {
+              _this48.setCheckboxRow(childRows, true);
             }
 
-            return _this44.$nextTick().then(function () {
+            return _this48.$nextTick().then(function () {
               if (transform) {
-                return _this44.handleTableData();
+                return _this48.handleTableData();
               }
             });
           });
@@ -18891,8 +18902,8 @@ var Methods = {
           return item === row;
         });
       }).finally(function () {
-        _this44.$nextTick().then(function () {
-          return _this44.recalculate();
+        _this48.$nextTick().then(function () {
+          return _this48.recalculate();
         }).then(function () {
           return resolve();
         });
@@ -18927,7 +18938,7 @@ var Methods = {
    * @returns
    */
   handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
-    var _this45 = this;
+    var _this49 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         tableFullData = this.tableFullData,
@@ -18975,7 +18986,7 @@ var Methods = {
           var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1; // 是否使用懒加载
 
           if (isLoad) {
-            result.push(_this45.handleAsyncTreeExpandChilds(row));
+            result.push(_this49.handleAsyncTreeExpandChilds(row));
           } else {
             if (row[children] && row[children].length) {
               treeExpandeds.push(row);
@@ -18991,7 +19002,7 @@ var Methods = {
 
     if (reserve) {
       validRows.forEach(function (row) {
-        return _this45.handleTreeExpandReserve(row, expanded);
+        return _this49.handleTreeExpandReserve(row, expanded);
       });
     }
 
@@ -19005,14 +19016,14 @@ var Methods = {
    * @returns
    */
   handleVirtualTreeExpand: function handleVirtualTreeExpand(rows, expanded) {
-    var _this46 = this;
+    var _this50 = this;
 
     return this.handleBaseTreeExpand(rows, expanded).then(function () {
-      _this46.handleVirtualTreeToList();
+      _this50.handleVirtualTreeToList();
 
-      return _this46.handleTableData();
+      return _this50.handleTableData();
     }).then(function () {
-      return _this46.recalculate();
+      return _this50.recalculate();
     });
   },
 
@@ -19057,7 +19068,7 @@ var Methods = {
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand: function clearTreeExpand() {
-    var _this47 = this;
+    var _this51 = this;
 
     var treeOpts = this.treeOpts,
         treeExpandeds = this.treeExpandeds,
@@ -19069,19 +19080,19 @@ var Methods = {
 
     if (reserve) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(tableFullData, function (row) {
-        return _this47.handleTreeExpandReserve(row, false);
+        return _this51.handleTreeExpandReserve(row, false);
       }, treeOpts);
     }
 
     return this.handleTableData().then(function () {
       if (transform) {
-        _this47.handleVirtualTreeToList();
+        _this51.handleVirtualTreeToList();
 
-        return _this47.handleTableData();
+        return _this51.handleTableData();
       }
     }).then(function () {
       if (isExists) {
-        _this47.recalculate();
+        _this51.recalculate();
       }
     });
   },
@@ -19211,18 +19222,18 @@ var Methods = {
   },
   // 计算可视渲染相关数据
   computeScrollLoad: function computeScrollLoad() {
-    var _this48 = this;
+    var _this52 = this;
 
     return this.$nextTick().then(function () {
-      var sYOpts = _this48.sYOpts,
-          sXOpts = _this48.sXOpts,
-          scrollXLoad = _this48.scrollXLoad,
-          scrollYLoad = _this48.scrollYLoad,
-          scrollXStore = _this48.scrollXStore,
-          scrollYStore = _this48.scrollYStore; // 计算 X 逻辑
+      var sYOpts = _this52.sYOpts,
+          sXOpts = _this52.sXOpts,
+          scrollXLoad = _this52.scrollXLoad,
+          scrollYLoad = _this52.scrollYLoad,
+          scrollXStore = _this52.scrollXStore,
+          scrollYStore = _this52.scrollYStore; // 计算 X 逻辑
 
       if (scrollXLoad) {
-        var _computeVirtualX3 = computeVirtualX(_this48),
+        var _computeVirtualX3 = computeVirtualX(_this52),
             visibleXSize = _computeVirtualX3.visibleSize;
 
         var offsetXSize = sXOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(sXOpts.oSize) : browse.msie ? 10 : browse.edge ? 5 : 0;
@@ -19230,13 +19241,13 @@ var Methods = {
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
 
-        _this48.updateScrollXData();
+        _this52.updateScrollXData();
       } else {
-        _this48.updateScrollXSpace();
+        _this52.updateScrollXSpace();
       } // 计算 Y 逻辑
 
 
-      var _computeVirtualY = computeVirtualY(_this48),
+      var _computeVirtualY = computeVirtualY(_this52),
           rowHeight = _computeVirtualY.rowHeight,
           visibleYSize = _computeVirtualY.visibleSize;
 
@@ -19248,14 +19259,14 @@ var Methods = {
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
 
-        _this48.updateScrollYData();
+        _this52.updateScrollYData();
       } else {
-        _this48.updateScrollYSpace();
+        _this52.updateScrollYSpace();
       }
 
-      _this48.rowHeight = rowHeight;
+      _this52.rowHeight = rowHeight;
 
-      _this48.$nextTick(_this48.updateStyle);
+      _this52.$nextTick(_this52.updateStyle);
     });
   },
   handleTableColumn: function handleTableColumn() {
@@ -19265,13 +19276,13 @@ var Methods = {
     this.tableColumn = scrollXLoad ? visibleColumn.slice(scrollXStore.startIndex, scrollXStore.endIndex) : visibleColumn.slice(0);
   },
   updateScrollXData: function updateScrollXData() {
-    var _this49 = this;
+    var _this53 = this;
 
     // this.tableColumn = []
     this.$nextTick(function () {
-      _this49.handleTableColumn();
+      _this53.handleTableColumn();
 
-      _this49.updateScrollXSpace();
+      _this53.updateScrollXSpace();
     });
   },
   // 更新横向 X 可视渲染上下剩余空间大小
@@ -19328,13 +19339,13 @@ var Methods = {
     }
   },
   updateScrollYData: function updateScrollYData() {
-    var _this50 = this;
+    var _this54 = this;
 
     // this.tableData = []
     this.$nextTick(function () {
-      _this50.handleTableData();
+      _this54.handleTableData();
 
-      _this50.updateScrollYSpace();
+      _this54.updateScrollYSpace();
     });
   },
   // 更新纵向 Y 可视渲染上下剩余空间大小
@@ -19381,7 +19392,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this51 = this;
+    var _this55 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -19402,7 +19413,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this51.$nextTick());
+          return resolve(_this55.$nextTick());
         }, 50);
       });
     }
@@ -19453,7 +19464,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this52 = this;
+    var _this56 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -19468,15 +19479,15 @@ var Methods = {
       if (matchObj) {
         var nodes = matchObj.nodes;
         nodes.forEach(function (row, index) {
-          if (index < nodes.length - 1 && !_this52.isTreeExpandByRow(row)) {
-            rests.push(_this52.setTreeExpand(row, true));
+          if (index < nodes.length - 1 && !_this56.isTreeExpandByRow(row)) {
+            rests.push(_this56.setTreeExpand(row, true));
           }
         });
       }
     }
 
     return Promise.all(rests).then(function () {
-      return rowToVisible(_this52, row);
+      return rowToVisible(_this56, row);
     });
   },
 
@@ -19540,29 +19551,29 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(scope, cellValue) {
-    var _this53 = this;
+    var _this57 = this;
 
     var customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(cellValue);
     return this.$nextTick().then(function () {
-      var $refs = _this53.$refs,
-          editRules = _this53.editRules,
-          validStore = _this53.validStore;
+      var $refs = _this57.$refs,
+          editRules = _this57.editRules,
+          validStore = _this57.validStore;
 
       if (scope && $refs.tableBody && editRules) {
         var row = scope.row,
             column = scope.column;
         var type = 'change';
 
-        if (_this53.hasCellRules(type, row, column)) {
-          var cell = _this53.getCell(row, column);
+        if (_this57.hasCellRules(type, row, column)) {
+          var cell = _this57.getCell(row, column);
 
           if (cell) {
-            return _this53.validCellRules(type, row, column, cellValue).then(function () {
+            return _this57.validCellRules(type, row, column, cellValue).then(function () {
               if (customVal && validStore.visible) {
                 methods_setCellValue(row, column, cellValue);
               }
 
-              _this53.clearValidate();
+              _this57.clearValidate();
             }).catch(function (_ref8) {
               var rule = _ref8.rule;
 
@@ -19570,7 +19581,7 @@ var Methods = {
                 methods_setCellValue(row, column, cellValue);
               }
 
-              _this53.showValidTooltip({
+              _this57.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -19591,7 +19602,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this54 = this;
+    var _this58 = this;
 
     if (this.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -19599,7 +19610,7 @@ var Methods = {
 
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this54.updateCellAreas();
+      return _this58.updateCellAreas();
     });
   },
 
@@ -19608,7 +19619,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this55 = this;
+    var _this59 = this;
 
     if (this.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -19616,7 +19627,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this55.updateCellAreas();
+      _this59.updateCellAreas();
 
       return rest;
     });
@@ -19640,7 +19651,7 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this56 = this;
+    var _this60 = this;
 
     if (this.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -19648,11 +19659,11 @@ var Methods = {
 
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this56.updateCellAreas();
+      return _this60.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this57 = this;
+    var _this61 = this;
 
     if (this.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -19660,7 +19671,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this57.updateCellAreas();
+      _this61.updateCellAreas();
 
       return rest;
     });
@@ -19792,10 +19803,10 @@ var Methods = {
     return cellLabel;
   },
   findRowIndexOf: function findRowIndexOf(list, row) {
-    var _this58 = this;
+    var _this62 = this;
 
     return row ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findIndexOf(list, function (item) {
-      return _this58.eqRow(item, row);
+      return _this62.eqRow(item, row);
     }) : -1;
   },
   eqRow: function eqRow(row1, row2) {
@@ -22418,7 +22429,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
                 afIndex = row;
               }
             } else {
-              afIndex = afterFullData.indexOf(row);
+              afIndex = this.findRowIndexOf(afterFullData, row);
             }
 
             if (afIndex === -1) {
@@ -22426,7 +22437,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
             }
 
             afterFullData.splice.apply(afterFullData, [afIndex, 0].concat(_toConsumableArray(newRecords)));
-            tableFullData.splice.apply(tableFullData, [tableFullData.indexOf(row), 0].concat(_toConsumableArray(newRecords))); // 刷新单元格合并
+            tableFullData.splice.apply(tableFullData, [this.findRowIndexOf(tableFullData, row), 0].concat(_toConsumableArray(newRecords))); // 刷新单元格合并
 
             mergeList.forEach(function (mergeItem) {
               var mergeRowIndex = mergeItem.row,
@@ -22511,7 +22522,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
 
       if (!checkField) {
         rows.forEach(function (row) {
-          var sIndex = selection.indexOf(row);
+          var sIndex = _this2.findRowIndexOf(selection, row);
 
           if (sIndex > -1) {
             selection.splice(sIndex, 1);
@@ -22539,7 +22550,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
               rest.push(rItems[0]);
             }
 
-            var afIndex = afterFullData.indexOf(row);
+            var afIndex = _this2.findRowIndexOf(afterFullData, row);
 
             if (afIndex > -1) {
               afterFullData.splice(afIndex, 1);
@@ -22547,14 +22558,14 @@ function insertTreeRow(_vm, newRecords, isAppend) {
           });
         } else {
           rows.forEach(function (row) {
-            var tfIndex = tableFullData.indexOf(row);
+            var tfIndex = _this2.findRowIndexOf(tableFullData, row);
 
             if (tfIndex > -1) {
               var rItems = tableFullData.splice(tfIndex, 1);
               rest.push(rItems[0]);
             }
 
-            var afIndex = afterFullData.indexOf(row);
+            var afIndex = _this2.findRowIndexOf(afterFullData, row);
 
             if (afIndex > -1) {
               // 刷新单元格合并
@@ -22575,13 +22586,13 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       } // 如果当前行被激活编辑，则清除激活状态
 
 
-      if (actived.row && rows.indexOf(actived.row) > -1) {
+      if (actived.row && this.findRowIndexOf(rows, actived.row) > -1) {
         this.clearActived();
       } // 从新增中移除已删除的数据
 
 
       rows.forEach(function (row) {
-        var iIndex = insertList.indexOf(row);
+        var iIndex = _this2.findRowIndexOf(insertList, row);
 
         if (iIndex > -1) {
           insertList.splice(iIndex, 1);
@@ -22934,7 +22945,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       var args = actived.args,
           row = actived.row;
 
-      if (args && afterFullData.indexOf(row) > -1 && $el.querySelectorAll('.vxe-body--column.col--actived').length) {
+      if (args && this.findRowIndexOf(afterFullData, row) > -1 && $el.querySelectorAll('.vxe-body--column.col--actived').length) {
         return Object.assign({}, args);
       }
 
@@ -23068,7 +23079,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       var column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
 
       if (row && column && editOpts.trigger !== 'manual') {
-        var rowIndex = tableData.indexOf(row);
+        var rowIndex = this.findRowIndexOf(tableData, row);
 
         if (rowIndex > -1) {
           var cell = this.getCell(row, column);
@@ -24909,14 +24920,14 @@ function renderDatePanel(h, _vm) {
       click: _vm.datePrevEvent
     }
   }, [h('i', {
-    class: 'vxe-icon--caret-left'
+    class: 'vxe-icon-caret-left'
   })]), h('span', {
     class: 'vxe-input--date-picker-btn vxe-input--date-picker-current-btn',
     on: {
       click: _vm.dateTodayMonthEvent
     }
   }, [h('i', {
-    class: 'vxe-icon--dot'
+    class: 'vxe-icon-dot'
   })]), h('span', {
     class: ['vxe-input--date-picker-btn vxe-input--date-picker-next-btn', {
       'is--disabled': isDisabledNextDateBtn
@@ -24925,7 +24936,7 @@ function renderDatePanel(h, _vm) {
       click: _vm.dateNextEvent
     }
   }, [h('i', {
-    class: 'vxe-icon--caret-right'
+    class: 'vxe-icon-caret-right'
   })]), multiple && supportMultiples ? h('span', {
     class: 'vxe-input--date-picker-btn vxe-input--date-picker-confirm-btn'
   }, [h('button', {
@@ -34458,7 +34469,7 @@ function renderCustoms(h, _vm) {
     }) : _e(), zoom && $xegrid ? h('vxe-button', {
       props: {
         circle: true,
-        icon: $xegrid.isMaximized() ? zoomOpts.iconOut || src_conf.icon.TOOLBAR_TOOLS_ZOOM_OUT : zoomOpts.iconIn || src_conf.icon.TOOLBAR_TOOLS_ZOOM_IN
+        icon: $xegrid.isMaximized() ? zoomOpts.iconOut || src_conf.icon.TOOLBAR_TOOLS_MINIMIZE : zoomOpts.iconIn || src_conf.icon.TOOLBAR_TOOLS_FULLSCREEN
       },
       attrs: {
         title: src_conf.i18n("vxe.toolbar.zoom".concat($xegrid.isMaximized() ? 'Out' : 'In'))
@@ -37626,7 +37637,7 @@ function getResetValue(value, resetValue) {
                 $form: _this4
               });
             } else if (field) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(data, field, resetValue === null ? getResetValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(data, field), undefined) : resetValue);
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(data, field, resetValue === null ? getResetValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(data, field), undefined) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clone(resetValue, true));
             }
           }
         });