vxe-table 3.15.47 → 3.15.49

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

@@ -431,7 +431,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
     const tableReactData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
     const { customStore } = props;
-    const { resizable: allResizable } = tableProps;
+    const { treeConfig, rowGroupConfig, aggregateConfig, resizable: allResizable } = tableProps;
     const { isCustomStatus, customColumnList } = tableReactData;
     const customOpts = $xeTable.computeCustomOpts;
     const { immediate } = customOpts;
@@ -725,7 +725,14 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
                             }, $xeTable.callSlot(bottomSlot, params, h))
                             : renderEmptyElement($xeTable),
                         renderDragTip(h, _vm)
-                    ])
+                    ]),
+                    !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel
+                        ? h($xeTable.getPivotTableAggregatePopupPanel(), {
+                            props: {
+                                customStore
+                            }
+                        })
+                        : renderEmptyElement($xeTable)
                 ]);
         },
         footer: () => {

package/es/table/src/body.js

@@ -190,6 +190,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
         $xeTable.triggerCellDblclickEvent(evnt, cellParams);
     };
     let isMergeCell = false;
+    let mergeColspan = 1;
     let mergeRowspan = 1;
     // 合并行或列
     if (mergeBodyFlag && mergeBodyList.length) {
@@ -206,6 +207,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
             }
             if (colspan > 1) {
                 isMergeCell = true;
+                mergeColspan = colspan;
                 tdAttrs.colspan = colspan;
             }
         }
@@ -223,6 +225,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
         }
         if (colspan > 1) {
             isMergeCell = true;
+            mergeColspan = colspan;
             tdAttrs.colspan = colspan;
         }
     }
@@ -262,16 +265,16 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     }
     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

@@ -151,12 +151,26 @@ function renderHeaderCellBaseVNs(h, params, content) {
     ];
     return vns;
 }
+function getRenderDefaultColumnTitle(h, column, content) {
+    if (column.type === 'html' && XEUtils.isString(content)) {
+        return h('span', {
+            key: 'ch',
+            domProps: {
+                innerHTML: content
+            }
+        });
+    }
+    return h('span', {
+        key: 'ct'
+    }, getSlotVNs(content));
+}
 function renderTitleContent(h, params, content) {
     const { $table, column } = params;
-    const { type, showHeaderOverflow } = column;
+    const { showHeaderOverflow } = column;
     const tableProps = $table;
     const tableReactData = $table;
     const { showHeaderOverflow: allColumnHeaderOverflow } = tableProps;
+    const { isRowGroupStatus } = tableReactData;
     const tooltipOpts = $table.computeTooltipOpts;
     const showAllTip = tooltipOpts.showAll;
     const headOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
@@ -186,19 +200,13 @@ function renderTitleContent(h, params, content) {
             }
         };
     }
+    const titleVN = getRenderDefaultColumnTitle(h, column, content);
     return [
-        type === 'html' && XEUtils.isString(content)
-            ? h('span', {
-                class: 'vxe-cell--title',
-                domProps: {
-                    innerHTML: content
-                },
-                on: ons
-            })
-            : h('span', {
-                class: 'vxe-cell--title',
-                on: ons
-            }, getSlotVNs(content))
+        h('span', Object.assign({ class: 'vxe-cell--title' }, ons), isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles
+            ? $table.getPivotTableAggregateRenderColTitles(h, column, titleVN)
+            : [
+                titleVN
+            ])
     ];
 }
 function getFooterContent(h, params) {

package/es/table/src/methods.js

@@ -6844,7 +6844,8 @@ const Methods = {
                 const childList = vals[2];
                 let sLen = 0; // 已选
                 let hLen = 0; // 半选
-                let vLen = 0; // 有效行
+                let vLen = 0; // 有效子行
+                const cLen = childList.length; // 有效子行
                 childList.forEach(checkMethod
                     ? (item) => {
                         const childRowid = handleGetRowId(item);
@@ -6878,16 +6879,29 @@ const Methods = {
                         }
                         vLen++;
                     });
-                let isSelected = (sLen >= vLen && (vLen >= 1 || hLen >= 1));
-                if (checkMethod) {
-                    if (checkMethod({ $table: $xeTable, row })) {
-                        isSelected = sLen >= vLen;
+                let isSelected = false;
+                if (cLen > 0) {
+                    if (vLen > 0) {
+                        isSelected = (sLen > 0 || hLen > 0) && sLen >= vLen;
                     }
                     else {
-                        isSelected = selectCheckboxMaps[rowid];
+                        // 如果存在子项禁用
+                        if ((sLen > 0 && sLen >= vLen)) {
+                            isSelected = true;
+                        }
+                        else if (selectCheckboxMaps[rowid]) {
+                            isSelected = true;
+                        }
+                        else {
+                            isSelected = false;
+                        }
                     }
                 }
-                const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
+                else {
+                    // 如果无子项
+                    isSelected = selectCheckboxMaps[rowid];
+                }
+                const halfSelect = !isSelected && (sLen > 0 || hLen > 0);
                 if (checkField) {
                     XEUtils.set(row, checkField, isSelected);
                 }
@@ -6930,7 +6944,9 @@ const Methods = {
         const { checkField, checkMethod, showReserveStatus } = checkboxOpts;
         const { handleGetRowId } = createHandleGetRowId($xeTable);
         let sLen = 0; // 已选
+        let dsLen = 0; // 禁用的已选
         let hLen = 0; // 半选
+        let dhLen = 0; // 禁用的半选
         let vLen = 0; // 有效行
         const rootList = (treeConfig ? afterTreeFullData : (isRowGroupStatus ? afterGroupFullData : afterFullData));
         rootList.forEach(checkMethod
@@ -6948,10 +6964,10 @@ const Methods = {
                 }
                 else {
                     if (selected) {
-                        sLen++;
+                        dsLen++;
                     }
                     else if (treeIndeterminateRowMaps[childRowid]) {
-                        hLen++;
+                        dhLen++;
                     }
                 }
             }
@@ -6967,7 +6983,7 @@ const Methods = {
                 vLen++;
             });
         const isSelected = rootList.length > 0 ? (vLen > 0 ? (sLen >= vLen) : (sLen >= rootList.length)) : false;
-        let halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
+        let halfSelect = !isSelected && (sLen > 0 || hLen > 0 || dsLen > 0 || dhLen > 0);
         // 如果复选框启用保留记录，当保留数据存在时显示半选
         if (!isSelected && !halfSelect && showReserveStatus) {
             halfSelect = !XEUtils.isEmpty(checkboxReserveRowMap);
@@ -8888,12 +8904,24 @@ const Methods = {
         const props = $xeTable;
         const internalData = $xeTable;
         const { aggregateConfig, rowGroupConfig } = props;
+        const aggregateOpts = $xeTable.computeAggregateOpts;
+        const { maxGroupSize } = aggregateOpts;
         if (!(aggregateConfig || rowGroupConfig)) {
             errLog('vxe.error.reqProp', ['aggregate-config']);
             return $xeTable.$nextTick();
         }
-        if (fieldOrColumns) {
-            handleUpdateRowGroup($xeTable, (XEUtils.isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns]).map(fieldOrColumn => {
+        const confList = fieldOrColumns ? (XEUtils.isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns]) : [];
+        if (maxGroupSize && confList.length > maxGroupSize) {
+            if (VxeUI.modal) {
+                VxeUI.modal.message({
+                    status: 'error',
+                    content: getI18n('vxe.table.maxGroupCol', [maxGroupSize])
+                });
+            }
+            return $xeTable.$nextTick();
+        }
+        if (confList.length) {
+            handleUpdateRowGroup($xeTable, confList.map(fieldOrColumn => {
                 return XEUtils.isString(fieldOrColumn) ? fieldOrColumn : fieldOrColumn.field;
             }));
             return loadTableData($xeTable, internalData.tableSynchData, true);

package/es/table/src/table.js

@@ -1111,10 +1111,10 @@ export default {
             const $xeTable = this;
             const reactData = $xeTable;
             const internalData = $xeTable;
-            const { rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData;
+            const { tableData, rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData;
             const { visibleDataRowIdData, rowExpandedMaps } = internalData;
             const expandList = [];
-            if (expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
+            if (tableData.length && expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
                 XEUtils.each(rowExpandedMaps, (row, rowid) => {
                     if (visibleDataRowIdData[rowid]) {
                         expandList.push(row);

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 {