vxe-table 3.12.10-beta.2 → 3.12.10-beta.21

package/es/table/module/export/mixin.js

@@ -943,6 +943,48 @@ export function readLocalFile(options = {}) {
         fileInput.click();
     });
 }
+function handleFilterColumns(exportOpts, column, columns) {
+    return columns.some((item) => {
+        if (isColumnInfo(item)) {
+            return column.id === item.id;
+        }
+        else if (XEUtils.isString(item)) {
+            return column.field === item;
+        }
+        else {
+            const colid = item.id || item.colId;
+            const type = item.type;
+            const field = item.field;
+            if (colid) {
+                return column.id === colid;
+            }
+            else if (field && type) {
+                return column.field === field && column.type === type;
+            }
+            else if (field) {
+                return column.field === field;
+            }
+            else if (type) {
+                return column.type === type;
+            }
+        }
+        return false;
+    });
+}
+function handleFilterFields(exportOpts, column, includeFields, excludeFields) {
+    if (excludeFields) {
+        if (XEUtils.includes(excludeFields, column.field)) {
+            return false;
+        }
+    }
+    if (includeFields) {
+        if (XEUtils.includes(includeFields, column.field)) {
+            return true;
+        }
+        return false;
+    }
+    return exportOpts.original ? column.field : defaultFilterExportColumn(column);
+}
 function handleExportAndPrint($xeTable, options, isPrint) {
     const props = $xeTable;
     const reactData = $xeTable;
@@ -972,7 +1014,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     const modes = defOpts.modes || [];
     const checkMethod = customOpts.checkMethod;
     const exportColumns = collectColumn.slice(0);
-    const { columns } = defOpts;
+    const { columns, excludeFields, includeFields } = defOpts;
     // 处理类型
     const typeList = types.map((value) => {
         return {
@@ -995,38 +1037,19 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     // 默认选中
     XEUtils.eachTree(exportColumns, (column, index, items, path, parent) => {
         const isColGroup = column.children && column.children.length;
-        if (isColGroup || defaultFilterExportColumn(column)) {
-            column.checked = columns
-                ? columns.some((item) => {
-                    if (isColumnInfo(item)) {
-                        return column.id === item.id;
-                    }
-                    else if (XEUtils.isString(item)) {
-                        return column.field === item;
-                    }
-                    else {
-                        const colid = item.id || item.colId;
-                        const type = item.type;
-                        const field = item.field;
-                        if (colid) {
-                            return column.id === colid;
-                        }
-                        else if (field && type) {
-                            return column.field === field && column.type === type;
-                        }
-                        else if (field) {
-                            return column.field === field;
-                        }
-                        else if (type) {
-                            return column.type === type;
-                        }
-                    }
-                    return false;
-                })
-                : column.visible;
-            column.halfChecked = false;
-            column.disabled = (parent && parent.disabled) || (checkMethod ? !checkMethod({ column }) : false);
+        let isChecked = false;
+        if (columns && columns.length) {
+            isChecked = handleFilterColumns(defOpts, column, columns);
+        }
+        else if (excludeFields || includeFields) {
+            isChecked = handleFilterFields(defOpts, column, includeFields, excludeFields);
+        }
+        else {
+            isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
         }
+        column.checked = isChecked;
+        column.halfChecked = false;
+        column.disabled = (parent && parent.disabled) || (checkMethod ? !checkMethod({ column }) : false);
     });
     // 更新条件
     Object.assign(exportStore, {

package/es/table/module/keyboard/mixin.js

@@ -1,4 +1,5 @@
 import XEUtils from 'xe-utils';
+import { getRefElem } from '../../src/util';
 import { browse, hasClass, getAbsolutePos, addClass, removeClass } from '../../../ui/src/dom';
 function getTargetOffset(target, container) {
     let offsetTop = 0;
@@ -22,36 +23,66 @@ function getTargetOffset(target, container) {
     return { offsetTop, offsetLeft };
 }
 function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offsetClientTop, moveRange) {
+    const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
+    const { showOverflow } = props;
+    const { fullAllDataRowIdData, isResizeCellHeight } = internalData;
+    const rowOpts = $xeTable.computeRowOpts;
+    const cellOpts = $xeTable.computeCellOpts;
+    const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+    const { row } = params;
     let countHeight = 0;
     let rangeRows = [];
     let moveSize = 0;
     const isDown = moveRange > 0;
-    const { scrollYLoad, rowHeight } = reactData;
+    const { scrollYLoad } = reactData;
     const { afterFullData } = internalData;
+    if (isDown) {
+        moveSize = offsetClientTop + moveRange;
+    }
+    else {
+        moveSize = (trRect.height - offsetClientTop) + Math.abs(moveRange);
+    }
     if (scrollYLoad) {
-        if (isDown) {
-            moveSize = offsetClientTop + moveRange;
-        }
-        else {
-            moveSize = (trRect.height - offsetClientTop) + Math.abs(moveRange);
-        }
-        const _rowIndex = $xeTable.getVTRowIndex(params.row);
-        if (isDown) {
-            rangeRows = afterFullData.slice(_rowIndex, _rowIndex + Math.ceil(moveSize / rowHeight));
+        const _rowIndex = $xeTable.getVTRowIndex(row);
+        const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
+        if (!isCustomCellHeight && showOverflow) {
+            if (isDown) {
+                rangeRows = afterFullData.slice(_rowIndex, _rowIndex + Math.ceil(moveSize / defaultRowHeight));
+            }
+            else {
+                rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / defaultRowHeight), _rowIndex + 1);
+            }
         }
         else {
-            rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / rowHeight), _rowIndex + 1);
+            if (isDown) {
+                for (let i = _rowIndex; i < afterFullData.length; i++) {
+                    const item = afterFullData[i];
+                    const rowid = $xeTable.getRowid(item);
+                    const rowRest = fullAllDataRowIdData[rowid] || {};
+                    countHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+                    rangeRows.push(item);
+                    if (countHeight > moveSize) {
+                        return rangeRows;
+                    }
+                }
+            }
+            else {
+                for (let len = _rowIndex; len >= 0; len--) {
+                    const item = afterFullData[len];
+                    const rowid = $xeTable.getRowid(item);
+                    const rowRest = fullAllDataRowIdData[rowid] || {};
+                    countHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+                    rangeRows.push(item);
+                    if (countHeight > moveSize) {
+                        return rangeRows;
+                    }
+                }
+            }
         }
     }
     else {
-        if (isDown) {
-            moveSize = evnt.clientY - trRect.y;
-        }
-        else {
-            moveSize = trRect.y - evnt.clientY + trRect.height;
-        }
         const siblingProp = isDown ? 'next' : 'previous';
         while (targetTrElem && countHeight < moveSize) {
             const rowNodeRest = $xeTable.getRowNode(targetTrElem);
@@ -217,15 +248,27 @@ export default {
         },
         handleCheckboxRangeEvent(evnt, params) {
             const $xeTable = this;
+            const internalData = $xeTable;
+            const { elemStore } = internalData;
+            const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+            const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
+            const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
             const { column, cell } = params;
             if (column.type === 'checkbox') {
-                const { $el, elemStore } = this;
+                let bodyWrapperElem = bodyScrollElem;
+                if (leftScrollElem && column.fixed === 'left') {
+                    bodyWrapperElem = leftScrollElem;
+                }
+                else if (rightScrollElem && column.fixed === 'right') {
+                    bodyWrapperElem = rightScrollElem;
+                }
+                if (!bodyWrapperElem) {
+                    return;
+                }
+                const el = $xeTable.$refs.refElem;
                 const disX = evnt.clientX;
                 const disY = evnt.clientY;
-                const bodyWrapperElem = elemStore[`${column.fixed || 'main'}-body-wrapper`] || elemStore['main-body-wrapper'];
                 const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range');
-                const domMousemove = document.onmousemove;
-                const domMouseup = document.onmouseup;
                 const trElem = cell.parentNode;
                 const selectRecords = this.getCheckboxRecords();
                 let lastRangeRows = [];
@@ -331,7 +374,7 @@ export default {
                         }
                     }, 50);
                 };
-                addClass($el, 'drag--range');
+                addClass(el, 'drag--range');
                 document.onmousemove = evnt => {
                     evnt.preventDefault();
                     evnt.stopPropagation();
@@ -359,10 +402,10 @@ export default {
                 };
                 document.onmouseup = (evnt) => {
                     stopMouseScroll();
-                    removeClass($el, 'drag--range');
+                    removeClass(el, 'drag--range');
                     checkboxRangeElem.removeAttribute('style');
-                    document.onmousemove = domMousemove;
-                    document.onmouseup = domMouseup;
+                    document.onmousemove = null;
+                    document.onmouseup = null;
                     triggerEvent('end', evnt);
                 };
                 triggerEvent('start', evnt);

package/es/table/module/menu/mixin.js

@@ -57,6 +57,8 @@ export default {
          * 快捷菜单事件处理
          */
         handleGlobalContextmenuEvent(evnt) {
+            const $xeTable = this;
+            const internalData = $xeTable;
             const { $refs, tId, editStore, menuConfig, contextMenu, ctxMenuStore, ctxMenuOpts, mouseConfig, mouseOpts } = this;
             const { selected } = editStore;
             const layoutList = ['header', 'body', 'footer'];
@@ -65,7 +67,7 @@ export default {
                     evnt.preventDefault();
                     return;
                 }
-                if (this._keyCtx) {
+                if (internalData._keyCtx) {
                     const type = 'body';
                     const params = { type, $grid: this.$xegrid, $table: this, keyboard: true, columns: this.visibleColumn.slice(0), $event: evnt };
                     // 如果开启单元格区域

package/es/table/src/body.js

@@ -11,10 +11,10 @@ const isVMScrollProcess = ($xeTable) => {
     const tableProps = $xeTable;
     const tableReactData = $xeTable;
     const { delayHover } = tableProps;
-    const { lastScrollTime, _isResize } = tableReactData;
-    return !!(_isResize || (lastScrollTime && Date.now() < lastScrollTime + delayHover));
+    const { lastScrollTime, isDragResize } = tableReactData;
+    return !!(isDragResize || (lastScrollTime && Date.now() < lastScrollTime + delayHover));
 };
-function renderLine(h, _vm, params) {
+function renderLine(h, _vm, params, cellHeight) {
     const $xeTable = _vm.$parent;
     const tableProps = $xeTable;
     const tableInternalData = $xeTable;
@@ -33,18 +33,20 @@ function renderLine(h, _vm, params) {
     let prevRow = null;
     if (rest) {
         rLevel = rest.level;
-        prevRow = rest.items[rest._index - 1];
+        prevRow = rest.items[rest.treeIndex - 1];
     }
     const isFirstRow = $xeTable.eqRow(afterFullData[0], row);
     if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
         return [
             h('div', {
+                key: 'tl',
                 class: 'vxe-tree--line-wrapper'
             }, [
                 h('div', {
                     class: 'vxe-tree--line',
                     style: {
                         height: `${isFirstRow ? 1 : calcTreeLine(params, prevRow)}px`,
+                        bottom: `-${Math.floor(cellHeight / 2)}px`,
                         left: `${(rLevel * treeOpts.indent) + (rLevel ? 2 - getOffsetSize($xeTable) : 0) + 16}px`
                     }
                 })
@@ -62,8 +64,8 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
     const { fullAllDataRowIdData } = tableInternalData;
-    const { columnKey, height, showOverflow: allColumnOverflow, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig } = tableProps;
-    const { tableData, overflowX, currentColumn, scrollXLoad, scrollYLoad, isCalcCellHeight, mergeList, editStore, isAllOverflow, validErrorMaps } = tableReactData;
+    const { columnKey, height, showOverflow: allColumnOverflow, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
+    const { tableData, overflowX, currentColumn, scrollXLoad, scrollYLoad, calcCellHeightFlag, resizeHeightFlag, mergeList, editStore, isAllOverflow, validErrorMaps } = tableReactData;
     const { afterFullData, scrollXStore, scrollYStore } = tableInternalData;
     const cellOpts = $xeTable.computeCellOpts;
     const validOpts = $xeTable.computeValidOpts;
@@ -73,15 +75,16 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     const rowOpts = $xeTable.computeRowOpts;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+    const currCellHeight = cellOpts.height || rowOpts.height || defaultRowHeight;
     const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = rowDragOpts;
     const columnOpts = $xeTable.computeColumnOpts;
     const mouseOpts = $xeTable.computeMouseOpts;
     const areaOpts = $xeTable.computeAreaOpts;
     const { selectCellToRow } = areaOpts;
-    const { type, cellRender, editRender, align, showOverflow, className, treeNode, slots } = column;
+    const { type, cellRender, editRender, align, showOverflow, className, treeNode, rowResize, slots } = column;
     const { verticalAlign } = cellOpts;
     const { actived } = editStore;
-    const { height: customRHeight } = rowOpts;
+    const rowRest = fullAllDataRowIdData[rowid];
     const colid = column.id;
     const renderOpts = editRender || cellRender;
     const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
@@ -91,21 +94,22 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     const columnIndex = $xeTable.getColumnIndex(column);
     const _columnIndex = $xeTable.getVTColumnIndex(column);
     const isEdit = isEnableConf(editRender);
+    const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
     let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
+    const isPadding = allPadding === null ? cellOpts.padding : allPadding;
     const cellOverflow = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? allColumnOverflow : showOverflow;
     const showEllipsis = cellOverflow === 'ellipsis';
     const showTitle = cellOverflow === 'title';
     const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
     // 如果表格加上 showOverflow 则不再支持列单独设置
-    const hasEllipsis = allColumnOverflow || showTitle || showTooltip || showEllipsis;
+    const hasEllipsis = allColumnOverflow || showTitle || showTooltip || showEllipsis || resizeHeight > 0;
     let isDirty;
     const tdOns = {};
-    const rest = fullAllDataRowIdData[rowid];
     const cellAlign = align || (compConf ? compConf.tableCellAlign : '') || allAlign;
     const errorValidItem = validErrorMaps[`${rowid}:${colid}`];
     const showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? (height || tableData.length > 1) : validOpts.message === 'inline');
-    const attrs = { colid };
-    const params = {
+    const tdAttrs = { colid };
+    const cellParams = {
         $table: $xeTable,
         $grid: $xeTable.xegrid,
         isEdit: false,
@@ -133,7 +137,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
         isRowDragCell = rowDragOpts.trigger === 'row' || (column.dragSort && rowDragOpts.trigger === 'cell');
     }
     if (isRowDragCell) {
-        isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
+        isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(cellParams));
     }
     // hover 进入事件
     if (showTitle || showTooltip || showAllTip || tooltipConfig) {
@@ -146,9 +150,9 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
             }
             else if (showTooltip || showAllTip) {
                 // 如果配置了显示 tooltip
-                $xeTable.triggerBodyTooltipEvent(evnt, params);
+                $xeTable.triggerBodyTooltipEvent(evnt, cellParams);
             }
-            $xeTable.dispatchEvent('cell-mouseenter', Object.assign({ cell: evnt.currentTarget }, params), evnt);
+            $xeTable.dispatchEvent('cell-mouseenter', Object.assign({ cell: evnt.currentTarget }, cellParams), evnt);
         };
     }
     // hover 退出事件
@@ -160,13 +164,13 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
             if (showTooltip || showAllTip) {
                 $xeTable.handleTargetLeaveEvent(evnt);
             }
-            $xeTable.dispatchEvent('cell-mouseleave', Object.assign({ cell: evnt.currentTarget }, params), evnt);
+            $xeTable.dispatchEvent('cell-mouseleave', Object.assign({ cell: evnt.currentTarget }, cellParams), evnt);
         };
     }
     // 按下事件处理
     if (isRowDragCell || checkboxOpts.range || mouseConfig) {
         tdOns.mousedown = (evnt) => {
-            $xeTable.triggerCellMousedownEvent(evnt, params);
+            $xeTable.triggerCellMousedownEvent(evnt, cellParams);
         };
     }
     // 拖拽列事件
@@ -175,11 +179,11 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     }
     // 点击事件处理
     tdOns.click = (evnt) => {
-        $xeTable.triggerCellClickEvent(evnt, params);
+        $xeTable.triggerCellClickEvent(evnt, cellParams);
     };
     // 双击事件处理
     tdOns.dblclick = (evnt) => {
-        $xeTable.triggerCellDblclickEvent(evnt, params);
+        $xeTable.triggerCellDblclickEvent(evnt, cellParams);
     };
     // 合并行或列
     if (mergeList.length) {
@@ -190,29 +194,29 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
                 return null;
             }
             if (rowspan > 1) {
-                attrs.rowspan = rowspan;
+                tdAttrs.rowspan = rowspan;
             }
             if (colspan > 1) {
-                attrs.colspan = colspan;
+                tdAttrs.colspan = colspan;
             }
         }
     }
     else if (spanMethod) {
         // 自定义合并行或列的方法
-        const { rowspan = 1, colspan = 1 } = spanMethod(params) || {};
+        const { rowspan = 1, colspan = 1 } = spanMethod(cellParams) || {};
         if (!rowspan || !colspan) {
             return null;
         }
         if (rowspan > 1) {
-            attrs.rowspan = rowspan;
+            tdAttrs.rowspan = rowspan;
         }
         if (colspan > 1) {
-            attrs.colspan = colspan;
+            tdAttrs.colspan = colspan;
         }
     }
     // 如果被合并不可隐藏
     if (fixedHiddenColumn && mergeList) {
-        if (attrs.colspan > 1 || attrs.rowspan > 1) {
+        if (tdAttrs.colspan > 1 || tdAttrs.rowspan > 1) {
             fixedHiddenColumn = false;
         }
     }
@@ -220,39 +224,77 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
         isDirty = $xeTable.isUpdateByRow(row, column.field);
     }
+    const isVNAutoHeight = scrollYLoad && !hasEllipsis;
+    let cellHeight = currCellHeight;
+    const vnHeight = calcCellHeightFlag ? rowRest.height : 0;
+    if (resizeHeight) {
+        cellHeight = resizeHeight;
+    }
+    else {
+        if (scrollYLoad) {
+            if (!hasEllipsis) {
+                cellHeight = vnHeight || currCellHeight;
+            }
+        }
+    }
+    const isLastColumn = $columnIndex === columns.length - 1;
+    const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
+    let isVNPreEmptyStatus = false;
+    if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+        isVNPreEmptyStatus = true;
+    }
+    else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+        isVNPreEmptyStatus = true;
+    }
+    const tcStyle = {};
+    if (hasEllipsis) {
+        tcStyle.height = `${cellHeight}px`;
+    }
+    else {
+        tcStyle.minHeight = `${cellHeight}px`;
+    }
     const tdVNs = [];
     if (fixedHiddenColumn && (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
         tdVNs.push(h('div', {
+            key: 'tc',
             class: ['vxe-cell', {
                     'c--title': showTitle,
                     'c--tooltip': showTooltip,
                     'c--ellipsis': showEllipsis
                 }],
-            style: {
-                maxHeight: hasEllipsis && (customRHeight || defaultRowHeight) ? `${customRHeight || defaultRowHeight}px` : ''
-            }
+            style: tcStyle
         }));
     }
     else {
         // 渲染单元格
-        tdVNs.push(...renderLine(h, _vm, params), h('div', {
+        tdVNs.push(...renderLine(h, _vm, cellParams, cellHeight), h('div', {
+            key: 'tc',
             class: ['vxe-cell', {
                     'c--title': showTitle,
                     'c--tooltip': showTooltip,
                     'c--ellipsis': showEllipsis
                 }],
-            style: {
-                maxHeight: hasEllipsis && (customRHeight || defaultRowHeight) ? `${customRHeight || defaultRowHeight}px` : ''
-            },
+            style: tcStyle,
             attrs: {
                 title: showTitle ? $xeTable.getCellLabel(row, column) : null
             }
-        }, column.renderCell(h, params)));
+        }, isVNPreEmptyStatus
+            ? []
+            : [
+                h('div', {
+                    attrs: {
+                        colid,
+                        rowid
+                    },
+                    class: 'vxe-cell--wrapper'
+                }, column.renderCell(h, cellParams))
+            ]));
         if (showValidTip && errorValidItem) {
             const errRule = errorValidItem.rule;
             const validSlot = slots ? slots.valid : null;
-            const validParams = Object.assign(Object.assign(Object.assign({}, params), errorValidItem), { rule: errorValidItem });
+            const validParams = Object.assign(Object.assign(Object.assign({}, cellParams), errorValidItem), { rule: errorValidItem });
             tdVNs.push(h('div', {
+                key: 'tcv',
                 class: ['vxe-cell--valid-error-tip', getClass(validOpts.className, errorValidItem)],
                 style: errRule && errRule.maxWidth
                     ? {
@@ -274,34 +316,24 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
             ]));
         }
     }
-    let cellHeight = '';
-    const vnHeight = isCalcCellHeight ? rest.height : 0;
-    if (hasEllipsis) {
-        if (customRHeight) {
-            cellHeight = `${customRHeight}px`;
-        }
-        else if (!isAllOverflow) {
-            cellHeight = `${vnHeight || defaultRowHeight || 18}px`;
-        }
-    }
-    else {
-        cellHeight = `${vnHeight || defaultRowHeight || 18}px`;
-    }
     if (mouseConfig && mouseOpts.area && selectCellToRow) {
         if ((!$columnIndex && selectCellToRow === true) ||
             (selectCellToRow === column.field)) {
             tdVNs.push(h('div', {
+                key: 'tca',
                 class: 'vxe-cell--area-status'
             }));
         }
     }
-    const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
-    let isPreLoadStatus = false;
-    if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex || _rowIndex > scrollYStore.visibleEndIndex)) {
-        isPreLoadStatus = true;
-    }
-    else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex || _columnIndex > scrollXStore.visibleEndIndex)) {
-        isPreLoadStatus = true;
+    if (rowResize && rowOpts.resizable) {
+        tdVNs.push(h('div', {
+            key: 'tcr',
+            class: 'vxe-cell--row-resizable',
+            on: {
+                mousedown: (evnt) => $xeTable.handleRowResizeMousedownEvent(evnt, cellParams),
+                dblclick: (evnt) => $xeTable.handleRowResizeDblclickEvent(evnt, cellParams)
+            }
+        }));
     }
     return h('td', {
         class: [
@@ -311,12 +343,14 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
                 [`col--${cellAlign}`]: cellAlign,
                 [`col--vertical-${verticalAlign}`]: verticalAlign,
                 [`col--${type}`]: type,
-                'col--last': $columnIndex === columns.length - 1,
+                'col--last': isLastColumn,
                 'col--tree-node': treeNode,
                 'col--edit': isEdit,
                 'col--ellipsis': hasEllipsis,
+                'col--auto-height': isVNAutoHeight,
                 'fixed--width': !isAutoCellWidth,
                 'fixed--hidden': fixedHiddenColumn,
+                'is--padding': isPadding,
                 'is--drag-cell': isRowDragCell && (isCrossDrag || isPeerDrag || !rowLevel),
                 'is--drag-disabled': isDisabledDrag,
                 'col--dirty': isDirty,
@@ -324,17 +358,15 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
                 'col--valid-error': !!errorValidItem,
                 'col--current': currentColumn === column
             },
-            getClass(compCellClassName, params),
-            getClass(className, params),
-            getClass(allCellClassName, params)
+            getClass(compCellClassName, cellParams),
+            getClass(className, cellParams),
+            getClass(allCellClassName, cellParams)
         ],
         key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? column.id : $columnIndex,
-        attrs,
-        style: Object.assign({
-            height: cellHeight
-        }, XEUtils.isFunction(compCellStyle) ? compCellStyle(params) : compCellStyle, XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle),
+        attrs: tdAttrs,
+        style: Object.assign({}, XEUtils.isFunction(compCellStyle) ? compCellStyle(cellParams) : compCellStyle, XEUtils.isFunction(cellStyle) ? cellStyle(cellParams) : cellStyle),
         on: tdOns
-    }, isPreLoadStatus || (isOptimizeMode && fixedHiddenColumn) ? [] : tdVNs);
+    }, isOptimizeMode && fixedHiddenColumn ? [] : tdVNs);
 }
 function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     const $xeTable = _vm.$parent;
@@ -648,7 +680,7 @@ export default {
                 $xeTable.triggerBodyScrollEvent(evnt, fixedType);
             }
         };
-        if (scrollYLoad || leftFixedWidth || rightFixedWidth) {
+        if (leftFixedWidth || rightFixedWidth) {
             ons.wheel = $xeTable.triggerBodyWheelEvent;
         }
         return h('div', {

package/es/table/src/cell.js

@@ -156,7 +156,7 @@ function renderTitleContent(h, params, content) {
     const ons = {};
     if (showTitle || showTooltip || showAllTip) {
         ons.mouseenter = (evnt) => {
-            if (tableReactData._isResize) {
+            if (tableReactData.isDragResize) {
                 return;
             }
             if (showTitle) {
@@ -169,7 +169,7 @@ function renderTitleContent(h, params, content) {
     }
     if (showTooltip || showAllTip) {
         ons.mouseleave = (evnt) => {
-            if (tableReactData._isResize) {
+            if (tableReactData.isDragResize) {
                 return;
             }
             if (showTooltip || showAllTip) {
@@ -386,11 +386,7 @@ export const Cell = {
         return Cell.renderTreeIcon(h, params, Cell.renderDefaultCell.call(this, h, params));
     },
     renderDefaultFooter(h, params) {
-        return [
-            h('span', {
-                class: 'vxe-cell--item'
-            }, getFooterContent(h, params))
-        ];
+        return getFooterContent(h, params);
     },
     /**
      * 树节点

package/es/table/src/column.js

@@ -68,6 +68,8 @@ export const columnProps = {
     treeNode: Boolean,
     // 设置为拖拽排序
     dragSort: Boolean,
+    // 设置为行高拖拽
+    rowResize: Boolean,
     // 是否可视
     visible: { type: Boolean, default: null },
     // 表头单元格数据导出方法