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

package/es/table/src/footer.js

@@ -245,7 +245,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;
             // 如果是使用优化模式
@@ -257,8 +257,10 @@ export default defineComponent({
                     isOptimizeMode = true;
                 }
             }
-            if (fixedType) {
+            if (fixedType || !overflowX) {
                 renderColumnList = visibleColumn;
+            }
+            if (fixedType) {
                 if (isOptimizeMode) {
                     renderColumnList = fixedColumn || [];
                 }

package/es/table/src/header.js

@@ -199,7 +199,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;
             let renderHeaderList = headerColumn.value;
@@ -218,8 +218,10 @@ export default defineComponent({
                         isOptimizeMode = true;
                     }
                 }
-                if (fixedType) {
+                if (fixedType || !overflowX) {
                     renderColumnList = visibleColumn;
+                }
+                if (fixedType) {
                     // 如果是使用优化模式
                     if (isOptimizeMode) {
                         renderColumnList = fixedColumn || [];

package/es/table/src/table.js

@@ -1141,7 +1141,7 @@ export default defineComponent({
             const { tableFullColumn, collectColumn } = internalData;
             const fullColumnIdData = internalData.fullColumnIdData = {};
             const fullColumnFieldData = internalData.fullColumnFieldData = {};
-            const mouseOpts = computeMouseOpts.value;
+            // const mouseOpts = computeMouseOpts.value
             const columnOpts = computeColumnOpts.value;
             const columnDragOpts = computeColumnDragOpts.value;
             const { isCrossDrag, isSelfToChildDrag } = columnDragOpts;
@@ -1231,11 +1231,11 @@ export default defineComponent({
             else {
                 tableFullColumn.forEach(handleFunc);
             }
-            if (process.env.NODE_ENV === 'development') {
-                if (expandColumn && mouseOpts.area) {
-                    errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
-                }
-            }
+            // if (process.env.NODE_ENV === 'development') {
+            //   if (expandColumn && mouseOpts.area) {
+            //     errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
+            //   }
+            // }
             if (process.env.NODE_ENV === 'development') {
                 if (htmlColumn) {
                     if (!columnOpts.useKey) {
@@ -2472,7 +2472,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 {
@@ -5122,7 +5125,9 @@ export default defineComponent({
                     }
                 }
                 reactData.rowExpandedMaps = rExpandedMaps;
-                return Promise.all(lazyRests).then(() => tableMethods.recalculate());
+                return Promise.all(lazyRests)
+                    .then(() => $xeTable.recalculate())
+                    .then(() => $xeTable.updateCellAreas());
             },
             /**
              * 判断行是否为展开状态
@@ -5156,7 +5161,7 @@ export default defineComponent({
                     if (expList.length) {
                         tableMethods.recalculate();
                     }
-                });
+                }).then(() => $xeTable.updateCellAreas());
             },
             clearRowExpandReserve() {
                 internalData.rowExpandedReserveRowMap = {};
@@ -5576,8 +5581,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();
             },
@@ -8926,7 +8931,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;
@@ -8940,7 +8945,7 @@ export default defineComponent({
                     const footerElem = tableFooterElem ? tableFooterElem.querySelector('.vxe-table--footer') : 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) {
@@ -9806,6 +9811,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/es/table/style.css

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