vxe-table 3.15.47 → 3.15.48

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.47";
+const version = "3.15.48";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2146,7 +2146,8 @@ core_.VxeUI.setConfig({
       mapChildrenField: '_X_ROW_CHILD_LIST',
       indent: 20,
       showIcon: true,
-      maxGroupSize: 4
+      maxGroupSize: 4,
+      showAggFuncTitle: true
     },
     treeConfig: {
       padding: true,
@@ -2665,7 +2666,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.47"}`;
+const log_version = `table v${"3.15.48"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3654,13 +3655,25 @@ function renderHeaderCellBaseVNs(h, params, content) {
   const vns = [renderTitlePrefixIcon(h, params), renderHeaderCellDragIcon(h, params), ...(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(content) ? content : [content]), renderTitleSuffixIcon(h, params)];
   return vns;
 }
+function getRenderDefaultColumnTitle(h, column, content) {
+  if (column.type === 'html' && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 tableProps = $table;
@@ -3668,6 +3681,9 @@ function renderTitleContent(h, params, content) {
   const {
     showHeaderOverflow: allColumnHeaderOverflow
   } = tableProps;
+  const {
+    isRowGroupStatus
+  } = tableReactData;
   const tooltipOpts = $table.computeTooltipOpts;
   const showAllTip = tooltipOpts.showAll;
   const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showHeaderOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
@@ -3696,16 +3712,11 @@ function renderTitleContent(h, params, content) {
       }
     };
   }
-  return [type === 'html' && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(content) ? h('span', {
-    class: 'vxe-cell--title',
-    domProps: {
-      innerHTML: content
-    },
-    on: ons
-  }) : h('span', {
+  const titleVN = getRenderDefaultColumnTitle(h, column, content);
+  return [h('span', {
     class: 'vxe-cell--title',
-    on: ons
-  }, getSlotVNs(content))];
+    ...ons
+  }, isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles ? $table.getPivotTableAggregateRenderColTitles(h, column, titleVN) : [titleVN])];
 }
 function getFooterContent(h, params) {
   const {
@@ -15562,12 +15573,26 @@ const Methods = {
       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, (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns]).map(fieldOrColumn => {
+    const confList = fieldOrColumns ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns] : [];
+    if (maxGroupSize && confList.length > maxGroupSize) {
+      if (core_.VxeUI.modal) {
+        core_.VxeUI.modal.message({
+          status: 'error',
+          content: methods_getI18n('vxe.table.maxGroupCol', [maxGroupSize])
+        });
+      }
+      return $xeTable.$nextTick();
+    }
+    if (confList.length) {
+      handleUpdateRowGroup($xeTable, confList.map(fieldOrColumn => {
         return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? fieldOrColumn : fieldOrColumn.field;
       }));
       return loadTableData($xeTable, internalData.tableSynchData, true);
@@ -17546,6 +17571,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) {
@@ -17565,6 +17591,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
       }
       if (colspan > 1) {
         isMergeCell = true;
+        mergeColspan = colspan;
         tdAttrs.colspan = colspan;
       }
     }
@@ -17584,6 +17611,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     }
     if (colspan > 1) {
       isMergeCell = true;
+      mergeColspan = colspan;
       tdAttrs.colspan = colspan;
     }
   }
@@ -17622,16 +17650,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`;
@@ -19878,6 +19906,9 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
     customStore
   } = props;
   const {
+    treeConfig,
+    rowGroupConfig,
+    aggregateConfig,
     resizable: allResizable
   } = tableProps;
   const {
@@ -20124,7 +20155,11 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
         }
       }, trVNs)])]), bottomSlot ? h('div', {
         class: 'vxe-table-custom-popup--table-bottom'
-      }, $xeTable.callSlot(bottomSlot, params, h)) : panel_renderEmptyElement($xeTable), renderDragTip(h, _vm)])]);
+      }, $xeTable.callSlot(bottomSlot, params, h)) : panel_renderEmptyElement($xeTable), renderDragTip(h, _vm)]), !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? h($xeTable.getPivotTableAggregatePopupPanel(), {
+        props: {
+          customStore
+        }
+      }) : panel_renderEmptyElement($xeTable)]);
     },
     footer: () => {
       if (footerSlot) {
@@ -33785,7 +33820,7 @@ const Toolbar = VxeToolbar;
       cstmDragTarget: '移动：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '点击并拖动图标可以调整列的排序',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: '列标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
@@ -34212,7 +34247,8 @@ const Toolbar = VxeToolbar;
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',