vxe-table 3.15.34 → 3.15.35

package/lib/table/src/methods.js

@@ -520,11 +520,11 @@ function handleRowGroupBaseExpand($xeTable, rows, expanded) {
     tableFullGroupData,
     rowGroupExpandedMaps
   } = internalData;
-  const rowGroupOpts = $xeTable.computeRowGroupOpts;
+  const aggregateOpts = $xeTable.computeAggregateOpts;
   const {
     mapChildrenField,
     accordion
-  } = rowGroupOpts;
+  } = aggregateOpts;
   const {
     handleGetRowId
   } = (0, _util.createHandleGetRowId)($xeTable);
@@ -733,7 +733,7 @@ function handleVirtualTreeToList($xeTable) {
     treeExpandedMaps,
     rowGroupExpandedMaps
   } = internalData;
-  const rowGroupOpts = $xeTable.computeRowGroupOpts;
+  const aggregateOpts = $xeTable.computeAggregateOpts;
   const treeOpts = $xeTable.computeTreeOpts;
   const {
     handleGetRowId
@@ -762,7 +762,7 @@ function handleVirtualTreeToList($xeTable) {
   } else if (isRowGroupStatus) {
     const {
       childrenField
-    } = rowGroupOpts;
+    } = aggregateOpts;
     _xeUtils.default.eachTree(internalData.afterGroupFullData, (row, index, items, path, parentRow) => {
       const rowid = handleGetRowId(row);
       const parentRowid = handleGetRowId(parentRow);
@@ -805,7 +805,7 @@ function updateAfterFullData($xeTable) {
   } = internalData;
   const filterOpts = $xeTable.computeFilterOpts;
   const sortOpts = $xeTable.computeSortOpts;
-  const rowGroupOpts = $xeTable.computeRowGroupOpts;
+  const aggregateOpts = $xeTable.computeAggregateOpts;
   const treeOpts = $xeTable.computeTreeOpts;
   const childrenField = treeOpts.children || treeOpts.childrenField;
   const {
@@ -930,8 +930,8 @@ function updateAfterFullData($xeTable) {
         tableTree = _xeUtils.default.searchTree(tableFullGroupData, handleFilter, {
           original: true,
           isEvery: true,
-          children: rowGroupOpts.mapChildrenField,
-          mapChildren: rowGroupOpts.childrenField
+          children: aggregateOpts.mapChildrenField,
+          mapChildren: aggregateOpts.childrenField
         });
         tableData = tableTree;
       } else if (treeConfig && transform) {
@@ -953,8 +953,8 @@ function updateAfterFullData($xeTable) {
         tableTree = _xeUtils.default.searchTree(tableFullGroupData, () => true, {
           original: true,
           isEvery: true,
-          children: rowGroupOpts.mapChildrenField,
-          mapChildren: rowGroupOpts.childrenField
+          children: aggregateOpts.mapChildrenField,
+          mapChildren: aggregateOpts.childrenField
         });
         tableData = tableTree;
       } else if (treeConfig && transform) {
@@ -985,18 +985,18 @@ function updateAfterFullData($xeTable) {
           tableTree = _xeUtils.default.isArray(sortRests) ? sortRests : tableTree;
         } else {
           const treeList = _xeUtils.default.toTreeArray(tableTree, {
-            key: rowGroupOpts.rowField,
-            parentKey: rowGroupOpts.parentField,
-            children: rowGroupOpts.mapChildrenField
+            key: aggregateOpts.rowField,
+            parentKey: aggregateOpts.parentField,
+            children: aggregateOpts.mapChildrenField
           });
           tableTree = _xeUtils.default.toArrayTree(_xeUtils.default.orderBy(treeList, orderColumns.map(({
             column,
             order
           }) => [getOrderField($xeTable, column), order])), {
-            key: rowGroupOpts.rowField,
-            parentKey: rowGroupOpts.parentField,
-            children: rowGroupOpts.childrenField,
-            mapChildren: rowGroupOpts.mapChildrenField
+            key: aggregateOpts.rowField,
+            parentKey: aggregateOpts.parentField,
+            children: aggregateOpts.childrenField,
+            mapChildren: aggregateOpts.mapChildrenField
           });
         }
         tableData = tableTree;
@@ -1066,8 +1066,8 @@ function updateAfterFullData($xeTable) {
       tableTree = _xeUtils.default.searchTree(tableFullGroupData, () => true, {
         original: true,
         isEvery: true,
-        children: rowGroupOpts.mapChildrenField,
-        mapChildren: rowGroupOpts.childrenField
+        children: aggregateOpts.mapChildrenField,
+        mapChildren: aggregateOpts.childrenField
       });
       tableData = tableTree;
     } else if (treeConfig && transform) {
@@ -1586,7 +1586,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
     selectCheckboxMaps
   } = internalData;
   const treeOpts = $xeTable.computeTreeOpts;
-  const rowGroupOpts = $xeTable.computeRowGroupOpts;
+  const aggregateOpts = $xeTable.computeAggregateOpts;
   const childrenField = treeOpts.children || treeOpts.childrenField;
   const checkboxOpts = $xeTable.computeCheckboxOpts;
   const {
@@ -1648,7 +1648,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
             selectRowMaps[rowid] = row;
           }
         }, {
-          children: rowGroupOpts.mapChildrenField
+          children: aggregateOpts.mapChildrenField
         });
       } else {
         /**
@@ -1665,7 +1665,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
               selectRowMaps[rowid] = row;
             }
           }, {
-            children: rowGroupOpts.mapChildrenField
+            children: aggregateOpts.mapChildrenField
           });
         }
       }
@@ -3132,17 +3132,69 @@ const handleUpdateRowGroup = ($xeTable, groupFields) => {
     };
   }) : [];
 };
+function handleeGroupSummary($xeTable, aggList) {
+  const aggregateOpts = $xeTable.computeAggregateOpts;
+  const {
+    mapChildrenField
+  } = aggregateOpts;
+  if (mapChildrenField) {
+    _xeUtils.default.lastEach(aggList, aggRow => {
+      let count = 0;
+      _xeUtils.default.each(aggRow[mapChildrenField], row => {
+        if (row.isAggregate) {
+          count += row.childCount || 0;
+        } else {
+          count++;
+        }
+      });
+      aggRow.childCount = count;
+    });
+    if ($xeTable.handlePivotTableAggregateData) {
+      $xeTable.handlePivotTableAggregateData(aggList);
+    }
+  }
+}
+function updateGroupData($xeTable) {
+  const props = $xeTable;
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    aggregateConfig,
+    rowGroupConfig
+  } = props;
+  const {
+    isRowGroupStatus
+  } = reactData;
+  const {
+    tableFullGroupData
+  } = internalData;
+  const aggregateOpts = $xeTable.computeAggregateOpts;
+  const {
+    mapChildrenField
+  } = aggregateOpts;
+  if ((aggregateConfig || rowGroupConfig) && isRowGroupStatus) {
+    const aggList = [];
+    _xeUtils.default.eachTree(tableFullGroupData, row => {
+      if (row.isAggregate) {
+        aggList.push(row);
+      }
+    }, {
+      children: mapChildrenField
+    });
+    handleeGroupSummary($xeTable, aggList);
+  }
+}
 function handleGroupData($xeTable, list, rowGroups) {
   let fullData = list;
   let treeData = list;
   if (rowGroups) {
-    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
     const {
       rowField,
       parentField,
       childrenField,
       mapChildrenField
-    } = rowGroupOpts;
+    } = aggregateOpts;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField
@@ -3155,7 +3207,7 @@ function handleGroupData($xeTable, list, rowGroups) {
       const groupField = rgItem.field;
       const groupColumn = $xeTable.getColumnByField(groupField);
       const groupMaps = {};
-      const groupList = [];
+      const aggList = [];
       const rowkey = (0, _util.getRowkey)($xeTable);
       list.forEach(row => {
         const cellValue = groupColumn ? $xeTable.getCellLabel(row, groupColumn) : _xeUtils.default.get(row, groupField);
@@ -3175,12 +3227,12 @@ function handleGroupData($xeTable, list, rowGroups) {
           fullData: childFullData,
           treeData: childTreeData
         } = handleGroupData($xeTable, childList, rowGroups.slice(1));
-        const childCount = 0;
-        const groupRow = {
+        const aggRow = {
           isAggregate: true,
-          childCount,
+          aggData: {},
           groupContent: groupValue,
           groupField,
+          childCount: 0,
           [rowField]: (0, _util.getRowUniqueId)(),
           [parentField]: null,
           [rowkey]: (0, _util.getRowUniqueId)(),
@@ -3188,29 +3240,19 @@ function handleGroupData($xeTable, list, rowGroups) {
           [mapChildrenField]: childTreeData
         };
         if (checkField) {
-          groupRow[checkField] = false;
+          aggRow[checkField] = false;
         }
         if (indeterminateField) {
-          groupRow[indeterminateField] = false;
+          aggRow[indeterminateField] = false;
         }
-        groupList.push(groupRow);
-        treeData.push(groupRow);
-        fullData.push(groupRow);
+        aggList.push(aggRow);
+        treeData.push(aggRow);
+        fullData.push(aggRow);
         if (childFullData.length) {
           fullData.push(...childFullData);
         }
       });
-      _xeUtils.default.lastEach(groupList, groupItem => {
-        let count = 0;
-        _xeUtils.default.each(groupItem[childrenField], row => {
-          if (row.isAggregate) {
-            count += row[childrenField] ? row[childrenField].length : 0;
-          } else {
-            count++;
-          }
-        });
-        groupItem.childCount = count;
-      });
+      handleeGroupSummary($xeTable, aggList);
     }
   }
   return {
@@ -3229,6 +3271,7 @@ function loadTableData($xeTable, datas, isReset) {
   const {
     keepSource,
     treeConfig,
+    aggregateConfig,
     rowGroupConfig
   } = props;
   const {
@@ -3254,11 +3297,11 @@ function loadTableData($xeTable, datas, isReset) {
     (0, _log.errLog)('vxe.error.errMaxRow', [supportMaxRow]);
   }
   if (treeConfig && rowGroupList.length) {
-    (0, _log.errLog)('vxe.error.noTree', ['row-group-config']);
+    (0, _log.errLog)('vxe.error.noTree', ['aggregate-config']);
     return $xeTable.$nextTick();
   }
   if (rowOpts.drag && rowGroupList.length) {
-    (0, _log.errLog)('vxe.error.errConflicts', ['row-config.drag', 'row-group-config']);
+    (0, _log.errLog)('vxe.error.errConflicts', ['row-config.drag', 'aggregate-config']);
     return $xeTable.$nextTick();
   }
   let isRGroup = false;
@@ -3295,7 +3338,7 @@ function loadTableData($xeTable, datas, isReset) {
     } else {
       treeData = fullData.slice(0);
     }
-  } else if (rowGroupConfig && rowGroupList.length) {
+  } else if ((aggregateConfig || rowGroupConfig) && rowGroupList.length) {
     const groupRest = handleGroupData($xeTable, fullData, rowGroupList);
     treeData = groupRest.treeData;
     fullData = groupRest.fullData;
@@ -3400,11 +3443,15 @@ function loadTableData($xeTable, datas, isReset) {
         // 是否变更虚拟滚动
         if (oldScrollYLoad === sYLoad) {
           (0, _util.restoreScrollLocation)($xeTable, targetScrollLeft, targetScrollTop).then(() => {
+            calcCellHeight($xeTable);
+            updateRowOffsetTop($xeTable);
             resolve();
           });
         } else {
           setTimeout(() => {
             (0, _util.restoreScrollLocation)($xeTable, targetScrollLeft, targetScrollTop).then(() => {
+              calcCellHeight($xeTable);
+              updateRowOffsetTop($xeTable);
               resolve();
             });
           });
@@ -3687,6 +3734,7 @@ function handleColumn($xeTable, collectColumn) {
     $xeTable.clearMergeCells();
     $xeTable.clearMergeFooterItems();
     $xeTable.handleTableData(true);
+    $xeTable.handleAggregateSummaryData();
     if ((scrollXLoad || scrollYLoad) && expandColumn && expandOpts.mode !== 'fixed') {
       (0, _log.warnLog)('vxe.error.scrollErrProp', ['column.type=expand']);
     }
@@ -4457,10 +4505,10 @@ const Methods = {
         children: childrenField
       });
     } else if (isRowGroupStatus) {
-      const rowGroupOpts = $xeTable.computeRowGroupOpts;
+      const aggregateOpts = $xeTable.computeAggregateOpts;
       const {
         mapChildrenField
-      } = rowGroupOpts;
+      } = aggregateOpts;
       _xeUtils.default.eachTree(tableFullGroupData, (row, index, items, path, parentRow, nodes) => {
         const rowid = handleUpdateRowId(row);
         handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, (0, _util.toTreePathSeq)(path));
@@ -7191,6 +7239,10 @@ const Methods = {
     internalData.mergeFooterCellMaps = buildMergeData(mergeFooterList);
     reactData.mergeFootFlag++;
   },
+  handleAggregateSummaryData() {
+    const $xeTable = this;
+    return updateGroupData($xeTable);
+  },
   handleTargetLeaveEvent() {
     const $xeTable = this;
     const internalData = $xeTable;
@@ -7543,7 +7595,7 @@ const Methods = {
     const {
       selectCheckboxMaps
     } = internalData;
-    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
       transform,
@@ -7615,7 +7667,7 @@ const Methods = {
             handleCheckboxReserveRow($xeTable, row, checked);
           }
         }, {
-          children: rowGroupOpts.mapChildrenField
+          children: aggregateOpts.mapChildrenField
         });
         reactData.updateCheckboxFlag++;
         return;
@@ -7806,7 +7858,7 @@ const Methods = {
       selectCheckboxMaps,
       treeIndeterminateRowMaps
     } = internalData;
-    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
@@ -7826,7 +7878,7 @@ const Methods = {
       const childRowList = [];
       if (isRowGroupStatus) {
         // 行分组
-        const mapChildrenField = rowGroupOpts.mapChildrenField;
+        const mapChildrenField = aggregateOpts.mapChildrenField;
         if (mapChildrenField) {
           _xeUtils.default.eachTree(afterGroupFullData, row => {
             const rowid = handleGetRowId(row);
@@ -8554,7 +8606,7 @@ const Methods = {
     const radioOpts = $xeTable.computeRadioOpts;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const keyboardOpts = $xeTable.computeKeyboardOpts;
-    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
     const rowOpts = $xeTable.computeRowOpts;
     const columnOpts = $xeTable.computeColumnOpts;
     const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
@@ -8597,7 +8649,7 @@ const Methods = {
         $xeTable.triggerTreeExpandEvent(evnt, params);
       }
       // 如果是行分组
-      if (rowGroupOpts.trigger === 'row' || rowGroupNode && rowGroupOpts.trigger === 'cell') {
+      if (aggregateOpts.trigger === 'row' || rowGroupNode && aggregateOpts.trigger === 'cell') {
         $xeTable.triggerRowGroupExpandEvent(evnt, params);
       }
     }
@@ -10265,10 +10317,11 @@ const Methods = {
     const props = $xeTable;
     const internalData = $xeTable;
     const {
+      aggregateConfig,
       rowGroupConfig
     } = props;
-    if (!rowGroupConfig) {
-      (0, _log.errLog)('vxe.error.reqProp', ['row-group-config']);
+    if (!(aggregateConfig || rowGroupConfig)) {
+      (0, _log.errLog)('vxe.error.reqProp', ['aggregate-config']);
       return $xeTable.$nextTick();
     }
     if (fieldOrColumns) {
@@ -10284,16 +10337,27 @@ const Methods = {
     const props = $xeTable;
     const internalData = $xeTable;
     const {
+      aggregateConfig,
       rowGroupConfig
     } = props;
-    if (!rowGroupConfig) {
-      (0, _log.errLog)('vxe.error.reqProp', ['row-group-config']);
+    if (!(aggregateConfig || rowGroupConfig)) {
+      (0, _log.errLog)('vxe.error.reqProp', ['aggregate-config']);
       return $xeTable.$nextTick();
     }
     handleUpdateRowGroup($xeTable, []);
     return loadTableData($xeTable, internalData.tableSynchData, true);
   },
   isRowGroupRecord(row) {
+    const $xeTable = this;
+    (0, _log.warnLog)('vxe.error.delFunc', ['isRowGroupRecord', 'isAggregateRecord']);
+    return $xeTable.isAggregateRecord(row);
+  },
+  isRowGroupExpandByRow(row) {
+    const $xeTable = this;
+    (0, _log.warnLog)('vxe.error.delFunc', ['isRowGroupExpandByRow', 'isAggregateExpandByRow']);
+    return $xeTable.isAggregateExpandByRow(row);
+  },
+  isAggregateRecord(row) {
     const $xeTable = this;
     const reactData = $xeTable;
     const {
@@ -10301,7 +10365,7 @@ const Methods = {
     } = reactData;
     return isRowGroupStatus && row.isAggregate;
   },
-  isRowGroupExpandByRow(row) {
+  isAggregateExpandByRow(row) {
     const $xeTable = this;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -10330,10 +10394,10 @@ const Methods = {
     const {
       tableFullGroupData
     } = internalData;
-    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
     const {
       mapChildrenField
-    } = rowGroupOpts;
+    } = aggregateOpts;
     const rgExpandedMaps = {};
     if (expanded && mapChildrenField) {
       _xeUtils.default.eachTree(tableFullGroupData, row => {
@@ -10482,14 +10546,14 @@ const Methods = {
     const {
       rowGroupExpandedMaps
     } = internalData;
-    const rowGroupOpts = $xeTable.computeRowGroupOpts;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
     const {
       row,
       column
     } = params;
     const {
       trigger
-    } = rowGroupOpts;
+    } = aggregateOpts;
     if (trigger === 'manual') {
       return;
     }
@@ -11605,11 +11669,11 @@ const Methods = {
     } = internalData;
     const rests = [];
     if (treeConfig || isRowGroupStatus) {
-      const rowGroupOpts = $xeTable.computeRowGroupOpts;
+      const aggregateOpts = $xeTable.computeAggregateOpts;
       const treeOpts = $xeTable.computeTreeOpts;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       const matchObj = _xeUtils.default.findTree(tableFullData, item => $xeTable.eqRow(item, row), {
-        children: isRowGroupStatus ? rowGroupOpts.mapChildrenField : childrenField
+        children: isRowGroupStatus ? aggregateOpts.mapChildrenField : childrenField
       });
       if (matchObj) {
         const nodes = matchObj.nodes;