vxe-table 4.17.31 → 4.17.33

package/es/table/src/cell.js

@@ -360,6 +360,7 @@ export const Cell = {
         const renderOpts = editConfig && isEnableConf(editRender) ? editRender : (isEnableConf(cellRender) ? cellRender : null);
         const defaultSlot = slots ? slots.default : null;
         const gcSlot = slots ? (slots.groupContent || slots['group-content']) : null;
+        const gvSlot = slots ? (slots.groupValues || slots['group-values']) : null;
         let cellValue = '';
         if (isRowGroupStatus && field && row.isAggregate) {
             const aggRow = row;
@@ -394,9 +395,6 @@ export const Cell = {
                  */
                 totalValue: childCount
             };
-            if (gcSlot) {
-                return renderCellBaseVNs(params, $table.callSlot(gcSlot, Object.assign({ groupField, groupContent, childList, childCount }, params)));
-            }
             if (mode === 'column' ? field === aggRow.groupField : rowGroupNode) {
                 cellValue = groupContent;
                 if (contentMethod) {
@@ -405,9 +403,16 @@ export const Cell = {
                 if (showTotal) {
                     cellValue = getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(ctParams) : childCount, childCount]);
                 }
+                if (gcSlot) {
+                    return renderCellBaseVNs(params, $table.callSlot(gcSlot, Object.assign({ groupField, groupContent, childList, childCount }, params)));
+                }
             }
             else if ($table.getPivotTableAggregateCellAggValue) {
                 cellValue = $table.getPivotTableAggregateCellAggValue(params);
+                ctParams.aggValue = cellValue;
+                if (gvSlot) {
+                    return renderCellBaseVNs(params, $table.callSlot(gvSlot, Object.assign({ groupField, groupContent, childList, childCount }, params, ctParams)));
+                }
             }
             else if (aggFunc === true || (countFields && countFields.includes(field))) {
                 cellValue = currAggData ? currAggData.value : childCount;
@@ -415,6 +420,9 @@ export const Cell = {
                 if (formatValuesMethod) {
                     cellValue = formatValuesMethod(ctParams);
                 }
+                if (gvSlot) {
+                    return renderCellBaseVNs(params, $table.callSlot(gvSlot, Object.assign({ groupField, groupContent, childList, childCount }, params, ctParams)));
+                }
             }
         }
         else {

package/es/table/src/header.js

@@ -323,7 +323,7 @@ export default defineVxeComponent({
                 ]);
             });
         };
-        const renderHeads = (isGroup, isOptimizeMode, headerGroups) => {
+        const renderHeads = (isGroup, isOptimizeMode, headerGroups, renderColumnList) => {
             const { fixedType } = props;
             const { headerRowClassName, headerRowStyle } = tableProps;
             const floatingFilterOpts = computeFloatingFilterOpts.value;
@@ -344,7 +344,7 @@ export default defineVxeComponent({
                     class: [
                         'vxe-header--row'
                     ]
-                }, renderFilterRows(isOptimizeMode, headerGroups[headerGroups.length - 1])));
+                }, renderFilterRows(isOptimizeMode, renderColumnList)));
             }
             return rowVNs;
         };
@@ -446,7 +446,7 @@ export default defineVxeComponent({
                          */
                         h('thead', {
                             ref: refHeaderTHead
-                        }, renderHeads(isGroup, isOptimizeMode, renderHeaderList))
+                        }, renderHeads(isGroup, isOptimizeMode, renderHeaderList, renderColumnList))
                     ]),
                     mouseConfig && mouseOpts.area
                         ? h('div', {

package/es/table/src/table.js

@@ -3614,7 +3614,6 @@ export default defineVxeComponent({
         };
         const initData = () => {
             const { data } = props;
-            dispatchEvent('ready', {}, null);
             loadTableData(data || [], true, true).then(() => {
                 if (data && data.length) {
                     internalData.inited = true;
@@ -3628,6 +3627,9 @@ export default defineVxeComponent({
                     updateRowOffsetTop();
                 }
             });
+            nextTick(() => {
+                dispatchEvent('ready', {}, null);
+            });
         };
         /**
          * 加载表格数据
@@ -3774,19 +3776,6 @@ export default defineVxeComponent({
                 }
                 handleReserveStatus();
                 $xeTable.checkSelectionStatus();
-                if (initStatus) {
-                    dispatchEvent('data-rendered', {
-                        isReload,
-                        visibleColumn: internalData.visibleColumn,
-                        visibleData: internalData.afterFullData
-                    }, null);
-                }
-                else {
-                    dispatchEvent('init-rendered', {
-                        visibleColumn: internalData.visibleColumn,
-                        visibleData: internalData.afterFullData
-                    }, null);
-                }
                 $xeTable.dispatchEvent('data-change', {
                     visibleColumn: internalData.visibleColumn,
                     visibleData: internalData.afterFullData
@@ -3842,6 +3831,20 @@ export default defineVxeComponent({
                             });
                         }
                     });
+                }).then(() => {
+                    if (initStatus) {
+                        dispatchEvent('data-rendered', {
+                            isReload,
+                            visibleColumn: internalData.visibleColumn,
+                            visibleData: internalData.afterFullData
+                        }, null);
+                    }
+                    else {
+                        dispatchEvent('init-rendered', {
+                            visibleColumn: internalData.visibleColumn,
+                            visibleData: internalData.afterFullData
+                        }, null);
+                    }
                 });
             });
         };

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.17.31";
+export const version = "4.17.33";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.17.31"}`;
+const version = `table v${"4.17.33"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3141,7 +3141,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.17.31";
+const version = "4.17.33";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3656,7 +3656,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.17.31"}`;
+const log_version = `table v${"4.17.33"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -5410,6 +5410,7 @@ const Cell = {
     const renderOpts = editConfig && isEnableConf(editRender) ? editRender : isEnableConf(cellRender) ? cellRender : null;
     const defaultSlot = slots ? slots.default : null;
     const gcSlot = slots ? slots.groupContent || slots['group-content'] : null;
+    const gvSlot = slots ? slots.groupValues || slots['group-values'] : null;
     let cellValue = '';
     if (isRowGroupStatus && field && row.isAggregate) {
       const aggRow = row;
@@ -5456,14 +5457,6 @@ const Cell = {
          */
         totalValue: childCount
       };
-      if (gcSlot) {
-        return renderCellBaseVNs(params, $table.callSlot(gcSlot, Object.assign({
-          groupField,
-          groupContent,
-          childList,
-          childCount
-        }, params)));
-      }
       if (mode === 'column' ? field === aggRow.groupField : rowGroupNode) {
         cellValue = groupContent;
         if (contentMethod) {
@@ -5472,14 +5465,39 @@ const Cell = {
         if (showTotal) {
           cellValue = cell_getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(ctParams) : childCount, childCount]);
         }
+        if (gcSlot) {
+          return renderCellBaseVNs(params, $table.callSlot(gcSlot, Object.assign({
+            groupField,
+            groupContent,
+            childList,
+            childCount
+          }, params)));
+        }
       } else if ($table.getPivotTableAggregateCellAggValue) {
         cellValue = $table.getPivotTableAggregateCellAggValue(params);
+        ctParams.aggValue = cellValue;
+        if (gvSlot) {
+          return renderCellBaseVNs(params, $table.callSlot(gvSlot, Object.assign({
+            groupField,
+            groupContent,
+            childList,
+            childCount
+          }, params, ctParams)));
+        }
       } else if (aggFunc === true || countFields && countFields.includes(field)) {
         cellValue = currAggData ? currAggData.value : childCount;
         ctParams.aggValue = cellValue;
         if (formatValuesMethod) {
           cellValue = formatValuesMethod(ctParams);
         }
+        if (gvSlot) {
+          return renderCellBaseVNs(params, $table.callSlot(gvSlot, Object.assign({
+            groupField,
+            groupContent,
+            childList,
+            childCount
+          }, params, ctParams)));
+        }
       }
     } else {
       if (defaultSlot) {
@@ -8554,7 +8572,7 @@ const header_renderType = 'header';
         }, flSlot ? $xeTable.callSlot(flSlot, cellParams) : rtFloatingFilter && firstFilterOption ? getSlotVNs(rtFloatingFilter(filterRender, cellParams)) : [])])]);
       });
     };
-    const renderHeads = (isGroup, isOptimizeMode, headerGroups) => {
+    const renderHeads = (isGroup, isOptimizeMode, headerGroups, renderColumnList) => {
       const {
         fixedType
       } = props;
@@ -8580,7 +8598,7 @@ const header_renderType = 'header';
         rowVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tr', {
           key: 'ff',
           class: ['vxe-header--row']
-        }, renderFilterRows(isOptimizeMode, headerGroups[headerGroups.length - 1])));
+        }, renderFilterRows(isOptimizeMode, renderColumnList)));
       }
       return rowVNs;
     };
@@ -8690,7 +8708,7 @@ const header_renderType = 'header';
        */
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('thead', {
         ref: refHeaderTHead
-      }, renderHeads(isGroup, isOptimizeMode, renderHeaderList))]), mouseConfig && mouseOpts.area ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, renderHeads(isGroup, isOptimizeMode, renderHeaderList, renderColumnList))]), mouseConfig && mouseOpts.area ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table--cell-area',
         xid: xID
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
@@ -19187,7 +19205,7 @@ if(reWidth){calcCellWidth();}if(reFull){autoCellWidth();}if(reHeight){calcCellHe
                                    * 已废弃
                                    * @deprecated
                                    */totalValue:childCount};let aggVal=0;// 如果下层同时也是分组
-if(childList.length&&childList[0].isAggregate){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(childList,row=>{if(row.isAggregate){const currAggData=row.aggData[field];if(currAggData){aggVal+=currAggData.value;}}});}else{aggVal=aggCalcMethod?aggCalcMethod(ctParams):aggRow.childCount;}aggDtObj[field]={type:'count',value:aggVal,label:aggVal};});aggRow.aggData=aggDtObj;});}}}};const updateGroupData=()=>{const{aggregateConfig,rowGroupConfig}=props;const{isRowGroupStatus}=reactData;const{tableFullGroupData}=internalData;const aggregateOpts=computeAggregateOpts.value;const{mapChildrenField}=aggregateOpts;if((aggregateConfig||rowGroupConfig)&&isRowGroupStatus){const aggList=[];external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullGroupData,row=>{if(row.isAggregate){aggList.push(row);}},{children:mapChildrenField});handleeGroupSummary(aggList);}};const handleGroupData=(list,rowGroups)=>{let fullData=list;let treeData=list;if(rowGroups){const aggregateOpts=computeAggregateOpts.value;const{rowField,parentField,childrenField,mapChildrenField}=aggregateOpts;const checkboxOpts=computeCheckboxOpts.value;const{checkField}=checkboxOpts;const indeterminateField=checkboxOpts.indeterminateField||checkboxOpts.halfField;const rgItem=rowGroups[0];if(rgItem&&rowField&&parentField&&childrenField&&mapChildrenField){fullData=[];treeData=[];const groupField=rgItem.field;const groupColumn=$xeTable.getColumnByField(groupField);const groupMaps={};const aggList=[];const rowkey=getRowkey($xeTable);list.forEach(row=>{const cellValue=groupColumn?$xeTable.getCellLabel(row,groupColumn):external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,groupField);const groupValue=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cellValue)?'':cellValue;let childList=groupMaps[groupValue];if(!childList){childList=[];groupMaps[groupValue]=childList;}if(row.isAggregate){row.isAggregate=undefined;}childList.push(row);});external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(groupMaps,(childList,groupValue)=>{const{fullData:childFullData,treeData:childTreeData}=handleGroupData(childList,rowGroups.slice(1));const aggRow={isAggregate:true,aggData:{},groupContent:groupValue,groupField,childCount:0,[rowField]:getRowUniqueId(),[parentField]:null,[rowkey]:getRowUniqueId(),[childrenField]:childTreeData,[mapChildrenField]:childTreeData};if(checkField){aggRow[checkField]=false;}if(indeterminateField){aggRow[indeterminateField]=false;}aggList.push(aggRow);treeData.push(aggRow);fullData.push(aggRow);if(childFullData.length){fullData.push(...childFullData);}});handleeGroupSummary(aggList);}}return{treeData,fullData};};const initData=()=>{const{data}=props;dispatchEvent('ready',{},null);loadTableData(data||[],true,true).then(()=>{if(data&&data.length){internalData.inited=true;internalData.initStatus=true;handleLoadDefaults();}handleInitDefaults();updateStyle();if(!reactData.isAllOverflow){calcCellHeight();updateRowOffsetTop();}});};/**
+if(childList.length&&childList[0].isAggregate){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(childList,row=>{if(row.isAggregate){const currAggData=row.aggData[field];if(currAggData){aggVal+=currAggData.value;}}});}else{aggVal=aggCalcMethod?aggCalcMethod(ctParams):aggRow.childCount;}aggDtObj[field]={type:'count',value:aggVal,label:aggVal};});aggRow.aggData=aggDtObj;});}}}};const updateGroupData=()=>{const{aggregateConfig,rowGroupConfig}=props;const{isRowGroupStatus}=reactData;const{tableFullGroupData}=internalData;const aggregateOpts=computeAggregateOpts.value;const{mapChildrenField}=aggregateOpts;if((aggregateConfig||rowGroupConfig)&&isRowGroupStatus){const aggList=[];external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullGroupData,row=>{if(row.isAggregate){aggList.push(row);}},{children:mapChildrenField});handleeGroupSummary(aggList);}};const handleGroupData=(list,rowGroups)=>{let fullData=list;let treeData=list;if(rowGroups){const aggregateOpts=computeAggregateOpts.value;const{rowField,parentField,childrenField,mapChildrenField}=aggregateOpts;const checkboxOpts=computeCheckboxOpts.value;const{checkField}=checkboxOpts;const indeterminateField=checkboxOpts.indeterminateField||checkboxOpts.halfField;const rgItem=rowGroups[0];if(rgItem&&rowField&&parentField&&childrenField&&mapChildrenField){fullData=[];treeData=[];const groupField=rgItem.field;const groupColumn=$xeTable.getColumnByField(groupField);const groupMaps={};const aggList=[];const rowkey=getRowkey($xeTable);list.forEach(row=>{const cellValue=groupColumn?$xeTable.getCellLabel(row,groupColumn):external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,groupField);const groupValue=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cellValue)?'':cellValue;let childList=groupMaps[groupValue];if(!childList){childList=[];groupMaps[groupValue]=childList;}if(row.isAggregate){row.isAggregate=undefined;}childList.push(row);});external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(groupMaps,(childList,groupValue)=>{const{fullData:childFullData,treeData:childTreeData}=handleGroupData(childList,rowGroups.slice(1));const aggRow={isAggregate:true,aggData:{},groupContent:groupValue,groupField,childCount:0,[rowField]:getRowUniqueId(),[parentField]:null,[rowkey]:getRowUniqueId(),[childrenField]:childTreeData,[mapChildrenField]:childTreeData};if(checkField){aggRow[checkField]=false;}if(indeterminateField){aggRow[indeterminateField]=false;}aggList.push(aggRow);treeData.push(aggRow);fullData.push(aggRow);if(childFullData.length){fullData.push(...childFullData);}});handleeGroupSummary(aggList);}}return{treeData,fullData};};const initData=()=>{const{data}=props;loadTableData(data||[],true,true).then(()=>{if(data&&data.length){internalData.inited=true;internalData.initStatus=true;handleLoadDefaults();}handleInitDefaults();updateStyle();if(!reactData.isAllOverflow){calcCellHeight();updateRowOffsetTop();}});(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>{dispatchEvent('ready',{},null);});};/**
          * 加载表格数据
          * @param {Array} datas 数据
          */const loadTableData=(datas,isReload,isReset)=>{const{keepSource,treeConfig,rowGroupConfig,aggregateConfig}=props;const{rowGroupList,scrollYLoad:oldScrollYLoad}=reactData;const{initStatus,scrollYStore,scrollXStore,lastScrollLeft,lastScrollTop}=internalData;const rowOpts=computeRowOpts.value;const treeOpts=computeTreeOpts.value;const expandOpts=computeExpandOpts.value;const{transform}=treeOpts;const childrenField=treeOpts.children||treeOpts.childrenField;let treeData=[];let fullData=(0,external_commonjs_vue_commonjs2_vue_root_Vue_.reactive)(datas?datas.slice(0):[]);// 转为响应式数据
@@ -19216,10 +19234,10 @@ if(!(props.height||props.maxHeight)){errLog('vxe.error.reqProp',['height | max-h
 // if (props.spanMethod) {
 //   warnLog('vxe.error.scrollErrProp', ['span-method'])
 // }
-}handleReserveStatus();$xeTable.checkSelectionStatus();if(initStatus){dispatchEvent('data-rendered',{isReload,visibleColumn:internalData.visibleColumn,visibleData:internalData.afterFullData},null);}else{dispatchEvent('init-rendered',{visibleColumn:internalData.visibleColumn,visibleData:internalData.afterFullData},null);}$xeTable.dispatchEvent('data-change',{visibleColumn:internalData.visibleColumn,visibleData:internalData.afterFullData},null);return new Promise(resolve=>{(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(()=>handleRecalculateStyle(false,false,false)).then(()=>{handleRecalculateStyle(false,true,true);updateRowOffsetTop();}).then(()=>{let targetScrollLeft=lastScrollLeft;let targetScrollTop=lastScrollTop;const virtualXOpts=computeVirtualXOpts.value;const virtualYOpts=computeVirtualYOpts.value;// 是否在更新数据之后自动滚动重置滚动条
+}handleReserveStatus();$xeTable.checkSelectionStatus();$xeTable.dispatchEvent('data-change',{visibleColumn:internalData.visibleColumn,visibleData:internalData.afterFullData},null);return new Promise(resolve=>{(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(()=>handleRecalculateStyle(false,false,false)).then(()=>{handleRecalculateStyle(false,true,true);updateRowOffsetTop();}).then(()=>{let targetScrollLeft=lastScrollLeft;let targetScrollTop=lastScrollTop;const virtualXOpts=computeVirtualXOpts.value;const virtualYOpts=computeVirtualYOpts.value;// 是否在更新数据之后自动滚动重置滚动条
 if(virtualXOpts.scrollToLeftOnChange){targetScrollLeft=0;}if(virtualYOpts.scrollToTopOnChange){targetScrollTop=0;}reactData.isRowLoading=false;handleRecalculateStyle(false,false,false);updateTreeLineStyle();// 如果是自动行高，特殊情况需调用 recalculate 手动刷新
 if(!props.showOverflow){setTimeout(()=>{handleLazyRecalculate(false,true,true);setTimeout(()=>handleLazyRecalculate(false,true,true),3000);},2000);}// 是否变更虚拟滚动
-if(oldScrollYLoad===sYLoad){restoreScrollLocation($xeTable,targetScrollLeft,targetScrollTop).then(()=>{handleRecalculateStyle(false,true,true);updateRowOffsetTop();updateTreeLineStyle();(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>resolve());});}else{setTimeout(()=>{restoreScrollLocation($xeTable,targetScrollLeft,targetScrollTop).then(()=>{handleRecalculateStyle(false,true,true);updateRowOffsetTop();updateTreeLineStyle();(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>resolve());});});}});});});};/**
+if(oldScrollYLoad===sYLoad){restoreScrollLocation($xeTable,targetScrollLeft,targetScrollTop).then(()=>{handleRecalculateStyle(false,true,true);updateRowOffsetTop();updateTreeLineStyle();(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>resolve());});}else{setTimeout(()=>{restoreScrollLocation($xeTable,targetScrollLeft,targetScrollTop).then(()=>{handleRecalculateStyle(false,true,true);updateRowOffsetTop();updateTreeLineStyle();(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>resolve());});});}});}).then(()=>{if(initStatus){dispatchEvent('data-rendered',{isReload,visibleColumn:internalData.visibleColumn,visibleData:internalData.afterFullData},null);}else{dispatchEvent('init-rendered',{visibleColumn:internalData.visibleColumn,visibleData:internalData.afterFullData},null);}});});};/**
          * 处理数据加载默认行为
          * 默认执行一次，除非被重置
          */const handleLoadDefaults=()=>{handleDefaultSelectionChecked();handleDefaultRadioChecked();handleDefaultRowExpand();handleDefaultTreeExpand();handleDefaultRowGroupExpand();handleDefaultMergeCells();handleDefaultMergeHeaderItems();handleDefaultMergeFooterItems();(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>{setTimeout(()=>$xeTable.recalculate());});};/**