vxe-table 4.15.4 → 4.15.6

package/packages/table/src/table.ts

@@ -12,14 +12,23 @@ import Cell from './cell'
 import TableBodyComponent from './body'
 import TableHeaderComponent from './header'
 import TableFooterComponent from './footer'
-import tableProps from './props'
-import tableEmits from './emits'
+import { tableProps } from './props'
+import { tableEmits } from './emits'
 import TableCustomPanelComponent from '../module/custom/panel'
 import TableFilterPanelComponent from '../module/filter/panel'
 import TableImportPanelComponent from '../module/export/import-panel'
 import TableExportPanelComponent from '../module/export/export-panel'
 import TableMenuPanelComponent from '../module/menu/panel'
 
+import '../module/filter/hook'
+import '../module/menu/hook'
+import '../module/edit/hook'
+import '../module/export/hook'
+import '../module/keyboard/hook'
+import '../module/validator/hook'
+import '../module/custom/hook'
+import '../render'
+
 import type { VxeTooltipInstance, VxeTabsConstructor, VxeTabsPrivateMethods, ValueOf, VxeComponentSlotType } from 'vxe-pc-ui'
 import type { VxeGridConstructor, VxeGridPrivateMethods, VxeTableConstructor, TableReactData, VxeTablePropTypes, VxeToolbarConstructor, TablePrivateMethods, VxeTablePrivateRef, VxeTablePrivateComputed, VxeTablePrivateMethods, TableMethods, VxeTableMethods, VxeTableDefines, VxeTableEmits, VxeTableProps, VxeColumnPropTypes, VxeTableCustomPanelConstructor } from '../../../types'
 
@@ -74,6 +83,12 @@ export default defineVxeComponent({
       lastScrollTime: 0,
       // 行高
       rowHeight: 0,
+      // 表头高度
+      tHeaderHeight: 0,
+      // 表体高度
+      tBodyHeight: 0,
+      // 表尾高度
+      tFooterHeight: 0,
       // 表格父容器的高度
       parentHeight: 0,
       // 是否使用分组表头
@@ -350,6 +365,7 @@ export default defineVxeComponent({
     const refScrollYSpaceElem = ref<HTMLDivElement>()
 
     const $xeGrid = inject<(VxeGridConstructor & VxeGridPrivateMethods) | null>('$xeGrid', null)
+    const $xeGantt = inject('$xeGantt', null)
     let $xeToolbar: VxeToolbarConstructor
 
     const computeTableId = computed(() => {
@@ -901,6 +917,9 @@ export default defineVxeComponent({
       getComputeMaps: () => computeMaps,
 
       xeGrid: $xeGrid,
+      xeGantt: $xeGantt,
+
+      // 已废弃
       xegrid: $xeGrid
     } as unknown as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods
 
@@ -1875,12 +1894,17 @@ export default defineVxeComponent({
     const calcCellAutoHeight = (rowRest: VxeTableDefines.RowCacheItem, wrapperEl: HTMLDivElement) => {
       const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`)
       let colHeight = rowRest.height
+      let firstCellStyle: CSSStyleDeclaration | null = null
+      let topBottomPadding = 0
       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 - topBottomPadding, Math.ceil(cellHeight))
+        const wrapperElem = cellElemList[i] as HTMLElement
+        const cellElem = wrapperElem.parentElement as HTMLTableCellElement
+        if (!firstCellStyle) {
+          firstCellStyle = getComputedStyle(cellElem)
+          topBottomPadding = firstCellStyle ? Math.ceil(XEUtils.toNumber(firstCellStyle.paddingTop) + XEUtils.toNumber(firstCellStyle.paddingBottom)) : 0
+        }
+        const cellHeight = wrapperElem ? wrapperElem.clientHeight : 0
+        colHeight = Math.max(colHeight, Math.ceil(cellHeight + topBottomPadding))
       }
       return colHeight
     }
@@ -2258,14 +2282,15 @@ export default defineVxeComponent({
 
     const updateStyle = () => {
       const { showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props
-      const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn, isColLoading } = reactData
-      const { visibleColumn, tableHeight, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData
+      const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn, isColLoading, tHeaderHeight, tFooterHeight } = reactData
+      const { visibleColumn, tableHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData
+      const $xeGanttView = internalData.xeGanttView
       const el = refElem.value
-      if (!el) {
+      if (!el || !el.clientHeight) {
         return
       }
       const containerList = ['main', 'left', 'right']
-      const osbWidth = overflowY ? scrollbarWidth : 0
+      let osbWidth = overflowY ? scrollbarWidth : 0
       const osbHeight = overflowX ? scrollbarHeight : 0
       const emptyPlaceholderElem = refEmptyPlaceholder.value
       const mouseOpts = computeMouseOpts.value
@@ -2273,39 +2298,49 @@ export default defineVxeComponent({
       const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper'])
       const bodyTableElem = getRefElem(elemStore['main-body-table'])
       if (emptyPlaceholderElem) {
-        emptyPlaceholderElem.style.top = `${headerHeight}px`
+        emptyPlaceholderElem.style.top = `${tHeaderHeight}px`
         emptyPlaceholderElem.style.height = bodyWrapperElem ? `${bodyWrapperElem.offsetHeight - osbHeight}px` : ''
       }
 
-      let bodyHeight = 0
+      const scrollbarXToTop = computeScrollbarXToTop.value
+      const scrollbarYToLeft = computeScrollbarYToLeft.value
+
+      const xScrollbarVisible = overflowX ? 'visible' : 'hidden'
+      let yScrollbarVisible = overflowY ? 'visible' : 'hidden'
+      if ($xeGanttView) {
+        if (!scrollbarYToLeft) {
+          osbWidth = 0
+          yScrollbarVisible = 'hidden'
+        }
+      }
+
+      let tbHeight = 0
       let bodyMaxHeight = 0
-      const bodyMinHeight = customMinHeight - headerHeight - footerHeight - osbHeight
+      const bodyMinHeight = customMinHeight - tHeaderHeight - tFooterHeight - osbHeight
       if (customMaxHeight) {
-        bodyMaxHeight = Math.max(bodyMinHeight, customMaxHeight - headerHeight - footerHeight - osbHeight)
+        bodyMaxHeight = Math.max(bodyMinHeight, customMaxHeight - tHeaderHeight - tFooterHeight - osbHeight)
       }
       if (customHeight) {
-        bodyHeight = customHeight - headerHeight - footerHeight - osbHeight
+        tbHeight = customHeight - tHeaderHeight - tFooterHeight - osbHeight
       }
-      if (!bodyHeight) {
+      if (!tbHeight) {
         if (bodyTableElem) {
-          bodyHeight = bodyTableElem.clientHeight
+          tbHeight = bodyTableElem.clientHeight
         }
       }
-      if (bodyHeight) {
+      if (tbHeight) {
         if (bodyMaxHeight) {
-          bodyHeight = Math.min(bodyMaxHeight, bodyHeight)
+          tbHeight = Math.min(bodyMaxHeight, tbHeight)
         }
-        bodyHeight = Math.max(bodyMinHeight, bodyHeight)
+        tbHeight = Math.max(bodyMinHeight, tbHeight)
       }
 
-      const scrollbarXToTop = computeScrollbarXToTop.value
-
       const xLeftCornerEl = refScrollXLeftCornerElem.value
       const xRightCornerEl = refScrollXRightCornerElem.value
       const scrollXVirtualEl = refScrollXVirtualElem.value
       if (scrollXVirtualEl) {
         scrollXVirtualEl.style.height = `${osbHeight}px`
-        scrollXVirtualEl.style.visibility = overflowX ? 'visible' : 'hidden'
+        scrollXVirtualEl.style.visibility = xScrollbarVisible
       }
       const xWrapperEl = refScrollXWrapperElem.value
       if (xWrapperEl) {
@@ -2324,32 +2359,34 @@ export default defineVxeComponent({
       const scrollYVirtualEl = refScrollYVirtualElem.value
       if (scrollYVirtualEl) {
         scrollYVirtualEl.style.width = `${osbWidth}px`
-        scrollYVirtualEl.style.height = `${bodyHeight + headerHeight + footerHeight}px`
-        scrollYVirtualEl.style.visibility = overflowY ? 'visible' : 'hidden'
+        scrollYVirtualEl.style.height = `${tbHeight + tHeaderHeight + tFooterHeight}px`
+        scrollYVirtualEl.style.visibility = yScrollbarVisible
       }
       const yTopCornerEl = refScrollYTopCornerElem.value
       if (yTopCornerEl) {
-        yTopCornerEl.style.height = `${headerHeight}px`
-        yTopCornerEl.style.display = overflowY && headerHeight ? 'block' : ''
+        yTopCornerEl.style.height = `${tHeaderHeight}px`
+        yTopCornerEl.style.display = overflowY && tHeaderHeight ? 'block' : ''
       }
       const yWrapperEl = refScrollYWrapperElem.value
       if (yWrapperEl) {
-        yWrapperEl.style.height = `${bodyHeight}px`
-        yWrapperEl.style.top = `${headerHeight}px`
+        yWrapperEl.style.height = `${tbHeight}px`
+        yWrapperEl.style.top = `${tHeaderHeight}px`
       }
       const yBottomCornerEl = refScrollYBottomCornerElem.value
       if (yBottomCornerEl) {
-        yBottomCornerEl.style.height = `${footerHeight}px`
-        yBottomCornerEl.style.top = `${headerHeight + bodyHeight}px`
-        yBottomCornerEl.style.display = overflowY && footerHeight ? 'block' : ''
+        yBottomCornerEl.style.height = `${tFooterHeight}px`
+        yBottomCornerEl.style.top = `${tHeaderHeight + tbHeight}px`
+        yBottomCornerEl.style.display = overflowY && tFooterHeight ? 'block' : ''
       }
 
       const rowExpandEl = refRowExpandElem.value
       if (rowExpandEl) {
-        rowExpandEl.style.height = `${bodyHeight}px`
-        rowExpandEl.style.top = `${headerHeight}px`
+        rowExpandEl.style.height = `${tbHeight}px`
+        rowExpandEl.style.top = `${tHeaderHeight}px`
       }
 
+      reactData.tBodyHeight = tbHeight
+
       containerList.forEach((name, index) => {
         const fixedType = index > 0 ? name : ''
         const layoutList = ['header', 'body', 'footer']
@@ -2415,7 +2452,7 @@ export default defineVxeComponent({
             }
 
             if (currScrollElem) {
-              currScrollElem.style.height = `${headerHeight}px`
+              currScrollElem.style.height = `${tHeaderHeight}px`
             }
 
             if (tableElem) {
@@ -2424,16 +2461,16 @@ export default defineVxeComponent({
           } else if (layout === 'body') {
             if (currScrollElem) {
               currScrollElem.style.maxHeight = customMaxHeight ? `${bodyMaxHeight}px` : ''
-              currScrollElem.style.height = customHeight ? `${bodyHeight}px` : ''
+              currScrollElem.style.height = customHeight ? `${tbHeight}px` : ''
               currScrollElem.style.minHeight = `${bodyMinHeight}px`
             }
 
             // 如果是固定列
             if (fixedWrapperElem) {
               if (wrapperElem) {
-                wrapperElem.style.top = `${headerHeight}px`
+                wrapperElem.style.top = `${tHeaderHeight}px`
               }
-              fixedWrapperElem.style.height = `${customHeight > 0 ? customHeight : (tableHeight + headerHeight + footerHeight + osbHeight)}px`
+              fixedWrapperElem.style.height = `${customHeight > 0 ? customHeight : (tableHeight + tHeaderHeight + tFooterHeight + osbHeight)}px`
               fixedWrapperElem.style.width = `${fixedColumn.reduce((previous, column) => previous + column.renderWidth, 0)}px`
             }
 
@@ -2516,11 +2553,11 @@ export default defineVxeComponent({
             }
 
             if (currScrollElem) {
-              currScrollElem.style.height = `${footerHeight}px`
+              currScrollElem.style.height = `${tFooterHeight}px`
               // 如果是固定列
               if (fixedWrapperElem) {
                 if (wrapperElem) {
-                  wrapperElem.style.top = `${customHeight > 0 ? customHeight - footerHeight - osbHeight : tableHeight + headerHeight}px`
+                  wrapperElem.style.top = `${customHeight > 0 ? customHeight - tFooterHeight - osbHeight : tableHeight + tHeaderHeight}px`
                 }
               }
             }
@@ -2536,6 +2573,9 @@ export default defineVxeComponent({
       if (mouseConfig && mouseOpts.selected && editStore.selected.row && editStore.selected.column) {
         $xeTable.addCellSelectedClass()
       }
+      if ($xeGanttView) {
+        $xeGanttView.handleUpdateStyle()
+      }
       return nextTick()
     }
 
@@ -3121,14 +3161,13 @@ export default defineVxeComponent({
           reactData.scrollbarHeight = scrollbarOpts.height || (xHandleEl.offsetHeight - xHandleEl.clientHeight) || 14
         }
 
-        const headerHeight = headerTableElem ? headerTableElem.clientHeight : 0
-        const footerHeight = footerTableElem ? footerTableElem.clientHeight : 0
+        const hHeight = headerTableElem ? headerTableElem.clientHeight : 0
+        const fHeight = footerTableElem ? footerTableElem.clientHeight : 0
         internalData.tableHeight = bodyWrapperElem.offsetHeight
-        internalData.headerHeight = headerHeight
-        internalData.footerHeight = footerHeight
-
+        reactData.tHeaderHeight = hHeight
+        reactData.tFooterHeight = fHeight
         reactData.overflowX = overflowX
-        reactData.parentHeight = Math.max(internalData.headerHeight + footerHeight + 20, $xeTable.getParentHeight())
+        reactData.parentHeight = Math.max(hHeight + fHeight + 20, $xeTable.getParentHeight())
       }
       if (overflowX) {
         $xeTable.checkScrolling()
@@ -3183,6 +3222,7 @@ export default defineVxeComponent({
 
     const handleLazyRecalculate = (reFull: boolean, reWidth: boolean, reHeight: boolean) => {
       return new Promise<void>(resolve => {
+        const $xeGanttView = internalData.xeGanttView
         const { rceTimeout, rceRunTime } = internalData
         const resizeOpts = computeResizeOpts.value
         const refreshDelay = resizeOpts.refreshDelay || 20
@@ -3207,6 +3247,9 @@ export default defineVxeComponent({
             handleRecalculateStyle(reFull, reWidth, reHeight)
           )
         }
+        if ($xeGanttView) {
+          $xeGanttView.handleLazyRecalculate()
+        }
         internalData.rceTimeout = setTimeout(() => {
           internalData.rceTimeout = undefined
           handleRecalculateStyle(reFull, reWidth, reHeight)
@@ -4182,6 +4225,18 @@ export default defineVxeComponent({
       requestAnimationFrame(step)
     }
 
+    const syncGanttScrollTop = (scrollTop: number) => {
+      const $xeGanttView = internalData.xeGanttView
+      if ($xeGanttView) {
+        const ganttInternalData = $xeGanttView.internalData
+        const { elemStore: ganttElemStore } = ganttInternalData
+        const ganttBodyScrollElem = getRefElem(ganttElemStore['main-body-scroll'])
+        if (ganttBodyScrollElem) {
+          ganttBodyScrollElem.scrollTop = scrollTop
+        }
+      }
+    }
+
     const dispatchEvent = (type: ValueOf<VxeTableEmits>, params: Record<string, any>, evnt: Event | null) => {
       emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeGrid }, params))
     }
@@ -5358,6 +5413,25 @@ export default defineVxeComponent({
         })
         return rest
       },
+      recalcRowHeight (rowOrId) {
+        const { fullAllDataRowIdData } = internalData
+        const rows = XEUtils.isArray(rowOrId) ? rowOrId : [rowOrId]
+        const el = refElem.value
+        if (el) {
+          const { handleGetRowId } = createHandleGetRowId($xeTable)
+          el.setAttribute('data-calc-row', 'Y')
+          rows.forEach(row => {
+            const rowid = XEUtils.isString(row) || XEUtils.isNumber(row) ? row : handleGetRowId(row)
+            const rowRest = fullAllDataRowIdData[rowid]
+            if (rowRest) {
+              rowRest.resizeHeight = calcCellAutoHeight(rowRest, el)
+            }
+            el.removeAttribute('data-calc-row')
+          })
+          reactData.calcCellHeightFlag++
+        }
+        return nextTick()
+      },
       setRowHeight (rowOrId, height) {
         const { fullAllDataRowIdData } = internalData
         let status = false
@@ -7046,11 +7120,18 @@ export default defineVxeComponent({
         internalData.isActivated = false
         return nextTick()
       },
+      /**
+       * 已废弃，被 connectToolbar 替换
+       * @deprecated
+       */
+      connect ($toolbar) {
+        return $xeTable.connectToolbar($toolbar)
+      },
       /**
        * 连接工具栏
        * @param $toolbar
        */
-      connect ($toolbar) {
+      connectToolbar ($toolbar) {
         if ($toolbar) {
           $xeToolbar = $toolbar
           $xeToolbar.syncUpdate({ collectColumn: internalData.collectColumn, $table: $xeTable })
@@ -7965,6 +8046,7 @@ export default defineVxeComponent({
       handleTableData (force?: boolean) {
         const { scrollYLoad } = reactData
         const { scrollYStore, fullDataRowIdData } = internalData
+        const $xeGanttView = internalData.xeGanttView
         let fullList: any[] = internalData.afterFullData
         // 是否进行数据处理
         if (force) {
@@ -7985,6 +8067,9 @@ export default defineVxeComponent({
         })
         reactData.tableData = tableData
         internalData.visibleDataRowIdData = visibleDataRowIdMaps
+        if ($xeGanttView) {
+          $xeGanttView.updateViewData()
+        }
         return nextTick()
       },
       /**
@@ -8322,6 +8407,7 @@ export default defineVxeComponent({
         evnt.stopPropagation()
         evnt.preventDefault()
         const { row } = params
+        const { showOverflow } = props
         const { overflowX, scrollbarWidth, overflowY, scrollbarHeight } = reactData
         const { elemStore, fullAllDataRowIdData } = internalData
         const osbWidth = overflowY ? scrollbarWidth : 0
@@ -8350,7 +8436,10 @@ export default defineVxeComponent({
           return
         }
         const defaultRowHeight = computeDefaultRowHeight.value
-        const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight
+        let currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight
+        if (!showOverflow) {
+          currCellHeight = tdEl.clientHeight
+        }
         const tableRect = tableEl.getBoundingClientRect()
         const trRect = trEl.getBoundingClientRect()
         const targetOffsetY = dragClientY - trRect.y - trEl.clientHeight
@@ -10506,6 +10595,7 @@ export default defineVxeComponent({
           }
           setScrollTop(yHandleEl, scrollTop)
           setScrollTop(rowExpandEl, scrollTop)
+          syncGanttScrollTop(scrollTop)
           if (scrollYLoad) {
             $xeTable.triggerScrollYEvent(evnt)
           }
@@ -10699,6 +10789,7 @@ export default defineVxeComponent({
             setScrollTop(leftScrollElem, currTopNum)
             setScrollTop(rightScrollElem, currTopNum)
             setScrollTop(rowExpandEl, currTopNum)
+            syncGanttScrollTop(currTopNum)
             if (scrollYLoad) {
               $xeTable.triggerScrollYEvent(evnt)
             }
@@ -10715,6 +10806,7 @@ export default defineVxeComponent({
               setScrollTop(leftScrollElem, currTopNum)
               setScrollTop(rightScrollElem, currTopNum)
               setScrollTop(rowExpandEl, currTopNum)
+              syncGanttScrollTop(currTopNum)
               if (scrollYLoad) {
                 $xeTable.triggerScrollYEvent(evnt)
               }
@@ -10789,6 +10881,7 @@ export default defineVxeComponent({
         setScrollTop(leftScrollElem, scrollTop)
         setScrollTop(rightScrollElem, scrollTop)
         setScrollTop(rowExpandEl, scrollTop)
+        syncGanttScrollTop(scrollTop)
         if (scrollYLoad) {
           $xeTable.triggerScrollYEvent(evnt)
         }
@@ -10828,6 +10921,7 @@ export default defineVxeComponent({
       updateScrollXSpace () {
         const { scrollXLoad, overflowX, scrollXWidth } = reactData
         const { visibleColumn, scrollXStore, elemStore, fullColumnIdData } = internalData
+        const $xeGanttView = internalData.xeGanttView
         const mouseOpts = computeMouseOpts.value
         const tableBody = refTableBody.value
         const tableBodyElem = tableBody ? tableBody.$el as HTMLDivElement : null
@@ -10896,10 +10990,13 @@ export default defineVxeComponent({
             scrollXSpaceEl.style.width = `${ySpaceWidth}px`
           }
 
+          calcScrollbar()
           if (isScrollXBig && mouseOpts.area) {
             errLog('vxe.error.notProp', ['mouse-config.area'])
           }
-          calcScrollbar()
+          if ($xeGanttView) {
+            $xeGanttView.updateScrollXSpace()
+          }
           return nextTick().then(() => {
             updateStyle()
           })
@@ -10909,6 +11006,7 @@ export default defineVxeComponent({
       updateScrollYSpace () {
         const { isAllOverflow, overflowY, scrollYLoad, expandColumn } = reactData
         const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData
+        const $xeGanttView = internalData.xeGanttView
         const { startIndex } = scrollYStore
         const mouseOpts = computeMouseOpts.value
         const expandOpts = computeExpandOpts.value
@@ -11006,10 +11104,13 @@ export default defineVxeComponent({
         reactData.scrollYHeight = scrollYHeight
         reactData.isScrollYBig = isScrollYBig
 
+        calcScrollbar()
         if (isScrollYBig && mouseOpts.area) {
           errLog('vxe.error.notProp', ['mouse-config.area'])
         }
-        calcScrollbar()
+        if ($xeGanttView) {
+          $xeGanttView.updateScrollYSpace()
+        }
         return nextTick().then(() => {
           updateStyle()
         })
@@ -11112,6 +11213,13 @@ export default defineVxeComponent({
           return getRowid($xeTable, row1) === getRowid($xeTable, row2)
         }
         return false
+      },
+      handleConnectGanttView ($ganttView) {
+        if ($ganttView && $ganttView.connectUpdate) {
+          $ganttView.connectUpdate({ $table: $xeTable })
+          internalData.xeGanttView = $ganttView as any
+        }
+        return nextTick()
       }
     }
 
@@ -11825,29 +11933,22 @@ export default defineVxeComponent({
       })
     })
 
-    const reScrollFlag = ref(0)
+    const reLayoutFlag = ref(0)
     watch(computeSize, () => {
-      reScrollFlag.value++
+      reLayoutFlag.value++
     })
     watch(() => props.showHeader, () => {
-      reScrollFlag.value++
+      reLayoutFlag.value++
     })
     watch(() => props.showFooter, () => {
-      reScrollFlag.value++
+      reLayoutFlag.value++
     })
     watch(() => reactData.overflowX, () => {
-      reScrollFlag.value++
+      reLayoutFlag.value++
     })
     watch(() => reactData.overflowY, () => {
-      reScrollFlag.value++
-    })
-    watch(reScrollFlag, () => {
-      nextTick(() => {
-        tableMethods.recalculate(true).then(() => tableMethods.refreshScroll())
-      })
+      reLayoutFlag.value++
     })
-
-    const reLayoutFlag = ref(0)
     watch(() => props.height, () => {
       reLayoutFlag.value++
     })
@@ -11864,7 +11965,7 @@ export default defineVxeComponent({
       reLayoutFlag.value++
     })
     watch(reLayoutFlag, () => {
-      nextTick(() => tableMethods.recalculate(true))
+      $xeTable.recalculate(true)
     })
 
     const footFlag = ref(0)
@@ -11875,7 +11976,7 @@ export default defineVxeComponent({
       footFlag.value++
     })
     watch(footFlag, () => {
-      tableMethods.updateFooter()
+      $xeTable.updateFooter()
     })
 
     watch(() => props.syncResize, (value) => {

package/packages/table/src/util.ts

@@ -36,10 +36,6 @@ export function createInternalData (): TableInternalData {
     tableWidth: 0,
     // 表格高度
     tableHeight: 0,
-    // 表头高度
-    headerHeight: 0,
-    // 表尾高度
-    footerHeight: 0,
     customHeight: 0,
     customMinHeight: 0,
     customMaxHeight: 0,
@@ -671,18 +667,9 @@ export function rowToVisible ($xeTable: VxeTableConstructor & VxeTablePrivateMet
         if (!isCustomCellHeight && showOverflow) {
           return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * defaultRowHeight)
         }
-        let scrollTop = 0
         const rowRest = fullAllDataRowIdData[rowid] || {}
         const rHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight
-        for (let i = 0; i < afterFullData.length; i++) {
-          const currRow = afterFullData[i]
-          const currRowid = getRowid($xeTable, currRow)
-          if (currRow === row || currRowid === rowid) {
-            break
-          }
-          const currRowRest = fullAllDataRowIdData[currRowid] || {}
-          scrollTop += currRowRest.resizeHeight || cellOpts.height || rowOpts.height || currRowRest.height || defaultRowHeight
-        }
+        const scrollTop = rowRest.oTop
         if (scrollTop < bodyScrollTop) {
           return $xeTable.scrollTo(null, scrollTop - leftFixedWidth - 1)
         }

package/packages/toolbar/src/toolbar.ts

@@ -310,7 +310,7 @@ export default defineVxeComponent({
             $xeGrid.triggerToolbarBtnEvent(item, $event)
           } else {
             const gCommandOpts = commands.get(code)
-            const params = { code, button: item, $table: $table!, $grid: $xeGrid, $event }
+            const params = { code, button: item, $table: $table as VxeTableConstructor, $grid: $xeGrid, $gantt: null, $event }
             if (gCommandOpts) {
               const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod
               if (tCommandMethod) {
@@ -336,7 +336,7 @@ export default defineVxeComponent({
             $xeGrid.triggerToolbarTolEvent(item, $event)
           } else {
             const gCommandOpts = commands.get(code)
-            const params = { code, button: null, tool: item, $table: $table!, $grid: $xeGrid, $event }
+            const params = { code, button: null, tool: item, $table: $table as VxeTableConstructor, $grid: $xeGrid, $gantt: null, $event }
             if (gCommandOpts) {
               const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod
               if (tCommandMethod) {

package/packages/ui/index.ts

@@ -239,7 +239,15 @@ VxeUI.setConfig({
     },
     scrollbarConfig: {
       // width: 14,
-      // height: 14
+      // height: 14,
+      x: {
+        // position: 'bottom',
+        visible: true
+      },
+      y: {
+        // position: 'right',
+        visible: true
+      }
     }
   },
   // export: {
@@ -292,7 +300,9 @@ VxeUI.setConfig({
     //   types: ['csv', 'html', 'xml', 'txt']
     // },
     // buttons: []
-  }
+  },
+
+  gantt: {}
 })
 
 const iconPrefix = 'vxe-table-icon-'

package/packages/ui/src/dom.ts

@@ -100,7 +100,7 @@ export function getDomNode () {
   }
 }
 
-export function getOffsetHeight (elem: HTMLElement) {
+export function getOffsetHeight (elem?: HTMLElement) {
   return elem ? elem.offsetHeight : 0
 }
 

package/styles/cssvar.scss

@@ -1,3 +1 @@
-/*已废弃*/
-
 @use './base.scss';