vxe-table 4.10.6-beta.26 → 4.10.6-beta.28

package/es/table/src/cell.js

@@ -179,18 +179,6 @@ function renderTitleContent(params, content) {
             : h('span', Object.assign({ class: 'vxe-cell--title' }, ons), getSlotVNs(content))
     ];
 }
-function formatFooterLabel(footerFormatter, params) {
-    if (XEUtils.isFunction(footerFormatter)) {
-        return `${footerFormatter(params)}`;
-    }
-    const isArr = XEUtils.isArray(footerFormatter);
-    const gFormatOpts = isArr ? formats.get(footerFormatter[0]) : formats.get(footerFormatter);
-    const footerFormatMethod = gFormatOpts ? gFormatOpts.tableFooterCellFormatMethod : null;
-    if (footerFormatMethod) {
-        return `${isArr ? footerFormatMethod(params, ...footerFormatter.slice(1)) : footerFormatMethod(params)}`;
-    }
-    return '';
-}
 function getFooterContent(params) {
     const { $table, column, _columnIndex, items, row } = params;
     const { slots, editRender, cellRender, footerFormatter } = column;
@@ -199,42 +187,40 @@ function getFooterContent(params) {
     if (footerSlot) {
         return $table.callSlot(footerSlot, params);
     }
+    let itemValue = '';
+    // 兼容老模式
+    if (XEUtils.isArray(items)) {
+        itemValue = items[_columnIndex];
+    }
+    else {
+        itemValue = XEUtils.get(row, column.field);
+    }
+    const footParams = Object.assign(params, {
+        itemValue
+    });
+    if (footerFormatter) {
+        if (XEUtils.isFunction(footerFormatter)) {
+            return `${footerFormatter(footParams)}`;
+        }
+        const isArr = XEUtils.isArray(footerFormatter);
+        const gFormatOpts = isArr ? formats.get(footerFormatter[0]) : formats.get(footerFormatter);
+        const footerFormatMethod = gFormatOpts ? gFormatOpts.tableFooterCellFormatMethod : null;
+        if (footerFormatMethod) {
+            return `${isArr ? footerFormatMethod(footParams, ...footerFormatter.slice(1)) : footerFormatMethod(footParams)}`;
+        }
+        return '';
+    }
     if (renderOpts) {
         const compConf = renderer.get(renderOpts.name);
         if (compConf) {
             const rtFooter = compConf.renderTableFooter || compConf.renderFooter;
             if (rtFooter) {
-                return getSlotVNs(rtFooter(renderOpts, params));
+                return getSlotVNs(rtFooter(renderOpts, footParams));
             }
         }
     }
-    let itemValue = '';
-    // 兼容老模式
-    if (XEUtils.isArray(items)) {
-        itemValue = items[_columnIndex];
-        return [
-            footerFormatter
-                ? formatFooterLabel(footerFormatter, {
-                    itemValue,
-                    column,
-                    row,
-                    items,
-                    _columnIndex
-                })
-                : formatText(itemValue, 1)
-        ];
-    }
-    itemValue = XEUtils.get(row, column.field);
     return [
-        footerFormatter
-            ? formatFooterLabel(footerFormatter, {
-                itemValue,
-                column,
-                row,
-                items,
-                _columnIndex
-            })
-            : formatText(itemValue, 1)
+        formatText(itemValue, 1)
     ];
 }
 function getDefaultCellLabel(params) {

package/es/table/src/column.js

@@ -54,6 +54,16 @@ export const columnProps = {
     formatter: [Function, Array, String],
     // 格式化表尾显示内容
     footerFormatter: [Function, Array, String],
+    // 是否显示间距
+    padding: {
+        type: Boolean,
+        default: null
+    },
+    // 垂直对齐方式
+    verticalAlign: {
+        type: String,
+        default: null
+    },
     // 是否允许排序
     sortable: Boolean,
     // 自定义排序的属性

package/es/table/src/columnInfo.js

@@ -70,6 +70,8 @@ export class ColumnInfo {
             footerClassName: _vm.footerClassName,
             formatter: formatter,
             footerFormatter: _vm.footerFormatter,
+            padding: _vm.padding,
+            verticalAlign: _vm.verticalAlign,
             sortable: _vm.sortable,
             sortBy: _vm.sortBy,
             sortType: _vm.sortType,

package/es/table/src/footer.js

@@ -2,6 +2,7 @@ import { defineComponent, TransitionGroup, h, ref, inject, nextTick, onMounted,
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { updateCellTitle, getPropClass } from '../../ui/src/dom';
+import { getCellHeight } from './util';
 const { renderer, renderEmptyElement } = VxeUI;
 const renderType = 'footer';
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
@@ -57,7 +58,7 @@ export default defineComponent({
             const defaultRowHeight = computeDefaultRowHeight.value;
             const cellOpts = computeCellOpts.value;
             const footerCellOpts = computeFooterCellOpts.value;
-            const currCellHeight = footerCellOpts.height || cellOpts.height || defaultRowHeight;
+            const currCellHeight = getCellHeight(footerCellOpts.height || cellOpts.height) || defaultRowHeight;
             return tableColumn.map((column, $columnIndex) => {
                 const { type, showFooterOverflow, footerAlign, align, footerClassName, editRender, cellRender } = column;
                 const colid = column.id;

package/es/table/src/header.js

@@ -1,7 +1,7 @@
 import { defineComponent, TransitionGroup, h, ref, inject, nextTick, watch, onMounted, onUnmounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
-import { convertHeaderColumnToRows } from './util';
+import { getCellHeight, convertHeaderColumnToRows } from './util';
 const { renderer, renderEmptyElement } = VxeUI;
 const renderType = 'header';
 export default defineComponent({
@@ -42,7 +42,7 @@ export default defineComponent({
             const cellOpts = computeCellOpts.value;
             const defaultRowHeight = computeDefaultRowHeight.value;
             const headerCellOpts = computeHeaderCellOpts.value;
-            const currCellHeight = headerCellOpts.height || cellOpts.height || defaultRowHeight;
+            const currCellHeight = getCellHeight(headerCellOpts.height || cellOpts.height) || defaultRowHeight;
             const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = columnDragOpts;
             return cols.map((column, $columnIndex) => {
                 const { type, showHeaderOverflow, headerAlign, align, filters, headerClassName, editRender, cellRender } = column;

package/es/table/src/table.js

@@ -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,19 +1390,15 @@ 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 { tableData, isAllOverflow, scrollYLoad, scrollXLoad } = reactData;
@@ -1410,13 +1406,15 @@ export default defineComponent({
             const defaultRowHeight = computeDefaultRowHeight.value;
             const el = refElem.value;
             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++;
             }
@@ -4148,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;
                         }
                     }
@@ -4193,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;
             },
             /**
              * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
@@ -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;
@@ -7882,7 +7910,11 @@ export default defineComponent({
                                         else {
                                             // 根到根
                                         }
-                                        const fullList = XEUtils.toTreeArray(internalData.afterTreeFullData, { children: childrenField });
+                                        const fullList = XEUtils.toTreeArray(internalData.afterTreeFullData, {
+                                            key: rowField,
+                                            parentKey: parentField,
+                                            children: mapChildrenField
+                                        });
                                         // 移出
                                         const otfIndex = $xeTable.findRowIndexOf(fullList, dragRow);
                                         fullList.splice(otfIndex, 1);
@@ -7898,10 +7930,10 @@ export default defineComponent({
                                         }
                                         dragRow[parentField] = isDragToChildFlag ? prevDragRow[rowField] : prevDragRow[parentField];
                                         internalData.tableFullTreeData = XEUtils.toArrayTree(fullList, {
-                                            key: treeOpts.rowField,
-                                            parentKey: treeOpts.parentField,
+                                            key: rowField,
+                                            parentKey: parentField,
                                             children: childrenField,
-                                            mapChildren: treeOpts.mapChildrenField
+                                            mapChildren: mapChildrenField
                                         });
                                     }
                                 }
@@ -8601,7 +8633,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;
@@ -8817,14 +8852,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;
                         }
                     }
                 }

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);
 }