vxe-table 3.12.13 → 3.12.15

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.13";
+const version = "3.12.15";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2842,7 +2842,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.13"}`;
+const log_version = `table v${"3.12.15"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6320,7 +6320,7 @@ const calcCellHeight = $xeTable => {
     reactData.calcCellHeightFlag++;
   }
 };
-function getOrderField(_vm, column) {
+function getOrderField($xeTable, column) {
   const {
     sortBy,
     sortType
@@ -6333,7 +6333,7 @@ function getOrderField(_vm, column) {
         column
       }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, sortBy);
     } else {
-      cellValue = _vm.getCellLabel(row, column);
+      cellValue = $xeTable.getCellLabel(row, column);
     }
     if (!sortType || sortType === 'auto') {
       return isNaN(cellValue) ? cellValue : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
@@ -8395,15 +8395,26 @@ const Methods = {
    */
   updateAfterFullData() {
     const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
     const {
       tableFullColumn,
       tableFullData,
-      filterOpts,
-      sortOpts,
-      treeConfig,
-      treeOpts,
       tableFullTreeData
-    } = this;
+    } = internalData;
+    const filterOpts = $xeTable.computeFilterOpts;
+    const sortOpts = $xeTable.computeSortOpts;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    const {
+      transform,
+      rowField,
+      parentField,
+      mapChildrenField
+    } = treeOpts;
     const {
       remote: allRemoteFilter,
       filterMethod: allFilterMethod
@@ -8414,63 +8425,61 @@ const Methods = {
       multiple: sortMultiple,
       chronological
     } = sortOpts;
-    const {
-      transform
-    } = treeOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
     let tableData = [];
     let tableTree = [];
-    const filterColumns = [];
-    let orderColumns = [];
-    tableFullColumn.forEach(column => {
-      const {
-        field,
-        sortable,
-        order,
-        filters
-      } = column;
-      if (!allRemoteFilter && filters && filters.length) {
-        const valueList = [];
-        const itemList = [];
-        filters.forEach(item => {
-          if (item.checked) {
-            itemList.push(item);
-            valueList.push(item.value);
+    // 处理数据
+    if (!allRemoteFilter || !allRemoteSort) {
+      const filterColumns = [];
+      let orderColumns = [];
+      tableFullColumn.forEach(column => {
+        const {
+          field,
+          sortable,
+          order,
+          filters
+        } = column;
+        if (!allRemoteFilter && filters && filters.length) {
+          const valueList = [];
+          const itemList = [];
+          filters.forEach(item => {
+            if (item.checked) {
+              itemList.push(item);
+              valueList.push(item.value);
+            }
+          });
+          if (itemList.length) {
+            filterColumns.push({
+              column,
+              valueList,
+              itemList
+            });
           }
-        });
-        if (itemList.length) {
-          filterColumns.push({
+        }
+        if (!allRemoteSort && sortable && order) {
+          orderColumns.push({
             column,
-            valueList,
-            itemList
+            field,
+            property: field,
+            order: order,
+            sortTime: column.sortTime
           });
         }
-      }
-      if (!allRemoteSort && sortable && order) {
-        orderColumns.push({
-          column,
-          field,
-          property: field,
-          order,
-          sortTime: column.sortTime
-        });
-      }
-    });
-    if (sortMultiple && chronological && orderColumns.length > 1) {
-      orderColumns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(orderColumns, 'sortTime');
-    }
-    if (filterColumns.length) {
-      const handleFilter = row => {
-        return filterColumns.every(({
-          column,
-          valueList,
-          itemList
-        }) => {
-          if (valueList.length && !allRemoteFilter) {
+      });
+      if (sortMultiple && chronological && orderColumns.length > 1) {
+        orderColumns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(orderColumns, 'sortTime');
+      }
+      // 处理筛选
+      // 支持单列、多列、组合筛选
+      if (!allRemoteFilter && filterColumns.length) {
+        const handleFilter = row => {
+          return filterColumns.every(({
+            column,
+            valueList,
+            itemList
+          }) => {
             const {
               filterMethod,
-              filterRender,
-              field
+              filterRender
             } = column;
             const compConf = isEnableConf(filterRender) ? methods_renderer.get(filterRender.name) : null;
             const compFilterMethod = compConf ? compConf.tableFilterMethod || compConf.filterMethod : null;
@@ -8483,7 +8492,7 @@ const Methods = {
                 cellValue,
                 row,
                 column,
-                $table: this
+                $table: $xeTable
               }));
             } else if (compFilterMethod) {
               return itemList.some(item => compFilterMethod({
@@ -8492,7 +8501,7 @@ const Methods = {
                 cellValue,
                 row,
                 column,
-                $table: this
+                $table: $xeTable
               }));
             } else if (allFilterMethod) {
               return allFilterMethod({
@@ -8509,96 +8518,119 @@ const Methods = {
                 cellValue,
                 row,
                 column,
-                $table: this
+                $table: $xeTable
               }));
             }
-            return valueList.indexOf(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, field)) > -1;
-          }
-          return true;
-        });
-      };
-      if (treeConfig && transform) {
-        // 筛选虚拟树
-        tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, handleFilter, {
-          original: true,
-          isEvery: true,
-          children: treeOpts.mapChildrenField,
-          mapChildren: childrenField
-        });
-        tableData = tableTree;
-      } else {
-        tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter);
-        tableTree = tableData;
-      }
-    } else {
-      if (treeConfig && transform) {
-        // 还原虚拟树
-        tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
-          original: true,
-          isEvery: true,
-          children: treeOpts.mapChildrenField,
-          mapChildren: childrenField
-        });
-        tableData = tableTree;
-      } else {
-        tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
-        tableTree = tableData;
-      }
-    }
-    const firstOrderColumn = orderColumns[0];
-    if (!allRemoteSort && firstOrderColumn) {
-      if (treeConfig && transform) {
-        // 虚拟树和列表一样，只能排序根级节点
-        if (allSortMethod) {
-          const sortRests = allSortMethod({
-            data: tableTree,
-            sortList: orderColumns,
-            $table: this
+            return valueList.indexOf(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field)) > -1;
           });
-          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableTree;
+        };
+        if (treeConfig && transform) {
+          // 筛选虚拟树
+          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, handleFilter, {
+            original: true,
+            isEvery: true,
+            children: mapChildrenField,
+            mapChildren: childrenField
+          });
+          tableData = tableTree;
         } else {
-          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableTree, orderColumns.map(({
-            column,
-            order
-          }) => [getOrderField(this, column), order]));
+          tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter);
+          tableTree = tableData;
         }
-        tableData = tableTree;
       } else {
-        if (allSortMethod) {
-          const sortRests = allSortMethod({
-            data: tableData,
-            column: firstOrderColumn.column,
-            property: firstOrderColumn.field,
-            field: firstOrderColumn.field,
-            order: firstOrderColumn.order,
-            sortList: orderColumns,
-            $table: this
+        if (treeConfig && transform) {
+          // 还原虚拟树
+          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
+            original: true,
+            isEvery: true,
+            children: mapChildrenField,
+            mapChildren: childrenField
           });
-          tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableData;
+          tableData = tableTree;
         } else {
-          // 兼容 v4
-          if (sortMultiple) {
-            tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, orderColumns.map(({
+          tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
+          tableTree = tableData;
+        }
+      }
+      // 处理排序（不能用于树形结构）
+      // 支持单列、多列、组合排序
+      if (!allRemoteSort && orderColumns.length) {
+        if (treeConfig && transform) {
+          // 虚拟树和列表一样，只能排序根级节点
+          if (allSortMethod) {
+            const sortRests = allSortMethod({
+              data: tableTree,
+              sortList: orderColumns,
+              $table: $xeTable
+            });
+            tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableTree;
+          } else {
+            const treeList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray(tableTree, {
+              children: mapChildrenField
+            });
+            tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(treeList, orderColumns.map(({
               column,
               order
-            }) => [getOrderField(this, column), order]));
+            }) => [getOrderField($xeTable, column), order])), {
+              key: rowField,
+              parentKey: parentField,
+              children: childrenField,
+              mapChildren: mapChildrenField
+            });
+          }
+          tableData = tableTree;
+        } else {
+          if (allSortMethod) {
+            const sortRests = allSortMethod({
+              data: tableData,
+              sortList: orderColumns,
+              $table: $xeTable
+            });
+            tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableData;
           } else {
-            // 兼容 v2，在 v4 中废弃， sortBy 不能为数组
-            let sortByConfs;
-            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(firstOrderColumn.sortBy)) {
-              sortByConfs = firstOrderColumn.sortBy.map(item => [item, firstOrderColumn.order]);
+            // 兼容 v4
+            if (sortMultiple) {
+              tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, orderColumns.map(({
+                column,
+                order
+              }) => [getOrderField(this, column), order]));
+            } else {
+              const firstOrderColumn = orderColumns[0];
+              let sortByConfs;
+              // 已废弃，兼容 v2，在 v4 中废弃， sortBy 不能为数组
+              if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(firstOrderColumn.sortBy)) {
+                sortByConfs = firstOrderColumn.sortBy.map(item => [item, firstOrderColumn.order]);
+              }
+              tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, sortByConfs || [firstOrderColumn].map(({
+                column,
+                order
+              }) => [getOrderField(this, column), order]));
             }
-            tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, sortByConfs || [firstOrderColumn].map(({
+            tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, orderColumns.map(({
               column,
               order
-            }) => [getOrderField(this, column), order]));
+            }) => [getOrderField($xeTable, column), order]));
           }
+          tableTree = tableData;
         }
+      }
+    } else {
+      if (treeConfig && transform) {
+        // 还原虚拟树
+        tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
+          original: true,
+          isEvery: true,
+          children: treeOpts.mapChildrenField,
+          mapChildren: childrenField
+        });
+        tableData = tableTree;
+      } else {
+        tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
         tableTree = tableData;
       }
     }
-    this.afterFullData = tableData;
-    this.afterTreeFullData = tableTree;
+    internalData.afterFullData = tableData;
+    internalData.afterTreeFullData = tableTree;
     updateAfterDataIndex($xeTable);
   },
   /**
@@ -12145,10 +12177,9 @@ const Methods = {
     } = sortOpts;
     const {
       field,
-      sortable,
-      remoteSort
+      sortable
     } = column;
-    if (sortable || remoteSort) {
+    if (sortable || column.remoteSort) {
       if (!order || column.order === order) {
         if (allowClear) {
           $xeTable.clearSort(multiple ? column : null);
@@ -12162,6 +12193,44 @@ const Methods = {
       $xeTable.handleColumnSortEvent(evnt, column);
     }
   },
+  handleCellRuleUpdateStatus(type, cellParams, cellValue) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      validStore
+    } = reactData;
+    const {
+      row,
+      column
+    } = cellParams;
+    if ($xeTable.hasCellRules) {
+      if ($xeTable.hasCellRules(type, row, column)) {
+        const cell = $xeTable.getCellElement(row, column);
+        if (cell) {
+          const customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(cellValue);
+          return $xeTable.validCellRules(type, row, column, cellValue).then(() => {
+            if (customVal && validStore.visible) {
+              setCellValue(row, column, cellValue);
+            }
+            $xeTable.clearValidate(row, column);
+          }).catch(({
+            rule
+          }) => {
+            if (customVal) {
+              setCellValue(row, column, cellValue);
+            }
+            $xeTable.showValidTooltip({
+              rule,
+              row,
+              column,
+              cell
+            });
+          });
+        }
+      }
+    }
+    return $xeTable.$nextTick();
+  },
   /**
    * 表头单元格按下事件
    */
@@ -14884,45 +14953,14 @@ const Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus(slotParams, cellValue) {
-    const customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(cellValue);
+    const $xeTable = this;
+    const props = $xeTable;
     return this.$nextTick().then(() => {
       const {
-        $refs,
-        editRules,
-        validStore
-      } = this;
-      const refTableBody = $refs.refTableBody;
-      if (slotParams && refTableBody && editRules) {
-        const {
-          row,
-          column
-        } = slotParams;
-        const type = 'change';
-        if (this.hasCellRules) {
-          if (this.hasCellRules(type, row, column)) {
-            const cell = this.getCellElement(row, column);
-            if (cell) {
-              return this.validCellRules(type, row, column, cellValue).then(() => {
-                if (customVal && validStore.visible) {
-                  setCellValue(row, column, cellValue);
-                }
-                this.clearValidate(row, column);
-              }).catch(({
-                rule
-              }) => {
-                if (customVal) {
-                  setCellValue(row, column, cellValue);
-                }
-                this.showValidTooltip({
-                  rule,
-                  row,
-                  column,
-                  cell
-                });
-              });
-            }
-          }
-        }
+        editRules
+      } = props;
+      if (slotParams && editRules) {
+        return $xeTable.handleCellRuleUpdateStatus('change', slotParams, cellValue);
       }
     });
   },
@@ -15544,6 +15582,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
       'fixed--width': !isAutoCellWidth,
       'fixed--hidden': fixedHiddenColumn,
       'is--padding': isCellPadding,
+      'is--progress': fixedHiddenColumn && isAllOverflow || isVNPreEmptyStatus,
       'is--drag-cell': isRowDragCell && (isCrossDrag || isPeerDrag || !rowLevel),
       'is--drag-disabled': isDisabledDrag,
       'col--dirty': isDirty,
@@ -16167,8 +16206,10 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     const showResizable = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
-    if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-      isVNPreEmptyStatus = true;
+    if (!isGroup) {
+      if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+        isVNPreEmptyStatus = true;
+      }
     }
     const tcStyle = {};
     if (hasEllipsis) {
@@ -20222,6 +20263,15 @@ const {
   renderer: edit_mixin_renderer,
   getI18n: mixin_getI18n
 } = core_.VxeUI;
+function removeCellSelectedClass($xeTable) {
+  const el = $xeTable.$refs.refElem;
+  if (el) {
+    const cell = el.querySelector('.col--selected');
+    if (cell) {
+      removeClass(cell, 'col--selected');
+    }
+  }
+}
 function insertTreeRow(_vm, newRecords, isAppend) {
   const {
     tableFullTreeData,
@@ -20643,7 +20693,7 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
       const childrenField = treeOpts.children || treeOpts.childrenField;
       const {
         actived,
-        removeList,
+        removeMaps,
         insertMaps
       } = editStore;
       const {
@@ -20658,7 +20708,8 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
       // 如果是新增，则保存记录
       rows.forEach(row => {
         if (!$xeTable.isInsertByRow(row)) {
-          removeList.push(row);
+          const rowid = getRowid($xeTable, row);
+          removeMaps[rowid] = row;
         }
       });
       // 如果绑定了多选属性，则更新状态
@@ -20835,7 +20886,19 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
      * 获取已删除的数据
      */
     _getRemoveRecords() {
-      return this.editStore.removeList;
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        editStore
+      } = reactData;
+      const {
+        removeMaps
+      } = editStore;
+      const removeRecords = [];
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(removeMaps, row => {
+        removeRecords.push(row);
+      });
+      return removeRecords;
     },
     /**
      * 获取更新数据
@@ -21079,11 +21142,6 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
       }
       focused.row = null;
       focused.column = null;
-      $xeTable.$nextTick(() => {
-        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
-          return $xeTable.handleRecalculateCellAreas();
-        }
-      });
       if (validOpts.autoClear) {
         if (validOpts.msgMode !== 'full' || mixin_getConfig().cellVaildMode === 'obsolete') {
           if ($xeTable.clearValidate) {
@@ -21091,7 +21149,11 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
           }
         }
       }
-      return $xeTable.$nextTick();
+      return $xeTable.$nextTick().then(() => {
+        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
+          return $xeTable.handleRecalculateCellAreas();
+        }
+      });
     },
     _getActiveRecord() {
       if (true) {
@@ -21303,7 +21365,7 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
             selected.row = row;
             selected.column = column;
             if (isMouseSelected) {
-              this.addColSdCls();
+              this.addCellSelectedClass();
             }
             this.focus();
             if (evnt) {
@@ -21332,13 +21394,14 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
      * 清除所选中源状态
      */
     _clearSelected() {
+      const $xeTable = this;
       const {
         selected
       } = this.editStore;
       selected.row = null;
       selected.column = null;
       this.reColTitleSdCls();
-      this.reColSdCls();
+      removeCellSelectedClass($xeTable);
       return this.$nextTick();
     },
     reColTitleSdCls() {
@@ -21347,23 +21410,22 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(headerElem.querySelectorAll('.col--title-selected'), elem => removeClass(elem, 'col--title-selected'));
       }
     },
-    reColSdCls() {
-      const cell = this.$el.querySelector('.col--selected');
-      if (cell) {
-        removeClass(cell, 'col--selected');
-      }
-    },
-    addColSdCls() {
+    addCellSelectedClass() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        editStore
+      } = reactData;
       const {
         selected
-      } = this.editStore;
+      } = editStore;
       const {
         row,
         column
       } = selected;
-      this.reColSdCls();
+      removeCellSelectedClass($xeTable);
       if (row && column) {
-        const cell = this.getCellElement(row, column);
+        const cell = $xeTable.getCellElement(row, column);
         if (cell) {
           addClass(cell, 'col--selected');
         }
@@ -21402,6 +21464,7 @@ function createHtmlPage(opts, content) {
 
 
 
+
 const {
   getI18n: export_mixin_getI18n,
   renderer: export_mixin_renderer
@@ -21534,7 +21597,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
                     cellValue = htmlCellElem.innerText.trim();
                   } else {
                     const cell = $xeTable.getCellElement(row, column);
-                    if (cell) {
+                    if (cell && !hasClass(cell, 'is--progress')) {
                       cellValue = cell.innerText.trim();
                     }
                   }
@@ -21604,7 +21667,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
                 cellValue = htmlCellElem.innerText.trim();
               } else {
                 const cell = $xeTable.getCellElement(row, column);
-                if (cell) {
+                if (cell && !hasClass(cell, 'is--progress')) {
                   cellValue = cell.innerText.trim();
                 }
               }
@@ -23921,13 +23984,26 @@ function validErrorRuleValue(rule, val) {
      * 返回 Promise 对象，或者使用回调方式
      */
     beginValidate(rows, cols, cb, isFull) {
+      const $xeTable = this;
+      const props = $xeTable;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
       const validRest = {};
       const {
         editRules,
-        afterFullData,
-        treeConfig,
-        treeOpts
-      } = this;
+        treeConfig
+      } = props;
+      const {
+        editStore,
+        pendingRowMaps
+      } = reactData;
+      const {
+        afterFullData
+      } = internalData;
+      const {
+        removeMaps
+      } = editStore;
+      const treeOpts = $xeTable.computeTreeOpts;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       let validList;
       if (rows === true) {
@@ -23950,6 +24026,15 @@ function validErrorRuleValue(rule, val) {
       if (editRules) {
         const columns = cols && cols.length ? cols : this.getColumns();
         const handleVaild = row => {
+          const rowid = getRowid($xeTable, row);
+          // 是否删除
+          if (removeMaps[rowid]) {
+            return;
+          }
+          // 是否标记删除
+          if (pendingRowMaps[rowid]) {
+            return;
+          }
           if (isFull || !this.validRuleErr) {
             const colVailds = [];
             columns.forEach(column => {
@@ -25130,7 +25215,6 @@ function renderBody(h, $xeTable) {
           column: null
         },
         insertMaps: {},
-        removeList: [],
         removeMaps: {}
       },
       // 存放 tooltip 相关信息
@@ -25188,6 +25272,12 @@ function renderBody(h, $xeTable) {
         isHeader: false,
         isFooter: false
       },
+      rowHeightStore: {
+        default: 48,
+        medium: 44,
+        small: 40,
+        mini: 36
+      },
       scrollVMLoading: false,
       calcCellHeightFlag: 0,
       resizeHeightFlag: 0,
@@ -25295,12 +25385,9 @@ function renderBody(h, $xeTable) {
       return this.computeRowHeightMaps;
     },
     computeRowHeightMaps() {
-      return {
-        default: 48,
-        medium: 44,
-        small: 40,
-        mini: 36
-      };
+      const $xeTable = this;
+      const reactData = $xeTable;
+      return reactData.rowHeightStore;
     },
     computeDefaultRowHeight() {
       const $xeTable = this;
@@ -26075,9 +26162,29 @@ function renderBody(h, $xeTable) {
   mounted() {
     const $xeTable = this;
     const props = $xeTable;
+    const reactData = $xeTable;
+    const {
+      rowHeightStore
+    } = reactData;
+    const varEl = $xeTable.$refs.refVarElem;
     const columnOpts = $xeTable.computeColumnOpts;
     const rowOpts = $xeTable.computeRowOpts;
     const customOpts = $xeTable.computeCustomOpts;
+    if (varEl) {
+      const [defEl, mediumEl, smallEl, miniEl] = varEl.children;
+      if (defEl) {
+        rowHeightStore.default = defEl.clientHeight;
+      }
+      if (mediumEl) {
+        rowHeightStore.medium = mediumEl.clientHeight;
+      }
+      if (smallEl) {
+        rowHeightStore.small = smallEl.clientHeight;
+      }
+      if (miniEl) {
+        rowHeightStore.mini = miniEl.clientHeight;
+      }
+    }
     if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
       initTpImg();
     }
@@ -26256,6 +26363,17 @@ function renderBody(h, $xeTable) {
       class: 'vxe-table-slots',
       ref: 'hideColumn'
     }, this.$slots.default), h('div', {
+      ref: 'refVarElem',
+      class: 'vxe-table-vars'
+    }, [h('div', {
+      class: 'vxe-table-var-default'
+    }), h('div', {
+      class: 'vxe-table-var-medium'
+    }), h('div', {
+      class: 'vxe-table-var-small'
+    }), h('div', {
+      class: 'vxe-table-var-mini'
+    })]), h('div', {
       key: 'tw',
       class: 'vxe-table--render-wrapper'
     }, scrollbarXToTop ? [renderScrollX(h, $xeTable), renderBody(h, $xeTable)] : [renderBody(h, $xeTable), renderScrollX(h, $xeTable)]),
@@ -28931,12 +29049,17 @@ function getCellLabelVNs(h, renderOpts, params, cellLabel) {
  * @param modelFunc
  * @param changeFunc
  */
-function getNativeElementOns(renderOpts, params, modelFunc, changeFunc) {
+function getNativeElementOns(renderOpts, params, eFns) {
   const {
     events
   } = renderOpts;
   const modelEvent = getModelEvent(renderOpts);
   const changeEvent = getChangeEvent(renderOpts);
+  const {
+    model: modelFunc,
+    change: changeFunc,
+    blur: blurFunc
+  } = eFns || {};
   const isSameEvent = changeEvent === modelEvent;
   const ons = {};
   if (events) {
@@ -28958,15 +29081,24 @@ function getNativeElementOns(renderOpts, params, modelFunc, changeFunc) {
     };
   }
   if (!isSameEvent && changeFunc) {
-    ons[getOnName(changeEvent)] = function (...args) {
-      changeFunc(...args);
+    ons[getOnName(changeEvent)] = function (evnt) {
+      changeFunc(evnt);
       if (events && events[changeEvent]) {
-        events[changeEvent](params, ...args);
+        events[changeEvent](params, evnt);
+      }
+    };
+  }
+  if (blurFunc) {
+    ons[getOnName(blurEvent)] = function (evnt) {
+      blurFunc(evnt);
+      if (events && events[blurEvent]) {
+        events[blurEvent](params, evnt);
       }
     };
   }
   return ons;
 }
+const blurEvent = 'blur';
 /**
  * 组件事件处理
  * @param renderOpts
@@ -28974,12 +29106,17 @@ function getNativeElementOns(renderOpts, params, modelFunc, changeFunc) {
  * @param modelFunc
  * @param changeFunc
  */
-function getComponentOns(renderOpts, params, modelFunc, changeFunc) {
+function getComponentOns(renderOpts, params, eFns) {
   const {
     events
   } = renderOpts;
   const modelEvent = getModelEvent(renderOpts);
   const changeEvent = getChangeEvent(renderOpts);
+  const {
+    model: modelFunc,
+    change: changeFunc,
+    blur: blurFunc
+  } = eFns || {};
   const ons = {};
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(events, (func, key) => {
     ons[getOnName(key)] = function (...args) {
@@ -29007,6 +29144,14 @@ function getComponentOns(renderOpts, params, modelFunc, changeFunc) {
       }
     };
   }
+  if (blurFunc) {
+    ons[getOnName(blurEvent)] = function (...args) {
+      blurFunc(...args);
+      if (events && events[blurEvent]) {
+        events[blurEvent](params, ...args);
+      }
+    };
+  }
   return ons;
 }
 function getEditOns(renderOpts, params) {
@@ -29022,31 +29167,47 @@ function getEditOns(renderOpts, params) {
     model
   } = column;
   const isImmediate = isImmediateCell(renderOpts, params);
-  return getComponentOns(renderOpts, params, cellValue => {
-    // 处理 model 值双向绑定
-    model.update = true;
-    model.value = cellValue;
-    if (isImmediate) {
-      setCellValue(row, column, cellValue);
-    }
-  }, eventParams => {
-    // 处理 change 事件相关逻辑
-    if (!isImmediate && ['VxeInput', 'VxeNumberInput', 'VxeTextarea', '$input', '$textarea'].includes(name)) {
-      const cellValue = eventParams.value;
+  return getComponentOns(renderOpts, params, {
+    model(cellValue) {
+      // 处理 model 值双向绑定
       model.update = true;
       model.value = cellValue;
-      $table.updateStatus(params, cellValue);
-    } else {
-      $table.updateStatus(params);
+      if (isImmediate) {
+        setCellValue(row, column, cellValue);
+      }
+    },
+    change(eventParams) {
+      // 处理 change 事件相关逻辑
+      if (!isImmediate && name && ['VxeInput', 'VxeNumberInput', 'VxeTextarea', '$input', '$textarea'].includes(name)) {
+        const cellValue = eventParams.value;
+        model.update = true;
+        model.value = cellValue;
+        $table.updateStatus(params, cellValue);
+      } else {
+        $table.updateStatus(params);
+      }
+    },
+    blur() {
+      if (isImmediate) {
+        $table.handleCellRuleUpdateStatus('blur', params);
+      } else {
+        $table.handleCellRuleUpdateStatus('blur', params, model.value);
+      }
     }
   });
 }
 function getFilterOns(renderOpts, params, option) {
-  return getComponentOns(renderOpts, params, value => {
-    // 处理 model 值双向绑定
-    option.data = value;
-  }, () => {
-    handleConfirmFilter(params, !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(option.data), option);
+  return getComponentOns(renderOpts, params, {
+    model(value) {
+      // 处理 model 值双向绑定
+      option.data = value;
+    },
+    change() {
+      handleConfirmFilter(params, !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(option.data), option);
+    },
+    blur() {
+      handleConfirmFilter(params, !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(option.data), option);
+    }
   });
 }
 function getNativeEditOns(renderOpts, params) {
@@ -29058,27 +29219,52 @@ function getNativeEditOns(renderOpts, params) {
   const {
     model
   } = column;
-  return getNativeElementOns(renderOpts, params, evnt => {
-    // 处理 model 值双向绑定
-    const cellValue = evnt.target.value;
-    if (isImmediateCell(renderOpts, params)) {
-      setCellValue(row, column, cellValue);
-    } else {
-      model.update = true;
-      model.value = cellValue;
+  return getNativeElementOns(renderOpts, params, {
+    model(evnt) {
+      // 处理 model 值双向绑定
+      const targetEl = evnt.target;
+      if (targetEl) {
+        const cellValue = targetEl.value;
+        if (isImmediateCell(renderOpts, params)) {
+          setCellValue(row, column, cellValue);
+        } else {
+          model.update = true;
+          model.value = cellValue;
+        }
+      }
+    },
+    change(evnt) {
+      // 处理 change 事件相关逻辑
+      const targetEl = evnt.target;
+      if (targetEl) {
+        const cellValue = targetEl.value;
+        $table.updateStatus(params, cellValue);
+      }
+    },
+    blur(evnt) {
+      const targetEl = evnt.target;
+      if (targetEl) {
+        const cellValue = targetEl.value;
+        $table.updateStatus(params, cellValue);
+      }
     }
-  }, evnt => {
-    // 处理 change 事件相关逻辑
-    const cellValue = evnt.target.value;
-    $table.updateStatus(params, cellValue);
   });
 }
 function getNativeFilterOns(renderOpts, params, option) {
-  return getNativeElementOns(renderOpts, params, evnt => {
-    // 处理 model 值双向绑定
-    option.data = evnt.target.value;
-  }, () => {
-    handleConfirmFilter(params, !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(option.data), option);
+  return getNativeElementOns(renderOpts, params, {
+    model(evnt) {
+      // 处理 model 值双向绑定
+      const targetEl = evnt.target;
+      if (targetEl) {
+        option.data = targetEl.value;
+      }
+    },
+    change() {
+      handleConfirmFilter(params, !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(option.data), option);
+    },
+    blur() {
+      handleConfirmFilter(params, !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(option.data), option);
+    }
   });
 }
 /**