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

package/es/table/src/cell.js

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

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

package/es/table/src/header.js

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

package/es/table/src/table.js

@@ -1142,7 +1142,6 @@ export default defineComponent({
             const fullColumnIdData = internalData.fullColumnIdData = {};
             const fullColumnFieldData = internalData.fullColumnFieldData = {};
             const mouseOpts = computeMouseOpts.value;
-            const expandOpts = computeExpandOpts.value;
             const columnOpts = computeColumnOpts.value;
             const columnDragOpts = computeColumnDragOpts.value;
             const { isCrossDrag, isSelfToChildDrag } = columnDragOpts;
@@ -1232,8 +1231,10 @@ export default defineComponent({
             else {
                 tableFullColumn.forEach(handleFunc);
             }
-            if ((expandColumn && expandOpts.mode !== 'fixed') && 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) {
@@ -2471,10 +2472,7 @@ export default defineComponent({
                             delete rExpandLazyLoadedMaps[rowid];
                         }
                         reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
-                        nextTick()
-                            .then(() => $xeTable.recalculate())
-                            .then(() => $xeTable.updateCellAreas())
-                            .then(() => resolve());
+                        nextTick().then(() => tableMethods.recalculate()).then(() => resolve());
                     });
                 }
                 else {
@@ -2952,7 +2950,6 @@ export default defineComponent({
             });
         };
         const handleColumn = (collectColumn) => {
-            const expandOpts = computeExpandOpts.value;
             internalData.collectColumn = collectColumn;
             const tableFullColumn = getColumnList(collectColumn);
             internalData.tableFullColumn = tableFullColumn;
@@ -2960,7 +2957,6 @@ export default defineComponent({
             reactData.isDragColMove = false;
             initColumnSort();
             return Promise.resolve(restoreCustomStorage()).then(() => {
-                const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
                 cacheColumnMap();
                 parseColumns(true).then(() => {
                     if (reactData.scrollXLoad) {
@@ -2970,9 +2966,11 @@ export default defineComponent({
                 $xeTable.clearMergeCells();
                 $xeTable.clearMergeFooterItems();
                 $xeTable.handleTableData(true);
-                if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
-                    warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
-                }
+                // if (process.env.NODE_ENV === 'development') {
+                //   if ((reactData.scrollXLoad || reactData.scrollYLoad) && reactData.expandColumn) {
+                //     warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
+                //   }
+                // }
                 return nextTick().then(() => {
                     if ($xeToolbar) {
                         $xeToolbar.syncUpdate({
@@ -3344,14 +3342,6 @@ 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,
             /**
@@ -5086,14 +5076,14 @@ export default defineComponent({
              * @param {Boolean} expanded 是否展开
              */
             setRowExpand(rows, expanded) {
-                const { rowExpandedMaps, rowExpandLazyLoadedMaps, expandColumn } = reactData;
+                const { rowExpandedMaps, rowExpandLazyLoadedMaps, expandColumn: column } = reactData;
                 const { fullAllDataRowIdData } = internalData;
                 let rExpandedMaps = Object.assign({}, rowExpandedMaps);
                 const expandOpts = computeExpandOpts.value;
                 const { reserve, lazy, accordion, toggleMethod } = expandOpts;
                 const lazyRests = [];
-                const columnIndex = tableMethods.getColumnIndex(expandColumn);
-                const $columnIndex = tableMethods.getVMColumnIndex(expandColumn);
+                const columnIndex = tableMethods.getColumnIndex(column);
+                const $columnIndex = tableMethods.getVMColumnIndex(column);
                 if (rows) {
                     if (!XEUtils.isArray(rows)) {
                         rows = [rows];
@@ -5103,7 +5093,7 @@ export default defineComponent({
                         rExpandedMaps = {};
                         rows = rows.slice(rows.length - 1, rows.length);
                     }
-                    const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) })) : rows;
+                    const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column, columnIndex, $columnIndex, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) })) : rows;
                     if (expanded) {
                         validRows.forEach((row) => {
                             const rowid = getRowid($xeTable, row);
@@ -5132,15 +5122,7 @@ export default defineComponent({
                     }
                 }
                 reactData.rowExpandedMaps = rExpandedMaps;
-                return Promise.all(lazyRests)
-                    .then(() => $xeTable.recalculate())
-                    .then(() => {
-                    if (expandColumn) {
-                        updateRowExpandStyle();
-                        handleRowExpandScroll();
-                    }
-                    return $xeTable.updateCellAreas();
-                });
+                return Promise.all(lazyRests).then(() => tableMethods.recalculate());
             },
             /**
              * 判断行是否为展开状态
@@ -5174,7 +5156,7 @@ export default defineComponent({
                     if (expList.length) {
                         tableMethods.recalculate();
                     }
-                }).then(() => $xeTable.updateCellAreas());
+                });
             },
             clearRowExpandReserve() {
                 internalData.rowExpandedReserveRowMap = {};
@@ -5594,8 +5576,8 @@ export default defineComponent({
             updateCellAreas() {
                 const { mouseConfig } = props;
                 const mouseOpts = computeMouseOpts.value;
-                if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreaEvent) {
-                    return $xeTable.handleRecalculateCellAreaEvent();
+                if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
+                    return $xeTable.handleRecalculateCellAreas();
                 }
                 return nextTick();
             },
@@ -7295,7 +7277,7 @@ export default defineComponent({
                         }
                         vLen++;
                     });
-                const isSelected = rootList.length > 0 ? (vLen > 0 ? (sLen >= vLen) : (sLen >= rootList.length)) : false;
+                const isSelected = vLen > 0 ? sLen >= vLen : sLen >= rootList.length;
                 const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
                 reactData.isAllSelected = isSelected;
                 reactData.isIndeterminate = halfSelect;
@@ -8944,7 +8926,7 @@ export default defineComponent({
             updateScrollYStatus,
             // 更新横向 X 可视渲染上下剩余空间大小
             updateScrollXSpace() {
-                const { isGroup, scrollXLoad, overflowX } = reactData;
+                const { isGroup, scrollXLoad } = reactData;
                 const { visibleColumn, scrollXStore, elemStore, tableWidth } = internalData;
                 const tableHeader = refTableHeader.value;
                 const tableBody = refTableBody.value;
@@ -8958,7 +8940,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 && overflowX) {
+                    if (scrollXLoad) {
                         marginLeft = `${leftSpaceWidth}px`;
                     }
                     if (headerElem) {
@@ -9767,8 +9749,7 @@ export default defineComponent({
                 warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
             }
             loadTableData(value, true).then(() => {
-                const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
-                const expandOpts = computeExpandOpts.value;
+                // const { scrollXLoad, scrollYLoad, expandColumn } = reactData
                 internalData.inited = true;
                 internalData.initStatus = true;
                 if (!initStatus) {
@@ -9779,9 +9760,9 @@ export default defineComponent({
                 // if (checkboxColumn && internalData.tableFullData.length > 300 && !checkboxOpts.checkField) {
                 //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
                 // }
-                if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
-                    warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
-                }
+                // if ((scrollXLoad || scrollYLoad) && expandColumn) {
+                //   warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
+                // }
                 return tableMethods.recalculate();
             });
         });
@@ -9825,12 +9806,6 @@ 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: 6;
+  z-index: 1;
 }
 
 .vxe-table--header-wrapper .vxe-table--cell-col-status-area {