vxe-table 4.12.4 → 4.13.0-beta.0

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

@@ -390,7 +390,7 @@ export default defineComponent({
                                 }, [
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
-                                      modelValue: hasEmptyData || defaultOptions.isHeader,
+                                      modelValue: hasEmptyData || isHeader,
                                       disabled: hasEmptyData,
                                       title: getI18n('vxe.export.expHeaderTitle'),
                                       content: getI18n('vxe.export.expOptHeader'),
@@ -401,23 +401,23 @@ export default defineComponent({
                                     : createCommentVNode(),
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
-                                      modelValue: defaultOptions.isFooter,
-                                      disabled: !storeData.hasFooter,
-                                      title: getI18n('vxe.export.expFooterTitle'),
-                                      content: getI18n('vxe.export.expOptFooter'),
+                                      modelValue: isHeader ? defaultOptions.isTitle : false,
+                                      disabled: !isHeader,
+                                      title: getI18n('vxe.export.expTitleTitle'),
+                                      content: getI18n('vxe.export.expOptTitle'),
                                       'onUpdate:modelValue' (value: any) {
-                                        defaultOptions.isFooter = value
+                                        defaultOptions.isTitle = value
                                       }
                                     })
                                     : createCommentVNode(),
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
-                                      modelValue: hasEmptyData ? false : defaultOptions.original,
-                                      disabled: hasEmptyData,
-                                      title: getI18n('vxe.export.expOriginalTitle'),
-                                      content: getI18n('vxe.export.expOptOriginal'),
+                                      modelValue: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
+                                      title: getI18n('vxe.export.expColgroupTitle'),
+                                      disabled: !isHeader || !hasColgroup || !supportMerge,
+                                      content: getI18n('vxe.export.expOptColgroup'),
                                       'onUpdate:modelValue' (value: any) {
-                                        defaultOptions.original = value
+                                        defaultOptions.isColgroup = value
                                       }
                                     })
                                     : createCommentVNode()
@@ -427,15 +427,12 @@ export default defineComponent({
                                 }, [
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
-                                      // modelValue: supportGroup || (isHeader && hasColgroup && supportMerge) ? defaultOptions.isColgroup : false,
-                                      // title: getI18n('vxe.export.expColgroupTitle'),
-                                      // disabled: !supportGroup && (!isHeader || !hasColgroup || !supportMerge),
-                                      modelValue: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
-                                      title: getI18n('vxe.export.expColgroupTitle'),
-                                      disabled: !isHeader || !hasColgroup || !supportMerge,
-                                      content: getI18n('vxe.export.expOptColgroup'),
+                                      modelValue: hasEmptyData ? false : defaultOptions.original,
+                                      disabled: hasEmptyData,
+                                      title: getI18n('vxe.export.expOriginalTitle'),
+                                      content: getI18n('vxe.export.expOptOriginal'),
                                       'onUpdate:modelValue' (value: any) {
-                                        defaultOptions.isColgroup = value
+                                        defaultOptions.original = value
                                       }
                                     })
                                     : createCommentVNode(),
@@ -472,6 +469,21 @@ export default defineComponent({
                                       }
                                     })
                                     : createCommentVNode()
+                                ]),
+                                h('div', {
+                                  class: 'vxe-table-export--panel-option-row'
+                                }, [
+                                  VxeUICheckboxComponent
+                                    ? h(VxeUICheckboxComponent, {
+                                      modelValue: defaultOptions.isFooter,
+                                      disabled: !storeData.hasFooter,
+                                      title: getI18n('vxe.export.expFooterTitle'),
+                                      content: getI18n('vxe.export.expOptFooter'),
+                                      'onUpdate:modelValue' (value: any) {
+                                        defaultOptions.isFooter = value
+                                      }
+                                    })
+                                    : createCommentVNode()
                                 ])
                               ])
                           ])

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

@@ -1,7 +1,7 @@
 import { inject, nextTick } from 'vue'
 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'
@@ -328,7 +328,7 @@ hooks.add('tableExportModule', {
     function getHeaderTitle (opts: any, column: any) {
       const columnOpts = computeColumnOpts.value
       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) || '')
     }
 
     const toBooleanValue = (cellValue: any) => {
@@ -564,7 +564,8 @@ hooks.add('tableExportModule', {
 
     const toHtml = (opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) => {
       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 = computeTreeOpts.value
       const { print: isPrint, isHeader, isFooter, isColgroup, isMerge, colgroups, original } = opts
       const allCls = 'check-all'
@@ -630,9 +631,10 @@ hooks.add('tableExportModule', {
           datas.forEach((item: any) => {
             tables.push(
               '<tr>' + columns.map((column: any) => {
+                const colid = column.id
                 const cellAlign = column.align || allAlign
                 const classNames = hasEllipsis(column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : []
-                const cellValue = item[column.id]
+                const cellValue = item[colid]
                 if (cellAlign) {
                   classNames.push(`col--${cellAlign}`)
                 }
@@ -659,18 +661,18 @@ hooks.add('tableExportModule', {
             )
           })
         } else {
-          datas.forEach((item: any) => {
+          datas.forEach((item) => {
             tables.push(
-              '<tr>' + columns.map((column: any) => {
+              '<tr>' + columns.map((column) => {
                 const cellAlign = column.align || allAlign
                 const classNames = hasEllipsis(column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : []
                 const cellValue = item[column.id]
                 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) {
@@ -1014,18 +1016,19 @@ hooks.add('tableExportModule', {
 
     const handleExportAndPrint = (options: VxeTablePropTypes.ExportOpts | VxeTablePropTypes.ExportConfig, isPrint?: boolean) => {
       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 = computeExportOpts.value
       const hasTree = treeConfig
       const customOpts = computeCustomOpts.value
       const selectRecords = $xeTable.getCheckboxRecords()
       const proxyOpts = $xeGrid ? $xeGrid.getComputeMaps().computeProxyOpts.value : {} as VxeGridPropTypes.ProxyOpts
       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,
@@ -1137,15 +1140,16 @@ hooks.add('tableExportModule', {
        */
       exportData (options) {
         const { treeConfig, showHeader, showFooter } = props
-        const { mergeList, mergeFooterList, isGroup } = reactData
-        const { tableFullColumn, afterFullData, collectColumn } = internalData
+        const { isGroup } = reactData
+        const { tableFullColumn, afterFullData, collectColumn, mergeBodyList, mergeFooterList } = internalData
         const exportOpts = computeExportOpts.value
         const treeOpts = computeTreeOpts.value
         const proxyOpts = $xeGrid ? $xeGrid.getComputeMaps().computeProxyOpts.value : {} as VxeGridPropTypes.ProxyOpts
-        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

@@ -1,7 +1,7 @@
 import { defineComponent, TransitionGroup, h, ref, Ref, PropType, inject, nextTick, onMounted, onUnmounted } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
-import { getOffsetSize, calcTreeLine, mergeBodyMethod, getRowid, createHandleGetRowId } from './util'
+import { getOffsetSize, calcTreeLine, getRowid, createHandleGetRowId } from './util'
 import { updateCellTitle, getPropClass } from '../../ui/src/dom'
 import { isEnableConf } from '../../ui/src/utils'
 import { getSlotVNs } from '../../ui/src/vn'
@@ -55,14 +55,13 @@ export default defineComponent({
       if (slots && (slots as any).line) {
         return $xeTable.callSlot((slots as any).line, params)
       }
-      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', {
@@ -72,7 +71,7 @@ export default defineComponent({
             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`
               }
@@ -103,10 +102,9 @@ export default defineComponent({
     ) => {
       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 = computeCellOpts.value
       const validOpts = computeValidOpts.value
       const checkboxOpts = computeCheckboxOpts.value
@@ -235,8 +233,8 @@ export default defineComponent({
       }
       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) {
@@ -265,7 +263,7 @@ export default defineComponent({
         }
       }
       // 如果被合并不可隐藏
-      if (fixedHiddenColumn && mergeList) {
+      if (fixedHiddenColumn && isMergeCell) {
         if (tdAttrs.colspan > 1 || tdAttrs.rowspan > 1) {
           fixedHiddenColumn = false
         }

package/packages/table/src/footer.ts

@@ -10,20 +10,6 @@ const { renderer, renderEmptyElement } = VxeUI
 
 const renderType = 'footer'
 
-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 }
-      }
-    }
-  }
-}
-
 export default defineComponent({
   name: 'VxeTableFooter',
   props: {
@@ -62,8 +48,8 @@ export default defineComponent({
 
       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 = computeTooltipOpts.value
       const resizableOpts = computeResizableOpts.value
       const { isAllColumnDrag } = resizableOpts
@@ -143,7 +129,7 @@ export default defineComponent({
         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) {