vxe-table 4.10.6-beta.25 → 4.10.6-beta.27

package/es/table/src/table.js

@@ -840,13 +840,13 @@ export default defineComponent({
             return { toVisibleIndex: 0, visibleSize: 6 };
         };
         const computeRowHeight = () => {
-            const { showOverflow } = props;
+            const { isAllOverflow } = reactData;
             const tableHeader = refTableHeader.value;
             const tableBody = refTableBody.value;
             const tableBodyElem = tableBody ? tableBody.$el : null;
             const defaultRowHeight = computeDefaultRowHeight.value;
             let rowHeight = 0;
-            if (showOverflow) {
+            if (isAllOverflow) {
                 if (tableBodyElem) {
                     const tableHeaderElem = tableHeader ? tableHeader.$el : null;
                     let firstTrElem;
@@ -869,7 +869,7 @@ export default defineComponent({
             return Math.max(18, rowHeight);
         };
         const handleVirtualYVisible = (currScrollTop) => {
-            const { showOverflow } = props;
+            const { isAllOverflow } = reactData;
             const { elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData } = internalData;
             const rowOpts = computeRowOpts.value;
             const cellOpts = computeCellOpts.value;
@@ -883,7 +883,7 @@ export default defineComponent({
                 let offsetTop = 0;
                 let visibleSize = 0;
                 const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
-                if (!isCustomCellHeight && showOverflow) {
+                if (!isCustomCellHeight && isAllOverflow) {
                     toVisibleIndex = Math.floor(scrollTop / defaultRowHeight);
                     visibleSize = Math.ceil(clientHeight / defaultRowHeight) + 1;
                 }
@@ -891,8 +891,8 @@ export default defineComponent({
                     for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
                         const row = afterFullData[rIndex];
                         const rowid = getRowid($xeTable, row);
-                        const rowRest = fullAllDataRowIdData[rowid];
-                        offsetTop += rowRest ? (rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight) : defaultRowHeight;
+                        const rowRest = fullAllDataRowIdData[rowid] || {};
+                        offsetTop += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
                         if (toVisibleIndex === -1 && scrollTop < offsetTop) {
                             toVisibleIndex = rIndex;
                         }
@@ -1390,34 +1390,31 @@ export default defineComponent({
         };
         const calcCellAutoHeight = (rowRest, wrapperEl) => {
             const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);
-            let topBottomPadding = 0;
-            const firstCellEl = cellElemList[0];
-            if (firstCellEl && firstCellEl.parentElement) {
-                const cellStyle = getComputedStyle(firstCellEl.parentElement);
-                topBottomPadding = Math.ceil(XEUtils.toNumber(cellStyle.paddingTop) + XEUtils.toNumber(cellStyle.paddingBottom));
-            }
-            let colHeight = rowRest.height - topBottomPadding;
+            let colHeight = rowRest.height;
             for (let i = 0; i < cellElemList.length; i++) {
                 const cellElem = cellElemList[i];
+                const tdEl = cellElem.parentElement;
+                const topBottomPadding = Math.ceil(XEUtils.toNumber(tdEl.style.paddingTop) + XEUtils.toNumber(tdEl.style.paddingBottom));
                 const cellHeight = cellElem ? cellElem.clientHeight : 0;
-                colHeight = Math.max(colHeight, Math.ceil(cellHeight));
+                colHeight = Math.max(colHeight - topBottomPadding, Math.ceil(cellHeight));
             }
-            return colHeight + topBottomPadding;
+            return colHeight;
         };
         const calcCellHeight = () => {
-            const { showOverflow } = props;
-            const { tableData, scrollYLoad, scrollXLoad } = reactData;
+            const { tableData, isAllOverflow, scrollYLoad, scrollXLoad } = reactData;
             const { fullAllDataRowIdData } = internalData;
             const defaultRowHeight = computeDefaultRowHeight.value;
             const el = refElem.value;
-            if (!showOverflow && scrollYLoad && el) {
+            if (!isAllOverflow && scrollYLoad && el) {
+                el.setAttribute('data-calc-row', 'Y');
                 tableData.forEach(row => {
                     const rowid = getRowid($xeTable, row);
                     const rowRest = fullAllDataRowIdData[rowid];
                     if (rowRest) {
-                        const height = calcCellAutoHeight(rowRest, el);
-                        rowRest.height = Math.max(defaultRowHeight, scrollXLoad ? Math.max(rowRest.height, height) : height);
+                        const reHeight = calcCellAutoHeight(rowRest, el);
+                        rowRest.height = Math.max(defaultRowHeight, scrollXLoad ? Math.max(rowRest.height, reHeight) : reHeight);
                     }
+                    el.removeAttribute('data-calc-row');
                 });
                 reactData.calcCellHeightFlag++;
             }
@@ -1674,7 +1671,7 @@ export default defineComponent({
             updateAfterDataIndex();
         };
         const updateStyle = () => {
-            const { border, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props;
+            const { border, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props;
             const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, columnStore, editStore, isAllOverflow, expandColumn } = reactData;
             const { visibleColumn, fullColumnIdData, tableHeight, tableWidth, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData;
             const el = refElem.value;
@@ -1863,7 +1860,7 @@ export default defineComponent({
                         let renderColumnList = tableColumn;
                         let isOptimizeMode = false;
                         // 如果是使用优化模式
-                        if (scrollXLoad || scrollYLoad || (allColumnOverflow && isAllOverflow)) {
+                        if (scrollXLoad || scrollYLoad || isAllOverflow) {
                             if (expandColumn || spanMethod || footerSpanMethod) {
                                 // 如果不支持优化模式
                             }
@@ -1948,7 +1945,7 @@ export default defineComponent({
                                     cellOverflow = XEUtils.isUndefined(showFooterOverflow) || XEUtils.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
                                 }
                                 else {
-                                    cellOverflow = XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow) ? allColumnOverflow : showOverflow;
+                                    cellOverflow = XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow) ? isAllOverflow : showOverflow;
                                 }
                                 const showEllipsis = cellOverflow === 'ellipsis';
                                 const showTitle = cellOverflow === 'title';
@@ -2534,11 +2531,10 @@ export default defineComponent({
          * @param {Array} datas 数据
          */
         const loadTableData = (datas, isReset) => {
-            const { keepSource, treeConfig, showOverflow } = props;
+            const { keepSource, treeConfig } = props;
             const { editStore, scrollYLoad: oldScrollYLoad } = reactData;
             const { scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData;
             const treeOpts = computeTreeOpts.value;
-            const rowOpts = computeRowOpts.value;
             const { transform } = treeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             let treeData = [];
@@ -2598,32 +2594,15 @@ export default defineComponent({
             internalData.tableSynchData = datas;
             if (isReset) {
                 internalData.isResizeCellHeight = false;
+                reactData.rowExpandedMaps = {};
+                reactData.rowExpandLazyLoadedMaps = {};
+                reactData.treeExpandedMaps = {};
+                reactData.treeExpandLazyLoadedMaps = {};
             }
             // 克隆原数据，用于显示编辑状态，与编辑值做对比
             if (keepSource) {
                 tablePrivateMethods.cacheSourceMap(fullData);
             }
-            if (sYLoad) {
-                if (showOverflow) {
-                    if (!rowOpts.height) {
-                        const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false);
-                        if (errColumn) {
-                            errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
-                        }
-                    }
-                }
-                if (process.env.NODE_ENV === 'development') {
-                    if (!(props.height || props.maxHeight)) {
-                        errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
-                    }
-                    // if (!props.showOverflow) {
-                    //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-                    // }
-                    if (props.spanMethod) {
-                        warnLog('vxe.error.scrollErrProp', ['table.span-method']);
-                    }
-                }
-            }
             if ($xeTable.clearCellAreas && props.mouseConfig) {
                 $xeTable.clearCellAreas();
                 $xeTable.clearCopyCellArea();
@@ -2642,6 +2621,27 @@ export default defineComponent({
                 if (sYLoad) {
                     scrollYStore.endIndex = scrollYStore.visibleSize;
                 }
+                if (sYLoad) {
+                    // if (showOverflow) {
+                    //   if (!rowOpts.height) {
+                    //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+                    //     if (errColumn) {
+                    //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+                    //     }
+                    //   }
+                    // }
+                    if (process.env.NODE_ENV === 'development') {
+                        if (!(props.height || props.maxHeight)) {
+                            errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+                        }
+                        // if (!props.showOverflow) {
+                        //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+                        // }
+                        if (props.spanMethod) {
+                            warnLog('vxe.error.scrollErrProp', ['table.span-method']);
+                        }
+                    }
+                }
                 handleReserveStatus();
                 tablePrivateMethods.checkSelectionStatus();
                 return new Promise(resolve => {
@@ -3039,11 +3039,10 @@ export default defineComponent({
          * 纵向 Y 可视渲染处理
          */
         const loadScrollYData = (scrollTop) => {
-            const { showOverflow } = props;
-            const { mergeList } = reactData;
+            const { mergeList, isAllOverflow } = reactData;
             const { scrollYStore } = internalData;
             const { preloadSize, startIndex, endIndex, offsetSize } = scrollYStore;
-            const autoOffsetYSize = showOverflow ? offsetSize : offsetSize + 1;
+            const autoOffsetYSize = isAllOverflow ? offsetSize : offsetSize + 1;
             const { toVisibleIndex, visibleSize } = handleVirtualYVisible(scrollTop);
             const offsetItem = {
                 startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize - preloadSize),
@@ -4147,7 +4146,7 @@ export default defineComponent({
                     if (rowRest) {
                         const resizeHeight = rowRest.resizeHeight;
                         if (resizeHeight || isFull) {
-                            const currCellHeight = resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+                            const currCellHeight = resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
                             rest[rowid] = currCellHeight;
                         }
                     }
@@ -4192,8 +4191,10 @@ export default defineComponent({
                 const defaultRowHeight = computeDefaultRowHeight.value;
                 const rowid = XEUtils.isString(rowOrId) || XEUtils.isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
                 const rowRest = fullAllDataRowIdData[rowid];
-                const currCellHeight = rowRest ? rowRest.resizeHeight : (cellOpts.height || rowOpts.height || defaultRowHeight);
-                return currCellHeight;
+                if (rowRest) {
+                    return rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+                }
+                return 0;
             },
             /**
              * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
@@ -5279,8 +5280,7 @@ export default defineComponent({
              * @param {ColumnInfo} fieldOrColumn 列配置
              */
             scrollToRow(row, fieldOrColumn) {
-                const { showOverflow } = props;
-                const { scrollYLoad, scrollXLoad } = reactData;
+                const { isAllOverflow, scrollYLoad, scrollXLoad } = reactData;
                 const rest = [];
                 if (row) {
                     if (props.treeConfig) {
@@ -5295,7 +5295,7 @@ export default defineComponent({
                 }
                 return Promise.all(rest).then(() => {
                     if (row) {
-                        if (!showOverflow && (scrollYLoad || scrollXLoad)) {
+                        if (!isAllOverflow && (scrollYLoad || scrollXLoad)) {
                             calcCellHeight();
                             calcCellWidth();
                         }
@@ -6736,6 +6736,7 @@ export default defineComponent({
                         resizeTipElem.style.left = `${resizeTipLeft}px`;
                         resizeTipElem.style.top = `${Math.min(tableHeight - resizeTipHeight, Math.max(0, evnt.clientY - wrapperRect.y - resizeTipHeight / 2))}px`;
                     }
+                    reactData.isDragResize = true;
                 };
                 reactData.isDragResize = true;
                 addClass(tableEl, 'col-drag--resize');
@@ -6745,8 +6746,10 @@ export default defineComponent({
                     document.onmousemove = null;
                     document.onmouseup = null;
                     resizeBarElem.style.display = 'none';
-                    reactData.isDragResize = false;
                     internalData._lastResizeTime = Date.now();
+                    setTimeout(() => {
+                        reactData.isDragResize = false;
+                    }, 50);
                     const resizeWidth = resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
                     const resizeParams = Object.assign(Object.assign({}, params), { resizeWidth, resizeColumn });
                     if (resizableOpts.dragMode === 'fixed') {
@@ -6777,6 +6780,8 @@ export default defineComponent({
                 const { isDblclickAutoWidth } = resizableOpts;
                 const el = refElem.value;
                 if (isDblclickAutoWidth && el) {
+                    evnt.stopPropagation();
+                    evnt.preventDefault();
                     const { fullColumnIdData } = internalData;
                     const { column } = params;
                     let resizeColumn = column;
@@ -6842,7 +6847,7 @@ export default defineComponent({
                     return;
                 }
                 const defaultRowHeight = computeDefaultRowHeight.value;
-                const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+                const currCellHeight = rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
                 const tableRect = tableEl.getBoundingClientRect();
                 const trRect = trEl.getBoundingClientRect();
                 const targetOffsetY = dragClientY - trRect.y - trEl.clientHeight;
@@ -6885,6 +6890,7 @@ export default defineComponent({
                         resizeTipElem.style.left = `${resizeBarLeft}px`;
                         resizeTipElem.style.top = `${resizeBarTop}px`;
                     }
+                    reactData.isDragResize = true;
                 };
                 reactData.isDragResize = true;
                 addClass(tableEl, 'row-drag--resize');
@@ -6894,8 +6900,10 @@ export default defineComponent({
                     document.onmousemove = null;
                     document.onmouseup = null;
                     resizeBarElem.style.display = 'none';
-                    reactData.isDragResize = false;
                     internalData._lastResizeTime = Date.now();
+                    setTimeout(() => {
+                        reactData.isDragResize = false;
+                    }, 50);
                     if (resizeHeight !== currCellHeight) {
                         const resizeParams = Object.assign(Object.assign({}, params), { resizeHeight, resizeRow: row });
                         internalData.isResizeCellHeight = true;
@@ -6916,23 +6924,37 @@ export default defineComponent({
                 const { isDblclickAutoHeight } = resizableOpts;
                 const el = refElem.value;
                 if (isDblclickAutoHeight && el) {
+                    evnt.stopPropagation();
+                    evnt.preventDefault();
+                    const { editStore } = reactData;
                     const { fullAllDataRowIdData } = internalData;
+                    const { actived } = editStore;
                     const { row } = params;
                     const rowid = getRowid($xeTable, row);
                     const rowRest = fullAllDataRowIdData[rowid];
                     if (!rowRest) {
                         return;
                     }
-                    const resizeHeight = calcCellAutoHeight(rowRest, el);
-                    const resizeParams = Object.assign(Object.assign({}, params), { resizeHeight, resizeRow: row });
-                    reactData.isDragResize = false;
-                    internalData._lastResizeTime = Date.now();
-                    if ($xeTable.handleRowResizeDblclickCellAreaEvent) {
-                        $xeTable.handleRowResizeDblclickCellAreaEvent(evnt, resizeParams);
+                    const handleRsHeight = () => {
+                        el.setAttribute('data-calc-row', 'Y');
+                        const resizeHeight = calcCellAutoHeight(rowRest, el);
+                        el.removeAttribute('data-calc-row');
+                        const resizeParams = Object.assign(Object.assign({}, params), { resizeHeight, resizeRow: row });
+                        reactData.isDragResize = false;
+                        internalData._lastResizeTime = Date.now();
+                        if ($xeTable.handleRowResizeDblclickCellAreaEvent) {
+                            $xeTable.handleRowResizeDblclickCellAreaEvent(evnt, resizeParams);
+                        }
+                        else {
+                            rowRest.resizeHeight = resizeHeight;
+                            handleUpdateRowResize(evnt, resizeParams);
+                        }
+                    };
+                    if (actived.row || actived.column) {
+                        $xeTable.clearEdit().then(handleRsHeight);
                     }
                     else {
-                        rowRest.resizeHeight = resizeHeight;
-                        handleUpdateRowResize(evnt, resizeParams);
+                        handleRsHeight();
                     }
                 }
             },
@@ -7350,12 +7372,12 @@ export default defineComponent({
                     internalData.tooltipTimeout = setTimeout(() => {
                         $tooltip = refTooltip.value;
                         if ($tooltip && $tooltip.isActived && !$tooltip.isActived()) {
-                            tableMethods.closeTooltip();
+                            $xeTable.closeTooltip();
                         }
                     }, tooltipOpts.leaveDelay);
                 }
                 else {
-                    tableMethods.closeTooltip();
+                    $xeTable.closeTooltip();
                 }
             },
             triggerHeaderCellClickEvent(evnt, params) {
@@ -7385,7 +7407,10 @@ export default defineComponent({
              */
             triggerCellClickEvent(evnt, params) {
                 const { highlightCurrentRow, editConfig } = props;
-                const { editStore } = reactData;
+                const { editStore, isDragResize } = reactData;
+                if (isDragResize) {
+                    return;
+                }
                 const expandOpts = computeExpandOpts.value;
                 const editOpts = computeEditOpts.value;
                 const treeOpts = computeTreeOpts.value;
@@ -7480,7 +7505,10 @@ export default defineComponent({
              */
             triggerCellDblclickEvent(evnt, params) {
                 const { editConfig } = props;
-                const { editStore } = reactData;
+                const { editStore, isDragResize } = reactData;
+                if (isDragResize) {
+                    return;
+                }
                 const editOpts = computeEditOpts.value;
                 const { actived } = editStore;
                 const cell = evnt.currentTarget;
@@ -8601,7 +8629,10 @@ export default defineComponent({
                 });
             },
             triggerBodyWheelEvent(evnt) {
-                const { deltaY, deltaX } = evnt;
+                const { target, deltaY, deltaX } = evnt;
+                if (target && /^textarea$/i.test(target.tagName)) {
+                    return;
+                }
                 const { highlightHoverRow } = tableProps;
                 const { elemStore, lastScrollTop, lastScrollLeft } = internalData;
                 const rowOpts = computeRowOpts.value;
@@ -8797,8 +8828,7 @@ export default defineComponent({
             },
             // 更新纵向 Y 可视渲染上下剩余空间大小
             updateScrollYSpace() {
-                const { showOverflow } = props;
-                const { scrollYLoad } = reactData;
+                const { isAllOverflow, scrollYLoad } = reactData;
                 const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData } = internalData;
                 const { startIndex } = scrollYStore;
                 const rowOpts = computeRowOpts.value;
@@ -8810,7 +8840,7 @@ export default defineComponent({
                 let ySpaceHeight = 0;
                 if (scrollYLoad) {
                     const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
-                    if (!isCustomCellHeight && showOverflow) {
+                    if (!isCustomCellHeight && isAllOverflow) {
                         ySpaceHeight = afterFullData.length * defaultRowHeight;
                         topSpaceHeight = Math.max(0, startIndex * defaultRowHeight);
                     }
@@ -8818,14 +8848,14 @@ export default defineComponent({
                         for (let i = 0; i < afterFullData.length; i++) {
                             const row = afterFullData[i];
                             const rowid = getRowid($xeTable, row);
-                            const rowRest = fullAllDataRowIdData[rowid];
-                            ySpaceHeight += rowRest ? (rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight) : defaultRowHeight;
+                            const rowRest = fullAllDataRowIdData[rowid] || {};
+                            ySpaceHeight += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
                         }
                         for (let i = 0; i < startIndex; i++) {
                             const row = afterFullData[i];
                             const rowid = getRowid($xeTable, row);
-                            const rowRest = fullAllDataRowIdData[rowid];
-                            topSpaceHeight += rowRest ? (rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight) : defaultRowHeight;
+                            const rowRest = fullAllDataRowIdData[rowid] || {};
+                            topSpaceHeight += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
                         }
                     }
                 }
@@ -8856,12 +8886,12 @@ export default defineComponent({
                 });
             },
             updateScrollXData() {
-                const { showOverflow } = props;
+                const { isAllOverflow } = reactData;
                 handleTableColumn();
                 return nextTick().then(() => {
                     handleTableColumn();
                     $xeTable.updateScrollXSpace();
-                    if (!showOverflow) {
+                    if (!isAllOverflow) {
                         $xeTable.updateScrollYSpace();
                     }
                 });
@@ -9474,7 +9504,7 @@ export default defineComponent({
             if (value && value.length >= 50000) {
                 warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
             }
-            loadTableData(value, false).then(() => {
+            loadTableData(value, true).then(() => {
                 const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
                 internalData.inited = true;
                 internalData.initStatus = true;

package/es/table/src/util.js

@@ -152,6 +152,12 @@ export function getRefElem(refEl) {
     }
     return null;
 }
+export function getCellHeight(height) {
+    if (height === 'unset') {
+        return 0;
+    }
+    return height || 0;
+}
 /**
  * 列宽拖动最大宽度
  * @param params
@@ -430,7 +436,7 @@ export function rowToVisible($xeTable, row) {
                     return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * defaultRowHeight);
                 }
                 let scrollTop = 0;
-                const rowRest = fullAllDataRowIdData[rowid];
+                const rowRest = fullAllDataRowIdData[rowid] || {};
                 const rHeight = rowRest ? (rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight) : defaultRowHeight;
                 for (let i = 0; i < afterFullData.length; i++) {
                     const currRow = afterFullData[i];
@@ -438,8 +444,8 @@ export function rowToVisible($xeTable, row) {
                     if (currRow === row || currRowid === rowid) {
                         break;
                     }
-                    const rowRest = fullAllDataRowIdData[currRowid];
-                    scrollTop += rowRest ? (rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight) : defaultRowHeight;
+                    const currRowRest = fullAllDataRowIdData[currRowid] || {};
+                    scrollTop += currRowRest.resizeHeight || currRowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
                 }
                 if (scrollTop < bodyScrollTop) {
                     return $xeTable.scrollTo(null, scrollTop - leftFixedWidth - 1);

package/es/table/style.css

@@ -1819,8 +1819,8 @@
 .vxe-table--filter-template .vxe-default-input,
 .vxe-table--filter-template .vxe-default-textarea,
 .vxe-table--filter-template .vxe-default-select {
+  font-family: var(--vxe-ui-font-family);
   outline: 0;
-  padding: 0 2px;
   color: var(--vxe-ui-font-color);
   border-radius: var(--vxe-ui-border-radius);
   border: 1px solid var(--vxe-ui-input-border-color);
@@ -1868,13 +1868,10 @@
 }
 .vxe-cell .vxe-default-textarea,
 .vxe-table--filter-template .vxe-default-textarea {
+  font-size: 1em;
   resize: none;
   vertical-align: middle;
 }
-.vxe-cell .vxe-default-textarea:not([rows]),
-.vxe-table--filter-template .vxe-default-textarea:not([rows]) {
-  height: var(--vxe-ui-input-height-default);
-}
 .vxe-cell > .vxe-input > .vxe-input--inner, .vxe-cell > .vxe-textarea > .vxe-textarea--inner,
 .vxe-table--filter-template > .vxe-input > .vxe-input--inner,
 .vxe-table--filter-template > .vxe-textarea > .vxe-textarea--inner {
@@ -1898,9 +1895,17 @@
   resize: none;
 }
 
-.vxe-body--column.col--vertical-top > .vxe-cell > .vxe-cell--wrapper {
+.vxe-body--column.col--vertical-top.col--active > .vxe-cell > .vxe-cell--wrapper {
   height: 100%;
 }
+.vxe-body--column.col--vertical-top.col--active > .vxe-cell > .vxe-cell--wrapper > .vxe-default-textarea {
+  height: 100%;
+}
+
+/*行高*/
+.vxe-table:not([data-calc-row]) .vxe-body--column.col--vertical-top:not(.col--active) > .vxe-cell > .vxe-cell--wrapper {
+  min-height: 100%;
+}
 
 .vxe-table--checkbox-range,
 .vxe-table--cell-main-area,
@@ -2332,10 +2337,10 @@
   /*边框线*/
   /*树形节点*/
   /*单元格高度*/
+  /*溢出列*/
   /*展开行*/
   /*拖拽列*/
   /*拖拽行*/
-  /*溢出列*/
   /*暂无数据*/
   /*校验不通过*/
   /*已废弃，旧的校验样式**/
@@ -2619,6 +2624,11 @@
 .vxe-table--render-default.size--medium .vxe-footer--column.is--padding .vxe-cell {
   padding: var(--vxe-ui-table-cell-padding-medium);
 }
+.vxe-table--render-default.size--medium .vxe-header--column.is--padding .vxe-cell .vxe-default-textarea,
+.vxe-table--render-default.size--medium .vxe-body--column.is--padding .vxe-cell .vxe-default-textarea,
+.vxe-table--render-default.size--medium .vxe-footer--column.is--padding .vxe-cell .vxe-default-textarea {
+  padding: var(--vxe-ui-table-cell-padding-medium);
+}
 .vxe-table--render-default.size--medium .vxe-cell .vxe-default-input,
 .vxe-table--render-default.size--medium .vxe-cell .vxe-default-textarea,
 .vxe-table--render-default.size--medium .vxe-cell .vxe-default-select {
@@ -2639,6 +2649,11 @@
 .vxe-table--render-default.size--small .vxe-footer--column.is--padding .vxe-cell {
   padding: var(--vxe-ui-table-cell-padding-small);
 }
+.vxe-table--render-default.size--small .vxe-header--column.is--padding .vxe-cell .vxe-default-textarea,
+.vxe-table--render-default.size--small .vxe-body--column.is--padding .vxe-cell .vxe-default-textarea,
+.vxe-table--render-default.size--small .vxe-footer--column.is--padding .vxe-cell .vxe-default-textarea {
+  padding: var(--vxe-ui-table-cell-padding-small);
+}
 .vxe-table--render-default.size--small .vxe-cell .vxe-default-input,
 .vxe-table--render-default.size--small .vxe-cell .vxe-default-textarea,
 .vxe-table--render-default.size--small .vxe-cell .vxe-default-select {
@@ -2659,6 +2674,11 @@
 .vxe-table--render-default.size--mini .vxe-footer--column.is--padding .vxe-cell {
   padding: var(--vxe-ui-table-cell-padding-mini);
 }
+.vxe-table--render-default.size--mini .vxe-header--column.is--padding .vxe-cell .vxe-default-textarea,
+.vxe-table--render-default.size--mini .vxe-body--column.is--padding .vxe-cell .vxe-default-textarea,
+.vxe-table--render-default.size--mini .vxe-footer--column.is--padding .vxe-cell .vxe-default-textarea {
+  padding: var(--vxe-ui-table-cell-padding-mini);
+}
 .vxe-table--render-default.size--mini .vxe-cell .vxe-default-input,
 .vxe-table--render-default.size--mini .vxe-cell .vxe-default-textarea,
 .vxe-table--render-default.size--mini .vxe-cell .vxe-default-select {
@@ -2672,6 +2692,11 @@
 .vxe-table--render-default .vxe-footer--column.is--padding .vxe-cell {
   padding: var(--vxe-ui-table-cell-padding-default);
 }
+.vxe-table--render-default .vxe-header--column.is--padding .vxe-cell .vxe-default-textarea,
+.vxe-table--render-default .vxe-body--column.is--padding .vxe-cell .vxe-default-textarea,
+.vxe-table--render-default .vxe-footer--column.is--padding .vxe-cell .vxe-default-textarea {
+  padding: var(--vxe-ui-table-cell-padding-default);
+}
 .vxe-table--render-default .vxe-cell {
   white-space: pre-line;
   word-break: break-all;
@@ -2953,6 +2978,25 @@
   flex-direction: row;
   align-items: center;
 }
+.vxe-table--render-default .vxe-header--column:not(.col--active).col--ellipsis > .vxe-cell,
+.vxe-table--render-default .vxe-body--column:not(.col--active).col--ellipsis > .vxe-cell,
+.vxe-table--render-default .vxe-footer--column:not(.col--active).col--ellipsis > .vxe-cell {
+  overflow: hidden;
+}
+.vxe-table--render-default .vxe-header--column:not(.col--active).col--ellipsis > .vxe-cell > .vxe-cell--wrapper,
+.vxe-table--render-default .vxe-body--column:not(.col--active).col--ellipsis > .vxe-cell > .vxe-cell--wrapper,
+.vxe-table--render-default .vxe-footer--column:not(.col--active).col--ellipsis > .vxe-cell > .vxe-cell--wrapper {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.vxe-table--render-default .vxe-header--column:not(.col--active).vxe-tree-cell > .vxe-cell > .vxe-cell--wrapper, .vxe-table--render-default .vxe-header--column:not(.col--active).col--vertical-top > .vxe-cell > .vxe-cell--wrapper,
+.vxe-table--render-default .vxe-body--column:not(.col--active).vxe-tree-cell > .vxe-cell > .vxe-cell--wrapper,
+.vxe-table--render-default .vxe-body--column:not(.col--active).col--vertical-top > .vxe-cell > .vxe-cell--wrapper,
+.vxe-table--render-default .vxe-footer--column:not(.col--active).vxe-tree-cell > .vxe-cell > .vxe-cell--wrapper,
+.vxe-table--render-default .vxe-footer--column:not(.col--active).col--vertical-top > .vxe-cell > .vxe-cell--wrapper {
+  white-space: pre-line;
+}
 .vxe-table--render-default .vxe-header--column.col--ellipsis > .vxe-cell .vxe-cell--wrapper,
 .vxe-table--render-default .vxe-footer--column.col--ellipsis > .vxe-cell .vxe-cell--wrapper {
   overflow: hidden;
@@ -3159,25 +3203,6 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.vxe-table--render-default .vxe-header--column.col--ellipsis:not(.col--active) > .vxe-cell,
-.vxe-table--render-default .vxe-body--column.col--ellipsis:not(.col--active) > .vxe-cell,
-.vxe-table--render-default .vxe-footer--column.col--ellipsis:not(.col--active) > .vxe-cell {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.vxe-table--render-default .vxe-header--column.col--ellipsis:not(.col--active) > .vxe-cell > .vxe-cell--wrapper,
-.vxe-table--render-default .vxe-body--column.col--ellipsis:not(.col--active) > .vxe-cell > .vxe-cell--wrapper,
-.vxe-table--render-default .vxe-footer--column.col--ellipsis:not(.col--active) > .vxe-cell > .vxe-cell--wrapper {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.vxe-table--render-default .vxe-header--column.col--ellipsis:not(.col--active).col--vertical-top > .vxe-cell,
-.vxe-table--render-default .vxe-body--column.col--ellipsis:not(.col--active).col--vertical-top > .vxe-cell,
-.vxe-table--render-default .vxe-footer--column.col--ellipsis:not(.col--active).col--vertical-top > .vxe-cell {
-  white-space: pre-line;
-}
 .vxe-table--render-default.size--medium .vxe-cell--checkbox {
   font-size: var(--vxe-checkbox-font-size-medium);
 }