vxe-table 3.13.0-beta.2 → 3.13.0-beta.4

package/packages/table/src/header.ts

@@ -272,7 +272,7 @@ export default {
     const { headerColumn } = this
 
     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 = $xeTable.computeMouseOpts
@@ -292,8 +292,11 @@ export default {
         }
       }
 
-      if (fixedType) {
+      if (fixedType || !overflowX) {
         renderColumnList = visibleColumn
+      }
+
+      if (fixedType) {
         // 如果是使用优化模式
         if (isOptimizeMode) {
           renderColumnList = fixedColumn || []

package/packages/table/src/methods.ts

@@ -189,7 +189,7 @@ function cacheColumnMap ($xeTable: VxeTableConstructor) {
   const { tableFullColumn, collectColumn } = internalData
   const fullColumnIdData: Record<string, VxeTableDefines.ColumnCacheItem> = internalData.fullColumnIdData = {}
   const fullColumnFieldData: Record<string, VxeTableDefines.ColumnCacheItem> = internalData.fullColumnFieldData = {}
-  const mouseOpts = $xeTable.computeMouseOpts
+  // const mouseOpts = $xeTable.computeMouseOpts
   const columnOpts = $xeTable.computeColumnOpts
   const columnDragOpts = $xeTable.computeColumnDragOpts
   const { isCrossDrag, isSelfToChildDrag } = columnDragOpts
@@ -277,11 +277,11 @@ function cacheColumnMap ($xeTable: VxeTableConstructor) {
     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 (process.env.VUE_APP_VXE_ENV === 'development') {
+  //   if (expandColumn && mouseOpts.area) {
+  //     errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
+  //   }
+  // }
 
   if (process.env.VUE_APP_VXE_ENV === 'developmeznt') {
     if (htmlColumn) {
@@ -7412,7 +7412,10 @@ const Methods = {
             delete rExpandLazyLoadedMaps[rowid]
           }
           reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps
-          $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => resolve())
+          $xeTable.$nextTick()
+            .then(() => $xeTable.recalculate())
+            .then(() => $xeTable.updateCellAreas())
+            .then(() => resolve())
         })
       } else {
         resolve()
@@ -7427,6 +7430,8 @@ const Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand (rows: any, expanded: any) {
+    const $xeTable = this
+
     const { rowExpandedMaps, fullAllDataRowIdData, rowExpandLazyLoadedMaps, expandOpts, expandColumn: column } = this
     let rExpandedMaps = { ...rowExpandedMaps }
     const { reserve, lazy, accordion, toggleMethod } = expandOpts
@@ -7442,7 +7447,7 @@ const Methods = {
         rExpandedMaps = {}
         rows = rows.slice(rows.length - 1, rows.length)
       }
-      const validRows = toggleMethod ? rows.filter((row: any) => toggleMethod({ expanded, column, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows
+      const validRows: any[] = toggleMethod ? rows.filter((row: any) => toggleMethod({ expanded, column, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows
       if (expanded) {
         validRows.forEach((row: any) => {
           const rowid = getRowid(this, row)
@@ -7457,7 +7462,7 @@ const Methods = {
           }
         })
       } else {
-        validRows.forEach((item: any) => {
+        validRows.forEach((item) => {
           const rowid = getRowid(this, item)
           if (rExpandedMaps[rowid]) {
             delete rExpandedMaps[rowid]
@@ -7465,11 +7470,13 @@ const Methods = {
         })
       }
       if (reserve) {
-        validRows.forEach((row: any) => this.handleRowExpandReserve(row, expanded))
+        validRows.forEach((row) => this.handleRowExpandReserve(row, expanded))
       }
     }
     this.rowExpandedMaps = rExpandedMaps
-    return Promise.all(lazyRests).then(this.recalculate)
+    return Promise.all(lazyRests)
+      .then(() => $xeTable.recalculate())
+      .then(() => $xeTable.updateCellAreas())
   },
   /**
    * 判断行是否为展开状态
@@ -7491,6 +7498,8 @@ const Methods = {
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand () {
+    const $xeTable = this
+
     const { expandOpts, tableFullData } = this
     const { reserve } = expandOpts
     const expList = this.getRowExpandRecords()
@@ -7502,7 +7511,7 @@ const Methods = {
       if (expList.length) {
         this.recalculate()
       }
-    })
+    }).then(() => $xeTable.updateCellAreas())
   },
   clearRowExpandReserve () {
     this.rowExpandedReserveRowMap = {}
@@ -8810,10 +8819,15 @@ const Methods = {
     }
   },
   updateCellAreas () {
-    if (this.mouseConfig && this.mouseOpts.area && this.handleRecalculateCellAreas) {
-      return this.handleRecalculateCellAreas()
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
+
+    const { mouseConfig } = props
+    const mouseOpts = $xeTable.computeMouseOpts
+    if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreaEvent) {
+      return $xeTable.handleRecalculateCellAreaEvent()
     }
-    return this.$nextTick()
+    return $xeTable.$nextTick()
   },
   dispatchEvent (type: ValueOf<VxeTableEmits>, params: Record<string, any>, evnt: Event | null) {
     const $xeTable = this

package/packages/table/src/table.ts

@@ -1222,6 +1222,12 @@ export default {
     showFooter () {
       this.reScrollFlag++
     },
+    overflowX () {
+      this.reScrollFlag++
+    },
+    overflowY () {
+      this.reScrollFlag++
+    },
     reScrollFlag () {
       const $xeTable = this
 

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 {