vxe-table 4.13.33 → 4.13.35

package/es/table/src/body.js

@@ -1,7 +1,7 @@
 import { defineComponent, TransitionGroup, h, ref, inject, nextTick, onMounted, onUnmounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
-import { getOffsetSize, calcTreeLine, getRowid, createHandleGetRowId } from './util';
+import { getOffsetSize, calcTreeLine, getRowid, createHandleGetRowId, getCellRestHeight } from './util';
 import { updateCellTitle, getPropClass } from '../../ui/src/dom';
 import { isEnableConf } from '../../ui/src/utils';
 import { getSlotVNs } from '../../ui/src/vn';
@@ -208,6 +208,7 @@ export default defineComponent({
                 $xeTable.triggerCellDblclickEvent(evnt, cellParams);
             };
             let isMergeCell = false;
+            let mergeRowspan = 1;
             // 合并行或列
             if (mergeBodyFlag && mergeBodyList.length) {
                 const spanRest = mergeBodyCellMaps[`${_rowIndex}:${_columnIndex}`];
@@ -218,6 +219,7 @@ export default defineComponent({
                     }
                     if (rowspan > 1) {
                         isMergeCell = true;
+                        mergeRowspan = rowspan;
                         tdAttrs.rowspan = rowspan;
                     }
                     if (colspan > 1) {
@@ -233,9 +235,12 @@ export default defineComponent({
                     return null;
                 }
                 if (rowspan > 1) {
+                    isMergeCell = true;
+                    mergeRowspan = rowspan;
                     tdAttrs.rowspan = rowspan;
                 }
                 if (colspan > 1) {
+                    isMergeCell = true;
                     tdAttrs.colspan = colspan;
                 }
             }
@@ -250,7 +255,7 @@ export default defineComponent({
                 isDirty = $xeTable.isUpdateByRow(row, column.field);
             }
             const isVNAutoHeight = scrollYLoad && !hasEllipsis;
-            const cellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+            let cellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
             const isLastColumn = $columnIndex === columns.length - 1;
             const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
             let isVNPreEmptyStatus = false;
@@ -264,6 +269,15 @@ export default defineComponent({
                     }
                 }
             }
+            if (mergeRowspan > 1) {
+                const mEndRow = afterFullData[_rowIndex + mergeRowspan - 1];
+                if (mEndRow) {
+                    const meRowRest = fullAllDataRowIdData[getRowid($xeTable, mEndRow)];
+                    if (meRowRest) {
+                        cellHeight += meRowRest.oTop - rowRest.oTop + getCellRestHeight(meRowRest, cellOpts, rowOpts, defaultRowHeight);
+                    }
+                }
+            }
             const tcStyle = {};
             if (hasEllipsis && resizeWidthFlag) {
                 let tsColspan = tdAttrs.colspan || 0;
@@ -297,7 +311,10 @@ export default defineComponent({
             }
             else {
                 // 渲染单元格
-                tdVNs.push(...renderLine(rowid, cellParams, cellHeight), h('div', {
+                if (treeConfig) {
+                    tdVNs.push(...renderLine(rowid, cellParams, cellHeight));
+                }
+                tdVNs.push(h('div', {
                     key: 'tc',
                     class: ['vxe-cell', {
                             'c--title': showTitle,

package/es/table/src/cell.js

@@ -257,12 +257,12 @@ function renderCellHandle(params) {
     const { isRowGroupStatus } = tableReactData;
     const { editConfig } = tableProps;
     const { type, treeNode, rowGroupNode, editRender } = column;
-    const { computeEditOpts, computeCheckboxOpts, computeRowGroupOpts } = $table.getComputeMaps();
-    const rowGroupOpts = computeRowGroupOpts.value;
-    const { mode } = rowGroupOpts;
+    const { computeEditOpts, computeCheckboxOpts, computeAggregateOpts } = $table.getComputeMaps();
+    const aggregateOpts = computeAggregateOpts.value;
+    const { mode } = aggregateOpts;
     const checkboxOpts = computeCheckboxOpts.value;
     const editOpts = computeEditOpts.value;
-    const isDeepCell = treeNode || (isRowGroupStatus && row.isAggregate && (mode === 'column' ? column.field === row.groupField : rowGroupNode));
+    const isDeepCell = treeNode || (isRowGroupStatus && (mode === 'column' ? column.field === row.groupField : rowGroupNode));
     switch (type) {
         case 'seq':
             return isDeepCell ? Cell.renderDeepIndexCell(params) : Cell.renderSeqCell(params);
@@ -364,7 +364,7 @@ export const Cell = {
         const tableReactData = $table.reactData;
         const tableInternalData = $table.internalData;
         const { isRowGroupStatus } = tableReactData;
-        const { field, slots, editRender, cellRender, rowGroupNode } = column;
+        const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column;
         const renderOpts = editRender || cellRender;
         const defaultSlot = slots ? slots.default : null;
         if (defaultSlot) {
@@ -382,41 +382,53 @@ export const Cell = {
             }
         }
         let cellValue = '';
-        if (isRowGroupStatus && row.isAggregate) {
+        if (isRowGroupStatus && field && row.isAggregate) {
+            const aggRow = row;
             const { fullColumnFieldData } = tableInternalData;
-            const { computeRowGroupOpts } = $table.getComputeMaps();
-            const rowGroupOpts = computeRowGroupOpts.value;
-            const { mode, showTotal, totalMethod, countFields, countMethod, contentMethod, mapChildrenField } = rowGroupOpts;
-            const groupField = row.groupField;
-            const groupContent = row.groupContent;
-            const childList = mapChildrenField ? (row[mapChildrenField] || []) : [];
-            const totalValue = row.childCount;
+            const { computeAggregateOpts } = $table.getComputeMaps();
+            const aggregateOpts = computeAggregateOpts.value;
+            const { mode, showTotal, totalMethod, countFields, contentMethod, mapChildrenField } = aggregateOpts;
+            const aggMethod = aggregateOpts.aggregateMethod || aggregateOpts.countMethod;
+            const groupField = aggRow.groupField;
+            const groupContent = aggRow.groupContent;
+            const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : [];
+            const childCount = aggRow.childCount;
             const colRest = fullColumnFieldData[groupField] || {};
-            const params = {
+            const ctParams = {
                 $table,
                 groupField,
                 groupColumn: (colRest ? colRest.column : null),
                 column,
                 groupValue: groupContent,
                 children: childList,
-                totalValue: totalValue
+                childCount,
+                aggValue: null,
+                /**
+                 * 已废弃
+                 * @deprecated
+                 */
+                totalValue: childCount
             };
-            if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+            if (mode === 'column' ? field === aggRow.groupField : rowGroupNode) {
                 cellValue = groupContent;
                 if (contentMethod) {
-                    cellValue = `${contentMethod(params)}`;
+                    cellValue = `${contentMethod(ctParams)}`;
                 }
                 if (showTotal) {
-                    cellValue = getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(params) : totalValue, totalValue]);
+                    cellValue = getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(ctParams) : childCount, childCount]);
                 }
             }
-            else if (countFields && countFields.includes(field)) {
-                if (countMethod) {
-                    cellValue = `${countMethod(params)}`;
+            else if ($table.getPivotTableAggregateCellAggValue) {
+                cellValue = $table.getPivotTableAggregateCellAggValue(params);
+            }
+            else if (aggFunc === true || (countFields && countFields.includes(field))) {
+                if (aggMethod) {
+                    ctParams.aggValue = childCount;
+                    cellValue = `${aggMethod(ctParams)}`;
                 }
             }
         }
-        else if (!(isRowGroupStatus && row.isAggregate)) {
+        else {
             cellValue = $table.getCellLabel(row, column);
         }
         const cellPlaceholder = editRender ? editRender.placeholder : '';
@@ -447,11 +459,11 @@ export const Cell = {
         const tableReactData = $table.reactData;
         const tableInternalData = $table.internalData;
         const { row, level } = params;
-        const { computeRowGroupOpts } = $table.getComputeMaps();
+        const { computeAggregateOpts } = $table.getComputeMaps();
         const { rowGroupExpandedFlag } = tableReactData;
         const { rowGroupExpandedMaps } = tableInternalData;
-        const rowGroupOpts = computeRowGroupOpts.value;
-        const { padding, indent } = rowGroupOpts;
+        const aggregateOpts = computeAggregateOpts.value;
+        const { padding, indent } = aggregateOpts;
         const rowid = getRowid($table, row);
         const isExpand = !!rowGroupExpandedFlag && !!rowGroupExpandedMaps[rowid];
         return h('div', {
@@ -464,16 +476,18 @@ export const Cell = {
                 }
                 : undefined
         }, [
-            h('span', {
-                class: 'vxe-row-group--node-btn',
-                onClick(evnt) {
-                    $table.triggerRowGroupExpandEvent(evnt, params);
-                }
-            }, [
-                h('i', {
-                    class: isExpand ? getIcon().TABLE_ROW_GROUP_OPEN : getIcon().TABLE_ROW_GROUP_CLOSE
-                })
-            ]),
+            row.isAggregate
+                ? h('span', {
+                    class: 'vxe-row-group--node-btn',
+                    onClick(evnt) {
+                        $table.triggerRowGroupExpandEvent(evnt, params);
+                    }
+                }, [
+                    h('i', {
+                        class: isExpand ? getIcon().TABLE_ROW_GROUP_OPEN : getIcon().TABLE_ROW_GROUP_CLOSE
+                    })
+                ])
+                : renderEmptyElement($table),
             h('div', {
                 class: 'vxe-row-group-cell'
             }, cellVNodes)
@@ -552,10 +566,12 @@ export const Cell = {
     renderDeepNodeBtn(params, cellVNodes) {
         const { $table, row, column } = params;
         const { rowGroupNode } = column;
-        if (row.isAggregate) {
-            const { computeRowGroupOpts } = $table.getComputeMaps();
-            const rowGroupOpts = computeRowGroupOpts.value;
-            const { mode } = rowGroupOpts;
+        const tableReactData = $table.reactData;
+        const { rowGroupList } = tableReactData;
+        if (rowGroupList.length) {
+            const { computeAggregateOpts } = $table.getComputeMaps();
+            const aggregateOpts = computeAggregateOpts.value;
+            const { mode } = aggregateOpts;
             if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
                 return [Cell.renderRowGroupBtn(params, cellVNodes)];
             }

package/es/table/src/column.js

@@ -121,6 +121,8 @@ export const columnProps = {
     editRender: Object,
     // 内容渲染配置项
     contentRender: Object,
+    // 聚合函数
+    aggFunc: [String, Boolean],
     // 额外的参数
     params: Object
 };

package/es/table/src/columnInfo.js

@@ -90,6 +90,7 @@ export class ColumnInfo {
             titleHelp: _vm.titleHelp,
             titlePrefix: _vm.titlePrefix,
             titleSuffix: _vm.titleSuffix,
+            aggFunc: _vm.aggFunc,
             // 自定义参数
             params: _vm.params,
             // 渲染属性
@@ -115,6 +116,7 @@ export class ColumnInfo {
             // 列排序
             sortNumber: 0,
             renderSortNumber: 0,
+            renderAggFn: '',
             renderFixed: '',
             renderVisible: false,
             renderWidth: 0,

package/es/table/src/props.js

@@ -192,7 +192,9 @@ export default {
     footerCellConfig: Object,
     // 行配置项
     rowConfig: Object,
-    // 行分组配置项
+    // 数据聚合配置项
+    aggregateConfig: Object,
+    //  已废弃，被 aggregateConfig 替换
     rowGroupConfig: Object,
     // 当前行配置项
     currentRowConfig: Object,