vxe-table 3.15.34 → 3.15.36

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

@@ -221,12 +221,14 @@ export default {
         beginValidate(rows, cols, cb, isFull) {
             const $xeTable = this;
             const props = $xeTable;
+            const reactData = $xeTable;
             const internalData = $xeTable;
             const validRest = {};
             const { editRules, treeConfig } = props;
+            const { isRowGroupStatus } = reactData;
             const { afterFullData, pendingRowMaps, removeRowMaps } = internalData;
             const treeOpts = $xeTable.computeTreeOpts;
-            const childrenField = treeOpts.children || treeOpts.childrenField;
+            const aggregateOpts = $xeTable.computeAggregateOpts;
             let validList;
             if (rows === true) {
                 validList = afterFullData;
@@ -259,6 +261,9 @@ export default {
                     if (pendingRowMaps[rowid]) {
                         return;
                     }
+                    if ($xeTable.isAggregateRecord(row)) {
+                        return;
+                    }
                     if (isFull || !this.validRuleErr) {
                         const colVailds = [];
                         columns.forEach((column) => {
@@ -296,7 +301,11 @@ export default {
                         rowValidErrs.push(Promise.all(colVailds));
                     }
                 };
-                if (treeConfig) {
+                if (isRowGroupStatus) {
+                    XEUtils.eachTree(validList, handleVaild, { children: aggregateOpts.mapChildrenField });
+                }
+                else if (treeConfig) {
+                    const childrenField = treeOpts.children || treeOpts.childrenField;
                     XEUtils.eachTree(validList, handleVaild, { children: childrenField });
                 }
                 else {

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, getRowid, createHandleGetRowId } from './util';
+import { getOffsetSize, calcTreeLine, getRowid, createHandleGetRowId, getCellRestHeight } from './util';
 import { updateCellTitle } from '../../ui/src/dom';
 import { getSlotVNs } from '../../ui/src/vn';
 const { getI18n, renderer, renderEmptyElement } = VxeUI;
@@ -190,6 +190,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
         $xeTable.triggerCellDblclickEvent(evnt, cellParams);
     };
     let isMergeCell = false;
+    let mergeRowspan = 1;
     // 合并行或列
     if (mergeBodyFlag && mergeBodyList.length) {
         const spanRest = mergeBodyCellMaps[`${_rowIndex}:${_columnIndex}`];
@@ -200,6 +201,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
             }
             if (rowspan > 1) {
                 isMergeCell = true;
+                mergeRowspan = rowspan;
                 tdAttrs.rowspan = rowspan;
             }
             if (colspan > 1) {
@@ -215,9 +217,12 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
             return null;
         }
         if (rowspan > 1) {
+            isMergeCell = true;
+            mergeRowspan = rowspan;
             tdAttrs.rowspan = rowspan;
         }
         if (colspan > 1) {
+            isMergeCell = true;
             tdAttrs.colspan = colspan;
         }
     }
@@ -232,7 +237,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
         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;
@@ -246,6 +251,15 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
             }
         }
     }
+    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;
@@ -279,7 +293,10 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     }
     else {
         // 渲染单元格
-        tdVNs.push(...renderLine(h, $xeTable, rowid, cellParams, cellHeight), h('div', {
+        if (treeConfig) {
+            tdVNs.push(...renderLine(h, $xeTable, rowid, cellParams, cellHeight));
+        }
+        tdVNs.push(h('div', {
             key: 'tc',
             class: ['vxe-cell', {
                     'c--title': showTitle,

package/es/table/src/cell.js

@@ -253,11 +253,11 @@ function renderCellHandle(h, params) {
     const { editConfig } = tableProps;
     const { isRowGroupStatus } = tableReactData;
     const { type, treeNode, rowGroupNode, editRender } = column;
-    const rowGroupOpts = $table.computeRowGroupOpts;
-    const { mode } = rowGroupOpts;
+    const aggregateOpts = $table.computeAggregateOpts;
+    const { mode } = aggregateOpts;
     const checkboxOpts = $table.computeCheckboxOpts;
     const editOpts = $table.computeEditOpts;
-    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(h, params) : Cell.renderSeqCell(h, params);
@@ -356,7 +356,7 @@ export const Cell = {
         const tableReactData = $table;
         const tableInternalData = $table;
         const { isRowGroupStatus } = tableReactData;
-        const { field, slots, editRender, cellRender, rowGroupNode } = column;
+        const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column;
         const renderOpts = editRender || cellRender;
         if (slots && slots.default) {
             return renderCellBaseVNs(h, params, $table.callSlot(slots.default, params, h));
@@ -371,40 +371,52 @@ export const Cell = {
             }
         }
         let cellValue = '';
-        if (isRowGroupStatus && row.isAggregate) {
+        if (isRowGroupStatus && field && row.isAggregate) {
+            const aggRow = row;
             const { fullColumnFieldData } = tableInternalData;
-            const rowGroupOpts = $table.computeRowGroupOpts;
-            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 aggregateOpts = $table.computeAggregateOpts;
+            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 : '';
@@ -437,8 +449,8 @@ export const Cell = {
         const { row, level } = params;
         const { rowGroupExpandedFlag } = tableReactData;
         const { rowGroupExpandedMaps } = tableInternalData;
-        const rowGroupOpts = $table.computeRowGroupOpts;
-        const { padding, indent } = rowGroupOpts;
+        const aggregateOpts = $table.computeAggregateOpts;
+        const { padding, indent } = aggregateOpts;
         const rowid = getRowid($table, row);
         const isExpand = !!rowGroupExpandedFlag && !!rowGroupExpandedMaps[rowid];
         return h('div', {
@@ -451,18 +463,20 @@ export const Cell = {
                 }
                 : undefined
         }, [
-            h('span', {
-                class: 'vxe-row-group--node-btn',
-                on: {
-                    click(evnt) {
-                        $table.triggerRowGroupExpandEvent(evnt, params);
+            row.isAggregate
+                ? h('span', {
+                    class: 'vxe-row-group--node-btn',
+                    on: {
+                        click(evnt) {
+                            $table.triggerRowGroupExpandEvent(evnt, params);
+                        }
                     }
-                }
-            }, [
-                h('i', {
-                    class: isExpand ? getIcon().TABLE_ROW_GROUP_OPEN : getIcon().TABLE_ROW_GROUP_CLOSE
-                })
-            ]),
+                }, [
+                    h('i', {
+                        class: isExpand ? getIcon().TABLE_ROW_GROUP_OPEN : getIcon().TABLE_ROW_GROUP_CLOSE
+                    })
+                ])
+                : renderEmptyElement($table),
             h('div', {
                 class: 'vxe-row-group-cell'
             }, cellVNodes)
@@ -545,9 +559,11 @@ export const Cell = {
     renderDeepNodeBtn(h, params, cellVNodes) {
         const { $table, row, column } = params;
         const { rowGroupNode } = column;
-        if (row.isAggregate) {
-            const rowGroupOpts = $table.computeRowGroupOpts;
-            const { mode } = rowGroupOpts;
+        const tableReactData = $table;
+        const { rowGroupList } = tableReactData;
+        if (rowGroupList.length) {
+            const aggregateOpts = $table.computeAggregateOpts;
+            const { mode } = aggregateOpts;
             if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
                 return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
             }

package/es/table/src/column.js

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

package/es/table/src/columnInfo.js

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