vxe-table 4.11.0-beta.3 → 4.11.0-beta.4

package/packages/table/src/table.ts

@@ -1246,7 +1246,7 @@ export default defineComponent({
       const { tableFullColumn, collectColumn } = internalData
       const fullColumnIdData: Record<string, VxeTableDefines.ColumnCacheItem> = internalData.fullColumnIdData = {}
       const fullColumnFieldData: Record<string, VxeTableDefines.ColumnCacheItem> = internalData.fullColumnFieldData = {}
-      const mouseOpts = computeMouseOpts.value
+      // const mouseOpts = computeMouseOpts.value
       const columnOpts = computeColumnOpts.value
       const columnDragOpts = computeColumnDragOpts.value
       const { isCrossDrag, isSelfToChildDrag } = columnDragOpts
@@ -1333,11 +1333,11 @@ 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 (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 (htmlColumn) {
@@ -2607,7 +2607,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()
@@ -5251,11 +5254,13 @@ 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(() => $xeTable.updateCellAreas())
       },
       /**
        * 判断行是否为展开状态
@@ -5289,7 +5294,7 @@ export default defineComponent({
           if (expList.length) {
             tableMethods.recalculate()
           }
-        })
+        }).then(() => $xeTable.updateCellAreas())
       },
       clearRowExpandReserve () {
         internalData.rowExpandedReserveRowMap = {}
@@ -5712,8 +5717,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()
       },

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 {