vxe-table 4.11.0-beta.1 → 4.11.0-beta.11

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

@@ -289,12 +289,10 @@ hooks.add('tableEditModule', {
     }
 
     const handleClearEdit = (evnt: Event | null, targetRow?: any) => {
-      const { mouseConfig } = props
       const { editStore } = reactData
       const { actived, focused } = editStore
       const { row, column } = actived
       const validOpts = computeValidOpts.value
-      const mouseOpts = computeMouseOpts.value
       if (row || column) {
         if (targetRow && getRowid($xeTable, targetRow) !== getRowid($xeTable, row)) {
           return nextTick()
@@ -322,11 +320,7 @@ hooks.add('tableEditModule', {
           }
         }
       }
-      return nextTick().then(() => {
-        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
-          return $xeTable.handleRecalculateCellAreas()
-        }
-      })
+      return nextTick().then(() => $xeTable.updateCellAreas())
     }
 
     const handleEditActive = (params: any, evnt: Event | null, isFocus: boolean) => {

package/packages/table/module/export/export-panel.ts

@@ -50,6 +50,11 @@ export default defineComponent({
       return !defaultOptions.original && defaultOptions.mode === 'current' && (storeData.isPrint || ['html', 'xlsx'].indexOf(defaultOptions.type) > -1)
     })
 
+    // const computeSupportGroup = computed(() => {
+    //   const { defaultOptions } = props
+    //   return ['html', 'xlsx', 'csv', 'txt'].indexOf(defaultOptions.type) > -1
+    // })
+
     const computeSupportStyle = computed(() => {
       const { defaultOptions } = props
       return !defaultOptions.original && ['xlsx'].indexOf(defaultOptions.type) > -1
@@ -166,6 +171,7 @@ export default defineComponent({
       const showSheet = computeShowSheet.value
       const supportMerge = computeSupportMerge.value
       const supportStyle = computeSupportStyle.value
+      // const supportGroup = computeSupportGroup.value
       const slots = defaultOptions.slots || {}
       const topSlot = slots.top
       const bottomSlot = slots.bottom
@@ -415,6 +421,9 @@ export default defineComponent({
                                 }, [
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
+                                      // modelValue: supportGroup || (isHeader && hasColgroup && supportMerge) ? defaultOptions.isColgroup : false,
+                                      // title: getI18n('vxe.export.expColgroupTitle'),
+                                      // disabled: !supportGroup && (!isHeader || !hasColgroup || !supportMerge),
                                       modelValue: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
                                       title: getI18n('vxe.export.expColgroupTitle'),
                                       disabled: !isHeader || !hasColgroup || !supportMerge,

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

@@ -92,9 +92,9 @@ function getBooleanValue (cellValue: any) {
   return cellValue === 'TRUE' || cellValue === 'true' || cellValue === true
 }
 
-function getFooterData (opts: any, footerTableData: any) {
+function getFooterData (opts: VxeTablePropTypes.ExportHandleOptions, footerTableData: any[]) {
   const { footerFilterMethod } = opts
-  return footerFilterMethod ? footerTableData.filter((items: any, index: any) => footerFilterMethod({ items, $rowIndex: index })) : footerTableData
+  return footerFilterMethod ? footerTableData.filter((items, index) => footerFilterMethod({ items, $rowIndex: index })) : footerTableData
 }
 
 function getCsvCellTypeLabel (column: any, cellValue: any) {
@@ -511,7 +511,7 @@ hooks.add('tableExportModule', {
       return XEUtils.get(row, column.field)
     }
 
-    const toCsv = (opts: any, columns: any[], datas: any[]) => {
+    const toCsv = (opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) => {
       let content = csvBOM
       if (opts.isHeader) {
         content += columns.map((column) => toTxtCellLabel(getHeaderTitle(opts, column))).join(',') + enterSymbol
@@ -522,14 +522,14 @@ hooks.add('tableExportModule', {
       if (opts.isFooter) {
         const { footerTableData } = reactData
         const footers = getFooterData(opts, footerTableData)
-        footers.forEach((row: any) => {
+        footers.forEach((row) => {
           content += columns.map((column: any) => toTxtCellLabel(getFooterCellValue(opts, row, column))).join(',') + enterSymbol
         })
       }
       return content
     }
 
-    const toTxt = (opts: any, columns: any[], datas: any[]) => {
+    const toTxt = (opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) => {
       let content = ''
       if (opts.isHeader) {
         content += columns.map((column) => toTxtCellLabel(getHeaderTitle(opts, column))).join('\t') + enterSymbol
@@ -540,14 +540,14 @@ hooks.add('tableExportModule', {
       if (opts.isFooter) {
         const { footerTableData } = reactData
         const footers = getFooterData(opts, footerTableData)
-        footers.forEach((row: any) => {
+        footers.forEach((row) => {
           content += columns.map((column: any) => toTxtCellLabel(getFooterCellValue(opts, row, column))).join('\t') + enterSymbol
         })
       }
       return content
     }
 
-    const hasEllipsis = (column: any, property: string, allColumnOverflow: any) => {
+    const hasEllipsis = (column: VxeTableDefines.ColumnInfo, property: 'showOverflow' | 'showHeaderOverflow', allColumnOverflow: VxeTablePropTypes.ShowOverflow | undefined) => {
       const columnOverflow = column[property]
       const headOverflow = XEUtils.isUndefined(columnOverflow) || XEUtils.isNull(columnOverflow) ? allColumnOverflow : columnOverflow
       const showEllipsis = headOverflow === 'ellipsis'
@@ -562,7 +562,7 @@ hooks.add('tableExportModule', {
       return isEllipsis
     }
 
-    const toHtml = (opts: any, columns: any, datas: any) => {
+    const toHtml = (opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) => {
       const { id, border, treeConfig, headerAlign: allHeaderAlign, align: allAlign, footerAlign: allFooterAlign, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow } = props
       const { isAllSelected, isIndeterminate, mergeList } = reactData
       const treeOpts = computeTreeOpts.value
@@ -762,7 +762,7 @@ hooks.add('tableExportModule', {
       return `${xml}</Table></Worksheet></Workbook>`
     }
 
-    const getContent = (opts: any, columns: any, datas: any) => {
+    const getContent = (opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) => {
       if (columns.length) {
         switch (opts.type) {
           case 'csv':
@@ -1138,24 +1138,28 @@ hooks.add('tableExportModule', {
        * @param {Object} options 参数
        */
       exportData (options) {
-        const { treeConfig } = props
-        const { isGroup, tableGroupColumn } = reactData
+        const { treeConfig, showHeader, showFooter } = props
+        const { mergeList, mergeFooterList, isGroup, tableGroupColumn } = reactData
         const { tableFullColumn, afterFullData } = internalData
         const exportOpts = computeExportOpts.value
         const treeOpts = computeTreeOpts.value
+        const proxyOpts = $xeGrid ? $xeGrid.getComputeMaps().computeProxyOpts.value : {} as VxeGridPropTypes.ProxyOpts
+        const hasMerge = !!(mergeList.length || mergeFooterList.length)
         const opts = Object.assign({
+          message: true,
+          isHeader: showHeader,
+          isFooter: showFooter,
+          isColgroup: isGroup,
+          isMerge: hasMerge,
+          useStyle: true,
+          current: 'current',
+          modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []),
+          download: true,
+          type: 'csv'
           // filename: '',
           // sheetName: '',
           // original: false,
-          // message: false,
-          isHeader: true,
-          isFooter: true,
-          isColgroup: true,
-          // isMerge: false,
           // isAllExpand: false,
-          download: true,
-          type: 'csv',
-          mode: 'current'
           // data: null,
           // remote: false,
           // dataFilterMethod: null,
@@ -1167,7 +1171,20 @@ hooks.add('tableExportModule', {
         }, exportOpts, options)
         const { filename, sheetName, type, mode, columns, original, columnFilterMethod, beforeExportMethod, includeFields, excludeFields } = opts
         let groups: any[] = []
-        const customCols = columns && columns.length ? columns : null
+        const customCols = columns && columns.length
+          ? columns
+          : XEUtils.searchTree(tableGroupColumn, column => {
+            const isColGroup = column.children && column.children.length
+            let isChecked = false
+            if (columns && columns.length) {
+              isChecked = handleFilterColumns(opts, column, columns)
+            } else if (excludeFields || includeFields) {
+              isChecked = handleFilterFields(opts, column, includeFields, excludeFields)
+            } else {
+              isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column))
+            }
+            return isChecked
+          }, { children: 'children', mapChildren: 'childNodes', original: true })
         const handleOptions: VxeTablePropTypes.ExportHandleOptions = Object.assign({ } as { data: any[], colgroups: any[], columns: any[] }, opts, { filename: '', sheetName: '' })
         // 如果设置源数据，则默认导出设置了字段的列
         if (!customCols && !columnFilterMethod) {

package/packages/table/render/index.ts

@@ -819,6 +819,11 @@ renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod,
     tableExportMethod: handleExportSelectMethod
   },
+  formatOption: {
+    renderTableDefault (renderOpts, params) {
+      return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params))
+    }
+  },
   VxeTreeSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,
@@ -827,6 +832,11 @@ renderer.mixin({
     },
     tableExportMethod: handleExportTreeSelectMethod
   },
+  formatTree: {
+    renderTableDefault (renderOpts, params) {
+      return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params))
+    }
+  },
   VxeTableSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,

package/packages/table/src/body.ts

@@ -635,7 +635,7 @@ export default defineComponent({
 
       const { fixedColumn, fixedType, tableColumn } = props
       const { spanMethod, footerSpanMethod, mouseConfig } = tableProps
-      const { isGroup, tableData, isRowLoading, isColLoading, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn, dragRow, dragCol } = tableReactData
+      const { isGroup, tableData, isRowLoading, isColLoading, overflowX, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn, dragRow, dragCol } = tableReactData
       const { visibleColumn, fullAllDataRowIdData, fullColumnIdData } = tableInternalData
       const rowOpts = computeRowOpts.value
       const emptyOpts = computeEmptyOpts.value
@@ -655,8 +655,11 @@ export default defineComponent({
         }
       }
 
-      if (fixedType) {
+      if (fixedType || !overflowX) {
         renderColumnList = visibleColumn
+      }
+
+      if (fixedType) {
         if (isOptimizeMode) {
           renderColumnList = fixedColumn || []
         }

package/packages/table/src/cell.ts

@@ -806,6 +806,9 @@ export const Cell = {
           class: ['vxe-table--expanded', {
             'is--active': isActive
           }],
+          onMousedown (evnt) {
+            evnt.stopPropagation()
+          },
           onClick (evnt: MouseEvent) {
             $table.triggerRowExpandEvent(evnt, params)
           }

package/packages/table/src/footer.ts

@@ -267,7 +267,7 @@ export default defineComponent({
       const { fixedType, fixedColumn, tableColumn } = props
       const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = tableProps
       const { visibleColumn, fullColumnIdData } = tableInternalData
-      const { isGroup, scrollXLoad, scrollYLoad, dragCol } = tableReactData
+      const { isGroup, overflowX, scrollXLoad, scrollYLoad, dragCol } = tableReactData
 
       let renderColumnList = tableColumn
       let isOptimizeMode = false
@@ -280,8 +280,11 @@ export default defineComponent({
         }
       }
 
-      if (fixedType) {
+      if (fixedType || !overflowX) {
         renderColumnList = visibleColumn
+      }
+
+      if (fixedType) {
         if (isOptimizeMode) {
           renderColumnList = fixedColumn || []
         }

package/packages/table/src/header.ts

@@ -142,8 +142,8 @@ export default defineComponent({
             'is--sortable': column.sortable,
             'col--filter': !!filters,
             'is--filter-active': hasFilter,
-            'is--drag-active': !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
-            'is--drag-disabled': isDisabledDrag,
+            'is--drag-active': columnOpts.drag && !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
+            'is--drag-disabled': columnOpts.drag && isDisabledDrag,
             'col--current': currentColumn === column
           },
           headerClassName ? (XEUtils.isFunction(headerClassName) ? headerClassName(cellParams) : headerClassName) : '',
@@ -223,7 +223,7 @@ export default defineComponent({
     const renderVN = () => {
       const { fixedType, fixedColumn, tableColumn } = props
       const { mouseConfig, showHeaderOverflow: allColumnHeaderOverflow, spanMethod, footerSpanMethod } = tableProps
-      const { isGroup, scrollXLoad, scrollYLoad, dragCol } = tableReactData
+      const { isGroup, overflowX, scrollXLoad, scrollYLoad, dragCol } = tableReactData
       const { visibleColumn, fullColumnIdData } = tableInternalData
 
       const mouseOpts = computeMouseOpts.value
@@ -243,8 +243,11 @@ export default defineComponent({
           }
         }
 
-        if (fixedType) {
+        if (fixedType || !overflowX) {
           renderColumnList = visibleColumn
+        }
+
+        if (fixedType) {
           // 如果是使用优化模式
           if (isOptimizeMode) {
             renderColumnList = fixedColumn || []

package/packages/table/src/table.ts

@@ -1247,6 +1247,7 @@ export default defineComponent({
       const fullColumnIdData: Record<string, VxeTableDefines.ColumnCacheItem> = internalData.fullColumnIdData = {}
       const fullColumnFieldData: Record<string, VxeTableDefines.ColumnCacheItem> = internalData.fullColumnFieldData = {}
       const mouseOpts = computeMouseOpts.value
+      const expandOpts = computeExpandOpts.value
       const columnOpts = computeColumnOpts.value
       const columnDragOpts = computeColumnDragOpts.value
       const { isCrossDrag, isSelfToChildDrag } = columnDragOpts
@@ -1333,10 +1334,8 @@ export default defineComponent({
         tableFullColumn.forEach(handleFunc)
       }
 
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (expandColumn && mouseOpts.area) {
-          errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
-        }
+      if ((expandColumn && expandOpts.mode !== 'fixed') && mouseOpts.area) {
+        errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
       }
 
       if (process.env.VUE_APP_VXE_ENV === 'development') {
@@ -1584,6 +1583,7 @@ export default defineComponent({
     }
 
     const updateAfterListIndex = () => {
+      const { treeConfig } = props
       const { afterFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData
       const fullMaps: Record<string, any> = {}
       afterFullData.forEach((row, index) => {
@@ -1591,7 +1591,9 @@ export default defineComponent({
         const rowRest = fullAllDataRowIdData[rowid]
         const seq = index + 1
         if (rowRest) {
-          rowRest.seq = seq
+          if (!treeConfig) {
+            rowRest.seq = seq
+          }
           rowRest._index = index
         } else {
           const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, treeIndex: -1, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
@@ -2607,7 +2609,10 @@ export default defineComponent({
               delete rExpandLazyLoadedMaps[rowid]
             }
             reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps
-            nextTick().then(() => tableMethods.recalculate()).then(() => resolve())
+            nextTick()
+              .then(() => $xeTable.recalculate())
+              .then(() => $xeTable.updateCellAreas())
+              .then(() => resolve())
           })
         } else {
           resolve()
@@ -3089,6 +3094,7 @@ export default defineComponent({
     }
 
     const handleColumn = (collectColumn: VxeTableDefines.ColumnInfo[]) => {
+      const expandOpts = computeExpandOpts.value
       internalData.collectColumn = collectColumn
       const tableFullColumn = getColumnList(collectColumn)
       internalData.tableFullColumn = tableFullColumn
@@ -3098,6 +3104,7 @@ export default defineComponent({
       return Promise.resolve(
         restoreCustomStorage()
       ).then(() => {
+        const { scrollXLoad, scrollYLoad, expandColumn } = reactData
         cacheColumnMap()
         parseColumns(true).then(() => {
           if (reactData.scrollXLoad) {
@@ -3107,11 +3114,11 @@ export default defineComponent({
         $xeTable.clearMergeCells()
         $xeTable.clearMergeFooterItems()
         $xeTable.handleTableData(true)
-        // if (process.env.VUE_APP_VXE_ENV === 'development') {
-        //   if ((reactData.scrollXLoad || reactData.scrollYLoad) && reactData.expandColumn) {
-        //     warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
-        //   }
-        // }
+
+        if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
+          warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
+        }
+
         return nextTick().then(() => {
           if ($xeToolbar) {
             $xeToolbar.syncUpdate({
@@ -3495,6 +3502,15 @@ export default defineComponent({
       }
     }
 
+    const handleRowExpandScroll = () => {
+      const { elemStore } = internalData
+      const rowExpandEl = refRowExpandElem.value
+      const bodyScrollElem = getRefElem(elemStore['main-body-scroll'])
+      if (rowExpandEl && bodyScrollElem) {
+        rowExpandEl.scrollTop = bodyScrollElem.scrollTop
+      }
+    }
+
     tableMethods = {
       dispatchEvent,
       /**
@@ -5211,14 +5227,14 @@ export default defineComponent({
        * @param {Boolean} expanded 是否展开
        */
       setRowExpand (rows, expanded) {
-        const { rowExpandedMaps, rowExpandLazyLoadedMaps, expandColumn: column } = reactData
+        const { rowExpandedMaps, rowExpandLazyLoadedMaps, expandColumn } = reactData
         const { fullAllDataRowIdData } = internalData
         let rExpandedMaps = { ...rowExpandedMaps }
         const expandOpts = computeExpandOpts.value
         const { reserve, lazy, accordion, toggleMethod } = expandOpts
         const lazyRests: any[] = []
-        const columnIndex = tableMethods.getColumnIndex(column)
-        const $columnIndex = tableMethods.getVMColumnIndex(column)
+        const columnIndex = $xeTable.getColumnIndex(expandColumn)
+        const $columnIndex = $xeTable.getVMColumnIndex(expandColumn)
         if (rows) {
           if (!XEUtils.isArray(rows)) {
             rows = [rows]
@@ -5228,7 +5244,7 @@ export default defineComponent({
             rExpandedMaps = {}
             rows = rows.slice(rows.length - 1, rows.length)
           }
-          const validRows: any[] = toggleMethod ? rows.filter((row: any) => toggleMethod({ $table: $xeTable, expanded, column, columnIndex, $columnIndex, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) })) : rows
+          const validRows: any[] = toggleMethod ? rows.filter((row: any) => toggleMethod({ $table: $xeTable, expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) })) : rows
           if (expanded) {
             validRows.forEach((row: any) => {
               const rowid = getRowid($xeTable, row)
@@ -5251,11 +5267,19 @@ export default defineComponent({
             })
           }
           if (reserve) {
-            validRows.forEach((row: any) => handleRowExpandReserve(row, expanded))
+            validRows.forEach((row) => handleRowExpandReserve(row, expanded))
           }
         }
         reactData.rowExpandedMaps = rExpandedMaps
-        return Promise.all(lazyRests).then(() => tableMethods.recalculate())
+        return Promise.all(lazyRests)
+          .then(() => $xeTable.recalculate())
+          .then(() => {
+            if (expandColumn) {
+              updateRowExpandStyle()
+              handleRowExpandScroll()
+            }
+            return $xeTable.updateCellAreas()
+          })
       },
       /**
        * 判断行是否为展开状态
@@ -5289,7 +5313,7 @@ export default defineComponent({
           if (expList.length) {
             tableMethods.recalculate()
           }
-        })
+        }).then(() => $xeTable.updateCellAreas())
       },
       clearRowExpandReserve () {
         internalData.rowExpandedReserveRowMap = {}
@@ -5712,8 +5736,8 @@ export default defineComponent({
       updateCellAreas () {
         const { mouseConfig } = props
         const mouseOpts = computeMouseOpts.value
-        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
-          return $xeTable.handleRecalculateCellAreas()
+        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreaEvent) {
+          return $xeTable.handleRecalculateCellAreaEvent()
         }
         return nextTick()
       },
@@ -7314,7 +7338,7 @@ export default defineComponent({
             const isSelected = sLen >= vLen
             const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1)
             if (checkField) {
-              XEUtils.get(row, checkField, isSelected)
+              XEUtils.set(row, checkField, isSelected)
             }
             if (isSelected) {
               if (!checkField) {
@@ -7384,7 +7408,7 @@ export default defineComponent({
             vLen++
           })
 
-        const isSelected = vLen > 0 ? sLen >= vLen : sLen >= rootList.length
+        const isSelected = rootList.length > 0 ? (vLen > 0 ? (sLen >= vLen) : (sLen >= rootList.length)) : false
         const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1)
 
         reactData.isAllSelected = isSelected
@@ -9046,7 +9070,7 @@ export default defineComponent({
       updateScrollYStatus,
       // 更新横向 X 可视渲染上下剩余空间大小
       updateScrollXSpace () {
-        const { isGroup, scrollXLoad } = reactData
+        const { isGroup, scrollXLoad, overflowX } = reactData
         const { visibleColumn, scrollXStore, elemStore, tableWidth } = internalData
         const tableHeader = refTableHeader.value
         const tableBody = refTableBody.value
@@ -9060,7 +9084,7 @@ export default defineComponent({
           const footerElem = tableFooterElem ? tableFooterElem.querySelector('.vxe-table--footer') as HTMLTableElement : null
           const leftSpaceWidth = visibleColumn.slice(0, scrollXStore.startIndex).reduce((previous, column) => previous + column.renderWidth, 0)
           let marginLeft = ''
-          if (scrollXLoad) {
+          if (scrollXLoad && overflowX) {
             marginLeft = `${leftSpaceWidth}px`
           }
           if (headerElem) {
@@ -9888,7 +9912,8 @@ export default defineComponent({
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)'])
       }
       loadTableData(value, true).then(() => {
-        // const { scrollXLoad, scrollYLoad, expandColumn } = reactData
+        const { scrollXLoad, scrollYLoad, expandColumn } = reactData
+        const expandOpts = computeExpandOpts.value
         internalData.inited = true
         internalData.initStatus = true
         if (!initStatus) {
@@ -9899,9 +9924,9 @@ export default defineComponent({
         // if (checkboxColumn && internalData.tableFullData.length > 300 && !checkboxOpts.checkField) {
         //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
         // }
-        // if ((scrollXLoad || scrollYLoad) && expandColumn) {
-        //   warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
-        // }
+        if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
+          warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
+        }
         return tableMethods.recalculate()
       })
     })
@@ -9950,6 +9975,12 @@ export default defineComponent({
     watch(() => props.showFooter, () => {
       reScrollFlag.value++
     })
+    watch(() => reactData.overflowX, () => {
+      reScrollFlag.value++
+    })
+    watch(() => reactData.overflowY, () => {
+      reScrollFlag.value++
+    })
     watch(reScrollFlag, () => {
       nextTick(() => {
         tableMethods.recalculate(true).then(() => tableMethods.refreshScroll())

package/styles/components/table.scss

@@ -271,7 +271,7 @@
   display: none;
   position: absolute;
   pointer-events: none;
-  z-index: 1;
+  z-index: 6;
 }
 
 .vxe-table--header-wrapper {