vxe-table 4.10.13 → 4.10.15-beta.0

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.10.13";
+const version = "4.10.15-beta.0";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3585,7 +3585,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.13"}`;
+const log_version = `table v${"4.10.15-beta.0"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6199,8 +6199,6 @@ const renderType = 'body';
       computeColumnOpts,
       computeRowDragOpts,
       computeColumnDragOpts,
-      computeLeftFixedWidth,
-      computeRightFixedWidth,
       computeResizableOpts
     } = $xeTable.getComputeMaps();
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -6641,7 +6639,8 @@ const renderType = 'body';
         expandColumn,
         selectRadioRow,
         pendingRowMaps,
-        isDragColMove
+        isDragColMove,
+        rowExpandHeightFlag
       } = tableReactData;
       const {
         fullAllDataRowIdData
@@ -6683,18 +6682,18 @@ const renderType = 'body';
           };
         }
         const rowid = getRowid($xeTable, row);
-        const rest = fullAllDataRowIdData[rowid];
+        const rowRest = fullAllDataRowIdData[rowid];
         let rowLevel = 0;
         let seq = -1;
         let _rowIndex = 0;
-        if (rest) {
-          rowLevel = rest.level;
+        if (rowRest) {
+          rowLevel = rowRest.level;
           if (treeConfig && transform && seqMode === 'increasing') {
-            seq = rest._index + 1;
+            seq = rowRest._index + 1;
           } else {
-            seq = rest.seq;
+            seq = rowRest.seq;
           }
-          _rowIndex = rest._index;
+          _rowIndex = rowRest._index;
         }
         const params = {
           $table: $xeTable,
@@ -6762,52 +6761,63 @@ const renderType = 'body';
           const expandOpts = computeExpandOpts.value;
           const {
             height: expandHeight,
-            padding
+            padding,
+            mode: expandMode
           } = expandOpts;
-          const cellStyle = {};
-          if (expandHeight) {
-            cellStyle.height = `${expandHeight}px`;
-          }
-          if (treeConfig) {
-            cellStyle.paddingLeft = `${rowLevel * treeOpts.indent + 30}px`;
+          if (expandMode === 'fixed') {
+            rows.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tr', {
+              class: 'vxe-body--row-expanded-place',
+              key: `expand_${rowid}`,
+              rowid
+            }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
+              class: 'vxe-body--row-expanded-place-column',
+              colspan: tableColumn.length,
+              style: {
+                height: `${rowExpandHeightFlag ? rowRest.expandHeight || expandHeight : 0}px`
+              }
+            })]));
+          } else {
+            const cellStyle = {};
+            if (expandHeight) {
+              cellStyle.height = `${expandHeight}px`;
+            }
+            if (treeConfig) {
+              cellStyle.paddingLeft = `${rowLevel * treeOpts.indent + 30}px`;
+            }
+            const {
+              showOverflow
+            } = expandColumn;
+            const hasEllipsis = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showOverflow) ? isAllOverflow : showOverflow;
+            const expandParams = {
+              $table: $xeTable,
+              seq,
+              column: expandColumn,
+              fixed: fixedType,
+              type: renderType,
+              level: rowLevel,
+              row,
+              rowIndex,
+              $rowIndex,
+              _rowIndex
+            };
+            rows.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tr', {
+              class: ['vxe-body--expanded-row', {
+                'is--padding': padding
+              }],
+              key: `expand_${rowid}`
+            }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
+              class: ['vxe-body--expanded-column', {
+                'fixed--hidden': fixedType && !hasFixedColumn,
+                'col--ellipsis': hasEllipsis
+              }],
+              colspan: tableColumn.length
+            }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+              class: ['vxe-body--expanded-cell', {
+                'is--ellipsis': expandHeight
+              }],
+              style: cellStyle
+            }, [expandColumn.renderData(expandParams)])])]));
           }
-          const {
-            showOverflow
-          } = expandColumn;
-          const hasEllipsis = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showOverflow) ? isAllOverflow : showOverflow;
-          const expandParams = {
-            $table: $xeTable,
-            seq,
-            column: expandColumn,
-            fixed: fixedType,
-            type: renderType,
-            level: rowLevel,
-            row,
-            rowIndex,
-            $rowIndex,
-            _rowIndex
-          };
-          rows.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tr', {
-            class: ['vxe-body--expanded-row', {
-              'is--padding': padding
-            }],
-            key: `expand_${rowid}`,
-            style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowStyle) ? rowStyle(expandParams) : rowStyle : null,
-            ...trOn
-          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
-            class: {
-              'vxe-body--expanded-column': 1,
-              'fixed--hidden': fixedType && !hasFixedColumn,
-              'col--ellipsis': hasEllipsis
-            },
-            colspan: tableColumn.length
-          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-            class: {
-              'vxe-body--expanded-cell': 1,
-              'is--ellipsis': expandHeight
-            },
-            style: cellStyle
-          }, [expandColumn.renderData(expandParams)])])]));
         }
         // 如果是树形表格
         if (isExpandTree) {
@@ -6888,14 +6898,13 @@ const renderType = 'body';
       const emptyOpts = computeEmptyOpts.value;
       const mouseOpts = computeMouseOpts.value;
       const rowDragOpts = computeRowDragOpts.value;
-      const leftFixedWidth = computeLeftFixedWidth.value;
-      const rightFixedWidth = computeRightFixedWidth.value;
+      const expandOpts = computeExpandOpts.value;
       let renderDataList = tableData;
       let renderColumnList = tableColumn;
       let isOptimizeMode = false;
       // 如果是使用优化模式
       if (scrollXLoad || scrollYLoad || isAllOverflow) {
-        if (expandColumn || spanMethod || footerSpanMethod) {
+        if (expandColumn && expandOpts.mode !== 'fixed' || spanMethod || footerSpanMethod) {
           // 如果不支持优化模式
         } else {
           isOptimizeMode = true;
@@ -6976,9 +6985,6 @@ const renderType = 'body';
           $xeTable.triggerBodyScrollEvent(evnt, fixedType);
         }
       };
-      if (scrollYLoad || leftFixedWidth || rightFixedWidth) {
-        ons.onWheel = $xeTable.triggerBodyWheelEvent;
-      }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refElem,
         class: ['vxe-table--body-wrapper', fixedType ? `fixed-${fixedType}--wrapper` : 'body--wrapper'],
@@ -10551,8 +10557,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         mini: 36
       },
       scrollVMLoading: false,
+      rowExpandHeightFlag: 1,
       calcCellHeightFlag: 1,
-      resizeHeightFlag: 0,
+      resizeHeightFlag: 1,
       isCustomStatus: false,
       isDragRowMove: false,
       dragRow: null,
@@ -10669,6 +10676,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const refDragTipElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refDragRowLineElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refDragColLineElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
+    const refRowExpandElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
+    const refRowExpandYSpaceElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refScrollXVirtualElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refScrollYVirtualElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refScrollXHandleElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -10930,6 +10939,26 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const computeCustomOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, table_getConfig().table.customConfig, props.customConfig);
     });
+    const computeTableRowExpandedList = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const {
+        rowExpandedMaps,
+        tableData,
+        expandColumn
+      } = reactData;
+      const expandList = [];
+      if (expandColumn) {
+        const rowKeys = {};
+        tableData.forEach(row => {
+          rowKeys[getRowid($xeTable, row)] = true;
+        });
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(rowExpandedMaps, (row, rowid) => {
+          if (rowKeys[rowid]) {
+            expandList.push(row);
+          }
+        });
+      }
+      return expandList;
+    });
     const computeAutoWidthColumnList = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
         visibleColumn
@@ -11216,6 +11245,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         visibleSize: 6
       };
     };
+    const calcVarRowHeightConfig = (sizeKey, sizeEl) => {
+      const {
+        rowHeightStore
+      } = reactData;
+      if (sizeEl && sizeEl.clientHeight) {
+        rowHeightStore[sizeKey] = sizeEl.clientHeight;
+      }
+    };
     const computeRowHeight = () => {
       const {
         isAllOverflow
@@ -11248,7 +11285,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     };
     const handleVirtualYVisible = currScrollTop => {
       const {
-        isAllOverflow
+        isAllOverflow,
+        expandColumn,
+        rowExpandedMaps
       } = reactData;
       const {
         elemStore,
@@ -11256,6 +11295,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         afterFullData,
         fullAllDataRowIdData
       } = internalData;
+      const expandOpts = computeExpandOpts.value;
       const rowOpts = computeRowOpts.value;
       const cellOpts = computeCellOpts.value;
       const defaultRowHeight = computeDefaultRowHeight.value;
@@ -11268,7 +11308,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         let offsetTop = 0;
         let visibleSize = 0;
         const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
-        if (!isCustomCellHeight && isAllOverflow) {
+        if (!isCustomCellHeight && !expandColumn && isAllOverflow) {
           toVisibleIndex = Math.floor(scrollTop / defaultRowHeight);
           visibleSize = Math.ceil(clientHeight / defaultRowHeight) + 1;
         } else {
@@ -11286,6 +11326,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 break;
               }
             }
+            // 是否展开行
+            if (expandColumn && rowExpandedMaps[rowid]) {
+              offsetTop += rowRest.expandHeight || expandOpts.height || 0;
+            }
           }
         }
         return {
@@ -11938,7 +11982,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             level: 0,
             height: 0,
             resizeHeight: 0,
-            oTop: 0
+            oTop: 0,
+            expandHeight: 0
           };
           fullAllDataRowIdData[rowid] = rest;
           fullDataRowIdData[rowid] = rest;
@@ -11988,7 +12033,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               level: 0,
               height: 0,
               resizeHeight: 0,
-              oTop: 0
+              oTop: 0,
+              expandHeight: 0
             };
             fullAllDataRowIdData[rowid] = rest;
             fullDataRowIdData[rowid] = rest;
@@ -12311,6 +12357,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const emptyPlaceholderElem = refEmptyPlaceholder.value;
       const cellOffsetWidth = computeCellOffsetWidth.value;
       const mouseOpts = computeMouseOpts.value;
+      const expandOpts = computeExpandOpts.value;
       const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
       const bodyTableElem = getRefElem(elemStore['main-body-table']);
       if (emptyPlaceholderElem) {
@@ -12380,6 +12427,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         yBottomCornerEl.style.top = `${headerHeight + bodyHeight}px`;
         yBottomCornerEl.style.display = footerHeight ? 'block' : '';
       }
+      const rowExpandEl = refRowExpandElem.value;
+      if (rowExpandEl) {
+        rowExpandEl.style.height = `${bodyHeight}px`;
+        rowExpandEl.style.top = `${headerHeight}px`;
+      }
       containerList.forEach((name, index) => {
         const fixedType = index > 0 ? name : '';
         const layoutList = ['header', 'body', 'footer'];
@@ -12489,7 +12541,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             let isOptimizeMode = false;
             // 如果是使用优化模式
             if (scrollXLoad || scrollYLoad || isAllOverflow) {
-              if (expandColumn || spanMethod || footerSpanMethod) {
+              if (expandColumn && expandOpts.mode !== 'fixed' || spanMethod || footerSpanMethod) {
                 // 如果不支持优化模式
               } else {
                 isOptimizeMode = true;
@@ -13255,15 +13307,25 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       if (!el || !el.clientWidth) {
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       }
+      const varEl = refVarElem.value;
+      if (varEl) {
+        const [defEl, mediumEl, smallEl, miniEl] = varEl.children;
+        calcVarRowHeightConfig('default', defEl);
+        calcVarRowHeightConfig('medium', mediumEl);
+        calcVarRowHeightConfig('small', smallEl);
+        calcVarRowHeightConfig('mini', miniEl);
+      }
       calcCellWidth();
       autoCellWidth();
       updateStyle();
+      updateRowExpandStyle();
       return computeScrollLoad().then(() => {
         if (reFull === true) {
           // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
           calcCellWidth();
           autoCellWidth();
           updateStyle();
+          updateRowExpandStyle();
           return computeScrollLoad();
         }
       });
@@ -14072,6 +14134,71 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         setTimeout(() => $xeTable.recalculate(true), 300);
       });
     };
+    const updateRowExpandStyle = () => {
+      const {
+        expandColumn,
+        scrollYLoad,
+        rowExpandedMaps
+      } = reactData;
+      const expandOpts = computeExpandOpts.value;
+      const rowOpts = computeRowOpts.value;
+      const cellOpts = computeCellOpts.value;
+      const defaultRowHeight = computeDefaultRowHeight.value;
+      const {
+        mode
+      } = expandOpts;
+      if (expandColumn && mode === 'fixed') {
+        const {
+          elemStore,
+          afterFullData,
+          fullAllDataRowIdData
+        } = internalData;
+        const rowExpandEl = refRowExpandElem.value;
+        const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+        if (rowExpandEl && bodyScrollElem) {
+          let isUpdateHeight = false;
+          if (scrollYLoad) {
+            let offsetTop = 0;
+            for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
+              const row = afterFullData[rIndex];
+              const rowid = getRowid($xeTable, row);
+              const rowRest = fullAllDataRowIdData[rowid] || {};
+              rowRest.oTop = offsetTop;
+              offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+              // 是否展开行
+              if (expandColumn && rowExpandedMaps[rowid]) {
+                offsetTop += rowRest.expandHeight || expandOpts.height || 0;
+              }
+            }
+          }
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(rowExpandEl.children, reEl => {
+            const expandEl = reEl;
+            const rowid = expandEl.getAttribute('rowid') || '';
+            const rowRest = fullAllDataRowIdData[rowid];
+            if (rowRest) {
+              const expandHeight = expandEl.offsetHeight + 1;
+              if (scrollYLoad) {
+                expandEl.style.top = toCssUnit(rowRest.oTop + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight));
+              } else {
+                const trEl = bodyScrollElem.querySelector(`.vxe-body--row[rowid="${rowid}"]`);
+                if (trEl) {
+                  expandEl.style.top = toCssUnit(trEl.offsetTop + trEl.offsetHeight);
+                }
+              }
+              if (!isUpdateHeight) {
+                if (rowRest.expandHeight !== expandHeight) {
+                  isUpdateHeight = true;
+                }
+              }
+              rowRest.expandHeight = expandHeight;
+            }
+          });
+          if (isUpdateHeight) {
+            reactData.rowExpandHeightFlag++;
+          }
+        }
+      }
+    };
     tableMethods = {
       dispatchEvent,
       /**
@@ -14266,7 +14393,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               level: parentLevel + nodes.length,
               height: 0,
               resizeHeight: 0,
-              oTop: 0
+              oTop: 0,
+              expandHeight: 0
             };
             fullDataRowIdData[rowid] = rest;
             fullAllDataRowIdData[rowid] = rest;
@@ -15226,6 +15354,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           const el = refElem.value;
           if (el && el.clientWidth) {
             autoCellWidth();
+            updateRowExpandStyle();
           }
           if (rceTimeout) {
             clearTimeout(rceTimeout);
@@ -17811,7 +17940,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               level,
               height: 0,
               resizeHeight: 0,
-              oTop: 0
+              oTop: 0,
+              expandHeight: 0
             };
           }
           cacheItem.row = row;
@@ -20126,6 +20256,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           direction,
           ...params
         };
+        updateRowExpandStyle();
         checkLastSyncScroll(isRollX, isRollY);
         if (rowOpts.isHover || highlightHoverRow) {
           $xeTable.clearHoverRow();
@@ -20164,6 +20295,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
       },
       triggerBodyScrollEvent(evnt, fixedType) {
+        const {
+          scrollYLoad,
+          scrollXLoad
+        } = reactData;
         const {
           elemStore,
           intoRunScroll,
@@ -20183,6 +20318,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
         const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
         const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
+        const rowExpandEl = refRowExpandElem.value;
         if (inWheelScroll || inVirtualScroll || inHeaderScroll || inFooterScroll) {
           return;
         }
@@ -20229,13 +20365,18 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             setScrollTop(rightScrollElem, scrollTop);
           }
           setScrollTop(yHandleEl, scrollTop);
-          $xeTable.triggerScrollYEvent(evnt);
+          setScrollTop(rowExpandEl, scrollTop);
+          if (scrollYLoad) {
+            $xeTable.triggerScrollYEvent(evnt);
+          }
         }
         if (isRollX) {
           setScrollLeft(xHandleEl, scrollLeft);
           setScrollLeft(headerScrollElem, scrollLeft);
           setScrollLeft(footerScrollElem, scrollLeft);
-          $xeTable.triggerScrollXEvent(evnt);
+          if (scrollXLoad) {
+            $xeTable.triggerScrollXEvent(evnt);
+          }
         }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'body',
@@ -20243,6 +20384,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         });
       },
       triggerHeaderScrollEvent(evnt, fixedType) {
+        const {
+          scrollXLoad
+        } = reactData;
         const {
           elemStore,
           intoRunScroll,
@@ -20279,13 +20423,18 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         setScrollLeft(xHandleEl, scrollLeft);
         setScrollLeft(footerScrollElem, scrollLeft);
         setScrollLeft(bodyScrollElem, scrollLeft);
-        $xeTable.triggerScrollXEvent(evnt);
+        if (scrollXLoad) {
+          $xeTable.triggerScrollXEvent(evnt);
+        }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'header',
           fixed: fixedType
         });
       },
       triggerFooterScrollEvent(evnt, fixedType) {
+        const {
+          scrollXLoad
+        } = reactData;
         const {
           elemStore,
           intoRunScroll,
@@ -20322,7 +20471,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         setScrollLeft(xHandleEl, scrollLeft);
         setScrollLeft(headerScrollElem, scrollLeft);
         setScrollLeft(bodyScrollElem, scrollLeft);
-        $xeTable.triggerScrollXEvent(evnt);
+        if (scrollXLoad) {
+          $xeTable.triggerScrollXEvent(evnt);
+        }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'footer',
           fixed: fixedType
@@ -20340,6 +20491,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const {
           highlightHoverRow
         } = src_props;
+        const {
+          scrollYLoad
+        } = reactData;
         const {
           elemStore,
           lastScrollTop,
@@ -20351,6 +20505,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
         const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
         const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
+        const rowExpandEl = refRowExpandElem.value;
         if (!xHandleEl) {
           return;
         }
@@ -20386,25 +20541,21 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             setScrollTop(bodyScrollElem, currTopNum);
             setScrollTop(leftScrollElem, currTopNum);
             setScrollTop(rightScrollElem, currTopNum);
-            $xeTable.triggerScrollYEvent(evnt);
+            setScrollTop(rowExpandEl, currTopNum);
+            if (scrollYLoad) {
+              $xeTable.triggerScrollYEvent(evnt);
+            }
             $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, scrollLeft, {
               type: 'table',
               fixed: ''
             });
           });
-          // internalData.inWheelScroll = true
-          // setScrollTop(yHandleEl, scrollTop)
-          // setScrollTop(bodyScrollElem, scrollTop)
-          // setScrollTop(leftScrollElem, scrollTop)
-          // setScrollTop(rightScrollElem, scrollTop)
-          // loadScrollYData(scrollTop)
-          // $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
-          //   type: 'footer',
-          //   fixed: ''
-          // })
         }
       },
       triggerVirtualScrollXEvent(evnt) {
+        const {
+          scrollXLoad
+        } = reactData;
         const {
           elemStore,
           inWheelScroll,
@@ -20438,13 +20589,18 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         setScrollLeft(bodyScrollElem, scrollLeft);
         setScrollLeft(headerScrollElem, scrollLeft);
         setScrollLeft(footerScrollElem, scrollLeft);
-        $xeTable.triggerScrollXEvent(evnt);
+        if (scrollXLoad) {
+          $xeTable.triggerScrollXEvent(evnt);
+        }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'table',
           fixed: ''
         });
       },
       triggerVirtualScrollYEvent(evnt) {
+        const {
+          scrollYLoad
+        } = reactData;
         const {
           elemStore,
           inWheelScroll,
@@ -20462,6 +20618,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
         const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
         const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
+        const rowExpandEl = refRowExpandElem.value;
         const xHandleEl = refScrollXHandleElem.value;
         const wrapperEl = evnt.currentTarget;
         const {
@@ -20478,7 +20635,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         setScrollTop(bodyScrollElem, scrollTop);
         setScrollTop(leftScrollElem, scrollTop);
         setScrollTop(rightScrollElem, scrollTop);
-        $xeTable.triggerScrollYEvent(evnt);
+        setScrollTop(rowExpandEl, scrollTop);
+        if (scrollYLoad) {
+          $xeTable.triggerScrollYEvent(evnt);
+        }
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: 'table',
           fixed: ''
@@ -20572,7 +20732,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       updateScrollYSpace() {
         const {
           isAllOverflow,
-          scrollYLoad
+          scrollYLoad,
+          expandColumn,
+          rowExpandedMaps
         } = reactData;
         const {
           scrollYStore,
@@ -20584,6 +20746,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const {
           startIndex
         } = scrollYStore;
+        const expandOpts = computeExpandOpts.value;
         const rowOpts = computeRowOpts.value;
         const cellOpts = computeCellOpts.value;
         const defaultRowHeight = computeDefaultRowHeight.value;
@@ -20593,7 +20756,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         let ySpaceHeight = 0;
         if (scrollYLoad) {
           const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
-          if (!isCustomCellHeight && isAllOverflow) {
+          if (!isCustomCellHeight && !expandColumn && isAllOverflow) {
             ySpaceHeight = afterFullData.length * defaultRowHeight;
             topSpaceHeight = Math.max(0, startIndex * defaultRowHeight);
           } else {
@@ -20602,12 +20765,20 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               const rowid = getRowid($xeTable, row);
               const rowRest = fullAllDataRowIdData[rowid] || {};
               ySpaceHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+              // 是否展开行
+              if (expandColumn && rowExpandedMaps[rowid]) {
+                ySpaceHeight += rowRest.expandHeight || expandOpts.height || 0;
+              }
             }
             for (let i = 0; i < startIndex; i++) {
               const row = afterFullData[i];
               const rowid = getRowid($xeTable, row);
               const rowRest = fullAllDataRowIdData[rowid] || {};
               topSpaceHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+              // 是否展开行
+              if (expandColumn && rowExpandedMaps[rowid]) {
+                topSpaceHeight += rowRest.expandHeight || expandOpts.height || 0;
+              }
             }
           }
         } else {
@@ -20632,6 +20803,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         if (scrollYSpaceEl) {
           scrollYSpaceEl.style.height = ySpaceHeight ? `${ySpaceHeight}px` : '';
         }
+        const rowExpandYSpaceEl = refRowExpandYSpaceElem.value;
+        if (rowExpandYSpaceEl) {
+          rowExpandYSpaceEl.style.height = ySpaceHeight ? `${ySpaceHeight}px` : '';
+        }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
           updateStyle();
         });
@@ -20641,6 +20816,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           isAllOverflow
         } = reactData;
         handleTableColumn();
+        $xeTable.updateScrollYSpace();
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
           handleTableColumn();
           $xeTable.updateScrollXSpace();
@@ -20651,6 +20827,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       },
       updateScrollYData() {
         $xeTable.handleTableData();
+        $xeTable.updateScrollYSpace();
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
           $xeTable.handleTableData();
           $xeTable.updateScrollYSpace();
@@ -20879,6 +21056,91 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }
       return table_renderEmptyElement($xeTable);
     };
+    const renderRowExpandedVNs = () => {
+      const {
+        treeConfig
+      } = props;
+      const {
+        expandColumn
+      } = reactData;
+      const tableRowExpandedList = computeTableRowExpandedList.value;
+      const expandOpts = computeExpandOpts.value;
+      const {
+        mode
+      } = expandOpts;
+      if (mode !== 'fixed') {
+        return table_renderEmptyElement($xeTable);
+      }
+      const expandVNs = [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        key: 'repY',
+        ref: refRowExpandYSpaceElem
+      })];
+      if (expandColumn) {
+        tableRowExpandedList.forEach(row => {
+          const expandOpts = computeExpandOpts.value;
+          const {
+            height: expandHeight,
+            padding
+          } = expandOpts;
+          const {
+            fullAllDataRowIdData
+          } = internalData;
+          const treeOpts = computeTreeOpts.value;
+          const {
+            transform,
+            seqMode
+          } = treeOpts;
+          const cellStyle = {};
+          const rowid = getRowid($xeTable, row);
+          const rest = fullAllDataRowIdData[rowid];
+          let rowLevel = 0;
+          let seq = -1;
+          let _rowIndex = 0;
+          const rowIndex = $xeTable.getRowIndex(row);
+          const $rowIndex = $xeTable.getVMRowIndex(row);
+          if (rest) {
+            rowLevel = rest.level;
+            if (treeConfig && transform && seqMode === 'increasing') {
+              seq = rest._index + 1;
+            } else {
+              seq = rest.seq;
+            }
+            _rowIndex = rest._index;
+          }
+          if (expandHeight) {
+            cellStyle.height = `${expandHeight}px`;
+          }
+          if (treeConfig) {
+            cellStyle.paddingLeft = `${rowLevel * treeOpts.indent + 30}px`;
+          }
+          const expandParams = {
+            $table: $xeTable,
+            seq,
+            column: expandColumn,
+            fixed: '',
+            type: 'body',
+            level: rowLevel,
+            row,
+            rowIndex,
+            $rowIndex,
+            _rowIndex
+          };
+          expandVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            key: rowid,
+            class: ['vxe-body--row-expanded-cell', {
+              'is--padding': padding,
+              'is--ellipsis': expandHeight
+            }],
+            rowid,
+            style: cellStyle
+          }, expandColumn.renderData(expandParams)));
+        });
+      }
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        ref: refRowExpandElem,
+        class: 'vxe-table--row-expanded-wrapper'
+      }, expandVNs);
+    };
     const renderScrollX = () => {
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         key: 'vsx',
@@ -20931,6 +21193,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } = props;
       const {
         overflowX,
+        scrollYLoad,
         tableData,
         tableColumn,
         tableGroupColumn,
@@ -20941,9 +21204,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         leftList,
         rightList
       } = columnStore;
+      const leftFixedWidth = computeLeftFixedWidth.value;
+      const rightFixedWidth = computeRightFixedWidth.value;
+      const ons = {};
+      if (scrollYLoad || leftFixedWidth || rightFixedWidth) {
+        ons.onWheel = $xeTable.triggerBodyWheelEvent;
+      }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refTableViewportElem,
-        class: 'vxe-table--viewport-wrapper'
+        class: 'vxe-table--viewport-wrapper',
+        ...ons
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table--main-wrapper'
       }, [
@@ -20973,7 +21243,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         tableColumn
       }) : table_renderEmptyElement($xeTable)]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table--fixed-wrapper'
-      }, [leftList && leftList.length && overflowX ? renderFixed('left') : table_renderEmptyElement($xeTable), rightList && rightList.length && overflowX ? renderFixed('right') : table_renderEmptyElement($xeTable)])]);
+      }, [leftList && leftList.length && overflowX ? renderFixed('left') : table_renderEmptyElement($xeTable), rightList && rightList.length && overflowX ? renderFixed('right') : table_renderEmptyElement($xeTable)]), renderRowExpandedVNs()]);
     };
     const renderBody = () => {
       const scrollbarYToLeft = computeScrollbarYToLeft.value;
@@ -21410,28 +21680,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       });
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
-      const {
-        rowHeightStore
-      } = reactData;
-      const varEl = refVarElem.value;
       const columnOpts = computeColumnOpts.value;
       const rowOpts = computeRowOpts.value;
       const customOpts = computeCustomOpts.value;
-      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();
       }
@@ -22629,7 +22880,7 @@ edit_hook_hooks.add('tableEditModule', {
         }
       }
     };
-    function syncActivedCell() {
+    const syncActivedCell = () => {
       const {
         editStore,
         tableColumn
@@ -22649,8 +22900,8 @@ edit_hook_hooks.add('tableEditModule', {
           setEditColumnModel(row, column);
         }
       }
-    }
-    function insertTreeRow(newRecords, isAppend) {
+    };
+    const insertTreeRow = (newRecords, isAppend) => {
       const {
         tableFullTreeData,
         afterFullData,
@@ -22700,7 +22951,8 @@ edit_hook_hooks.add('tableEditModule', {
             level: parentLevel + 1,
             height: 0,
             resizeHeight: 0,
-            oTop: 0
+            oTop: 0,
+            expandHeight: 0
           };
           fullDataRowIdData[rowid] = rest;
           fullAllDataRowIdData[rowid] = rest;
@@ -22725,13 +22977,14 @@ edit_hook_hooks.add('tableEditModule', {
             level: 0,
             height: 0,
             resizeHeight: 0,
-            oTop: 0
+            oTop: 0,
+            expandHeight: 0
           };
           fullDataRowIdData[rowid] = rest;
           fullAllDataRowIdData[rowid] = rest;
         }
       });
-    }
+    };
     const handleInsertRowAt = (records, targetRow, isInsertNextRow) => {
       const {
         treeConfig
@@ -22781,7 +23034,8 @@ edit_hook_hooks.add('tableEditModule', {
               level: 0,
               height: 0,
               resizeHeight: 0,
-              oTop: 0
+              oTop: 0,
+              expandHeight: 0
             };
             fullDataRowIdData[rowid] = rest;
             fullAllDataRowIdData[rowid] = rest;
@@ -22819,7 +23073,8 @@ edit_hook_hooks.add('tableEditModule', {
                 level: 0,
                 height: 0,
                 resizeHeight: 0,
-                oTop: 0
+                oTop: 0,
+                expandHeight: 0
               };
               fullDataRowIdData[rowid] = rest;
               fullAllDataRowIdData[rowid] = rest;
@@ -22880,7 +23135,8 @@ edit_hook_hooks.add('tableEditModule', {
                   level: parentLevel + 1,
                   height: 0,
                   resizeHeight: 0,
-                  oTop: 0
+                  oTop: 0,
+                  expandHeight: 0
                 };
                 fullDataRowIdData[rowid] = rest;
                 fullAllDataRowIdData[rowid] = rest;
@@ -23050,6 +23306,160 @@ edit_hook_hooks.add('tableEditModule', {
         }
       });
     };
+    const handleEditActive = (params, evnt, isFocus) => {
+      const {
+        editConfig,
+        mouseConfig
+      } = props;
+      const {
+        editStore,
+        tableColumn
+      } = reactData;
+      const editOpts = computeEditOpts.value;
+      const {
+        mode
+      } = editOpts;
+      const {
+        actived,
+        focused
+      } = editStore;
+      const {
+        row,
+        column
+      } = params;
+      const {
+        editRender
+      } = column;
+      const cell = params.cell || $xeTable.getCellElement(row, column);
+      const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
+      params.cell = cell;
+      if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
+        // 激活编辑
+        if (!$xeTable.isPendingByRow(row)) {
+          if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
+            // 判断是否禁用编辑
+            let type = 'edit-disabled';
+            if (!beforeEditMethod || beforeEditMethod({
+              ...params,
+              $table: $xeTable,
+              $grid: $xeTable.xegrid
+            })) {
+              if (mouseConfig) {
+                $xeTable.clearSelected();
+                if ($xeTable.clearCellAreas) {
+                  $xeTable.clearCellAreas();
+                  $xeTable.clearCopyCellArea();
+                }
+              }
+              $xeTable.closeTooltip();
+              if (actived.column) {
+                handleClearEdit(evnt);
+              }
+              type = 'edit-activated';
+              column.renderHeight = cell.offsetHeight;
+              actived.args = params;
+              actived.row = row;
+              actived.column = column;
+              if (mode === 'row') {
+                tableColumn.forEach(column => getEditColumnModel(row, column));
+              } else {
+                getEditColumnModel(row, column);
+              }
+              const afterEditMethod = editOpts.afterEditMethod;
+              (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+                if (isFocus) {
+                  $xeTable.handleFocus(params, evnt);
+                }
+                if (afterEditMethod) {
+                  afterEditMethod({
+                    ...params,
+                    $table: $xeTable,
+                    $grid: $xeTable.xegrid
+                  });
+                }
+              });
+            }
+            $xeTable.dispatchEvent(type, {
+              row,
+              rowIndex: $xeTable.getRowIndex(row),
+              $rowIndex: $xeTable.getVMRowIndex(row),
+              column,
+              columnIndex: $xeTable.getColumnIndex(column),
+              $columnIndex: $xeTable.getVMColumnIndex(column)
+            }, evnt);
+            // v4已废弃
+            if (type === 'edit-activated') {
+              $xeTable.dispatchEvent('edit-actived', {
+                row,
+                rowIndex: $xeTable.getRowIndex(row),
+                $rowIndex: $xeTable.getVMRowIndex(row),
+                column,
+                columnIndex: $xeTable.getColumnIndex(column),
+                $columnIndex: $xeTable.getVMColumnIndex(column)
+              }, evnt);
+            }
+          } else {
+            const {
+              column: oldColumn
+            } = actived;
+            if (mouseConfig) {
+              $xeTable.clearSelected();
+              if ($xeTable.clearCellAreas) {
+                $xeTable.clearCellAreas();
+                $xeTable.clearCopyCellArea();
+              }
+            }
+            if (oldColumn !== column) {
+              const {
+                model: oldModel
+              } = oldColumn;
+              if (oldModel.update) {
+                setCellValue(row, oldColumn, oldModel.value);
+              }
+              if ($xeTable.clearValidate) {
+                $xeTable.clearValidate(row, column);
+              }
+            }
+            column.renderHeight = cell.offsetHeight;
+            actived.args = params;
+            actived.column = column;
+            if (isFocus) {
+              setTimeout(() => {
+                $xeTable.handleFocus(params, evnt);
+              });
+            }
+          }
+          focused.column = null;
+          focused.row = null;
+          $xeTable.focus();
+        }
+      }
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+    };
+    const handleEditCell = (row, fieldOrColumn, isPos) => {
+      const {
+        editConfig
+      } = props;
+      const column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
+      if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
+        return Promise.resolve(isPos ? $xeTable.scrollToRow(row, column) : null).then(() => {
+          const cell = $xeTable.getCellElement(row, column);
+          if (cell) {
+            handleEditActive({
+              row,
+              rowIndex: $xeTable.getRowIndex(row),
+              column,
+              columnIndex: $xeTable.getColumnIndex(column),
+              cell,
+              $table: $xeTable
+            }, null, false);
+            internalData._lastCallTime = Date.now();
+          }
+          return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        });
+      }
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+    };
     editMethods = {
       /**
        * 往表格中插入临时数据
@@ -23444,7 +23854,7 @@ edit_hook_hooks.add('tableEditModule', {
         if (fieldOrColumn) {
           column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
         }
-        return $xeTable.setEditCell(row, column);
+        return handleEditCell(row, column, false);
       },
       setActiveCell(row, fieldOrColumn) {
         if (true) {
@@ -23457,28 +23867,7 @@ edit_hook_hooks.add('tableEditModule', {
        * 激活单元格编辑
        */
       setEditCell(row, fieldOrColumn) {
-        const {
-          editConfig
-        } = props;
-        const column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
-        if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
-          return $xeTable.scrollToRow(row, column).then(() => {
-            const cell = $xeTable.getCellElement(row, column);
-            if (cell) {
-              editPrivateMethods.handleEdit({
-                row,
-                rowIndex: $xeTable.getRowIndex(row),
-                column,
-                columnIndex: $xeTable.getColumnIndex(column),
-                cell,
-                $table: $xeTable
-              });
-              internalData._lastCallTime = Date.now();
-            }
-            return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
-          });
-        }
-        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        return handleEditCell(row, fieldOrColumn, true);
       },
       /**
        * 只对 trigger=dblclick 有效，选中单元格
@@ -23511,130 +23900,7 @@ edit_hook_hooks.add('tableEditModule', {
        * 处理激活编辑
        */
       handleEdit(params, evnt) {
-        const {
-          editConfig,
-          mouseConfig
-        } = props;
-        const {
-          editStore,
-          tableColumn
-        } = reactData;
-        const editOpts = computeEditOpts.value;
-        const {
-          mode
-        } = editOpts;
-        const {
-          actived,
-          focused
-        } = editStore;
-        const {
-          row,
-          column
-        } = params;
-        const {
-          editRender
-        } = column;
-        const cell = params.cell || $xeTable.getCellElement(row, column);
-        const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
-        params.cell = cell;
-        if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
-          // 激活编辑
-          if (!$xeTable.isPendingByRow(row)) {
-            if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
-              // 判断是否禁用编辑
-              let type = 'edit-disabled';
-              if (!beforeEditMethod || beforeEditMethod({
-                ...params,
-                $table: $xeTable,
-                $grid: $xeTable.xegrid
-              })) {
-                if (mouseConfig) {
-                  editMethods.clearSelected();
-                  if ($xeTable.clearCellAreas) {
-                    $xeTable.clearCellAreas();
-                    $xeTable.clearCopyCellArea();
-                  }
-                }
-                $xeTable.closeTooltip();
-                if (actived.column) {
-                  handleClearEdit(evnt);
-                }
-                type = 'edit-activated';
-                column.renderHeight = cell.offsetHeight;
-                actived.args = params;
-                actived.row = row;
-                actived.column = column;
-                if (mode === 'row') {
-                  tableColumn.forEach(column => getEditColumnModel(row, column));
-                } else {
-                  getEditColumnModel(row, column);
-                }
-                const afterEditMethod = editOpts.afterEditMethod;
-                (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-                  editPrivateMethods.handleFocus(params, evnt);
-                  if (afterEditMethod) {
-                    afterEditMethod({
-                      ...params,
-                      $table: $xeTable,
-                      $grid: $xeTable.xegrid
-                    });
-                  }
-                });
-              }
-              $xeTable.dispatchEvent(type, {
-                row,
-                rowIndex: $xeTable.getRowIndex(row),
-                $rowIndex: $xeTable.getVMRowIndex(row),
-                column,
-                columnIndex: $xeTable.getColumnIndex(column),
-                $columnIndex: $xeTable.getVMColumnIndex(column)
-              }, evnt);
-              // v4已废弃
-              if (type === 'edit-activated') {
-                $xeTable.dispatchEvent('edit-actived', {
-                  row,
-                  rowIndex: $xeTable.getRowIndex(row),
-                  $rowIndex: $xeTable.getVMRowIndex(row),
-                  column,
-                  columnIndex: $xeTable.getColumnIndex(column),
-                  $columnIndex: $xeTable.getVMColumnIndex(column)
-                }, evnt);
-              }
-            } else {
-              const {
-                column: oldColumn
-              } = actived;
-              if (mouseConfig) {
-                editMethods.clearSelected();
-                if ($xeTable.clearCellAreas) {
-                  $xeTable.clearCellAreas();
-                  $xeTable.clearCopyCellArea();
-                }
-              }
-              if (oldColumn !== column) {
-                const {
-                  model: oldModel
-                } = oldColumn;
-                if (oldModel.update) {
-                  setCellValue(row, oldColumn, oldModel.value);
-                }
-                if ($xeTable.clearValidate) {
-                  $xeTable.clearValidate(row, column);
-                }
-              }
-              column.renderHeight = cell.offsetHeight;
-              actived.args = params;
-              actived.column = column;
-              setTimeout(() => {
-                editPrivateMethods.handleFocus(params, evnt);
-              });
-            }
-            focused.column = null;
-            focused.row = null;
-            $xeTable.focus();
-          }
-        }
-        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        return handleEditActive(params, evnt, true);
       },
       /**
        * @deprecated