vxe-table 3.14.4 → 3.15.0-beta.0

package/es/table/module/edit/mixin.js

@@ -93,8 +93,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
     const reactData = $xeTable;
     const internalData = $xeTable;
     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;
@@ -117,7 +116,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
                 tableFullData.unshift(item);
             });
             // 刷新单元格合并
-            mergeList.forEach((mergeItem) => {
+            mergeBodyList.forEach((mergeItem) => {
                 const { row: mergeRowIndex } = mergeItem;
                 if (mergeRowIndex > 0) {
                     mergeItem.row = mergeRowIndex + newRecords.length;
@@ -141,7 +140,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
                     tableFullData.push(item);
                 });
                 // 刷新单元格合并
-                mergeList.forEach((mergeItem) => {
+                mergeBodyList.forEach((mergeItem) => {
                     const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem;
                     if (mergeRowIndex + mergeRowspan > afterFullData.length) {
                         mergeItem.rowspan = mergeRowspan + newRecords.length;
@@ -229,7 +228,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
                     tableFullData.push(...newRecords);
                 }
                 // 刷新单元格合并
-                mergeList.forEach((mergeItem) => {
+                mergeBodyList.forEach((mergeItem) => {
                     const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem;
                     if (mergeRowIndex > afIndex) {
                         mergeItem.row = mergeRowIndex + newRecords.length;
@@ -253,6 +252,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
         $xeTable.updateAfterDataIndex();
     }
     $xeTable.updateFooter();
+    $xeTable.handleUpdateBodyMerge();
     $xeTable.checkSelectionStatus();
     if (reactData.scrollYLoad) {
         $xeTable.updateScrollYSpace();
@@ -495,8 +495,8 @@ export default {
             const reactData = $xeTable;
             const internalData = $xeTable;
             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;
@@ -564,7 +564,7 @@ export default {
                         const afIndex = this.findRowIndexOf(afterFullData, row);
                         if (afIndex > -1) {
                             // 刷新单元格合并
-                            mergeList.forEach((mergeItem) => {
+                            mergeBodyList.forEach((mergeItem) => {
                                 const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem;
                                 if (mergeRowIndex > afIndex) {
                                     mergeItem.row = mergeRowIndex - 1;
@@ -595,9 +595,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/es/table/module/export/export-panel.js

@@ -326,27 +326,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) {
-                                                                        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) {
-                                                                        defaultOptions.original = value;
+                                                                        defaultOptions.isColgroup = value;
                                                                     }
                                                                 }
                                                             })
@@ -356,16 +356,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) {
-                                                                        defaultOptions.isColgroup = value;
+                                                                        defaultOptions.original = value;
                                                                     }
                                                                 }
                                                             }),
@@ -410,6 +408,23 @@ 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) {
+                                                                        defaultOptions.isFooter = value;
+                                                                    }
+                                                                }
+                                                            })
                                                         ])
                                                     ])
                                             ])

package/es/table/module/export/mixin.js

@@ -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';
@@ -209,7 +209,7 @@ function getBooleanValue(cellValue) {
 function getHeaderTitle($xeTable, opts, column) {
     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, opts, row, column) {
     const columnOpts = $xeTable.computeColumnOpts;
@@ -320,8 +320,10 @@ function hasEllipsis($xeTable, column, property, allColumnOverflow) {
 function toHtml($xeTable, opts, columns, datas) {
     const props = $xeTable;
     const reactData = $xeTable;
+    const internalData = $xeTable;
     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';
@@ -416,15 +418,16 @@ function toHtml($xeTable, opts, columns, datas) {
         else {
             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) {
@@ -1004,18 +1007,19 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     const internalData = $xeTable;
     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,
@@ -1183,15 +1187,16 @@ export default {
             const internalData = $xeTable;
             const $xeGrid = $xeTable.$xeGrid;
             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/es/table/src/body.js

@@ -1,7 +1,7 @@
 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';
 const { getI18n, renderer, renderEmptyElement } = VxeUI;
@@ -27,14 +27,13 @@ function renderLine(h, _vm, rowid, params, cellHeight) {
     if (slots && slots.line) {
         return $xeTable.callSlot(slots.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', {
@@ -44,7 +43,7 @@ function renderLine(h, _vm, rowid, params, cellHeight) {
                 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`
                     }
@@ -63,10 +62,9 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
     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;
@@ -193,8 +191,8 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     };
     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) {
@@ -224,7 +222,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
         }
     }
     // 如果被合并不可隐藏
-    if (fixedHiddenColumn && mergeList) {
+    if (fixedHiddenColumn && isMergeCell) {
         if (tdAttrs.colspan > 1 || tdAttrs.rowspan > 1) {
             fixedHiddenColumn = false;
         }

package/es/table/src/footer.js

@@ -5,19 +5,6 @@ import { updateCellTitle } from '../../ui/src/dom';
 import { getCellHeight } from './util';
 const renderType = 'footer';
 const { renderer, renderEmptyElement } = VxeUI;
-function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
-    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, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex) {
     const props = _vm;
     const $xeTable = _vm.$parent;
@@ -27,8 +14,8 @@ function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIn
     const $xeGrid = $xeTable.$xeGrid;
     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;
@@ -105,7 +92,7 @@ function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIn
         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) {