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

package/es/table/src/body.js

@@ -611,7 +611,7 @@ export default {
         const { xID, $scopedSlots } = $xeTable;
         const { fixedColumn, fixedType, tableColumn } = props;
         const { spanMethod, footerSpanMethod, mouseConfig } = tableProps;
-        const { isGroup, tableData, isRowLoading, isColLoading, overflowX, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn, dragRow, dragCol } = tableReactData;
+        const { isGroup, tableData, isRowLoading, isColLoading, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn, dragRow, dragCol } = tableReactData;
         const { visibleColumn, fullAllDataRowIdData, fullColumnIdData } = tableInternalData;
         const rowOpts = $xeTable.computeRowOpts;
         const emptyOpts = $xeTable.computeEmptyOpts;
@@ -630,10 +630,8 @@ export default {
                 isOptimizeMode = true;
             }
         }
-        if (fixedType || !overflowX) {
-            renderColumnList = visibleColumn;
-        }
         if (fixedType) {
+            renderColumnList = visibleColumn;
             if (isOptimizeMode) {
                 renderColumnList = fixedColumn || [];
             }

package/es/table/src/cell.js

@@ -748,9 +748,6 @@ export const Cell = {
                             'is--active': isActive
                         }],
                     on: {
-                        mousedown(evnt) {
-                            evnt.stopPropagation();
-                        },
                         click(evnt) {
                             $table.triggerRowExpandEvent(evnt, params);
                         }

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

package/es/table/src/header.js

@@ -107,8 +107,8 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
                     '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
                 }, getClass(headerClassName, cellParams), getClass(headerCellClassName, cellParams)],
             attrs: thAttrs,
@@ -252,7 +252,7 @@ export default {
         const { fixedType, fixedColumn, tableColumn } = props;
         const { headerColumn } = this;
         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 = $xeTable.computeMouseOpts;
         let renderHeaderList = headerColumn;
@@ -271,10 +271,8 @@ export default {
                     isOptimizeMode = true;
                 }
             }
-            if (fixedType || !overflowX) {
-                renderColumnList = visibleColumn;
-            }
             if (fixedType) {
+                renderColumnList = visibleColumn;
                 // 如果是使用优化模式
                 if (isOptimizeMode) {
                     renderColumnList = fixedColumn || [];

package/es/table/src/methods.js

@@ -172,7 +172,6 @@ function cacheColumnMap($xeTable) {
     const fullColumnIdData = internalData.fullColumnIdData = {};
     const fullColumnFieldData = internalData.fullColumnFieldData = {};
     const mouseOpts = $xeTable.computeMouseOpts;
-    const expandOpts = $xeTable.computeExpandOpts;
     const columnOpts = $xeTable.computeColumnOpts;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     const { isCrossDrag, isSelfToChildDrag } = columnDragOpts;
@@ -262,8 +261,10 @@ function cacheColumnMap($xeTable) {
     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 === 'developmeznt') {
         if (htmlColumn) {
@@ -1637,7 +1638,6 @@ function handleColumn($xeTable, collectColumn) {
     const $xeToolbar = $xeTable.$refs.$xeToolbar;
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const expandOpts = $xeTable.computeExpandOpts;
     internalData.collectColumn = collectColumn;
     const tableFullColumn = getColumnList(collectColumn);
     internalData.tableFullColumn = tableFullColumn;
@@ -1645,7 +1645,6 @@ function handleColumn($xeTable, collectColumn) {
     reactData.isDragColMove = false;
     initColumnSort($xeTable);
     return Promise.resolve(restoreCustomStorage($xeTable)).then(() => {
-        const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
         cacheColumnMap($xeTable);
         parseColumns($xeTable, true).then(() => {
             if (reactData.scrollXLoad) {
@@ -1655,8 +1654,10 @@ function handleColumn($xeTable, collectColumn) {
         $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 $xeTable.$nextTick().then(() => {
             if ($xeToolbar) {
@@ -1928,15 +1929,6 @@ function updateRowExpandStyle($xeTable) {
         }
     }
 }
-function handleRowExpandScroll($xeTable) {
-    const internalData = $xeTable;
-    const { elemStore } = internalData;
-    const rowExpandEl = $xeTable.$refs.refRowExpandElem;
-    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
-    if (rowExpandEl && bodyScrollElem) {
-        rowExpandEl.scrollTop = bodyScrollElem.scrollTop;
-    }
-}
 const Methods = {
     callSlot(slotFunc, params, h, vNodes) {
         if (slotFunc) {
@@ -5525,7 +5517,7 @@ const Methods = {
                 }
                 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;
@@ -7282,10 +7274,7 @@ const Methods = {
                         delete rExpandLazyLoadedMaps[rowid];
                     }
                     reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
-                    $xeTable.$nextTick()
-                        .then(() => $xeTable.recalculate())
-                        .then(() => $xeTable.updateCellAreas())
-                        .then(() => resolve());
+                    $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => resolve());
                 });
             }
             else {
@@ -7301,13 +7290,12 @@ const Methods = {
      * @param {Boolean} expanded 是否展开
      */
     setRowExpand(rows, expanded) {
-        const $xeTable = this;
-        const { rowExpandedMaps, fullAllDataRowIdData, rowExpandLazyLoadedMaps, expandOpts, expandColumn } = this;
+        const { rowExpandedMaps, fullAllDataRowIdData, rowExpandLazyLoadedMaps, expandOpts, expandColumn: column } = this;
         let rExpandedMaps = Object.assign({}, rowExpandedMaps);
         const { reserve, lazy, accordion, toggleMethod } = expandOpts;
         const lazyRests = [];
-        const columnIndex = this.getColumnIndex(expandColumn);
-        const $columnIndex = this.getVMColumnIndex(expandColumn);
+        const columnIndex = this.getColumnIndex(column);
+        const $columnIndex = this.getVMColumnIndex(column);
         if (rows) {
             if (!XEUtils.isArray(rows)) {
                 rows = [rows];
@@ -7317,7 +7305,7 @@ const Methods = {
                 rExpandedMaps = {};
                 rows = rows.slice(rows.length - 1, rows.length);
             }
-            const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows;
+            const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ expanded, column, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows;
             if (expanded) {
                 validRows.forEach((row) => {
                     const rowid = getRowid(this, row);
@@ -7346,15 +7334,7 @@ const Methods = {
             }
         }
         this.rowExpandedMaps = rExpandedMaps;
-        return Promise.all(lazyRests)
-            .then(() => $xeTable.recalculate())
-            .then(() => {
-            if (expandColumn) {
-                updateRowExpandStyle($xeTable);
-                handleRowExpandScroll($xeTable);
-            }
-            return $xeTable.updateCellAreas();
-        });
+        return Promise.all(lazyRests).then(this.recalculate);
     },
     /**
      * 判断行是否为展开状态
@@ -7376,7 +7356,6 @@ const Methods = {
      * 手动清空展开行状态，数据会恢复成未展开的状态
      */
     clearRowExpand() {
-        const $xeTable = this;
         const { expandOpts, tableFullData } = this;
         const { reserve } = expandOpts;
         const expList = this.getRowExpandRecords();
@@ -7388,7 +7367,7 @@ const Methods = {
             if (expList.length) {
                 this.recalculate();
             }
-        }).then(() => $xeTable.updateCellAreas());
+        });
     },
     clearRowExpandReserve() {
         this.rowExpandedReserveRowMap = {};
@@ -8665,14 +8644,10 @@ const Methods = {
         }
     },
     updateCellAreas() {
-        const $xeTable = this;
-        const props = $xeTable;
-        const { mouseConfig } = props;
-        const mouseOpts = $xeTable.computeMouseOpts;
-        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreaEvent) {
-            return $xeTable.handleRecalculateCellAreaEvent();
+        if (this.mouseConfig && this.mouseOpts.area && this.handleRecalculateCellAreas) {
+            return this.handleRecalculateCellAreas();
         }
-        return $xeTable.$nextTick();
+        return this.$nextTick();
     },
     dispatchEvent(type, params, evnt) {
         const $xeTable = this;

package/es/table/src/table.js

@@ -1114,15 +1114,11 @@ export default {
         } }),
     watch: {
         data(value) {
-            const $xeTable = this;
-            const reactData = $xeTable;
             const { initStatus } = this;
             if (value && value.length >= 50000) {
                 warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
             }
             this.loadTableData(value || [], true).then(() => {
-                const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
-                const expandOpts = $xeTable.computeExpandOpts;
                 this.inited = true;
                 this.initStatus = true;
                 if (!initStatus) {
@@ -1132,9 +1128,9 @@ export default {
                 // if (checkboxColumn && this.tableFullData.length > 300 && !this.checkboxOpts.checkField) {
                 //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
                 // }
-                if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
-                    warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
-                }
+                // if ((this.scrollXLoad || this.scrollYLoad) && this.expandColumn) {
+                //   warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
+                // }
                 this.recalculate();
             });
         },
@@ -1159,12 +1155,6 @@ 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: 6;
+  z-index: 1;
 }
 
 .vxe-table--header-wrapper .vxe-table--cell-col-status-area {