vxe-table 3.19.32 → 3.19.34

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

@@ -201,12 +201,12 @@ const renderSimplePanel = (h, _vm) => {
                         }, [
                             h('span', {
                                 class: ['vxe-table-custom--sort-btn', {
-                                        'is--disabled': isDisabled || isHidden
+                                        'is--disabled': isHidden
                                     }],
                                 attrs: {
                                     title: getI18n('vxe.custom.setting.sortHelpTip')
                                 },
-                                on: isDisabled || isHidden
+                                on: isHidden
                                     ? {}
                                     : {
                                         mousedown: _vm.sortMousedownEvent,
@@ -244,7 +244,7 @@ const renderSimplePanel = (h, _vm) => {
                                 mode: 'text',
                                 icon: column.renderFixed === 'left' ? getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_LEFT,
                                 status: column.renderFixed === 'left' ? 'primary' : '',
-                                disabled: isDisabled || isHidden || (isMaxFixedColumn && !column.renderFixed),
+                                disabled: isHidden || (isMaxFixedColumn && !column.renderFixed),
                                 title: getI18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
                             },
                             on: {
@@ -258,7 +258,7 @@ const renderSimplePanel = (h, _vm) => {
                                 mode: 'text',
                                 icon: column.renderFixed === 'right' ? getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,
                                 status: column.renderFixed === 'right' ? 'primary' : '',
-                                disabled: isDisabled || isHidden || (isMaxFixedColumn && !column.renderFixed),
+                                disabled: isHidden || (isMaxFixedColumn && !column.renderFixed),
                                 title: getI18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
                             },
                             on: {
@@ -545,12 +545,12 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
                             ? ((isCrossDrag ? immediate : false) || column.level === 1
                                 ? h('div', {
                                     class: ['vxe-table-custom-popup--column-sort-btn', {
-                                            'is--disabled': isDisabled || isHidden
+                                            'is--disabled': isHidden
                                         }],
                                     attrs: {
                                         title: getI18n('vxe.custom.setting.sortHelpTip')
                                     },
-                                    on: (isDisabled || isHidden
+                                    on: (isHidden
                                         ? {}
                                         : {
                                             mousedown: _vm.sortMousedownEvent,
@@ -594,7 +594,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
                                     props: {
                                         type: 'integer',
                                         immediate: false,
-                                        disabled: isDisabled || isHidden,
+                                        disabled: isHidden,
                                         value: column.renderResizeWidth,
                                         min: customMinWidth || undefined,
                                         max: customMaxWidth || undefined
@@ -622,11 +622,11 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
                                     value: column.renderFixed || '',
                                     type: 'button',
                                     size: 'mini',
-                                    disabled: isDisabled || isHidden,
+                                    disabled: isHidden,
                                     options: [
-                                        { label: getI18n('vxe.custom.setting.fixedLeft'), value: 'left', disabled: isDisabled || isHidden || isMaxFixedColumn },
-                                        { label: getI18n('vxe.custom.setting.fixedUnset'), value: '', disabled: isDisabled || isHidden },
-                                        { label: getI18n('vxe.custom.setting.fixedRight'), value: 'right', disabled: isDisabled || isHidden || isMaxFixedColumn }
+                                        { label: getI18n('vxe.custom.setting.fixedLeft'), value: 'left', disabled: isHidden || isMaxFixedColumn },
+                                        { label: getI18n('vxe.custom.setting.fixedUnset'), value: '', disabled: isHidden },
+                                        { label: getI18n('vxe.custom.setting.fixedRight'), value: 'right', disabled: isHidden || isMaxFixedColumn }
                                     ]
                                 },
                                 on: {

package/es/table/src/cell.js

@@ -359,6 +359,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;
@@ -392,9 +393,6 @@ export const Cell = {
                  */
                 totalValue: childCount
             };
-            if (gcSlot) {
-                return renderCellBaseVNs(h, params, $table.callSlot(gcSlot, Object.assign({ groupField, groupContent, childList, childCount }, params), h));
-            }
             if (mode === 'column' ? field === aggRow.groupField : rowGroupNode) {
                 cellValue = groupContent;
                 if (contentMethod) {
@@ -403,9 +401,16 @@ export const Cell = {
                 if (showTotal) {
                     cellValue = getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(ctParams) : childCount, childCount]);
                 }
+                if (gcSlot) {
+                    return renderCellBaseVNs(h, params, $table.callSlot(gcSlot, Object.assign({ groupField, groupContent, childList, childCount }, params), h));
+                }
             }
             else if ($table.getPivotTableAggregateCellAggValue) {
                 cellValue = $table.getPivotTableAggregateCellAggValue(params);
+                ctParams.aggValue = cellValue;
+                if (gvSlot) {
+                    return renderCellBaseVNs(h, params, $table.callSlot(gvSlot, Object.assign({ groupField, groupContent, childList, childCount }, params, ctParams), h));
+                }
             }
             else if (aggFunc === true || (countFields && countFields.includes(field))) {
                 cellValue = currAggData ? currAggData.value : childCount;
@@ -413,6 +418,9 @@ export const Cell = {
                 if (formatValuesMethod) {
                     cellValue = formatValuesMethod(ctParams);
                 }
+                if (gvSlot) {
+                    return renderCellBaseVNs(h, params, $table.callSlot(gvSlot, Object.assign({ groupField, groupContent, childList, childCount }, params, ctParams), h));
+                }
             }
         }
         else {

package/es/table/src/header.js

@@ -307,7 +307,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
         ]);
     });
 }
-function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
+function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups, renderColumnList) {
     const props = _vm;
     const $xeTable = _vm.$parent;
     const tableProps = $xeTable;
@@ -331,7 +331,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
             class: [
                 'vxe-header--row'
             ]
-        }, renderFilterRows(h, _vm, isOptimizeMode, headerGroups[headerGroups.length - 1])));
+        }, renderFilterRows(h, _vm, isOptimizeMode, renderColumnList)));
     }
     return rowVNs;
 }
@@ -508,7 +508,7 @@ export default {
                      */
                     h('thead', {
                         ref: 'refHeaderTHead'
-                    }, renderHeads(h, _vm, isGroup, isOptimizeMode, renderHeaderList))
+                    }, renderHeads(h, _vm, isGroup, isOptimizeMode, renderHeaderList, renderColumnList))
                 ]),
                 mouseConfig && mouseOpts.area
                     ? h('div', {

package/es/table/src/methods.js

@@ -4415,7 +4415,6 @@ const tableMethods = {
         const reactData = $xeTable;
         const internalData = $xeTable;
         const { data } = props;
-        $xeTable.dispatchEvent('ready', {}, null);
         loadTableData($xeTable, data || [], true, true).then(() => {
             if (data && data.length) {
                 internalData.inited = true;
@@ -4429,6 +4428,9 @@ const tableMethods = {
                 updateRowOffsetTop($xeTable);
             }
         });
+        $xeTable.$nextTick().then(() => {
+            $xeTable.dispatchEvent('ready', {}, null);
+        });
     },
     /**
      * 加载表格数据

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.19.32";
+export const version = "3.19.34";
 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${"3.19.32"}`;
+const version = `table v${"3.19.34"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.19.32";
+const version = "3.19.34";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2715,7 +2715,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.19.32"}`;
+const log_version = `table v${"3.19.34"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4184,6 +4184,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;
@@ -4227,14 +4228,6 @@ const Cell = {
          */
         totalValue: childCount
       };
-      if (gcSlot) {
-        return renderCellBaseVNs(h, params, $table.callSlot(gcSlot, Object.assign({
-          groupField,
-          groupContent,
-          childList,
-          childCount
-        }, params), h));
-      }
       if (mode === 'column' ? field === aggRow.groupField : rowGroupNode) {
         cellValue = groupContent;
         if (contentMethod) {
@@ -4243,14 +4236,39 @@ const Cell = {
         if (showTotal) {
           cellValue = cell_getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(ctParams) : childCount, childCount]);
         }
+        if (gcSlot) {
+          return renderCellBaseVNs(h, params, $table.callSlot(gcSlot, Object.assign({
+            groupField,
+            groupContent,
+            childList,
+            childCount
+          }, params), h));
+        }
       } else if ($table.getPivotTableAggregateCellAggValue) {
         cellValue = $table.getPivotTableAggregateCellAggValue(params);
+        ctParams.aggValue = cellValue;
+        if (gvSlot) {
+          return renderCellBaseVNs(h, params, $table.callSlot(gvSlot, Object.assign({
+            groupField,
+            groupContent,
+            childList,
+            childCount
+          }, params, ctParams), h));
+        }
       } 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(h, params, $table.callSlot(gvSlot, Object.assign({
+            groupField,
+            groupContent,
+            childList,
+            childCount
+          }, params, ctParams), h));
+        }
       }
     } else {
       if (defaultSlot) {
@@ -6142,7 +6160,7 @@ if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_defau
 setTimeout(()=>handleLazyRecalculate($xeTable,false,true,true),50);});},handleTableData(force){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{scrollYLoad}=reactData;const{scrollYStore,fullDataRowIdData}=internalData;const $xeGanttView=internalData.xeGanttView;let fullList=internalData.afterFullData;// 是否进行数据处理
 if(force){// 更新数据，处理筛选和排序
 updateAfterFullData($xeTable);// 如果为虚拟树，将树结构拍平
-fullList=handleVirtualTreeToList($xeTable);}const tableData=scrollYLoad?fullList.slice(scrollYStore.startIndex,scrollYStore.endIndex):fullList.slice(0);const visibleDataRowIdMaps={};tableData.forEach((row,$index)=>{const rowid=getRowid($xeTable,row);const rest=fullDataRowIdData[rowid];if(rest){rest.$index=$index;}visibleDataRowIdMaps[rowid]=row;});reactData.tableData=tableData;internalData.visibleDataRowIdData=visibleDataRowIdMaps;if($xeGanttView&&$xeGanttView.updateViewData){$xeGanttView.updateViewData();}return $xeTable.$nextTick();},initData(){const $xeTable=this;const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{data}=props;$xeTable.dispatchEvent('ready',{},null);loadTableData($xeTable,data||[],true,true).then(()=>{if(data&&data.length){internalData.inited=true;internalData.initStatus=true;handleLoadDefaults($xeTable);}handleInitDefaults($xeTable);updateStyle($xeTable);if(!reactData.isAllOverflow){calcCellHeight($xeTable);updateRowOffsetTop($xeTable);}});},/**
+fullList=handleVirtualTreeToList($xeTable);}const tableData=scrollYLoad?fullList.slice(scrollYStore.startIndex,scrollYStore.endIndex):fullList.slice(0);const visibleDataRowIdMaps={};tableData.forEach((row,$index)=>{const rowid=getRowid($xeTable,row);const rest=fullDataRowIdData[rowid];if(rest){rest.$index=$index;}visibleDataRowIdMaps[rowid]=row;});reactData.tableData=tableData;internalData.visibleDataRowIdData=visibleDataRowIdMaps;if($xeGanttView&&$xeGanttView.updateViewData){$xeGanttView.updateViewData();}return $xeTable.$nextTick();},initData(){const $xeTable=this;const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{data}=props;loadTableData($xeTable,data||[],true,true).then(()=>{if(data&&data.length){internalData.inited=true;internalData.initStatus=true;handleLoadDefaults($xeTable);}handleInitDefaults($xeTable);updateStyle($xeTable);if(!reactData.isAllOverflow){calcCellHeight($xeTable);updateRowOffsetTop($xeTable);}});$xeTable.$nextTick().then(()=>{$xeTable.dispatchEvent('ready',{},null);});},/**
      * 加载表格数据
      * @param {Array} datas 数据
      */loadTableData(datas,isReload,isReset){const $xeTable=this;return loadTableData($xeTable,datas,isReload,isReset);},/**
@@ -8086,7 +8104,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
     }, flSlot ? $xeTable.callSlot(flSlot, cellParams, h) : rtFloatingFilter && firstFilterOption ? getSlotVNs(rtFloatingFilter.call($xeTable, h, filterRender, cellParams)) : [])])]);
   });
 }
-function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
+function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups, renderColumnList) {
   const props = _vm;
   const $xeTable = _vm.$parent;
   const tableProps = $xeTable;
@@ -8115,7 +8133,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
     rowVNs.push(h('tr', {
       key: 'ff',
       class: ['vxe-header--row']
-    }, renderFilterRows(h, _vm, isOptimizeMode, headerGroups[headerGroups.length - 1])));
+    }, renderFilterRows(h, _vm, isOptimizeMode, renderColumnList)));
   }
   return rowVNs;
 }
@@ -8312,7 +8330,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
      */
     h('thead', {
       ref: 'refHeaderTHead'
-    }, renderHeads(h, _vm, isGroup, isOptimizeMode, renderHeaderList))]), mouseConfig && mouseOpts.area ? h('div', {
+    }, renderHeads(h, _vm, isGroup, isOptimizeMode, renderHeaderList, renderColumnList))]), mouseConfig && mouseOpts.area ? h('div', {
       class: 'vxe-table--cell-area',
       attrs: {
         xid: xID
@@ -9010,12 +9028,12 @@ const renderSimplePanel = (h, _vm) => {
         class: 'vxe-table-custom--sort-option'
       }, [h('span', {
         class: ['vxe-table-custom--sort-btn', {
-          'is--disabled': isDisabled || isHidden
+          'is--disabled': isHidden
         }],
         attrs: {
           title: panel_getI18n('vxe.custom.setting.sortHelpTip')
         },
-        on: isDisabled || isHidden ? {} : {
+        on: isHidden ? {} : {
           mousedown: _vm.sortMousedownEvent,
           mouseup: _vm.sortMouseupEvent
         }
@@ -9040,7 +9058,7 @@ const renderSimplePanel = (h, _vm) => {
           mode: 'text',
           icon: column.renderFixed === 'left' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT,
           status: column.renderFixed === 'left' ? 'primary' : '',
-          disabled: isDisabled || isHidden || isMaxFixedColumn && !column.renderFixed,
+          disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
           title: panel_getI18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
         },
         on: {
@@ -9055,7 +9073,7 @@ const renderSimplePanel = (h, _vm) => {
           mode: 'text',
           icon: column.renderFixed === 'right' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,
           status: column.renderFixed === 'right' ? 'primary' : '',
-          disabled: isDisabled || isHidden || isMaxFixedColumn && !column.renderFixed,
+          disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
           title: panel_getI18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
         },
         on: {
@@ -9311,12 +9329,12 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
         class: 'vxe-table-custom-popup--name'
       }, [allowSort ? (isCrossDrag ? immediate : false) || column.level === 1 ? h('div', {
         class: ['vxe-table-custom-popup--column-sort-btn', {
-          'is--disabled': isDisabled || isHidden
+          'is--disabled': isHidden
         }],
         attrs: {
           title: panel_getI18n('vxe.custom.setting.sortHelpTip')
         },
-        on: isDisabled || isHidden ? {} : {
+        on: isHidden ? {} : {
           mousedown: _vm.sortMousedownEvent,
           mouseup: _vm.sortMouseupEvent
         }
@@ -9342,7 +9360,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
         props: {
           type: 'integer',
           immediate: false,
-          disabled: isDisabled || isHidden,
+          disabled: isHidden,
           value: column.renderResizeWidth,
           min: customMinWidth || undefined,
           max: customMaxWidth || undefined
@@ -9362,19 +9380,19 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
           value: column.renderFixed || '',
           type: 'button',
           size: 'mini',
-          disabled: isDisabled || isHidden,
+          disabled: isHidden,
           options: [{
             label: panel_getI18n('vxe.custom.setting.fixedLeft'),
             value: 'left',
-            disabled: isDisabled || isHidden || isMaxFixedColumn
+            disabled: isHidden || isMaxFixedColumn
           }, {
             label: panel_getI18n('vxe.custom.setting.fixedUnset'),
             value: '',
-            disabled: isDisabled || isHidden
+            disabled: isHidden
           }, {
             label: panel_getI18n('vxe.custom.setting.fixedRight'),
             value: 'right',
-            disabled: isDisabled || isHidden || isMaxFixedColumn
+            disabled: isHidden || isMaxFixedColumn
           }]
         },
         on: {