vxe-table 3.15.32 → 3.15.34

package/es/table/src/cell.js

@@ -247,13 +247,17 @@ function getDefaultCellLabel(params) {
     return formatText($table.getCellLabel(row, column), 1);
 }
 function renderCellHandle(h, params) {
-    const { column, $table } = 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);
@@ -352,7 +356,7 @@ export const Cell = {
         const tableReactData = $table;
         const tableInternalData = $table;
         const { isRowGroupStatus } = tableReactData;
-        const { slots, editRender, cellRender, rowGroupNode } = column;
+        const { field, slots, editRender, cellRender, rowGroupNode } = column;
         const renderOpts = editRender || cellRender;
         if (slots && slots.default) {
             return renderCellBaseVNs(h, params, $table.callSlot(slots.default, params, h));
@@ -367,29 +371,37 @@ export const Cell = {
             }
         }
         let cellValue = '';
-        if (isRowGroupStatus && rowGroupNode && row.isAggregate) {
+        if (isRowGroupStatus && row.isAggregate) {
             const { fullColumnFieldData } = tableInternalData;
             const rowGroupOpts = $table.computeRowGroupOpts;
-            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)) {
@@ -531,10 +543,14 @@ export const Cell = {
      * 行分组、树结构
      */
     renderDeepNodeBtn(h, params, cellVNodes) {
-        const { row, column } = params;
+        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)];
     },

package/es/table/src/methods.js

@@ -96,7 +96,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;
@@ -1690,7 +1690,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);
@@ -2624,6 +2624,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) : XEUtils.get(row, groupField);
@@ -2640,8 +2641,10 @@ function handleGroupData($xeTable, list, rowGroups) {
             });
             XEUtils.objectEach(groupMaps, (childList, groupValue) => {
                 const { fullData: childFullData, treeData: childTreeData } = handleGroupData($xeTable, childList, rowGroups.slice(1));
+                const childCount = 0;
                 const groupRow = {
                     isAggregate: true,
+                    childCount,
                     groupContent: groupValue,
                     groupField,
                     [rowField]: getRowUniqueId(),
@@ -2656,12 +2659,25 @@ 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);
                 }
             });
+            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/src/table.js

@@ -732,12 +732,12 @@ export default {
         computeVirtualXOpts() {
             const $xeTable = this;
             const props = $xeTable;
-            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);
         },
         computeVirtualYOpts() {
             const $xeTable = this;
             const props = $xeTable;
-            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);
         },
         computeScrollbarOpts() {
             const $xeTable = this;

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);
 }