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

package/packages/table/src/table.ts

@@ -937,13 +937,13 @@ export default defineComponent({
     }
 
     const computeRowHeight = () => {
-      const { showOverflow } = props
+      const { isAllOverflow } = reactData
       const tableHeader = refTableHeader.value
       const tableBody = refTableBody.value
       const tableBodyElem = tableBody ? tableBody.$el as HTMLDivElement : null
       const defaultRowHeight = computeDefaultRowHeight.value
       let rowHeight = 0
-      if (showOverflow) {
+      if (isAllOverflow) {
         if (tableBodyElem) {
           const tableHeaderElem = tableHeader ? tableHeader.$el as HTMLDivElement : null
           let firstTrElem
@@ -966,7 +966,7 @@ export default defineComponent({
     }
 
     const handleVirtualYVisible = (currScrollTop?: number) => {
-      const { showOverflow } = props
+      const { isAllOverflow } = reactData
       const { elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData } = internalData
       const rowOpts = computeRowOpts.value
       const cellOpts = computeCellOpts.value
@@ -980,15 +980,15 @@ 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
         } else {
           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,35 +1495,32 @@ 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 = () => {
-      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++
       }
@@ -1778,7 +1775,7 @@ export default defineComponent({
     }
 
     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
@@ -1980,7 +1977,7 @@ export default defineComponent({
 
             let isOptimizeMode = false
             // 如果是使用优化模式
-            if (scrollXLoad || scrollYLoad || (allColumnOverflow && isAllOverflow)) {
+            if (scrollXLoad || scrollYLoad || isAllOverflow) {
               if (expandColumn || spanMethod || footerSpanMethod) {
                 // 如果不支持优化模式
               } else {
@@ -2069,7 +2066,7 @@ export default defineComponent({
                 } else if (layout === 'footer') {
                   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'
@@ -2663,11 +2660,10 @@ export default defineComponent({
      * @param {Array} datas 数据
      */
     const loadTableData = (datas: any[], isReset: boolean) => {
-      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 = []
@@ -2726,33 +2722,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.VUE_APP_VXE_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()
@@ -2771,6 +2749,30 @@ 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.VUE_APP_VXE_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<void>(resolve => {
@@ -3173,11 +3175,10 @@ export default defineComponent({
      * 纵向 Y 可视渲染处理
      */
     const loadScrollYData = (scrollTop?: number) => {
-      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),
@@ -4279,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
             }
           }
@@ -4324,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
       },
       /**
        * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
@@ -5403,8 +5406,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) {
@@ -5418,7 +5420,7 @@ export default defineComponent({
         }
         return Promise.all(rest).then(() => {
           if (row) {
-            if (!showOverflow && (scrollYLoad || scrollXLoad)) {
+            if (!isAllOverflow && (scrollYLoad || scrollXLoad)) {
               calcCellHeight()
               calcCellWidth()
             }
@@ -6834,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
@@ -6844,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') {
@@ -6877,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
@@ -6943,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
@@ -6985,6 +6993,7 @@ export default defineComponent({
             resizeTipElem.style.left = `${resizeBarLeft}px`
             resizeTipElem.style.top = `${resizeBarTop}px`
           }
+          reactData.isDragResize = true
         }
 
         reactData.isDragResize = true
@@ -6995,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
@@ -7016,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()
           }
         }
       },
@@ -7445,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) {
@@ -7479,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
@@ -7571,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
@@ -8702,7 +8734,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
@@ -8721,7 +8756,6 @@ export default defineComponent({
         if (!bodyScrollElem) {
           return
         }
-
         const wheelSpeed = getWheelSpeed(reactData.lastScrollTime)
         const deltaTop = deltaY * wheelSpeed
         const deltaLeft = deltaX * wheelSpeed
@@ -8908,8 +8942,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
@@ -8922,21 +8955,21 @@ export default defineComponent({
 
         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)
           } else {
             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 {
@@ -8966,12 +8999,12 @@ export default defineComponent({
         })
       },
       updateScrollXData () {
-        const { showOverflow } = props
+        const { isAllOverflow } = reactData
         handleTableColumn()
         return nextTick().then(() => {
           handleTableColumn()
           $xeTable.updateScrollXSpace()
-          if (!showOverflow) {
+          if (!isAllOverflow) {
             $xeTable.updateScrollYSpace()
           }
         })
@@ -9594,7 +9627,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/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);