vxe-table 3.14.4 → 3.15.0-beta.0

package/es/table/src/table.js

@@ -199,21 +199,23 @@ function renderRowExpandedVNs(h, $xeTable) {
             const { transform, seqMode } = treeOpts;
             const cellStyle = {};
             const rowid = handleGetRowId(row);
-            const rest = fullAllDataRowIdData[rowid];
+            const rowRest = fullAllDataRowIdData[rowid];
             let rowLevel = 0;
             let seq = -1;
-            let _rowIndex = 0;
-            const rowIndex = $xeTable.getRowIndex(row);
-            const $rowIndex = $xeTable.getVMRowIndex(row);
-            if (rest) {
-                rowLevel = rest.level;
+            let _rowIndex = -1;
+            let rowIndex = -1;
+            let $rowIndex = -1;
+            if (rowRest) {
+                rowLevel = rowRest.level;
                 if (treeConfig && transform && seqMode === 'increasing') {
-                    seq = rest._index + 1;
+                    seq = rowRest._index + 1;
                 }
                 else {
-                    seq = rest.seq;
+                    seq = rowRest.seq;
                 }
-                _rowIndex = rest._index;
+                rowIndex = rowRest.index;
+                $rowIndex = rowRest.$index;
+                _rowIndex = rowRest._index;
             }
             if (expandHeight) {
                 cellStyle.height = `${expandHeight}px`;
@@ -453,10 +455,6 @@ export default {
             hasFixedColumn: false,
             // 树节点列信息
             treeNodeColumn: null,
-            // 合并单元格的对象集
-            mergeList: [],
-            // 合并表尾数据的对象集
-            mergeFooterList: [],
             // 初始化标识
             initStore: {
                 filter: false,
@@ -599,12 +597,17 @@ export default {
                 original: false,
                 message: true,
                 isHeader: false,
+                isTitle: false,
                 isFooter: false
             },
             rowExpandedFlag: 1,
             treeExpandedFlag: 1,
             updateCheckboxFlag: 1,
             pendingRowFlag: 1,
+            insertRowFlag: 1,
+            removeRowFlag: 1,
+            mergeBodyFlag: 1,
+            mergeFootFlag: 1,
             rowHeightStore: {
                 default: 48,
                 medium: 44,
@@ -1030,19 +1033,21 @@ export default {
         },
         computeTableRowExpandedList() {
             const $xeTable = this;
+            const props = $xeTable;
             const reactData = $xeTable;
             const internalData = $xeTable;
-            const { rowExpandedFlag, tableData, expandColumn } = reactData;
-            const { rowExpandedMaps } = internalData;
-            const { handleGetRowId } = createHandleGetRowId($xeTable);
+            const { treeConfig } = props;
+            const { rowExpandedFlag, expandColumn } = reactData;
+            const { visibleDataRowIdData, rowExpandedMaps } = internalData;
+            const treeOpts = $xeTable.computeTreeOpts;
+            const { transform } = treeOpts;
             const expandList = [];
             if (expandColumn && rowExpandedFlag) {
-                const rowKeys = {};
-                tableData.forEach(row => {
-                    rowKeys[handleGetRowId(row)] = true;
-                });
+                if (treeConfig && !transform) {
+                    return XEUtils.values(rowExpandedMaps);
+                }
                 XEUtils.each(rowExpandedMaps, (row, rowid) => {
-                    if (rowKeys[rowid]) {
+                    if (visibleDataRowIdData[rowid]) {
                         expandList.push(row);
                     }
                 });
@@ -1301,13 +1306,26 @@ export default {
             tableFullColumn: [],
             // 渲染所有列
             visibleColumn: [],
-            // 总的缓存数据集
+            // 全量数据集（包括当前和已删除）
             fullAllDataRowIdData: {},
+            // 数据集（仅当前）
+            fullDataRowIdData: {},
+            // 数据集（仅可视）
+            visibleDataRowIdData: {},
             // 渲染中缓存数据
             sourceDataRowIdData: {},
-            fullDataRowIdData: {},
             fullColumnIdData: {},
             fullColumnFieldData: {},
+            // 合并单元格的数据
+            mergeBodyList: [],
+            mergeBodyMaps: {},
+            // 合并表尾的数据
+            mergeFooterList: [],
+            mergeFooterMaps: {},
+            // 已合并单元格数据集合
+            mergeBodyCellMaps: {},
+            // 已合并表尾数据集合
+            mergeFooterCellMaps: {},
             // 已展开的行集合
             rowExpandedMaps: {},
             // 懒加载中的展开行的集合
@@ -1345,6 +1363,7 @@ export default {
         const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
         const virtualXOpts = $xeTable.computeVirtualXOpts;
         const virtualYOpts = $xeTable.computeVirtualYOpts;
+        const keyboardOpts = $xeTable.computeKeyboardOpts;
         if (props.rowId) {
             warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
         }
@@ -1387,6 +1406,12 @@ export default {
         if (this.highlightHoverColumn) {
             warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
         }
+        // if (props.scrollY) {
+        //   warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
+        // }
+        // if (props.scrollX) {
+        //   warnLog('vxe.error.delProp', ['scroll-x', 'virtual-x-config'])
+        // }
         // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
         if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
             warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')]);
@@ -1478,10 +1503,10 @@ export default {
         if (props.emptyRender && !XEUtils.isObject(props.emptyRender)) {
             warnLog('vxe.error.errProp', [`table.empty-render=${props.emptyRender}`, 'table.empty-render={}']);
         }
-        if ((rowOpts.isCurrent || highlightCurrentRow) && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
+        if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
             warnLog('vxe.error.notConflictProp', ['row-config.isCurrent', 'current-row-config.isFollowSelected']);
         }
-        if ((columnOpts.isCurrent || highlightCurrentColumn) && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
+        if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
             warnLog('vxe.error.notConflictProp', ['column-config.isCurrent', 'current-column-config.isFollowSelected']);
         }
         // 如果不支持虚拟滚动

package/es/table/src/util.js

@@ -353,19 +353,6 @@ export function calcTreeLine(params, prevRow) {
     }
     return cellHeight * expandSize - (prevRow ? 1 : (12 - getOffsetSize($table)));
 }
-export function mergeBodyMethod(mergeList, _rowIndex, _columnIndex) {
-    for (let mIndex = 0; mIndex < mergeList.length; mIndex++) {
-        const { row: mergeRowIndex, col: mergeColIndex, rowspan: mergeRowspan, colspan: mergeColspan } = mergeList[mIndex];
-        if (mergeColIndex > -1 && mergeRowIndex > -1 && mergeRowspan && mergeColspan) {
-            if (mergeRowIndex === _rowIndex && mergeColIndex === _columnIndex) {
-                return { rowspan: mergeRowspan, colspan: mergeColspan };
-            }
-            if (_rowIndex >= mergeRowIndex && _rowIndex < mergeRowIndex + mergeRowspan && _columnIndex >= mergeColIndex && _columnIndex < mergeColIndex + mergeColspan) {
-                return { rowspan: 0, colspan: 0 };
-            }
-        }
-    }
-}
 export function getCellValue(row, column) {
     return XEUtils.get(row, column.field);
 }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.14.4";
+export const version = "3.15.0-beta.0";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -192,7 +192,7 @@ VxeUI.setConfig({
         },
         virtualXConfig: {
             enabled: true,
-            gt: 60,
+            gt: 28,
             preSize: 0,
             oSize: 1
         },

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.14.4"}`;
+const version = `table v${"3.15.0-beta.0"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);