vxe-table 4.13.47 → 4.13.48

package/es/table/module/custom/panel.js

@@ -701,7 +701,7 @@ export default defineVxeComponent({
                 class: ['vxe-table-custom-wrapper', `placement--${placement}`, {
                         'is--active': customStore.visible
                     }],
-                style: maxHeight && !['left', 'right'].includes(placement)
+                style: maxHeight && !['left', 'right'].includes(placement || '')
                     ? {
                         maxHeight: `${maxHeight}px`
                     }
@@ -829,7 +829,7 @@ export default defineVxeComponent({
         const renderPopupPanel = () => {
             const $xeGrid = $xeTable.xeGrid;
             const { customStore } = props;
-            const { resizable: allResizable } = tableProps;
+            const { treeConfig, rowGroupConfig, aggregateConfig, resizable: allResizable } = tableProps;
             const { isCustomStatus, customColumnList } = tableReactData;
             const customOpts = computeCustomOpts.value;
             const { immediate } = customOpts;
@@ -1096,7 +1096,12 @@ export default defineVxeComponent({
                                     }, $xeTable.callSlot(bottomSlot, params))
                                     : renderEmptyElement($xeTable),
                                 renderDragTip()
-                            ])
+                            ]),
+                            !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel
+                                ? h($xeTable.getPivotTableAggregatePopupPanel(), {
+                                    customStore
+                                })
+                                : renderEmptyElement($xeTable)
                         ]);
                 },
                 footer: () => {

package/es/table/src/body.js

@@ -209,6 +209,7 @@ export default defineVxeComponent({
                 $xeTable.triggerCellDblclickEvent(evnt, cellParams);
             };
             let isMergeCell = false;
+            let mergeColspan = 1;
             let mergeRowspan = 1;
             // 合并行或列
             if (mergeBodyFlag && mergeBodyList.length) {
@@ -225,6 +226,7 @@ export default defineVxeComponent({
                     }
                     if (colspan > 1) {
                         isMergeCell = true;
+                        mergeColspan = colspan;
                         tdAttrs.colspan = colspan;
                     }
                 }
@@ -242,6 +244,7 @@ export default defineVxeComponent({
                 }
                 if (colspan > 1) {
                     isMergeCell = true;
+                    mergeColspan = colspan;
                     tdAttrs.colspan = colspan;
                 }
             }
@@ -281,16 +284,16 @@ export default defineVxeComponent({
             }
             const tcStyle = {};
             if (hasEllipsis && resizeWidthFlag) {
-                let tsColspan = tdAttrs.colspan || 0;
-                if (tsColspan > 1) {
-                    for (let index = 1; index < tsColspan; index++) {
+                let mergeColWidth = 0;
+                if (mergeColspan > 1) {
+                    for (let index = 1; index < mergeColspan; index++) {
                         const nextColumn = visibleColumn[columnIndex + index];
                         if (nextColumn) {
-                            tsColspan += nextColumn.renderWidth;
+                            mergeColWidth += nextColumn.renderWidth;
                         }
                     }
                 }
-                tcStyle.width = `${column.renderWidth - (cellOffsetWidth * tsColspan)}px`;
+                tcStyle.width = `${column.renderWidth + mergeColWidth - cellOffsetWidth}px`;
             }
             if (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
                 tcStyle.height = `${cellHeight}px`;

package/es/table/src/cell.js

@@ -146,13 +146,25 @@ function renderHeaderCellBaseVNs(params, content) {
     ];
     return vns;
 }
+function getRenderDefaultColumnTitle(column, content) {
+    if (column.type === 'html' && XEUtils.isString(content)) {
+        return h('span', {
+            key: 'ch',
+            innerHTML: content
+        });
+    }
+    return h('span', {
+        key: 'ct'
+    }, getSlotVNs(content));
+}
 function renderTitleContent(params, content) {
     const { $table, column } = params;
     const tableProps = $table.props;
     const tableReactData = $table.reactData;
     const { computeTooltipOpts } = $table.getComputeMaps();
     const { showHeaderOverflow: allColumnHeaderOverflow } = tableProps;
-    const { type, showHeaderOverflow } = column;
+    const { isRowGroupStatus } = tableReactData;
+    const { showHeaderOverflow } = column;
     const tooltipOpts = computeTooltipOpts.value;
     const showAllTip = tooltipOpts.showAll;
     const headOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
@@ -182,10 +194,13 @@ function renderTitleContent(params, content) {
             }
         };
     }
+    const titleVN = getRenderDefaultColumnTitle(column, content);
     return [
-        type === 'html' && XEUtils.isString(content)
-            ? h('span', Object.assign({ class: 'vxe-cell--title', innerHTML: content }, ons))
-            : h('span', Object.assign({ class: 'vxe-cell--title' }, ons), getSlotVNs(content))
+        h('span', Object.assign({ class: 'vxe-cell--title' }, ons), isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles
+            ? $table.getPivotTableAggregateRenderColTitles(column, titleVN)
+            : [
+                titleVN
+            ])
     ];
 }
 function getFooterContent(params) {

package/es/table/src/table.js

@@ -6093,7 +6093,6 @@ export default defineVxeComponent({
             },
             setRowGroups(fieldOrColumns) {
                 const { aggregateConfig, rowGroupConfig } = props;
-                const { rowGroupList } = reactData;
                 const aggregateOpts = computeAggregateOpts.value;
                 const { maxGroupSize } = aggregateOpts;
                 if (!(aggregateConfig || rowGroupConfig)) {
@@ -6101,7 +6100,7 @@ export default defineVxeComponent({
                     return nextTick();
                 }
                 const confList = fieldOrColumns ? (XEUtils.isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns]) : [];
-                if (maxGroupSize && (rowGroupList.length + confList.length > maxGroupSize)) {
+                if (maxGroupSize && confList.length > maxGroupSize) {
                     if (VxeUI.modal) {
                         VxeUI.modal.message({
                             status: 'error',

package/es/table/style.css

@@ -999,13 +999,17 @@
 
 .vxe-table-custom-popup--body-wrapper {
   position: relative;
-  overflow: auto;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
   height: 100%;
   outline: 0;
 }
 
 .vxe-table-custom-popup--handle-wrapper {
+  flex-grow: 1;
   outline: 0;
+  overflow: auto;
 }
 
 .vxe-table-custom-popup--table-wrapper {