vxe-table 3.12.0-beta.8 → 3.12.0

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.0-beta.8";
+const version = "3.12.0";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2251,7 +2251,7 @@ core_.VxeUI.setConfig({
     //   keyField: '_X_ROW_KEY' // 行数据的唯一主键字段名
     // },
     resizeConfig: {
-      // refreshDelay: 250
+      // refreshDelay: 20
     },
     resizableConfig: {
       dragMode: 'auto',
@@ -2808,7 +2808,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.0-beta.8"}`;
+const log_version = `table v${"3.12.0"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3514,6 +3514,9 @@ function getChangeEvent(renderOpts) {
   return 'change';
 }
 function getSlotVNs(vns) {
+  if (vns === null || vns === undefined) {
+    return [];
+  }
   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(vns)) {
     return vns;
   }
@@ -3629,6 +3632,7 @@ function renderCellBaseVNs(h, params, content) {
   const rowDragOpts = $table.computeRowDragOpts;
   const {
     showIcon,
+    isPeerDrag,
     isCrossDrag,
     visibleMethod
   } = rowDragOpts;
@@ -3636,7 +3640,7 @@ function renderCellBaseVNs(h, params, content) {
   const vns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(content) ? content : [content];
   if (dragSort && rowOpts.drag && (showIcon || (dragConfig ? dragConfig.showRowIcon : false)) && (!rVisibleMethod || rVisibleMethod(params))) {
     if (treeConfig) {
-      if (isCrossDrag || !level) {
+      if (isPeerDrag || isCrossDrag || !level) {
         vns.unshift(renderCellDragIcon(h, params));
       }
     } else {
@@ -3656,12 +3660,13 @@ function renderHeaderCellDragIcon(h, params) {
     showIcon,
     icon,
     trigger,
+    isPeerDrag,
     isCrossDrag,
     visibleMethod,
     disabledMethod
   } = columnDragOpts;
   if (columnOpts.drag && showIcon && (!visibleMethod || visibleMethod(params))) {
-    if (!column.fixed && (isCrossDrag || !column.parentId)) {
+    if (!column.fixed && (isPeerDrag || isCrossDrag || !column.parentId)) {
       const isDisabled = disabledMethod && disabledMethod(params);
       const ons = {};
       if (trigger !== 'cell') {
@@ -3698,18 +3703,20 @@ function renderTitleContent(h, params, content) {
     type,
     showHeaderOverflow
   } = column;
+  const tableProps = $table;
+  const tableReactData = $table;
   const {
-    showHeaderOverflow: allColumnHeaderOverflow,
-    tooltipOpts
-  } = $table;
-  const showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
+    showHeaderOverflow: allColumnHeaderOverflow
+  } = tableProps;
+  const tooltipOpts = $table.computeTooltipOpts;
+  const showAllTip = tooltipOpts.showAll;
   const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showHeaderOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
   const showTitle = headOverflow === 'title';
   const showTooltip = headOverflow === true || headOverflow === 'tooltip';
   const ons = {};
   if (showTitle || showTooltip || showAllTip) {
     ons.mouseenter = evnt => {
-      if ($table._isResize) {
+      if (tableReactData._isResize) {
         return;
       }
       if (showTitle) {
@@ -3721,7 +3728,7 @@ function renderTitleContent(h, params, content) {
   }
   if (showTooltip || showAllTip) {
     ons.mouseleave = evnt => {
-      if ($table._isResize) {
+      if (tableReactData._isResize) {
         return;
       }
       if (showTooltip || showAllTip) {
@@ -3742,13 +3749,13 @@ function renderTitleContent(h, params, content) {
 }
 function formatFooterLabel(footerFormatter, params) {
   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerFormatter)) {
-    return footerFormatter(params);
+    return `${footerFormatter(params)}`;
   }
   const isArr = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(footerFormatter);
   const gFormatOpts = isArr ? cell_formats.get(footerFormatter[0]) : cell_formats.get(footerFormatter);
   const footerFormatMethod = gFormatOpts ? gFormatOpts.tableFooterCellFormatMethod : null;
   if (footerFormatMethod) {
-    return isArr ? footerFormatMethod(params, ...footerFormatter.slice(1)) : footerFormatMethod(params);
+    return `${isArr ? footerFormatMethod(params, ...footerFormatter.slice(1)) : footerFormatMethod(params)}`;
   }
   return '';
 }
@@ -3948,12 +3955,16 @@ const Cell = {
       $table,
       isHidden
     } = params;
+    const tableReactData = $table;
+    const tableInternalData = $table;
     const {
-      treeOpts,
       treeExpandedMaps,
-      treeExpandLazyLoadedMaps,
+      treeExpandLazyLoadedMaps
+    } = tableReactData;
+    const {
       fullAllDataRowIdData
-    } = $table;
+    } = tableInternalData;
+    const treeOpts = $table.computeTreeOpts;
     const {
       row,
       column,
@@ -3975,17 +3986,18 @@ const Cell = {
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     const rowChilds = row[childrenField];
     const hasChild = rowChilds && rowChilds.length;
+    const iconSlot = slots ? slots.icon : null;
     let hasLazyChilds = false;
-    let isAceived = false;
+    let isActive = false;
     let isLazyLoading = false;
     let isLazyLoaded = false;
-    const on = {};
-    if (slots && slots.icon) {
-      return $table.callSlot(slots.icon, params, h, cellVNodes);
+    const ons = {};
+    if (iconSlot) {
+      return $table.callSlot(iconSlot, params, h);
     }
     if (!isHidden) {
       const rowid = getRowid($table, row);
-      isAceived = !!treeExpandedMaps[rowid];
+      isActive = !!treeExpandedMaps[rowid];
       if (lazy) {
         const rest = fullAllDataRowIdData[rowid];
         isLazyLoading = !!treeExpandLazyLoadedMaps[rowid];
@@ -3994,22 +4006,22 @@ const Cell = {
       }
     }
     if (!trigger || trigger === 'default') {
-      on.click = evnt => {
+      ons.click = evnt => {
         $table.triggerTreeExpandEvent(evnt, params);
       };
     }
     return [h('div', {
       class: ['vxe-cell--tree-node', {
-        'is--active': isAceived
+        'is--active': isActive
       }],
       style: {
         paddingLeft: `${level * indent}px`
       }
     }, [showIcon && (lazy ? isLazyLoaded ? hasChild : hasLazyChilds : hasChild) ? [h('div', {
       class: 'vxe-tree--btn-wrapper',
-      on
+      on: ons
     }, [h('i', {
-      class: ['vxe-tree--node-btn', isLazyLoading ? iconLoaded || cell_getIcon().TABLE_TREE_LOADED : isAceived ? iconOpen || cell_getIcon().TABLE_TREE_OPEN : iconClose || cell_getIcon().TABLE_TREE_CLOSE]
+      class: ['vxe-tree--node-btn', isLazyLoading ? iconLoaded || cell_getIcon().TABLE_TREE_LOADED : isActive ? iconOpen || cell_getIcon().TABLE_TREE_OPEN : iconClose || cell_getIcon().TABLE_TREE_CLOSE]
     })])] : null, h('div', {
       class: 'vxe-tree-cell'
     }, cellVNodes)])];
@@ -4032,10 +4044,11 @@ const Cell = {
       $table,
       column
     } = params;
+    const tableProps = $table;
     const {
-      treeConfig,
-      seqOpts
-    } = $table;
+      treeConfig
+    } = tableProps;
+    const seqOpts = $table.computeSeqOpts;
     const {
       slots
     } = column;
@@ -4074,10 +4087,11 @@ const Cell = {
       column,
       isHidden
     } = params;
+    const tableReactData = $table;
     const {
-      radioOpts,
       selectRadioRow
-    } = $table;
+    } = tableReactData;
+    const radioOpts = $table.computeRadioOpts;
     const {
       slots
     } = column;
@@ -4151,25 +4165,24 @@ const Cell = {
       column,
       isHidden
     } = params;
+    const tableReactData = $table;
     const {
       isAllSelected: isAllCheckboxSelected,
-      isIndeterminate: isAllCheckboxIndeterminate,
-      isAllCheckboxDisabled
-    } = $table;
+      isIndeterminate: isAllCheckboxIndeterminate
+    } = tableReactData;
+    const isAllCheckboxDisabled = $table.computeIsAllCheckboxDisabled;
     const {
       slots
     } = column;
     const headerSlot = slots ? slots.header : null;
     const titleSlot = slots ? slots.title : null;
-    const checkboxOpts = $table.checkboxOpts;
+    const checkboxOpts = $table.computeCheckboxOpts;
     const headerTitle = column.getTitle();
-    let on;
+    const ons = {};
     if (!isHidden) {
-      on = {
-        click(evnt) {
-          if (!isAllCheckboxDisabled) {
-            $table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected);
-          }
+      ons.click = evnt => {
+        if (!isAllCheckboxDisabled) {
+          $table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected);
         }
       };
     }
@@ -4196,7 +4209,7 @@ const Cell = {
       attrs: {
         title: cell_getI18n('vxe.table.allTitle')
       },
-      on
+      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]
     })].concat(titleSlot || headerTitle ? [h('span', {
@@ -4210,16 +4223,21 @@ const Cell = {
       column,
       isHidden
     } = params;
+    const tableProps = $table;
+    const tableReactData = $table;
     const {
-      treeConfig,
-      treeIndeterminateMaps,
-      selectCheckboxMaps
-    } = $table;
+      treeConfig
+    } = tableProps;
+    const {
+      selectCheckboxMaps,
+      treeIndeterminateMaps
+    } = tableReactData;
+    const checkboxOpts = $table.computeCheckboxOpts;
     const {
       labelField,
       checkMethod,
       visibleMethod
-    } = $table.checkboxOpts;
+    } = checkboxOpts;
     const {
       slots
     } = column;
@@ -4231,15 +4249,13 @@ const Cell = {
       row
     });
     let isDisabled = !!checkMethod;
-    let on;
+    const ons = {};
     if (!isHidden) {
       const rowid = getRowid($table, row);
       isChecked = !!selectCheckboxMaps[rowid];
-      on = {
-        click(evnt) {
-          if (!isDisabled && isVisible) {
-            $table.triggerCheckRowEvent(evnt, params, !isChecked);
-          }
+      ons.click = evnt => {
+        if (!isDisabled && isVisible) {
+          $table.triggerCheckRowEvent(evnt, params, !isChecked);
         }
       };
       if (checkMethod) {
@@ -4279,7 +4295,7 @@ const Cell = {
         'is--indeterminate': indeterminate,
         'is--hidden': !isVisible
       }],
-      on
+      on: ons
     }, checkVNs)]);
   },
   renderTreeSelectionCell(h, params) {
@@ -4292,11 +4308,15 @@ const Cell = {
       column,
       isHidden
     } = params;
+    const tableProps = $table;
+    const tableReactData = $table;
     const {
-      treeConfig,
-      treeIndeterminateMaps,
-      checkboxOpts
-    } = $table;
+      treeConfig
+    } = tableProps;
+    const {
+      treeIndeterminateMaps
+    } = tableReactData;
+    const checkboxOpts = $table.computeCheckboxOpts;
     const {
       labelField,
       checkField,
@@ -4315,15 +4335,13 @@ const Cell = {
       row
     });
     let isDisabled = !!checkMethod;
-    let on;
+    const ons = {};
     if (!isHidden) {
       const rowid = getRowid($table, row);
       isChecked = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
-      on = {
-        click(evnt) {
-          if (!isDisabled && isVisible) {
-            $table.triggerCheckRowEvent(evnt, params, !isChecked);
-          }
+      ons.click = evnt => {
+        if (!isDisabled && isVisible) {
+          $table.triggerCheckRowEvent(evnt, params, !isChecked);
         }
       };
       if (checkMethod) {
@@ -4363,7 +4381,7 @@ const Cell = {
         'is--indeterminate': indeterminateField && !isChecked ? row[indeterminateField] : isIndeterminate,
         'is--hidden': !isVisible
       }],
-      on
+      on: ons
     }, checkVNs)]);
   },
   renderTreeSelectionCellByProp(h, params) {
@@ -4379,11 +4397,12 @@ const Cell = {
       row,
       column
     } = params;
+    const tableReactData = $table;
     const {
-      expandOpts,
       rowExpandedMaps,
       rowExpandLazyLoadedMaps
-    } = $table;
+    } = tableReactData;
+    const expandOpts = $table.computeExpandOpts;
     const {
       lazy,
       labelField,
@@ -4397,21 +4416,22 @@ const Cell = {
       slots
     } = column;
     const defaultSlot = slots ? slots.default : null;
-    let isAceived = false;
+    const iconSlot = slots ? slots.icon : null;
+    let isActive = false;
     let isLazyLoading = false;
-    if (slots && slots.icon) {
-      return renderCellBaseVNs(h, params, $table.callSlot(slots.icon, params, h));
+    if (iconSlot) {
+      return renderCellBaseVNs(h, params, $table.callSlot(iconSlot, params, h));
     }
     if (!isHidden) {
       const rowid = getRowid($table, row);
-      isAceived = !!rowExpandedMaps[rowid];
+      isActive = !!rowExpandedMaps[rowid];
       if (lazy) {
         isLazyLoading = !!rowExpandLazyLoadedMaps[rowid];
       }
     }
     return renderCellBaseVNs(h, params, [showIcon && (!visibleMethod || visibleMethod(params)) ? h('span', {
       class: ['vxe-table--expanded', {
-        'is--active': isAceived
+        'is--active': isActive
       }],
       on: {
         click(evnt) {
@@ -4419,7 +4439,7 @@ const Cell = {
         }
       }
     }, [h('i', {
-      class: ['vxe-table--expand-btn', isLazyLoading ? iconLoaded || cell_getIcon().TABLE_EXPAND_LOADED : isAceived ? iconOpen || cell_getIcon().TABLE_EXPAND_OPEN : iconClose || cell_getIcon().TABLE_EXPAND_CLOSE]
+      class: ['vxe-table--expand-btn', isLazyLoading ? iconLoaded || cell_getIcon().TABLE_EXPAND_LOADED : isActive ? iconOpen || cell_getIcon().TABLE_EXPAND_OPEN : iconClose || cell_getIcon().TABLE_EXPAND_CLOSE]
     })]) : renderEmptyElement($table), defaultSlot || labelField ? h('span', {
       class: 'vxe-table--expand-label'
     }, defaultSlot ? $table.callSlot(defaultSlot, params, h) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, labelField)) : renderEmptyElement($table)]);
@@ -4534,10 +4554,11 @@ const Cell = {
       column,
       hasFilter
     } = params;
+    const tableReactData = $table;
     const {
-      filterStore,
-      filterOpts
-    } = $table;
+      filterStore
+    } = tableReactData;
+    const filterOpts = $table.computeFilterOpts;
     const {
       showIcon,
       iconNone,
@@ -4569,14 +4590,14 @@ const Cell = {
       $table,
       column
     } = params;
+    const tableProps = $table;
     const {
       editConfig,
-      editRules,
-      editOpts
-    } = $table;
+      editRules
+    } = tableProps;
+    const editOpts = $table.computeEditOpts;
     const {
       sortable,
-      remoteSort,
       filters,
       editRender
     } = column;
@@ -4595,7 +4616,7 @@ const Cell = {
         class: ['vxe-cell--edit-icon', editOpts.icon || cell_getIcon().TABLE_EDIT]
       }) : renderEmptyElement($table)];
     }
-    return renderHeaderCellBaseVNs(h, params, editIconVNs.concat(Cell.renderHeaderTitle(h, params)).concat(sortable || remoteSort ? Cell.renderSortIcon(h, params) : []).concat(filters ? Cell.renderFilterIcon(h, params) : []));
+    return renderHeaderCellBaseVNs(h, params, editIconVNs.concat(Cell.renderHeaderTitle(h, params)).concat(sortable ? Cell.renderSortIcon(h, params) : []).concat(filters ? Cell.renderFilterIcon(h, params) : []));
   },
   // 行格编辑模式
   renderRowEdit(h, params) {
@@ -4603,12 +4624,16 @@ const Cell = {
       $table,
       column
     } = params;
+    const tableReactData = $table;
     const {
-      editRender
-    } = column;
+      editStore
+    } = tableReactData;
     const {
       actived
-    } = $table.editStore;
+    } = editStore;
+    const {
+      editRender
+    } = column;
     return Cell.runRenderer(h, params, this, isEnableConf(editRender) && actived && actived.row === params.row);
   },
   renderTreeRowEdit(h, params) {
@@ -4620,12 +4645,16 @@ const Cell = {
       $table,
       column
     } = params;
+    const tableReactData = $table;
     const {
-      editRender
-    } = column;
+      editStore
+    } = tableReactData;
     const {
       actived
-    } = $table.editStore;
+    } = editStore;
+    const {
+      editRender
+    } = column;
     return Cell.runRenderer(h, params, this, isEnableConf(editRender) && actived && actived.row === params.row && actived.column === params.column);
   },
   renderTreeCellEdit(h, params) {
@@ -5040,33 +5069,28 @@ function handleVirtualXVisible($xeTable) {
   };
 }
 const computeRowHeight = $xeTable => {
-  const props = $xeTable;
-  const {
-    showOverflow
-  } = props;
   const tableHeader = $xeTable.$refs.tableHeader;
   const tableBody = $xeTable.$refs.tableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   const vSize = $xeTable.computeSize;
   const rowHeightMaps = $xeTable.computeRowHeightMaps;
-  let rowHeight = 24;
-  if (showOverflow) {
-    if (tableBodyElem) {
-      const tableHeaderElem = tableHeader ? tableHeader.$el : null;
-      let firstTrElem;
-      firstTrElem = tableBodyElem.querySelector('tr');
-      if (!firstTrElem && tableHeaderElem) {
-        firstTrElem = tableHeaderElem.querySelector('tr');
-      }
-      if (firstTrElem) {
-        rowHeight = firstTrElem.clientHeight;
-      }
-      if (!rowHeight) {
-        rowHeight = rowHeightMaps[vSize || 'default'];
-      }
+  let rowHeight = 0;
+  if (tableBodyElem) {
+    const tableHeaderElem = tableHeader ? tableHeader.$el : null;
+    let firstTrElem;
+    firstTrElem = tableBodyElem.querySelector('tr');
+    if (!firstTrElem && tableHeaderElem) {
+      firstTrElem = tableHeaderElem.querySelector('tr');
     }
+    if (firstTrElem) {
+      rowHeight = firstTrElem.clientHeight;
+    }
+  }
+  if (!rowHeight) {
+    rowHeight = rowHeightMaps[vSize || 'default'];
   }
-  return rowHeight;
+  // 最低支持 18px 行高
+  return Math.max(18, rowHeight);
 };
 function handleVirtualYVisible($xeTable) {
   const internalData = $xeTable;
@@ -5535,7 +5559,9 @@ const handleScrollToRowColumn = ($xeTable, fieldOrColumn, row) => {
   return $xeTable.$nextTick();
 };
 function handleRecalculateLayout($xeTable, reFull) {
+  const internalData = $xeTable;
   const el = $xeTable.$refs.refElem;
+  internalData.reRunTime = Date.now();
   if (!el || !el.clientWidth) {
     return $xeTable.$nextTick();
   }
@@ -6024,7 +6050,7 @@ const Methods = {
     const isLazy = treeConfig && treeOpts.lazy;
     const fullAllDataRowIdMaps = {};
     const fullDataRowIdMaps = {};
-    const handleCache = (row, index, items, path, parent, nodes) => {
+    const handleCache = (row, index, items, path, parentRow, nodes) => {
       let rowid = getRowid(this, row);
       const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
       const level = nodes ? nodes.length - 1 : 0;
@@ -6045,16 +6071,16 @@ const Methods = {
           _index: -1,
           $index: -1,
           items,
-          parent,
+          parent: parentRow,
           level,
           height: 0
         };
       }
       cacheItem.row = row;
       cacheItem.items = items;
-      cacheItem.parent = parent;
+      cacheItem.parent = parentRow;
       cacheItem.level = level;
-      cacheItem.index = treeConfig && parent ? -1 : index;
+      cacheItem.index = treeConfig && parentRow ? -1 : index;
       if (isSource) {
         fullDataRowIdMaps[rowid] = cacheItem;
       }
@@ -6137,9 +6163,9 @@ const Methods = {
           sourceDataRowIdData[rowid] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(childRow, true);
         });
       }
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, (childRow, index, items, path, parent, nodes) => {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, (childRow, index, items, path, parentItem, nodes) => {
         const rowid = getRowid($xeTable, childRow);
-        const parentRow = parent || parentRest.row;
+        const parentRow = parentItem || parentRest.row;
         const rest = {
           row: childRow,
           rowid,
@@ -6196,7 +6222,7 @@ const Methods = {
     let radioColumn;
     let htmlColumn;
     let hasFixed;
-    const handleFunc = (column, index, items, path, parent) => {
+    const handleFunc = (column, index, items, path, parentColumn) => {
       const {
         id: colid,
         field,
@@ -6211,7 +6237,7 @@ const Methods = {
         colid,
         index,
         items,
-        parent: parent || null,
+        parent: parentColumn || null,
         width: 0
       };
       if (field) {
@@ -6275,9 +6301,9 @@ const Methods = {
       fullColumnIdData[colid] = rest;
     };
     if (isGroup) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent, nodes) => {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn, nodes) => {
         column.level = nodes.length;
-        handleFunc(column, index, items, path, parent);
+        handleFunc(column, index, items, path, parentColumn);
       });
     } else {
       tableFullColumn.forEach(handleFunc);
@@ -6947,10 +6973,10 @@ const Methods = {
     if (treeConfig && treeOpts.transform) {
       const fullData = [];
       const expandMaps = {};
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, (row, index, items, path, parent) => {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, (row, index, items, path, parentRow) => {
         const rowid = getRowid(this, row);
-        const parentRowid = getRowid(this, parent);
-        if (!parent || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
+        const parentRowid = getRowid(this, parentRow);
+        if (!parentRow || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
           const rowRest = fullAllDataRowIdData[rowid];
           if (rowRest) {
             rowRest._index = fullData.length;
@@ -7646,11 +7672,11 @@ const Methods = {
     let hasCustomSort = false;
     // 处理还原
     if (resizableData || sortData || visibleData || fixedData) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent) => {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentRow) => {
         const colKey = column.getKey();
         // 支持一级
-        if (!parent) {
-          if (fixedData && fixedData[colKey]) {
+        if (!parentRow) {
+          if (fixedData && fixedData[colKey] !== undefined) {
             column.fixed = fixedData[colKey];
           }
           if (sortData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(sortData[colKey])) {
@@ -7744,9 +7770,9 @@ const Methods = {
     let hasSort = 0;
     let hasFixedt = 0;
     let hasVisible = 0;
-    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent) => {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn) => {
       // 只支持一级
-      if (!parent) {
+      if (!parentColumn) {
         collectColumn.forEach(column => {
           const colKey = column.getKey();
           if (colKey) {
@@ -7754,7 +7780,7 @@ const Methods = {
             sortData[colKey] = column.renderSortNumber;
           }
         });
-        if (column.fixed && column.fixed !== column.defaultFixed) {
+        if (column.fixed !== column.defaultFixed) {
           const colKey = column.getKey();
           if (colKey) {
             hasFixedt = 1;
@@ -7890,13 +7916,13 @@ const Methods = {
       const leftGroupList = [];
       const centerGroupList = [];
       const rightGroupList = [];
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent) => {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn) => {
         const isColGroup = hasChildrenList(column);
         // 如果是分组，必须按组设置固定列，不允许给子列设置固定
-        if (parent && parent.fixed) {
-          column.fixed = parent.fixed;
+        if (parentColumn && parentColumn.fixed) {
+          column.fixed = parentColumn.fixed;
         }
-        if (parent && column.fixed !== parent.fixed) {
+        if (parentColumn && column.fixed !== parentColumn.fixed) {
           errLog('vxe.error.groupFixed');
         }
         if (isColGroup) {
@@ -8104,28 +8130,35 @@ const Methods = {
    * 刷新布局
    */
   recalculate(reFull) {
+    const $xeTable = this;
+    const internalData = $xeTable;
     return new Promise(resolve => {
-      const $xeTable = this;
-      const internalData = $xeTable;
       const {
-        rceTimeout
+        rceTimeout,
+        reRunTime
       } = internalData;
+      const resizeOpts = $xeTable.computeResizeOpts;
+      const refreshDelay = resizeOpts.refreshDelay || 20;
       const el = $xeTable.$refs.refElem;
       if (el && el.clientWidth) {
         $xeTable.autoCellWidth();
       }
       if (rceTimeout) {
         clearTimeout(rceTimeout);
-        $xeTable.$nextTick(() => {
-          resolve();
-        });
+        if (reRunTime && reRunTime + (refreshDelay - 5) < Date.now()) {
+          resolve(handleRecalculateLayout($xeTable, !!reFull));
+        } else {
+          $xeTable.$nextTick(() => {
+            resolve();
+          });
+        }
       } else {
         resolve(handleRecalculateLayout($xeTable, !!reFull));
       }
       internalData.rceTimeout = setTimeout(() => {
         internalData.rceTimeout = undefined;
-        resolve(handleRecalculateLayout($xeTable, !!reFull));
-      }, 20);
+        handleRecalculateLayout($xeTable, !!reFull);
+      }, refreshDelay);
     });
   },
   calcCellWidth() {
@@ -10884,7 +10917,9 @@ const Methods = {
       actived
     } = editStore;
     const cell = evnt.currentTarget;
-    params.cell = cell;
+    params = Object.assign({
+      cell
+    }, params);
     if (isEnableConf(editConfig) && editOpts.trigger === 'dblclick') {
       if (!actived.args || evnt.currentTarget !== actived.args.cell) {
         if (editOpts.mode === 'row') {
@@ -11099,6 +11134,7 @@ const Methods = {
       prevDragToChild
     } = internalData;
     const {
+      isPeerDrag,
       isCrossDrag,
       isSelfToChildDrag,
       dragEndMethod
@@ -11160,20 +11196,27 @@ const Methods = {
                 let isSelfToChildStatus = false;
                 if (oldLevel && newLevel) {
                   // 子到子
-                  if (!isCrossDrag) {
-                    return;
-                  }
-                  if (oldAllMaps[newRowid]) {
-                    isSelfToChildStatus = true;
-                    if (!isSelfToChildDrag) {
-                      if (core_.VxeUI.modal) {
-                        core_.VxeUI.modal.message({
-                          status: 'error',
-                          content: methods_getI18n('vxe.error.treeDragChild')
-                        });
-                      }
+                  if (isPeerDrag) {
+                    if (oldRest.row[parentField] !== newRest.row[parentField]) {
+                      // 非同级
                       return;
                     }
+                  } else {
+                    if (!isCrossDrag) {
+                      return;
+                    }
+                    if (oldAllMaps[newRowid]) {
+                      isSelfToChildStatus = true;
+                      if (!(isCrossDrag && isSelfToChildDrag)) {
+                        if (core_.VxeUI.modal) {
+                          core_.VxeUI.modal.message({
+                            status: 'error',
+                            content: methods_getI18n('vxe.error.treeDragChild')
+                          });
+                        }
+                        return;
+                      }
+                    }
                   }
                 } else if (oldLevel) {
                   // 子到根
@@ -11187,7 +11230,7 @@ const Methods = {
                   }
                   if (oldAllMaps[newRowid]) {
                     isSelfToChildStatus = true;
-                    if (!isSelfToChildDrag) {
+                    if (!(isCrossDrag && isSelfToChildDrag)) {
                       if (core_.VxeUI.modal) {
                         core_.VxeUI.modal.message({
                           status: 'error',
@@ -11211,7 +11254,7 @@ const Methods = {
                 const ntfIndex = ptfIndex + dragOffsetIndex;
                 fullList.splice(ntfIndex, 0, dragRow);
                 // 改变层级
-                if (isSelfToChildStatus && isSelfToChildDrag) {
+                if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
                   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(dragRow[childrenField], childRow => {
                     childRow[parentField] = dragRow[parentField];
                   });
@@ -11292,10 +11335,12 @@ const Methods = {
     } = reactData;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
-      transform
+      transform,
+      parentField
     } = treeOpts;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
+      isPeerDrag,
       isCrossDrag,
       isToChildDrag
     } = rowDragOpts;
@@ -11315,7 +11360,7 @@ const Methods = {
       } = reactData;
       const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
       const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
-      if ($xeTable.eqRow(dragRow, row) || !isCrossDrag && treeConfig && rest.level) {
+      if ($xeTable.eqRow(dragRow, row) || !isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level)) {
         showDropTip($xeTable, evnt, trEl, null, false, dragPos);
         return;
       }
@@ -11396,6 +11441,7 @@ const Methods = {
     } = props;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     const {
+      isPeerDrag,
       isCrossDrag,
       isSelfToChildDrag,
       isToChildDrag,
@@ -11428,20 +11474,27 @@ const Methods = {
           let isSelfToChildStatus = false;
           if (oldColumn.parentId && newColumn.parentId) {
             // 子到子
-            if (!isCrossDrag) {
-              return;
-            }
-            if (oldAllMaps[newColumn.id]) {
-              isSelfToChildStatus = true;
-              if (!isSelfToChildDrag) {
-                if (core_.VxeUI.modal) {
-                  core_.VxeUI.modal.message({
-                    status: 'error',
-                    content: methods_getI18n('vxe.error.treeDragChild')
-                  });
-                }
+            if (isPeerDrag) {
+              if (oldColumn.parentId !== newColumn.parentId) {
+                // 非同级
                 return;
               }
+            } else {
+              if (!isCrossDrag) {
+                return;
+              }
+              if (oldAllMaps[newColumn.id]) {
+                isSelfToChildStatus = true;
+                if (!(isCrossDrag && isSelfToChildDrag)) {
+                  if (core_.VxeUI.modal) {
+                    core_.VxeUI.modal.message({
+                      status: 'error',
+                      content: methods_getI18n('vxe.error.treeDragChild')
+                    });
+                  }
+                  return;
+                }
+              }
             }
           } else if (oldColumn.parentId) {
             // 子到根
@@ -11455,7 +11508,7 @@ const Methods = {
             }
             if (oldAllMaps[newColumn.id]) {
               isSelfToChildStatus = true;
-              if (!isSelfToChildDrag) {
+              if (!(isCrossDrag && isSelfToChildDrag)) {
                 if (core_.VxeUI.modal) {
                   core_.VxeUI.modal.message({
                     status: 'error',
@@ -11470,7 +11523,7 @@ const Methods = {
           }
           const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id === oldColumn.id);
           // 改变层级
-          if (isSelfToChildStatus && isSelfToChildDrag) {
+          if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
             if (oldewMatchRest) {
               const {
                 items: oCols,
@@ -11504,7 +11557,7 @@ const Methods = {
               parent: nParent
             } = newMatchRest;
             // 转子级
-            if (isToChildDrag && prevDragToChild) {
+            if (isCrossDrag && isToChildDrag && prevDragToChild) {
               oldColumn.parentId = newColumn.id;
               newColumn.children = (newColumn.children || []).concat([oldColumn]);
             } else {
@@ -11515,8 +11568,8 @@ const Methods = {
               nafIndex = nIndex;
             }
           }
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent) => {
-            if (!parent) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+            if (!parentColumn) {
               const sortIndex = index + 1;
               column.renderSortNumber = sortIndex;
             }
@@ -11584,6 +11637,7 @@ const Methods = {
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     const {
       isToChildDrag,
+      isPeerDrag,
       isCrossDrag
     } = columnDragOpts;
     if (!dragCol) {
@@ -11601,11 +11655,11 @@ const Methods = {
       } = evnt;
       const offsetX = clientX - thEl.getBoundingClientRect().x;
       const dragPos = offsetX < thEl.clientWidth / 2 ? 'left' : 'right';
-      if (column.fixed || dragCol && dragCol.id === column.id || !isCrossDrag && column.parentId) {
+      if (column.fixed || dragCol && dragCol.id === column.id || !isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : column.parentId)) {
         showDropTip($xeTable, evnt, null, thEl, false, dragPos);
         return;
       }
-      internalData.prevDragToChild = !!(isToChildDrag && hasCtrlKey);
+      internalData.prevDragToChild = !!(isCrossDrag && isToChildDrag && hasCtrlKey);
       internalData.prevDragCol = column;
       internalData.prevDragPos = dragPos;
       showDropTip($xeTable, evnt, null, thEl, true, dragPos);
@@ -17065,7 +17119,7 @@ const renderPopupPanel = (h, _vm) => {
                 }
                 if (oldAllMaps[newColumn.id]) {
                   isSelfToChildStatus = true;
-                  if (!isSelfToChildDrag) {
+                  if (!(isCrossDrag && isSelfToChildDrag)) {
                     if (core_.VxeUI.modal) {
                       core_.VxeUI.modal.message({
                         status: 'error',
@@ -17087,7 +17141,7 @@ const renderPopupPanel = (h, _vm) => {
                 }
                 if (oldAllMaps[newColumn.id]) {
                   isSelfToChildStatus = true;
-                  if (!isSelfToChildDrag) {
+                  if (!(isCrossDrag && isSelfToChildDrag)) {
                     if (core_.VxeUI.modal) {
                       core_.VxeUI.modal.message({
                         status: 'error',
@@ -17102,7 +17156,7 @@ const renderPopupPanel = (h, _vm) => {
               }
               const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id === oldColumn.id);
               // 改变层级
-              if (isSelfToChildStatus && isSelfToChildDrag) {
+              if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
                 if (oldewMatchRest) {
                   const {
                     items: oCols,
@@ -17136,7 +17190,7 @@ const renderPopupPanel = (h, _vm) => {
                   parent: nParent
                 } = newMatchRest;
                 // 转子级
-                if (isToChildDrag && prevDragToChild) {
+                if (isCrossDrag && isToChildDrag && prevDragToChild) {
                   oldColumn.parentId = newColumn.id;
                   newColumn.children = (newColumn.children || []).concat([oldColumn]);
                 } else {
@@ -17220,7 +17274,7 @@ const renderPopupPanel = (h, _vm) => {
           panel_showDropTip(this, evnt, optEl, false, dragPos);
           return;
         }
-        this.prevDragToChild = !!(isToChildDrag && hasCtrlKey && immediate);
+        this.prevDragToChild = !!(isCrossDrag && isToChildDrag && hasCtrlKey && immediate);
         this.prevDragCol = column;
         this.prevDragPos = dragPos;
         panel_showDropTip(this, evnt, optEl, true, dragPos);
@@ -20208,7 +20262,6 @@ function createHtmlPage(opts, content) {
 
 
 
-
 const {
   getI18n: export_mixin_getI18n,
   renderer: export_mixin_renderer
@@ -20217,30 +20270,23 @@ let htmlCellElem;
 // 导入
 let fileForm;
 let fileInput;
-// 打印
-let printFrame;
 const csvBOM = '\ufeff';
 const enterSymbol = '\r\n';
-function createFrame() {
-  const frame = document.createElement('iframe');
-  frame.className = 'vxe-table--print-frame';
-  return frame;
-}
-function hasTreeChildren($xetable, row) {
-  const treeOpts = $xetable.treeOpts;
+function hasTreeChildren($xeTable, row) {
+  const treeOpts = $xeTable.computeTreeOpts;
   const childrenField = treeOpts.children || treeOpts.childrenField;
-  return row[childrenField] && row[childrenField].length > 0;
+  return row[childrenField] && row[childrenField].length;
 }
-function getSeq($xetable, cellValue, row, $rowIndex, column, $columnIndex) {
-  const seqOpts = $xetable.seqOpts;
+function getSeq($xeTable, cellValue, row, $rowIndex, column, $columnIndex) {
+  const seqOpts = $xeTable.computeSeqOpts;
   const seqMethod = seqOpts.seqMethod || column.seqMethod;
   if (seqMethod) {
     return seqMethod({
       row,
-      rowIndex: $xetable.getRowIndex(row),
+      rowIndex: $xeTable.getRowIndex(row),
       $rowIndex,
       column,
-      columnIndex: $xetable.getColumnIndex(column),
+      columnIndex: $xeTable.getColumnIndex(column),
       $columnIndex
     });
   }
@@ -20265,22 +20311,23 @@ const toStringValue = cellValue => {
   return eqEmptyValue(cellValue) ? '' : `${cellValue}`;
 };
 function getBodyLabelData($xeTable, opts, columns, datas) {
+  const props = $xeTable;
   const {
     isAllExpand,
     mode
   } = opts;
   const {
-    treeConfig,
-    treeOpts,
-    radioOpts,
-    checkboxOpts,
-    columnOpts
-  } = $xeTable;
-  const childrenField = treeOpts.children || treeOpts.childrenField;
+    treeConfig
+  } = props;
+  const radioOpts = $xeTable.computeRadioOpts;
+  const checkboxOpts = $xeTable.computeCheckboxOpts;
+  const treeOpts = $xeTable.computeTreeOpts;
+  const columnOpts = $xeTable.computeColumnOpts;
   if (!htmlCellElem) {
     htmlCellElem = document.createElement('div');
   }
   if (treeConfig) {
+    const childrenField = treeOpts.children || treeOpts.childrenField;
     // 如果是树表格只允许导出数据源
     const rest = [];
     const expandMaps = new Map();
@@ -20298,11 +20345,11 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
         columns.forEach((column, $columnIndex) => {
           let cellValue = '';
           const renderOpts = column.editRender || column.cellRender;
-          let bodyExportMethod = column.exportMethod;
+          let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
           if (!bodyExportMethod && renderOpts && renderOpts.name) {
             const compConf = export_mixin_renderer.get(renderOpts.name);
             if (compConf) {
-              bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod || compConf.cellExportMethod;
+              bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
             }
           }
           if (!bodyExportMethod) {
@@ -20319,8 +20366,8 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
             switch (column.type) {
               case 'seq':
                 {
-                  const seqValue = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
-                  cellValue = mode === 'all' ? seqValue : getSeq($xeTable, seqValue, row, $rowIndex, column, $columnIndex);
+                  const seqVal = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
+                  cellValue = mode === 'all' ? seqVal : getSeq($xeTable, seqVal, row, $rowIndex, column, $columnIndex);
                   break;
                 }
               case 'checkbox':
@@ -20371,16 +20418,13 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
     columns.forEach((column, $columnIndex) => {
       let cellValue = '';
       const renderOpts = column.editRender || column.cellRender;
-      let bodyExportMethod = column.exportMethod;
+      let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
       if (!bodyExportMethod && renderOpts && renderOpts.name) {
         const compConf = export_mixin_renderer.get(renderOpts.name);
         if (compConf) {
-          bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod || compConf.cellExportMethod;
+          bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
         }
       }
-      if (!bodyExportMethod) {
-        bodyExportMethod = columnOpts.exportMethod;
-      }
       if (bodyExportMethod) {
         cellValue = bodyExportMethod({
           $table: $xeTable,
@@ -20857,7 +20901,8 @@ function clearColumnConvert(columns) {
     children: 'children'
   });
 }
-function handleExport($xetable, opts) {
+function handleExport($xeTable, opts) {
+  const $xeGrid = $xeTable.$xeGrid;
   const {
     remote,
     columns,
@@ -20869,19 +20914,19 @@ function handleExport($xetable, opts) {
     if (remote) {
       const params = {
         options: opts,
-        $table: $xetable,
-        $grid: $xetable.$xegrid
+        $table: $xeTable,
+        $grid: $xeGrid
       };
       resolve(exportMethod ? exportMethod(params) : params);
     } else {
-      const datas = getExportData($xetable, opts);
-      resolve($xetable.preventEvent(null, 'event.export', {
+      const datas = getExportData($xeTable, opts);
+      resolve($xeTable.preventEvent(null, 'event.export', {
         options: opts,
         columns,
         colgroups,
         datas
       }, () => {
-        return downloadFile($xetable, opts, getContent($xetable, opts, columns, datas));
+        return downloadFile($xeTable, opts, getContent($xeTable, opts, columns, datas));
       }));
     }
   }).then(params => {
@@ -20891,8 +20936,8 @@ function handleExport($xetable, opts) {
         afterExportMethod({
           status: true,
           options: opts,
-          $table: $xetable,
-          $grid: $xetable.$xegrid
+          $table: $xeTable,
+          $grid: $xeGrid
         });
       }
     }
@@ -20906,8 +20951,8 @@ function handleExport($xetable, opts) {
         afterExportMethod({
           status: false,
           options: opts,
-          $table: $xetable,
-          $grid: $xetable.$xegrid
+          $table: $xeTable,
+          $grid: $xeGrid
         });
       }
     }
@@ -21330,79 +21375,42 @@ function readLocalFile(options = {}) {
     fileInput.click();
   });
 }
-function removePrintFrame() {
-  if (printFrame) {
-    if (printFrame.parentNode) {
-      try {
-        printFrame.contentDocument.write('');
-      } catch (e) {}
-      printFrame.parentNode.removeChild(printFrame);
-    }
-    printFrame = null;
-  }
-}
-function appendPrintFrame() {
-  if (!printFrame.parentNode) {
-    document.body.appendChild(printFrame);
-  }
-}
-function afterPrintEvent() {
-  requestAnimationFrame(removePrintFrame);
-}
-function handlePrint($xetable, opts, content) {
+function handleExportAndPrint($xeTable, options, isPrint) {
+  const props = $xeTable;
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const $xeGrid = $xeTable.$xeGrid;
   const {
-    beforePrintMethod
-  } = opts;
-  if (beforePrintMethod) {
-    content = beforePrintMethod({
-      content,
-      options: opts,
-      $table: $xetable
-    }) || '';
-  }
-  content = createHtmlPage(opts, content);
-  const blob = getExportBlobByContent(content, opts);
-  if (browse.msie) {
-    removePrintFrame();
-    printFrame = createFrame();
-    appendPrintFrame();
-    printFrame.contentDocument.write(content);
-    printFrame.contentDocument.execCommand('print');
-  } else {
-    if (!printFrame) {
-      printFrame = createFrame();
-      printFrame.onload = evnt => {
-        if (evnt.target.src) {
-          evnt.target.contentWindow.onafterprint = afterPrintEvent;
-          evnt.target.contentWindow.print();
-        }
-      };
-    }
-    appendPrintFrame();
-    printFrame.src = URL.createObjectURL(blob);
-  }
-}
-function handleExportAndPrint($xetable, options, isPrint) {
+    treeConfig,
+    showHeader,
+    showFooter
+  } = props;
   const {
-    $xegrid,
     initStore,
-    customOpts,
-    collectColumn,
-    footerTableData,
-    treeConfig,
     mergeList,
+    mergeFooterList,
     isGroup,
-    exportParams,
-    exportOpts
-  } = $xetable;
-  const proxyOpts = $xegrid ? $xegrid.proxyOpts : {};
-  const selectRecords = $xetable.getCheckboxRecords();
-  const hasFooter = !!footerTableData.length;
+    footerTableData,
+    exportStore,
+    exportParams
+  } = reactData;
+  const {
+    collectColumn
+  } = internalData;
+  const exportOpts = $xeTable.computeExportOpts;
   const hasTree = treeConfig;
-  const hasMerge = !hasTree && mergeList.length;
+  const customOpts = $xeTable.computeCustomOpts;
+  const selectRecords = $xeTable.getCheckboxRecords();
+  const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : {};
+  const hasFooter = !!footerTableData.length;
+  const hasMerge = !!(mergeList.length || mergeFooterList.length);
   const defOpts = Object.assign({
     message: true,
-    isHeader: true,
+    isHeader: showHeader,
+    isFooter: showFooter,
+    isColgroup: isGroup,
+    isMerge: hasMerge,
+    useStyle: true,
     current: 'current',
     modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : [])
   }, options);
@@ -21438,7 +21446,7 @@ function handleExportAndPrint($xetable, options, isPrint) {
     if (isColGroup || defaultFilterExportColumn(column)) {
       column.checked = columns ? columns.some(item => {
         if (isColumnInfo(item)) {
-          return column === item;
+          return column.id === item.id;
         } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(item)) {
           return column.field === item;
         } else {
@@ -21464,7 +21472,7 @@ function handleExportAndPrint($xetable, options, isPrint) {
     }
   });
   // 更新条件
-  Object.assign($xetable.exportStore, {
+  Object.assign(exportStore, {
     columns: exportColumns,
     typeList,
     modeList,
@@ -21479,14 +21487,42 @@ function handleExportAndPrint($xetable, options, isPrint) {
   Object.assign(exportParams, {
     mode: selectRecords.length ? 'selected' : 'current'
   }, defOpts);
-  if (!modeList.some(item => item.value === exportParams.mode)) {
+  const {
+    filename,
+    sheetName,
+    mode,
+    type
+  } = exportParams;
+  if (filename) {
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(filename)) {
+      exportParams.filename = filename({
+        options: defOpts,
+        $table: $xeTable,
+        $grid: $xeGrid
+      });
+    } else {
+      exportParams.filename = `${filename}`;
+    }
+  }
+  if (sheetName) {
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(sheetName)) {
+      exportParams.sheetName = sheetName({
+        options: defOpts,
+        $table: $xeTable,
+        $grid: $xeGrid
+      });
+    } else {
+      exportParams.sheetName = `${sheetName}`;
+    }
+  }
+  if (!modeList.some(item => item.value === mode)) {
     exportParams.mode = modeList[0].value;
   }
-  if (!typeList.some(item => item.value === exportParams.type)) {
+  if (!typeList.some(item => item.value === type)) {
     exportParams.type = typeList[0].value;
   }
   initStore.export = true;
-  return $xetable.$nextTick();
+  return $xeTable.$nextTick();
 }
 const getConvertColumns = columns => {
   const result = [];
@@ -21544,12 +21580,13 @@ const convertToRows = originColumns => {
     /**
      * 导出文件，支持 csv/html/xml/txt
      * 如果是树表格，则默认是导出所有节点
-     * 如果是启用了虚拟滚动，则只能导出数据源，可以配合 dataFilterMethod 函数自行转换数据
+     * 如果是启用了虚拟滚动，则只能导出数据源，可以配合 dataFilterMethod 函数转换数据
      * @param {Object} options 参数
      */
     _exportData(options) {
+      const $xeTable = this;
+      const $xeGrid = $xeTable.$xeGrid;
       const {
-        $xegrid,
         isGroup,
         tableGroupColumn,
         tableFullColumn,
@@ -21583,20 +21620,26 @@ const convertToRows = originColumns => {
         print: false
       }, options);
       const {
+        filename,
+        sheetName,
         type,
         mode,
         columns,
         original,
+        columnFilterMethod,
         beforeExportMethod,
-        excludeFields,
-        includeFields
+        includeFields,
+        excludeFields
       } = opts;
       let groups = [];
       const customCols = columns && columns.length ? columns : null;
+      const handleOptions = Object.assign({}, opts, {
+        filename: '',
+        sheetName: ''
+      });
       // 如果设置源数据，则默认导出设置了字段的列
-      let columnFilterMethod = opts.columnFilterMethod;
       if (!customCols && !columnFilterMethod) {
-        columnFilterMethod = ({
+        handleOptions.columnFilterMethod = ({
           column
         }) => {
           if (excludeFields) {
@@ -21614,24 +21657,24 @@ const convertToRows = originColumns => {
         };
       }
       if (customCols) {
-        opts._isCustomColumn = true;
+        handleOptions._isCustomColumn = true;
         groups = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().mapTree(customCols, item => {
           let targetColumn;
           if (item) {
             if (isColumnInfo(item)) {
               targetColumn = item;
             } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(item)) {
-              targetColumn = this.getColumnByField(item);
+              targetColumn = $xeTable.getColumnByField(item);
             } else {
               const colid = item.id || item.colId;
               const type = item.type;
               const field = item.field;
               if (colid) {
-                targetColumn = this.getColumnById(colid);
+                targetColumn = $xeTable.getColumnById(colid);
               } else if (field && type) {
                 targetColumn = tableFullColumn.find(column => column.field === field && column.type === type);
               } else if (field) {
-                targetColumn = this.getColumnByField(field);
+                targetColumn = $xeTable.getColumnByField(field);
               } else if (type) {
                 targetColumn = tableFullColumn.find(column => column.type === type);
               }
@@ -21642,7 +21685,7 @@ const convertToRows = originColumns => {
           children: 'childNodes',
           mapChildren: '_children'
         }), (column, index) => isColumnInfo(column) && (!columnFilterMethod || columnFilterMethod({
-          column,
+          column: column,
           $columnIndex: index
         })), {
           children: '_children',
@@ -21670,16 +21713,38 @@ const convertToRows = originColumns => {
         children: 'childNodes'
       });
       // 构建分组层级
-      opts.columns = cols;
-      opts.colgroups = convertToRows(groups);
-      if (!opts.filename) {
-        opts.filename = export_mixin_getI18n(opts.original ? 'vxe.table.expOriginFilename' : 'vxe.table.expFilename', [external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(Date.now(), 'yyyyMMddHHmmss')]);
+      handleOptions.columns = cols;
+      handleOptions.colgroups = convertToRows(groups);
+      if (filename) {
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(filename)) {
+          handleOptions.filename = filename({
+            options: opts,
+            $table: $xeTable,
+            $grid: $xeGrid
+          });
+        } else {
+          handleOptions.filename = `${filename}`;
+        }
       }
-      if (!opts.sheetName) {
-        opts.sheetName = document.title;
+      if (!handleOptions.filename) {
+        handleOptions.filename = export_mixin_getI18n(handleOptions.original ? 'vxe.table.expOriginFilename' : 'vxe.table.expFilename', [external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(Date.now(), 'yyyyMMddHHmmss')]);
+      }
+      if (sheetName) {
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(sheetName)) {
+          handleOptions.sheetName = sheetName({
+            options: opts,
+            $table: $xeTable,
+            $grid: $xeGrid
+          });
+        } else {
+          handleOptions.sheetName = `${sheetName}`;
+        }
+      }
+      if (!handleOptions.sheetName) {
+        handleOptions.sheetName = document.title || '';
       }
       // 检查类型，如果为自定义导出，则不需要校验类型
-      if (!opts.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), type)) {
+      if (!handleOptions.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), type)) {
         errLog('vxe.error.notType', [type]);
         if (true) {
           if (['xlsx', 'pdf'].includes(type)) {
@@ -21691,21 +21756,21 @@ const convertToRows = originColumns => {
         };
         return Promise.reject(params);
       }
-      if (!opts.print) {
+      if (!handleOptions.print) {
         if (beforeExportMethod) {
           beforeExportMethod({
-            options: opts,
-            $table: this,
-            $grid: $xegrid
+            options: handleOptions,
+            $table: $xeTable,
+            $grid: $xeGrid
           });
         }
       }
       if (!opts.data) {
-        opts.data = [];
+        handleOptions.data = [];
         if (mode === 'selected') {
-          const selectRecords = this.getCheckboxRecords();
+          const selectRecords = $xeTable.getCheckboxRecords();
           if (['html', 'pdf'].indexOf(type) > -1 && treeConfig) {
-            opts.data = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(this.getTableData().fullData, item => selectRecords.indexOf(item) > -1, Object.assign({}, treeOpts, {
+            opts.data = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree($xeTable.getTableData().fullData, item => $xeTable.findRowIndexOf(selectRecords, item) > -1, Object.assign({}, treeOpts, {
               data: '_row'
             }));
           } else {
@@ -21713,17 +21778,22 @@ const convertToRows = originColumns => {
           }
         } else if (mode === 'all') {
           if (true) {
-            if (!$xegrid) {
+            if (!$xeGrid) {
               warnLog('vxe.error.errProp', ['all', 'mode=current,selected']);
             }
           }
-          if ($xegrid && !opts.remote) {
+          if ($xeGrid && !handleOptions.remote) {
+            const gridReactData = $xeGrid;
+            const proxyOpts = $xeGrid.computeProxyOpts;
+            const {
+              sortData
+            } = gridReactData;
             const {
               beforeQueryAll,
               afterQueryAll,
-              ajax = {},
-              props = {}
-            } = $xegrid.proxyOpts;
+              ajax = {}
+            } = proxyOpts;
+            const resConfigs = proxyOpts.response || proxyOpts.props || {};
             const ajaxMethods = ajax.queryAll;
             const queryAllSuccessMethods = ajax.queryAllSuccess;
             const queryAllErrorMethods = ajax.queryAllError;
@@ -21734,16 +21804,20 @@ const convertToRows = originColumns => {
             }
             if (ajaxMethods) {
               const params = {
-                $table: this,
-                $grid: $xegrid,
-                sort: $xegrid.sortData,
-                filters: $xegrid.filterData,
-                form: $xegrid.formData,
-                target: ajaxMethods,
-                options: opts
+                $table: $xeTable,
+                $grid: $xeGrid,
+                sort: sortData.length ? sortData[0] : {},
+                sorts: sortData,
+                filters: gridReactData.filterData,
+                form: gridReactData.formData,
+                options: handleOptions
               };
               return Promise.resolve((beforeQueryAll || ajaxMethods)(params)).then(rest => {
-                opts.data = (props.list ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, props.list) : rest) || [];
+                const listProp = resConfigs.list;
+                handleOptions.data = (listProp ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(listProp) ? listProp({
+                  data: rest,
+                  $grid: $xeGrid
+                }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, listProp) : rest) || [];
                 if (afterQueryAll) {
                   afterQueryAll(params);
                 }
@@ -21753,7 +21827,7 @@ const convertToRows = originColumns => {
                     response: rest
                   });
                 }
-                return handleExport(this, opts);
+                return handleExport($xeTable, handleOptions);
               }).catch(rest => {
                 if (queryAllErrorMethods) {
                   queryAllErrorMethods({
@@ -21765,10 +21839,10 @@ const convertToRows = originColumns => {
             }
           }
         } else if (mode === 'current') {
-          opts.data = afterFullData;
+          handleOptions.data = afterFullData;
         }
       }
-      return handleExport(this, opts);
+      return handleExport($xeTable, opts);
     },
     _importByFile(file, options) {
       const opts = Object.assign({}, options);
@@ -21825,6 +21899,8 @@ const convertToRows = originColumns => {
       return readLocalFile(options);
     },
     _print(options) {
+      const $xeTable = this;
+      const $xeGrid = $xeTable.$xeGrid;
       const opts = Object.assign({
         original: false
         // beforePrintMethod
@@ -21834,25 +21910,76 @@ const convertToRows = originColumns => {
         remote: false,
         print: true
       });
-      if (!opts.sheetName) {
-        opts.sheetName = document.title;
-      }
-      return new Promise(resolve => {
-        if (opts.content) {
-          resolve(handlePrint(this, opts, opts.content));
+      const {
+        sheetName
+      } = opts;
+      let printTitle = '';
+      if (sheetName) {
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(sheetName)) {
+          printTitle = sheetName({
+            options: opts,
+            $table: $xeTable,
+            $grid: $xeGrid
+          });
         } else {
-          resolve(this.exportData(opts).then(({
-            content
-          }) => {
-            return handlePrint(this, opts, content);
-          }));
+          printTitle = `${sheetName}`;
+        }
+      }
+      if (!printTitle) {
+        printTitle = document.title || '';
+      }
+      const beforePrintMethod = opts.beforePrintMethod;
+      const tableHtml = opts.html || opts.content;
+      return new Promise((resolve, reject) => {
+        if (core_.VxeUI.print) {
+          if (tableHtml) {
+            resolve(core_.VxeUI.print({
+              title: printTitle,
+              html: tableHtml,
+              customStyle: opts.style,
+              beforeMethod: beforePrintMethod ? ({
+                html
+              }) => {
+                return beforePrintMethod({
+                  html,
+                  content: html,
+                  options: opts,
+                  $table: $xeTable
+                });
+              } : undefined
+            }));
+          } else {
+            resolve($xeTable.exportData(opts).then(({
+              content
+            }) => {
+              return core_.VxeUI.print({
+                title: printTitle,
+                html: content,
+                customStyle: opts.style,
+                beforeMethod: beforePrintMethod ? ({
+                  html
+                }) => {
+                  return beforePrintMethod({
+                    html,
+                    content: html,
+                    options: opts,
+                    $table: $xeTable
+                  });
+                } : undefined
+              });
+            }));
+          }
+        } else {
+          const e = {
+            status: false
+          };
+          reject(e);
         }
       });
     },
     _getPrintHtml(options) {
-      const {
-        printOpts
-      } = this;
+      const $xeTable = this;
+      const printOpts = $xeTable.computePrintOpts;
       const opts = Object.assign({
         original: false
         // beforePrintMethod
@@ -21862,7 +21989,7 @@ const convertToRows = originColumns => {
         remote: false,
         print: true
       });
-      return this.exportData(opts).then(({
+      return $xeTable.exportData(opts).then(({
         content
       }) => {
         return {
@@ -22571,7 +22698,6 @@ function validErrorRuleValue(rule, val) {
       const {
         editRules,
         afterFullData,
-        visibleColumn,
         treeConfig,
         treeOpts
       } = this;
@@ -22686,11 +22812,7 @@ function validErrorRuleValue(rule, val) {
             } else {
               const row = firstErrParams.row;
               const column = firstErrParams.column;
-              const rowIndex = afterFullData.indexOf(row);
-              const columnIndex = visibleColumn.indexOf(column);
-              const targetRow = rowIndex > 0 ? afterFullData[rowIndex - 1] : row;
-              const targetColumn = columnIndex > 0 ? visibleColumn[columnIndex - 1] : column;
-              this.scrollToRow(targetRow, targetColumn).then(posAndFinish);
+              this.scrollToRow(row, column).then(posAndFinish);
             }
           });
         });
@@ -23795,6 +23917,9 @@ function handleUupdateResize(_vm) {
       return 0;
     },
     rowHeightMaps() {
+      return this.computeRowHeightMaps;
+    },
+    computeRowHeightMaps() {
       return {
         default: 48,
         medium: 44,
@@ -24483,15 +24608,7 @@ function handleUupdateResize(_vm) {
       });
     }
     if (this.autoResize) {
-      const handleWrapperResize = this.resizeOpts.refreshDelay ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().throttle(() => this.recalculate(true), this.resizeOpts.refreshDelay, {
-        leading: true,
-        trailing: true
-      }) : null;
-      const resizeObserver = table_globalResize.create(handleWrapperResize ? () => {
-        if (this.autoResize) {
-          handleWrapperResize();
-        }
-      } : () => {
+      const resizeObserver = table_globalResize.create(() => {
         if (this.autoResize) {
           this.recalculate(true);
         }
@@ -25263,11 +25380,12 @@ const {
     /**
      * 渲染按钮
      */
-    renderBtns(h) {
+    renderLeftBtns(h) {
       // 使用已安装的组件，如果未安装则不渲染
       const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
       const $xeToolbar = this;
       const props = $xeToolbar;
+      const slots = $xeToolbar.$scopedSlots;
       const internalData = $xeToolbar.internalData;
       const $xeGrid = $xeToolbar.$xeGrid;
       const {
@@ -25277,7 +25395,16 @@ const {
         connectTable
       } = internalData;
       const $table = connectTable;
+      const buttonPrefixSlot = slots.buttonPrefix || slots['button-prefix'];
+      const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix'];
       const btnVNs = [];
+      if (buttonPrefixSlot) {
+        btnVNs.push(...getSlotVNs(buttonPrefixSlot.call($xeToolbar, {
+          buttons: buttons || [],
+          $grid: $xeGrid,
+          $table: $table
+        })));
+      }
       if (buttons) {
         buttons.forEach(item => {
           const {
@@ -25332,6 +25459,13 @@ const {
           }
         });
       }
+      if (buttonSuffixSlot) {
+        btnVNs.push(...getSlotVNs(buttonSuffixSlot.call($xeToolbar, {
+          buttons: buttons || [],
+          $grid: $xeGrid,
+          $table: $table
+        })));
+      }
       return btnVNs;
     },
     /**
@@ -25342,6 +25476,7 @@ const {
       const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
       const $xeToolbar = this;
       const props = $xeToolbar;
+      const slots = $xeToolbar.$scopedSlots;
       const internalData = $xeToolbar.internalData;
       const $xeGrid = $xeToolbar.$xeGrid;
       const {
@@ -25351,7 +25486,16 @@ const {
         connectTable
       } = internalData;
       const $table = connectTable;
+      const toolPrefixSlot = slots.toolPrefix || slots['tool-prefix'];
+      const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix'];
       const btnVNs = [];
+      if (toolPrefixSlot) {
+        btnVNs.push(...getSlotVNs(toolPrefixSlot.call($xeToolbar, {
+          tools: tools || [],
+          $grid: $xeGrid,
+          $table: $table
+        })));
+      }
       if (tools) {
         tools.forEach((item, tIndex) => {
           const {
@@ -25409,6 +25553,13 @@ const {
           }
         });
       }
+      if (toolSuffixSlot) {
+        btnVNs.push(...getSlotVNs(toolSuffixSlot.call($xeToolbar, {
+          tools: tools || [],
+          $grid: $xeGrid,
+          $table: $table
+        })));
+      }
       return btnVNs;
     },
     renderToolImport(h) {
@@ -25561,7 +25712,7 @@ const {
       }, buttonsSlot ? buttonsSlot({
         $grid: $xeGrid,
         $table: $table
-      }) : $xeToolbar.renderBtns(h)), h('div', {
+      }) : $xeToolbar.renderLeftBtns(h)), h('div', {
         class: 'vxe-tools--wrapper'
       }, toolsSlot ? toolsSlot({
         $grid: $xeGrid,