vxe-table 3.15.32 → 3.15.34

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.32";
+const version = "3.15.34";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2203,13 +2203,13 @@ core_.VxeUI.setConfig({
       isReplace: true
     },
     virtualXConfig: {
-      // enabled: false,
+      enabled: true,
       gt: 24,
       preSize: 0,
       oSize: 0
     },
     virtualYConfig: {
-      // enabled: false,
+      enabled: true,
       gt: 100,
       preSize: 1,
       oSize: 0
@@ -2646,7 +2646,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.32"}`;
+const log_version = `table v${"3.15.34"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3742,21 +3742,30 @@ function getDefaultCellLabel(params) {
 function renderCellHandle(h, params) {
   const {
     column,
+    row,
     $table
   } = params;
   const tableProps = $table;
+  const tableReactData = $table;
   const {
     editConfig
   } = tableProps;
+  const {
+    isRowGroupStatus
+  } = tableReactData;
   const {
     type,
     treeNode,
     rowGroupNode,
     editRender
   } = column;
+  const rowGroupOpts = $table.computeRowGroupOpts;
+  const {
+    mode
+  } = rowGroupOpts;
   const checkboxOpts = $table.computeCheckboxOpts;
   const editOpts = $table.computeEditOpts;
-  const isDeepCell = treeNode || rowGroupNode;
+  const isDeepCell = treeNode || isRowGroupStatus && row.isAggregate && (mode === 'column' ? column.field === row.groupField : rowGroupNode);
   switch (type) {
     case 'seq':
       return isDeepCell ? Cell.renderDeepIndexCell(h, params) : Cell.renderSeqCell(h, params);
@@ -3876,6 +3885,7 @@ const Cell = {
       isRowGroupStatus
     } = tableReactData;
     const {
+      field,
       slots,
       editRender,
       cellRender,
@@ -3897,36 +3907,46 @@ const Cell = {
       }
     }
     let cellValue = '';
-    if (isRowGroupStatus && rowGroupNode && row.isAggregate) {
+    if (isRowGroupStatus && row.isAggregate) {
       const {
         fullColumnFieldData
       } = tableInternalData;
       const rowGroupOpts = $table.computeRowGroupOpts;
       const {
+        mode,
         showTotal,
         totalMethod,
+        countFields,
+        countMethod,
         contentMethod,
         mapChildrenField
       } = rowGroupOpts;
       const groupField = row.groupField;
-      cellValue = row.groupContent;
+      const groupContent = row.groupContent;
       const childList = mapChildrenField ? row[mapChildrenField] || [] : [];
-      const totalValue = childList.length;
+      const totalValue = row.childCount;
       const colRest = fullColumnFieldData[groupField] || {};
       const params = {
         $table,
         groupField,
         groupColumn: colRest ? colRest.column : null,
         column,
-        groupValue: cellValue,
+        groupValue: groupContent,
         children: childList,
         totalValue: totalValue
       };
-      if (contentMethod) {
-        cellValue = `${contentMethod(params)}`;
-      }
-      if (showTotal) {
-        cellValue = cell_getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(params) : totalValue, totalValue]);
+      if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+        cellValue = groupContent;
+        if (contentMethod) {
+          cellValue = `${contentMethod(params)}`;
+        }
+        if (showTotal) {
+          cellValue = cell_getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(params) : totalValue, totalValue]);
+        }
+      } else if (countFields && countFields.includes(field)) {
+        if (countMethod) {
+          cellValue = `${countMethod(params)}`;
+        }
       }
     } else if (!(isRowGroupStatus && row.isAggregate)) {
       cellValue = $table.getCellLabel(row, column);
@@ -4079,14 +4099,21 @@ const Cell = {
    */
   renderDeepNodeBtn(h, params, cellVNodes) {
     const {
+      $table,
       row,
       column
     } = params;
     const {
       rowGroupNode
     } = column;
-    if (rowGroupNode && row.isAggregate) {
-      return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
+    if (row.isAggregate) {
+      const rowGroupOpts = $table.computeRowGroupOpts;
+      const {
+        mode
+      } = rowGroupOpts;
+      if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+        return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
+      }
     }
     return [Cell.renderTreeNodeBtn(h, params, cellVNodes)];
   },
@@ -5196,7 +5223,7 @@ function handleVirtualXVisible($xeTable) {
       }
     }
     let visibleSize = 0;
-    const toVisibleIndex = Math.max(0, leftIndex < visibleColumn.length ? leftIndex - 2 : 0);
+    const toVisibleIndex = leftIndex === visibleColumn.length ? leftIndex : Math.max(0, leftIndex < visibleColumn.length ? leftIndex - 2 : 0);
     for (let cIndex = toVisibleIndex, cLen = visibleColumn.length; cIndex < cLen; cIndex++) {
       const column = visibleColumn[cIndex];
       const colid = column.id;
@@ -7162,7 +7189,7 @@ function handleVirtualYVisible($xeTable) {
           rightIndex = rIndex;
         }
       }
-      toVisibleIndex = Math.max(0, leftIndex < afterFullData.length ? leftIndex - 2 : 0);
+      toVisibleIndex = leftIndex === afterFullData.length ? leftIndex : Math.max(0, leftIndex < afterFullData.length ? leftIndex - 2 : 0);
       for (let rIndex = toVisibleIndex, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
         const row = afterFullData[rIndex];
         const rowid = handleGetRowId(row);
@@ -8227,6 +8254,7 @@ function handleGroupData($xeTable, list, rowGroups) {
       const groupField = rgItem.field;
       const groupColumn = $xeTable.getColumnByField(groupField);
       const groupMaps = {};
+      const groupList = [];
       const rowkey = getRowkey($xeTable);
       list.forEach(row => {
         const cellValue = groupColumn ? $xeTable.getCellLabel(row, groupColumn) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, groupField);
@@ -8246,8 +8274,10 @@ function handleGroupData($xeTable, list, rowGroups) {
           fullData: childFullData,
           treeData: childTreeData
         } = handleGroupData($xeTable, childList, rowGroups.slice(1));
+        const childCount = 0;
         const groupRow = {
           isAggregate: true,
+          childCount,
           groupContent: groupValue,
           groupField,
           [rowField]: getRowUniqueId(),
@@ -8262,12 +8292,24 @@ function handleGroupData($xeTable, list, rowGroups) {
         if (indeterminateField) {
           groupRow[indeterminateField] = false;
         }
+        groupList.push(groupRow);
         treeData.push(groupRow);
         fullData.push(groupRow);
         if (childFullData.length) {
           fullData.push(...childFullData);
         }
       });
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().lastEach(groupList, groupItem => {
+        let count = 0;
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(groupItem[childrenField], row => {
+          if (row.isAggregate) {
+            count += row[childrenField] ? row[childrenField].length : 0;
+          } else {
+            count++;
+          }
+        });
+        groupItem.childCount = count;
+      });
     }
   }
   return {
@@ -27701,12 +27743,12 @@ function renderBody(h, $xeTable) {
     computeVirtualXOpts() {
       const $xeTable = this;
       const props = $xeTable;
-      return Object.assign({}, table_getConfig().table.scrollX, table_getConfig().table.virtualXConfig, props.scrollX, props.virtualXConfig);
+      return Object.assign({}, table_getConfig().table.virtualXConfig || table_getConfig().table.scrollX, props.virtualXConfig || props.scrollX);
     },
     computeVirtualYOpts() {
       const $xeTable = this;
       const props = $xeTable;
-      return Object.assign({}, table_getConfig().table.scrollY, table_getConfig().table.virtualYConfig, props.scrollY, props.virtualYConfig);
+      return Object.assign({}, table_getConfig().table.virtualYConfig || table_getConfig().table.scrollY, props.virtualYConfig || props.scrollY);
     },
     computeScrollbarOpts() {
       const $xeTable = this;