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

package/es/table/src/footer.js

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

package/es/table/src/header.js

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

package/es/table/src/methods.js

@@ -171,7 +171,7 @@ function cacheColumnMap($xeTable) {
     const { tableFullColumn, collectColumn } = internalData;
     const fullColumnIdData = internalData.fullColumnIdData = {};
     const fullColumnFieldData = internalData.fullColumnFieldData = {};
-    const mouseOpts = $xeTable.computeMouseOpts;
+    // const mouseOpts = $xeTable.computeMouseOpts
     const columnOpts = $xeTable.computeColumnOpts;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     const { isCrossDrag, isSelfToChildDrag } = columnDragOpts;
@@ -261,11 +261,11 @@ function cacheColumnMap($xeTable) {
     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 === 'developmeznt') {
         if (htmlColumn) {
             if (!columnOpts.useKey) {
@@ -7274,7 +7274,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 {
@@ -7290,6 +7293,7 @@ const Methods = {
      * @param {Boolean} expanded 是否展开
      */
     setRowExpand(rows, expanded) {
+        const $xeTable = this;
         const { rowExpandedMaps, fullAllDataRowIdData, rowExpandLazyLoadedMaps, expandOpts, expandColumn: column } = this;
         let rExpandedMaps = Object.assign({}, rowExpandedMaps);
         const { reserve, lazy, accordion, toggleMethod } = expandOpts;
@@ -7334,7 +7338,9 @@ const Methods = {
             }
         }
         this.rowExpandedMaps = rExpandedMaps;
-        return Promise.all(lazyRests).then(this.recalculate);
+        return Promise.all(lazyRests)
+            .then(() => $xeTable.recalculate())
+            .then(() => $xeTable.updateCellAreas());
     },
     /**
      * 判断行是否为展开状态
@@ -7356,6 +7362,7 @@ const Methods = {
      * 手动清空展开行状态，数据会恢复成未展开的状态
      */
     clearRowExpand() {
+        const $xeTable = this;
         const { expandOpts, tableFullData } = this;
         const { reserve } = expandOpts;
         const expList = this.getRowExpandRecords();
@@ -7367,7 +7374,7 @@ const Methods = {
             if (expList.length) {
                 this.recalculate();
             }
-        });
+        }).then(() => $xeTable.updateCellAreas());
     },
     clearRowExpandReserve() {
         this.rowExpandedReserveRowMap = {};
@@ -8644,10 +8651,14 @@ const Methods = {
         }
     },
     updateCellAreas() {
-        if (this.mouseConfig && this.mouseOpts.area && this.handleRecalculateCellAreas) {
-            return this.handleRecalculateCellAreas();
+        const $xeTable = this;
+        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, params, evnt) {
         const $xeTable = this;

package/es/table/src/table.js

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

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 {