vxe-table 3.14.4 → 3.15.0-beta.0

package/packages/locale/lang/hu-HU.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: 'táblázat vége',
       expFooterTitle: 'Szükséges a táblázat lábléce?',
       expOptColgroup: 'Csoportfejléc',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: 'Ha vannak, a csoportosító szerkezetű fejlécek támogatottak',
       expOptMerge: 'összeolvad',
       expMergeTitle: 'Támogatja a cellákat egyesítési struktúrákkal, ha vannak',
-      expOptAllExpand: 'Szint bővítése',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: 'Ha létezik, támogatja az összes adat kibontását hierarchikus szerkezettel.',
       expOptUseStyle: 'stílus',
       expUseStyleTitle: 'A stílusos cellák támogatottak, ha vannak',

package/packages/locale/lang/hy-AM.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: '表尾',
       expFooterTitle: '是否需要表尾',
       expOptColgroup: '分组表头',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: '如果存在，则支持带有分组结构的表头',
       expOptMerge: '合并',
       expMergeTitle: '如果存在，则支持带有合并结构的单元格',
-      expOptAllExpand: '展开层级',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
       expOptUseStyle: '样式',
       expUseStyleTitle: '如果存在，则支持带样式的单元格',

package/packages/locale/lang/id-ID.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: '表尾',
       expFooterTitle: '是否需要表尾',
       expOptColgroup: '分组表头',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: '如果存在，则支持带有分组结构的表头',
       expOptMerge: '合并',
       expMergeTitle: '如果存在，则支持带有合并结构的单元格',
-      expOptAllExpand: '展开层级',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
       expOptUseStyle: '样式',
       expUseStyleTitle: '如果存在，则支持带样式的单元格',

package/packages/locale/lang/it-IT.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: 'fine del tavolo',
       expFooterTitle: 'È necessario un piè di pagina della tabella?',
       expOptColgroup: 'Intestazione del gruppo',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: 'Se presenti, sono supportate intestazioni con strutture di raggruppamento',
       expOptMerge: 'unire',
       expMergeTitle: 'Supporta celle con strutture di unione, se presenti',
-      expOptAllExpand: 'Espandi il livello',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: "Se esiste, supporta l'espansione di tutti i dati con una struttura gerarchica.",
       expOptUseStyle: 'stile',
       expUseStyleTitle: 'Le celle con stile sono supportate se presenti',

package/packages/locale/lang/ja-JP.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: 'フッター',
       expFooterTitle: 'フッターをエクスポート',
       expOptColgroup: 'グループ分けタイトル',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: 'グループ分けタイトルを有効にする',
       expOptMerge: '結合',
       expMergeTitle: '結合セルを有効にする',
-      expOptAllExpand: '階層構造',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: '階層構造を有効にする',
       expOptUseStyle: 'スタイル',
       expUseStyleTitle: 'スタイルを有効にする',

package/packages/locale/lang/ko-KR.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: '표 바닥글',
       expFooterTitle: '표 바닥글이 필요한지 여부',
       expOptColgroup: '그룹화된 표 헤더',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: '그룹화된 구조가 있는 표 헤더 지원',
       expOptMerge: '병합',
       expMergeTitle: '병합된 셀을 지원하는 경우',
-      expOptAllExpand: '전체 계층 전개',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: '계층 구조가 있는 데이터를 전체 전개 지원',
       expOptUseStyle: '스타일',
       expUseStyleTitle: '스타일이 있는 셀을 지원하는 경우',

package/packages/locale/lang/nb-NO.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: '表尾',
       expFooterTitle: '是否需要表尾',
       expOptColgroup: '分组表头',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: '如果存在，则支持带有分组结构的表头',
       expOptMerge: '合并',
       expMergeTitle: '如果存在，则支持带有合并结构的单元格',
-      expOptAllExpand: '展开层级',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
       expOptUseStyle: '样式',
       expUseStyleTitle: '如果存在，则支持带样式的单元格',

package/packages/locale/lang/pt-BR.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: 'Rodapé',
       expFooterTitle: 'Necessita de tabela de rodapé',
       expOptColgroup: 'Cabeçalho de grupo',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: 'Se existir, suporta cabeçalhos com estrutura de agrupamento',
       expOptMerge: 'Mesclar',
       expMergeTitle: 'Se existir, suporta células com estruturas mescladas',
-      expOptAllExpand: 'Expandir nós',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: 'Se existir, todos os dados com estrutura de árvore podem ser expandidos',
       expOptUseStyle: 'Estilos',
       expUseStyleTitle: 'Se existir, suporta células com estilos',

package/packages/locale/lang/ru-RU.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: 'конец таблицы',
       expFooterTitle: 'Нужен ли нижний колонтитул таблицы?',
       expOptColgroup: 'Заголовок группы',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: 'Если они присутствуют, поддерживаются заголовки со структурами группировки.',
       expOptMerge: 'слить',
       expMergeTitle: 'Поддерживает ячейки со структурами слияния, если они присутствуют.',
-      expOptAllExpand: 'Развернуть уровень',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: 'Если он существует, он поддерживает расширение всех данных с помощью иерархической структуры.',
       expOptUseStyle: 'стиль',
       expUseStyleTitle: 'Стилизованные ячейки поддерживаются, если они есть.',

package/packages/locale/lang/th-TH.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: 'ท้ายตาราง',
       expFooterTitle: 'จำเป็นต้องมีส่วนท้ายของตารางหรือไม่?',
       expOptColgroup: 'ส่วนหัวของกลุ่ม',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: 'หากมี รองรับส่วนหัวที่มีโครงสร้างการจัดกลุ่ม',
       expOptMerge: 'ผสาน',
       expMergeTitle: 'รองรับเซลล์ที่มีโครงสร้างผสาน หากมี',
-      expOptAllExpand: 'ขยายระดับ',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: 'หากมีอยู่จะรองรับการขยายข้อมูลทั้งหมดด้วยโครงสร้างแบบลำดับชั้น',
       expOptUseStyle: 'สไตล์',
       expUseStyleTitle: 'เซลล์ที่มีสไตล์ได้รับการสนับสนุน หากมี',

package/packages/locale/lang/ug-CN.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: 'ھۆججەت ئاخىرى',
       expFooterTitle: 'ھۆججەت ئاخىرى لازىممۇ؟',
       expOptColgroup: 'ھۆججەت بىشىنى گۇرۇپپىلاش',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: 'ئەگەر مەۋجۇت بولسا،گۇرۇپپىلانغان ھۆججەت بىشى قۇرۇلمىسىنى قوللايدۇ ',
       expOptMerge: 'بېرىكتۈرۈش',
       expMergeTitle: 'ئەگەر مەۋجۇت بولسا برىكتۈرۈلگەن قۇرۇلمىلىق ھۆججەت ئىلمىنتىنى قوللايدۇ ',
-      expOptAllExpand: 'دەرىجىسىنى ئىچىش',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: 'ئەگەر مەۋجۇت بولسا،دەرىجىسى بولغان بارلىق ئۇچۇرلار ئىچىلىدۇ ',
       expOptUseStyle: 'نۇسخا',
       expUseStyleTitle: 'ئەگەر مەۋجۇت بولسا ،نۇسخىسى بولغان ئىلمىنىتلارغا نۇسخا قوشىلىدۇ',

package/packages/locale/lang/uk-UA.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: 'Нижній колонтитул',
       expFooterTitle: 'Чи потрібен нижній колонтитул',
       expOptColgroup: 'Групування заголовків',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: 'Якщо є, підтримується групування заголовків',
       expOptMerge: 'Злиття',
       expMergeTitle: 'Якщо є, підтримується злиття клітинок',
-      expOptAllExpand: 'Розгорнути рівні',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: 'Якщо є, підтримується розгортання даних з рівневими структурами',
       expOptUseStyle: 'Стилі',
       expUseStyleTitle: 'Якщо є, підтримується використання стилів у клітинках',

package/packages/locale/lang/vi-VN.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: '表尾',
       expFooterTitle: '是否需要表尾',
       expOptColgroup: '分组表头',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: '如果存在，则支持带有分组结构的表头',
       expOptMerge: '合并',
       expMergeTitle: '如果存在，则支持带有合并结构的单元格',
-      expOptAllExpand: '展开层级',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
       expOptUseStyle: '样式',
       expUseStyleTitle: '如果存在，则支持带样式的单元格',

package/packages/locale/lang/zh-CHT.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: '表尾',
       expFooterTitle: '是否需要表尾',
       expOptColgroup: '分組表頭',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: '如果存在，則支援帶有分組結構的表頭',
       expOptMerge: '合併',
       expMergeTitle: '如果存在，則支援帶有合併結構的儲存格',
-      expOptAllExpand: '展開層級',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: '如果存在，則支援將帶有層級結構的資料全部展開',
       expOptUseStyle: '樣式',
       expUseStyleTitle: '如果存在，則支援帶有樣式的儲存格',

package/packages/locale/lang/zh-CN.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: '表尾',
       expFooterTitle: '是否需要表尾',
       expOptColgroup: '分组表头',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: '如果存在，则支持带有分组结构的表头',
       expOptMerge: '合并',
       expMergeTitle: '如果存在，则支持带有合并结构的单元格',
-      expOptAllExpand: '展开层级',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
       expOptUseStyle: '样式',
       expUseStyleTitle: '如果存在，则支持带样式的单元格',

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

@@ -104,8 +104,7 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
   const internalData = $xeTable as unknown as TableInternalData
 
   const { treeConfig } = props
-  const { mergeList } = reactData
-  const { tableFullTreeData, afterFullData, tableFullData, fullDataRowIdData, fullAllDataRowIdData, insertRowMaps } = internalData
+  const { tableFullTreeData, afterFullData, mergeBodyList, tableFullData, fullDataRowIdData, fullAllDataRowIdData, insertRowMaps } = internalData
   const treeOpts = $xeTable.computeTreeOpts
   const { transform, rowField, mapChildrenField } = treeOpts
   const childrenField = treeOpts.children || treeOpts.childrenField
@@ -127,7 +126,7 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
         tableFullData.unshift(item)
       })
       // 刷新单元格合并
-      mergeList.forEach((mergeItem: any) => {
+      mergeBodyList.forEach((mergeItem: any) => {
         const { row: mergeRowIndex } = mergeItem
         if (mergeRowIndex > 0) {
           mergeItem.row = mergeRowIndex + newRecords.length
@@ -149,7 +148,7 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
           tableFullData.push(item)
         })
         // 刷新单元格合并
-        mergeList.forEach((mergeItem: any) => {
+        mergeBodyList.forEach((mergeItem: any) => {
           const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
           if (mergeRowIndex + mergeRowspan > afterFullData.length) {
             mergeItem.rowspan = mergeRowspan + newRecords.length
@@ -233,7 +232,7 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
           tableFullData.push(...newRecords)
         }
         // 刷新单元格合并
-        mergeList.forEach((mergeItem: any) => {
+        mergeBodyList.forEach((mergeItem: any) => {
           const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
           if (mergeRowIndex > afIndex) {
             mergeItem.row = mergeRowIndex + newRecords.length
@@ -256,6 +255,7 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
     $xeTable.updateAfterDataIndex()
   }
   $xeTable.updateFooter()
+  $xeTable.handleUpdateBodyMerge()
   $xeTable.checkSelectionStatus()
   if (reactData.scrollYLoad) {
     $xeTable.updateScrollYSpace()
@@ -506,8 +506,8 @@ export default {
       const internalData = $xeTable as unknown as TableInternalData
 
       const { treeConfig } = props
-      const { mergeList, editStore } = reactData
-      const { tableFullTreeData, selectCheckboxMaps, afterFullData, tableFullData, pendingRowMaps, insertRowMaps, removeRowMaps } = internalData
+      const { editStore } = reactData
+      const { tableFullTreeData, selectCheckboxMaps, afterFullData, mergeBodyList, tableFullData, pendingRowMaps, insertRowMaps, removeRowMaps } = internalData
       const checkboxOpts = $xeTable.computeCheckboxOpts
       const treeOpts = $xeTable.computeTreeOpts
       const { transform, mapChildrenField } = treeOpts
@@ -572,7 +572,7 @@ export default {
             const afIndex = this.findRowIndexOf(afterFullData, row)
             if (afIndex > -1) {
               // 刷新单元格合并
-              mergeList.forEach((mergeItem: any) => {
+              mergeBodyList.forEach((mergeItem: any) => {
                 const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
                 if (mergeRowIndex > afIndex) {
                   mergeItem.row = mergeRowIndex - 1
@@ -602,9 +602,10 @@ export default {
       reactData.removeRowFlag++
       reactData.insertRowFlag++
       reactData.pendingRowFlag++
-      $xeTable.updateFooter()
       $xeTable.cacheRowMap(false)
       $xeTable.handleTableData(treeConfig && transform)
+      $xeTable.updateFooter()
+      $xeTable.handleUpdateBodyMerge()
       if (!(treeConfig && transform)) {
         $xeTable.updateAfterDataIndex()
       }

package/packages/table/module/export/export-panel.ts

@@ -338,27 +338,27 @@ export default {
                                 }),
                                 h('vxe-checkbox', {
                                   props: {
-                                    value: defaultOptions.isFooter,
-                                    disabled: !storeData.hasFooter,
-                                    title: getI18n('vxe.export.expFooterTitle'),
-                                    content: getI18n('vxe.export.expOptFooter')
+                                    value: isHeader ? defaultOptions.isTitle : false,
+                                    disabled: !isHeader,
+                                    title: getI18n('vxe.export.expTitleTitle'),
+                                    content: getI18n('vxe.export.expOptTitle')
                                   },
                                   on: {
                                     input (value: any) {
-                                      defaultOptions.isFooter = value
+                                      defaultOptions.isTitle = value
                                     }
                                   }
                                 }),
                                 h('vxe-checkbox', {
                                   props: {
-                                    value: hasEmptyData ? false : defaultOptions.original,
-                                    disabled: hasEmptyData,
-                                    title: getI18n('vxe.export.expOriginalTitle'),
-                                    content: getI18n('vxe.export.expOptOriginal')
+                                    value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
+                                    disabled: !isHeader || !hasColgroup || !supportMerge,
+                                    title: getI18n('vxe.export.expColgroupTitle'),
+                                    content: getI18n('vxe.export.expOptColgroup')
                                   },
                                   on: {
                                     input (value: any) {
-                                      defaultOptions.original = value
+                                      defaultOptions.isColgroup = value
                                     }
                                   }
                                 })
@@ -368,16 +368,14 @@ export default {
                               }, [
                                 h('vxe-checkbox', {
                                   props: {
-                                    // value: supportGroup || (isHeader && hasColgroup && supportMerge) ? defaultOptions.isColgroup : false,
-                                    // disabled: !supportGroup && (!isHeader || !hasColgroup || !supportMerge),
-                                    value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
-                                    disabled: !isHeader || !hasColgroup || !supportMerge,
-                                    title: getI18n('vxe.export.expColgroupTitle'),
-                                    content: getI18n('vxe.export.expOptColgroup')
+                                    value: hasEmptyData ? false : defaultOptions.original,
+                                    disabled: hasEmptyData,
+                                    title: getI18n('vxe.export.expOriginalTitle'),
+                                    content: getI18n('vxe.export.expOptOriginal')
                                   },
                                   on: {
                                     input (value: any) {
-                                      defaultOptions.isColgroup = value
+                                      defaultOptions.original = value
                                     }
                                   }
                                 }),
@@ -422,6 +420,24 @@ export default {
                                     }
                                   }
                                 })
+                              ]),
+
+                              h('div', {
+                                class: 'vxe-table-export--panel-option-row'
+                              }, [
+                                h('vxe-checkbox', {
+                                  props: {
+                                    value: defaultOptions.isFooter,
+                                    disabled: !storeData.hasFooter,
+                                    title: getI18n('vxe.export.expFooterTitle'),
+                                    content: getI18n('vxe.export.expOptFooter')
+                                  },
+                                  on: {
+                                    input (value: any) {
+                                      defaultOptions.isFooter = value
+                                    }
+                                  }
+                                })
                               ])
                             ])
                         ])

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'
@@ -220,7 +220,7 @@ function getBooleanValue (cellValue: any) {
 function getHeaderTitle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: any, column: any) {
   const columnOpts = $xeTable.computeColumnOpts
   const headExportMethod = column.headerExportMethod || columnOpts.headerExportMethod
-  return headExportMethod ? headExportMethod({ column, options: opts, $table: $xeTable }) : ((opts.original ? column.field : column.getTitle()) || '')
+  return headExportMethod ? headExportMethod({ column, options: opts, $table: $xeTable }) : ((opts.isTitle ? column.getTitle() : column.field) || '')
 }
 
 function getFooterCellValue ($xeTable: any, opts: any, row: any, column: any) {
@@ -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,18 +1074,19 @@ 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,
+    isTitle: showHeader,
     isFooter: showFooter,
     isColgroup: isGroup,
     isMerge: hasMerge,
@@ -1252,15 +1256,16 @@ 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,
+        isTitle: showHeader,
         isFooter: showFooter,
         isColgroup: isGroup,
         isMerge: hasMerge,

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) {