vxe-table 3.21.3 → 3.21.4

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

@@ -48,9 +48,11 @@ const toStringValue = (cellValue) => {
 function getBodyLabelData($xeTable, opts, columns, datas) {
     const props = $xeTable;
     const reactData = $xeTable;
-    const { isTreeAllExpanded, isRowGroupAllExpanded, mode } = opts;
+    const internalData = $xeTable;
+    const { isTreeAllExpanded, isRowGroupAllExpanded, mode: expMode } = opts;
     const { treeConfig } = props;
     const { isRowGroupStatus } = reactData;
+    const { fullColumnFieldData } = internalData;
     const radioOpts = $xeTable.computeRadioOpts;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const treeOpts = $xeTable.computeTreeOpts;
@@ -62,8 +64,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
     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 = {};
@@ -84,8 +85,9 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
                     _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);
@@ -103,21 +105,77 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
                         switch (column.type) {
                             case 'seq': {
                                 const seqVal = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
-                                cellValue = mode === 'all' ? seqVal : getSeq($xeTable, seqVal, row, $rowIndex, column, $columnIndex);
+                                cellValue = expMode === 'all' ? seqVal : getSeq($xeTable, 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 {
@@ -133,6 +191,8 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
                                         }
                                     }
                                 }
+                                break;
+                            }
                         }
                     }
                     item[column.id] = toStringValue(cellValue);
@@ -188,7 +248,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
                         switch (column.type) {
                             case 'seq': {
                                 const seqVal = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
-                                cellValue = mode === 'all' ? seqVal : getSeq($xeTable, seqVal, row, $rowIndex, column, $columnIndex);
+                                cellValue = expMode === 'all' ? seqVal : getSeq($xeTable, seqVal, row, $rowIndex, column, $columnIndex);
                                 break;
                             }
                             case 'checkbox':
@@ -252,7 +312,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
                 switch (column.type) {
                     case 'seq': {
                         const seqValue = $rowIndex + 1;
-                        cellValue = mode === 'all' ? seqValue : getSeq($xeTable, seqValue, row, $rowIndex, column, $columnIndex);
+                        cellValue = expMode === 'all' ? seqValue : getSeq($xeTable, seqValue, row, $rowIndex, column, $columnIndex);
                         break;
                     }
                     case 'checkbox':

package/es/table/src/cell.js

@@ -602,7 +602,13 @@ export const Cell = {
         if (rowGroupList.length) {
             const aggregateOpts = $table.computeAggregateOpts;
             const { mode } = aggregateOpts;
-            if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+            if (mode === 'column') {
+                if (row.groupField && column.field === row.groupField) {
+                    return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
+                }
+                return cellVNodes;
+            }
+            else if (rowGroupNode) {
                 return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
             }
         }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.21.3";
+export const version = "3.21.4";
 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${"3.21.3"}`;
+const version = `table v${"3.21.4"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3311,7 +3311,7 @@ function getClass(property, params) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.21.3";
+const version = "3.21.4";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3842,7 +3842,7 @@ var es_iterator_some = __webpack_require__(3579);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.21.3"}`;
+const log_version = `table v${"3.21.4"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6123,7 +6123,12 @@ const Cell = {
       const {
         mode
       } = aggregateOpts;
-      if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+      if (mode === 'column') {
+        if (row.groupField && column.field === row.groupField) {
+          return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
+        }
+        return cellVNodes;
+      } else if (rowGroupNode) {
         return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
       }
     }
@@ -16016,10 +16021,11 @@ const toStringValue = cellValue => {
 function getBodyLabelData($xeTable, opts, columns, datas) {
   const props = $xeTable;
   const reactData = $xeTable;
+  const internalData = $xeTable;
   const {
     isTreeAllExpanded,
     isRowGroupAllExpanded,
-    mode
+    mode: expMode
   } = opts;
   const {
     treeConfig
@@ -16027,6 +16033,9 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
   const {
     isRowGroupStatus
   } = reactData;
+  const {
+    fullColumnFieldData
+  } = internalData;
   const radioOpts = $xeTable.computeRadioOpts;
   const checkboxOpts = $xeTable.computeCheckboxOpts;
   const treeOpts = $xeTable.computeTreeOpts;
@@ -16039,9 +16048,14 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
     handleGetRowId
   } = createHandleGetRowId($xeTable);
   if (isRowGroupStatus) {
-    // 如果是数据分组
     // 如果是数据分组
     const {
+      mode: aggMode,
+      showTotal,
+      totalMethod,
+      countFields,
+      contentMethod,
+      formatValuesMethod,
       mapChildrenField
     } = aggregateOpts;
     const rest = [];
@@ -16064,8 +16078,15 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
           _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 = export_mixin_renderer.get(renderOpts.name);
@@ -16088,39 +16109,97 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
               case 'seq':
                 {
                   const seqVal = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
-                  cellValue = mode === 'all' ? seqVal : getSeq($xeTable, seqVal, row, $rowIndex, column, $columnIndex);
+                  cellValue = expMode === 'all' ? seqVal : getSeq($xeTable, seqVal, row, $rowIndex, column, $columnIndex);
                   break;
                 }
               case 'checkbox':
-                cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
-                item._checkboxLabel = checkboxOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkboxOpts.labelField) : '';
-                item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({
-                  $table: $xeTable,
-                  row
-                });
-                break;
+                {
+                  cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
+                  item._checkboxLabel = checkboxOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkboxOpts.labelField) : '';
+                  item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({
+                    $table: $xeTable,
+                    row
+                  });
+                  break;
+                }
               case 'radio':
-                cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row));
-                item._radioLabel = radioOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, radioOpts.labelField) : '';
-                item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({
-                  $table: $xeTable,
-                  row
-                });
-                break;
+                {
+                  cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row));
+                  item._radioLabel = radioOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, radioOpts.labelField) : '';
+                  item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({
+                    $table: $xeTable,
+                    row
+                  });
+                  break;
+                }
               default:
-                if (opts.original) {
-                  cellValue = getCellValue(row, column);
-                } else {
-                  cellValue = $xeTable.getCellLabel(row, column);
-                  if (column.type === 'html') {
-                    htmlCellElem.innerHTML = cellValue;
-                    cellValue = htmlCellElem.innerText.trim();
+                {
+                  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 = export_mixin_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 {
-                    const cell = $xeTable.getCellElement(row, column);
-                    if (cell && !hasClass(cell, 'is--progress')) {
-                      cellValue = cell.innerText.trim();
+                    cellValue = $xeTable.getCellLabel(row, column);
+                    if (column.type === 'html') {
+                      htmlCellElem.innerHTML = cellValue;
+                      cellValue = htmlCellElem.innerText.trim();
+                    } else {
+                      const cell = $xeTable.getCellElement(row, column);
+                      if (cell && !hasClass(cell, 'is--progress')) {
+                        cellValue = cell.innerText.trim();
+                      }
                     }
                   }
+                  break;
                 }
             }
           }
@@ -16184,7 +16263,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
               case 'seq':
                 {
                   const seqVal = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
-                  cellValue = mode === 'all' ? seqVal : getSeq($xeTable, seqVal, row, $rowIndex, column, $columnIndex);
+                  cellValue = expMode === 'all' ? seqVal : getSeq($xeTable, seqVal, row, $rowIndex, column, $columnIndex);
                   break;
                 }
               case 'checkbox':
@@ -16259,7 +16338,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
           case 'seq':
             {
               const seqValue = $rowIndex + 1;
-              cellValue = mode === 'all' ? seqValue : getSeq($xeTable, seqValue, row, $rowIndex, column, $columnIndex);
+              cellValue = expMode === 'all' ? seqValue : getSeq($xeTable, seqValue, row, $rowIndex, column, $columnIndex);
               break;
             }
           case 'checkbox':