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

package/packages/table/src/cell.ts

@@ -6,7 +6,7 @@ import { updateCellTitle } from '../../ui/src/dom'
 import { createColumn, getRowid } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
 
-import type { VxeTableConstructor, VxeTableDefines, VxeColumnPropTypes, VxeTablePrivateMethods, VxeComponentSlotType } from '../../../types'
+import type { VxeTableConstructor, VxeTableDefines, VxeTablePrivateMethods, VxeComponentSlotType } from '../../../types'
 
 const { getI18n, getIcon, renderer, formats, renderEmptyElement } = VxeUI
 
@@ -207,25 +207,6 @@ function renderTitleContent (params: VxeTableDefines.CellRenderHeaderParams & {
   ]
 }
 
-function formatFooterLabel (footerFormatter: VxeColumnPropTypes.FooterFormatter, params: {
-  itemValue: any
-  column: VxeTableDefines.ColumnInfo
-  row: any
-  items: any[]
-  _columnIndex: number
-}) {
-  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: VxeTableDefines.CellRenderFooterParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
   const { $table, column, _columnIndex, items, row } = params
   const { slots, editRender, cellRender, footerFormatter } = column
@@ -234,42 +215,39 @@ function getFooterContent (params: VxeTableDefines.CellRenderFooterParams & { $t
   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)
   ]
 }
 

package/packages/table/src/column.ts

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

package/packages/table/src/columnInfo.ts

@@ -74,6 +74,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/packages/table/src/footer.ts

@@ -2,6 +2,7 @@ import { defineComponent, TransitionGroup, h, ref, Ref, PropType, inject, nextTi
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { updateCellTitle, getPropClass } from '../../ui/src/dom'
+import { getCellHeight } from './util'
 
 import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods, VxeTableDefines } from '../../../types'
 
@@ -66,7 +67,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

package/packages/table/src/header.ts

@@ -1,7 +1,7 @@
 import { defineComponent, TransitionGroup, h, ref, Ref, PropType, 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'
 
 import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods, VxeTableDefines, VxeColumnPropTypes } from '../../../types'
 
@@ -52,7 +52,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/packages/table/src/table.ts

@@ -987,8 +987,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
             }
@@ -1495,19 +1495,15 @@ export default defineComponent({
 
     const calcCellAutoHeight = (rowRest: VxeTableDefines.RowCacheItem, wrapperEl: HTMLDivElement) => {
       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] as HTMLElement
+        const tdEl = cellElem.parentElement as HTMLTableCellElement
+        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 = () => {
@@ -1516,13 +1512,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++
       }
@@ -4282,7 +4280,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
             }
           }
@@ -4327,8 +4325,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
       },
       /**
        * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
@@ -6836,6 +6836,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
@@ -6846,9 +6847,12 @@ 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 = { ...params, resizeWidth, resizeColumn }
           if (resizableOpts.dragMode === 'fixed') {
@@ -6879,6 +6883,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
@@ -6945,7 +6951,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
@@ -6987,6 +6993,7 @@ export default defineComponent({
             resizeTipElem.style.left = `${resizeBarLeft}px`
             resizeTipElem.style.top = `${resizeBarTop}px`
           }
+          reactData.isDragResize = true
         }
 
         reactData.isDragResize = true
@@ -6997,8 +7004,12 @@ 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 = { ...params, resizeHeight, resizeRow: row }
             internalData.isResizeCellHeight = true
@@ -7018,22 +7029,35 @@ 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 = { ...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 = { ...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()
           }
         }
       },
@@ -7447,11 +7471,11 @@ 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) {
@@ -7481,7 +7505,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
@@ -7573,7 +7600,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 as HTMLDivElement
@@ -7975,7 +8005,11 @@ export default defineComponent({
                       // 根到根
                     }
 
-                    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)
@@ -7995,10 +8029,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
                     })
                   }
                 }
@@ -8704,7 +8738,10 @@ export default defineComponent({
         })
       },
       triggerBodyWheelEvent (evnt) {
-        const { deltaY, deltaX } = evnt
+        const { target, deltaY, deltaX } = evnt
+        if (target && /^textarea$/i.test((target as HTMLElement).tagName)) {
+          return
+        }
         const { highlightHoverRow } = tableProps
         const { elemStore, lastScrollTop, lastScrollLeft } = internalData
         const rowOpts = computeRowOpts.value
@@ -8723,7 +8760,6 @@ export default defineComponent({
         if (!bodyScrollElem) {
           return
         }
-
         const wheelSpeed = getWheelSpeed(reactData.lastScrollTime)
         const deltaTop = deltaY * wheelSpeed
         const deltaLeft = deltaX * wheelSpeed
@@ -8930,14 +8966,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
             }
           }
         } else {

package/packages/table/src/util.ts

@@ -178,6 +178,13 @@ export function getRefElem (refEl: any) {
   return null
 }
 
+export function getCellHeight (height: number | 'unset' | undefined | null) {
+  if (height === 'unset') {
+    return 0
+  }
+  return height || 0
+}
+
 /**
  * 列宽拖动最大宽度
  * @param params
@@ -483,7 +490,7 @@ export function rowToVisible ($xeTable: VxeTableConstructor & VxeTablePrivateMet
           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]
@@ -491,8 +498,8 @@ export function rowToVisible ($xeTable: VxeTableConstructor & VxeTablePrivateMet
           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/styles/components/table.scss

@@ -155,8 +155,8 @@
   .vxe-default-input,
   .vxe-default-textarea,
   .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);
@@ -186,11 +186,9 @@
     }
   }
   .vxe-default-textarea {
+    font-size: 1em;
     resize: none;
     vertical-align: middle;
-    &:not([rows]) {
-      height: var(--vxe-ui-input-height-default);
-    }
   }
   & > .vxe-input > .vxe-input--inner,
   & > .vxe-textarea > .vxe-textarea--inner {
@@ -213,9 +211,30 @@
 }
 .vxe-body--column {
   &.col--vertical-top {
-    & > .vxe-cell {
-      & > .vxe-cell--wrapper {
-        height: 100%;
+    &.col--active {
+      & > .vxe-cell {
+        & > .vxe-cell--wrapper {
+          height: 100%;
+          & > .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%;
+            }
+          }
+        }
       }
     }
   }
@@ -1198,6 +1217,9 @@
       &.is--padding {
         .vxe-cell {
           padding: var(--vxe-ui-table-cell-padding-medium);
+          .vxe-default-textarea {
+            padding: var(--vxe-ui-table-cell-padding-medium);
+          }
         }
       }
     }
@@ -1226,6 +1248,9 @@
       &.is--padding {
         .vxe-cell {
           padding: var(--vxe-ui-table-cell-padding-small);
+          .vxe-default-textarea {
+            padding: var(--vxe-ui-table-cell-padding-small);
+          }
         }
       }
     }
@@ -1254,6 +1279,9 @@
       &.is--padding {
         .vxe-cell {
           padding: var(--vxe-ui-table-cell-padding-mini);
+          .vxe-default-textarea {
+            padding: var(--vxe-ui-table-cell-padding-mini);
+          }
         }
       }
     }
@@ -1277,6 +1305,9 @@
     &.is--padding {
       .vxe-cell {
         padding: var(--vxe-ui-table-cell-padding-default);
+        .vxe-default-textarea {
+          padding: var(--vxe-ui-table-cell-padding-default);
+        }
       }
     }
   }
@@ -1523,6 +1554,31 @@
       align-items: center;
     }
   }
+  /*溢出列*/
+  .vxe-header--column,
+  .vxe-body--column,
+  .vxe-footer--column {
+    &:not(.col--active) {
+      &.col--ellipsis {
+        & > .vxe-cell {
+          overflow: hidden;
+          & > .vxe-cell--wrapper {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+        }
+      }
+      &.vxe-tree-cell,
+      &.col--vertical-top {
+        & > .vxe-cell {
+          & > .vxe-cell--wrapper {
+            white-space: pre-line;
+          }
+        }
+      }
+    }
+  }
   .vxe-header--column,
   .vxe-footer--column {
     &.col--ellipsis {
@@ -1760,30 +1816,6 @@
     white-space: nowrap;
   }
 
-  /*溢出列*/
-  .vxe-header--column,
-  .vxe-body--column,
-  .vxe-footer--column {
-    &.col--ellipsis {
-      &:not(.col--active) {
-        & > .vxe-cell {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          & > .vxe-cell--wrapper {
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-          }
-        }
-        &.col--vertical-top {
-          & > .vxe-cell {
-            white-space: pre-line;
-          }
-        }
-      }
-    }
-  }
   &.size--medium {
     .vxe-cell--checkbox {
       font-size: var(--vxe-checkbox-font-size-medium);