vxe-table 3.14.5 → 3.15.0-beta.0

package/packages/table/module/export/mixin.ts

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
-import { isColumnInfo, mergeBodyMethod, getCellValue } from '../../src/util'
+import { isColumnInfo, getCellValue } from '../../src/util'
 import { parseFile, formatText, eqEmptyValue } from '../../../ui/src/utils'
 import { hasClass } from '../../../ui/src/dom'
 import { createHtmlPage, getExportBlobByContent } from './util'
@@ -342,9 +342,11 @@ function hasEllipsis ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, co
 function toHtml ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) {
   const props = $xeTable
   const reactData = $xeTable as unknown as TableReactData
+  const internalData = $xeTable as unknown as TableInternalData
 
   const { id, border, treeConfig, headerAlign: allHeaderAlign, align: allAlign, footerAlign: allFooterAlign, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow } = props
-  const { isAllSelected, isIndeterminate, mergeList } = reactData
+  const { isAllSelected, isIndeterminate } = reactData
+  const { mergeBodyCellMaps } = internalData
   const treeOpts = $xeTable.computeTreeOpts
   const { print: isPrint, isHeader, isFooter, isColgroup, isMerge, colgroups, original } = opts
   const allCls = 'check-all'
@@ -442,15 +444,16 @@ function toHtml ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: V
       datas.forEach(item => {
         tables.push(
           '<tr>' + columns.map(column => {
+            const colid = column.id
             const cellAlign = column.align || allAlign
             const classNames = hasEllipsis($xeTable, column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : []
-            const cellValue = item[column.id]
+            const cellValue = item[colid]
             let rowSpan = 1
             let colSpan = 1
-            if (isMerge && mergeList.length) {
+            if (isMerge) {
               const _rowIndex = $xeTable.getVTRowIndex(item._row)
               const _columnIndex = $xeTable.getVTColumnIndex(column)
-              const spanRest = mergeBodyMethod(mergeList, _rowIndex, _columnIndex)
+              const spanRest = mergeBodyCellMaps[`${_rowIndex}:${_columnIndex}`]
               if (spanRest) {
                 const { rowspan, colspan } = spanRest
                 if (!rowspan || !colspan) {
@@ -1071,15 +1074,15 @@ function handleExportAndPrint ($xeTable: VxeTableConstructor, options: VxeTableP
   const $xeGrid = $xeTable.$xeGrid
 
   const { treeConfig, showHeader, showFooter } = props
-  const { initStore, mergeList, mergeFooterList, isGroup, footerTableData, exportStore, exportParams } = reactData
-  const { collectColumn } = internalData
+  const { initStore, isGroup, footerTableData, exportStore, exportParams } = reactData
+  const { collectColumn, mergeBodyList, mergeFooterList } = internalData
   const exportOpts = $xeTable.computeExportOpts
   const hasTree = treeConfig
   const customOpts = $xeTable.computeCustomOpts
   const selectRecords = $xeTable.getCheckboxRecords()
   const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : {}
   const hasFooter = !!footerTableData.length
-  const hasMerge = !!(mergeList.length || mergeFooterList.length)
+  const hasMerge = !!(mergeBodyList.length || mergeFooterList.length)
   const defOpts = Object.assign({
     message: true,
     isHeader: showHeader,
@@ -1253,12 +1256,12 @@ export default {
       const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor
 
       const { treeConfig, showHeader, showFooter } = props
-      const { mergeList, mergeFooterList, isGroup } = reactData
-      const { tableFullColumn, afterFullData, collectColumn } = internalData
+      const { mergeFooterList, isGroup } = reactData
+      const { tableFullColumn, afterFullData, mergeBodyList, collectColumn } = internalData
       const exportOpts = $xeTable.computeExportOpts
       const treeOpts = $xeTable.computeTreeOpts
       const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : {}
-      const hasMerge = !!(mergeList.length || mergeFooterList.length)
+      const hasMerge = !!(mergeBodyList.length || mergeFooterList.length)
       const opts = Object.assign({
         message: true,
         isHeader: showHeader,

package/packages/table/src/body.ts

@@ -2,7 +2,7 @@ import { PropType, CreateElement } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { isEnableConf, getClass } from '../../ui/src/utils'
-import { getOffsetSize, calcTreeLine, mergeBodyMethod, getRowid, createHandleGetRowId } from './util'
+import { getOffsetSize, calcTreeLine, getRowid, createHandleGetRowId } from './util'
 import { updateCellTitle } from '../../ui/src/dom'
 import { getSlotVNs } from '../../ui/src/vn'
 
@@ -36,14 +36,13 @@ function renderLine (h: CreateElement, _vm: any, rowid: string, params: VxeTable
   if (slots && (slots as any).line) {
     return $xeTable.callSlot((slots as any).line, params, h)
   }
-  const rest = fullAllDataRowIdData[rowid]
+  const rowRest = fullAllDataRowIdData[rowid]
   let rLevel = 0
   let prevRow = null
-  if (rest) {
-    rLevel = rest.level
-    prevRow = rest.items[rest.treeIndex - 1]
+  if (rowRest) {
+    rLevel = rowRest.level
+    prevRow = rowRest.items[rowRest.treeIndex - 1]
   }
-  const isFirstRow = $xeTable.eqRow(afterFullData[0], row)
   if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
     return [
       h('div', {
@@ -53,7 +52,7 @@ function renderLine (h: CreateElement, _vm: any, rowid: string, params: VxeTable
         h('div', {
           class: 'vxe-tree--line',
           style: {
-            height: `${isFirstRow ? 1 : calcTreeLine(params, prevRow)}px`,
+            height: `${$xeTable.eqRow(afterFullData[0], row) ? 1 : calcTreeLine(params, prevRow)}px`,
             bottom: `-${Math.floor(cellHeight / 2)}px`,
             left: `${(rLevel * treeOpts.indent) + (rLevel ? 2 - getOffsetSize($xeTable) : 0) + 16}px`
           }
@@ -90,10 +89,9 @@ function renderTdColumn (
   const tableInternalData = $xeTable as unknown as TableInternalData
   const $xeGrid = $xeTable.$xeGrid
 
-  const { fullAllDataRowIdData, fullColumnIdData, visibleColumn } = tableInternalData
   const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps
-  const { tableData, dragRow, overflowX, currentColumn, scrollXLoad, scrollYLoad, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, mergeList, editStore, isAllOverflow, validErrorMaps } = tableReactData
-  const { afterFullData, scrollXStore, scrollYStore } = tableInternalData
+  const { tableData, dragRow, overflowX, currentColumn, scrollXLoad, scrollYLoad, mergeBodyFlag, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, editStore, isAllOverflow, validErrorMaps } = tableReactData
+  const { fullAllDataRowIdData, fullColumnIdData, mergeBodyCellMaps, visibleColumn, afterFullData, mergeBodyList, scrollXStore, scrollYStore } = tableInternalData
   const cellOpts = $xeTable.computeCellOpts
   const validOpts = $xeTable.computeValidOpts
   const checkboxOpts = $xeTable.computeCheckboxOpts
@@ -221,8 +219,8 @@ function renderTdColumn (
   }
   let isMergeCell = false
   // 合并行或列
-  if (mergeList.length) {
-    const spanRest = mergeBodyMethod(mergeList, _rowIndex, _columnIndex)
+  if (mergeBodyFlag && mergeBodyList.length) {
+    const spanRest = mergeBodyCellMaps[`${_rowIndex}:${_columnIndex}`]
     if (spanRest) {
       const { rowspan, colspan } = spanRest
       if (!rowspan || !colspan) {
@@ -251,7 +249,7 @@ function renderTdColumn (
     }
   }
   // 如果被合并不可隐藏
-  if (fixedHiddenColumn && mergeList) {
+  if (fixedHiddenColumn && isMergeCell) {
     if (tdAttrs.colspan > 1 || tdAttrs.rowspan > 1) {
       fixedHiddenColumn = false
     }

package/packages/table/src/footer.ts

@@ -11,20 +11,6 @@ const renderType = 'footer'
 
 const { renderer, renderEmptyElement } = VxeUI
 
-function mergeFooterMethod (mergeFooterList: VxeTableDefines.MergeItem[], _rowIndex: number, _columnIndex: number) {
-  for (let mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {
-    const { row: mergeRowIndex, col: mergeColIndex, rowspan: mergeRowspan, colspan: mergeColspan } = mergeFooterList[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 }
-      }
-    }
-  }
-}
-
 function renderRows (h: CreateElement, _vm: any, tableColumn: VxeTableDefines.ColumnInfo[], footerTableData: any[], row: any, $rowIndex: number, _rowIndex: number) {
   const props = _vm
   const $xeTable = _vm.$parent as VxeTableConstructor & VxeTablePrivateMethods
@@ -35,8 +21,8 @@ function renderRows (h: CreateElement, _vm: any, tableColumn: VxeTableDefines.Co
 
   const { fixedType } = props
   const { resizable: allResizable, border, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, footerSpanMethod, align: allAlign, columnKey, showFooterOverflow: allColumnFooterOverflow } = tableProps
-  const { scrollXLoad, scrollYLoad, overflowX, currentColumn, mergeFooterList } = tableReactData
-  const { fullColumnIdData, scrollXStore } = tableInternalData
+  const { scrollXLoad, scrollYLoad, overflowX, currentColumn } = tableReactData
+  const { fullColumnIdData, mergeFooterList, mergeFooterCellMaps, scrollXStore } = tableInternalData
   const tooltipOpts = $xeTable.computeTooltipOpts
   const { isAllColumnDrag } = $xeTable.resizableOpts
   const columnOpts = $xeTable.computeColumnOpts
@@ -115,7 +101,7 @@ function renderRows (h: CreateElement, _vm: any, tableColumn: VxeTableDefines.Co
     let isMergeCell = false
     // 合并行或列
     if (mergeFooterList.length) {
-      const spanRest = mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex)
+      const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`]
       if (spanRest) {
         const { rowspan, colspan } = spanRest
         if (!rowspan || !colspan) {