vxe-table 3.7.7-beta.2 → 3.7.7-beta.4

package/lib/index.umd.js

@@ -10222,7 +10222,7 @@ var iconPrefix = 'vxe-icon-';
     showHeader: true,
     animat: true,
     delayHover: 250,
-    autoResize: false,
+    autoResize: true,
     minHeight: 144,
     // keepSource: false,
     // showOverflow: null,
@@ -10591,7 +10591,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.7.7-beta.2", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.7.7-beta.4", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12023,7 +12023,7 @@ var setup = config;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.7.7-beta.2",
+  version: "3.7.7-beta.4",
   reg: reg,
   use: use,
   setup: setup,
@@ -12883,10 +12883,10 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     editRules = $xetable.editRules,
     validOpts = $xetable.validOpts,
     editStore = $xetable.editStore,
-    validStore = $xetable.validStore,
     tooltipConfig = $xetable.tooltipConfig,
     rowOpts = $xetable.rowOpts,
-    columnOpts = $xetable.columnOpts;
+    columnOpts = $xetable.columnOpts,
+    validErrorMaps = $xetable.validErrorMaps;
   var type = column.type,
     cellRender = column.cellRender,
     editRender = column.editRender,
@@ -12914,7 +12914,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   var isDirty;
   var tdOns = {};
   var cellAlign = align || allAlign;
-  var hasValidError = validStore.row === row && validStore.column === column;
+  var errorValidItem = validErrorMaps["".concat(rowid, ":").concat(column.id)];
   var showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? height || tableData.length > 1 : validOpts.message === 'inline');
   var attrs = {
     colid: column.id
@@ -13070,19 +13070,19 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
         title: showTitle ? $xetable.getCellLabel(row, column) : null
       }
     }, column.renderCell(h, params))]));
-    if (showValidTip && hasValidError) {
+    if (showValidTip && errorValidItem) {
       tdVNs.push(h('div', {
-        class: 'vxe-cell--valid',
-        style: validStore.rule && validStore.rule.maxWidth ? {
-          width: "".concat(validStore.rule.maxWidth, "px")
+        class: 'vxe-cell--valid-error-hint',
+        style: errorValidItem.rule && errorValidItem.rule.maxWidth ? {
+          width: "".concat(errorValidItem.rule.maxWidth, "px")
         } : null
       }, [h('span', {
-        class: 'vxe-cell--valid-msg'
-      }, validStore.content)]));
+        class: 'vxe-cell--valid-error-msg'
+      }, errorValidItem.content)]));
     }
   }
   return h('td', {
-    class: ['vxe-body--column', column.id, (_ref2 = {}, _defineProperty(_ref2, "col--".concat(cellAlign), cellAlign), _defineProperty(_ref2, "col--".concat(type), type), _defineProperty(_ref2, 'col--last', $columnIndex === columns.length - 1), _defineProperty(_ref2, 'col--tree-node', treeNode), _defineProperty(_ref2, 'col--edit', isEdit), _defineProperty(_ref2, 'col--ellipsis', hasEllipsis), _defineProperty(_ref2, 'fixed--hidden', fixedHiddenColumn), _defineProperty(_ref2, 'col--dirty', isDirty), _defineProperty(_ref2, 'col--actived', editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row')), _defineProperty(_ref2, 'col--valid-error', hasValidError), _defineProperty(_ref2, 'col--current', currentColumn === column), _ref2), utils.getClass(compCellClassName, params), utils.getClass(className, params), utils.getClass(allCellClassName, params)],
+    class: ['vxe-body--column', column.id, (_ref2 = {}, _defineProperty(_ref2, "col--".concat(cellAlign), cellAlign), _defineProperty(_ref2, "col--".concat(type), type), _defineProperty(_ref2, 'col--last', $columnIndex === columns.length - 1), _defineProperty(_ref2, 'col--tree-node', treeNode), _defineProperty(_ref2, 'col--edit', isEdit), _defineProperty(_ref2, 'col--ellipsis', hasEllipsis), _defineProperty(_ref2, 'fixed--hidden', fixedHiddenColumn), _defineProperty(_ref2, 'col--dirty', isDirty), _defineProperty(_ref2, 'col--active', editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row')), _defineProperty(_ref2, 'col--valid-error', !!errorValidItem), _defineProperty(_ref2, 'col--current', currentColumn === column), _ref2), utils.getClass(compCellClassName, params), utils.getClass(className, params), utils.getClass(allCellClassName, params)],
     key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
     attrs: attrs,
     style: Object.assign({
@@ -13111,7 +13111,9 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
     expandColumn = $xetable.expandColumn,
     hasFixedColumn = $xetable.hasFixedColumn,
     fullAllDataRowIdData = $xetable.fullAllDataRowIdData,
-    rowOpts = $xetable.rowOpts;
+    rowOpts = $xetable.rowOpts,
+    pendingRowList = $xetable.pendingRowList,
+    pendingRowMaps = $xetable.pendingRowMaps;
   var childrenField = treeOpts.children || treeOpts.childrenField;
   var rows = [];
   tableData.forEach(function (row, $rowIndex) {
@@ -13175,7 +13177,8 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
         'is--expand-tree': isExpandTree,
         'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
         'row--radio': radioOpts.highlight && $xetable.selectRadioRow === row,
-        'row--checked': checkboxOpts.highlight && $xetable.isCheckedByCheckboxRow(row)
+        'row--checked': checkboxOpts.highlight && $xetable.isCheckedByCheckboxRow(row),
+        'row--pending': pendingRowList.length && !!pendingRowMaps[rowid]
       }, rowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowClassName) ? rowClassName(params) : rowClassName : ''],
       attrs: {
         rowid: rowid
@@ -13309,8 +13312,10 @@ function syncBodyScroll(_vm, fixedType, scrollTop, elem1, elem2) {
     elemStore["".concat(prefix, "xSpace")] = $refs.xSpace;
     elemStore["".concat(prefix, "ySpace")] = $refs.ySpace;
     elemStore["".concat(prefix, "emptyBlock")] = $refs.emptyBlock;
-    this.$el.onscroll = this.scrollEvent;
-    this.$el._onscroll = this.scrollEvent;
+    if (this.$el) {
+      this.$el.onscroll = this.scrollEvent;
+      this.$el._onscroll = this.scrollEvent;
+    }
   },
   beforeDestroy: function beforeDestroy() {
     clearTimeout(this.wheelTime);
@@ -17893,7 +17898,9 @@ var Methods = {
       mouseConfig = this.mouseConfig,
       editStore = this.editStore,
       ctxMenuStore = this.ctxMenuStore,
+      editRules = this.editRules,
       editOpts = this.editOpts,
+      validOpts = this.validOpts,
       filterStore = this.filterStore,
       getRowNode = this.getRowNode;
     var actived = editStore.actived;
@@ -17974,8 +17981,13 @@ var Methods = {
     if (ctxMenuStore.visible && ctxWrapper && !getEventTargetNode(evnt, ctxWrapper.$el).flag) {
       this.closeMenu();
     }
+    var isActivated = getEventTargetNode(evnt, ($xegrid || this).$el).flag;
+    // 如果存在校验，点击了表格之外则清除
+    if (!isActivated && editRules && validOpts.autoClear) {
+      this.validErrorMaps = {};
+    }
     // 最后激活的表格
-    this.isActivated = getEventTargetNode(evnt, ($xegrid || this).$el).flag;
+    this.isActivated = isActivated;
   },
   /**
    * 窗口失焦事件处理
@@ -19760,8 +19772,78 @@ var Methods = {
       this.emitEvent('sort-change', params, evnt);
     }
   },
-  sort: function sort(sortConfs, sortOrder) {
+  setPendingRow: function setPendingRow(rows, status) {
     var _this40 = this;
+    var pendingMaps = _objectSpread2({}, this.pendingRowMaps);
+    var pendingList = _toConsumableArray(this.pendingRowList);
+    if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
+      rows = [rows];
+    }
+    if (status) {
+      rows.forEach(function (row) {
+        var rowid = getRowid(_this40, row);
+        if (rowid && !pendingMaps[rowid]) {
+          pendingList.push(row);
+          pendingMaps[rowid] = row;
+        }
+      });
+    } else {
+      rows.forEach(function (row) {
+        var rowid = getRowid(_this40, row);
+        if (rowid && pendingMaps[rowid]) {
+          var pendingIndex = _this40.findRowIndexOf(pendingList, row);
+          if (pendingIndex > -1) {
+            pendingList.splice(pendingIndex, 1);
+          }
+          delete pendingMaps[rowid];
+        }
+      });
+    }
+    this.pendingRowMaps = pendingMaps;
+    this.pendingRowList = pendingList;
+    return this.$nextTick();
+  },
+  togglePendingRow: function togglePendingRow(rows) {
+    var _this41 = this;
+    var pendingMaps = _objectSpread2({}, this.pendingRowMaps);
+    var pendingList = _toConsumableArray(this.pendingRowList);
+    if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
+      rows = [rows];
+    }
+    rows.forEach(function (row) {
+      var rowid = getRowid(_this41, row);
+      if (rowid) {
+        if (pendingMaps[rowid]) {
+          var pendingIndex = _this41.findRowIndexOf(pendingList, row);
+          if (pendingIndex > -1) {
+            pendingList.splice(pendingIndex, 1);
+          }
+          delete pendingMaps[rowid];
+        } else {
+          pendingList.push(row);
+          pendingMaps[rowid] = row;
+        }
+      }
+    });
+    this.pendingRowMaps = pendingMaps;
+    this.pendingRowList = pendingList;
+    return this.$nextTick();
+  },
+  getPendingRecords: function getPendingRecords() {
+    return this.pendingRowList.slice(0);
+  },
+  hasPendingByRow: function hasPendingByRow(row) {
+    var pendingRowMaps = this.pendingRowMaps;
+    var rowid = getRowid(this, row);
+    return !!pendingRowMaps[rowid];
+  },
+  clearPendingRow: function clearPendingRow() {
+    this.pendingRowMaps = {};
+    this.pendingRowList = [];
+    return this.$nextTick();
+  },
+  sort: function sort(sortConfs, sortOrder) {
+    var _this42 = this;
     var sortOpts = this.sortOpts;
     var multiple = sortOpts.multiple,
       remote = sortOpts.remote,
@@ -19787,14 +19869,14 @@ var Methods = {
           order = confs.order;
         var column = field;
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(field)) {
-          column = _this40.getColumnByField(field);
+          column = _this42.getColumnByField(field);
         }
         if (column && (column.sortable || column.remoteSort)) {
           if (!firstSortColumn) {
             firstSortColumn = column;
           }
           if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(_this40, column);
+            order = getNextSortOrder(_this42, column);
           }
           if (column.order !== order) {
             column.order = order;
@@ -19807,8 +19889,8 @@ var Methods = {
         this.handleTableData(true);
       }
       return this.$nextTick().then(function () {
-        _this40.updateCellAreas();
-        return _this40.updateStyle();
+        _this42.updateCellAreas();
+        return _this42.updateStyle();
       });
     }
     return this.$nextTick();
@@ -19942,14 +20024,14 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadRowExpand: function reloadRowExpand(row) {
-    var _this41 = this;
+    var _this43 = this;
     var expandOpts = this.expandOpts,
       rowExpandLazyLoadedMaps = this.rowExpandLazyLoadedMaps;
     var lazy = expandOpts.lazy;
     var rowid = getRowid(this, row);
     if (lazy && !rowExpandLazyLoadedMaps[rowid]) {
       this.clearRowExpandLoaded(row).then(function () {
-        return _this41.handleAsyncRowExpand(row);
+        return _this43.handleAsyncRowExpand(row);
       });
     }
     return this.$nextTick();
@@ -19970,7 +20052,7 @@ var Methods = {
     var lazy = expandOpts.lazy;
     var rowid = getRowid(this, row);
     if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
-      var expanded = !this.isExpandByRow(row);
+      var expanded = !this.isRowExpandByRow(row);
       var columnIndex = this.getColumnIndex(column);
       var $columnIndex = this.getVMColumnIndex(column);
       this.setRowExpand(row, expanded);
@@ -19989,7 +20071,7 @@ var Methods = {
    * 切换展开行
    */
   toggleRowExpand: function toggleRowExpand(row) {
-    return this.setRowExpand(row, !this.isExpandByRow(row));
+    return this.setRowExpand(row, !this.isRowExpandByRow(row));
   },
   /**
    * 处理默认展开行
@@ -20034,39 +20116,39 @@ var Methods = {
     return this.setRowExpand(expandedRows, expanded);
   },
   handleAsyncRowExpand: function handleAsyncRowExpand(row) {
-    var _this42 = this;
+    var _this44 = this;
     var fullAllDataRowMap = this.fullAllDataRowMap,
       expandOpts = this.expandOpts;
     var rest = fullAllDataRowMap.get(row);
     return new Promise(function (resolve) {
       var loadMethod = expandOpts.loadMethod;
       if (loadMethod) {
-        var rowExpandLazyLoadedMaps = _this42.rowExpandLazyLoadedMaps;
+        var rowExpandLazyLoadedMaps = _this44.rowExpandLazyLoadedMaps;
         var rowTempExpandLazyLoadedMaps = _objectSpread2({}, rowExpandLazyLoadedMaps);
-        var rowid = getRowid(_this42, row);
+        var rowid = getRowid(_this44, row);
         rowTempExpandLazyLoadedMaps[rowid] = row;
-        _this42.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
+        _this44.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
         loadMethod({
-          $table: _this42,
+          $table: _this44,
           row: row,
-          rowIndex: _this42.getRowIndex(row),
-          $rowIndex: _this42.getVMRowIndex(row)
+          rowIndex: _this44.getRowIndex(row),
+          $rowIndex: _this44.getVMRowIndex(row)
         }).then(function () {
           rest.expandLoaded = true;
-          var rowExpandedMaps = _this42.rowExpandedMaps;
+          var rowExpandedMaps = _this44.rowExpandedMaps;
           var rowTempExpandedMaps = _objectSpread2({}, rowExpandedMaps);
           rowTempExpandedMaps[rowid] = row;
-          _this42.rowExpandedMaps = rowTempExpandedMaps;
+          _this44.rowExpandedMaps = rowTempExpandedMaps;
         }).catch(function () {
           rest.expandLoaded = false;
         }).finally(function () {
-          var rowExpandLazyLoadedMaps = _this42.rowExpandLazyLoadedMaps;
+          var rowExpandLazyLoadedMaps = _this44.rowExpandLazyLoadedMaps;
           var rowTempExpandLazyLoadedMaps = _objectSpread2({}, rowExpandLazyLoadedMaps);
           if (rowTempExpandLazyLoadedMaps[rowid]) {
             delete rowTempExpandLazyLoadedMaps[rowid];
           }
-          _this42.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
-          resolve(_this42.$nextTick().then(_this42.recalculate));
+          _this44.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
+          resolve(_this44.$nextTick().then(_this44.recalculate));
         });
       } else {
         resolve();
@@ -20081,7 +20163,7 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand: function setRowExpand(rows, expanded) {
-    var _this43 = this;
+    var _this45 = this;
     var rowExpandedMaps = this.rowExpandedMaps,
       fullAllDataRowIdData = this.fullAllDataRowIdData,
       rowExpandLazyLoadedMaps = this.rowExpandLazyLoadedMaps,
@@ -20111,18 +20193,18 @@ var Methods = {
           columnIndex: columnIndex,
           $columnIndex: $columnIndex,
           row: row,
-          rowIndex: _this43.getRowIndex(row),
-          $rowIndex: _this43.getVMRowIndex(row)
+          rowIndex: _this45.getRowIndex(row),
+          $rowIndex: _this45.getVMRowIndex(row)
         });
       }) : rows;
       if (expanded) {
         validRows.forEach(function (row) {
-          var rowid = getRowid(_this43, row);
+          var rowid = getRowid(_this45, row);
           if (!rExpandedMaps[rowid]) {
             var rest = fullAllDataRowIdData[rowid];
             var isLoad = lazy && !rest.expandLoaded && !rowExpandLazyLoadedMaps[rowid];
             if (isLoad) {
-              lazyRests.push(_this43.handleAsyncRowExpand(row));
+              lazyRests.push(_this45.handleAsyncRowExpand(row));
             } else {
               rExpandedMaps[rowid] = row;
             }
@@ -20130,7 +20212,7 @@ var Methods = {
         });
       } else {
         validRows.forEach(function (item) {
-          var rowid = getRowid(_this43, item);
+          var rowid = getRowid(_this45, item);
           if (rExpandedMaps[rowid]) {
             delete rExpandedMaps[rowid];
           }
@@ -20138,7 +20220,7 @@ var Methods = {
       }
       if (reserve) {
         validRows.forEach(function (row) {
-          return _this43.handleRowExpandReserve(row, expanded);
+          return _this45.handleRowExpandReserve(row, expanded);
         });
       }
     }
@@ -20149,16 +20231,23 @@ var Methods = {
    * 判断行是否为展开状态
    * @param {Row} row 行对象
    */
-  isExpandByRow: function isExpandByRow(row) {
+  isRowExpandByRow: function isRowExpandByRow(row) {
     var rowExpandedMaps = this.rowExpandedMaps;
     var rowid = getRowid(this, row);
     return !!rowExpandedMaps[rowid];
   },
+  isExpandByRow: function isExpandByRow(row) {
+    // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    //   warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow'])
+    // }
+    // 即将废弃
+    return this.isRowExpandByRow(row);
+  },
   /**
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand: function clearRowExpand() {
-    var _this44 = this;
+    var _this46 = this;
     var expandOpts = this.expandOpts,
       tableFullData = this.tableFullData;
     var reserve = expandOpts.reserve;
@@ -20166,12 +20255,12 @@ var Methods = {
     this.rowExpandedMaps = {};
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this44.handleRowExpandReserve(row, false);
+        return _this46.handleRowExpandReserve(row, false);
       });
     }
     return this.$nextTick().then(function () {
       if (expList.length) {
-        _this44.recalculate();
+        _this46.recalculate();
       }
     });
   },
@@ -20254,7 +20343,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadTreeExpand: function reloadTreeExpand(row) {
-    var _this45 = this;
+    var _this47 = this;
     var treeOpts = this.treeOpts,
       treeExpandLazyLoadedMaps = this.treeExpandLazyLoadedMaps;
     var transform = treeOpts.transform,
@@ -20263,14 +20352,14 @@ var Methods = {
     var rowid = getRowid(this, row);
     if (lazy && row[hasChildField] && !treeExpandLazyLoadedMaps[rowid]) {
       this.clearTreeExpandLoaded(row).then(function () {
-        return _this45.handleAsyncTreeExpandChilds(row);
+        return _this47.handleAsyncTreeExpandChilds(row);
       }).then(function () {
         if (transform) {
-          _this45.handleVirtualTreeToList();
-          return _this45.handleTableData();
+          _this47.handleVirtualTreeToList();
+          return _this47.handleTableData();
         }
       }).then(function () {
-        return _this45.recalculate();
+        return _this47.recalculate();
       });
     }
     return this.$nextTick();
@@ -20341,7 +20430,7 @@ var Methods = {
     }
   },
   handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
-    var _this46 = this;
+    var _this48 = this;
     var treeOpts = this.treeOpts,
       checkboxOpts = this.checkboxOpts;
     var transform = treeOpts.transform,
@@ -20349,13 +20438,13 @@ var Methods = {
     var checkStrictly = checkboxOpts.checkStrictly;
     return new Promise(function (resolve) {
       if (loadMethod) {
-        var fullAllDataRowMap = _this46.fullAllDataRowMap,
-          treeExpandLazyLoadedMaps = _this46.treeExpandLazyLoadedMaps;
-        var rowid = getRowid(_this46, row);
+        var fullAllDataRowMap = _this48.fullAllDataRowMap,
+          treeExpandLazyLoadedMaps = _this48.treeExpandLazyLoadedMaps;
+        var rowid = getRowid(_this48, row);
         var rest = fullAllDataRowMap.get(row);
         treeExpandLazyLoadedMaps[rowid] = row;
         loadMethod({
-          $table: _this46,
+          $table: _this48,
           row: row
         }).then(function (childRecords) {
           // 响应成功后则展开行，并将子节点挂载到该节点下
@@ -20367,20 +20456,20 @@ var Methods = {
             childRecords = [];
           }
           if (childRecords) {
-            return _this46.loadTreeChildren(row, childRecords).then(function (childRows) {
-              var treeExpandedMaps = _this46.treeExpandedMaps;
+            return _this48.loadTreeChildren(row, childRecords).then(function (childRows) {
+              var treeExpandedMaps = _this48.treeExpandedMaps;
               var treeTempExpandedMaps = _objectSpread2({}, treeExpandedMaps);
               if (childRows.length && !treeTempExpandedMaps[rowid]) {
                 treeTempExpandedMaps[rowid] = row;
-                _this46.treeExpandedMaps = treeTempExpandedMaps;
+                _this48.treeExpandedMaps = treeTempExpandedMaps;
               }
               // 如果当前节点已选中，则展开后子节点也被选中
-              if (!checkStrictly && _this46.isCheckedByCheckboxRow(row)) {
-                _this46.handleCheckedCheckboxRow(childRows, true, true);
+              if (!checkStrictly && _this48.isCheckedByCheckboxRow(row)) {
+                _this48.handleCheckedCheckboxRow(childRows, true, true);
               }
-              return _this46.$nextTick().then(function () {
+              return _this48.$nextTick().then(function () {
                 if (transform) {
-                  return _this46.handleTableData();
+                  return _this48.handleTableData();
                 }
               });
             });
@@ -20388,13 +20477,13 @@ var Methods = {
         }).catch(function () {
           // 如果响应异常，则不展开，再次点击后将重新触发懒加载
           rest.treeLoaded = false;
-          var treeExpandLazyLoadedMaps = _this46.treeExpandLazyLoadedMaps;
+          var treeExpandLazyLoadedMaps = _this48.treeExpandLazyLoadedMaps;
           if (treeExpandLazyLoadedMaps[rowid]) {
             treeExpandLazyLoadedMaps[rowid] = null;
           }
         }).finally(function () {
-          _this46.$nextTick().then(function () {
-            return _this46.recalculate();
+          _this48.$nextTick().then(function () {
+            return _this48.recalculate();
           }).then(function () {
             return resolve();
           });
@@ -20431,7 +20520,7 @@ var Methods = {
    * @returns
    */
   handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
-    var _this47 = this;
+    var _this49 = this;
     var fullAllDataRowMap = this.fullAllDataRowMap,
       tableFullData = this.tableFullData,
       treeExpandedMaps = this.treeExpandedMaps,
@@ -20467,7 +20556,7 @@ var Methods = {
       });
       if (matchObj) {
         matchObj.items.forEach(function (item) {
-          var rowid = getRowid(_this47, item);
+          var rowid = getRowid(_this49, item);
           if (treeTempExpandedMaps[rowid]) {
             delete treeTempExpandedMaps[rowid];
           }
@@ -20476,13 +20565,13 @@ var Methods = {
     }
     if (expanded) {
       validRows.forEach(function (row) {
-        var rowid = getRowid(_this47, row);
+        var rowid = getRowid(_this49, row);
         if (!treeTempExpandedMaps[rowid]) {
           var rest = fullAllDataRowMap.get(row);
           var isLoad = lazy && row[hasChildField] && !rest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
           // 是否使用懒加载
           if (isLoad) {
-            result.push(_this47.handleAsyncTreeExpandChilds(row));
+            result.push(_this49.handleAsyncTreeExpandChilds(row));
           } else {
             if (row[childrenField] && row[childrenField].length) {
               treeTempExpandedMaps[rowid] = row;
@@ -20492,7 +20581,7 @@ var Methods = {
       });
     } else {
       validRows.forEach(function (item) {
-        var rowid = getRowid(_this47, item);
+        var rowid = getRowid(_this49, item);
         if (treeTempExpandedMaps[rowid]) {
           delete treeTempExpandedMaps[rowid];
         }
@@ -20500,7 +20589,7 @@ var Methods = {
     }
     if (reserve) {
       validRows.forEach(function (row) {
-        return _this47.handleTreeExpandReserve(row, expanded);
+        return _this49.handleTreeExpandReserve(row, expanded);
       });
     }
     this.treeExpandedMaps = treeTempExpandedMaps;
@@ -20513,12 +20602,12 @@ var Methods = {
    * @returns
    */
   handleVirtualTreeExpand: function handleVirtualTreeExpand(rows, expanded) {
-    var _this48 = this;
+    var _this50 = this;
     return this.handleBaseTreeExpand(rows, expanded).then(function () {
-      _this48.handleVirtualTreeToList();
-      return _this48.handleTableData();
+      _this50.handleVirtualTreeToList();
+      return _this50.handleTableData();
     }).then(function () {
-      return _this48.recalculate();
+      return _this50.recalculate();
     });
   },
   /**
@@ -20558,7 +20647,7 @@ var Methods = {
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand: function clearTreeExpand() {
-    var _this49 = this;
+    var _this51 = this;
     var treeOpts = this.treeOpts,
       tableFullData = this.tableFullData;
     var transform = treeOpts.transform,
@@ -20568,19 +20657,19 @@ var Methods = {
     this.treeExpandedMaps = {};
     if (reserve) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullData, function (row) {
-        return _this49.handleTreeExpandReserve(row, false);
+        return _this51.handleTreeExpandReserve(row, false);
       }, {
         children: childrenField
       });
     }
     return this.handleTableData().then(function () {
       if (transform) {
-        _this49.handleVirtualTreeToList();
-        return _this49.handleTableData();
+        _this51.handleVirtualTreeToList();
+        return _this51.handleTableData();
       }
     }).then(function () {
       if (expList.length) {
-        _this49.recalculate();
+        _this51.recalculate();
       }
     });
   },
@@ -20699,28 +20788,28 @@ var Methods = {
   },
   // 计算可视渲染相关数据
   computeScrollLoad: function computeScrollLoad() {
-    var _this50 = this;
+    var _this52 = this;
     return this.$nextTick().then(function () {
-      var sYOpts = _this50.sYOpts,
-        sXOpts = _this50.sXOpts,
-        scrollXLoad = _this50.scrollXLoad,
-        scrollYLoad = _this50.scrollYLoad,
-        scrollXStore = _this50.scrollXStore,
-        scrollYStore = _this50.scrollYStore;
+      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(_this50),
+        var _computeVirtualX3 = computeVirtualX(_this52),
           visibleXSize = _computeVirtualX3.visibleSize;
         var offsetXSize = sXOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(sXOpts.oSize) : browse.msie ? 10 : browse.edge ? 5 : 0;
         scrollXStore.offsetSize = offsetXSize;
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
-        _this50.updateScrollXData();
+        _this52.updateScrollXData();
       } else {
-        _this50.updateScrollXSpace();
+        _this52.updateScrollXSpace();
       }
       // 计算 Y 逻辑
-      var _computeVirtualY = computeVirtualY(_this50),
+      var _computeVirtualY = computeVirtualY(_this52),
         rowHeight = _computeVirtualY.rowHeight,
         visibleYSize = _computeVirtualY.visibleSize;
       scrollYStore.rowHeight = rowHeight;
@@ -20729,12 +20818,12 @@ var Methods = {
         scrollYStore.offsetSize = offsetYSize;
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
-        _this50.updateScrollYData();
+        _this52.updateScrollYData();
       } else {
-        _this50.updateScrollYSpace();
+        _this52.updateScrollYSpace();
       }
-      _this50.rowHeight = rowHeight;
-      _this50.$nextTick(_this50.updateStyle);
+      _this52.rowHeight = rowHeight;
+      _this52.$nextTick(_this52.updateStyle);
     });
   },
   handleTableColumn: function handleTableColumn() {
@@ -20744,11 +20833,11 @@ var Methods = {
     this.tableColumn = scrollXLoad ? visibleColumn.slice(scrollXStore.startIndex, scrollXStore.endIndex) : visibleColumn.slice(0);
   },
   updateScrollXData: function updateScrollXData() {
-    var _this51 = this;
+    var _this53 = this;
     // this.tableColumn = []
     this.$nextTick(function () {
-      _this51.handleTableColumn();
-      _this51.updateScrollXSpace();
+      _this53.handleTableColumn();
+      _this53.updateScrollXSpace();
     });
   },
   // 更新横向 X 可视渲染上下剩余空间大小
@@ -20799,11 +20888,11 @@ var Methods = {
     }
   },
   updateScrollYData: function updateScrollYData() {
-    var _this52 = this;
+    var _this54 = this;
     // this.tableData = []
     this.$nextTick(function () {
-      _this52.handleTableData();
-      _this52.updateScrollYSpace();
+      _this54.handleTableData();
+      _this54.updateScrollYSpace();
     });
   },
   // 更新纵向 Y 可视渲染上下剩余空间大小
@@ -20844,7 +20933,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this53 = this;
+    var _this55 = this;
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
       rightBody = $refs.rightBody,
@@ -20861,7 +20950,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this53.$nextTick());
+          return resolve(_this55.$nextTick());
         }, 50);
       });
     }
@@ -20903,7 +20992,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this54 = this;
+    var _this56 = this;
     var tableFullData = this.tableFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts;
@@ -20918,14 +21007,14 @@ var Methods = {
       if (matchObj) {
         var nodes = matchObj.nodes;
         nodes.forEach(function (row, index) {
-          if (index < nodes.length - 1 && !_this54.isTreeExpandByRow(row)) {
-            rests.push(_this54.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(_this54, row);
+      return rowToVisible(_this56, row);
     });
   },
   /**
@@ -20975,41 +21064,44 @@ var Methods = {
     return this.$nextTick();
   },
   /**
-   * 更新列状态
+   * 更新列状态 updateStatus({ row, column }, cellValue)
    * 如果组件值 v-model 发生 change 时，调用改函数用于更新某一列编辑状态
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(slotParams, cellValue) {
-    var _this55 = this;
+    var _this57 = this;
     var customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(cellValue);
     return this.$nextTick().then(function () {
-      var $refs = _this55.$refs,
-        editRules = _this55.editRules,
-        validStore = _this55.validStore;
-      if (slotParams && $refs.tableBody && editRules) {
+      var $refs = _this57.$refs,
+        editRules = _this57.editRules,
+        validStore = _this57.validStore;
+      var tableBody = $refs.tableBody;
+      if (slotParams && tableBody && editRules) {
         var row = slotParams.row,
           column = slotParams.column;
         var type = 'change';
-        if (_this55.hasCellRules(type, row, column)) {
-          var cell = _this55.getCell(row, column);
-          if (cell) {
-            return _this55.validCellRules(type, row, column, cellValue).then(function () {
-              if (customVal && validStore.visible) {
-                setCellValue(row, column, cellValue);
-              }
-              _this55.clearValidate();
-            }).catch(function (_ref8) {
-              var rule = _ref8.rule;
-              if (customVal) {
-                setCellValue(row, column, cellValue);
-              }
-              _this55.showValidTooltip({
-                rule: rule,
-                row: row,
-                column: column,
-                cell: cell
+        if (_this57.hasCellRules) {
+          if (_this57.hasCellRules(type, row, column)) {
+            var cell = _this57.getCell(row, column);
+            if (cell) {
+              return _this57.validCellRules(type, row, column, cellValue).then(function () {
+                if (customVal && validStore.visible) {
+                  setCellValue(row, column, cellValue);
+                }
+                _this57.clearValidate(row, column);
+              }).catch(function (_ref8) {
+                var rule = _ref8.rule;
+                if (customVal) {
+                  setCellValue(row, column, cellValue);
+                }
+                _this57.showValidTooltip({
+                  rule: rule,
+                  row: row,
+                  column: column,
+                  cell: cell
+                });
               });
-            });
+            }
           }
         }
       }
@@ -21023,13 +21115,13 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this56 = this;
+    var _this58 = this;
     if (this.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this56.updateCellAreas();
+      return _this58.updateCellAreas();
     });
   },
   /**
@@ -21037,13 +21129,13 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this57 = this;
+    var _this59 = this;
     if (this.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this57.updateCellAreas();
+      _this59.updateCellAreas();
       return rest;
     });
   },
@@ -21064,23 +21156,23 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this58 = this;
+    var _this60 = this;
     if (this.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this58.updateCellAreas();
+      return _this60.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this59 = this;
+    var _this61 = this;
     if (this.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this59.updateCellAreas();
+      _this61.updateCellAreas();
       return rest;
     });
   },
@@ -21197,9 +21289,9 @@ var Methods = {
     return cellLabel;
   },
   findRowIndexOf: function findRowIndexOf(list, row) {
-    var _this60 = this;
+    var _this62 = this;
     return row ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(list, function (item) {
-      return _this60.eqRow(item, row);
+      return _this62.eqRow(item, row);
     }) : -1;
   },
   eqRow: function eqRow(row1, row2) {
@@ -21764,6 +21856,10 @@ function handleUupdateResize(_vm) {
       upDataFlag: 0,
       // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
       reColumnFlag: 0,
+      // 已标记的对象集
+      pendingRowMaps: {},
+      // 已标记的行
+      pendingRowList: [],
       // 当前选中的筛选列
       filterStore: {
         isAllSelected: false,
@@ -21834,13 +21930,9 @@ function handleUupdateResize(_vm) {
       },
       // 存放数据校验相关信息
       validStore: {
-        visible: false,
-        row: null,
-        column: null,
-        content: '',
-        rule: null,
-        isArrow: false
+        visible: false
       },
+      validErrorMaps: {},
       // 导入相关信息
       importStore: {
         inited: false,
@@ -22375,7 +22467,7 @@ function handleUupdateResize(_vm) {
     var leftList = columnStore.leftList,
       rightList = columnStore.rightList;
     return h('div', {
-      class: ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), (_ref = {}, _defineProperty(_ref, "vaild-msg--".concat(validOpts.msgMode), !!editRules), _defineProperty(_ref, 'vxe-editable', !!editConfig), _defineProperty(_ref, 'cell--highlight', highlightCell), _defineProperty(_ref, 'cell--selected', mouseConfig && mouseOpts.selected), _defineProperty(_ref, 'cell--area', mouseConfig && mouseOpts.area), _defineProperty(_ref, 'row--highlight', rowOpts.isHover || highlightHoverRow), _defineProperty(_ref, 'column--highlight', columnOpts.isHover || highlightHoverColumn), _defineProperty(_ref, 'is--header', showHeader), _defineProperty(_ref, 'is--footer', showFooter), _defineProperty(_ref, 'is--group', isGroup), _defineProperty(_ref, 'is--tree-line', treeConfig && (treeOpts.showLine || treeOpts.line)), _defineProperty(_ref, 'is--fixed-left', leftList.length), _defineProperty(_ref, 'is--fixed-right', rightList.length), _defineProperty(_ref, 'is--animat', !!this.animat), _defineProperty(_ref, 'is--round', this.round), _defineProperty(_ref, 'is--stripe', !treeConfig && stripe), _defineProperty(_ref, 'is--loading', loading), _defineProperty(_ref, 'is--empty', !loading && !tableData.length), _defineProperty(_ref, 'is--scroll-y', overflowY), _defineProperty(_ref, 'is--scroll-x', overflowX), _defineProperty(_ref, 'is--virtual-x', scrollXLoad), _defineProperty(_ref, 'is--virtual-y', scrollYLoad), _ref)],
+      class: ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), (_ref = {}, _defineProperty(_ref, "vaild-msg--".concat(validOpts.msgMode), !!editRules), _defineProperty(_ref, 'vxe-editable', !!editConfig), _defineProperty(_ref, 'old-cell-valid', editRules && conf.cellVaildMode === 'obsolete'), _defineProperty(_ref, 'cell--highlight', highlightCell), _defineProperty(_ref, 'cell--selected', mouseConfig && mouseOpts.selected), _defineProperty(_ref, 'cell--area', mouseConfig && mouseOpts.area), _defineProperty(_ref, 'row--highlight', rowOpts.isHover || highlightHoverRow), _defineProperty(_ref, 'column--highlight', columnOpts.isHover || highlightHoverColumn), _defineProperty(_ref, 'is--header', showHeader), _defineProperty(_ref, 'is--footer', showFooter), _defineProperty(_ref, 'is--group', isGroup), _defineProperty(_ref, 'is--tree-line', treeConfig && (treeOpts.showLine || treeOpts.line)), _defineProperty(_ref, 'is--fixed-left', leftList.length), _defineProperty(_ref, 'is--fixed-right', rightList.length), _defineProperty(_ref, 'is--animat', !!this.animat), _defineProperty(_ref, 'is--round', this.round), _defineProperty(_ref, 'is--stripe', !treeConfig && stripe), _defineProperty(_ref, 'is--loading', loading), _defineProperty(_ref, 'is--empty', !loading && !tableData.length), _defineProperty(_ref, 'is--scroll-y', overflowY), _defineProperty(_ref, 'is--scroll-x', overflowX), _defineProperty(_ref, 'is--virtual-x', scrollXLoad), _defineProperty(_ref, 'is--virtual-y', scrollYLoad), _ref)],
       on: {
         keydown: this.keydownEvent
       }
@@ -22530,7 +22622,9 @@ function handleUupdateResize(_vm) {
      */
     hasTip && this.editRules && validOpts.showMessage && (validOpts.message === 'default' ? !height : validOpts.message === 'tooltip') ? h('vxe-tooltip', {
       ref: 'validTip',
-      class: 'vxe-table--valid-error',
+      class: [{
+        'old-cell-valid': editRules && conf.cellVaildMode === 'obsolete'
+      }, 'vxe-table--valid-error'],
       props: validOpts.message === 'tooltip' || tableData.length === 1 ? validTipOpts : null
     }) : _e()]);
   },
@@ -23574,6 +23668,7 @@ var es_array_unshift = __webpack_require__(541);
 
 
 
+
 
 
 function insertTreeRow(_vm, newRecords, isAppend) {
@@ -24020,7 +24115,8 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       return {
         insertRecords: this.getInsertRecords(),
         removeRecords: this.getRemoveRecords(),
-        updateRecords: this.getUpdateRecords()
+        updateRecords: this.getUpdateRecords(),
+        pendingRecords: this.getUpdateRecords()
       };
     },
     /**
@@ -24092,7 +24188,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       var editRender = column.editRender;
       var cell = params.cell = params.cell || this.getCell(row, column);
       var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
-      if (isEnableConf(editConfig) && isEnableConf(editRender) && cell) {
+      if (isEnableConf(editConfig) && isEnableConf(editRender) && !this.hasPendingByRow(row) && cell) {
         if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
           // 判断是否禁用编辑
           var type = 'edit-disabled';
@@ -24108,7 +24204,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
             if (actived.column) {
               this.clearActived(evnt);
             }
-            type = 'edit-actived';
+            type = 'edit-activated';
             column.renderHeight = cell.offsetHeight;
             actived.args = params;
             actived.row = row;
@@ -24132,6 +24228,18 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
             columnIndex: this.getColumnIndex(column),
             $columnIndex: this.getVMColumnIndex(column)
           }, evnt);
+
+          // v4已废弃
+          if (type === 'edit-activated') {
+            this.emitEvent('edit-actived', {
+              row: row,
+              rowIndex: this.getRowIndex(row),
+              $rowIndex: this.getVMRowIndex(row),
+              column: column,
+              columnIndex: this.getColumnIndex(column),
+              $columnIndex: this.getVMColumnIndex(column)
+            }, evnt);
+          }
         } else {
           var oldColumn = actived.column;
           if (mouseConfig) {
@@ -24222,7 +24330,12 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
           $columnIndex: this.getVMColumnIndex(column)
         }, evnt);
       }
-      return v_x_e_table._valid ? this.clearValidate() : this.$nextTick();
+      if (conf.cellVaildMode === 'obsolete') {
+        if (this.clearValidate) {
+          return this.clearValidate();
+        }
+      }
+      return this.$nextTick();
     },
     _getActiveRecord: function _getActiveRecord() {
       // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
@@ -24238,7 +24351,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       var actived = editStore.actived;
       var args = actived.args,
         row = actived.row;
-      if (args && this.findRowIndexOf(afterFullData, row) > -1 && $el.querySelectorAll('.vxe-body--column.col--actived').length) {
+      if (args && this.findRowIndexOf(afterFullData, row) > -1 && $el.querySelectorAll('.vxe-body--column.col--active').length) {
         return Object.assign({}, args);
       }
       return null;
@@ -28396,7 +28509,8 @@ function checkOptionDisabled(_vm, isSelected, option, group) {
   return false;
 }
 function renderOption(h, _vm, list, group) {
-  var isGroup = _vm.isGroup,
+  var $scopedSlots = _vm.$scopedSlots,
+    isGroup = _vm.isGroup,
     labelField = _vm.labelField,
     valueField = _vm.valueField,
     optionKey = _vm.optionKey,
@@ -28405,6 +28519,7 @@ function renderOption(h, _vm, list, group) {
     currentValue = _vm.currentValue,
     optionOpts = _vm.optionOpts;
   var useKey = optionOpts.useKey;
+  var optionSlot = $scopedSlots.option;
   return list.map(function (option, cIndex) {
     var slots = option.slots;
     var optionValue = option[valueField];
@@ -28413,6 +28528,11 @@ function renderOption(h, _vm, list, group) {
     var isDisabled = checkOptionDisabled(_vm, isSelected, option, group);
     var optid = getOptid(_vm, option);
     var defaultSlot = slots ? slots.default : null;
+    var optParams = {
+      option: option,
+      group: null,
+      $select: _vm
+    };
     return isVisible ? h('div', {
       key: useKey || optionKey ? optid : cIndex,
       class: ['vxe-select-option', option.className, {
@@ -28436,24 +28556,28 @@ function renderOption(h, _vm, list, group) {
           }
         }
       }
-    }, defaultSlot ? _vm.callSlot(defaultSlot, {
-      option: option,
-      $select: _vm
-    }, h) : utils.formatText(getFuncText(option[labelField]))) : null;
+    }, optionSlot ? _vm.callSlot(optionSlot, optParams, h) : defaultSlot ? _vm.callSlot(defaultSlot, optParams, h) : utils.formatText(getFuncText(option[labelField]))) : null;
   });
 }
 function renderOptgroup(h, _vm) {
-  var optionKey = _vm.optionKey,
+  var $scopedSlots = _vm.$scopedSlots,
+    optionKey = _vm.optionKey,
     visibleGroupList = _vm.visibleGroupList,
     groupLabelField = _vm.groupLabelField,
     groupOptionsField = _vm.groupOptionsField,
     optionOpts = _vm.optionOpts;
   var useKey = optionOpts.useKey;
+  var optionSlot = $scopedSlots.option;
   return visibleGroupList.map(function (group, gIndex) {
     var slots = group.slots;
     var optid = getOptid(_vm, group);
     var isGroupDisabled = group.disabled;
     var defaultSlot = slots ? slots.default : null;
+    var optParams = {
+      option: group,
+      group: group,
+      $select: _vm
+    };
     return h('div', {
       key: useKey || optionKey ? optid : gIndex,
       class: ['vxe-optgroup', group.className, {
@@ -28464,10 +28588,7 @@ function renderOptgroup(h, _vm) {
       }
     }, [h('div', {
       class: 'vxe-optgroup--title'
-    }, defaultSlot ? _vm.callSlot(defaultSlot, {
-      option: group,
-      $select: _vm
-    }, h) : getFuncText(group[groupLabelField])), h('div', {
+    }, optionSlot ? _vm.callSlot(optionSlot, optParams, h) : defaultSlot ? _vm.callSlot(defaultSlot, optParams, h) : getFuncText(group[groupLabelField])), h('div', {
       class: 'vxe-optgroup--wrapper'
     }, renderOption(h, _vm, group[groupOptionsField], group))]);
   });
@@ -28711,7 +28832,9 @@ function renderOpts(h, _vm) {
     GlobalEvent.off(this, 'blur');
   },
   render: function render(h) {
-    var _ref, _ref2;
+    var _ref,
+      _this2 = this,
+      _ref2;
     var _e = this._e,
       $scopedSlots = this.$scopedSlots,
       vSize = this.vSize,
@@ -28723,7 +28846,10 @@ function renderOpts(h, _vm) {
       disabled = this.disabled,
       visiblePanel = this.visiblePanel,
       filterable = this.filterable;
+    var defaultSlot = $scopedSlots.default;
     var prefixSlot = $scopedSlots.prefix;
+    var headerSlot = $scopedSlots.header;
+    var footerSlot = $scopedSlots.footer;
     return h('div', {
       class: ['vxe-select', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
         $select: this
@@ -28731,7 +28857,7 @@ function renderOpts(h, _vm) {
     }, [h('div', {
       class: 'vxe-select-slots',
       ref: 'hideOption'
-    }, this.$slots.default), h('vxe-input', {
+    }, defaultSlot ? defaultSlot.call(this, {}) : []), h('vxe-input', {
       ref: 'input',
       props: {
         clearable: this.clearable,
@@ -28752,7 +28878,7 @@ function renderOpts(h, _vm) {
       },
       scopedSlots: prefixSlot ? {
         prefix: function prefix() {
-          return prefixSlot({});
+          return prefixSlot.call(_this2, {});
         }
       } : {}
     }), h('div', {
@@ -28765,10 +28891,10 @@ function renderOpts(h, _vm) {
       },
       style: this.panelStyle
     }, inited ? [filterable ? h('div', {
-      class: 'vxe-select-filter--wrapper'
+      class: 'vxe-select--panel-search'
     }, [h('vxe-input', {
       ref: 'inpSearch',
-      class: 'vxe-select-filter--input',
+      class: 'vxe-select-search--input',
       props: {
         value: this.searchValue,
         type: 'text',
@@ -28784,9 +28910,17 @@ function renderOpts(h, _vm) {
         search: this.triggerSearchEvent
       }
     })]) : _e(), h('div', {
+      class: 'vxe-select--panel-wrapper'
+    }, [headerSlot ? h('div', {
+      class: 'vxe-select--panel-header'
+    }, headerSlot.call(this, {})) : _e(), h('div', {
+      class: 'vxe-select--panel-body'
+    }, [h('div', {
       ref: 'optWrapper',
       class: 'vxe-select-option--wrapper'
-    }, renderOpts(h, this))] : null)]);
+    }, renderOpts(h, this))]), footerSlot ? h('div', {
+      class: 'vxe-select--panel-footer'
+    }, footerSlot.call(this, {})) : _e()])] : [])]);
   },
   methods: {
     callSlot: function callSlot(slotFunc, params, h) {
@@ -28802,13 +28936,13 @@ function renderOpts(h, _vm) {
       return [];
     },
     cacheItemMap: function cacheItemMap() {
-      var _this2 = this;
+      var _this3 = this;
       var fullOptionList = this.fullOptionList,
         fullGroupList = this.fullGroupList,
         groupOptionsField = this.groupOptionsField;
       var optkey = getOptkey(this);
       var handleOptis = function handleOptis(item) {
-        if (!getOptid(_this2, item)) {
+        if (!getOptid(_this3, item)) {
           item[optkey] = getOptUniqueId();
         }
       };
@@ -28878,12 +29012,12 @@ function renderOpts(h, _vm) {
       }
     },
     scrollToOption: function scrollToOption(option, isAlignBottom) {
-      var _this3 = this;
+      var _this4 = this;
       return this.$nextTick().then(function () {
         if (option) {
-          var $refs = _this3.$refs;
+          var $refs = _this4.$refs;
           var optWrapperElem = $refs.optWrapper;
-          var optElem = $refs.panel.querySelector("[optid='".concat(getOptid(_this3, option), "']"));
+          var optElem = $refs.panel.querySelector("[optid='".concat(getOptid(_this4, option), "']"));
           if (optWrapperElem && optElem) {
             var wrapperHeight = optWrapperElem.offsetHeight;
             var offsetPadding = 5;
@@ -29053,11 +29187,11 @@ function renderOpts(h, _vm) {
       }
     },
     handleFocusSearch: function handleFocusSearch() {
-      var _this4 = this;
+      var _this5 = this;
       if (this.filterable) {
         this.$nextTick(function () {
-          if (_this4.$refs.inpSearch) {
-            _this4.$refs.inpSearch.focus();
+          if (_this5.$refs.inpSearch) {
+            _this5.$refs.inpSearch.focus();
           }
         });
       }
@@ -29091,7 +29225,7 @@ function renderOpts(h, _vm) {
       }
     },
     triggerSearchEvent: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().debounce(function () {
-      var _this5 = this;
+      var _this6 = this;
       var remote = this.remote,
         remoteMethod = this.remoteMethod,
         searchValue = this.searchValue;
@@ -29100,12 +29234,12 @@ function renderOpts(h, _vm) {
         Promise.resolve(remoteMethod({
           searchValue: searchValue
         })).then(function () {
-          return _this5.$nextTick();
+          return _this6.$nextTick();
         }).catch(function () {
-          return _this5.$nextTick();
+          return _this6.$nextTick();
         }).finally(function () {
-          _this5.searchLoading = false;
-          _this5.refreshOption();
+          _this6.searchLoading = false;
+          _this6.refreshOption();
         });
       } else {
         this.refreshOption();
@@ -29146,7 +29280,7 @@ function renderOpts(h, _vm) {
       }
     },
     showOptionPanel: function showOptionPanel() {
-      var _this6 = this;
+      var _this7 = this;
       var loading = this.loading,
         disabled = this.disabled,
         filterable = this.filterable;
@@ -29165,37 +29299,37 @@ function renderOpts(h, _vm) {
           this.refreshOption();
         }
         setTimeout(function () {
-          var value = _this6.value,
-            multiple = _this6.multiple;
-          var currOption = findOption(_this6, multiple && value ? value[0] : value);
-          _this6.visiblePanel = true;
+          var value = _this7.value,
+            multiple = _this7.multiple;
+          var currOption = findOption(_this7, multiple && value ? value[0] : value);
+          _this7.visiblePanel = true;
           if (currOption) {
-            _this6.setCurrentOption(currOption);
-            _this6.scrollToOption(currOption);
+            _this7.setCurrentOption(currOption);
+            _this7.scrollToOption(currOption);
           }
-          _this6.handleFocusSearch();
+          _this7.handleFocusSearch();
         }, 10);
         this.updateZindex();
         this.updatePlacement();
       }
     },
     hideOptionPanel: function hideOptionPanel() {
-      var _this7 = this;
+      var _this8 = this;
       this.searchValue = '';
       this.searchLoading = false;
       this.visiblePanel = false;
       this.hidePanelTimeout = setTimeout(function () {
-        _this7.animatVisible = false;
-        _this7.searchValue = '';
+        _this8.animatVisible = false;
+        _this8.searchValue = '';
       }, 350);
     },
     updatePlacement: function updatePlacement() {
-      var _this8 = this;
+      var _this9 = this;
       return this.$nextTick().then(function () {
-        var $refs = _this8.$refs,
-          transfer = _this8.transfer,
-          placement = _this8.placement,
-          panelIndex = _this8.panelIndex;
+        var $refs = _this9.$refs,
+          transfer = _this9.transfer,
+          placement = _this9.placement,
+          panelIndex = _this9.panelIndex;
         var targetElem = $refs.input.$el;
         var panelElem = $refs.panel;
         if (panelElem && targetElem) {
@@ -29259,9 +29393,9 @@ function renderOpts(h, _vm) {
               }
             }
           }
-          _this8.panelStyle = panelStyle;
-          _this8.panelPlacement = panelPlacement;
-          return _this8.$nextTick();
+          _this9.panelStyle = panelStyle;
+          _this9.panelPlacement = panelPlacement;
+          return _this9.$nextTick();
         }
       });
     },
@@ -32260,6 +32394,9 @@ var Keyboard = {
 
 
 
+
+
+
 
 
 
@@ -32346,8 +32483,9 @@ function validErrorRuleValue(rule, val) {
      */
     handleValidError: function handleValidError(params) {
       var _this = this;
+      var validOpts = this.validOpts;
       return new Promise(function (resolve) {
-        if (_this.validOpts.autoPos === false) {
+        if (validOpts.autoPos === false) {
           _this.emitEvent('valid-error', params);
           resolve();
         } else {
@@ -32362,6 +32500,19 @@ function validErrorRuleValue(rule, val) {
         }
       });
     },
+    handleErrMsgMode: function handleErrMsgMode(validErrMaps) {
+      var validOpts = this.validOpts;
+      if (validOpts.msgMode === 'single') {
+        var keys = Object.keys(validErrMaps);
+        var resMaps = validErrMaps;
+        if (keys.length) {
+          var firstKey = keys[0];
+          resMaps[firstKey] = validErrMaps[firstKey];
+        }
+        return resMaps;
+      }
+      return validErrMaps;
+    },
     /**
      * 对表格数据进行校验
      * 如果不指定数据，则默认只校验临时变动的数据，例如新增或修改
@@ -32376,6 +32527,7 @@ function validErrorRuleValue(rule, val) {
       var validRest = {};
       var editRules = this.editRules,
         afterFullData = this.afterFullData,
+        visibleColumn = this.visibleColumn,
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts;
       var childrenField = treeOpts.children || treeOpts.childrenField;
@@ -32396,6 +32548,7 @@ function validErrorRuleValue(rule, val) {
       this.lastCallTime = Date.now();
       this.validRuleErr = false; // 如果为快速校验，当存在某列校验不通过时将终止执行
       this.clearValidate();
+      var validErrMaps = {};
       if (editRules) {
         var columns = this.getColumns();
         var handleVaild = function handleVaild(row) {
@@ -32419,6 +32572,12 @@ function validErrorRuleValue(rule, val) {
                   if (!validRest[column.property]) {
                     validRest[column.property] = [];
                   }
+                  validErrMaps["".concat(getRowid(_this2, row), ":").concat(column.id)] = {
+                    column: column,
+                    row: row,
+                    rule: rule,
+                    content: rule.content
+                  };
                   validRest[column.property].push(rest);
                   if (!isFull) {
                     _this2.validRuleErr = true;
@@ -32439,6 +32598,7 @@ function validErrorRuleValue(rule, val) {
         }
         return Promise.all(rowValids).then(function () {
           var ruleProps = Object.keys(validRest);
+          _this2.validErrorMaps = _this2.handleErrMsgMode(validErrMaps);
           return _this2.$nextTick().then(function () {
             if (ruleProps.length) {
               return Promise.reject(validRest[ruleProps[0]][0]);
@@ -32474,20 +32634,21 @@ function validErrorRuleValue(rule, val) {
              * 将表格滚动到可视区
              * 由于提示信息至少需要占一行，定位向上偏移一行
              */
-            var row = firstErrParams.row;
-            var rowIndex = afterFullData.indexOf(row);
-            var locatRow = rowIndex > 0 ? afterFullData[rowIndex - 1] : row;
             if (_this2.validOpts.autoPos === false) {
               finish();
             } else {
-              if (treeConfig) {
-                _this2.scrollToTreeRow(locatRow).then(posAndFinish);
-              } else {
-                _this2.scrollToRow(locatRow).then(posAndFinish);
-              }
+              var row = firstErrParams.row;
+              var column = firstErrParams.column;
+              var rowIndex = afterFullData.indexOf(row);
+              var columnIndex = visibleColumn.indexOf(column);
+              var locatRow = rowIndex > 0 ? afterFullData[rowIndex - 1] : row;
+              var locatColumn = columnIndex > 0 ? visibleColumn[rowIndex - 1] : column;
+              _this2.scrollToRow(locatRow, locatColumn).then(posAndFinish);
             }
           });
         });
+      } else {
+        this.validErrorMaps = {};
       }
       return this.$nextTick().then(function () {
         if (cb) {
@@ -32615,41 +32776,82 @@ function validErrorRuleValue(rule, val) {
         }
       });
     },
-    _clearValidate: function _clearValidate() {
+    _clearValidate: function _clearValidate(rows, fieldOrColumn) {
+      var _this4 = this;
+      var validOpts = this.validOpts,
+        validErrorMaps = this.validErrorMaps;
       var validTip = this.$refs.validTip;
-      Object.assign(this.validStore, {
-        visible: false,
-        row: null,
-        column: null,
-        content: '',
-        rule: null
+      var rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows) ? rows : rows ? [rows] : [];
+      var colList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : []).map(function (column) {
+        return handleFieldOrColumn(_this4, column);
       });
-      if (validTip && validTip.visible) {
+      var validErrMaps = {};
+      if (validTip && validTip.reactData.visible) {
         validTip.close();
       }
+      // 如果是单个提示模式
+      if (validOpts.msgMode === 'single') {
+        this.validErrorMaps = {};
+        return this.$nextTick();
+      }
+      if (rowList.length && colList.length) {
+        validErrMaps = Object.assign({}, validErrorMaps);
+        rowList.forEach(function (row) {
+          colList.forEach(function (column) {
+            var vaildKey = "".concat(getRowid(_this4, row), ":").concat(column.id);
+            if (validErrMaps[vaildKey]) {
+              delete validErrMaps[vaildKey];
+            }
+          });
+        });
+      } else if (rowList.length) {
+        var rowidList = rowList.map(function (row) {
+          return "".concat(getRowid(_this4, row));
+        });
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(validErrorMaps, function (item, key) {
+          if (rowidList.indexOf(key.split(':')[0]) > -1) {
+            validErrMaps[key] = item;
+          }
+        });
+      } else if (colList.length) {
+        var colidList = colList.map(function (column) {
+          return "".concat(column.id);
+        });
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(validErrorMaps, function (item, key) {
+          if (colidList.indexOf(key.split(':')[1]) > -1) {
+            validErrMaps[key] = item;
+          }
+        });
+      }
+      this.validErrorMaps = validErrMaps;
       return this.$nextTick();
     },
     /**
      * 触发校验
      */
     triggerValidate: function triggerValidate(type) {
-      var _this4 = this;
+      var _this5 = this;
       var editConfig = this.editConfig,
         editStore = this.editStore,
         editRules = this.editRules,
-        validStore = this.validStore;
+        editOpts = this.editOpts,
+        validOpts = this.validOpts;
       var actived = editStore.actived;
-      if (actived.row && editRules) {
+      // 检查清除校验消息
+      if (editRules && validOpts.msgMode === 'single') {
+        this.validErrorMaps = {};
+      }
+
+      // 校验单元格
+      if (editConfig && editRules && actived.row) {
         var _actived$args = actived.args,
           row = _actived$args.row,
           column = _actived$args.column,
           cell = _actived$args.cell;
         if (this.hasCellRules(type, row, column)) {
           return this.validCellRules(type, row, column).then(function () {
-            if (editConfig.mode === 'row') {
-              if (validStore.visible && validStore.row === row && validStore.column === column) {
-                _this4.clearValidate();
-              }
+            if (editOpts.mode === 'row') {
+              _this5.clearValidate(row, column);
             }
           }).catch(function (_ref2) {
             var rule = _ref2.rule;
@@ -32661,7 +32863,7 @@ function validErrorRuleValue(rule, val) {
                 column: column,
                 cell: cell
               };
-              _this4.showValidTooltip(rest);
+              _this5.showValidTooltip(rest);
               return Promise.reject(rest);
             }
             return Promise.resolve();
@@ -32674,9 +32876,10 @@ function validErrorRuleValue(rule, val) {
      * 弹出校验错误提示
      */
     showValidTooltip: function showValidTooltip(params) {
-      var _this5 = this;
       var $refs = this.$refs,
         height = this.height,
+        validStore = this.validStore,
+        validErrorMaps = this.validErrorMaps,
         tableData = this.tableData,
         validOpts = this.validOpts;
       var rule = params.rule,
@@ -32685,19 +32888,29 @@ function validErrorRuleValue(rule, val) {
         cell = params.cell;
       var validTip = $refs.validTip;
       var content = rule.content;
-      return this.$nextTick(function () {
-        Object.assign(_this5.validStore, {
-          row: row,
+      validStore.visible = true;
+      if (validOpts.msgMode === 'single') {
+        this.validErrorMaps = _defineProperty({}, "".concat(getRowid(this, row), ":").concat(column.id), {
           column: column,
+          row: row,
           rule: rule,
-          content: content,
-          visible: true
+          content: content
         });
-        _this5.emitEvent('valid-error', params);
+      } else {
+        this.validErrorMaps = Object.assign({}, validErrorMaps, _defineProperty({}, "".concat(getRowid(this, row), ":").concat(column.id), {
+          column: column,
+          row: row,
+          rule: rule,
+          content: content
+        }));
+      }
+      this.emitEvent('valid-error', params, null);
+      if (validTip) {
         if (validTip && (validOpts.message === 'tooltip' || validOpts.message === 'default' && !height && tableData.length < 2)) {
           return validTip.open(cell, content);
         }
-      });
+      }
+      return this.$nextTick();
     }
   }
 });
@@ -33443,7 +33656,6 @@ Object.keys(packages_table.methods).forEach(function (name) {
       tableLoading: false,
       isZMax: false,
       tableData: [],
-      pendingRecords: [],
       filterData: [],
       formData: {},
       sortData: [],
@@ -33510,7 +33722,6 @@ Object.keys(packages_table.methods).forEach(function (name) {
       if (proxyConfig) {
         tableProps.loading = loading || tableLoading;
         tableProps.data = tableData;
-        tableProps.rowClassName = this.handleRowClassName;
         if (proxyOpts.seq && isEnableConf(pagerConfig)) {
           tableProps.seqConfig = Object.assign({}, seqConfig, {
             startIndex: (tablePage.currentPage - 1) * tablePage.pageSize
@@ -33518,9 +33729,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
         }
       }
       if (editConfig) {
-        tableProps.editConfig = Object.assign({}, editConfig, {
-          beforeEditMethod: this.handleBeforeEditMethod
-        });
+        tableProps.editConfig = Object.assign({}, editConfig);
       }
       return tableProps;
     }
@@ -33682,27 +33891,6 @@ Object.keys(packages_table.methods).forEach(function (name) {
       var parentPaddingSize = isZMax || height !== 'auto' ? 0 : getPaddingTopBottomSize($el.parentNode);
       return parentPaddingSize + getPaddingTopBottomSize($el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
     },
-    handleRowClassName: function handleRowClassName(params) {
-      var rowClassName = this.rowClassName;
-      var clss = [];
-      if (this.pendingRecords.some(function (item) {
-        return item === params.row;
-      })) {
-        clss.push('row--pending');
-      }
-      clss.push(rowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowClassName) ? rowClassName(params) : rowClassName : '');
-      return clss;
-    },
-    handleBeforeEditMethod: function handleBeforeEditMethod(params) {
-      var editConfig = this.editConfig;
-      var beforeEditMethod = editConfig ? editConfig.beforeEditMethod || editConfig.activeMethod : null;
-      if (this.pendingRecords.indexOf(params.row) === -1) {
-        return !beforeEditMethod || beforeEditMethod(_objectSpread2(_objectSpread2({}, params), {}, {
-          $grid: this
-        }));
-      }
-      return false;
-    },
     initToolbar: function initToolbar() {
       var _this3 = this;
       this.$nextTick(function () {
@@ -33827,11 +34015,20 @@ Object.keys(packages_table.methods).forEach(function (name) {
       switch (code) {
         case 'insert':
           return this.insert();
-        case 'insert_actived':
+        case 'insert_edit':
           return this.insert().then(function (_ref2) {
             var row = _ref2.row;
-            return _this5.setActiveRow(row);
+            return _this5.setEditRow(row);
           });
+
+        // 已废弃
+        case 'insert_actived':
+          return this.insert().then(function (_ref3) {
+            var row = _ref3.row;
+            return _this5.setEditRow(row);
+          });
+        // 已废弃
+
         case 'mark_cancel':
           this.triggerPendingEvent(code);
           break;
@@ -33892,7 +34089,6 @@ Object.keys(packages_table.methods).forEach(function (name) {
                 filterList = $xetable.getCheckedFilters();
               } else {
                 if (isReload) {
-                  this.pendingRecords = [];
                   $xetable.clearAll();
                 } else {
                   sortList = $xetable.getSortColumns();
@@ -33978,9 +34174,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
                   _this5.tableLoading = true;
                   return Promise.resolve((beforeDelete || _ajaxMethods).apply(void 0, _toConsumableArray(_applyArgs))).then(function (rest) {
                     _this5.tableLoading = false;
-                    _this5.pendingRecords = _this5.pendingRecords.filter(function (row) {
-                      return removeRecords.indexOf(row) === -1;
-                    });
+                    $xetable.setPendingRow(removeRecords, false);
                     if (isMsg) {
                       // 检测弹窗模块
                       if (false) {}
@@ -34033,9 +34227,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
           {
             var _ajaxMethods2 = ajax.save;
             if (_ajaxMethods2) {
-              var _body = Object.assign({
-                pendingRecords: this.pendingRecords
-              }, this.getRecordset());
+              var _body = this.getRecordset();
               var insertRecords = _body.insertRecords,
                 _removeRecords = _body.removeRecords,
                 updateRecords = _body.updateRecords,
@@ -34074,7 +34266,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
                   _this5.tableLoading = true;
                   return Promise.resolve((beforeSave || _ajaxMethods2).apply(void 0, _toConsumableArray(_applyArgs2))).then(function (rest) {
                     _this5.tableLoading = false;
-                    _this5.pendingRecords = [];
+                    $xetable.clearPendingRow();
                     if (isMsg) {
                       // 检测弹窗模块
                       if (false) {}
@@ -34191,9 +34383,6 @@ Object.keys(packages_table.methods).forEach(function (name) {
       });
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(itemIndex) ? itemList : itemList[itemIndex];
     },
-    getPendingRecords: function getPendingRecords() {
-      return this.pendingRecords;
-    },
     triggerToolbarCommitEvent: function triggerToolbarCommitEvent(params, evnt) {
       var _this6 = this;
       var code = params.code;
@@ -34226,28 +34415,10 @@ Object.keys(packages_table.methods).forEach(function (name) {
       });
     },
     triggerPendingEvent: function triggerPendingEvent(code) {
-      var pendingRecords = this.pendingRecords,
-        isMsg = this.isMsg;
+      var isMsg = this.isMsg;
       var selectRecords = this.getCheckboxRecords();
       if (selectRecords.length) {
-        var plus = [];
-        var minus = [];
-        selectRecords.forEach(function (data) {
-          if (pendingRecords.some(function (item) {
-            return data === item;
-          })) {
-            minus.push(data);
-          } else {
-            plus.push(data);
-          }
-        });
-        if (minus.length) {
-          this.pendingRecords = pendingRecords.filter(function (item) {
-            return minus.indexOf(item) === -1;
-          }).concat(plus);
-        } else if (plus.length) {
-          this.pendingRecords = pendingRecords.concat(plus);
-        }
+        this.togglePendingRow(selectRecords);
         this.clearCheckboxRow();
       } else {
         if (isMsg) {
@@ -34410,8 +34581,10 @@ Object.keys(packages_table.methods).forEach(function (name) {
       });
     },
     getProxyInfo: function getProxyInfo() {
-      var sortData = this.sortData,
+      var $refs = this.$refs,
+        sortData = this.sortData,
         proxyConfig = this.proxyConfig;
+      var $xetable = $refs.xTable;
       if (proxyConfig) {
         return {
           data: this.tableData,
@@ -34420,7 +34593,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
           sort: sortData.length ? sortData[0] : {},
           sorts: sortData,
           pager: this.tablePage,
-          pendingRecords: this.pendingRecords
+          pendingRecords: $xetable ? $xetable.getPendingRecords() : []
         };
       }
       return null;
@@ -36294,7 +36467,7 @@ var autoTxtElem;
         autoTxtElem.className = ['vxe-textarea--autosize', size ? "size--".concat(size) : ''].join(' ');
         autoTxtElem.style.width = "".concat(textElem.clientWidth, "px");
         autoTxtElem.style.padding = textStyle.padding;
-        autoTxtElem.innerHTML = ('' + (inputValue || '　')).replace(/\n$/, '\n　');
+        autoTxtElem.innerText = ('' + (inputValue || '　')).replace(/\n$/, '\n　');
       }
     },
     handleResize: function handleResize() {
@@ -37091,7 +37264,7 @@ function renderContent(h, _vm) {
     return h('div', {
       class: ['vxe-table--tooltip-wrapper', "theme--".concat(theme), popupClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(popupClassName) ? popupClassName({
         $tooltip: this
-      }) : popupClassName : '', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, "placement--".concat(tipStore.placement), tipStore.placement), _defineProperty(_ref, 'is--enterable', enterable), _defineProperty(_ref, 'is--visible', visible), _defineProperty(_ref, 'is--arrow', isArrow), _defineProperty(_ref, 'is--actived', tipActive), _ref)],
+      }) : popupClassName : '', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, "placement--".concat(tipStore.placement), tipStore.placement), _defineProperty(_ref, 'is--enterable', enterable), _defineProperty(_ref, 'is--visible', visible), _defineProperty(_ref, 'is--arrow', isArrow), _defineProperty(_ref, 'is--active', tipActive), _ref)],
       style: tipStore.style,
       ref: 'tipWrapper',
       on: on
@@ -39296,7 +39469,8 @@ var List = Object.assign(list, {
   },
   render: function render(h) {
     var _ref, _ref2;
-    var $scopedSlots = this.$scopedSlots,
+    var _e = this._e,
+      $scopedSlots = this.$scopedSlots,
       inited = this.inited,
       className = this.className,
       popupClassName = this.popupClassName,
@@ -39310,7 +39484,9 @@ var List = Object.assign(list, {
       panelStyle = this.panelStyle,
       panelPlacement = this.panelPlacement;
     var defaultSlot = $scopedSlots.default;
-    var downSlot = $scopedSlots.dropdown;
+    var headerSlot = $scopedSlots.header;
+    var footerSlot = $scopedSlots.footer;
+    var dropdownSlot = $scopedSlots.dropdown;
     return h('div', {
       class: ['vxe-pulldown', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
         $pulldown: this
@@ -39329,11 +39505,21 @@ var List = Object.assign(list, {
         placement: panelPlacement
       },
       style: panelStyle
-    }, downSlot ? [h('div', {
-      class: 'vxe-pulldown--wrapper'
-    }, !inited || destroyOnClose && !visiblePanel && !animatVisible ? [] : downSlot.call(this, {
+    }, [h('div', {
+      class: 'vxe-pulldown--panel-wrapper'
+    }, !inited || destroyOnClose && !visiblePanel && !animatVisible ? [] : [headerSlot ? h('div', {
+      class: 'vxe-pulldown--panel-header'
+    }, headerSlot.call(this, {
+      $pulldown: this
+    })) : _e(), h('div', {
+      class: 'vxe-pulldown--panel-body'
+    }, dropdownSlot ? dropdownSlot.call(this, {
+      $pulldown: this
+    }, h) : []), footerSlot ? h('div', {
+      class: 'vxe-pulldown--panel-footer'
+    }, footerSlot.call(this, {
       $pulldown: this
-    }, h))] : [])]);
+    })) : _e()])])]);
   },
   methods: {
     handleGlobalMousewheelEvent: function handleGlobalMousewheelEvent(evnt) {