vxe-table 3.19.0 → 3.19.1

package/packages/grid/src/grid.ts

@@ -438,8 +438,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
      */
     getExcludeHeight () {
       const $xeGrid = this
+      const props = $xeGrid
       const reactData = $xeGrid.reactData
 
+      const { height } = props
       const { isZMax } = reactData
       const el = $xeGrid.$refs.refElem as HTMLDivElement
       if (el) {
@@ -449,7 +451,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
         const bottomWrapper = $xeGrid.$refs.refBottomWrapper as HTMLDivElement
         const pagerWrapper = $xeGrid.$refs.refPagerWrapper as HTMLDivElement
         const parentEl = el.parentElement as HTMLElement
-        const parentPaddingSize = isZMax ? 0 : (parentEl ? getPaddingTopBottomSize(parentEl) : 0)
+        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
@@ -673,6 +678,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
             if (!isInited && reactData.tableLoading) {
               return $xeGrid.$nextTick()
             }
+            let operPromise = null
             let sortList: any[] = []
             let filterList: VxeTableDefines.FilterCheckedParams[] = []
             let pageParams: any = {}
@@ -724,7 +730,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
             } else {
               if ($xeTable) {
                 if (isReload) {
-                  $xeTable.clearAll()
+                  operPromise = $xeTable.clearAll()
                 } else {
                   sortList = $xeTable.getSortColumns()
                   filterList = $xeTable.getCheckedFilters()
@@ -749,51 +755,53 @@ export default /* define-vxe-component start */ defineVxeComponent({
             reactData.sortData = sortList
             reactData.filterData = filterList
             reactData.tableLoading = true
-            const applyArgs = [commitParams].concat(args)
-            return Promise.resolve((beforeQuery || ajaxMethods)(...applyArgs))
-              .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 as VxeGridConstructor, $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 as VxeGridConstructor, $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 as VxeGridConstructor, $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 as VxeGridConstructor, $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 as VxeGridConstructor, $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 {
-                  $xeTable.$nextTick(() => {
-                    if ($xeTable) {
-                      $xeTable.loadData(tableData)
-                    }
-                  })
-                }
-                if (afterQuery) {
-                  afterQuery(...applyArgs)
-                }
-                if (querySuccessMethods) {
-                  querySuccessMethods({ ...commitParams, response: rest })
+                  const listProp = resConfigs.list
+                  tableData = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $table: $xeTable, $grid: $xeGrid as VxeGridConstructor, $gantt: null }) : XEUtils.get(rest, listProp)) : rest) || []
                 }
-                return { status: true }
-              }).catch((rest) => {
-                reactData.tableLoading = false
-                if (queryErrorMethods) {
-                  queryErrorMethods({ ...commitParams, response: rest })
-                }
-                return { status: false }
-              })
+              }
+              if ($xeTable) {
+                $xeTable.loadData(tableData)
+              } else {
+                $xeGrid.$nextTick(() => {
+                  const $xeTable = $xeGrid.$refs.refTable as VxeTableConstructor & VxeTablePrivateMethods
+                  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'])
           }
@@ -829,11 +837,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
                     reactData.tableLoading = false
                     $xeTable.setPendingRow(removeRecords, false)
                     if (isRespMsg) {
-                      // 检测弹窗模块
-                      if (!VxeUI.modal) {
-                        errLog('vxe.error.reqModule', ['Modal'])
+                      if (VxeUI.modal) {
+                        VxeUI.modal.message({ content: $xeGrid.getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' })
                       }
-                      VxeUI.modal.message({ content: $xeGrid.getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' })
                     }
                     if (afterDelete) {
                       afterDelete(...applyArgs)
@@ -848,11 +854,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
                   .catch(rest => {
                     reactData.tableLoading = false
                     if (isRespMsg) {
-                      // 检测弹窗模块
-                      if (!VxeUI.modal) {
-                        errLog('vxe.error.reqModule', ['Modal'])
+                      if (VxeUI.modal) {
+                        VxeUI.modal.message({ id: code, content: $xeGrid.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                       }
-                      VxeUI.modal.message({ id: code, content: $xeGrid.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                     }
                     if (deleteErrorMethods) {
                       deleteErrorMethods({ ...commitParams, response: rest })
@@ -862,11 +866,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
               })
             } else {
               if (isActiveMsg) {
-                // 检测弹窗模块
-                if (!VxeUI.modal) {
-                  errLog('vxe.error.reqModule', ['Modal'])
+                if (VxeUI.modal) {
+                  VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' })
                 }
-                VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' })
               }
             }
           } else {
@@ -917,11 +919,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
                     reactData.tableLoading = false
                     $xeTable.clearPendingRow()
                     if (isRespMsg) {
-                      // 检测弹窗模块
-                      if (!VxeUI.modal) {
-                        errLog('vxe.error.reqModule', ['Modal'])
+                      if (VxeUI.modal) {
+                        VxeUI.modal.message({ content: $xeGrid.getRespMsg(rest, 'vxe.grid.saveSuccess'), status: 'success' })
                       }
-                      VxeUI.modal.message({ content: $xeGrid.getRespMsg(rest, 'vxe.grid.saveSuccess'), status: 'success' })
                     }
                     if (afterSave) {
                       afterSave(...applyArgs)
@@ -936,11 +936,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
                   .catch(rest => {
                     reactData.tableLoading = false
                     if (isRespMsg) {
-                      // 检测弹窗模块
-                      if (!VxeUI.modal) {
-                        errLog('vxe.error.reqModule', ['Modal'])
+                      if (VxeUI.modal) {
+                        VxeUI.modal.message({ id: code, content: $xeGrid.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                       }
-                      VxeUI.modal.message({ id: code, content: $xeGrid.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                     }
                     if (saveErrorMethods) {
                       saveErrorMethods({ ...commitParams, response: rest })
@@ -949,11 +947,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
                   })
               } else {
                 if (isActiveMsg) {
-                  // 检测弹窗模块
-                  if (!VxeUI.modal) {
-                    errLog('vxe.error.reqModule', ['Modal'])
+                  if (VxeUI.modal) {
+                    VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.dataUnchanged'), status: 'info' })
                   }
-                  VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.dataUnchanged'), status: 'info' })
                 }
               }
             })

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/src/methods.ts

@@ -1002,7 +1002,7 @@ function updateStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
   const { visibleColumn, tableHeight, elemStore, customHeight, customMinHeight, customMaxHeight, tHeaderHeight, tFooterHeight } = internalData
   const $xeGanttView = internalData.xeGanttView
   const el = $xeTable.$refs.refElem as HTMLDivElement
-  if (!el || !el.clientHeight) {
+  if (!el || (internalData.tBodyHeight && !el.clientHeight)) {
     return
   }
   const containerList = ['main', 'left', 'right']
@@ -2359,7 +2359,7 @@ function calcTableHeight ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
   const props = $xeTable
   const reactData = $xeTable as unknown as TableReactData
 
-  const { editConfig } = props
+  const { editConfig, editRules } = props
   const { parentHeight } = reactData
   let val = props[key]
   if (key === 'minHeight') {
@@ -2367,7 +2367,7 @@ function calcTableHeight ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
     if (XEUtils.eqNull(val)) {
       if (eqEmptyValue(defMinHeight)) {
         // 编辑模式默认最小高度
-        if (isEnableConf(editConfig)) {
+        if (editRules && isEnableConf(editConfig)) {
           val = 144
         }
       } else {
@@ -10824,17 +10824,45 @@ const Methods = {
    */
   getScroll () {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
+    return $xeTable.getScrollData()
+  },
+  /**
+   * 获取表格的滚动数据
+   */
+  getScrollData () {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const reactData = $xeTable as unknown as TableReactData
     const internalData = $xeTable as unknown as TableInternalData
 
-    const { scrollXLoad, scrollYLoad } = reactData
+    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
     }
   },
   handleScrollEvent (evnt: Event, isRollY: boolean, isRollX: boolean, scrollTop: number, scrollLeft: number, params: any) {
@@ -11152,12 +11180,11 @@ const Methods = {
     const { scrollXLoad, scrollYLoad, expandColumn } = reactData
     const leftFixedWidth = $xeTable.computeLeftFixedWidth
     const rightFixedWidth = $xeTable.computeRightFixedWidth
-    if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
-      return
-    }
 
     const { elemStore, lastScrollTop, lastScrollLeft } = internalData
     const rowOpts = $xeTable.computeRowOpts
+    const scrollbarXOpts = $xeTable.computeScrollbarXOpts
+    const scrollbarYOpts = $xeTable.computeScrollbarYOpts
     const xHandleEl = $xeTable.$refs.refScrollXHandleElem as HTMLDivElement
     const yHandleEl = $xeTable.$refs.refScrollYHandleElem as HTMLDivElement
     const leftScrollElem = getRefElem(elemStore['left-body-scroll'])
@@ -11166,12 +11193,6 @@ const Methods = {
     const footerScrollElem = getRefElem(elemStore['main-footer-scroll'])
     const rightScrollElem = getRefElem(elemStore['right-body-scroll'])
     const rowExpandEl = $xeTable.$refs.refRowExpandElem as HTMLDivElement
-    if (!xHandleEl) {
-      return
-    }
-    if (!yHandleEl) {
-      return
-    }
     if (!bodyScrollElem) {
       return
     }
@@ -11188,7 +11209,19 @@ const Methods = {
     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) {
@@ -11196,6 +11229,10 @@ const Methods = {
       }
     }
 
+    if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
+      return
+    }
+
     if (rowOpts.isHover || highlightHoverRow) {
       $xeTable.clearHoverRow()
     }
@@ -11745,7 +11782,10 @@ const Methods = {
     scrollYStore.visibleStartIndex = 0
     scrollYStore.endIndex = scrollYStore.visibleSize
     scrollYStore.visibleEndIndex = scrollYStore.visibleSize
+
     return $xeTable.$nextTick().then(() => {
+      internalData.lastScrollLeft = 0
+      internalData.lastScrollTop = 0
       internalData.intoRunScroll = false
     })
   },

package/packages/table/src/table.ts

@@ -88,7 +88,7 @@ function renderViewFixed (h: CreateElement, $xeTable: VxeTableConstructor & VxeT
   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
     }]
@@ -446,7 +446,7 @@ function renderViewport (h: CreateElement, $xeTable: VxeTableConstructor & VxeTa
     }]
   }, [
     h('div', {
-      class: 'vxe-table--main-wrapper'
+      class: ['vxe-table--main-wrapper', `sx--${scrollbarXOpts.visible}`, `sy--${scrollbarYOpts.visible}`]
     }, [
       /**
          * 表头
@@ -1475,6 +1475,13 @@ export default {
     },
     computeVxeLanguage () {
       return VxeUI.getLanguage()
+    },
+    computeScrollbarVisible () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
+      const scrollbarXOpts = $xeTable.computeScrollbarXOpts
+      const scrollbarYOpts = $xeTable.computeScrollbarYOpts
+      return `${scrollbarXOpts.visible}${scrollbarYOpts.visible}`
     }
   } as any,
   watch: {
@@ -1547,6 +1554,9 @@ export default {
     computeVxeLanguage () {
       this.reLayoutFlag++
     },
+    computeScrollbarVisible () {
+      this.reLayoutFlag++
+    },
     reLayoutFlag () {
       const $xeTable = this
 
@@ -2211,11 +2221,15 @@ export default {
       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(h, $xeTable))
+          class: 'vxe-table--empty-placeholder'
+        }, [
+          h('div', {
+            class: 'vxe-table--empty-content'
+          }, renderEmptyBody(h, $xeTable))
+        ])
       ]),
       /**
        * 边框线

package/packages/table/src/util.ts

@@ -630,29 +630,43 @@ export function getRefElem (refEl: any) {
   return null
 }
 
-export function clearTableDefaultStatus (_vm: any) {
-  _vm.initStatus = false
-  _vm.clearSort()
-  _vm.clearCurrentRow()
-  _vm.clearCurrentColumn()
-  _vm.clearRadioRow()
-  _vm.clearRadioReserve()
-  _vm.clearCheckboxRow()
-  _vm.clearCheckboxReserve()
-  _vm.clearRowExpand()
-  _vm.clearTreeExpand()
-  _vm.clearTreeExpandReserve()
-  if (_vm.clearEdit) {
-    _vm.clearEdit()
-  }
-  if (_vm.clearSelected && (_vm.keyboardConfig || _vm.mouseConfig)) {
-    _vm.clearSelected()
-  }
-  if (_vm.clearCellAreas && _vm.mouseConfig) {
-    _vm.clearCellAreas()
-    _vm.clearCopyCellArea()
-  }
-  return _vm.clearScroll()
+export function clearTableDefaultStatus ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
+  const props = $xeTable
+  const internalData = $xeTable as unknown as TableInternalData
+
+  internalData.initStatus = false
+  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) {
+    actionList.push(
+      $xeTable.clearFilter()
+    )
+  }
+  if ($xeTable.clearSelected && (props.keyboardConfig || props.mouseConfig)) {
+    actionList.push(
+      $xeTable.clearSelected()
+    )
+  }
+  if ($xeTable.clearCellAreas && props.mouseConfig) {
+    actionList.push(
+      $xeTable.clearCellAreas(),
+      $xeTable.clearCopyCellArea()
+    )
+  }
+  return Promise.all(actionList).then(() => {
+    return $xeTable.clearScroll()
+  })
 }
 
 export function clearTableAllStatus (_vm: any) {

package/styles/components/table.scss

@@ -136,6 +136,51 @@ $btnThemeList: (
   overflow-x: scroll;
 }
 
+// 禁用滚动条
+.vxe-table--main-wrapper {
+  &.sx--hidden {
+    & > .vxe-table--header-wrapper {
+      & > .vxe-table--header-inner-wrapper {
+        overflow-x: hidden;
+      }
+    }
+    & > .vxe-table--body-wrapper {
+      & > .vxe-table--body-inner-wrapper {
+        overflow-x: hidden;
+      }
+    }
+    & > .vxe-table--footer-wrapper {
+      & > .vxe-table--footer-inner-wrapper {
+        overflow-x: hidden;
+      }
+    }
+  }
+  &.sy--hidden {
+    & > .vxe-table--body-wrapper {
+      & > .vxe-table--body-inner-wrapper {
+        overflow-y: hidden;
+      }
+    }
+  }
+}
+.vxe-table--fixed-left-wrapper,
+.vxe-table--fixed-right-wrapper {
+  &.sx--hidden {
+    & > .vxe-table--body-wrapper {
+      & > .vxe-table--body-inner-wrapper {
+        overflow-x: hidden;
+      }
+    }
+  }
+  &.sy--hidden {
+    & > .vxe-table--body-wrapper {
+      & > .vxe-table--body-inner-wrapper {
+        overflow-y: hidden;
+      }
+    }
+  }
+}
+
 .vxe-loading--custom-wrapper {
   display: none;
   position: absolute;
@@ -2141,11 +2186,16 @@ $btnThemeList: (
     display: none;
     visibility: hidden;
   }
-  .vxe-table--empty-placeholder {
+  .vxe-table--empty-place-wrapper {
     display: none;
     position: absolute;
+    width: 100%;
     top: 0;
     z-index: 5;
+    overflow: hidden;
+  }
+  .vxe-table--empty-placeholder {
+    display: flex;
   }
   .vxe-table--empty-content {
     display: block;
@@ -2154,7 +2204,7 @@ $btnThemeList: (
   }
   &.is--empty {
     .vxe-table--empty-block,
-    .vxe-table--empty-placeholder {
+    .vxe-table--empty-place-wrapper{
       display: flex;
     }
   }