vxe-table 3.15.43 → 3.15.45

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.43";
+const version = "3.15.45";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2212,13 +2212,13 @@ core_.VxeUI.setConfig({
       isReplace: true
     },
     virtualXConfig: {
-      enabled: true,
+      // enabled: false,
       gt: 24,
       preSize: 0,
       oSize: 0
     },
     virtualYConfig: {
-      enabled: true,
+      // enabled: false,
       gt: 100,
       preSize: 1,
       oSize: 0
@@ -2298,14 +2298,18 @@ core_.VxeUI.setIcon({
   TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked-fill',
   TABLE_CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
   TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate-fill',
+  TABLE_CHECKBOX_DISABLED_UNCHECKED: iconPrefix + 'checkbox-unchecked-fill',
   TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked-fill',
   TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
+  TABLE_RADIO_DISABLED_UNCHECKED: iconPrefix + 'radio-unchecked-fill',
   TABLE_CUSTOM_SORT: iconPrefix + 'drag-handle',
   TABLE_MENU_OPTIONS: iconPrefix + 'arrow-right',
   TABLE_DRAG_ROW: iconPrefix + 'drag-handle',
   TABLE_DRAG_COLUMN: iconPrefix + 'drag-handle',
   TABLE_DRAG_STATUS_ROW: iconPrefix + 'sort',
   TABLE_DRAG_STATUS_SUB_ROW: iconPrefix + 'add-sub',
+  TABLE_DRAG_STATUS_AGG_GROUP: iconPrefix + 'grouping',
+  TABLE_DRAG_STATUS_AGG_VALUES: iconPrefix + 'values',
   TABLE_DRAG_STATUS_COLUMN: iconPrefix + 'swap',
   TABLE_DRAG_DISABLED: iconPrefix + 'no-drop',
   TABLE_ROW_GROUP_OPEN: iconPrefix + 'arrow-right rotate90',
@@ -2658,7 +2662,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.43"}`;
+const log_version = `table v${"3.15.45"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4262,7 +4266,7 @@ const Cell = {
     const radioVNs = [];
     if (isVisible) {
       radioVNs.push(h('span', {
-        class: ['vxe-radio--icon', isChecked ? cell_getIcon().TABLE_RADIO_CHECKED : cell_getIcon().TABLE_RADIO_UNCHECKED]
+        class: ['vxe-radio--icon', isChecked ? cell_getIcon().TABLE_RADIO_CHECKED : isDisabled ? cell_getIcon().TABLE_RADIO_DISABLED_UNCHECKED : cell_getIcon().TABLE_RADIO_UNCHECKED]
       }));
     }
     if (defaultSlot || labelField) {
@@ -4341,7 +4345,7 @@ const Cell = {
       },
       on: ons
     }, [h('span', {
-      class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllCheckboxSelected ? cell_getIcon().TABLE_CHECKBOX_CHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
+      class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllCheckboxSelected ? cell_getIcon().TABLE_CHECKBOX_CHECKED : isAllCheckboxDisabled ? cell_getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
     })].concat(titleSlot || colTitle ? [h('span', {
       class: 'vxe-checkbox--label'
     }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : colTitle)] : []))]));
@@ -4417,7 +4421,7 @@ const Cell = {
     const checkVNs = [];
     if (isVisible) {
       checkVNs.push(h('span', {
-        class: ['vxe-checkbox--icon', indeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? cell_getIcon().TABLE_CHECKBOX_CHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
+        class: ['vxe-checkbox--icon', indeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? cell_getIcon().TABLE_CHECKBOX_CHECKED : isDisabled ? cell_getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
       }));
     }
     if (defaultSlot || labelField) {
@@ -4510,7 +4514,7 @@ const Cell = {
     const checkVNs = [];
     if (isVisible) {
       checkVNs.push(h('span', {
-        class: ['vxe-checkbox--icon', isIndeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? cell_getIcon().TABLE_CHECKBOX_CHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
+        class: ['vxe-checkbox--icon', isIndeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? cell_getIcon().TABLE_CHECKBOX_CHECKED : isDisabled ? cell_getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
       }));
     }
     if (defaultSlot || labelField) {
@@ -5346,7 +5350,7 @@ function restoreCustomStorage($xeTable) {
   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 (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
     if (!tableId) {
       errLog('vxe.error.reqProp', ['id']);
       return;
@@ -10915,7 +10919,7 @@ const Methods = {
     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 (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       if (!tableId) {
         errLog('vxe.error.reqProp', ['id']);
         return;
@@ -10971,7 +10975,9 @@ const Methods = {
       fixedData: undefined
     };
     if (!id) {
-      errLog('vxe.error.reqProp', ['id']);
+      if (storage) {
+        errLog('vxe.error.reqProp', ['id']);
+      }
       return storeData;
     }
     let hasResizable = 0;
@@ -11048,7 +11054,7 @@ const Methods = {
     if (type !== 'reset') {
       reactData.isCustomStatus = true;
     }
-    if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
+    if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       if (!tableId) {
         errLog('vxe.error.reqProp', ['id']);
         return this.$nextTick();
@@ -13137,7 +13143,7 @@ const Methods = {
           }
           vLen++;
         });
-        const isSelected = sLen >= vLen;
+        const isSelected = selectCheckboxMaps[rowid] || sLen >= vLen && (vLen >= 1 || hLen >= 1);
         const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
         if (checkField) {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, isSelected);
@@ -15559,6 +15565,27 @@ const Methods = {
     } = reactData;
     return isRowGroupStatus && row.isAggregate;
   },
+  getAggregateContentByRow(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      isRowGroupStatus
+    } = reactData;
+    return isRowGroupStatus && row && row.isAggregate ? row.groupContent : '';
+  },
+  getAggregateRowChildren(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
+    const {
+      childrenField,
+      mapChildrenField
+    } = aggregateOpts;
+    const {
+      isRowGroupStatus
+    } = reactData;
+    return isRowGroupStatus && row && row.isAggregate && childrenField && mapChildrenField ? row[mapChildrenField] || [] : [];
+  },
   isAggregateExpandByRow(row) {
     const $xeTable = this;
     const reactData = $xeTable;
@@ -17172,7 +17199,7 @@ const Methods = {
   }
 };
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,saveFilterPanelByEvent,resetFilterPanel,resetFilterPanelByEvent,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
+const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,saveFilterPanelByEvent,resetFilterPanel,resetFilterPanelByEvent,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getEditCell,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,toggleCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
   Methods[name] = function (...args) {
     if (!this[`_${name}`]) {
@@ -17182,7 +17209,7 @@ funcs.forEach(name => {
         errLog('vxe.error.reqModule', ['Validator']);
       } else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
         errLog('vxe.error.reqModule', ['Filter']);
-      } else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
+      } else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getEditCell,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
         errLog('vxe.error.reqModule', ['Edit']);
       } else if ('openCustom'.split(',').includes(name)) {
         errLog('vxe.error.reqModule', ['Custom']);
@@ -19432,22 +19459,29 @@ const {
   getIcon: panel_getIcon,
   renderEmptyElement: panel_renderEmptyElement
 } = core_.VxeUI;
-function panel_showDropTip(_vm, evnt, optEl, showLine, dragPos) {
-  const {
-    prevDragToChild
-  } = _vm;
-  const el = _vm.$refs.bodyElemRef;
-  if (!el) {
+function panel_showDropTip($xeTableCustomPanel, evnt, optEl, showLine, dragPos) {
+  const customPanelInternalData = $xeTableCustomPanel.internalData;
+  const bodyWrapperElem = $xeTableCustomPanel.$refs.refBodyWrapperElem;
+  if (!bodyWrapperElem) {
     return;
   }
-  const wrapperRect = el.getBoundingClientRect();
+  const customBodyElem = $xeTableCustomPanel.$refs.refCustomBodyElem;
+  if (!customBodyElem) {
+    return;
+  }
+  const {
+    prevDragToChild
+  } = customPanelInternalData;
+  const bodyWrapperRect = bodyWrapperElem.getBoundingClientRect();
+  const customBodyRect = customBodyElem.getBoundingClientRect();
   if (optEl) {
-    const dragLineEl = _vm.$refs.refDragLineElem;
+    const dragLineEl = $xeTableCustomPanel.$refs.refDragLineElem;
     if (dragLineEl) {
       if (showLine) {
         const optRect = optEl.getBoundingClientRect();
         dragLineEl.style.display = 'block';
-        dragLineEl.style.top = `${Math.max(1, optRect.y + el.scrollTop - wrapperRect.y)}px`;
+        dragLineEl.style.left = `${Math.max(0, customBodyRect.x - bodyWrapperRect.x)}px`;
+        dragLineEl.style.top = `${Math.max(1, optRect.y + bodyWrapperElem.scrollTop - bodyWrapperRect.y)}px`;
         dragLineEl.style.height = `${optRect.height}px`;
         dragLineEl.style.width = `${optRect.width}px`;
         dragLineEl.setAttribute('drag-pos', dragPos);
@@ -19457,17 +19491,17 @@ function panel_showDropTip(_vm, evnt, optEl, showLine, dragPos) {
       }
     }
   }
-  const dragTipEl = _vm.$refs.refDragTipElem;
+  const dragTipEl = $xeTableCustomPanel.$refs.refDragTipElem;
   if (dragTipEl) {
     dragTipEl.style.display = 'block';
-    dragTipEl.style.top = `${Math.min(el.clientHeight + el.scrollTop - dragTipEl.clientHeight, evnt.clientY + el.scrollTop - wrapperRect.y)}px`;
-    dragTipEl.style.left = `${Math.min(el.clientWidth + el.scrollLeft - dragTipEl.clientWidth, evnt.clientX + el.scrollLeft - wrapperRect.x)}px`;
+    dragTipEl.style.top = `${Math.min(bodyWrapperElem.clientHeight + bodyWrapperElem.scrollTop - dragTipEl.clientHeight, evnt.clientY + bodyWrapperElem.scrollTop - bodyWrapperRect.y)}px`;
+    dragTipEl.style.left = `${Math.min(bodyWrapperElem.clientWidth + bodyWrapperElem.scrollLeft - dragTipEl.clientWidth, evnt.clientX + bodyWrapperElem.scrollLeft - bodyWrapperRect.x)}px`;
     dragTipEl.setAttribute('drag-status', showLine ? prevDragToChild ? 'sub' : 'normal' : 'disabled');
   }
 }
-function panel_hideDropTip(_vm) {
-  const dragTipEl = _vm.$refs.refDragTipElem;
-  const dragLineEl = _vm.$refs.refDragLineElem;
+function panel_hideDropTip($xeTableCustomPanel) {
+  const dragTipEl = $xeTableCustomPanel.$refs.refDragTipElem;
+  const dragLineEl = $xeTableCustomPanel.$refs.refDragLineElem;
   if (dragTipEl) {
     dragTipEl.style.display = '';
   }
@@ -19475,9 +19509,12 @@ function panel_hideDropTip(_vm) {
     dragLineEl.style.display = '';
   }
 }
-const renderDragTip = (h, _vm) => {
-  const $xeTable = _vm.$xeTable;
-  const dragCol = $xeTable.dragColumnRef;
+const renderDragTip = (h, $xeTableCustomPanel) => {
+  const $xeTable = $xeTableCustomPanel.$xeTable;
+  const customPanelReactData = $xeTableCustomPanel.reactData;
+  const {
+    dragTipText
+  } = customPanelReactData;
   const columnDragOpts = $xeTable.computeColumnDragOpts;
   return h('div', {}, [h('div', {
     ref: 'refDragLineElem',
@@ -19495,18 +19532,22 @@ const renderDragTip = (h, _vm) => {
     class: ['vxe-table-custom-popup--drag-tip-normal-status', panel_getIcon().TABLE_DRAG_STATUS_ROW]
   }), h('span', {
     class: ['vxe-table-custom-popup--drag-tip-sub-status', panel_getIcon().TABLE_DRAG_STATUS_SUB_ROW]
+  }), h('span', {
+    class: ['vxe-table-custom-popup--drag-tip-group-status', panel_getIcon().TABLE_DRAG_STATUS_AGG_GROUP]
+  }), h('span', {
+    class: ['vxe-table-custom-popup--drag-tip-values-status', panel_getIcon().TABLE_DRAG_STATUS_AGG_VALUES]
   }), h('span', {
     class: ['vxe-table-custom-popup--drag-tip-disabled-status', panel_getIcon().TABLE_DRAG_DISABLED]
   })]), h('div', {
     class: 'vxe-table-custom-popup--drag-tip-content'
-  }, panel_getI18n('vxe.custom.cstmDragTarget', [dragCol && dragCol.type !== 'html' ? dragCol.getTitle() : '']))])])]);
+  }, `${dragTipText || ''}`)])])]);
 };
 const renderSimplePanel = (h, _vm) => {
   const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
   const props = _vm;
   const $xeTable = _vm.$xeTable;
   const tableProps = $xeTable;
-  const reactData = $xeTable;
+  const tableReactData = $xeTable;
   const $xeGrid = $xeTable.$xeGrid;
   const {
     customStore
@@ -19519,7 +19560,7 @@ const renderSimplePanel = (h, _vm) => {
   const {
     isCustomStatus,
     customColumnList
-  } = reactData;
+  } = tableReactData;
   const customOpts = $xeTable.computeCustomOpts;
   const {
     immediate
@@ -19603,9 +19644,9 @@ const renderSimplePanel = (h, _vm) => {
           title: panel_getI18n('vxe.custom.setting.colVisible')
         },
         on: {
-          click: () => {
+          click: evnt => {
             if (!isDisabled) {
-              _vm.changeCheckboxOption(column);
+              _vm.changeCheckboxOption(column, evnt);
             }
           }
         }
@@ -19651,8 +19692,10 @@ const renderSimplePanel = (h, _vm) => {
           title: panel_getI18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
         },
         on: {
-          click: () => {
-            _vm.changeFixedOption(column, 'left');
+          click: ({
+            $event
+          }) => {
+            _vm.changeFixedOption(column, 'left', $event);
           }
         }
       }), h(VxeUIButtonComponent, {
@@ -19664,8 +19707,10 @@ const renderSimplePanel = (h, _vm) => {
           title: panel_getI18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
         },
         on: {
-          click: () => {
-            _vm.changeFixedOption(column, 'right');
+          click: ({
+            $event
+          }) => {
+            _vm.changeFixedOption(column, 'right', $event);
           }
         }
       })]) : panel_renderEmptyElement($xeTable)]));
@@ -19679,11 +19724,15 @@ const renderSimplePanel = (h, _vm) => {
     style: maxHeight && !['left', 'right'].includes(placement || '') ? {
       maxHeight: `${maxHeight}px`
     } : {}
-  }, customStore.visible ? [!treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregateSimplePanel ? h($xeTable.getPivotTableAggregateSimplePanel(), {
+  }, customStore.visible ? [h('div', {
+    ref: 'refBodyWrapperElem',
+    class: 'vxe-table-custom-body-wrapper'
+  }, [!treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregateSimplePanel ? h($xeTable.getPivotTableAggregateSimplePanel(), {
     props: {
       customStore
     }
   }) : panel_renderEmptyElement($xeTable), h('div', {
+    ref: 'refCustomBodyElem',
     class: 'vxe-table-custom--handle-wrapper'
   }, [h('div', {
     class: 'vxe-table-custom--header'
@@ -19709,7 +19758,6 @@ const renderSimplePanel = (h, _vm) => {
   }, panel_getI18n('vxe.toolbar.customAll'))]) : h('span', {
     class: 'vxe-checkbox--label'
   }, panel_getI18n('vxe.table.customTitle'))])])]), h('div', {
-    ref: 'bodyElemRef',
     class: 'vxe-table-custom--body'
   }, [topSlot ? h('div', {
     class: 'vxe-table-custom--panel-top'
@@ -19724,7 +19772,7 @@ const renderSimplePanel = (h, _vm) => {
     on: customWrapperOns
   }, colVNs), bottomSlot ? h('div', {
     class: 'vxe-table-custom--panel-bottom'
-  }, $xeTable.callSlot(bottomSlot, params, h)) : panel_renderEmptyElement($xeTable), renderDragTip(h, _vm)]), customOpts.showFooter ? h('div', {
+  }, $xeTable.callSlot(bottomSlot, params, h)) : panel_renderEmptyElement($xeTable)]), customOpts.showFooter ? h('div', {
     class: 'vxe-table-custom--footer'
   }, footerSlot ? $xeTable.callSlot(footerSlot, params, h) : [h('div', {
     class: 'vxe-table-custom--footer-buttons'
@@ -19762,18 +19810,18 @@ const renderSimplePanel = (h, _vm) => {
     on: {
       click: _vm.confirmCustomEvent
     }
-  })])]) : null])] : []);
+  })])]) : null]), renderDragTip(h, _vm)])] : []);
 };
-const renderPopupPanel = (h, _vm) => {
+const renderPopupPanel = (h, $xeTableCustomPanel) => {
   const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
   const VxeUIDrawerComponent = core_.VxeUI.getComponent('VxeDrawer');
   const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
   const VxeUINumberInputComponent = core_.VxeUI.getComponent('VxeInput');
-  const $xeTableCustomPanel = _vm;
-  const props = _vm;
-  const $xeTable = _vm.$xeTable;
+  const _vm = $xeTableCustomPanel;
+  const props = $xeTableCustomPanel;
+  const $xeTable = $xeTableCustomPanel.$xeTable;
   const tableProps = $xeTable;
-  const reactData = $xeTable;
+  const tableReactData = $xeTable;
   const $xeGrid = $xeTable.$xeGrid;
   const {
     customStore
@@ -19784,7 +19832,7 @@ const renderPopupPanel = (h, _vm) => {
   const {
     isCustomStatus,
     customColumnList
-  } = reactData;
+  } = tableReactData;
   const customOpts = $xeTable.computeCustomOpts;
   const {
     immediate
@@ -19891,9 +19939,9 @@ const renderPopupPanel = (h, _vm) => {
           title: panel_getI18n('vxe.custom.setting.colVisible')
         },
         on: {
-          click: () => {
+          click: evnt => {
             if (!isDisabled) {
-              _vm.changeCheckboxOption(column);
+              _vm.changeCheckboxOption(column, evnt);
             }
           }
         }
@@ -19972,8 +20020,11 @@ const renderPopupPanel = (h, _vm) => {
           }]
         },
         on: {
-          input(value) {
-            _vm.changeFixedOption(column, value);
+          change({
+            label,
+            $event
+          }) {
+            _vm.changeFixedOption(column, label, $event);
           }
         }
       })]) : panel_renderEmptyElement($xeTable)]));
@@ -19981,12 +20032,12 @@ const renderPopupPanel = (h, _vm) => {
   });
   const scopedSlots = {
     default: () => {
-      if (defaultSlot) {
-        return $xeTable.callSlot(defaultSlot, params, h);
-      }
       return h('div', {
-        ref: 'bodyElemRef',
-        class: 'vxe-table-custom-popup--body'
+        ref: 'refBodyWrapperElem',
+        class: 'vxe-table-custom-popup--body-wrapper'
+      }, defaultSlot ? $xeTable.callSlot(defaultSlot, params, h) : [h('div', {
+        ref: 'refCustomBodyElem',
+        class: 'vxe-table-custom-popup--handle-wrapper'
       }, [topSlot ? h('div', {
         class: 'vxe-table-custom-popup--table-top'
       }, $xeTable.callSlot(topSlot, params, h)) : panel_renderEmptyElement($xeTable), h('div', {
@@ -20022,7 +20073,7 @@ const renderPopupPanel = (h, _vm) => {
         }
       }, 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)])]);
     },
     footer: () => {
       if (footerSlot) {
@@ -20126,27 +20177,44 @@ const renderPopupPanel = (h, _vm) => {
       default: () => ({})
     }
   },
+  provide() {
+    const $xeTableCustomPanel = this;
+    return {
+      $xeTableCustomPanel
+    };
+  },
   inject: {
     $xeTable: {
       default: null
     }
   },
   data() {
+    const reactData = {
+      dragCol: null,
+      dragGroup: null,
+      dragValues: null,
+      dragTipText: ''
+    };
+    const internalData = {
+      // prevDragCol: undefined,
+      // prevDragToChild: false,
+      // prevDragPos: null
+    };
     return {
-      prevDragCol: undefined,
-      prevDragToChild: false,
-      prevDragPos: null
+      reactData,
+      internalData
     };
   },
   computed: {},
   created() {
+    const $xeTableCustomPanel = this;
     const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
     const VxeUIDrawerComponent = core_.VxeUI.getComponent('VxeDrawer');
     const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
     const VxeUINumberInputComponent = core_.VxeUI.getComponent('VxeNumberInput');
     const VxeUIRadioGroupComponent = core_.VxeUI.getComponent('VxeRadioGroup');
-    this.$nextTick(() => {
-      const $xeTable = this.$xeTable;
+    $xeTableCustomPanel.$nextTick(() => {
+      const $xeTable = $xeTableCustomPanel.$xeTable;
       const {
         customOpts
       } = $xeTable;
@@ -20171,16 +20239,18 @@ const renderPopupPanel = (h, _vm) => {
     });
   },
   render(h) {
-    const $xeTable = this.$xeTable;
+    const $xeTableCustomPanel = this;
+    const $xeTable = $xeTableCustomPanel.$xeTable;
     const customOpts = $xeTable.computeCustomOpts;
     if (['modal', 'drawer', 'popup'].includes(`${customOpts.mode}`)) {
-      return renderPopupPanel(h, this);
+      return renderPopupPanel(h, $xeTableCustomPanel);
     }
-    return renderSimplePanel(h, this);
+    return renderSimplePanel(h, $xeTableCustomPanel);
   },
   methods: {
     handleWrapperMouseenterEvent(evnt) {
-      const $xeTable = this.$xeTable;
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
       const {
         customStore
       } = this;
@@ -20188,10 +20258,12 @@ const renderPopupPanel = (h, _vm) => {
       $xeTable.customOpenEvent(evnt);
     },
     handleWrapperMouseleaveEvent(evnt) {
-      const $xeTable = this.$xeTable;
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
+      const props = $xeTableCustomPanel;
       const {
         customStore
-      } = this;
+      } = props;
       customStore.activeWrapper = false;
       setTimeout(() => {
         if (!customStore.activeBtn && !customStore.activeWrapper) {
@@ -20205,9 +20277,10 @@ const renderPopupPanel = (h, _vm) => {
     confirmCustomEvent({
       $event
     }) {
-      const $xeTable = this.$xeTable;
-      const reactData = $xeTable;
-      reactData.isCustomStatus = true;
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
+      const tableReactData = $xeTable;
+      tableReactData.isCustomStatus = true;
       $xeTable.saveCustom();
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('confirm', $event);
@@ -20215,20 +20288,23 @@ const renderPopupPanel = (h, _vm) => {
     cancelCloseEvent({
       $event
     }) {
-      const $xeTable = this.$xeTable;
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('close', $event);
     },
     cancelCustomEvent({
       $event
     }) {
-      const $xeTable = this.$xeTable;
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
       $xeTable.cancelCustom();
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('cancel', $event);
     },
     handleResetCustomEvent(evnt) {
-      const $xeTable = this.$xeTable;
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
       $xeTable.resetCustom(true);
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('reset', evnt);
@@ -20248,27 +20324,13 @@ const renderPopupPanel = (h, _vm) => {
         this.handleResetCustomEvent(evnt);
       }
     },
-    resetPopupCustomEvent(evnt) {
-      if (core_.VxeUI.modal) {
-        core_.VxeUI.modal.confirm({
-          content: panel_getI18n('vxe.custom.cstmConfirmRestore'),
-          className: 'vxe-table--ignore-clear',
-          escClosable: true
-        }).then(type => {
-          if (type === 'confirm') {
-            this.resetCustomEvent(evnt);
-          }
-        });
-      } else {
-        this.resetCustomEvent(evnt);
-      }
-    },
     handleOptionCheck(column) {
-      const $xeTable = this.$xeTable;
-      const reactData = $xeTable;
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
+      const tableReactData = $xeTable;
       const {
         customColumnList
-      } = reactData;
+      } = tableReactData;
       const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(customColumnList, item => item === column);
       if (matchObj && matchObj.parent) {
         const {
@@ -20281,9 +20343,10 @@ const renderPopupPanel = (h, _vm) => {
         }
       }
     },
-    changeCheckboxOption(column) {
-      const $xeTable = this.$xeTable;
-      const reactData = $xeTable;
+    changeCheckboxOption(column, evnt) {
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
+      const tableReactData = $xeTable;
       const customOpts = $xeTable.computeCustomOpts;
       const isChecked = !column.renderVisible;
       if (customOpts.immediate) {
@@ -20292,7 +20355,7 @@ const renderPopupPanel = (h, _vm) => {
           item.renderVisible = isChecked;
           item.halfVisible = false;
         });
-        reactData.isCustomStatus = true;
+        tableReactData.isCustomStatus = true;
         $xeTable.handleCustom();
         $xeTable.saveCustomStore('update:visible');
       } else {
@@ -20303,63 +20366,114 @@ const renderPopupPanel = (h, _vm) => {
       }
       this.handleOptionCheck(column);
       $xeTable.checkCustomStatus();
+      $xeTable.dispatchEvent('custom-visible-change', {
+        column,
+        checked: isChecked
+      }, evnt);
     },
     changeColumnWidth(column) {
-      const $xeTable = this.$xeTable;
-      const reactData = $xeTable;
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
+      const tableReactData = $xeTable;
       const customOpts = $xeTable.computeCustomOpts;
       if (customOpts.immediate) {
         if (column.renderResizeWidth !== column.renderWidth) {
           column.resizeWidth = column.renderResizeWidth;
           column.renderWidth = column.renderResizeWidth;
-          reactData.isCustomStatus = true;
+          tableReactData.isCustomStatus = true;
           $xeTable.handleCustom();
           $xeTable.saveCustomStore('update:width');
         }
       }
     },
-    changeFixedOption(column, colFixed) {
-      const $xeTable = this.$xeTable;
-      const reactData = $xeTable;
+    changeFixedOption(column, colFixed, evnt) {
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
+      const tableReactData = $xeTable;
       const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
       const customOpts = $xeTable.computeCustomOpts;
+      let targetFixed = null;
       if (customOpts.immediate) {
         if (column.renderFixed === colFixed) {
+          targetFixed = '';
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], col => {
             col.fixed = '';
             col.renderFixed = '';
           });
         } else {
           if (!isMaxFixedColumn || column.renderFixed) {
+            targetFixed = colFixed;
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], col => {
               col.fixed = colFixed;
               col.renderFixed = colFixed;
             });
           }
         }
-        reactData.isCustomStatus = true;
+        tableReactData.isCustomStatus = true;
         $xeTable.handleCustom();
         $xeTable.saveCustomStore('update:fixed');
       } else {
         if (column.renderFixed === colFixed) {
+          targetFixed = '';
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], col => {
             col.renderFixed = '';
           });
         } else {
           if (!isMaxFixedColumn || column.renderFixed) {
+            targetFixed = colFixed;
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], col => {
               col.renderFixed = colFixed;
             });
           }
         }
       }
+      if (!targetFixed !== null) {
+        $xeTable.dispatchEvent('custom-fixed-change', {
+          column,
+          fixed: targetFixed
+        }, evnt);
+      }
     },
-    allOptionEvent() {
-      const $xeTable = this.$xeTable;
+    allOptionEvent(evnt) {
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
+      const tableReactData = $xeTable;
+      const {
+        customStore
+      } = tableReactData;
+      const isAll = !customStore.isAll;
       $xeTable.toggleCustomAllCheckbox();
+      $xeTable.dispatchEvent('custom-visible-all', {
+        checked: isAll
+      }, evnt);
+    },
+    updateColDropTipContent() {
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
+      const customPanelReactData = $xeTableCustomPanel.reactData;
+      const {
+        dragCol
+      } = customPanelReactData;
+      const columnDragOpts = $xeTable.computeColumnDragOpts;
+      const {
+        tooltipMethod
+      } = columnDragOpts;
+      let tipContent = '';
+      if (tooltipMethod) {
+        const dtParams = {
+          $table: $xeTable,
+          column: dragCol
+        };
+        tipContent = `${tooltipMethod(dtParams) || ''}`;
+      } else {
+        tipContent = panel_getI18n('vxe.custom.cstmDragTarget', [dragCol && dragCol.type !== 'html' ? dragCol.getTitle() : '']);
+      }
+      customPanelReactData.dragTipText = tipContent;
     },
     sortMousedownEvent(evnt) {
-      const $xeTable = this.$xeTable;
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
+      const customPanelReactData = $xeTableCustomPanel.reactData;
       const btnEl = evnt.currentTarget;
       const cellEl = btnEl.parentElement;
       const tdEl = cellEl.parentElement;
@@ -20367,44 +20481,48 @@ const renderPopupPanel = (h, _vm) => {
       const colid = trEl.getAttribute('colid');
       const column = $xeTable.getColumnById(colid);
       trEl.draggable = true;
-      this.dragCol = column;
+      customPanelReactData.dragCol = column;
+      this.updateColDropTipContent();
       addClass(trEl, 'active--drag-origin');
     },
     sortMouseupEvent(evnt) {
+      const $xeTableCustomPanel = this;
+      const customPanelReactData = $xeTableCustomPanel.reactData;
       const btnEl = evnt.currentTarget;
       const cellEl = btnEl.parentElement;
       const tdEl = cellEl.parentElement;
       const trEl = tdEl.parentElement;
-      panel_hideDropTip(this);
+      panel_hideDropTip($xeTableCustomPanel);
       trEl.draggable = false;
-      this.dragCol = null;
+      customPanelReactData.dragCol = null;
       removeClass(trEl, 'active--drag-origin');
     },
     sortDragstartEvent(evnt) {
+      const $xeTableCustomPanel = this;
+      const customPanelReactData = $xeTableCustomPanel.reactData;
       if (evnt.dataTransfer) {
         evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
       }
+      customPanelReactData.dragGroup = null;
+      customPanelReactData.dragValues = null;
     },
     sortDragendEvent(evnt) {
-      const $xeTable = this.$xeTable;
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
       const tableProps = $xeTable;
-      const reactData = $xeTable;
-      const internalData = $xeTable;
-      const {
-        dragCol,
-        prevDragPos,
-        prevDragCol,
-        prevDragToChild
-      } = this;
+      const tableReactData = $xeTable;
+      const tableInternalData = $xeTable;
+      const customPanelReactData = $xeTableCustomPanel.reactData;
+      const customPanelInternalData = $xeTableCustomPanel.internalData;
       const {
         mouseConfig
       } = tableProps;
       const {
         customColumnList
-      } = reactData;
+      } = tableReactData;
       const {
         collectColumn
-      } = internalData;
+      } = tableInternalData;
       const customOpts = $xeTable.computeCustomOpts;
       const {
         immediate
@@ -20417,8 +20535,22 @@ const renderPopupPanel = (h, _vm) => {
         isToChildDrag,
         dragEndMethod
       } = columnDragOpts;
+      const {
+        dragCol,
+        dragGroup,
+        dragValues
+      } = customPanelReactData;
+      const {
+        prevDragCol,
+        prevDragPos,
+        prevDragToChild
+      } = customPanelInternalData;
       const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
-      if (prevDragCol && dragCol) {
+      if (dragGroup || dragValues) {
+        if ($xeTable.handlePivotTableAggregatePanelDragendEvent) {
+          $xeTable.handlePivotTableAggregatePanelDragendEvent(evnt);
+        }
+      } else if (prevDragCol && dragCol) {
         // 判断是否有拖动
         if (prevDragCol !== dragCol) {
           const dragColumn = dragCol;
@@ -20544,7 +20676,7 @@ const renderPopupPanel = (h, _vm) => {
               nafIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(customColumnList, item => item.id === newColumn.id);
               customColumnList.splice(nafIndex + dragOffsetIndex, 0, dragColumn);
             }
-            reactData.isDragColMove = true;
+            tableReactData.isDragColMove = true;
             if (mouseConfig) {
               if ($xeTable.clearSelected) {
                 $xeTable.clearSelected();
@@ -20566,24 +20698,29 @@ const renderPopupPanel = (h, _vm) => {
               }
             }, evnt);
             if (immediate) {
-              reactData.customColumnList = collectColumn.slice(0);
+              tableReactData.customColumnList = collectColumn.slice(0);
               $xeTable.handleColDragSwapColumn();
             }
           }).catch(() => {});
         }
       }
-      panel_hideDropTip(this);
-      this.dragCol.value = null;
+      panel_hideDropTip($xeTableCustomPanel);
+      customPanelReactData.dragCol = null;
+      customPanelReactData.dragGroup = null;
+      customPanelReactData.dragValues = null;
       trEl.draggable = false;
       trEl.removeAttribute('drag-pos');
       removeClass(trEl, 'active--drag-target');
       removeClass(trEl, 'active--drag-origin');
     },
     sortDragoverEvent(evnt) {
-      const $xeTable = this.$xeTable;
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
+      const customPanelReactData = $xeTableCustomPanel.reactData;
+      const customPanelInternalData = $xeTableCustomPanel.internalData;
       const {
         dragCol
-      } = this;
+      } = customPanelReactData;
       const customOpts = $xeTable.computeCustomOpts;
       const {
         immediate
@@ -20597,19 +20734,21 @@ const renderPopupPanel = (h, _vm) => {
       const isControlKey = hasControlKey(evnt);
       const colid = optEl.getAttribute('colid');
       const column = $xeTable.getColumnById(colid);
+      customPanelReactData.dragGroup = null;
+      customPanelReactData.dragValues = null;
       // 是否移入有效列
       if (column && (isCrossDrag || column.level === 1)) {
         evnt.preventDefault();
         const offsetY = evnt.clientY - optEl.getBoundingClientRect().y;
         const dragPos = offsetY < optEl.clientHeight / 2 ? 'top' : 'bottom';
         if (dragCol && dragCol.id === column.id || !isCrossDrag && column.level > 1 || !immediate && column.level > 1 || column.renderFixed) {
-          panel_showDropTip(this, evnt, optEl, false, dragPos);
+          panel_showDropTip($xeTableCustomPanel, evnt, optEl, false, dragPos);
           return;
         }
-        this.prevDragToChild = !!(isCrossDrag && isToChildDrag && isControlKey && immediate);
-        this.prevDragCol = column;
-        this.prevDragPos = dragPos;
-        panel_showDropTip(this, evnt, optEl, true, dragPos);
+        customPanelInternalData.prevDragToChild = !!(isCrossDrag && isToChildDrag && isControlKey && immediate);
+        customPanelInternalData.prevDragCol = column;
+        customPanelInternalData.prevDragPos = dragPos;
+        panel_showDropTip($xeTableCustomPanel, evnt, optEl, true, dragPos);
       }
     }
   }
@@ -23473,27 +23612,63 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
     },
     _getActiveRecord() {
       const $xeTable = this;
-      warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord']);
-      // 即将废弃
-      return $xeTable.getEditRecord();
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditCell']);
+      const {
+        editStore
+      } = reactData;
+      const {
+        fullAllDataRowIdData
+      } = internalData;
+      const {
+        args,
+        row
+      } = editStore.actived;
+      if (args && row && fullAllDataRowIdData[getRowid($xeTable, row)]) {
+        return Object.assign({}, args, {
+          row
+        });
+      }
+      return null;
     },
     _getEditRecord() {
       const $xeTable = this;
       const reactData = $xeTable;
       const internalData = $xeTable;
+      warnLog('vxe.error.delFunc', ['getEditRecord', 'getEditCell']);
       const {
         editStore
       } = reactData;
       const {
-        afterFullData
+        fullAllDataRowIdData
       } = internalData;
-      const el = $xeTable.$refs.refElem;
       const {
         args,
         row
       } = editStore.actived;
-      if (args && $xeTable.findRowIndexOf(afterFullData, row) > -1 && el.querySelectorAll('.vxe-body--column.col--active').length) {
-        return Object.assign({}, args);
+      if (args && row && fullAllDataRowIdData[getRowid($xeTable, row)]) {
+        return Object.assign({}, args, {
+          row
+        });
+      }
+      return null;
+    },
+    _getEditCell() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        editStore
+      } = reactData;
+      const {
+        row,
+        column
+      } = editStore.actived;
+      if (column && row) {
+        return {
+          row,
+          column
+        };
       }
       return null;
     },
@@ -23698,11 +23873,14 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
         editStore
       } = reactData;
       const {
-        args,
+        row,
         column
       } = editStore.selected;
-      if (args && column) {
-        return Object.assign({}, args);
+      if (row && column) {
+        return {
+          row,
+          column
+        };
       }
       return null;
     },
@@ -23841,11 +24019,20 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
     const childrenField = treeOpts.children || treeOpts.childrenField;
     // 如果是树表格只允许导出数据源
     const rest = [];
-    const expandMaps = new Map();
+    const expandMaps = {};
+    const useMaps = {};
+    const {
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(datas, (item, $rowIndex, items, path, parent, nodes) => {
       const row = item._row || item;
+      const rowid = handleGetRowId(row);
+      if (useMaps[rowid]) {
+        return;
+      }
       const parentRow = parent && parent._row ? parent._row : parent;
-      if (isAllExpand || !parentRow || expandMaps.has(parentRow) && $xeTable.isTreeExpandByRow(parentRow)) {
+      const pRowid = parentRow ? handleGetRowId(parentRow) : '';
+      if (isAllExpand || !parentRow || expandMaps[pRowid] && $xeTable.isTreeExpandByRow(parentRow)) {
         const hasRowChild = hasTreeChildren($xeTable, row);
         const item = {
           _row: row,
@@ -23916,7 +24103,10 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
           }
           item[column.id] = toStringValue(cellValue);
         });
-        expandMaps.set(row, 1);
+        useMaps[rowid] = true;
+        if (pRowid) {
+          expandMaps[pRowid] = true;
+        }
         rest.push(Object.assign(item, row));
       }
     }, {
@@ -25069,6 +25259,7 @@ const convertToRows = originColumns => {
       const {
         tableFullColumn,
         afterFullData,
+        afterTreeFullData,
         collectColumn,
         mergeBodyList,
         mergeFooterList
@@ -25344,8 +25535,10 @@ const convertToRows = originColumns => {
             }
           }
         } else if (mode === 'current') {
-          handleOptions.data = afterFullData;
+          handleOptions.data = treeConfig ? afterTreeFullData : afterFullData;
         }
+      } else {
+        handleOptions._isCustomData = true;
       }
       return handleExport($xeTable, handleOptions);
     },
@@ -26928,6 +27121,17 @@ function emitCustomEvent($xeTable, type, evnt) {
       }
       return $xeTable.$nextTick();
     },
+    _toggleCustom() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        customStore
+      } = reactData;
+      if (customStore.visible) {
+        return $xeTable.closeCustom();
+      }
+      return $xeTable.openCustom();
+    },
     _saveCustom() {
       const $xeTable = this;
       const reactData = $xeTable;