vxe-table 4.19.3 → 4.19.5

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

@@ -278,7 +278,7 @@ hooks.add('tableExportModule', {
         function getHeaderTitle(opts, column) {
             const columnOpts = computeColumnOpts.value;
             const headExportMethod = column.headerExportMethod || columnOpts.headerExportMethod;
-            return headExportMethod ? headExportMethod({ column, options: opts, $table: $xeTable }) : ((opts.isTitle ? column.getTitle() : column.field) || '');
+            return headExportMethod ? headExportMethod({ column, options: opts, $table: $xeTable }) : ((opts.isTitle ? $xeTable.getHeaderCellLabel(column) : column.field) || '');
         }
         const toBooleanValue = (cellValue) => {
             return XEUtils.isBoolean(cellValue) ? (cellValue ? 'TRUE' : 'FALSE') : cellValue;
@@ -287,9 +287,10 @@ hooks.add('tableExportModule', {
             return eqEmptyValue(cellValue) ? '' : `${cellValue}`;
         };
         const getBodyLabelData = (opts, columns, datas) => {
-            const { isTreeAllExpanded, isRowGroupAllExpanded, mode } = opts;
+            const { isTreeAllExpanded, isRowGroupAllExpanded, mode: expMode } = opts;
             const { treeConfig } = props;
             const { isRowGroupStatus } = reactData;
+            const { fullColumnFieldData } = internalData;
             const radioOpts = computeRadioOpts.value;
             const checkboxOpts = computeCheckboxOpts.value;
             const treeOpts = computeTreeOpts.value;
@@ -301,7 +302,7 @@ hooks.add('tableExportModule', {
             const { handleGetRowId } = createHandleGetRowId($xeTable);
             if (isRowGroupStatus) {
                 // 如果是数据分组
-                const { mapChildrenField } = aggregateOpts;
+                const { mode: aggMode, showTotal, totalMethod, countFields, contentMethod, formatValuesMethod, mapChildrenField } = aggregateOpts;
                 const rest = [];
                 const expandMaps = {};
                 const useMaps = {};
@@ -322,8 +323,9 @@ hooks.add('tableExportModule', {
                             _expand: hasRowChild && $xeTable.isRowExpandByRow(row)
                         };
                         columns.forEach((column, $columnIndex) => {
+                            const { field, editRender, cellRender, aggFunc, rowGroupNode } = column;
                             let cellValue = '';
-                            const renderOpts = column.editRender || column.cellRender;
+                            const renderOpts = editRender || cellRender;
                             let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
                             if (!bodyExportMethod && renderOpts && renderOpts.name) {
                                 const compConf = renderer.get(renderOpts.name);
@@ -341,21 +343,77 @@ hooks.add('tableExportModule', {
                                 switch (column.type) {
                                     case 'seq': {
                                         const seqVal = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
-                                        cellValue = mode === 'all' ? seqVal : getSeq(seqVal, row, $rowIndex, column, $columnIndex);
+                                        cellValue = expMode === 'all' ? seqVal : getSeq(seqVal, row, $rowIndex, column, $columnIndex);
                                         break;
                                     }
-                                    case 'checkbox':
+                                    case 'checkbox': {
                                         cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
                                         item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : '';
                                         item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ $table: $xeTable, row });
                                         break;
-                                    case 'radio':
+                                    }
+                                    case 'radio': {
                                         cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row));
                                         item._radioLabel = radioOpts.labelField ? XEUtils.get(row, radioOpts.labelField) : '';
                                         item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ $table: $xeTable, row });
                                         break;
-                                    default:
-                                        if (opts.original) {
+                                    }
+                                    default: {
+                                        if (field && row.isAggregate) {
+                                            const aggRow = row;
+                                            const aggData = aggRow.aggData;
+                                            const currAggData = aggData ? aggData[field] : null;
+                                            const groupField = aggRow.groupField;
+                                            const groupContent = aggRow.groupContent;
+                                            const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : [];
+                                            const childCount = aggRow.childCount;
+                                            const colRest = fullColumnFieldData[groupField] || {};
+                                            const ctParams = {
+                                                $table: $xeTable,
+                                                groupField,
+                                                groupColumn: (colRest ? colRest.column : null),
+                                                column,
+                                                groupValue: groupContent,
+                                                childList,
+                                                childCount,
+                                                aggValue: null,
+                                                /**
+                                                 * 已废弃
+                                                 * @deprecated
+                                                 */
+                                                children: childList,
+                                                /**
+                                                 * 已废弃
+                                                 * @deprecated
+                                                 */
+                                                totalValue: childCount
+                                            };
+                                            if (aggMode === 'column' ? field === aggRow.groupField : rowGroupNode) {
+                                                cellValue = groupContent;
+                                                if (contentMethod) {
+                                                    cellValue = `${contentMethod(ctParams)}`;
+                                                }
+                                                if (showTotal) {
+                                                    cellValue = getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(ctParams) : childCount, childCount]);
+                                                }
+                                            }
+                                            else if ($xeTable.getPivotTableAggregateCellAggValue) {
+                                                const aggParams = {
+                                                    $table: $xeTable,
+                                                    row,
+                                                    column
+                                                };
+                                                cellValue = $xeTable.getPivotTableAggregateCellAggValue(aggParams);
+                                            }
+                                            else if (aggFunc === true || (countFields && countFields.includes(field))) {
+                                                cellValue = currAggData ? currAggData.value : childCount;
+                                                ctParams.aggValue = cellValue;
+                                                if (formatValuesMethod) {
+                                                    cellValue = formatValuesMethod(ctParams);
+                                                }
+                                            }
+                                        }
+                                        else if (opts.original) {
                                             cellValue = getCellValue(row, column);
                                         }
                                         else {
@@ -371,6 +429,8 @@ hooks.add('tableExportModule', {
                                                 }
                                             }
                                         }
+                                        break;
+                                    }
                                 }
                             }
                             item[column.id] = toStringValue(cellValue);
@@ -426,7 +486,7 @@ hooks.add('tableExportModule', {
                                 switch (column.type) {
                                     case 'seq': {
                                         const seqVal = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
-                                        cellValue = mode === 'all' ? seqVal : getSeq(seqVal, row, $rowIndex, column, $columnIndex);
+                                        cellValue = expMode === 'all' ? seqVal : getSeq(seqVal, row, $rowIndex, column, $columnIndex);
                                         break;
                                     }
                                     case 'checkbox':
@@ -490,7 +550,7 @@ hooks.add('tableExportModule', {
                         switch (column.type) {
                             case 'seq': {
                                 const seqValue = $rowIndex + 1;
-                                cellValue = mode === 'all' ? seqValue : getSeq(seqValue, row, $rowIndex, column, $columnIndex);
+                                cellValue = expMode === 'all' ? seqValue : getSeq(seqValue, row, $rowIndex, column, $columnIndex);
                                 break;
                             }
                             case 'checkbox':
@@ -872,12 +932,12 @@ hooks.add('tableExportModule', {
             const tableTitleMaps = {};
             tableFullColumn.forEach((column) => {
                 const field = column.field;
-                const title = column.getTitle();
+                const title = $xeTable.getHeaderCellLabel(column);
                 if (field) {
                     tableFieldMaps[field] = column;
                 }
                 if (title) {
-                    tableTitleMaps[column.getTitle()] = column;
+                    tableTitleMaps[title] = column;
                 }
             });
             const tableConf = {

package/es/table/src/cell.js

@@ -356,7 +356,7 @@ export const Cell = {
                 }
             }
         }
-        return renderTitleContent(params, formatText(column.getTitle(), 1));
+        return renderTitleContent(params, $table.getHeaderCellLabel(column));
     },
     renderDefaultHeader(params) {
         return renderHeaderCellBaseVNs(params, Cell.renderHeaderTitle(params));
@@ -368,7 +368,7 @@ export const Cell = {
         const tableInternalData = $table.internalData;
         const { isRowGroupStatus } = tableReactData;
         const { editConfig } = tableProps;
-        const { field, slots, editRender, cellRender, rowGroupNode, aggFunc, formatter } = column;
+        const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column;
         const isEnableEdit = editConfig && isEnableConf(editConfig);
         const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
         const cellRenderOpts = isEnableConf(cellRender) ? cellRender : null;
@@ -444,8 +444,9 @@ export const Cell = {
                 return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params));
             }
             const renderOpts = editRenderOpts || cellRenderOpts;
-            // formatter > (renderTableCell | renderTableDefault)
-            if (renderOpts && !formatter) {
+            // 如果是编辑表格：renderTableCell > formatter
+            // 如果是查看表格：renderTableDefault > formatter
+            if (renderOpts) {
                 const compConf = renderer.get(renderOpts.name);
                 if (compConf) {
                     const renderFn = editRenderOpts ? (compConf.renderTableCell || compConf.renderCell) : (compConf.renderTableDefault || compConf.renderDefault);
@@ -597,7 +598,13 @@ export const Cell = {
             const { computeAggregateOpts } = $table.getComputeMaps();
             const aggregateOpts = computeAggregateOpts.value;
             const { mode } = aggregateOpts;
-            if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+            if (mode === 'column') {
+                if (row.groupField && column.field === row.groupField) {
+                    return [Cell.renderRowGroupBtn(params, cellVNodes)];
+                }
+                return cellVNodes;
+            }
+            else if (rowGroupNode) {
                 return [Cell.renderRowGroupBtn(params, cellVNodes)];
             }
         }
@@ -610,7 +617,7 @@ export const Cell = {
         const { $table, column } = params;
         const { slots } = column;
         const headerSlot = slots ? slots.header : null;
-        return renderHeaderCellBaseVNs(params, renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : formatText(column.getTitle(), 1)));
+        return renderHeaderCellBaseVNs(params, renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : $table.getHeaderCellLabel(column)));
     },
     renderSeqCell(params) {
         const { $table, column } = params;
@@ -645,7 +652,7 @@ export const Cell = {
             : [
                 h('span', {
                     class: 'vxe-radio--label'
-                }, titleSlot ? $table.callSlot(titleSlot, params) : formatText(column.getTitle(), 1))
+                }, titleSlot ? $table.callSlot(titleSlot, params) : $table.getHeaderCellLabel(column))
             ]));
     },
     renderRadioCell(params) {
@@ -714,7 +721,7 @@ export const Cell = {
         const titleSlot = slots ? slots.title : null;
         const checkboxOpts = computeCheckboxOpts.value;
         const { checkStrictly, showHeader, headerTitle } = checkboxOpts;
-        const colTitle = column.getTitle();
+        const colTitle = $table.getHeaderCellLabel(column);
         const ons = {};
         if (!isHidden) {
             ons.onClick = (evnt) => {

package/es/table/src/columnInfo.js

@@ -11,16 +11,13 @@ export class ColumnInfo {
         const $xeGrid = $xeTable.xeGrid;
         const $xeGantt = $xeTable.xeGantt;
         const $xeGGWrapper = $xeGrid || $xeGantt;
-        const { field, editRender, filterRender, headerFormatter } = _vm;
+        const { field, editRender, filterRender } = _vm;
         const colId = _vm.colId || XEUtils.uniqueId('col_');
         const formatter = _vm.formatter;
         const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
         const flCompConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
         const ctFilterOptions = flCompConf ? flCompConf.createTableFilterOptions : null;
         const filters = toFilters(_vm.filters, colId);
-        if (headerFormatter) {
-            errLog('vxe.error.notProp', ['header-formatter']);
-        }
         const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
         if (_vm.type && types.indexOf(_vm.type) === -1) {
             warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);

package/es/table/src/table.js

@@ -4050,6 +4050,7 @@ export default defineVxeComponent({
                         loadScrollXData();
                     }
                 });
+                $xeTable.clearHeaderFormatterCache();
                 $xeTable.clearMergeCells();
                 $xeTable.clearMergeFooterItems();
                 $xeTable.handleTableData(true);
@@ -5291,6 +5292,81 @@ export default defineVxeComponent({
                 }
                 return nextTick();
             },
+            getHeaderCellLabel(fieldOrColumn) {
+                const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+                if (!column) {
+                    return null;
+                }
+                const { headerFormatter } = column;
+                const _columnIndex = $xeTable.getVTColumnIndex(column);
+                let cellLabel = column.getTitle();
+                if (headerFormatter) {
+                    let formatData;
+                    const { headerFullDataColData } = internalData;
+                    const colid = column.id;
+                    let colRest = headerFullDataColData[colid];
+                    if (!colRest) {
+                        colRest = headerFullDataColData[colid] = {};
+                    }
+                    const formatObj = colRest.formatObj;
+                    if (formatObj && formatObj.value === cellLabel) {
+                        return formatObj.label;
+                    }
+                    const headFormatParams = {
+                        $table: $xeTable,
+                        cellTitle: cellLabel,
+                        cellValue: cellLabel,
+                        column,
+                        _columnIndex,
+                        columnIndex: $xeTable.getColumnIndex(column)
+                    };
+                    if (XEUtils.isString(headerFormatter)) {
+                        const gFormatOpts = formats.get(headerFormatter);
+                        const fcFormatMethod = gFormatOpts ? gFormatOpts.tableHeaderCellFormatMethod : null;
+                        cellLabel = XEUtils.toValueString(fcFormatMethod ? fcFormatMethod(headFormatParams) : '');
+                    }
+                    else if (XEUtils.isArray(headerFormatter)) {
+                        const gFormatOpts = formats.get(headerFormatter[0]);
+                        const fcFormatMethod = gFormatOpts ? gFormatOpts.tableHeaderCellFormatMethod : null;
+                        cellLabel = XEUtils.toValueString(fcFormatMethod ? fcFormatMethod(headFormatParams, ...headerFormatter.slice(1)) : '');
+                    }
+                    else {
+                        cellLabel = XEUtils.toValueString(headerFormatter(headFormatParams));
+                    }
+                    if (formatData) {
+                        colRest.formatObj = { value: cellLabel, label: cellLabel };
+                    }
+                }
+                return cellLabel;
+            },
+            updateHeaderCellLabel(fieldOrColumn) {
+                const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+                if (!column) {
+                    return '';
+                }
+                const { headerFullDataColData } = internalData;
+                const colid = column.id;
+                const colRest = headerFullDataColData[colid];
+                if (colRest) {
+                    colRest.formatObj = undefined;
+                }
+                return $xeTable.getHeaderCellLabel(column);
+            },
+            clearHeaderFormatterCache(isUpdate) {
+                const { tableColumn } = reactData;
+                const { headerFullDataColData } = internalData;
+                XEUtils.each(headerFullDataColData, (colRest) => {
+                    if (colRest.formatObj) {
+                        colRest.formatObj = undefined;
+                    }
+                });
+                if (isUpdate) {
+                    tableColumn.forEach(column => {
+                        $xeTable.getHeaderCellLabel(column);
+                    });
+                }
+                return nextTick();
+            },
             getFooterCellLabel(row, fieldOrColumn) {
                 const column = handleFieldOrColumn($xeTable, fieldOrColumn);
                 if (!column) {
@@ -7502,6 +7578,7 @@ export default defineVxeComponent({
                     footData = visibleColumn.length ? footerMethod({ columns: visibleColumn, data: afterFullData, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }) : [];
                 }
                 reactData.footerTableData = footData;
+                $xeTable.clearFooterFormatterCache();
                 $xeTable.handleUpdateFooterMerge();
                 $xeTable.dispatchEvent('footer-data-change', {
                     visibleColumn: internalData.visibleColumn,

package/es/table/src/util.js

@@ -77,6 +77,7 @@ export function createInternalData() {
         // 数据集（仅可视）
         visibleDataRowIdData: {},
         keepUpdateFieldMaps: {},
+        headerFullDataColData: {},
         footerFullDataRowData: {},
         // 渲染中缓存数据
         sourceDataRowIdData: {},

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.19.3";
+export const version = "4.19.5";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.19.3"}`;
+const version = `table v${"4.19.5"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);