vxe-table 4.13.32 → 4.13.34

package/es/table/src/cell.js

@@ -251,14 +251,18 @@ function getDefaultCellLabel(params) {
     return formatText($table.getCellLabel(row, column), 1);
 }
 function renderCellHandle(params) {
-    const { column, $table } = params;
+    const { column, row, $table } = params;
     const tableProps = $table.props;
+    const tableReactData = $table.reactData;
+    const { isRowGroupStatus } = tableReactData;
     const { editConfig } = tableProps;
     const { type, treeNode, rowGroupNode, editRender } = column;
-    const { computeEditOpts, computeCheckboxOpts } = $table.getComputeMaps();
+    const { computeEditOpts, computeCheckboxOpts, computeRowGroupOpts } = $table.getComputeMaps();
+    const rowGroupOpts = computeRowGroupOpts.value;
+    const { mode } = rowGroupOpts;
     const checkboxOpts = computeCheckboxOpts.value;
     const editOpts = computeEditOpts.value;
-    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(params) : Cell.renderSeqCell(params);
@@ -360,7 +364,7 @@ export const Cell = {
         const tableReactData = $table.reactData;
         const tableInternalData = $table.internalData;
         const { isRowGroupStatus } = tableReactData;
-        const { slots, editRender, cellRender, rowGroupNode } = column;
+        const { field, slots, editRender, cellRender, rowGroupNode } = column;
         const renderOpts = editRender || cellRender;
         const defaultSlot = slots ? slots.default : null;
         if (defaultSlot) {
@@ -378,30 +382,38 @@ export const Cell = {
             }
         }
         let cellValue = '';
-        if (isRowGroupStatus && rowGroupNode && row.isAggregate) {
+        if (isRowGroupStatus && row.isAggregate) {
             const { fullColumnFieldData } = tableInternalData;
             const { computeRowGroupOpts } = $table.getComputeMaps();
             const rowGroupOpts = computeRowGroupOpts.value;
-            const { showTotal, totalMethod, contentMethod, mapChildrenField } = rowGroupOpts;
+            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 (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+                cellValue = groupContent;
+                if (contentMethod) {
+                    cellValue = `${contentMethod(params)}`;
+                }
+                if (showTotal) {
+                    cellValue = getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(params) : totalValue, totalValue]);
+                }
             }
-            if (showTotal) {
-                cellValue = 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)) {
@@ -538,10 +550,15 @@ export const Cell = {
      * 行分组、树结构
      */
     renderDeepNodeBtn(params, cellVNodes) {
-        const { row, column } = params;
+        const { $table, row, column } = params;
         const { rowGroupNode } = column;
-        if (rowGroupNode && row.isAggregate) {
-            return [Cell.renderRowGroupBtn(params, cellVNodes)];
+        if (row.isAggregate) {
+            const { computeRowGroupOpts } = $table.getComputeMaps();
+            const rowGroupOpts = computeRowGroupOpts.value;
+            const { mode } = rowGroupOpts;
+            if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+                return [Cell.renderRowGroupBtn(params, cellVNodes)];
+            }
         }
         return [Cell.renderTreeNodeBtn(params, cellVNodes)];
     },

package/es/table/src/table.js

@@ -468,10 +468,10 @@ export default defineComponent({
             return virtualYOpts;
         });
         const computeVirtualXOpts = computed(() => {
-            return Object.assign({}, getConfig().table.scrollX, getConfig().table.virtualXConfig, props.scrollX, props.virtualXConfig);
+            return Object.assign({}, getConfig().table.virtualXConfig || getConfig().table.scrollX, props.virtualXConfig || props.scrollX);
         });
         const computeVirtualYOpts = computed(() => {
-            return Object.assign({}, getConfig().table.scrollY, getConfig().table.virtualYConfig, props.scrollY, props.virtualYConfig);
+            return Object.assign({}, getConfig().table.virtualYConfig || getConfig().table.scrollY, props.virtualYConfig || props.scrollY);
         });
         const computeScrollbarOpts = computed(() => {
             return Object.assign({}, getConfig().table.scrollbarConfig, props.scrollbarConfig);
@@ -949,7 +949,7 @@ export default defineComponent({
                     }
                 }
                 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;
@@ -1036,7 +1036,7 @@ export default defineComponent({
                             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);
@@ -3012,6 +3012,7 @@ export default defineComponent({
                     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) : XEUtils.get(row, groupField);
@@ -3028,8 +3029,10 @@ export default defineComponent({
                     });
                     XEUtils.objectEach(groupMaps, (childList, groupValue) => {
                         const { fullData: childFullData, treeData: childTreeData } = handleGroupData(childList, rowGroups.slice(1));
+                        const childCount = 0;
                         const groupRow = {
                             isAggregate: true,
+                            childCount,
                             groupContent: groupValue,
                             groupField,
                             [rowField]: getRowUniqueId(),
@@ -3044,12 +3047,25 @@ export default defineComponent({
                         if (indeterminateField) {
                             groupRow[indeterminateField] = false;
                         }
+                        groupList.push(groupRow);
                         treeData.push(groupRow);
                         fullData.push(groupRow);
                         if (childFullData.length) {
                             fullData.push(...childFullData);
                         }
                     });
+                    XEUtils.lastEach(groupList, groupItem => {
+                        let count = 0;
+                        XEUtils.each(groupItem[childrenField], row => {
+                            if (row.isAggregate) {
+                                count += row[childrenField] ? row[childrenField].length : 0;
+                            }
+                            else {
+                                count++;
+                            }
+                        });
+                        groupItem.childCount = count;
+                    });
                 }
             }
             return {

package/es/table/style.css

@@ -2500,9 +2500,6 @@
   color: var(--vxe-ui-input-disabled-color);
   cursor: not-allowed;
 }
-.vxe-table--render-default.column--highlight .vxe-header--column:not(.col--seq):hover {
-  background-color: var(--vxe-ui-table-column-hover-background-color);
-}
 .vxe-table--render-default.header-cell--area .vxe-table--header-wrapper {
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -2567,6 +2564,12 @@
 .vxe-table--render-default .vxe-body--row.row--stripe > .vxe-body--column {
   background-color: var(--vxe-ui-table-row-striped-background-color);
 }
+.vxe-table--render-default.column--highlight .vxe-header--column:hover {
+  background-color: var(--vxe-ui-table-column-hover-background-color);
+}
+.vxe-table--render-default.column--highlight .vxe-header--column:hover.col--current {
+  background-color: var(--vxe-ui-table-column-hover-current-background-color);
+}
 .vxe-table--render-default .vxe-header--column,
 .vxe-table--render-default .vxe-body--column,
 .vxe-table--render-default .vxe-footer--column {
@@ -2591,6 +2594,9 @@
 .vxe-table--render-default .vxe-body--row.row--hover > .vxe-body--column {
   background-color: var(--vxe-ui-table-row-hover-background-color);
 }
+.vxe-table--render-default .vxe-body--row.row--hover > .vxe-body--column.col--current {
+  background-color: var(--vxe-ui-table-column-current-background-color);
+}
 .vxe-table--render-default .vxe-body--row.row--hover.row--stripe > .vxe-body--column {
   background-color: var(--vxe-ui-table-row-hover-striped-background-color);
 }