vxe-table 3.15.38 → 3.15.40

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.38";
+const version = "3.15.39";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2302,6 +2302,9 @@ core_.VxeUI.setIcon({
   TABLE_DRAG_DISABLED: iconPrefix + 'no-drop',
   TABLE_ROW_GROUP_OPEN: iconPrefix + 'arrow-right rotate90',
   TABLE_ROW_GROUP_CLOSE: iconPrefix + 'arrow-right',
+  TABLE_AGGREGATION_GROUPING: iconPrefix + 'grouping',
+  TABLE_AGGREGATION_VALUES: iconPrefix + 'values',
+  TABLE_AGGREGATION_DELETE: iconPrefix + 'close',
   // toolbar
   TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
   TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'repeat roll',
@@ -2647,7 +2650,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.38"}`;
+const log_version = `table v${"3.15.39"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5159,6 +5162,9 @@ function eqCellValue(row1, row2, field) {
   }
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEqual(val1, val2);
 }
+function hangleStorageDefaultValue(value, isAll) {
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(value) ? value : isAll;
+}
 function getNextSortOrder($xeTable, column) {
   const sortOpts = $xeTable.computeSortOpts;
   const {
@@ -5323,14 +5329,15 @@ function restoreCustomStorage($xeTable) {
   const customOpts = $xeTable.computeCustomOpts;
   const {
     storage,
-    restoreStore
+    restoreStore,
+    storeOptions
   } = customOpts;
   const isAllCustom = storage === true;
-  const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
-  const isCustomResizable = isAllCustom || storageOpts.resizable;
-  const isCustomVisible = isAllCustom || storageOpts.visible;
-  const isCustomFixed = isAllCustom || storageOpts.fixed;
-  const isCustomSort = isAllCustom || storageOpts.sort;
+  const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+  const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
+  const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
+  const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
+  const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
   if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
     if (!tableId) {
       errLog('vxe.error.reqProp', ['id']);
@@ -8258,11 +8265,18 @@ function handleRecalculateLayout($xeTable, reFull) {
 }
 const handleUpdateRowGroup = ($xeTable, groupFields) => {
   const reactData = $xeTable;
-  reactData.rowGroupList = groupFields ? (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(groupFields) ? groupFields : [groupFields]).map(field => {
-    return {
-      field
-    };
-  }) : [];
+  const aggFields = [];
+  const aggConfs = [];
+  if (groupFields) {
+    (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(groupFields) ? groupFields : [groupFields]).forEach(field => {
+      aggFields.push(field);
+      aggConfs.push({
+        field
+      });
+    });
+  }
+  reactData.rowGroupList = aggConfs;
+  reactData.aggHandleFields = aggFields;
 };
 function handleeGroupSummary($xeTable, aggList) {
   const aggregateOpts = $xeTable.computeAggregateOpts;
@@ -8484,9 +8498,9 @@ function loadTableData($xeTable, datas, isReset) {
   internalData.cvCacheMaps = {};
   reactData.isRowLoading = true;
   reactData.scrollVMLoading = false;
-  internalData.treeExpandedMaps = {};
+  // internalData.treeExpandedMaps = {}
   reactData.treeExpandedFlag++;
-  internalData.rowExpandedMaps = {};
+  // internalData.rowExpandedMaps = {}
   reactData.rowExpandedFlag++;
   internalData.insertRowMaps = {};
   reactData.insertRowFlag++;
@@ -10884,14 +10898,15 @@ const Methods = {
     const customOpts = $xeTable.computeCustomOpts;
     const {
       storage,
-      restoreStore
+      restoreStore,
+      storeOptions
     } = customOpts;
     const isAllCustom = storage === true;
-    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
-    const isCustomResizable = isAllCustom || storageOpts.resizable;
-    const isCustomVisible = isAllCustom || storageOpts.visible;
-    const isCustomFixed = isAllCustom || storageOpts.fixed;
-    const isCustomSort = isAllCustom || storageOpts.sort;
+    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+    const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
+    const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
+    const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
+    const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
     if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       if (!tableId) {
         errLog('vxe.error.reqProp', ['id']);
@@ -10928,14 +10943,15 @@ const Methods = {
     } = internalData;
     const {
       storage,
-      checkMethod
+      checkMethod,
+      storeOptions
     } = customOpts;
     const isAllCustom = storage === true;
-    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
-    const isCustomResizable = isAllCustom || storageOpts.resizable;
-    const isCustomVisible = isAllCustom || storageOpts.visible;
-    const isCustomFixed = isAllCustom || storageOpts.fixed;
-    const isCustomSort = isAllCustom || storageOpts.sort;
+    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+    const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
+    const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
+    const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
+    const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
     const resizableData = {};
     const sortData = {};
     const visibleData = {};
@@ -17514,7 +17530,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     if (mEndRow) {
       const meRowRest = fullAllDataRowIdData[getRowid($xeTable, mEndRow)];
       if (meRowRest) {
-        cellHeight += meRowRest.oTop - rowRest.oTop + getCellRestHeight(meRowRest, cellOpts, rowOpts, defaultRowHeight);
+        cellHeight += meRowRest.oTop + getCellRestHeight(meRowRest, cellOpts, rowOpts, defaultRowHeight) - rowRest.oTop - getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
       }
     }
   }
@@ -17841,7 +17857,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         } = expandColumn || {};
         const colid = expandColumn.id;
         const colRest = fullColumnIdData[colid] || {};
-        const hasEllipsis = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showOverflow) ? isAllOverflow : showOverflow;
+        const hasEllipsis = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showOverflow) ? isAllOverflow : showOverflow;
         let columnIndex = -1;
         let $columnIndex = -1;
         let _columnIndex = -1;
@@ -17959,9 +17975,9 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const slots = $xeTable.$scopedSlots;
     const {
-      xID,
-      $scopedSlots
+      xID
     } = $xeTable;
     const {
       fixedColumn,
@@ -18063,18 +18079,18 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       }
     }
     let emptyContent;
-    if ($scopedSlots.empty) {
-      emptyContent = $scopedSlots.empty.call(this, {
-        $table: $xeTable,
-        $grid: $xeGrid
-      });
+    const emptySlot = slots ? slots.empty : null;
+    const emptyParams = {
+      $table: $xeTable,
+      $grid: $xeGrid
+    };
+    if (emptySlot) {
+      emptyContent = emptySlot.call($xeTable, emptyParams);
     } else {
       const compConf = emptyOpts.name ? body_renderer.get(emptyOpts.name) : null;
       const rtEmptyView = compConf ? compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty : null;
       if (rtEmptyView) {
-        emptyContent = getSlotVNs(rtEmptyView.call(this, h, emptyOpts, {
-          $table: $xeTable
-        }));
+        emptyContent = getSlotVNs(rtEmptyView.call($xeTable, h, emptyOpts, emptyParams));
       } else {
         emptyContent = tableProps.emptyText || body_getI18n('vxe.table.emptyText');
       }
@@ -19244,11 +19260,20 @@ const {
     default: () => props_getConfig().table.showFooterOverflow
   },
   /** 高级属性 */
-  // （即将废弃）columnKey 已废弃，被 column-config.useKey 替换
+  /**
+   * （即将废弃）columnKey 已废弃，被 column-config.useKey 替换
+   * @deprecated
+   */
   columnKey: Boolean,
-  // （即将废弃）rowKey 已废弃，被 row-config.useKey 替换
+  /**
+   * （即将废弃）rowKey 已废弃，被 row-config.useKey 替换
+   * @deprecated
+   */
   rowKey: Boolean,
-  // （即将废弃）rowId 已废弃，被 row-config.keyField 替换
+  /**
+   * （即将废弃）rowId 已废弃，被 row-config.keyField 替换
+   * @deprecated
+   */
   rowId: {
     type: String,
     default: () => props_getConfig().table.rowId
@@ -19285,11 +19310,17 @@ const {
   rowConfig: Object,
   // 数据聚合配置项
   aggregateConfig: Object,
-  //  已废弃，被 aggregateConfig 替换
+  /**
+   * 已废弃，被 aggregateConfig 替换
+   * @deprecated
+   */
   rowGroupConfig: Object,
   // 当前行配置项
   currentRowConfig: Object,
-  // 已废弃，被 rowDragConfig 替换
+  /**
+   * 已废弃，被 rowDragConfig 替换
+   * @deprecated
+   */
   dragConfig: Object,
   // 行拖拽排序配置项
   rowDragConfig: Object,
@@ -19321,7 +19352,10 @@ const {
   treeConfig: [Boolean, Object],
   // 快捷菜单配置项
   menuConfig: [Boolean, Object],
-  // 在 v4 中废弃 contextMenu
+  /**
+   * 在 v4 中废弃 contextMenu
+   * @deprecated
+   */
   contextMenu: [Boolean, Object],
   // 鼠标配置项
   mouseConfig: Object,
@@ -19345,9 +19379,15 @@ const {
   emptyRender: [Boolean, Object],
   // 自定义列配置项
   customConfig: Object,
-  // （即将废弃）横向虚拟滚动配置项
+  /**
+   * （即将废弃）横向虚拟滚动配置项
+   * @deprecated
+   */
   scrollX: Object,
-  // （即将废弃）纵向虚拟滚动配置项
+  /**
+   * （即将废弃）纵向虚拟滚动配置项
+   * @deprecated
+   */
   scrollY: Object,
   // 横向虚拟滚动配置项
   virtualXConfig: Object,
@@ -19453,11 +19493,17 @@ const renderSimplePanel = (h, _vm) => {
   const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
   const props = _vm;
   const $xeTable = _vm.$xeTable;
+  const tableProps = $xeTable;
   const reactData = $xeTable;
   const $xeGrid = $xeTable.$xeGrid;
   const {
     customStore
   } = props;
+  const {
+    treeConfig,
+    rowGroupConfig,
+    aggregateConfig
+  } = tableProps;
   const {
     isCustomStatus,
     customColumnList
@@ -19621,7 +19667,13 @@ const renderSimplePanel = (h, _vm) => {
     style: maxHeight && !['left', 'right'].includes(placement || '') ? {
       maxHeight: `${maxHeight}px`
     } : {}
-  }, customStore.visible ? [h('div', {
+  }, customStore.visible ? [!treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregateSimplePanel ? h($xeTable.getPivotTableAggregateSimplePanel(), {
+    props: {
+      customStore
+    }
+  }) : panel_renderEmptyElement($xeTable), h('div', {
+    class: 'vxe-table-custom--handle-wrapper'
+  }, [h('div', {
     class: 'vxe-table-custom--header'
   }, headerSlot ? $xeTable.callSlot(headerSlot, params, h) : [h('ul', {
     class: 'vxe-table-custom--panel-list'
@@ -19698,7 +19750,7 @@ const renderSimplePanel = (h, _vm) => {
     on: {
       click: _vm.confirmCustomEvent
     }
-  })])]) : null] : []);
+  })])]) : null])] : []);
 };
 const renderPopupPanel = (h, _vm) => {
   const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
@@ -26868,9 +26920,11 @@ function emitCustomEvent($xeTable, type, evnt) {
       const $xeTable = this;
       const reactData = $xeTable;
       const {
-        customOpts,
-        customColumnList
-      } = this;
+        customColumnList,
+        aggHandleFields,
+        rowGroupList
+      } = reactData;
+      const customOpts = $xeTable.computeCustomOpts;
       const {
         allowVisible,
         allowSort,
@@ -26907,7 +26961,18 @@ function emitCustomEvent($xeTable, type, evnt) {
       setTimeout(() => {
         reactData.isDragColMove = false;
       }, 1000);
-      return $xeTable.saveCustomStore('confirm');
+      return $xeTable.saveCustomStore('confirm').then(() => {
+        if ($xeTable.handlePivotTableAggregateData) {
+          if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
+            // 改动聚合分组
+            if (aggHandleFields.length) {
+              $xeTable.setRowGroups(aggHandleFields);
+            } else {
+              $xeTable.clearRowGroups();
+            }
+          }
+        }
+      });
     },
     _cancelCustom() {
       const $xeTable = this;
@@ -26955,6 +27020,9 @@ function emitCustomEvent($xeTable, type, evnt) {
       const $xeTable = this;
       const reactData = $xeTable;
       const internalData = $xeTable;
+      const {
+        rowGroupList
+      } = reactData;
       const {
         collectColumn
       } = internalData;
@@ -26988,7 +27056,18 @@ function emitCustomEvent($xeTable, type, evnt) {
       });
       reactData.isCustomStatus = false;
       $xeTable.saveCustomStore('reset');
-      return $xeTable.handleCustom();
+      return $xeTable.handleCustom().then(() => {
+        if ($xeTable.handlePivotTableAggregateData) {
+          const rowGroupFields = $xeTable.computeRowGroupFields;
+          if (rowGroupFields ? rowGroupFields.length : rowGroupList.length) {
+            if (rowGroupFields && rowGroupFields.length) {
+              $xeTable.setRowGroups(rowGroupFields);
+            } else {
+              $xeTable.clearRowGroups();
+            }
+          }
+        }
+      });
     },
     _toggleCustomAllCheckbox() {
       const {
@@ -27250,24 +27329,25 @@ function renderFixed(h, $xeTable, fixedType) {
     ref: `${fixedType}Footer`
   }) : table_renderEmptyElement($xeTable)]);
 }
-function renderEmptyBody(h, _vm) {
-  const {
-    $scopedSlots,
-    emptyOpts
-  } = _vm;
+function renderEmptyBody(h, $xeTable) {
+  const slots = $xeTable.$scopedSlots;
+  const $xeGrid = $xeTable.$xeGrid;
+  const emptyOpts = $xeTable.computeEmptyOpts;
+  const emptySlot = slots.empty;
   let emptyContent = '';
-  const params = {
-    $table: _vm
+  const emptyParams = {
+    $table: $xeTable,
+    $grid: $xeGrid
   };
-  if ($scopedSlots.empty) {
-    emptyContent = $scopedSlots.empty.call(_vm, params, h);
+  if (emptySlot) {
+    emptyContent = emptySlot.call($xeTable, emptyParams);
   } else {
     const compConf = emptyOpts.name ? table_renderer.get(emptyOpts.name) : null;
     const rtEmptyView = compConf ? compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty : null;
     if (rtEmptyView) {
-      emptyContent = getSlotVNs(rtEmptyView.call(_vm, h, emptyOpts, params));
+      emptyContent = getSlotVNs(rtEmptyView.call($xeTable, h, emptyOpts, emptyParams));
     } else {
-      emptyContent = getFuncText(_vm.emptyText) || table_getI18n('vxe.table.emptyText');
+      emptyContent = getFuncText($xeTable.emptyText) || table_getI18n('vxe.table.emptyText');
     }
   }
   return emptyContent;
@@ -27343,12 +27423,10 @@ const table_renderDragTip = (h, $xeTable) => {
   }
   return table_renderEmptyElement($xeTable);
 };
-function handleUpdateResize(_vm) {
-  const {
-    $el
-  } = _vm;
-  if ($el && $el.clientWidth && $el.clientHeight) {
-    _vm.recalculate();
+function handleUpdateResize($xeTable) {
+  const el = $xeTable.$refs.refElem;
+  if (el && el.clientWidth && el.clientHeight) {
+    $xeTable.recalculate();
   }
 }
 function renderRowExpandedVNs(h, $xeTable) {
@@ -27800,6 +27878,8 @@ function renderBody(h, $xeTable) {
       },
       visiblwRowsFlag: 1,
       isRowGroupStatus: false,
+      rowGroupList: [],
+      aggHandleFields: [],
       rowGroupExpandedFlag: 1,
       rowExpandedFlag: 1,
       treeExpandedFlag: 1,
@@ -27847,13 +27927,17 @@ function renderBody(h, $xeTable) {
       return this.computeTableId;
     },
     computeTableId() {
+      const $xeTable = this;
+      const props = $xeTable;
+      const $xeGrid = $xeTable.$xeGrid;
       const {
         id
-      } = this;
+      } = props;
       if (id) {
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(id)) {
           return `${id({
-            $table: this
+            $table: $xeTable,
+            $grid: $xeGrid
           }) || ''}`;
         }
         return `${id}`;
@@ -27870,9 +27954,9 @@ function renderBody(h, $xeTable) {
       return this.computeValidOpts;
     },
     computeValidOpts() {
-      return Object.assign({
-        message: 'default'
-      }, table_getConfig().table.validConfig, this.validConfig);
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.validConfig, props.validConfig);
     },
     sXOpts() {
       return this.computeVirtualXOpts;
@@ -28288,38 +28372,25 @@ function renderBody(h, $xeTable) {
     },
     computeTableRowExpandedList() {
       const $xeTable = this;
-      const props = $xeTable;
       const reactData = $xeTable;
       const internalData = $xeTable;
-      const {
-        treeConfig
-      } = props;
       const {
         rowExpandedFlag,
         expandColumn,
         rowGroupExpandedFlag,
-        treeExpandedFlag,
-        isRowGroupStatus
+        treeExpandedFlag
       } = reactData;
       const {
         visibleDataRowIdData,
         rowExpandedMaps
       } = internalData;
-      const treeOpts = $xeTable.computeTreeOpts;
-      const {
-        transform
-      } = treeOpts;
       const expandList = [];
       if (expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
-        if (isRowGroupStatus || treeConfig && transform) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(rowExpandedMaps, (row, rowid) => {
-            if (visibleDataRowIdData[rowid]) {
-              expandList.push(row);
-            }
-          });
-        } else {
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().values(rowExpandedMaps);
-        }
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(rowExpandedMaps, (row, rowid) => {
+          if (visibleDataRowIdData[rowid]) {
+            expandList.push(row);
+          }
+        });
       }
       return expandList;
     },
@@ -28431,6 +28502,25 @@ function renderBody(h, $xeTable) {
       const aggregateOpts = $xeTable.computeAggregateOpts;
       return aggregateOpts.groupFields;
     },
+    computeRowGroupColumns() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      const {
+        rowGroupList
+      } = reactData;
+      const {
+        fullColumnFieldData
+      } = internalData;
+      const rgColumns = [];
+      rowGroupList.forEach(aggConf => {
+        const colRest = fullColumnFieldData[aggConf.field];
+        if (colRest) {
+          rgColumns.push(colRest.column);
+        }
+      });
+      return rgColumns;
+    },
     tabsResizeFlag() {
       const $xeTable = this;
       const $xeTabs = $xeTable.$xeTabs;
@@ -28532,11 +28622,12 @@ function renderBody(h, $xeTable) {
       $xeTable.updateFooter();
     },
     syncResize(value) {
+      const $xeTable = this;
       if (value) {
-        handleUpdateResize(this);
-        this.$nextTick(() => {
-          handleUpdateResize(this);
-          setTimeout(() => handleUpdateResize(this));
+        handleUpdateResize($xeTable);
+        $xeTable.$nextTick(() => {
+          handleUpdateResize($xeTable);
+          setTimeout(() => handleUpdateResize($xeTable));
         });
       }
     },
@@ -28544,12 +28635,14 @@ function renderBody(h, $xeTable) {
       this.handleGlobalResizeEvent();
     },
     mergeCells(value) {
-      this.clearMergeCells();
-      this.$nextTick(() => this.setMergeCells(value));
+      const $xeTable = this;
+      $xeTable.clearMergeCells();
+      $xeTable.$nextTick(() => $xeTable.setMergeCells(value));
     },
     mergeFooterItems(value) {
-      this.clearMergeFooterItems();
-      this.$nextTick(() => this.setMergeFooterItems(value));
+      const $xeTable = this;
+      $xeTable.clearMergeFooterItems();
+      $xeTable.$nextTick(() => $xeTable.setMergeFooterItems(value));
     },
     computeRowGroupFields(val) {
       const $xeTable = this;
@@ -29164,7 +29257,7 @@ function renderBody(h, $xeTable) {
       class: 'vxe-table--empty-placeholder'
     }, [h('div', {
       class: 'vxe-table--empty-content'
-    }, renderEmptyBody(h, this))]),
+    }, renderEmptyBody(h, $xeTable))]),
     /**
      * 边框线
      */
@@ -30168,15 +30261,16 @@ function renderDefaultForm(h, $xeGrid) {
   const VxeUIFormComponent = core_.VxeUI.getComponent('VxeForm');
   const props = $xeGrid;
   const slots = $xeGrid.$scopedSlots;
+  const reactData = $xeGrid;
   const {
     proxyConfig,
     formConfig
   } = props;
   const {
-    proxyOpts,
-    formData,
-    formOpts
-  } = $xeGrid;
+    formData
+  } = reactData;
+  const proxyOpts = $xeGrid.computeProxyOpts;
+  const formOpts = $xeGrid.computeFormOpts;
   if (isEnableConf(formConfig) && formOpts.items && formOpts.items.length) {
     const formSlots = {};
     if (!formOpts.inited) {
@@ -30250,32 +30344,44 @@ const getConfigSlot = ($xeGrid, slotConfigs) => {
   });
   return slotConf;
 };
-function getToolbarSlots(_vm) {
-  const {
-    $scopedSlots,
-    toolbarOpts
-  } = _vm;
+function getToolbarSlots($xeGrid) {
+  const slots = $xeGrid.$scopedSlots;
+  const toolbarOpts = $xeGrid.computeToolbarOpts;
   const toolbarOptSlots = toolbarOpts.slots;
-  let buttonsSlot;
-  let toolsSlot;
-  const slots = {};
-  if ($scopedSlots.buttons && (!toolbarOptSlots || toolbarOptSlots.buttons !== 'buttons')) {
+  const toolbarSlots = {};
+  if (slots.buttons && (!toolbarOptSlots || toolbarOptSlots.buttons !== 'buttons')) {
     warnLog('vxe.error.reqProp', ['toolbar-config.slots.buttons']);
   }
-  if ($scopedSlots.tools && (!toolbarOptSlots || toolbarOptSlots.tools !== 'tools')) {
+  if (slots.tools && (!toolbarOptSlots || toolbarOptSlots.tools !== 'tools')) {
     warnLog('vxe.error.reqProp', ['toolbar-config.slots.tools']);
   }
   if (toolbarOptSlots) {
-    buttonsSlot = getFuncSlot(_vm, toolbarOptSlots, 'buttons');
-    toolsSlot = getFuncSlot(_vm, toolbarOptSlots, 'tools');
+    const buttonsSlot = getFuncSlot($xeGrid, toolbarOptSlots, 'buttons');
+    const buttonPrefixSlot = getFuncSlot($xeGrid, toolbarOptSlots, 'buttonPrefix');
+    const buttonSuffixSlot = getFuncSlot($xeGrid, toolbarOptSlots, 'buttonSuffix');
+    const toolsSlot = getFuncSlot($xeGrid, toolbarOptSlots, 'tools');
+    const toolPrefixSlot = getFuncSlot($xeGrid, toolbarOptSlots, 'toolPrefix');
+    const toolSuffixSlot = getFuncSlot($xeGrid, toolbarOptSlots, 'toolSuffix');
     if (buttonsSlot) {
-      slots.buttons = buttonsSlot;
+      toolbarSlots.buttons = buttonsSlot;
+    }
+    if (buttonPrefixSlot) {
+      toolbarSlots.buttonPrefix = buttonPrefixSlot;
+    }
+    if (buttonSuffixSlot) {
+      toolbarSlots.buttonSuffix = buttonSuffixSlot;
     }
     if (toolsSlot) {
-      slots.tools = toolsSlot;
+      toolbarSlots.tools = toolsSlot;
+    }
+    if (toolPrefixSlot) {
+      toolbarSlots.toolPrefix = toolPrefixSlot;
+    }
+    if (toolSuffixSlot) {
+      toolbarSlots.toolSuffix = toolSuffixSlot;
     }
   }
-  return slots;
+  return toolbarSlots;
 }
 function getTableOns(_vm) {
   const {
@@ -30326,135 +30432,121 @@ function pageChangeEvent($xeGrid, params) {
 /**
  * 渲染表单
  */
-function renderForm(h, _vm) {
+function renderForm(h, $xeGrid) {
+  const slots = $xeGrid.$scopedSlots;
+  const props = $xeGrid;
   const {
-    _e,
-    $scopedSlots,
     formConfig
-  } = _vm;
-  const formSlot = $scopedSlots.form;
+  } = props;
+  const formSlot = slots.form;
   const hasForm = !!(formSlot || isEnableConf(formConfig));
   if (hasForm) {
     return h('div', {
       key: 'form',
       ref: 'refFormWrapper',
       class: 'vxe-grid--form-wrapper'
-    }, formSlot ? formSlot.call(_vm, {
-      $grid: _vm
-    }, h) : renderDefaultForm(h, _vm));
+    }, formSlot ? formSlot.call($xeGrid, {
+      $grid: $xeGrid
+    }) : renderDefaultForm(h, $xeGrid));
   }
-  return _e();
+  return grid_renderEmptyElement($xeGrid);
 }
 /**
  * 渲染工具栏
  */
-function renderToolbar(h, _vm) {
+function renderToolbar(h, $xeGrid) {
+  const slots = $xeGrid.$scopedSlots;
+  const props = $xeGrid;
   const {
-    _e,
-    $scopedSlots,
-    toolbarConfig,
-    toolbar
-  } = _vm;
-  const toolbarSlot = $scopedSlots.toolbar;
+    toolbarConfig
+  } = props;
+  const toolbarSlot = slots.toolbar;
   const hasToolbar = !!(toolbarSlot || isEnableConf(toolbarConfig) || toolbar);
+  const toolbarOpts = $xeGrid.computeToolbarOpts;
   if (hasToolbar) {
     return h('div', {
       key: 'toolbar',
       ref: 'refToolbarWrapper',
       class: 'vxe-grid--toolbar-wrapper'
-    }, toolbarSlot ? toolbarSlot.call(_vm, {
-      $grid: _vm
-    }, h) : [h(src_toolbar, {
-      props: Object.assign({}, _vm.toolbarOpts, {
+    }, toolbarSlot ? toolbarSlot.call($xeGrid, {
+      $grid: $xeGrid
+    }) : [h(src_toolbar, {
+      props: Object.assign({}, toolbarOpts, {
         slots: undefined
       }),
       ref: 'xToolbar',
-      scopedSlots: getToolbarSlots(_vm)
+      scopedSlots: getToolbarSlots($xeGrid)
     })]);
   }
-  return _e();
+  return grid_renderEmptyElement($xeGrid);
 }
 /**
  * 渲染表格顶部区域
  */
-function renderTop(h, _vm) {
-  const {
-    _e,
-    $scopedSlots
-  } = _vm;
-  const topSlot = $scopedSlots.top;
+function renderTop(h, $xeGrid) {
+  const slots = $xeGrid.$scopedSlots;
+  const topSlot = slots.top;
   return topSlot ? h('div', {
     key: 'top',
     ref: 'refTopWrapper',
     class: 'vxe-grid--top-wrapper'
-  }, topSlot.call(_vm, {
-    $grid: _vm
-  }, h)) : _e();
+  }, topSlot.call($xeGrid, {
+    $grid: $xeGrid
+  })) : grid_renderEmptyElement($xeGrid);
 }
-function renderTableLeft(h, _vm) {
-  const {
-    _e,
-    $scopedSlots
-  } = _vm;
-  const leftSlot = $scopedSlots.left;
+function renderTableLeft(h, $xeGrid) {
+  const slots = $xeGrid.$scopedSlots;
+  const leftSlot = slots.left;
   if (leftSlot) {
     return h('div', {
       class: 'vxe-grid--left-wrapper'
     }, leftSlot({
-      $grid: _vm
+      $grid: $xeGrid
     }));
   }
-  return _e();
+  return grid_renderEmptyElement($xeGrid);
 }
-function renderTableRight(h, _vm) {
-  const {
-    _e,
-    $scopedSlots
-  } = _vm;
-  const rightSlot = $scopedSlots.right;
+function renderTableRight(h, $xeGrid) {
+  const slots = $xeGrid.$scopedSlots;
+  const rightSlot = slots.right;
   if (rightSlot) {
     return h('div', {
       class: 'vxe-grid--right-wrapper'
     }, rightSlot({
-      $grid: _vm
+      $grid: $xeGrid
     }));
   }
-  return _e();
+  return grid_renderEmptyElement($xeGrid);
 }
 /**
  * 渲染表格
  */
-function renderTable(h, _vm) {
-  const {
-    $scopedSlots,
-    tableProps
-  } = _vm;
+function renderTable(h, $xeGrid) {
+  const slots = $xeGrid.$scopedSlots;
+  const tableProps = $xeGrid.computeTableProps;
   return h('div', {
     class: 'vxe-grid--table-wrapper'
   }, [h('vxe-table', {
     key: 'table',
     props: tableProps,
-    on: getTableOns(_vm),
-    scopedSlots: $scopedSlots,
+    on: getTableOns($xeGrid),
+    scopedSlots: slots,
     ref: 'xTable'
   })]);
 }
 /**
  * 渲染表格底部区域
  */
-function renderBottom(h, _vm) {
-  const {
-    _e,
-    $scopedSlots
-  } = _vm;
-  const bottomSlot = $scopedSlots.bottom;
+function renderBottom(h, $xeGrid) {
+  const slots = $xeGrid.$scopedSlots;
+  const bottomSlot = slots.bottom;
   return bottomSlot ? h('div', {
     key: 'bottom',
     ref: 'refBottomWrapper',
     class: 'vxe-grid--bottom-wrapper'
-  }, bottomSlot.call(_vm, {
-    $grid: _vm
-  }, h)) : _e();
+  }, bottomSlot.call($xeGrid, {
+    $grid: $xeGrid
+  })) : grid_renderEmptyElement($xeGrid);
 }
 /**
  * 渲染分页
@@ -33149,7 +33241,7 @@ if (core_.VxeUI.dynamicApp) {
 }
 core_.VxeUI.component(src_toolbar);
 const Toolbar = VxeToolbar;
-/* harmony default export */ var toolbar = ((/* unused pure expression or super */ null && (VxeToolbar)));
+/* harmony default export */ var packages_toolbar = ((/* unused pure expression or super */ null && (VxeToolbar)));
 ;// CONCATENATED MODULE: ./packages/locale/lang/zh-CN.ts
 /* harmony default export */ var zh_CN = ({
   vxe: {
@@ -33711,6 +33803,12 @@ const Toolbar = VxeToolbar;
           replaceSuccess: '成功替换 {0} 个单元格'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: '冻结列',