vxe-table 4.1.0-beta.0 → 4.1.2

package/lib/index.umd.js

@@ -7976,7 +7976,6 @@ var GlobalConfig = {
     // resizeInterval: 500,
     // size: null,
     // zIndex: null,
-    // resizable: false,
     // autoResize: false,
     // stripe: false,
     // border: false,
@@ -8022,6 +8021,8 @@ var GlobalConfig = {
       showIcon: true
     },
     treeConfig: {
+      rowtKey: 'id',
+      parentKey: 'parentId',
       children: 'children',
       hasChild: 'hasChild',
       indent: 20,
@@ -11762,7 +11763,7 @@ var editHook = {
 
         reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
         $xetable.updateFooter();
-        $xetable.updateCache();
+        $xetable.cacheRowMap();
         $xetable.handleTableData();
         $xetable.updateAfterDataIndex();
         $xetable.checkSelectionStatus();
@@ -11876,7 +11877,7 @@ var editHook = {
         });
         reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
         $xetable.updateFooter();
-        $xetable.updateCache();
+        $xetable.cacheRowMap();
         $xetable.handleTableData();
         $xetable.updateAfterDataIndex();
         $xetable.checkSelectionStatus();
@@ -16931,7 +16932,7 @@ function getOptUniqueId() {
       return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
     };
 
-    var updateCache = function updateCache() {
+    var cacheItemMap = function cacheItemMap() {
       var fullOptionList = reactData.fullOptionList,
           fullGroupList = reactData.fullGroupList;
       var groupOptionsField = computeGroupOptionsField.value;
@@ -17542,21 +17543,21 @@ function getOptUniqueId() {
         reactData.fullOptionList = value || [];
       }
 
-      updateCache();
+      cacheItemMap();
     });
     Object(external_commonjs_vue_commonjs2_vue_root_Vue_["watch"])(function () {
       return props.options;
     }, function (value) {
       reactData.fullGroupList = [];
       reactData.fullOptionList = value || [];
-      updateCache();
+      cacheItemMap();
     });
     Object(external_commonjs_vue_commonjs2_vue_root_Vue_["watch"])(function () {
       return props.optionGroups;
     }, function (value) {
       reactData.fullOptionList = [];
       reactData.fullGroupList = value || [];
-      updateCache();
+      cacheItemMap();
     });
     Object(external_commonjs_vue_commonjs2_vue_root_Vue_["onMounted"])(function () {
       Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
@@ -17569,7 +17570,7 @@ function getOptUniqueId() {
           reactData.fullOptionList = options;
         }
 
-        updateCache();
+        cacheItemMap();
       });
       GlobalEvent.on($xeselect, 'mousewheel', handleGlobalMousewheelEvent);
       GlobalEvent.on($xeselect, 'mousedown', handleGlobalMousedownEvent);
@@ -18397,9 +18398,6 @@ var web_url_search_params = __webpack_require__("9861");
 
 
 
-
-
-
  // 导入
 
 var fileForm;
@@ -18477,6 +18475,13 @@ var util_readLocalFile = function readLocalFile(options) {
         });
       } else {
         if (opts.message !== false) {
+          // 检测弹窗模块
+          if (true) {
+            if (!VXETable.modal) {
+              errLog('vxe.error.reqModule', ['Modal']);
+            }
+          }
+
           VXETable.modal.message({
             content: conf.i18n('vxe.error.notType', [errType]),
             status: 'error'
@@ -18575,13 +18580,20 @@ var util_saveLocalFile = function saveLocalFile(options) {
     if (navigator.msSaveBlob) {
       navigator.msSaveBlob(blob, name);
     } else {
+      var url = URL.createObjectURL(blob);
       var linkElem = document.createElement('a');
       linkElem.target = '_blank';
       linkElem.download = name;
-      linkElem.href = URL.createObjectURL(blob);
+      linkElem.href = url;
       document.body.appendChild(linkElem);
       linkElem.click();
-      document.body.removeChild(linkElem);
+      requestAnimationFrame(function () {
+        if (linkElem.parentNode) {
+          linkElem.parentNode.removeChild(linkElem);
+        }
+
+        URL.revokeObjectURL(url);
+      });
     }
 
     return Promise.resolve();
@@ -18611,8 +18623,6 @@ var util_saveLocalFile = function saveLocalFile(options) {
 
 
 
-
-
 
 
 
@@ -19532,6 +19542,13 @@ var tableExportHook = {
         content: content
       }).then(function () {
         if (opts.message !== false) {
+          // 检测弹窗模块
+          if (true) {
+            if (!VXETable.modal) {
+              errLog('vxe.error.reqModule', ['Modal']);
+            }
+          }
+
           VXETable.modal.message({
             content: conf.i18n('vxe.table.expSuccess'),
             status: 'success'
@@ -19646,6 +19663,13 @@ var tableExportHook = {
           }
 
           if (opts.message !== false) {
+            // 检测弹窗模块
+            if (true) {
+              if (!VXETable.modal) {
+                errLog('vxe.error.reqModule', ['Modal']);
+              }
+            }
+
             VXETable.modal.message({
               content: conf.i18n('vxe.table.impSuccess', [rows.length]),
               status: 'success'
@@ -19661,6 +19685,13 @@ var tableExportHook = {
           });
         });
       } else if (opts.message !== false) {
+        // 检测弹窗模块
+        if (true) {
+          if (!VXETable.modal) {
+            errLog('vxe.error.reqModule', ['Modal']);
+          }
+        }
+
         VXETable.modal.message({
           content: conf.i18n('vxe.error.impFields'),
           status: 'error'
@@ -19685,6 +19716,13 @@ var tableExportHook = {
 
       if (!importMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.includes(VXETable.config.importTypes, type)) {
         if (opts.message !== false) {
+          // 检测弹窗模块
+          if (true) {
+            if (!VXETable.modal) {
+              errLog('vxe.error.reqModule', ['Modal']);
+            }
+          }
+
           VXETable.modal.message({
             content: conf.i18n('vxe.error.notType', [type]),
             status: 'error'
@@ -20849,9 +20887,6 @@ var Keyboard = {
 
 
 
-
-
-
 /**
  * 校验规则
  */
@@ -20879,9 +20914,14 @@ var hook_Rule = /*#__PURE__*/function () {
 
 
   _createClass(Rule, [{
+    key: "content",
+    get: function get() {
+      return getFuncText(this.$options.content || this.$options.message);
+    }
+  }, {
     key: "message",
     get: function get() {
-      return getFuncText(this.$options.message);
+      return this.content;
     }
   }]);
 
@@ -21190,7 +21230,7 @@ var validatorHook = {
                       errorRules.push(new hook_Rule({
                         type: 'custom',
                         trigger: trigger,
-                        message: customValid.message,
+                        content: customValid.message,
                         rule: new hook_Rule(rule)
                       }));
                     } else if (customValid.catch) {
@@ -21200,7 +21240,7 @@ var validatorHook = {
                         errorRules.push(new hook_Rule({
                           type: 'custom',
                           trigger: trigger,
-                          message: e && e.message ? e.message : rule.message,
+                          content: e && e.message ? e.message : rule.content || rule.message,
                           rule: new hook_Rule(rule)
                         }));
                       }));
@@ -21304,7 +21344,7 @@ var validatorHook = {
             column = params.column,
             cell = params.cell;
         var validTip = refValidTooltip.value;
-        var content = rule.message;
+        var content = rule.content;
         return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])().then(function () {
           Object.assign(validStore, {
             row: row,
@@ -21450,6 +21490,9 @@ var renderType = 'header';
         refRightContainer = _$xetable$getRefMaps.refRightContainer,
         refCellResizeBar = _$xetable$getRefMaps.refCellResizeBar;
 
+    var _$xetable$getComputeM = $xetable.getComputeMaps(),
+        computeColumnOpts = _$xetable$getComputeM.computeColumnOpts;
+
     var headerColumn = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])([]);
     var refElem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
     var refHeaderTable = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
@@ -21595,14 +21638,15 @@ var renderType = 'header';
           mouseConfig = tableProps.mouseConfig;
       var isGroup = tableReactData.isGroup,
           currentColumn = tableReactData.currentColumn,
-          scrollXLoad = tableReactData.scrollXLoad,
+          scrollYLoad = tableReactData.scrollYLoad,
           overflowX = tableReactData.overflowX,
           scrollbarWidth = tableReactData.scrollbarWidth;
+      var columnOpts = computeColumnOpts.value;
       var headerGroups = headerColumn.value; // 如果是使用优化模式
 
       if (!isGroup) {
         if (fixedType) {
-          if (scrollXLoad || allColumnHeaderOverflow) {
+          if (scrollYLoad || allColumnHeaderOverflow) {
             tableColumn = fixedColumn;
           }
         }
@@ -21699,9 +21743,9 @@ var renderType = 'header';
             onDblclick: function onDblclick(evnt) {
               return $xetable.triggerHeaderCellDblclickEvent(evnt, params);
             }
-          }; // 虚拟滚动不支持动态高度
+          }; // 纵向虚拟滚动不支持动态行高
 
-          if (scrollXLoad && !hasEllipsis) {
+          if (scrollYLoad && !hasEllipsis) {
             showEllipsis = hasEllipsis = true;
           } // 按下事件处理
 
@@ -21730,7 +21774,7 @@ var renderType = 'header';
           /**
            * 列宽拖动
            */
-          !fixedHiddenColumn && !isColGroup && (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isBoolean(column.resizable) ? column.resizable : resizable) ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
+          !fixedHiddenColumn && !isColGroup && (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || resizable) ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
             class: ['vxe-resizable', {
               'is--line': !border || border === 'none'
             }],
@@ -21776,7 +21820,6 @@ var Header = Object.assign(header, {
 
 
 
-
 var footer_renderType = 'footer';
 
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
@@ -21924,7 +21967,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           columnKey = tableProps.columnKey,
           allColumnFooterOverflow = tableProps.showFooterOverflow;
       var visibleColumn = tableInternalData.visibleColumn;
-      var scrollXLoad = tableReactData.scrollXLoad,
+      var scrollYLoad = tableReactData.scrollYLoad,
           overflowX = tableReactData.overflowX,
           scrollbarWidth = tableReactData.scrollbarWidth,
           currentColumn = tableReactData.currentColumn,
@@ -21932,7 +21975,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
       var tooltipOpts = computeTooltipOpts.value; // 如果是使用优化模式
 
       if (fixedType) {
-        if (scrollXLoad || allColumnFooterOverflow) {
+        if (scrollYLoad || allColumnFooterOverflow) {
           if (!mergeFooterList.length || !footerSpanMethod) {
             tableColumn = fixedColumn;
           } else {
@@ -22033,9 +22076,9 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
             fixed: fixedType,
             type: footer_renderType,
             data: footerTableData
-          }; // 虚拟滚动不支持动态高度
+          }; // 纵向虚拟滚动不支持动态行高
 
-          if (scrollXLoad && !hasEllipsis) {
+          if (scrollYLoad && !hasEllipsis) {
             showEllipsis = hasEllipsis = true;
           }
 
@@ -23475,8 +23518,11 @@ var es_array_sort = __webpack_require__("4e82");
   },
   // 是否自动根据状态属性去更新响应式表格宽高
   syncResize: [Boolean, String, Number],
-  // 设置列的默认参数，仅对部分支持的属性有效
+  // 列配置信息
   columnConfig: Object,
+  // 行配置信息
+  rowConfig: Object,
+  // 列调整配置项
   resizableConfig: Object,
   // 序号配置项
   seqConfig: Object,
@@ -23568,7 +23614,7 @@ var es_array_sort = __webpack_require__("4e82");
 
 
 var tableComponentPropKeys = Object.keys(src_props);
-var tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getRowById', 'getRowid', 'getTableData', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadExpandContent', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'focus', 'blur', 'connect'];
+var tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getRowById', 'getRowid', 'getTableData', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'focus', 'blur', 'connect'];
 var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'toolbar-button-click', 'toolbar-tool-click', 'zoom']);
 /* harmony default export */ var grid = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeGrid',
@@ -23824,6 +23870,13 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
         gridExtendTableMethods.clearCheckboxRow();
       } else {
         if (isMsg) {
+          // 检测弹窗模块
+          if (true) {
+            if (!VXETable.modal) {
+              errLog('vxe.error.reqModule', ['Modal']);
+            }
+          }
+
           VXETable.modal.message({
             id: code,
             content: conf.i18n('vxe.grid.selectOneRecord'),
@@ -23862,6 +23915,13 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
             }
           });
         } else {
+          // 检测弹窗模块
+          if (true) {
+            if (!VXETable.modal) {
+              errLog('vxe.error.reqModule', ['Modal']);
+            }
+          }
+
           VXETable.modal.message({
             id: "msg_".concat(code),
             content: conf.i18n('vxe.grid.selectOneRecord'),
@@ -24527,6 +24587,13 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
                       });
 
                       if (isMsg) {
+                        // 检测弹窗模块
+                        if (true) {
+                          if (!VXETable.modal) {
+                            errLog('vxe.error.reqModule', ['Modal']);
+                          }
+                        }
+
                         VXETable.modal.message({
                           content: getRespMsg(rest, 'vxe.grid.delSuccess'),
                           status: 'success'
@@ -24542,6 +24609,12 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
                       reactData.tableLoading = false;
 
                       if (isMsg) {
+                        if (true) {
+                          if (!VXETable.modal.message) {
+                            errLog('vxe.error.reqModule', ['Modal']);
+                          }
+                        }
+
                         VXETable.modal.message({
                           id: code,
                           content: getRespMsg(rest, 'vxe.grid.operError'),
@@ -24552,6 +24625,13 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
                   });
                 } else {
                   if (isMsg) {
+                    // 检测弹窗模块
+                    if (true) {
+                      if (!VXETable.modal) {
+                        errLog('vxe.error.reqModule', ['Modal']);
+                      }
+                    }
+
                     VXETable.modal.message({
                       id: code,
                       content: conf.i18n('vxe.grid.selectOneRecord'),
@@ -24613,6 +24693,13 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
                       reactData.pendingRecords = [];
 
                       if (isMsg) {
+                        // 检测弹窗模块
+                        if (true) {
+                          if (!VXETable.modal) {
+                            errLog('vxe.error.reqModule', ['Modal']);
+                          }
+                        }
+
                         VXETable.modal.message({
                           content: getRespMsg(rest, 'vxe.grid.saveSuccess'),
                           status: 'success'
@@ -24628,6 +24715,13 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
                       reactData.tableLoading = false;
 
                       if (isMsg) {
+                        // 检测弹窗模块
+                        if (true) {
+                          if (!VXETable.modal) {
+                            errLog('vxe.error.reqModule', ['Modal']);
+                          }
+                        }
+
                         VXETable.modal.message({
                           id: code,
                           content: getRespMsg(rest, 'vxe.grid.operError'),
@@ -24637,6 +24731,13 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
                     });
                   } else {
                     if (isMsg) {
+                      // 检测弹窗模块
+                      if (true) {
+                        if (!VXETable.modal) {
+                          errLog('vxe.error.reqModule', ['Modal']);
+                        }
+                      }
+
                       VXETable.modal.message({
                         id: code,
                         content: conf.i18n('vxe.grid.dataUnchanged'),
@@ -27487,8 +27588,8 @@ function renderTitle($xeform, item) {
   var titVNs = [];
 
   if (titlePrefix) {
-    titVNs.push(titlePrefix.message ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])('vxe-tooltip'), {
-      content: getFuncText(titlePrefix.message),
+    titVNs.push(titlePrefix.content || titlePrefix.message ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])('vxe-tooltip'), {
+      content: getFuncText(titlePrefix.content || titlePrefix.message),
       enterable: titlePrefix.enterable,
       theme: titlePrefix.theme
     }, {
@@ -27507,8 +27608,8 @@ function renderTitle($xeform, item) {
   var fixVNs = [];
 
   if (titleSuffix) {
-    fixVNs.push(titleSuffix.message ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])('vxe-tooltip'), {
-      content: getFuncText(titleSuffix.message),
+    fixVNs.push(titleSuffix.content || titleSuffix.message ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])('vxe-tooltip'), {
+      content: getFuncText(titleSuffix.content || titleSuffix.message),
       enterable: titleSuffix.enterable,
       theme: titleSuffix.theme
     }, {
@@ -27548,9 +27649,6 @@ function renderTitle($xeform, item) {
 
 
 
-
-
-
 
 
 
@@ -27573,9 +27671,14 @@ var form_Rule = /*#__PURE__*/function () {
   }
 
   _createClass(Rule, [{
+    key: "content",
+    get: function get() {
+      return getFuncText(this.$options.content || this.$options.message);
+    }
+  }, {
     key: "message",
     get: function get() {
-      return getFuncText(this.$options.message);
+      return this.content;
     }
   }]);
 
@@ -27635,7 +27738,12 @@ function getResetValue(value, resetValue) {
         return conf.form.size || conf.size;
       }
     },
-    span: [String, Number],
+    span: {
+      type: [String, Number],
+      default: function _default() {
+        return conf.form.span;
+      }
+    },
     align: {
       type: String,
       default: function _default() {
@@ -27648,7 +27756,12 @@ function getResetValue(value, resetValue) {
         return conf.form.titleAlign;
       }
     },
-    titleWidth: [String, Number],
+    titleWidth: {
+      type: [String, Number],
+      default: function _default() {
+        return conf.form.titleWidth;
+      }
+    },
     titleColon: {
       type: Boolean,
       default: function _default() {
@@ -27969,7 +28082,7 @@ function getResetValue(value, resetValue) {
                     errorRules.push(new form_Rule({
                       type: 'custom',
                       trigger: trigger,
-                      message: customValid.message,
+                      content: customValid.message,
                       rule: new form_Rule(rule)
                     }));
                   } else if (customValid.catch) {
@@ -27978,7 +28091,7 @@ function getResetValue(value, resetValue) {
                       errorRules.push(new form_Rule({
                         type: 'custom',
                         trigger: trigger,
-                        message: e ? e.message : rule.message,
+                        content: e ? e.message : rule.content || rule.message,
                         rule: new form_Rule(rule)
                       }));
                     }));
@@ -28295,7 +28408,7 @@ function getResetValue(value, resetValue) {
             style: errRule.maxWidth ? {
               width: "".concat(errRule.maxWidth, "px")
             } : null
-          }, errRule.message));
+          }, errRule.content));
         }
 
         var ons = showTooltip ? {
@@ -29997,7 +30110,8 @@ var lineOffsetSizes = {
         computeRadioOpts = _$xetable$getComputeM.computeRadioOpts,
         computeTreeOpts = _$xetable$getComputeM.computeTreeOpts,
         computeCheckboxOpts = _$xetable$getComputeM.computeCheckboxOpts,
-        computeValidOpts = _$xetable$getComputeM.computeValidOpts;
+        computeValidOpts = _$xetable$getComputeM.computeValidOpts,
+        computeRowOpts = _$xetable$getComputeM.computeRowOpts;
 
     var refElem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
     var refBodyTable = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
@@ -30098,7 +30212,6 @@ var lineOffsetSizes = {
           tooltipConfig = tableProps.tooltipConfig;
       var tableData = tableReactData.tableData,
           overflowX = tableReactData.overflowX,
-          scrollXLoad = tableReactData.scrollXLoad,
           scrollYLoad = tableReactData.scrollYLoad,
           currentColumn = tableReactData.currentColumn,
           mergeList = tableReactData.mergeList,
@@ -30110,6 +30223,7 @@ var lineOffsetSizes = {
       var checkboxOpts = computeCheckboxOpts.value;
       var editOpts = computeEditOpts.value;
       var tooltipOpts = computeTooltipOpts.value;
+      var rowOpts = computeRowOpts.value;
       var sYOpts = computeSYOpts.value;
       var type = column.type,
           cellRender = column.cellRender,
@@ -30119,7 +30233,8 @@ var lineOffsetSizes = {
           className = column.className,
           treeNode = column.treeNode;
       var actived = editStore.actived;
-      var rHeight = sYOpts.rHeight;
+      var scrollYRHeight = sYOpts.rHeight;
+      var rowHeight = rowOpts.height;
       var showAllTip = tooltipOpts.showAll;
       var columnIndex = $xetable.getColumnIndex(column);
 
@@ -30162,7 +30277,7 @@ var lineOffsetSizes = {
         items: items
       }; // 虚拟滚动不支持动态高度
 
-      if ((scrollXLoad || scrollYLoad) && !hasEllipsis) {
+      if (scrollYLoad && !hasEllipsis) {
         showEllipsis = hasEllipsis = true;
       } // hover 进入事件
 
@@ -30283,7 +30398,7 @@ var lineOffsetSizes = {
             'c--ellipsis': showEllipsis
           }],
           style: {
-            maxHeight: hasEllipsis && rHeight ? "".concat(rHeight, "px") : ''
+            maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? "".concat(scrollYRHeight || rowHeight, "px") : ''
           }
         }));
       } else {
@@ -30295,7 +30410,7 @@ var lineOffsetSizes = {
             'c--ellipsis': showEllipsis
           }],
           style: {
-            maxHeight: hasEllipsis && rHeight ? "".concat(rHeight, "px") : ''
+            maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? "".concat(scrollYRHeight || rowHeight, "px") : ''
           },
           title: showTitle ? $xetable.getCellLabel(row, column) : null
         }, column.renderCell(params))]));
@@ -30317,12 +30432,12 @@ var lineOffsetSizes = {
         key: columnKey ? column.id : $columnIndex
       }, attrs), {}, {
         style: Object.assign({
-          height: hasEllipsis && rHeight ? "".concat(rHeight, "px") : ''
+          height: hasEllipsis && (scrollYRHeight || rowHeight) ? "".concat(scrollYRHeight || rowHeight, "px") : ''
         }, cellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(cellStyle) ? cellStyle(params) : cellStyle : null)
       }, tdOns), tdVNs);
     };
 
-    var renderRows = function renderRows($seq, rowLevel, fixedType, tableData, tableColumn) {
+    var renderRows = function renderRows($seq, fixedType, tableData, tableColumn) {
       var stripe = tableProps.stripe,
           rowKey = tableProps.rowKey,
           highlightHoverRow = tableProps.highlightHoverRow,
@@ -30338,7 +30453,8 @@ var lineOffsetSizes = {
           rowExpandeds = tableReactData.rowExpandeds,
           expandColumn = tableReactData.expandColumn,
           selectRow = tableReactData.selectRow;
-      var scrollYStore = tableInternalData.scrollYStore;
+      var fullAllDataRowIdData = tableInternalData.fullAllDataRowIdData,
+          scrollYStore = tableInternalData.scrollYStore;
       var checkboxOpts = computeCheckboxOpts.value;
       var radioOpts = computeRadioOpts.value;
       var treeOpts = computeTreeOpts.value;
@@ -30380,6 +30496,8 @@ var lineOffsetSizes = {
         }
 
         var rowid = util_getRowid($xetable, row);
+        var rest = fullAllDataRowIdData[rowid];
+        var rowLevel = rest ? rest.level : 0;
         var params = {
           $table: $xetable,
           $seq: $seq,
@@ -30455,11 +30573,11 @@ var lineOffsetSizes = {
         } // 如果是树形表格
 
 
-        if (treeConfig && treeExpandeds.length) {
+        if (treeConfig && !scrollYLoad && treeExpandeds.length) {
           var rowChildren = row[treeOpts.children];
 
           if (rowChildren && rowChildren.length && $xetable.findRowIndexOf(treeExpandeds, row) > -1) {
-            rows.push.apply(rows, _toConsumableArray(renderRows($seq ? "".concat($seq, ".").concat(seq) : "".concat(seq), rowLevel + 1, fixedType, rowChildren, tableColumn)));
+            rows.push.apply(rows, _toConsumableArray(renderRows($seq ? "".concat($seq, ".").concat(seq) : "".concat(seq), fixedType, rowChildren, tableColumn)));
           }
         }
       });
@@ -30732,7 +30850,6 @@ var lineOffsetSizes = {
           mouseConfig = tableProps.mouseConfig;
       var tableData = tableReactData.tableData,
           mergeList = tableReactData.mergeList,
-          scrollXLoad = tableReactData.scrollXLoad,
           scrollYLoad = tableReactData.scrollYLoad,
           isAllOverflow = tableReactData.isAllOverflow;
       var visibleColumn = tableInternalData.visibleColumn;
@@ -30745,7 +30862,7 @@ var lineOffsetSizes = {
       // 如果是使用优化模式
 
       if (fixedType) {
-        if (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
+        if (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
           if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
             tableColumn = fixedColumn;
           } else {
@@ -30818,7 +30935,7 @@ var lineOffsetSizes = {
        */
       Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('tbody', {
         ref: refBodyTBody
-      }, renderRows('', 0, fixedType, tableData, tableColumn))]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
+      }, renderRows('', fixedType, tableData, tableColumn))]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
         class: 'vxe-table--checkbox-range'
       }), mouseConfig && mouseOpts.area ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
         class: 'vxe-table--cell-area'
@@ -31131,6 +31248,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       treeExpandedReserveRowMap: {},
       // 完整数据、条件处理后
       tableFullData: [],
+      treeFullData: [],
       afterFullData: [],
       tableSynchData: [],
       tableSourceData: [],
@@ -31192,7 +31310,10 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       };
     });
     var computeColumnOpts = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
-      return Object.assign({}, props.columnConfig);
+      return Object.assign({}, conf.table.columnConfig, props.columnConfig);
+    });
+    var computeRowOpts = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      return Object.assign({}, conf.table.rowConfig, props.rowConfig);
     });
     var computeResizableOpts = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       return Object.assign({}, conf.table.resizableConfig, props.resizableConfig);
@@ -31389,6 +31510,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       computeValidOpts: computeValidOpts,
       computeSXOpts: computeSXOpts,
       computeSYOpts: computeSYOpts,
+      computeColumnOpts: computeColumnOpts,
+      computeRowOpts: computeRowOpts,
       computeResizableOpts: computeResizableOpts,
       computeSeqOpts: computeSeqOpts,
       computeRadioOpts: computeRadioOpts,
@@ -32136,7 +32259,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             $index: -1,
             _index: _index,
             items: [],
-            parent: null
+            parent: null,
+            level: 0
           };
         }
       });
@@ -32448,7 +32572,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             var _tWidth = tableWidth; // 如果是使用优化模式
 
             if (fixedType) {
-              if (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
+              if (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
                 if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
                   tableColumn = fixedColumn;
                 } else {
@@ -32549,16 +32673,10 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                 var showTitle = cellOverflow === 'title';
                 var showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
                 var hasEllipsis = showTitle || showTooltip || showEllipsis;
-                var _listElem = elemStore["".concat(name, "-").concat(layout, "-list")]; // 滚动的渲染不支持动态行高
+                var _listElem = elemStore["".concat(name, "-").concat(layout, "-list")]; // 纵向虚拟滚动不支持动态行高
 
-                if (layout === 'header' || layout === 'footer') {
-                  if (scrollXLoad && !hasEllipsis) {
-                    hasEllipsis = true;
-                  }
-                } else {
-                  if ((scrollXLoad || scrollYLoad) && !hasEllipsis) {
-                    hasEllipsis = true;
-                  }
+                if (scrollYLoad && !hasEllipsis) {
+                  hasEllipsis = true;
                 }
 
                 if (_listElem) {
@@ -32883,7 +33001,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             }
 
             if (childRecords) {
-              tableMethods.loadChildren(row, childRecords).then(function (childRows) {
+              tableMethods.loadTreeChildren(row, childRecords).then(function (childRows) {
                 if (childRows.length && $xetable.findRowIndexOf(treeExpandeds, row) === -1) {
                   treeExpandeds.push(row);
                 } // 如果当前节点已选中，则展开后子节点也被选中
@@ -33046,30 +33164,67 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           scrollXStore = internalData.scrollXStore,
           lastScrollLeft = internalData.lastScrollLeft,
           lastScrollTop = internalData.lastScrollTop;
-      var sYOpts = computeSYOpts.value;
-      var tableFullData = datas ? datas.slice(0) : [];
-      var scrollYLoad = !treeConfig && !!sYOpts.enabled && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
+      var treeOpts = computeTreeOpts.value;
+      var transform = treeOpts.transform;
+      var treeData = [];
+      var fullData = datas ? datas.slice(0) : [];
+
+      if (treeConfig) {
+        if (transform) {
+          // 树结构自动转换
+          if (true) {
+            if (!treeOpts.rowtKey) {
+              errLog('vxe.error.reqProp', ['tree-config.rowtKey']);
+            }
+
+            if (!treeOpts.parentKey) {
+              errLog('vxe.error.reqProp', ['tree-config.parentKey']);
+            }
+
+            if (!treeOpts.children) {
+              errLog('vxe.error.reqProp', ['tree-config.children']);
+            }
+
+            fullData.forEach(function (row) {
+              if (row[treeOpts.children] && row[treeOpts.children].length) {
+                warnLog('vxe.error.errConflicts', ['tree-config.transform', "row.".concat(treeOpts.children)]);
+              }
+            });
+          }
+
+          treeData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toArrayTree(fullData, {
+            key: treeOpts.rowtKey,
+            parentKey: treeOpts.parentKey,
+            children: treeOpts.children
+          });
+          fullData = treeData.slice(0);
+        } else {
+          treeData = fullData.slice(0);
+        }
+      }
+
       scrollYStore.startIndex = 0;
       scrollYStore.endIndex = 1;
       scrollXStore.startIndex = 0;
       scrollXStore.endIndex = 1;
       editStore.insertList = [];
-      editStore.removeList = []; // 全量数据
+      editStore.removeList = [];
+      var sYLoad = updateScrollYStatus(fullData);
+      reactData.scrollYLoad = sYLoad; // 全量数据
 
-      internalData.tableFullData = tableFullData; // 缓存数据
+      internalData.tableFullData = fullData;
+      internalData.treeFullData = treeData; // 缓存数据
 
-      tablePrivateMethods.updateCache(true); // 原始数据
+      tablePrivateMethods.cacheRowMap(true); // 原始数据
 
-      internalData.tableSynchData = datas;
+      internalData.tableSynchData = datas; // 克隆原数据，用于显示编辑状态，与编辑值做对比
 
       if (keepSource) {
-        internalData.tableSourceData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clone(tableFullData, true);
+        internalData.tableSourceData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clone(fullData, true);
       }
 
-      reactData.scrollYLoad = scrollYLoad;
-
       if (true) {
-        if (scrollYLoad) {
+        if (sYLoad) {
           if (!(props.height || props.maxHeight)) {
             errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
           }
@@ -33099,8 +33254,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       }).then(function () {
         computeScrollLoad();
       }).then(function () {
-        // 是否加载了数据
-        if (scrollYLoad) {
+        // 是否启用了虚拟滚动
+        if (sYLoad) {
           scrollYStore.endIndex = scrollYStore.visibleSize;
         }
 
@@ -33111,7 +33266,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             return tableMethods.recalculate();
           }).then(function () {
             // 是否变更虚拟滚动
-            if (oldScrollYLoad === scrollYLoad) {
+            if (oldScrollYLoad === sYLoad) {
               restoreScrollLocation($xetable, lastScrollLeft, lastScrollTop).then(resolve);
             } else {
               setTimeout(function () {
@@ -33380,6 +33535,135 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         return tableMethods.recalculate();
       });
     };
+
+    var updateScrollYStatus = function updateScrollYStatus(fullData) {
+      var treeConfig = props.treeConfig;
+      var sYOpts = computeSYOpts.value;
+      var treeOpts = computeTreeOpts.value;
+      var transform = treeOpts.transform;
+      var scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && sYOpts.gt < fullData.length;
+      reactData.scrollYLoad = scrollYLoad;
+      return scrollYLoad;
+    };
+
+    var updateVirtualTreeData = function updateVirtualTreeData() {
+      var oldScrollYLoad = reactData.scrollYLoad,
+          treeExpandeds = reactData.treeExpandeds;
+      var treeFullData = internalData.treeFullData;
+      var treeOpts = computeTreeOpts.value;
+      var fullData = [];
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(treeFullData, function (row, index, items, path, parent) {
+        if (!parent || $xetable.findRowIndexOf(treeExpandeds, parent) > -1) {
+          fullData.push(row);
+        }
+      }, treeOpts);
+      var scrollYLoad = updateScrollYStatus(fullData);
+      internalData.tableFullData = scrollYLoad ? fullData : treeFullData;
+
+      if (scrollYLoad || oldScrollYLoad !== scrollYLoad) {
+        return tablePrivateMethods.handleTableData(true).then(function () {
+          return tableMethods.recalculate();
+        });
+      }
+
+      return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
+    };
+    /**
+     * 展开与收起树节点
+     * @param rows
+     * @param expanded
+     * @returns
+     */
+
+
+    var handleBaseTreeExpand = function handleBaseTreeExpand(rows, expanded) {
+      var treeExpandeds = reactData.treeExpandeds,
+          treeLazyLoadeds = reactData.treeLazyLoadeds,
+          treeNodeColumn = reactData.treeNodeColumn;
+      var fullAllDataRowIdData = internalData.fullAllDataRowIdData,
+          tableFullData = internalData.tableFullData;
+      var treeOpts = computeTreeOpts.value;
+      var reserve = treeOpts.reserve,
+          lazy = treeOpts.lazy,
+          hasChild = treeOpts.hasChild,
+          children = treeOpts.children,
+          accordion = treeOpts.accordion,
+          toggleMethod = treeOpts.toggleMethod;
+      var result = [];
+      var columnIndex = tableMethods.getColumnIndex(treeNodeColumn);
+      var $columnIndex = tableMethods.getVMColumnIndex(treeNodeColumn);
+      var validRows = toggleMethod ? rows.filter(function (row) {
+        return toggleMethod({
+          $table: $xetable,
+          expanded: expanded,
+          column: treeNodeColumn,
+          columnIndex: columnIndex,
+          $columnIndex: $columnIndex,
+          row: row
+        });
+      }) : rows;
+
+      if (accordion) {
+        validRows = validRows.length ? [validRows[validRows.length - 1]] : []; // 同一级只能展开一个
+
+        var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullData, function (item) {
+          return item === validRows[0];
+        }, treeOpts);
+
+        if (matchObj) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeExpandeds, function (item) {
+            return matchObj.items.indexOf(item) > -1;
+          });
+        }
+      }
+
+      if (expanded) {
+        validRows.forEach(function (row) {
+          if ($xetable.findRowIndexOf(treeExpandeds, row) === -1) {
+            var rest = fullAllDataRowIdData[util_getRowid($xetable, row)];
+
+            var isLoad = lazy && row[hasChild] && !rest.treeLoaded && $xetable.findRowIndexOf(treeLazyLoadeds, row) === -1; // 是否使用懒加载
+
+            if (isLoad) {
+              result.push(handleAsyncTreeExpandChilds(row));
+            } else {
+              if (row[children] && row[children].length) {
+                treeExpandeds.push(row);
+              }
+            }
+          }
+        });
+      } else {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeExpandeds, function (row) {
+          return $xetable.findRowIndexOf(validRows, row) > -1;
+        });
+      }
+
+      if (reserve) {
+        validRows.forEach(function (row) {
+          return handleTreeExpandReserve(row, expanded);
+        });
+      }
+
+      return Promise.all(result).then(function () {
+        return tableMethods.recalculate();
+      });
+    };
+    /**
+     * 虚拟树的展开与收起
+     * @param rows
+     * @param expanded
+     * @returns
+     */
+
+
+    var handleVirtualTreeExpand = function handleVirtualTreeExpand(rows, expanded) {
+      return handleBaseTreeExpand(rows, expanded).then(function () {
+        return updateVirtualTreeData();
+      }).then(function () {
+        return tableMethods.recalculate();
+      });
+    };
     /**
      * 纵向 Y 可视渲染处理
      */
@@ -33526,7 +33810,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                 tableSourceData[rowIndex] = record;
                 external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clear(row, undefined);
                 Object.assign(row, tablePrivateMethods.defineField(Object.assign({}, record)));
-                tablePrivateMethods.updateCache(true);
+                tablePrivateMethods.cacheRowMap(true);
               } else {
                 external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.destructuring(oRow, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clone(row, true));
               }
@@ -33546,15 +33830,18 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       /**
        * 用于树结构，给行数据加载子节点
        */
-      loadChildren: function loadChildren(row, childRecords) {
-        return tableMethods.createData(childRecords).then(function (rows) {
-          var keepSource = props.keepSource;
-          var fullDataRowIdData = internalData.fullDataRowIdData,
-              fullAllDataRowIdData = internalData.fullAllDataRowIdData;
-          var tableSourceData = internalData.tableSourceData;
-          var treeOpts = computeTreeOpts.value;
-          var children = treeOpts.children;
+      loadTreeChildren: function loadTreeChildren(row, childRecords) {
+        var keepSource = props.keepSource;
+        var tableSourceData = internalData.tableSourceData,
+            fullDataRowIdData = internalData.fullDataRowIdData,
+            fullAllDataRowIdData = internalData.fullAllDataRowIdData;
+        var treeOpts = computeTreeOpts.value;
+        var children = treeOpts.children;
 
+        var rest = fullAllDataRowIdData[util_getRowid($xetable, row)];
+
+        var parentLevel = rest ? rest.level : 0;
+        return tableMethods.createData(childRecords).then(function (rows) {
           if (keepSource) {
             var rowid = util_getRowid($xetable, row);
 
@@ -33567,7 +33854,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             }
           }
 
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(rows, function (childRow, index, items, path, parent) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
             var rowid = util_getRowid($xetable, childRow);
 
             var rest = {
@@ -33577,7 +33864,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               _index: -1,
               $index: -1,
               items: items,
-              parent: parent
+              parent: parent,
+              level: parentLevel + nodes.length
             };
             fullDataRowIdData[rowid] = rest;
             fullAllDataRowIdData[rowid] = rest;
@@ -34922,10 +35210,10 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       },
 
       /**
-       * 重新加载展开行的内容
+       * 重新懒加载展开行，并展开内容
        * @param {Row} row 行对象
        */
-      reloadExpandContent: function reloadExpandContent(row) {
+      reloadRowExpand: function reloadRowExpand(row) {
         var expandLazyLoadeds = reactData.expandLazyLoadeds;
         var expandOpts = computeExpandOpts.value;
         var lazy = expandOpts.lazy;
@@ -34938,6 +35226,14 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 
         return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
       },
+      reloadExpandContent: function reloadExpandContent(row) {
+        if (true) {
+          warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
+        } // 即将废弃
+
+
+        return tableMethods.reloadRowExpand(row);
+      },
 
       /**
        * 切换展开行
@@ -35106,23 +35402,38 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       },
 
       /**
-       * 重新加载树的子节点
+       * 重新懒加载树节点，并展开该节点
        * @param {Row} row 行对象
        */
-      reloadTreeChilds: function reloadTreeChilds(row) {
+      reloadTreeExpand: function reloadTreeExpand(row) {
         var treeLazyLoadeds = reactData.treeLazyLoadeds;
         var treeOpts = computeTreeOpts.value;
-        var lazy = treeOpts.lazy,
+        var transform = treeOpts.transform,
+            lazy = treeOpts.lazy,
             hasChild = treeOpts.hasChild;
 
         if (lazy && row[hasChild] && $xetable.findRowIndexOf(treeLazyLoadeds, row) === -1) {
           tableMethods.clearTreeExpandLoaded(row).then(function () {
             return handleAsyncTreeExpandChilds(row);
+          }).then(function () {
+            if (transform) {
+              return updateVirtualTreeData();
+            }
+          }).then(function () {
+            return tableMethods.recalculate();
           });
         }
 
         return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
       },
+      reloadTreeChilds: function reloadTreeChilds(row) {
+        if (true) {
+          warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
+        } // 即将废弃
+
+
+        return tableMethods.reloadTreeExpand(row);
+      },
 
       /**
        * 切换/展开树节点
@@ -35159,21 +35470,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        * @param {Boolean} expanded 是否展开
        */
       setTreeExpand: function setTreeExpand(rows, expanded) {
-        var treeExpandeds = reactData.treeExpandeds,
-            treeLazyLoadeds = reactData.treeLazyLoadeds,
-            treeNodeColumn = reactData.treeNodeColumn;
-        var fullAllDataRowIdData = internalData.fullAllDataRowIdData,
-            tableFullData = internalData.tableFullData;
         var treeOpts = computeTreeOpts.value;
-        var reserve = treeOpts.reserve,
-            lazy = treeOpts.lazy,
-            hasChild = treeOpts.hasChild,
-            children = treeOpts.children,
-            accordion = treeOpts.accordion,
-            toggleMethod = treeOpts.toggleMethod;
-        var result = [];
-        var columnIndex = tableMethods.getColumnIndex(treeNodeColumn);
-        var $columnIndex = tableMethods.getVMColumnIndex(treeNodeColumn);
+        var transform = treeOpts.transform;
 
         if (rows) {
           if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(rows)) {
@@ -35181,62 +35479,12 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           }
 
           if (rows.length) {
-            var validRows = toggleMethod ? rows.filter(function (row) {
-              return toggleMethod({
-                $table: $xetable,
-                expanded: expanded,
-                column: treeNodeColumn,
-                columnIndex: columnIndex,
-                $columnIndex: $columnIndex,
-                row: row
-              });
-            }) : rows;
-
-            if (accordion) {
-              validRows = validRows.length ? [validRows[validRows.length - 1]] : []; // 同一级只能展开一个
-
-              var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullData, function (item) {
-                return item === validRows[0];
-              }, treeOpts);
-
-              if (matchObj) {
-                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeExpandeds, function (item) {
-                  return matchObj.items.indexOf(item) > -1;
-                });
-              }
-            }
-
-            if (expanded) {
-              validRows.forEach(function (row) {
-                if ($xetable.findRowIndexOf(treeExpandeds, row) === -1) {
-                  var rest = fullAllDataRowIdData[util_getRowid($xetable, row)];
-
-                  var isLoad = lazy && row[hasChild] && !rest.treeLoaded && $xetable.findRowIndexOf(treeLazyLoadeds, row) === -1; // 是否使用懒加载
-
-                  if (isLoad) {
-                    result.push(handleAsyncTreeExpandChilds(row));
-                  } else {
-                    if (row[children] && row[children].length) {
-                      treeExpandeds.push(row);
-                    }
-                  }
-                }
-              });
+            // 如果为虚拟树
+            if (transform) {
+              return handleVirtualTreeExpand(rows, expanded);
             } else {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeExpandeds, function (row) {
-                return $xetable.findRowIndexOf(validRows, row) > -1;
-              });
+              return handleBaseTreeExpand(rows, expanded);
             }
-
-            if (reserve) {
-              validRows.forEach(function (row) {
-                return handleTreeExpandReserve(row, expanded);
-              });
-            }
-
-            return Promise.all(result).then(function () {
-              return tableMethods.recalculate();
-            });
           }
         }
 
@@ -35257,19 +35505,19 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        */
       clearTreeExpand: function clearTreeExpand() {
         var treeExpandeds = reactData.treeExpandeds;
-        var tableFullData = internalData.tableFullData;
+        var treeFullData = internalData.treeFullData;
         var treeOpts = computeTreeOpts.value;
         var reserve = treeOpts.reserve;
         var isExists = treeExpandeds.length;
         reactData.treeExpandeds = [];
 
         if (reserve) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(tableFullData, function (row) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(treeFullData, function (row) {
             return handleTreeExpandReserve(row, false);
           }, treeOpts);
         }
 
-        return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])().then(function () {
+        return updateVirtualTreeData().then(function () {
           if (isExists) {
             tableMethods.recalculate();
           }
@@ -36258,16 +36506,17 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        * 更新数据行的 Map
        * 牺牲数据组装的耗时，用来换取使用过程中的流畅
        */
-      updateCache: function updateCache(isSource) {
+      cacheRowMap: function cacheRowMap(isSource) {
         var treeConfig = props.treeConfig;
         var treeOpts = computeTreeOpts.value;
         var fullDataRowIdData = internalData.fullDataRowIdData,
             fullAllDataRowIdData = internalData.fullAllDataRowIdData,
-            tableFullData = internalData.tableFullData;
+            tableFullData = internalData.tableFullData,
+            treeFullData = internalData.treeFullData;
         var rowkey = getRowkey($xetable);
         var isLazy = treeConfig && treeOpts.lazy;
 
-        var handleCache = function handleCache(row, index, items, path, parent) {
+        var handleCache = function handleCache(row, index, items, path, parent, nodes) {
           var rowid = util_getRowid($xetable, row);
 
           if (eqEmptyValue(rowid)) {
@@ -36286,7 +36535,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             _index: -1,
             $index: -1,
             items: items,
-            parent: parent
+            parent: parent,
+            level: nodes ? nodes.length - 1 : 0
           };
 
           if (isSource) {
@@ -36303,7 +36553,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         fullAllDataRowIdData = internalData.fullAllDataRowIdData = {};
 
         if (treeConfig) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(tableFullData, handleCache, treeOpts);
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(treeFullData, handleCache, treeOpts);
         } else {
           tableFullData.forEach(handleCache);
         }
@@ -36699,10 +36949,10 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         var column = params.column;
         var titleHelp = column.titleHelp;
 
-        if (titleHelp.message) {
+        if (titleHelp.content || titleHelp.message) {
           var tooltipStore = internalData.tooltipStore;
           var $tooltip = refTooltip.value;
-          var content = getFuncText(titleHelp.message);
+          var content = getFuncText(titleHelp.content || titleHelp.message);
           handleTargetEnterEvent();
           tooltipStore.visible = true;
 
@@ -37450,6 +37700,20 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         return false;
       }
     };
+
+    if (true) {
+      'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(function (name) {
+        $xetable[name] = function () {
+          errLog('vxe.error.reqModule', ['Export']);
+        };
+      });
+      'clearValidate,fullValidate,validate'.split(',').forEach(function (name) {
+        $xetable[name] = function () {
+          errLog('vxe.error.reqModule', ['Validator']);
+        };
+      });
+    }
+
     Object.assign($xetable, tableMethods, tablePrivateMethods);
     /**
      * 渲染浮固定列
@@ -37711,6 +37975,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         if (true) {
           var customOpts = computeCustomOpts.value;
           var mouseOpts = computeMouseOpts.value;
+          var rowOpts = computeRowOpts.value;
 
           if (!props.id && props.customConfig && (customOpts.storage === true || customOpts.storage && customOpts.storage.resizable || customOpts.storage && customOpts.storage.visible)) {
             errLog('vxe.error.reqProp', ['id']);
@@ -37720,6 +37985,10 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             errLog('vxe.error.noTree', ['checkbox-config.range']);
           }
 
+          if (rowOpts.height && !props.showOverflow) {
+            warnLog('vxe.error.notProp', ['table.show-overflow']);
+          }
+
           if (!$xetable.handleUpdateCellAreas) {
             if (props.clipConfig) {
               warnLog('vxe.error.notProp', ['clip-config']);