vxe-table 4.1.0-beta.0 → 4.1.2

package/lib/table/src/table.js

@@ -301,6 +301,7 @@ var _default = (0, _vue.defineComponent)({
       treeExpandedReserveRowMap: {},
       // 完整数据、条件处理后
       tableFullData: [],
+      treeFullData: [],
       afterFullData: [],
       tableSynchData: [],
       tableSourceData: [],
@@ -362,7 +363,10 @@ var _default = (0, _vue.defineComponent)({
       };
     });
     var computeColumnOpts = (0, _vue.computed)(function () {
-      return Object.assign({}, props.columnConfig);
+      return Object.assign({}, _conf.default.table.columnConfig, props.columnConfig);
+    });
+    var computeRowOpts = (0, _vue.computed)(function () {
+      return Object.assign({}, _conf.default.table.rowConfig, props.rowConfig);
     });
     var computeResizableOpts = (0, _vue.computed)(function () {
       return Object.assign({}, _conf.default.table.resizableConfig, props.resizableConfig);
@@ -559,6 +563,8 @@ var _default = (0, _vue.defineComponent)({
       computeValidOpts: computeValidOpts,
       computeSXOpts: computeSXOpts,
       computeSYOpts: computeSYOpts,
+      computeColumnOpts: computeColumnOpts,
+      computeRowOpts: computeRowOpts,
       computeResizableOpts: computeResizableOpts,
       computeSeqOpts: computeSeqOpts,
       computeRadioOpts: computeRadioOpts,
@@ -1312,7 +1318,8 @@ var _default = (0, _vue.defineComponent)({
             $index: -1,
             _index: _index,
             items: [],
-            parent: null
+            parent: null,
+            level: 0
           };
         }
       });
@@ -1624,7 +1631,7 @@ var _default = (0, _vue.defineComponent)({
             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 {
@@ -1725,16 +1732,10 @@ var _default = (0, _vue.defineComponent)({
                 var showTitle = cellOverflow === 'title';
                 var showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
                 var hasEllipsis_1 = showTitle || showTooltip || showEllipsis;
-                var listElem = elemStore[name + "-" + layout + "-list"]; // 滚动的渲染不支持动态行高
+                var listElem = elemStore[name + "-" + layout + "-list"]; // 纵向虚拟滚动不支持动态行高
 
-                if (layout === 'header' || layout === 'footer') {
-                  if (scrollXLoad && !hasEllipsis_1) {
-                    hasEllipsis_1 = true;
-                  }
-                } else {
-                  if ((scrollXLoad || scrollYLoad) && !hasEllipsis_1) {
-                    hasEllipsis_1 = true;
-                  }
+                if (scrollYLoad && !hasEllipsis_1) {
+                  hasEllipsis_1 = true;
                 }
 
                 if (listElem) {
@@ -2060,7 +2061,7 @@ var _default = (0, _vue.defineComponent)({
             }
 
             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);
                 } // 如果当前节点已选中，则展开后子节点也被选中
@@ -2221,30 +2222,67 @@ var _default = (0, _vue.defineComponent)({
           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 (process.env.NODE_ENV === 'development') {
+            if (!treeOpts.rowtKey) {
+              (0, _utils.errLog)('vxe.error.reqProp', ['tree-config.rowtKey']);
+            }
+
+            if (!treeOpts.parentKey) {
+              (0, _utils.errLog)('vxe.error.reqProp', ['tree-config.parentKey']);
+            }
+
+            if (!treeOpts.children) {
+              (0, _utils.errLog)('vxe.error.reqProp', ['tree-config.children']);
+            }
+
+            fullData.forEach(function (row) {
+              if (row[treeOpts.children] && row[treeOpts.children].length) {
+                (0, _utils.warnLog)('vxe.error.errConflicts', ['tree-config.transform', "row." + treeOpts.children]);
+              }
+            });
+          }
+
+          treeData = _xeUtils.default.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 = _xeUtils.default.clone(tableFullData, true);
+        internalData.tableSourceData = _xeUtils.default.clone(fullData, true);
       }
 
-      reactData.scrollYLoad = scrollYLoad;
-
       if (process.env.NODE_ENV === 'development') {
-        if (scrollYLoad) {
+        if (sYLoad) {
           if (!(props.height || props.maxHeight)) {
             (0, _utils.errLog)('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
           }
@@ -2274,8 +2312,8 @@ var _default = (0, _vue.defineComponent)({
       }).then(function () {
         computeScrollLoad();
       }).then(function () {
-        // 是否加载了数据
-        if (scrollYLoad) {
+        // 是否启用了虚拟滚动
+        if (sYLoad) {
           scrollYStore.endIndex = scrollYStore.visibleSize;
         }
 
@@ -2286,7 +2324,7 @@ var _default = (0, _vue.defineComponent)({
             return tableMethods.recalculate();
           }).then(function () {
             // 是否变更虚拟滚动
-            if (oldScrollYLoad === scrollYLoad) {
+            if (oldScrollYLoad === sYLoad) {
               (0, _util.restoreScrollLocation)($xetable, lastScrollLeft, lastScrollTop).then(resolve);
             } else {
               setTimeout(function () {
@@ -2555,6 +2593,136 @@ var _default = (0, _vue.defineComponent)({
         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 = [];
+
+      _xeUtils.default.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 (0, _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_1 = _xeUtils.default.findTree(tableFullData, function (item) {
+          return item === validRows[0];
+        }, treeOpts);
+
+        if (matchObj_1) {
+          _xeUtils.default.remove(treeExpandeds, function (item) {
+            return matchObj_1.items.indexOf(item) > -1;
+          });
+        }
+      }
+
+      if (expanded) {
+        validRows.forEach(function (row) {
+          if ($xetable.findRowIndexOf(treeExpandeds, row) === -1) {
+            var rest = fullAllDataRowIdData[(0, _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 {
+        _xeUtils.default.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 可视渲染处理
      */
@@ -2704,7 +2872,7 @@ var _default = (0, _vue.defineComponent)({
                 _xeUtils.default.clear(row, undefined);
 
                 Object.assign(row, tablePrivateMethods.defineField(Object.assign({}, record)));
-                tablePrivateMethods.updateCache(true);
+                tablePrivateMethods.cacheRowMap(true);
               } else {
                 _xeUtils.default.destructuring(oRow, _xeUtils.default.clone(row, true));
               }
@@ -2724,15 +2892,16 @@ var _default = (0, _vue.defineComponent)({
       /**
        * 用于树结构，给行数据加载子节点
        */
-      loadChildren: function loadChildren(row, childRecords) {
+      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[(0, _util.getRowid)($xetable, row)];
+        var parentLevel = rest ? rest.level : 0;
         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;
-
           if (keepSource) {
             var rowid_1 = (0, _util.getRowid)($xetable, row);
 
@@ -2745,7 +2914,7 @@ var _default = (0, _vue.defineComponent)({
             }
           }
 
-          _xeUtils.default.eachTree(rows, function (childRow, index, items, path, parent) {
+          _xeUtils.default.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
             var rowid = (0, _util.getRowid)($xetable, childRow);
             var rest = {
               row: childRow,
@@ -2754,7 +2923,8 @@ var _default = (0, _vue.defineComponent)({
               _index: -1,
               $index: -1,
               items: items,
-              parent: parent
+              parent: parent,
+              level: parentLevel + nodes.length
             };
             fullDataRowIdData[rowid] = rest;
             fullAllDataRowIdData[rowid] = rest;
@@ -4100,10 +4270,10 @@ var _default = (0, _vue.defineComponent)({
       },
 
       /**
-       * 重新加载展开行的内容
+       * 重新懒加载展开行，并展开内容
        * @param {Row} row 行对象
        */
-      reloadExpandContent: function reloadExpandContent(row) {
+      reloadRowExpand: function reloadRowExpand(row) {
         var expandLazyLoadeds = reactData.expandLazyLoadeds;
         var expandOpts = computeExpandOpts.value;
         var lazy = expandOpts.lazy;
@@ -4116,6 +4286,14 @@ var _default = (0, _vue.defineComponent)({
 
         return (0, _vue.nextTick)();
       },
+      reloadExpandContent: function reloadExpandContent(row) {
+        if (process.env.NODE_ENV === 'development') {
+          (0, _utils.warnLog)('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
+        } // 即将废弃
+
+
+        return tableMethods.reloadRowExpand(row);
+      },
 
       /**
        * 切换展开行
@@ -4281,23 +4459,38 @@ var _default = (0, _vue.defineComponent)({
       },
 
       /**
-       * 重新加载树的子节点
+       * 重新懒加载树节点，并展开该节点
        * @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 (0, _vue.nextTick)();
       },
+      reloadTreeChilds: function reloadTreeChilds(row) {
+        if (process.env.NODE_ENV === 'development') {
+          (0, _utils.warnLog)('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
+        } // 即将废弃
+
+
+        return tableMethods.reloadTreeExpand(row);
+      },
 
       /**
        * 切换/展开树节点
@@ -4336,21 +4529,8 @@ var _default = (0, _vue.defineComponent)({
        * @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 (!_xeUtils.default.isArray(rows)) {
@@ -4358,61 +4538,12 @@ var _default = (0, _vue.defineComponent)({
           }
 
           if (rows.length) {
-            var validRows_2 = toggleMethod ? rows.filter(function (row) {
-              return toggleMethod({
-                $table: $xetable,
-                expanded: expanded,
-                column: treeNodeColumn,
-                columnIndex: columnIndex,
-                $columnIndex: $columnIndex,
-                row: row
-              });
-            }) : rows;
-
-            if (accordion) {
-              validRows_2 = validRows_2.length ? [validRows_2[validRows_2.length - 1]] : []; // 同一级只能展开一个
-
-              var matchObj_1 = _xeUtils.default.findTree(tableFullData, function (item) {
-                return item === validRows_2[0];
-              }, treeOpts);
-
-              if (matchObj_1) {
-                _xeUtils.default.remove(treeExpandeds, function (item) {
-                  return matchObj_1.items.indexOf(item) > -1;
-                });
-              }
-            }
-
-            if (expanded) {
-              validRows_2.forEach(function (row) {
-                if ($xetable.findRowIndexOf(treeExpandeds, row) === -1) {
-                  var rest = fullAllDataRowIdData[(0, _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 {
-              _xeUtils.default.remove(treeExpandeds, function (row) {
-                return $xetable.findRowIndexOf(validRows_2, row) > -1;
-              });
+              return handleBaseTreeExpand(rows, expanded);
             }
-
-            if (reserve) {
-              validRows_2.forEach(function (row) {
-                return handleTreeExpandReserve(row, expanded);
-              });
-            }
-
-            return Promise.all(result).then(function () {
-              return tableMethods.recalculate();
-            });
           }
         }
 
@@ -4433,19 +4564,19 @@ var _default = (0, _vue.defineComponent)({
        */
       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) {
-          _xeUtils.default.eachTree(tableFullData, function (row) {
+          _xeUtils.default.eachTree(treeFullData, function (row) {
             return handleTreeExpandReserve(row, false);
           }, treeOpts);
         }
 
-        return (0, _vue.nextTick)().then(function () {
+        return updateVirtualTreeData().then(function () {
           if (isExists) {
             tableMethods.recalculate();
           }
@@ -5432,16 +5563,17 @@ var _default = (0, _vue.defineComponent)({
        * 更新数据行的 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 = (0, _util.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 = (0, _util.getRowid)($xetable, row);
 
           if ((0, _utils.eqEmptyValue)(rowid)) {
@@ -5461,7 +5593,8 @@ var _default = (0, _vue.defineComponent)({
             _index: -1,
             $index: -1,
             items: items,
-            parent: parent
+            parent: parent,
+            level: nodes ? nodes.length - 1 : 0
           };
 
           if (isSource) {
@@ -5478,7 +5611,7 @@ var _default = (0, _vue.defineComponent)({
         fullAllDataRowIdData = internalData.fullAllDataRowIdData = {};
 
         if (treeConfig) {
-          _xeUtils.default.eachTree(tableFullData, handleCache, treeOpts);
+          _xeUtils.default.eachTree(treeFullData, handleCache, treeOpts);
         } else {
           tableFullData.forEach(handleCache);
         }
@@ -5880,10 +6013,10 @@ var _default = (0, _vue.defineComponent)({
         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 = (0, _utils.getFuncText)(titleHelp.message);
+          var content = (0, _utils.getFuncText)(titleHelp.content || titleHelp.message);
           handleTargetEnterEvent();
           tooltipStore.visible = true;
 
@@ -6628,6 +6761,20 @@ var _default = (0, _vue.defineComponent)({
         return false;
       }
     };
+
+    if (process.env.NODE_ENV === 'development') {
+      'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(function (name) {
+        $xetable[name] = function () {
+          (0, _utils.errLog)('vxe.error.reqModule', ['Export']);
+        };
+      });
+      'clearValidate,fullValidate,validate'.split(',').forEach(function (name) {
+        $xetable[name] = function () {
+          (0, _utils.errLog)('vxe.error.reqModule', ['Validator']);
+        };
+      });
+    }
+
     Object.assign($xetable, tableMethods, tablePrivateMethods);
     /**
      * 渲染浮固定列
@@ -6891,6 +7038,7 @@ var _default = (0, _vue.defineComponent)({
         if (process.env.NODE_ENV === 'development') {
           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)) {
             (0, _utils.errLog)('vxe.error.reqProp', ['id']);
@@ -6900,6 +7048,10 @@ var _default = (0, _vue.defineComponent)({
             (0, _utils.errLog)('vxe.error.noTree', ['checkbox-config.range']);
           }
 
+          if (rowOpts.height && !props.showOverflow) {
+            (0, _utils.warnLog)('vxe.error.notProp', ['table.show-overflow']);
+          }
+
           if (!$xetable.handleUpdateCellAreas) {
             if (props.clipConfig) {
               (0, _utils.warnLog)('vxe.error.notProp', ['clip-config']);