vxe-table 4.17.0 → 4.17.2

package/packages/grid/src/grid.ts

@@ -19,7 +19,7 @@ import type { VxeTableMethods, VxeGridConstructor, VxeGridEmits, GridReactData,
 const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI
 
 const tableComponentPropKeys = Object.keys(tableProps) as (keyof VxeTableProps)[]
-const tableComponentMethodKeys: (keyof VxeTableMethods)[] = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeRowChildren', 'getTreeRowLevel', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'recalcRowHeight', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'setFilterByEvent', 'sort', 'setSort', 'setSortByEvent', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'setMergeHeaderCells', 'removeMergeHeaderCells', 'getMergeHeaderCells', 'clearMergeHeaderCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'setRowGroupExpand', 'setRowGroupExpandByField', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'isAggregateRecord', 'isAggregateExpandByRow', 'getAggregateContentByRow', 'getAggregateRowChildren', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect', 'connectToolbar']
+const tableComponentMethodKeys: (keyof VxeTableMethods)[] = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeRowChildren', 'getTreeRowLevel', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'recalcRowHeight', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'setFilterByEvent', 'sort', 'setSort', 'setSortByEvent', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'getScrollData', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'setMergeHeaderCells', 'removeMergeHeaderCells', 'getMergeHeaderCells', 'clearMergeHeaderCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'setRowGroupExpand', 'setRowGroupExpandByField', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'isAggregateRecord', 'isAggregateExpandByRow', 'getAggregateContentByRow', 'getAggregateRowChildren', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect', 'connectToolbar']
 
 function createInternalData (): GridInternalData {
   return {
@@ -1015,6 +1015,7 @@ export default defineVxeComponent({
               if (!isInited && reactData.tableLoading) {
                 return nextTick()
               }
+              let operPromise = null
               let sortList: any[] = []
               let filterList: VxeTableDefines.FilterCheckedParams[] = []
               let pageParams: any = {}
@@ -1068,7 +1069,7 @@ export default defineVxeComponent({
               } else {
                 if ($xeTable) {
                   if (isReload) {
-                    $xeTable.clearAll()
+                    operPromise = $xeTable.clearAll()
                   } else {
                     sortList = $xeTable.getSortColumns()
                     filterList = $xeTable.getCheckedFilters()
@@ -1093,50 +1094,53 @@ export default defineVxeComponent({
               reactData.sortData = sortList
               reactData.filterData = filterList
               reactData.tableLoading = true
-              return Promise.resolve((beforeQuery || ajaxMethods)(commitParams, ...args))
-                .then(rest => {
-                  let tableData: any[] = []
-                  reactData.tableLoading = false
-                  if (rest) {
-                    if (pagerConfig && isEnableConf(pagerOpts)) {
-                      const totalProp = resConfigs.total
-                      const total = (XEUtils.isFunction(totalProp) ? totalProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null }) : XEUtils.get(rest, totalProp || 'page.total')) || 0
-                      tablePage.total = XEUtils.toNumber(total)
-                      const resultProp = resConfigs.result
-                      tableData = (XEUtils.isFunction(resultProp) ? resultProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null }) : XEUtils.get(rest, resultProp || 'result')) || []
-                      // 检验当前页码，不能超出当前最大页数
-                      const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1)
-                      if (tablePage.currentPage > pageCount) {
-                        tablePage.currentPage = pageCount
-                      }
-                    } else {
-                      const listProp = resConfigs.list
-                      tableData = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null }) : XEUtils.get(rest, listProp)) : rest) || []
+              return Promise.all([
+                Promise.resolve((beforeQuery || ajaxMethods)(commitParams, ...args)),
+                operPromise
+              ]).then(([rest]) => {
+                let tableData: any[] = []
+                reactData.tableLoading = false
+                if (rest) {
+                  if (pagerConfig && isEnableConf(pagerOpts)) {
+                    const totalProp = resConfigs.total
+                    const total = (XEUtils.isFunction(totalProp) ? totalProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null }) : XEUtils.get(rest, totalProp || 'page.total')) || 0
+                    tablePage.total = XEUtils.toNumber(total)
+                    const resultProp = resConfigs.result
+                    tableData = (XEUtils.isFunction(resultProp) ? resultProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null }) : XEUtils.get(rest, resultProp || 'result')) || []
+                    // 检验当前页码，不能超出当前最大页数
+                    const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1)
+                    if (tablePage.currentPage > pageCount) {
+                      tablePage.currentPage = pageCount
                     }
-                  }
-                  if ($xeTable as any) {
-                    $xeTable.loadData(tableData)
                   } else {
-                    nextTick(() => {
-                      if ($xeTable) {
-                        $xeTable.loadData(tableData)
-                      }
-                    })
-                  }
-                  if (afterQuery) {
-                    afterQuery(commitParams, ...args)
+                    const listProp = resConfigs.list
+                    tableData = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null }) : XEUtils.get(rest, listProp)) : rest) || []
                   }
-                  if (querySuccessMethods) {
-                    querySuccessMethods({ ...commitParams, response: rest })
-                  }
-                  return { status: true }
-                }).catch((rest) => {
-                  reactData.tableLoading = false
-                  if (queryErrorMethods) {
-                    queryErrorMethods({ ...commitParams, response: rest })
-                  }
-                  return { status: false }
-                })
+                }
+                if ($xeTable) {
+                  $xeTable.loadData(tableData)
+                } else {
+                  nextTick(() => {
+                    const $xeTable = refTable.value
+                    if ($xeTable) {
+                      $xeTable.loadData(tableData)
+                    }
+                  })
+                }
+                if (afterQuery) {
+                  afterQuery(commitParams, ...args)
+                }
+                if (querySuccessMethods) {
+                  querySuccessMethods({ ...commitParams, response: rest })
+                }
+                return { status: true }
+              }).catch((rest) => {
+                reactData.tableLoading = false
+                if (queryErrorMethods) {
+                  queryErrorMethods({ ...commitParams, response: rest })
+                }
+                return { status: false }
+              })
             } else {
               errLog('vxe.error.notFunc', ['[grid] proxy-config.ajax.query'])
             }
@@ -1469,6 +1473,7 @@ export default defineVxeComponent({
        * 获取需要排除的高度
        */
       getExcludeHeight () {
+        const { height } = props
         const { isZMax } = reactData
         const el = refElem.value
         if (el) {
@@ -1477,8 +1482,11 @@ export default defineVxeComponent({
           const topWrapper = refTopWrapper.value
           const bottomWrapper = refBottomWrapper.value
           const pagerWrapper = refPagerWrapper.value
-          const parentEl = el.parentElement as HTMLElement
-          const parentPaddingSize = isZMax ? 0 : (parentEl ? getPaddingTopBottomSize(parentEl) : 0)
+          const parentEl = el.parentElement
+          let parentPaddingSize = 0
+          if (parentEl && (height === '100%' || height === 'auto')) {
+            parentPaddingSize = isZMax ? 0 : getPaddingTopBottomSize(parentEl)
+          }
           return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper)
         }
         return 0

package/packages/locale/lang/en-US.ts

@@ -7,7 +7,7 @@ export default {
       fullStop: '。'
     },
     loading: {
-      text: 'loading...'
+      text: 'Loading...'
     },
     error: {
       downErr: 'Download failed',
@@ -181,7 +181,7 @@ export default {
         insertBottom: 'Append at the bottom (append new data at the bottom of the table)'
       },
       impTitle: 'Import data',
-      impFile: 'file name',
+      impFile: 'File name',
       impSelect: 'Select file',
       impType: 'File type',
       impOpts: 'Parameter settings',
@@ -207,9 +207,9 @@ export default {
       },
       printTitle: 'Print data',
       expTitle: 'Export data',
-      expName: 'file name',
+      expName: 'File name',
       expNamePlaceholder: 'Please enter a file name',
-      expSheetName: 'title',
+      expSheetName: 'Title',
       expSheetNamePlaceholder: 'Please enter a title',
       expType: 'Save type',
       expMode: 'Select data',
@@ -643,10 +643,10 @@ export default {
         },
         cases: {
           equal: 'equal',
-          gt: 'Greater than',
-          lt: 'Less than',
-          begin: 'The beginning is',
-          endin: 'The end is',
+          gt: 'Greater',
+          lt: 'Less',
+          begin: 'Start',
+          endin: 'End',
           include: 'Include',
           isSensitive: 'case sensitive'
         }
@@ -675,14 +675,14 @@ export default {
         },
         cases: {
           equal: 'equal',
-          unequal: 'Not equal to',
-          gt: 'Greater than',
-          ge: 'Greater than or equal to',
-          lt: 'Less than',
-          le: 'Less than or equal to',
-          begin: 'The beginning is',
+          unequal: 'Not equal',
+          gt: 'Greater',
+          ge: 'Greater or equal',
+          lt: 'Less',
+          le: 'Less or equal',
+          begin: 'Start',
           notbegin: "It's not at the beginning",
-          endin: 'The end is',
+          endin: 'End',
           notendin: 'The ending is not',
           include: 'Include',
           exclude: 'Not included',
@@ -740,14 +740,14 @@ export default {
       search: 'search',
       cases: {
         equal: 'equal',
-        unequal: 'Not equal to',
-        gt: 'Greater than',
-        ge: 'Greater than or equal to',
-        lt: 'Less than',
-        le: 'Less than or equal to',
-        begin: 'The beginning is',
+        unequal: 'Not equal',
+        gt: 'Greater',
+        ge: 'Greater or equal',
+        lt: 'Less',
+        le: 'Less or equal',
+        begin: 'Start',
         notbegin: "It's not at the beginning",
-        endin: 'The end is',
+        endin: 'End',
         notendin: 'The ending is not',
         include: 'Include',
         exclude: 'Not included',

package/packages/table/module/custom/hook.ts

@@ -5,7 +5,7 @@ import { getColumnList } from '../../src/util'
 
 import type { TableCustomMethods, TableCustomPrivateMethods, VxeColumnPropTypes, VxeTableDefines } from '../../../../types'
 
-const tableCustomMethodKeys: (keyof TableCustomMethods)[] = ['openCustom', 'closeCustom', 'toggleCustom', 'saveCustom', 'cancelCustom', 'resetCustom', 'toggleCustomAllCheckbox', 'setCustomAllCheckbox']
+const tableCustomMethodKeys: (keyof TableCustomMethods)[] = ['openCustom', 'closeCustom', 'getCustomVisible', 'toggleCustom', 'saveCustom', 'cancelCustom', 'resetCustom', 'toggleCustomAllCheckbox', 'setCustomAllCheckbox']
 
 VxeUI.hooks.add('tableCustomModule', {
   setupTable ($xeTable) {
@@ -13,7 +13,6 @@ VxeUI.hooks.add('tableCustomModule', {
     const { computeCustomOpts, computeRowGroupFields } = $xeTable.getComputeMaps()
     const { refElem } = $xeTable.getRefMaps()
 
-    const $xeGrid = $xeTable.xeGrid
     const $xeGantt = $xeTable.xeGantt
 
     const calcMaxHeight = () => {
@@ -289,8 +288,7 @@ VxeUI.hooks.add('tableCustomModule', {
     }
 
     const emitCustomEvent = (type: VxeTableDefines.CustomType, evnt: Event) => {
-      const comp = $xeGrid || $xeGantt || $xeTable
-      comp.dispatchEvent('custom', { type }, evnt)
+      $xeTable.dispatchEvent('custom', { type }, evnt)
     }
 
     const customPrivateMethods: TableCustomPrivateMethods = {

package/packages/table/module/custom/panel.ts

@@ -91,6 +91,7 @@ export default defineVxeComponent({
       $xeTable.saveCustom()
       $xeTable.closeCustom()
       $xeTable.emitCustomEvent('confirm', $event)
+      $xeTable.emitCustomEvent('close', $event)
     }
 
     const cancelCloseEvent: VxeButtonEvents.Click = ({ $event }) => {
@@ -102,12 +103,14 @@ export default defineVxeComponent({
       $xeTable.cancelCustom()
       $xeTable.closeCustom()
       $xeTable.emitCustomEvent('cancel', $event)
+      $xeTable.emitCustomEvent('close', $event)
     }
 
     const handleResetCustomEvent = (evnt: Event) => {
       $xeTable.resetCustom(true)
       $xeTable.closeCustom()
       $xeTable.emitCustomEvent('reset', evnt)
+      $xeTable.emitCustomEvent('close', evnt)
     }
 
     const resetCustomEvent: VxeButtonEvents.Click = ({ $event }) => {

package/packages/table/module/menu/hook.ts

@@ -16,6 +16,10 @@ hooks.add('tableMenuModule', {
     const { refElem, refTableFilter, refTableMenu } = $xeTable.getRefMaps()
     const { computeMouseOpts, computeIsContentMenu, computeMenuOpts } = $xeTable.getComputeMaps()
 
+    const $xeGrid = $xeTable.xeGrid
+    const $xeGantt = $xeTable.xeGantt
+    const $xeGGWrapper = $xeGrid || $xeGantt
+
     let menuMethods = {} as TableMenuMethods
     let menuPrivateMethods = {} as TableMenuPrivateMethods
 
@@ -38,7 +42,10 @@ hooks.add('tableMenuModule', {
             if (!visibleMethod || visibleMethod(params)) {
               evnt.preventDefault()
               $xeTable.updateZindex()
-              const el = refElem.value
+              const el = $xeGGWrapper ? $xeGGWrapper.getRefMaps().refElem.value : refElem.value
+              if (!el) {
+                return
+              }
               const tableRect = el.getBoundingClientRect()
               const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode()
 

package/packages/table/src/cell.ts

@@ -412,11 +412,9 @@ export const Cell = {
     const tableReactData = $table.reactData
     const tableInternalData = $table.internalData
     const { isRowGroupStatus } = tableReactData
-    const { computeEditOpts } = $table.getComputeMaps()
     const { editConfig } = tableProps
-    const editOpts = computeEditOpts.value
-    const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column
-    const renderOpts = editConfig && isEnableConf(editOpts) && editRender ? editRender : cellRender
+    const { field, slots, editRender, cellRender, rowGroupNode, aggFunc, formatter } = column
+    const renderOpts = editConfig && isEnableConf(editRender) ? editRender : (isEnableConf(cellRender) ? cellRender : null)
     const defaultSlot = slots ? slots.default : null
     const gcSlot = slots ? (slots.groupContent || slots['group-content']) : null
     let cellValue: string | number | null = ''
@@ -476,7 +474,8 @@ export const Cell = {
       if (defaultSlot) {
         return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params))
       }
-      if (renderOpts) {
+      // formatter > (renderTableCell | renderTableDefault)
+      if (renderOpts && !formatter) {
         const compConf = renderer.get(renderOpts.name)
         if (compConf) {
           const rtCell = compConf.renderTableCell || compConf.renderCell

package/packages/table/src/table.ts

@@ -1598,7 +1598,7 @@ export default defineVxeComponent({
     }
 
     const calcTableHeight = (key: 'height' | 'minHeight' | 'maxHeight') => {
-      const { editConfig } = props
+      const { editConfig, editRules } = props
       const { parentHeight } = reactData
       let val = props[key]
       if (key === 'minHeight') {
@@ -1606,7 +1606,7 @@ export default defineVxeComponent({
         if (XEUtils.eqNull(val)) {
           if (eqEmptyValue(defMinHeight)) {
             // 编辑模式默认最小高度
-            if (isEnableConf(editConfig)) {
+            if (editRules && isEnableConf(editConfig)) {
               val = 144
             }
           } else {
@@ -2464,7 +2464,7 @@ export default defineVxeComponent({
       const { visibleColumn, tableHeight, elemStore, customHeight, customMinHeight, customMaxHeight, tHeaderHeight, tFooterHeight } = internalData
       const $xeGanttView = internalData.xeGanttView
       const el = refElem.value
-      if (!el || !el.clientHeight) {
+      if (!el || (internalData.tBodyHeight && !el.clientHeight)) {
         return
       }
       const containerList = ['main', 'left', 'right']
@@ -7027,14 +7027,40 @@ export default defineVxeComponent({
        * 获取表格的滚动状态
        */
       getScroll () {
-        const { scrollXLoad, scrollYLoad } = reactData
+        return $xeTable.getScrollData()
+      },
+      /**
+       * 获取表格的滚动数据
+       */
+      getScrollData () {
+        const { scrollXLoad, scrollYLoad, scrollbarHeight, scrollbarWidth } = reactData
         const { elemStore } = internalData
         const bodyScrollElem = getRefElem(elemStore['main-body-scroll'])
+        const scrollTop = bodyScrollElem ? bodyScrollElem.scrollTop : 0
+        const scrollLeft = bodyScrollElem ? bodyScrollElem.scrollLeft : 0
+        const clientHeight = bodyScrollElem ? bodyScrollElem.clientHeight : 0
+        const clientWidth = bodyScrollElem ? bodyScrollElem.clientWidth : 0
+        const scrollHeight = bodyScrollElem ? bodyScrollElem.scrollHeight : 0
+        const scrollWidth = bodyScrollElem ? bodyScrollElem.scrollWidth : 0
+        const isTop = scrollTop <= 0
+        const isBottom = scrollTop + clientHeight >= scrollHeight
+        const isLeft = scrollLeft <= 0
+        const isRight = scrollLeft + clientWidth >= scrollWidth
         return {
           virtualX: scrollXLoad,
           virtualY: scrollYLoad,
-          scrollTop: bodyScrollElem ? bodyScrollElem.scrollTop : 0,
-          scrollLeft: bodyScrollElem ? bodyScrollElem.scrollLeft : 0
+          isTop,
+          isBottom,
+          isLeft,
+          isRight,
+          scrollbarHeight,
+          scrollbarWidth,
+          scrollTop,
+          scrollLeft,
+          scrollHeight,
+          scrollWidth,
+          clientHeight,
+          clientWidth
         }
       },
       /**
@@ -7158,7 +7184,10 @@ export default defineVxeComponent({
         scrollYStore.visibleStartIndex = 0
         scrollYStore.endIndex = scrollYStore.visibleSize
         scrollYStore.visibleEndIndex = scrollYStore.visibleSize
+
         return nextTick().then(() => {
+          internalData.lastScrollLeft = 0
+          internalData.lastScrollTop = 0
           internalData.intoRunScroll = false
         })
       },
@@ -7528,11 +7557,12 @@ export default defineVxeComponent({
           // 如果点击自定义列容器
         } else {
           if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
-            tablePrivateMethods.preventEvent(evnt, 'event.clearCustom', {}, () => {
-              if ($xeTable.closeCustom) {
+            if (customStore.visible && $xeTable.closeCustom) {
+              tablePrivateMethods.preventEvent(evnt, 'event.clearCustom', {}, () => {
                 $xeTable.closeCustom()
-              }
-            })
+                $xeTable.dispatchEvent('custom', { type: 'close' }, evnt)
+              })
+            }
           }
         }
       }
@@ -8364,7 +8394,7 @@ export default defineVxeComponent({
         const el = refElem.value
         if (el) {
           const parentElem = el.parentNode as HTMLElement
-          const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0
+          let parentPaddingSize = 0
           let parentWrapperHeight = 0
           if (parentElem) {
             if ($xeGantt && hasClass(parentElem, 'vxe-gantt--table-wrapper')) {
@@ -8373,6 +8403,7 @@ export default defineVxeComponent({
               parentWrapperHeight = $xeGrid.getParentHeight()
             } else {
               parentWrapperHeight = parentElem.clientHeight
+              parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0
             }
           }
           return Math.floor(parentWrapperHeight - parentPaddingSize)
@@ -11404,12 +11435,11 @@ export default defineVxeComponent({
         const { scrollXLoad, scrollYLoad, expandColumn } = reactData
         const leftFixedWidth = computeLeftFixedWidth.value
         const rightFixedWidth = computeRightFixedWidth.value
-        if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
-          return
-        }
 
         const { elemStore, lastScrollTop, lastScrollLeft } = internalData
         const rowOpts = computeRowOpts.value
+        const scrollbarXOpts = computeScrollbarXOpts.value
+        const scrollbarYOpts = computeScrollbarYOpts.value
         const xHandleEl = refScrollXHandleElem.value
         const yHandleEl = refScrollYHandleElem.value
         const leftScrollElem = getRefElem(elemStore['left-body-scroll'])
@@ -11418,12 +11448,6 @@ export default defineVxeComponent({
         const footerScrollElem = getRefElem(elemStore['main-footer-scroll'])
         const rightScrollElem = getRefElem(elemStore['right-body-scroll'])
         const rowExpandEl = refRowExpandElem.value
-        if (!xHandleEl) {
-          return
-        }
-        if (!yHandleEl) {
-          return
-        }
         if (!bodyScrollElem) {
           return
         }
@@ -11440,7 +11464,19 @@ export default defineVxeComponent({
         const isRollX = scrollLeft !== lastScrollLeft
         const isRollY = scrollTop !== lastScrollTop
 
+        if (isRollX) {
+          // 如果禁用滚动
+          if (scrollbarXOpts.visible === 'hidden') {
+            evnt.preventDefault()
+            return
+          }
+        }
         if (isRollY) {
+          // 如果禁用滚动
+          if (scrollbarYOpts.visible === 'hidden') {
+            evnt.preventDefault()
+            return
+          }
           const isTopWheel = deltaTop < 0
           // 如果滚动位置已经是顶部或底部，则不需要触发
           if (isTopWheel ? currScrollTop <= 0 : currScrollTop >= bodyScrollElem.scrollHeight - bodyScrollElem.clientHeight) {
@@ -11448,9 +11484,14 @@ export default defineVxeComponent({
           }
         }
 
+        if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
+          return
+        }
+
         if (rowOpts.isHover || highlightHoverRow) {
           $xeTable.clearHoverRow()
         }
+
         // 用于鼠标纵向滚轮处理
         if (isRollX) {
           evnt.preventDefault()
@@ -11972,7 +12013,7 @@ export default defineVxeComponent({
       const osYBehavior = XEUtils.eqNull(overscrollYBehavior) ? scrollbarOpts.overscrollBehavior : overscrollYBehavior
       return h('div', {
         ref: isFixedLeft ? refLeftContainer : refRightContainer,
-        class: [`vxe-table--fixed-${fixedType}-wrapper`, {
+        class: [`vxe-table--fixed-${fixedType}-wrapper`, `sx--${scrollbarXOpts.visible}`, `sy--${scrollbarYOpts.visible}`, {
           [`x-ob--${osXBehavior}`]: osXBehavior,
           [`y-ob--${osYBehavior}`]: osYBehavior
         }]
@@ -12290,7 +12331,7 @@ export default defineVxeComponent({
         }]
       }, [
         h('div', {
-          class: 'vxe-table--main-wrapper'
+          class: ['vxe-table--main-wrapper', `sx--${scrollbarXOpts.visible}`, `sy--${scrollbarYOpts.visible}`]
         }, [
           /**
            * 表头
@@ -12466,11 +12507,15 @@ export default defineVxeComponent({
         h('div', {
           key: 'tn',
           ref: refEmptyPlaceholder,
-          class: 'vxe-table--empty-placeholder'
+          class: 'vxe-table--empty-place-wrapper'
         }, [
           h('div', {
-            class: 'vxe-table--empty-content'
-          }, renderEmptyBody())
+            class: 'vxe-table--empty-placeholder'
+          }, [
+            h('div', {
+              class: 'vxe-table--empty-content'
+            }, renderEmptyBody())
+          ])
         ]),
         /**
          * 边框线
@@ -12783,6 +12828,18 @@ export default defineVxeComponent({
     watch(() => VxeUI.getLanguage(), () => {
       reLayoutFlag.value++
     })
+    watch(() => {
+      const scrollbarXOpts = computeScrollbarXOpts.value
+      return scrollbarXOpts.visible
+    }, () => {
+      reLayoutFlag.value++
+    })
+    watch(() => {
+      const scrollbarYOpts = computeScrollbarYOpts.value
+      return scrollbarYOpts.visible
+    }, () => {
+      reLayoutFlag.value++
+    })
     watch(reLayoutFlag, () => {
       $xeTable.recalculate(true)
     })

package/packages/table/src/util.ts

@@ -702,29 +702,40 @@ export function calcTreeLine (params: VxeTableDefines.CellRenderBodyParams, prev
 
 export function clearTableDefaultStatus ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
   const { props, internalData } = $xeTable
+
   internalData.initStatus = false
-  $xeTable.clearSort()
-  $xeTable.clearCurrentRow()
-  $xeTable.clearCurrentColumn()
-  $xeTable.clearRadioRow()
-  $xeTable.clearRadioReserve()
-  $xeTable.clearCheckboxRow()
-  $xeTable.clearCheckboxReserve()
-  $xeTable.clearRowExpand()
-  $xeTable.clearTreeExpand()
-  $xeTable.clearTreeExpandReserve()
-  $xeTable.clearPendingRow()
+  const actionList = [
+    $xeTable.clearSort(),
+    $xeTable.clearCurrentRow(),
+    $xeTable.clearCurrentColumn(),
+    $xeTable.clearRadioRow(),
+    $xeTable.clearRadioReserve(),
+    $xeTable.clearCheckboxRow(),
+    $xeTable.clearCheckboxReserve(),
+    $xeTable.clearRowExpand(),
+    $xeTable.clearTreeExpand(),
+    $xeTable.clearTreeExpandReserve(),
+    $xeTable.clearPendingRow()
+  ]
   if ($xeTable.clearFilter) {
-    $xeTable.clearFilter()
+    actionList.push(
+      $xeTable.clearFilter()
+    )
   }
   if ($xeTable.clearSelected && (props.keyboardConfig || props.mouseConfig)) {
-    $xeTable.clearSelected()
+    actionList.push(
+      $xeTable.clearSelected()
+    )
   }
   if ($xeTable.clearCellAreas && props.mouseConfig) {
-    $xeTable.clearCellAreas()
-    $xeTable.clearCopyCellArea()
+    actionList.push(
+      $xeTable.clearCellAreas(),
+      $xeTable.clearCopyCellArea()
+    )
   }
-  return $xeTable.clearScroll()
+  return Promise.all(actionList).then(() => {
+    return $xeTable.clearScroll()
+  })
 }
 
 export function clearTableAllStatus ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {