vxe-table 3.13.16 → 3.13.18

package/lib/index.umd.js

@@ -3201,7 +3201,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.13.16";
+const version = "3.13.18";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3828,7 +3828,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.13.16"}`;
+const log_version = `table v${"3.13.18"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3854,42 +3854,40 @@ class ColumnInfo {
     const formatter = _vm.formatter;
     const visible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.visible) ? _vm.visible : true;
     const tableProps = $xetable;
-    if (true) {
-      const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
-      if (_vm.type && types.indexOf(_vm.type) === -1) {
-        warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
-      }
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.cellRender) || _vm.cellRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.cellRender)) {
-        warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
-      }
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.editRender) || _vm.editRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.editRender)) {
-        warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
+    const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
+    if (_vm.type && types.indexOf(_vm.type) === -1) {
+      warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
+    }
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.cellRender) || _vm.cellRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.cellRender)) {
+      warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
+    }
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.editRender) || _vm.editRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.editRender)) {
+      warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
+    }
+    if (_vm.type === 'expand') {
+      const {
+        treeConfig
+      } = tableProps;
+      if (treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
+        errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand']);
       }
-      if (_vm.type === 'expand') {
-        const {
-          treeConfig
-        } = tableProps;
-        if (treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
-          errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand']);
+    }
+    if (_vm.remoteSort) {
+      warnLog('vxe.error.delProp', ['column.remote-sort', 'sort-config.remote']);
+    }
+    if (_vm.sortMethod) {
+      warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod']);
+    }
+    if (formatter) {
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
+        const gFormatOpts = columnInfo_formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
+        if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+          errLog('vxe.error.notFormats', [formatter]);
         }
-      }
-      if (_vm.remoteSort) {
-        warnLog('vxe.error.delProp', ['column.remote-sort', 'sort-config.remote']);
-      }
-      if (_vm.sortMethod) {
-        warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod']);
-      }
-      if (formatter) {
-        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
-          const gFormatOpts = columnInfo_formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
-          if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-            errLog('vxe.error.notFormats', [formatter]);
-          }
-        } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
-          const gFormatOpts = columnInfo_formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
-          if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-            errLog('vxe.error.notFormats', [formatter[0]]);
-          }
+      } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
+        const gFormatOpts = columnInfo_formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
+        if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+          errLog('vxe.error.notFormats', [formatter[0]]);
         }
       }
     }
@@ -4150,12 +4148,10 @@ function assembleColumn(_vm) {
   } = _vm;
   const groupConfig = $xecolumn ? $xecolumn.columnConfig : null;
   if (groupConfig) {
-    if (true) {
-      if ($xecolumn.$options._componentTag === 'vxe-table-column') {
-        errLog('vxe.error.groupTag', [`<vxe-table-colgroup title=${$xecolumn.title} ...>`, `<vxe-table-column title=${$xecolumn.title} ...>`]);
-      } else if ($xecolumn.$options._componentTag === 'vxe-column') {
-        warnLog('vxe.error.groupTag', [`<vxe-colgroup title=${$xecolumn.title} ...>`, `<vxe-column title=${$xecolumn.title} ...>`]);
-      }
+    if ($xecolumn.$options._componentTag === 'vxe-table-column') {
+      errLog('vxe.error.groupTag', [`<vxe-table-colgroup title=${$xecolumn.title} ...>`, `<vxe-table-column title=${$xecolumn.title} ...>`]);
+    } else if ($xecolumn.$options._componentTag === 'vxe-column') {
+      warnLog('vxe.error.groupTag', [`<vxe-colgroup title=${$xecolumn.title} ...>`, `<vxe-column title=${$xecolumn.title} ...>`]);
     }
     if (!groupConfig.children) {
       groupConfig.children = [];
@@ -8751,28 +8747,26 @@ const Methods = {
     if (treeConfig) {
       // 树结构自动转换
       if (treeOpts.transform) {
-        if (true) {
-          if (!treeOpts.rowField) {
-            errLog('vxe.error.reqProp', ['table.tree-config.rowField']);
-          }
-          if (!treeOpts.parentField) {
-            errLog('vxe.error.reqProp', ['table.tree-config.parentField']);
-          }
-          if (!childrenField) {
-            errLog('vxe.error.reqProp', ['tree-config.childrenField']);
-          }
-          if (!treeOpts.mapChildrenField) {
-            errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
-          }
-          if (childrenField === treeOpts.mapChildrenField) {
-            errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
-          }
-          // fullData.forEach(row => {
-          //   if (row[childrenField] && row[childrenField].length) {
-          //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
-          //   }
-          // })
+        if (!treeOpts.rowField) {
+          errLog('vxe.error.reqProp', ['table.tree-config.rowField']);
+        }
+        if (!treeOpts.parentField) {
+          errLog('vxe.error.reqProp', ['table.tree-config.parentField']);
         }
+        if (!childrenField) {
+          errLog('vxe.error.reqProp', ['tree-config.childrenField']);
+        }
+        if (!treeOpts.mapChildrenField) {
+          errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
+        }
+        if (childrenField === treeOpts.mapChildrenField) {
+          errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
+        }
+        // fullData.forEach(row => {
+        //   if (row[childrenField] && row[childrenField].length) {
+        //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
+        //   }
+        // })
         treeData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(fullData, {
           key: treeOpts.rowField,
           parentKey: treeOpts.parentField,
@@ -8836,16 +8830,14 @@ const Methods = {
         //     }
         //   }
         // }
-        if (true) {
-          if (!(this.height || this.maxHeight)) {
-            errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
-          }
-          // if (!this.showOverflow) {
-          //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-          // }
-          if (this.spanMethod) {
-            warnLog('vxe.error.scrollErrProp', ['table.span-method']);
-          }
+        if (!(this.height || this.maxHeight)) {
+          errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+        }
+        // if (!this.showOverflow) {
+        //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+        // }
+        if (this.spanMethod) {
+          warnLog('vxe.error.scrollErrProp', ['table.span-method']);
         }
       }
       handleReserveStatus($xeTable);
@@ -8991,22 +8983,30 @@ const Methods = {
   cacheRowMap() {
     const $xeTable = this;
     const props = $xeTable;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
       treeConfig
     } = props;
-    const treeOpts = $xeTable.computeTreeOpts;
+    const {
+      treeExpandedMaps
+    } = reactData;
     const {
       fullAllDataRowIdData,
       tableFullData,
       tableFullTreeData
     } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     const rowkey = getRowkey($xeTable);
-    const isLazy = treeConfig && treeOpts.lazy;
-    const fullAllDataRowIdMaps = {};
+    const fullAllDataRowIdMaps = {
+      ...fullAllDataRowIdData
+    }; // 存在已删除数据
     const fullDataRowIdMaps = {};
+    const treeTempExpandedMaps = {
+      ...treeExpandedMaps
+    };
     const handleRow = (row, index, items, path, parentRow, nodes) => {
       let rowid = getRowid($xeTable, row);
       const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
@@ -9015,8 +9015,16 @@ const Methods = {
         rowid = getRowUniqueId();
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
       }
-      if (isLazy && row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
-        row[childrenField] = null;
+      if (treeConfig && treeOpts.lazy) {
+        const treeExpRest = treeExpandedMaps[rowid];
+        if (row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
+          row[childrenField] = null;
+        }
+        if (treeExpRest) {
+          if (!row[childrenField] || !row[childrenField].length) {
+            delete treeTempExpandedMaps[rowid];
+          }
+        }
       }
       let rowRest = fullAllDataRowIdData[rowid];
       if (!rowRest) {
@@ -9037,6 +9045,8 @@ const Methods = {
           expandHeight: 0
         };
       }
+      rowRest.treeLoaded = false;
+      rowRest.expandLoaded = false;
       rowRest.row = row;
       rowRest.items = items;
       rowRest.parent = parentRow;
@@ -9045,8 +9055,6 @@ const Methods = {
       fullDataRowIdMaps[rowid] = rowRest;
       fullAllDataRowIdMaps[rowid] = rowRest;
     };
-    internalData.fullDataRowIdData = fullDataRowIdMaps;
-    internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
     if (treeConfig) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleRow, {
         children: childrenField
@@ -9054,6 +9062,9 @@ const Methods = {
     } else {
       tableFullData.forEach(handleRow);
     }
+    internalData.fullDataRowIdData = fullDataRowIdMaps;
+    internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
+    reactData.treeExpandedMaps = treeTempExpandedMaps;
   },
   cacheSourceMap(fullData) {
     let {
@@ -9454,16 +9465,30 @@ const Methods = {
    * 如果还额外传了 field 则还原指定的单元格数据
    */
   revertData(rows, field) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
       keepSource,
-      tableSourceData,
       treeConfig
-    } = this;
+    } = props;
+    const {
+      fullAllDataRowIdData,
+      tableSourceData,
+      sourceDataRowIdData,
+      tableFullData,
+      afterFullData
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const {
+      transform
+    } = treeOpts;
     if (!keepSource) {
       if (true) {
         warnLog('vxe.error.reqProp', ['keep-source']);
       }
-      return this.$nextTick();
+      return $xeTable.$nextTick();
     }
     let targetRows = rows;
     if (rows) {
@@ -9471,30 +9496,52 @@ const Methods = {
         targetRows = [rows];
       }
     } else {
-      targetRows = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArray(this.getUpdateRecords());
+      targetRows = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArray($xeTable.getUpdateRecords());
     }
+    let reDelFlag = false;
     if (targetRows.length) {
       targetRows.forEach(row => {
-        if (!this.isInsertByRow(row)) {
-          const rowIndex = this.getRowIndex(row);
-          if (treeConfig && rowIndex === -1) {
-            errLog('vxe.error.noTree', ['revertData']);
-          }
-          const oRow = tableSourceData[rowIndex];
+        if (!$xeTable.isInsertByRow(row)) {
+          const rowid = getRowid($xeTable, row);
+          const oRow = sourceDataRowIdData[rowid];
           if (oRow && row) {
             if (field) {
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oRow, field), true));
             } else {
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
             }
+            if ($xeTable.isRemoveByRow(row)) {
+              const rowRest = fullAllDataRowIdData[rowid];
+              if (rowRest) {
+                const reRow = rowRest.row;
+                tableFullData.unshift(reRow);
+                afterFullData.unshift(reRow);
+                reDelFlag = true;
+              }
+            }
           }
         }
       });
     }
     if (rows) {
-      return this.$nextTick();
+      if (reDelFlag) {
+        $xeTable.updateFooter();
+        $xeTable.cacheRowMap(false);
+        $xeTable.handleTableData(treeConfig && transform);
+        if (!(treeConfig && transform)) {
+          $xeTable.updateAfterDataIndex();
+        }
+        $xeTable.checkSelectionStatus();
+        if (reactData.scrollYLoad) {
+          $xeTable.updateScrollYSpace();
+        }
+      }
+      return $xeTable.$nextTick().then(() => {
+        $xeTable.updateCellAreas();
+        return $xeTable.recalculate();
+      });
     }
-    return this.reloadData(tableSourceData);
+    return $xeTable.reloadData(tableSourceData);
   },
   /**
    * 清空单元格内容
@@ -9624,12 +9671,23 @@ const Methods = {
    * @param {Row} row 行对象
    */
   isInsertByRow(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       editStore
-    } = this;
-    const rowid = getRowid(this, row);
+    } = reactData;
+    const rowid = getRowid($xeTable, row);
     return !!editStore.insertMaps[rowid];
   },
+  isRemoveByRow(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      editStore
+    } = reactData;
+    const rowid = getRowid($xeTable, row);
+    return !!editStore.removeMaps[rowid];
+  },
   /**
    * 删除所有新增的临时数据
    * @returns
@@ -16424,19 +16482,17 @@ const Methods = {
 const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,resetFilterPanel,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(',');
 funcs.forEach(name => {
   Methods[name] = function (...args) {
-    if (true) {
-      if (!this[`_${name}`]) {
-        if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
-          errLog('vxe.error.reqModule', ['VxeTableExportModule']);
-        } else if ('fullValidate,validate'.split(',').includes(name)) {
-          errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
-        } else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
-          errLog('vxe.error.reqModule', ['VxeTableFilterModule']);
-        } else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
-          errLog('vxe.error.reqModule', ['VxeTableEditModule']);
-        } else if ('openCustom'.split(',').includes(name)) {
-          errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
-        }
+    if (!this[`_${name}`]) {
+      if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
+        errLog('vxe.error.reqModule', ['VxeTableExportModule']);
+      } else if ('fullValidate,validate'.split(',').includes(name)) {
+        errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
+      } else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
+        errLog('vxe.error.reqModule', ['VxeTableFilterModule']);
+      } else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
+        errLog('vxe.error.reqModule', ['VxeTableEditModule']);
+      } else if ('openCustom'.split(',').includes(name)) {
+        errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
       }
     }
     return this[`_${name}`] ? this[`_${name}`](...args) : null;
@@ -16536,6 +16592,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const {
     columnKey,
     resizable: allResizable,
+    showOverflow: allShowOverflow,
     border,
     height,
     cellClassName: allCellClassName,
@@ -16623,7 +16680,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
   let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
   const isCellPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(padding) ? allPadding === null ? cellOpts.padding : allPadding : padding;
-  const cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showOverflow) ? isAllOverflow : showOverflow;
+  const cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showOverflow) ? allShowOverflow : showOverflow;
   const showEllipsis = cellOverflow === 'ellipsis';
   const showTitle = cellOverflow === 'title';
   const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
@@ -19288,39 +19345,37 @@ const renderPopupPanel = (h, _vm) => {
   },
   computed: {},
   created() {
-    if (true) {
-      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;
-        const {
-          customOpts
-        } = $xetable;
-        const {
-          mode
-        } = customOpts;
-        if (!VxeUIModalComponent) {
-          errLog('vxe.error.reqComp', ['vxe-modal']);
-        }
-        if (!VxeUIDrawerComponent && mode === 'drawer') {
-          errLog('vxe.error.reqComp', ['vxe-drawer']);
-        }
-        if (!VxeUIButtonComponent) {
-          errLog('vxe.error.reqComp', ['vxe-button']);
-        }
-        if (!VxeUINumberInputComponent) {
-          errLog('vxe.error.reqComp', ['vxe-input']);
-        }
-        if (!VxeUIRadioGroupComponent) {
-          errLog('vxe.error.reqComp', ['vxe-radio-group']);
-        }
-      });
-    }
+    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;
+      const {
+        customOpts
+      } = $xetable;
+      const {
+        mode
+      } = customOpts;
+      if (!VxeUIModalComponent) {
+        errLog('vxe.error.reqComp', ['vxe-modal']);
+      }
+      if (!VxeUIDrawerComponent && mode === 'drawer') {
+        errLog('vxe.error.reqComp', ['vxe-drawer']);
+      }
+      if (!VxeUIButtonComponent) {
+        errLog('vxe.error.reqComp', ['vxe-button']);
+      }
+      if (!VxeUINumberInputComponent) {
+        errLog('vxe.error.reqComp', ['vxe-input']);
+      }
+      if (!VxeUIRadioGroupComponent) {
+        errLog('vxe.error.reqComp', ['vxe-radio-group']);
+      }
+    });
   },
   render(h) {
     const $xeTable = this.$xeTable;
@@ -20065,22 +20120,20 @@ const {
   },
   created() {
     const $xeTableImportPanel = this;
-    if (true) {
-      const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
-      const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
-      const VxeUISelectComponent = core_.VxeUI.getComponent('VxeSelect');
-      $xeTableImportPanel.$nextTick(() => {
-        if (!VxeUIModalComponent) {
-          errLog('vxe.error.reqComp', ['vxe-modal']);
-        }
-        if (!VxeUIButtonComponent) {
-          errLog('vxe.error.reqComp', ['vxe-button']);
-        }
-        if (!VxeUISelectComponent) {
-          errLog('vxe.error.reqComp', ['vxe-select']);
-        }
-      });
-    }
+    const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
+    const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
+    const VxeUISelectComponent = core_.VxeUI.getComponent('VxeSelect');
+    $xeTableImportPanel.$nextTick(() => {
+      if (!VxeUIModalComponent) {
+        errLog('vxe.error.reqComp', ['vxe-modal']);
+      }
+      if (!VxeUIButtonComponent) {
+        errLog('vxe.error.reqComp', ['vxe-button']);
+      }
+      if (!VxeUISelectComponent) {
+        errLog('vxe.error.reqComp', ['vxe-select']);
+      }
+    });
   },
   render(h) {
     const $xeTable = this.$xeTable;
@@ -20316,30 +20369,28 @@ const {
   },
   created() {
     const $xeTableExportPanel = this;
-    if (true) {
-      const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
-      const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
-      const VxeUISelectComponent = core_.VxeUI.getComponent('VxeSelect');
-      const VxeUIInputComponent = core_.VxeUI.getComponent('VxeInput');
-      const VxeUICheckboxComponent = core_.VxeUI.getComponent('VxeCheckbox');
-      $xeTableExportPanel.$nextTick(() => {
-        if (!VxeUIModalComponent) {
-          errLog('vxe.error.reqComp', ['vxe-modal']);
-        }
-        if (!VxeUIButtonComponent) {
-          errLog('vxe.error.reqComp', ['vxe-button']);
-        }
-        if (!VxeUISelectComponent) {
-          errLog('vxe.error.reqComp', ['vxe-select']);
-        }
-        if (!VxeUIInputComponent) {
-          errLog('vxe.error.reqComp', ['vxe-input']);
-        }
-        if (!VxeUICheckboxComponent) {
-          errLog('vxe.error.reqComp', ['vxe-checkbox']);
-        }
-      });
-    }
+    const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
+    const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
+    const VxeUISelectComponent = core_.VxeUI.getComponent('VxeSelect');
+    const VxeUIInputComponent = core_.VxeUI.getComponent('VxeInput');
+    const VxeUICheckboxComponent = core_.VxeUI.getComponent('VxeCheckbox');
+    $xeTableExportPanel.$nextTick(() => {
+      if (!VxeUIModalComponent) {
+        errLog('vxe.error.reqComp', ['vxe-modal']);
+      }
+      if (!VxeUIButtonComponent) {
+        errLog('vxe.error.reqComp', ['vxe-button']);
+      }
+      if (!VxeUISelectComponent) {
+        errLog('vxe.error.reqComp', ['vxe-select']);
+      }
+      if (!VxeUIInputComponent) {
+        errLog('vxe.error.reqComp', ['vxe-input']);
+      }
+      if (!VxeUICheckboxComponent) {
+        errLog('vxe.error.reqComp', ['vxe-checkbox']);
+      }
+    });
   },
   render(h) {
     const $xeTable = this.$xeTable;
@@ -21891,11 +21942,9 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           const parentLevel = parentRest ? parentRest.level : 0;
           newRecords.forEach((item, i) => {
             const rowid = getRowid($xeTable, item);
-            if (true) {
-              if (item[treeOpts.parentField]) {
-                if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
-                  errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
-                }
+            if (item[treeOpts.parentField]) {
+              if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
+                errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
               }
             }
             if (parentRow) {
@@ -23529,10 +23578,8 @@ function downloadFile($xetable, opts, content) {
   }).then(() => {
     if (opts.message !== false) {
       // 检测弹窗模块
-      if (true) {
-        if (!core_.VxeUI.modal) {
-          errLog('vxe.error.reqModule', ['Modal']);
-        }
+      if (!core_.VxeUI.modal) {
+        errLog('vxe.error.reqModule', ['Modal']);
       }
       core_.VxeUI.modal.message({
         content: export_mixin_getI18n('vxe.table.expSuccess'),
@@ -23813,10 +23860,8 @@ function handleImport($xeTable, content, opts) {
       }
       if (opts.message !== false) {
         // 检测弹窗模块
-        if (true) {
-          if (!core_.VxeUI.modal) {
-            errLog('vxe.error.reqModule', ['Modal']);
-          }
+        if (!core_.VxeUI.modal) {
+          errLog('vxe.error.reqModule', ['Modal']);
         }
         core_.VxeUI.modal.message({
           content: export_mixin_getI18n('vxe.table.impSuccess', [rows.length]),
@@ -23833,10 +23878,8 @@ function handleImport($xeTable, content, opts) {
     });
   } else if (opts.message !== false) {
     // 检测弹窗模块
-    if (true) {
-      if (!core_.VxeUI.modal) {
-        errLog('vxe.error.reqModule', ['Modal']);
-      }
+    if (!core_.VxeUI.modal) {
+      errLog('vxe.error.reqModule', ['Modal']);
     }
     core_.VxeUI.modal.message({
       content: export_mixin_getI18n('vxe.error.impFields'),
@@ -23865,10 +23908,8 @@ function handleFileImport($xetable, file, opts) {
   if (!importMethod && !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(importOpts._typeMaps), type)) {
     if (opts.message !== false) {
       // 检测弹窗模块
-      if (true) {
-        if (!core_.VxeUI.modal) {
-          errLog('vxe.error.reqModule', ['Modal']);
-        }
+      if (!core_.VxeUI.modal) {
+        errLog('vxe.error.reqModule', ['Modal']);
       }
       core_.VxeUI.modal.message({
         content: export_mixin_getI18n('vxe.error.notType', [type]),
@@ -23941,9 +23982,7 @@ function handleFileImport($xetable, file, opts) {
       }
     } else {
       // 不支持的浏览器
-      if (true) {
-        errLog('vxe.error.notExp');
-      }
+      errLog('vxe.error.notExp');
       _importResolve({
         status: true
       });
@@ -24020,10 +24059,8 @@ function readLocalFile(options = {}) {
       } else {
         if (options.message !== false) {
           // 检测弹窗模块
-          if (true) {
-            if (!core_.VxeUI.modal) {
-              errLog('vxe.error.reqModule', ['Modal']);
-            }
+          if (!core_.VxeUI.modal) {
+            errLog('vxe.error.reqModule', ['Modal']);
           }
           core_.VxeUI.modal.message({
             content: export_mixin_getI18n('vxe.error.notType', [errType]),
@@ -24789,10 +24826,8 @@ const convertToRows = originColumns => {
       const {
         exportOpts
       } = this;
-      if (true) {
-        if (!this.exportConfig) {
-          errLog('vxe.error.reqProp', ['export-config']);
-        }
+      if (!this.exportConfig) {
+        errLog('vxe.error.reqProp', ['export-config']);
       }
       return handleExportAndPrint(this, Object.assign({}, exportOpts, options));
     },
@@ -24801,10 +24836,8 @@ const convertToRows = originColumns => {
       const {
         printOpts
       } = this;
-      if (true) {
-        if (!this.printConfig) {
-          errLog('vxe.error.reqProp', ['print-config']);
-        }
+      if (!this.printConfig) {
+        errLog('vxe.error.reqProp', ['print-config']);
       }
       return handleExportAndPrint(this, Object.assign({}, printOpts, options), true);
     }
@@ -25061,6 +25094,7 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
       });
     },
     handleCellMousedownEvent(evnt, params) {
+      const $xeTable = this;
       const {
         editConfig,
         editOpts,
@@ -25070,8 +25104,8 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
         mouseConfig,
         mouseOpts
       } = this;
-      if (mouseConfig && mouseOpts.area && this.handleMousedownCellAreaEvent) {
-        return this.handleMousedownCellAreaEvent(evnt, params);
+      if (mouseConfig && mouseOpts.area && $xeTable.handleMousedownCellAreaEvent) {
+        return $xeTable.handleMousedownCellAreaEvent(evnt, params);
       } else {
         if (checkboxConfig && checkboxOpts.range) {
           this.handleCheckboxRangeEvent(evnt, params);
@@ -25695,9 +25729,7 @@ function validErrorRuleValue(rule, val) {
                       }
                     }
                   } else {
-                    if (true) {
-                      errLog('vxe.error.notValidators', [validator]);
-                    }
+                    errLog('vxe.error.notValidators', [validator]);
                   }
                 } else {
                   customValid = validator(validParams);
@@ -27804,23 +27836,21 @@ function renderBody(h, $xeTable) {
         warnLog('vxe.error.reqProp', ['tooltip-config']);
       }
     }
-    if (true) {
-      // 使用已安装的组件，如果未安装则不渲染
-      const VxeUILoadingComponent = core_.VxeUI.getComponent('VxeLoading');
-      const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
-      $xeTable.$nextTick(() => {
-        if (props.loading) {
-          if (!VxeUILoadingComponent && !this.$scopedSlots.loading) {
-            errLog('vxe.error.reqComp', ['vxe-loading']);
-          }
+    // 使用已安装的组件，如果未安装则不渲染
+    const VxeUILoadingComponent = core_.VxeUI.getComponent('VxeLoading');
+    const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
+    $xeTable.$nextTick(() => {
+      if (props.loading) {
+        if (!VxeUILoadingComponent && !this.$scopedSlots.loading) {
+          errLog('vxe.error.reqComp', ['vxe-loading']);
         }
-        if (props.showOverflow === true || props.showOverflow === 'tooltip' || props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip' || props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip' || props.tooltipConfig || props.editRules) {
-          if (!VxeUITooltipComponent) {
-            errLog('vxe.error.reqComp', ['vxe-tooltip']);
-          }
+      }
+      if (props.showOverflow === true || props.showOverflow === 'tooltip' || props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip' || props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip' || props.tooltipConfig || props.editRules) {
+        if (!VxeUITooltipComponent) {
+          errLog('vxe.error.reqComp', ['vxe-tooltip']);
         }
-      });
-    }
+      }
+    });
     if (this.autoResize) {
       const resizeObserver = table_globalResize.create(() => {
         if (this.autoResize) {
@@ -28440,9 +28470,7 @@ const {
             if (tCommandMethod) {
               tCommandMethod(params);
             } else {
-              if (true) {
-                errLog('vxe.error.notCommands', [code]);
-              }
+              errLog('vxe.error.notCommands', [code]);
             }
           }
           $xeToolbar.dispatchEvent('button-click', params, evnt);
@@ -28477,9 +28505,7 @@ const {
             if (tCommandMethod) {
               tCommandMethod(params);
             } else {
-              if (true) {
-                errLog('vxe.error.notCommands', [code]);
-              }
+              errLog('vxe.error.notCommands', [code]);
             }
           }
           $xeToolbar.dispatchEvent('tool-click', params, evnt);
@@ -28932,28 +28958,24 @@ const {
         $xetable.connect(this);
       }
       const customOpts = $xeToolbar.computeCustomOpts;
-      if (true) {
-        if (customOpts.isFooter) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
-        }
-        if (customOpts.showFooter) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
-        }
-        if (customOpts.immediate) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
-        }
-        if (customOpts.trigger) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
-        }
+      if (customOpts.isFooter) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
+      }
+      if (customOpts.showFooter) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
+      }
+      if (customOpts.immediate) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
+      }
+      if (customOpts.trigger) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
       }
     });
-    if (true) {
-      // 使用已安装的组件，如果未安装则不渲染
-      const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
-      if (props.refresh || props.import || props.export || props.print || props.zoom) {
-        if (!VxeUIButtonComponent) {
-          errLog('vxe.error.reqComp', ['vxe-button']);
-        }
+    // 使用已安装的组件，如果未安装则不渲染
+    const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
+    if (props.refresh || props.import || props.export || props.print || props.zoom) {
+      if (!VxeUIButtonComponent) {
+        errLog('vxe.error.reqComp', ['vxe-button']);
       }
     }
   },
@@ -29047,9 +29069,7 @@ function getFuncSlot($xeGrid, optSlots, slotKey) {
       if (slots[funcSlot]) {
         return slots[funcSlot];
       } else {
-        if (true) {
-          errLog('vxe.error.notSlot', [funcSlot]);
-        }
+        errLog('vxe.error.notSlot', [funcSlot]);
       }
     } else {
       return funcSlot;
@@ -29142,7 +29162,7 @@ function renderForm(h, _vm) {
   if (hasForm) {
     return h('div', {
       key: 'form',
-      ref: 'formWrapper',
+      ref: 'refFormWrapper',
       class: 'vxe-grid--form-wrapper'
     }, formSlot ? formSlot.call(_vm, {
       $grid: _vm
@@ -29165,7 +29185,7 @@ function renderToolbar(h, _vm) {
   if (hasToolbar) {
     return h('div', {
       key: 'toolbar',
-      ref: 'toolbarWrapper',
+      ref: 'refToolbarWrapper',
       class: 'vxe-grid--toolbar-wrapper'
     }, toolbarSlot ? toolbarSlot.call(_vm, {
       $grid: _vm
@@ -29188,7 +29208,7 @@ function renderTop(h, _vm) {
   const topSlot = $scopedSlots.top;
   return topSlot ? h('div', {
     key: 'top',
-    ref: 'topWrapper',
+    ref: 'refTopWrapper',
     class: 'vxe-grid--top-wrapper'
   }, topSlot.call(_vm, {
     $grid: _vm
@@ -29253,7 +29273,7 @@ function renderBottom(h, _vm) {
   const bottomSlot = $scopedSlots.bottom;
   return bottomSlot ? h('div', {
     key: 'bottom',
-    ref: 'bottomWrapper',
+    ref: 'refBottomWrapper',
     class: 'vxe-grid--bottom-wrapper'
   }, bottomSlot.call(_vm, {
     $grid: _vm
@@ -29278,7 +29298,7 @@ function renderPager(h, $xeGrid) {
   if (hasPager) {
     return h('div', {
       key: 'pager',
-      ref: 'pagerWrapper',
+      ref: 'refPagerWrapper',
       class: 'vxe-grid--pager-wrapper'
     }, pagerSlot ? pagerSlot.call($xeGrid, {
       $grid: $xeGrid
@@ -29568,34 +29588,30 @@ Object.keys(table.methods).forEach(name => {
     // if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
     //   errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
     // }
-    if (true) {
-      if (this.toolbar) {
-        warnLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config']);
-      }
-      if (this.toolbarConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.toolbarConfig)) {
-        warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}']);
-      }
-      // if (proxyOpts.props) {
-      //   warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
-      // }
+    if (this.toolbar) {
+      warnLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config']);
     }
-    if (true) {
-      // 使用已安装的组件，如果未安装则不渲染
-      const VxeUIFormComponent = core_.VxeUI.getComponent('VxeForm');
-      const VxeUIPagerComponent = core_.VxeUI.getComponent('VxePager');
-      $xeGrid.$nextTick(() => {
-        if (props.formConfig) {
-          if (!VxeUIFormComponent) {
-            errLog('vxe.error.reqComp', ['vxe-form']);
-          }
+    if (this.toolbarConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.toolbarConfig)) {
+      warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}']);
+    }
+    // if (proxyOpts.props) {
+    //   warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
+    // }
+    // 使用已安装的组件，如果未安装则不渲染
+    const VxeUIFormComponent = core_.VxeUI.getComponent('VxeForm');
+    const VxeUIPagerComponent = core_.VxeUI.getComponent('VxePager');
+    $xeGrid.$nextTick(() => {
+      if (props.formConfig) {
+        if (!VxeUIFormComponent) {
+          errLog('vxe.error.reqComp', ['vxe-form']);
         }
-        if (props.pagerConfig) {
-          if (!VxeUIPagerComponent) {
-            errLog('vxe.error.reqComp', ['vxe-pager']);
-          }
+      }
+      if (props.pagerConfig) {
+        if (!VxeUIPagerComponent) {
+          errLog('vxe.error.reqComp', ['vxe-pager']);
         }
-      });
-    }
+      }
+    });
     this.initPages();
     grid_globalEvents.on(this, 'keydown', this.handleGlobalKeydownEvent);
   },
@@ -29616,6 +29632,7 @@ Object.keys(table.methods).forEach(name => {
     const vSize = $xeGrid.computeSize;
     const styles = $xeGrid.computeStyles;
     return h('div', {
+      ref: 'refElem',
       class: ['vxe-grid', {
         [`size--${vSize}`]: vSize,
         'is--animat': !!this.animat,
@@ -29642,32 +29659,32 @@ Object.keys(table.methods).forEach(name => {
       }
       return [];
     },
-    getParentHeight() {
-      const {
-        $el,
-        isZMax
-      } = this;
-      return (isZMax ? getDomNode().visibleHeight : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle($el.parentNode).height)) - this.getExcludeHeight();
-    },
     /**
      * 获取需要排除的高度
      */
     getExcludeHeight() {
+      const $xeGrid = this;
+      const reactData = $xeGrid;
       const {
-        $refs,
-        $el,
-        isZMax,
-        height
-      } = this;
-      const {
-        formWrapper,
-        toolbarWrapper,
-        topWrapper,
-        bottomWrapper,
-        pagerWrapper
-      } = $refs;
-      const parentPaddingSize = isZMax || !(height === 'auto' || height === '100%') ? 0 : getPaddingTopBottomSize($el.parentNode);
-      return parentPaddingSize + getPaddingTopBottomSize($el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
+        isZMax
+      } = reactData;
+      const el = $xeGrid.$refs.refElem;
+      const formWrapper = $xeGrid.$refs.refFormWrapper;
+      const toolbarWrapper = $xeGrid.$refs.refToolbarWrapper;
+      const topWrapper = $xeGrid.$refs.refTopWrapper;
+      const bottomWrapper = $xeGrid.$refs.refBottomWrapper;
+      const pagerWrapper = $xeGrid.$refs.refPagerWrapper;
+      const parentPaddingSize = isZMax ? 0 : getPaddingTopBottomSize(el.parentNode);
+      return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
+    },
+    getParentHeight() {
+      const $xeGrid = this;
+      const reactData = $xeGrid;
+      const el = $xeGrid.$refs.refElem;
+      if (el) {
+        return (reactData.isZMax ? getDomNode().visibleHeight : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(el.parentNode).height)) - $xeGrid.getExcludeHeight();
+      }
+      return 0;
     },
     initToolbar() {
       this.$nextTick(() => {
@@ -29959,9 +29976,7 @@ Object.keys(table.methods).forEach(name => {
                 };
               });
             } else {
-              if (true) {
-                errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
-              }
+              errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
             }
             break;
           }
@@ -29996,10 +30011,8 @@ Object.keys(table.methods).forEach(name => {
                     $xetable.setPendingRow(removeRecords, false);
                     if (isRespMsg) {
                       // 检测弹窗模块
-                      if (true) {
-                        if (!core_.VxeUI.modal) {
-                          errLog('vxe.error.reqModule', ['Modal']);
-                        }
+                      if (!core_.VxeUI.modal) {
+                        errLog('vxe.error.reqModule', ['Modal']);
                       }
                       core_.VxeUI.modal.message({
                         content: this.getRespMsg(rest, 'vxe.grid.delSuccess'),
@@ -30024,10 +30037,8 @@ Object.keys(table.methods).forEach(name => {
                     this.tableLoading = false;
                     if (isRespMsg) {
                       // 检测弹窗模块
-                      if (true) {
-                        if (!core_.VxeUI.modal) {
-                          errLog('vxe.error.reqModule', ['Modal']);
-                        }
+                      if (!core_.VxeUI.modal) {
+                        errLog('vxe.error.reqModule', ['Modal']);
                       }
                       core_.VxeUI.modal.message({
                         id: code,
@@ -30049,10 +30060,8 @@ Object.keys(table.methods).forEach(name => {
               } else {
                 if (isActiveMsg) {
                   // 检测弹窗模块
-                  if (true) {
-                    if (!core_.VxeUI.modal) {
-                      errLog('vxe.error.reqModule', ['Modal']);
-                    }
+                  if (!core_.VxeUI.modal) {
+                    errLog('vxe.error.reqModule', ['Modal']);
                   }
                   core_.VxeUI.modal.message({
                     id: code,
@@ -30062,9 +30071,7 @@ Object.keys(table.methods).forEach(name => {
                 }
               }
             } else {
-              if (true) {
-                errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
-              }
+              errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
             }
             break;
           }
@@ -30115,10 +30122,8 @@ Object.keys(table.methods).forEach(name => {
                     $xetable.clearPendingRow();
                     if (isRespMsg) {
                       // 检测弹窗模块
-                      if (true) {
-                        if (!core_.VxeUI.modal) {
-                          errLog('vxe.error.reqModule', ['Modal']);
-                        }
+                      if (!core_.VxeUI.modal) {
+                        errLog('vxe.error.reqModule', ['Modal']);
                       }
                       core_.VxeUI.modal.message({
                         content: this.getRespMsg(rest, 'vxe.grid.saveSuccess'),
@@ -30143,10 +30148,8 @@ Object.keys(table.methods).forEach(name => {
                     this.tableLoading = false;
                     if (isRespMsg) {
                       // 检测弹窗模块
-                      if (true) {
-                        if (!core_.VxeUI.modal) {
-                          errLog('vxe.error.reqModule', ['Modal']);
-                        }
+                      if (!core_.VxeUI.modal) {
+                        errLog('vxe.error.reqModule', ['Modal']);
                       }
                       core_.VxeUI.modal.message({
                         id: code,
@@ -30167,10 +30170,8 @@ Object.keys(table.methods).forEach(name => {
                 } else {
                   if (isActiveMsg) {
                     // 检测弹窗模块
-                    if (true) {
-                      if (!core_.VxeUI.modal) {
-                        errLog('vxe.error.reqModule', ['Modal']);
-                      }
+                    if (!core_.VxeUI.modal) {
+                      errLog('vxe.error.reqModule', ['Modal']);
                     }
                     core_.VxeUI.modal.message({
                       id: code,
@@ -30181,9 +30182,7 @@ Object.keys(table.methods).forEach(name => {
                 }
               });
             } else {
-              if (true) {
-                errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
-              }
+              errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
             }
             break;
           }
@@ -30199,9 +30198,7 @@ Object.keys(table.methods).forEach(name => {
                   $table: $xetable
                 }, ...args);
               } else {
-                if (true) {
-                  errLog('vxe.error.notCommands', [code]);
-                }
+                errLog('vxe.error.notCommands', [code]);
               }
             }
           }
@@ -30234,10 +30231,8 @@ Object.keys(table.methods).forEach(name => {
           });
         } else {
           // 检测弹窗模块
-          if (true) {
-            if (!core_.VxeUI.modal) {
-              errLog('vxe.error.reqModule', ['Modal']);
-            }
+          if (!core_.VxeUI.modal) {
+            errLog('vxe.error.reqModule', ['Modal']);
           }
           core_.VxeUI.modal.message({
             id: `msg_${code}`,
@@ -30318,10 +30313,8 @@ Object.keys(table.methods).forEach(name => {
       } else {
         if (isActiveMsg) {
           // 检测弹窗模块
-          if (true) {
-            if (!core_.VxeUI.modal) {
-              errLog('vxe.error.reqModule', ['Modal']);
-            }
+          if (!core_.VxeUI.modal) {
+            errLog('vxe.error.reqModule', ['Modal']);
           }
           core_.VxeUI.modal.message({
             id: code,
@@ -30747,10 +30740,8 @@ function getComponentOns(renderOpts, params, eFns) {
   const ons = {};
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(events, (func, key) => {
     ons[getOnName(key)] = function (...args) {
-      if (true) {
-        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
-          errLog('vxe.error.errFunc', [func]);
-        }
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
+        errLog('vxe.error.errFunc', [func]);
       }
       func(params, ...args);
     };