vxe-table 3.14.4 → 3.15.0-beta.0

package/packages/table/src/table.ts

@@ -216,20 +216,22 @@ function renderRowExpandedVNs (h: CreateElement, $xeTable: VxeTableConstructor &
       const { transform, seqMode } = treeOpts
       const cellStyle: Record<string, string> = {}
       const rowid = handleGetRowId(row)
-      const rest = fullAllDataRowIdData[rowid]
+      const rowRest = fullAllDataRowIdData[rowid]
       let rowLevel = 0
       let seq: string | number = -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`
@@ -479,10 +481,6 @@ export default {
       hasFixedColumn: false,
       // 树节点列信息
       treeNodeColumn: null,
-      // 合并单元格的对象集
-      mergeList: [],
-      // 合并表尾数据的对象集
-      mergeFooterList: [],
       // 初始化标识
       initStore: {
         filter: false,
@@ -625,6 +623,7 @@ export default {
         original: false,
         message: true,
         isHeader: false,
+        isTitle: false,
         isFooter: false
       },
 
@@ -632,6 +631,10 @@ export default {
       treeExpandedFlag: 1,
       updateCheckboxFlag: 1,
       pendingRowFlag: 1,
+      insertRowFlag: 1,
+      removeRowFlag: 1,
+      mergeBodyFlag: 1,
+      mergeFootFlag: 1,
 
       rowHeightStore: {
         default: 48,
@@ -1097,20 +1100,22 @@ export default {
     },
     computeTableRowExpandedList () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const props = $xeTable
       const reactData = $xeTable as unknown as TableReactData
       const internalData = $xeTable as unknown as TableInternalData
 
-      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: any[] = []
       if (expandColumn && rowExpandedFlag) {
-        const rowKeys: Record<string, boolean> = {}
-        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)
           }
         })
@@ -1385,14 +1390,27 @@ export default {
       tableFullColumn: [],
       // 渲染所有列
       visibleColumn: [],
-      // 总的缓存数据集
+      // 全量数据集（包括当前和已删除）
       fullAllDataRowIdData: {},
+      // 数据集（仅当前）
+      fullDataRowIdData: {},
+      // 数据集（仅可视）
+      visibleDataRowIdData: {},
       // 渲染中缓存数据
       sourceDataRowIdData: {},
-      fullDataRowIdData: {},
       fullColumnIdData: {},
       fullColumnFieldData: {},
 
+      // 合并单元格的数据
+      mergeBodyList: [],
+      mergeBodyMaps: {},
+      // 合并表尾的数据
+      mergeFooterList: [],
+      mergeFooterMaps: {},
+      // 已合并单元格数据集合
+      mergeBodyCellMaps: {},
+      // 已合并表尾数据集合
+      mergeFooterCellMaps: {},
       // 已展开的行集合
       rowExpandedMaps: {},
       // 懒加载中的展开行的集合
@@ -1432,6 +1450,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'])
@@ -1475,6 +1494,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(',')])
@@ -1569,10 +1594,10 @@ export default {
       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/packages/table/src/util.ts

@@ -390,20 +390,6 @@ export function calcTreeLine (params: VxeTableDefines.CellRenderBodyParams, prev
   return cellHeight * expandSize - (prevRow ? 1 : (12 - getOffsetSize($table)))
 }
 
-export function mergeBodyMethod (mergeList: any, _rowIndex: any, _columnIndex: any) {
-  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: any, column: any) {
   return XEUtils.get(row, column.field)
 }

package/packages/ui/index.ts

@@ -199,7 +199,7 @@ VxeUI.setConfig({
     },
     virtualXConfig: {
       enabled: true,
-      gt: 60,
+      gt: 28,
       preSize: 0,
       oSize: 1
     },