vxe-table 4.1.0-beta.0 → 4.1.2

package/es/table/src/table.js

@@ -266,6 +266,7 @@ export default defineComponent({
             treeExpandedReserveRowMap: {},
             // 完整数据、条件处理后
             tableFullData: [],
+            treeFullData: [],
             afterFullData: [],
             tableSynchData: [],
             tableSourceData: [],
@@ -327,7 +328,10 @@ export default defineComponent({
             };
         });
         var computeColumnOpts = computed(function () {
-            return Object.assign({}, props.columnConfig);
+            return Object.assign({}, GlobalConfig.table.columnConfig, props.columnConfig);
+        });
+        var computeRowOpts = computed(function () {
+            return Object.assign({}, GlobalConfig.table.rowConfig, props.rowConfig);
         });
         var computeResizableOpts = computed(function () {
             return Object.assign({}, GlobalConfig.table.resizableConfig, props.resizableConfig);
@@ -500,6 +504,8 @@ export default defineComponent({
             computeValidOpts: computeValidOpts,
             computeSXOpts: computeSXOpts,
             computeSYOpts: computeSYOpts,
+            computeColumnOpts: computeColumnOpts,
+            computeRowOpts: computeRowOpts,
             computeResizableOpts: computeResizableOpts,
             computeSeqOpts: computeSeqOpts,
             computeRadioOpts: computeRadioOpts,
@@ -1084,7 +1090,7 @@ export default defineComponent({
                     rest._index = _index;
                 }
                 else {
-                    fullDataRowIdData[rowid] = { row: row, rowid: rowid, index: -1, $index: -1, _index: _index, items: [], parent: null };
+                    fullDataRowIdData[rowid] = { row: row, rowid: rowid, index: -1, $index: -1, _index: _index, items: [], parent: null, level: 0 };
                 }
             });
         };
@@ -1284,7 +1290,7 @@ export default 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;
                                 }
@@ -1376,16 +1382,9 @@ export default defineComponent({
                                 var showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
                                 var hasEllipsis_1 = showTitle || showTooltip || showEllipsis;
                                 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) {
                                     XEUtils.arrayEach(listElem.querySelectorAll("." + column_2.id), function (elem) {
@@ -1634,7 +1633,7 @@ export default defineComponent({
                             childRecords = [];
                         }
                         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);
                                 }
@@ -1755,27 +1754,57 @@ export default defineComponent({
             var keepSource = props.keepSource, treeConfig = props.treeConfig;
             var editStore = reactData.editStore, oldScrollYLoad = reactData.scrollYLoad;
             var scrollYStore = internalData.scrollYStore, 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) {
+                            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." + treeOpts.children]);
+                            }
+                        });
+                    }
+                    treeData = XEUtils.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 = [];
+            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;
+            // 克隆原数据，用于显示编辑状态，与编辑值做对比
             if (keepSource) {
-                internalData.tableSourceData = XEUtils.clone(tableFullData, true);
+                internalData.tableSourceData = XEUtils.clone(fullData, true);
             }
-            reactData.scrollYLoad = scrollYLoad;
             if (process.env.NODE_ENV === 'development') {
-                if (scrollYLoad) {
+                if (sYLoad) {
                     if (!(props.height || props.maxHeight)) {
                         errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
                     }
@@ -1801,8 +1830,8 @@ export default defineComponent({
             }).then(function () {
                 computeScrollLoad();
             }).then(function () {
-                // 是否加载了数据
-                if (scrollYLoad) {
+                // 是否启用了虚拟滚动
+                if (sYLoad) {
                     scrollYStore.endIndex = scrollYStore.visibleSize;
                 }
                 handleReserveStatus();
@@ -1812,7 +1841,7 @@ export default defineComponent({
                         .then(function () { return tableMethods.recalculate(); })
                         .then(function () {
                         // 是否变更虚拟滚动
-                        if (oldScrollYLoad === scrollYLoad) {
+                        if (oldScrollYLoad === sYLoad) {
                             restoreScrollLocation($xetable, lastScrollLeft, lastScrollTop).then(resolve);
                         }
                         else {
@@ -2029,6 +2058,95 @@ export default defineComponent({
                 return tableMethods.recalculate();
             });
         };
+        var updateScrollYStatus = function (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 () {
+            var oldScrollYLoad = reactData.scrollYLoad, treeExpandeds = reactData.treeExpandeds;
+            var treeFullData = internalData.treeFullData;
+            var treeOpts = computeTreeOpts.value;
+            var fullData = [];
+            XEUtils.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 nextTick();
+        };
+        /**
+         * 展开与收起树节点
+         * @param rows
+         * @param expanded
+         * @returns
+         */
+        var handleBaseTreeExpand = function (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.findTree(tableFullData, function (item) { return item === validRows[0]; }, treeOpts);
+                if (matchObj_1) {
+                    XEUtils.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[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.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 (rows, expanded) {
+            return handleBaseTreeExpand(rows, expanded).then(function () {
+                return updateVirtualTreeData();
+            }).then(function () {
+                return tableMethods.recalculate();
+            });
+        };
         /**
          * 纵向 Y 可视渲染处理
          */
@@ -2147,7 +2265,7 @@ export default defineComponent({
                                 tableSourceData[rowIndex] = record;
                                 XEUtils.clear(row, undefined);
                                 Object.assign(row, tablePrivateMethods.defineField(Object.assign({}, record)));
-                                tablePrivateMethods.updateCache(true);
+                                tablePrivateMethods.cacheRowMap(true);
                             }
                             else {
                                 XEUtils.destructuring(oRow, XEUtils.clone(row, true));
@@ -2166,13 +2284,14 @@ export default defineComponent({
             /**
              * 用于树结构，给行数据加载子节点
              */
-            loadChildren: function (row, childRecords) {
+            loadTreeChildren: function (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[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 = getRowid($xetable, row);
                         var matchObj = XEUtils.findTree(tableSourceData, function (item) { return rowid_1 === getRowid($xetable, item); }, treeOpts);
@@ -2180,9 +2299,9 @@ export default defineComponent({
                             matchObj.item[children] = XEUtils.clone(rows, true);
                         }
                     }
-                    XEUtils.eachTree(rows, function (childRow, index, items, path, parent) {
+                    XEUtils.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
                         var rowid = getRowid($xetable, childRow);
-                        var rest = { row: childRow, rowid: rowid, index: -1, _index: -1, $index: -1, items: items, parent: parent };
+                        var rest = { row: childRow, rowid: rowid, index: -1, _index: -1, $index: -1, items: items, parent: parent, level: parentLevel + nodes.length };
                         fullDataRowIdData[rowid] = rest;
                         fullAllDataRowIdData[rowid] = rest;
                     }, treeOpts);
@@ -3242,10 +3361,10 @@ export default defineComponent({
                 return nextTick();
             },
             /**
-             * 重新加载展开行的内容
+             * 重新懒加载展开行，并展开内容
              * @param {Row} row 行对象
              */
-            reloadExpandContent: function (row) {
+            reloadRowExpand: function (row) {
                 var expandLazyLoadeds = reactData.expandLazyLoadeds;
                 var expandOpts = computeExpandOpts.value;
                 var lazy = expandOpts.lazy;
@@ -3255,6 +3374,13 @@ export default defineComponent({
                 }
                 return nextTick();
             },
+            reloadExpandContent: function (row) {
+                if (process.env.NODE_ENV === 'development') {
+                    warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
+                }
+                // 即将废弃
+                return tableMethods.reloadRowExpand(row);
+            },
             /**
              * 切换展开行
              */
@@ -3377,19 +3503,33 @@ export default defineComponent({
                 return nextTick();
             },
             /**
-             * 重新加载树的子节点
+             * 重新懒加载树节点，并展开该节点
              * @param {Row} row 行对象
              */
-            reloadTreeChilds: function (row) {
+            reloadTreeExpand: function (row) {
                 var treeLazyLoadeds = reactData.treeLazyLoadeds;
                 var treeOpts = computeTreeOpts.value;
-                var lazy = treeOpts.lazy, hasChild = treeOpts.hasChild;
+                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); });
+                    tableMethods.clearTreeExpandLoaded(row).then(function () {
+                        return handleAsyncTreeExpandChilds(row);
+                    }).then(function () {
+                        if (transform) {
+                            return updateVirtualTreeData();
+                        }
+                    }).then(function () {
+                        return tableMethods.recalculate();
+                    });
                 }
                 return nextTick();
             },
+            reloadTreeChilds: function (row) {
+                if (process.env.NODE_ENV === 'development') {
+                    warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
+                }
+                // 即将废弃
+                return tableMethods.reloadTreeExpand(row);
+            },
             /**
              * 切换/展开树节点
              */
@@ -3421,53 +3561,20 @@ export default defineComponent({
              * @param {Boolean} expanded 是否展开
              */
             setTreeExpand: function (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.isArray(rows)) {
                         rows = [rows];
                     }
                     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.findTree(tableFullData, function (item) { return item === validRows_2[0]; }, treeOpts);
-                            if (matchObj_1) {
-                                XEUtils.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[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.remove(treeExpandeds, function (row) { return $xetable.findRowIndexOf(validRows_2, row) > -1; });
-                        }
-                        if (reserve) {
-                            validRows_2.forEach(function (row) { return handleTreeExpandReserve(row, expanded); });
+                            return handleBaseTreeExpand(rows, expanded);
                         }
-                        return Promise.all(result).then(function () {
-                            return tableMethods.recalculate();
-                        });
                     }
                 }
                 return nextTick();
@@ -3485,15 +3592,15 @@ export default defineComponent({
              */
             clearTreeExpand: function () {
                 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.eachTree(tableFullData, function (row) { return handleTreeExpandReserve(row, false); }, treeOpts);
+                    XEUtils.eachTree(treeFullData, function (row) { return handleTreeExpandReserve(row, false); }, treeOpts);
                 }
-                return nextTick().then(function () {
+                return updateVirtualTreeData().then(function () {
                     if (isExists) {
                         tableMethods.recalculate();
                     }
@@ -4340,13 +4447,13 @@ export default defineComponent({
              * 更新数据行的 Map
              * 牺牲数据组装的耗时，用来换取使用过程中的流畅
              */
-            updateCache: function (isSource) {
+            cacheRowMap: function (isSource) {
                 var treeConfig = props.treeConfig;
                 var treeOpts = computeTreeOpts.value;
-                var fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData, tableFullData = internalData.tableFullData;
+                var fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData, tableFullData = internalData.tableFullData, treeFullData = internalData.treeFullData;
                 var rowkey = getRowkey($xetable);
                 var isLazy = treeConfig && treeOpts.lazy;
-                var handleCache = function (row, index, items, path, parent) {
+                var handleCache = function (row, index, items, path, parent, nodes) {
                     var rowid = getRowid($xetable, row);
                     if (eqEmptyValue(rowid)) {
                         rowid = getRowUniqueId();
@@ -4355,7 +4462,7 @@ export default defineComponent({
                     if (isLazy && row[treeOpts.hasChild] && XEUtils.isUndefined(row[treeOpts.children])) {
                         row[treeOpts.children] = null;
                     }
-                    var rest = { row: row, rowid: rowid, index: treeConfig && parent ? -1 : index, _index: -1, $index: -1, items: items, parent: parent };
+                    var rest = { row: row, rowid: rowid, index: treeConfig && parent ? -1 : index, _index: -1, $index: -1, items: items, parent: parent, level: nodes ? nodes.length - 1 : 0 };
                     if (isSource) {
                         fullDataRowIdData[rowid] = rest;
                     }
@@ -4366,7 +4473,7 @@ export default defineComponent({
                 }
                 fullAllDataRowIdData = internalData.fullAllDataRowIdData = {};
                 if (treeConfig) {
-                    XEUtils.eachTree(tableFullData, handleCache, treeOpts);
+                    XEUtils.eachTree(treeFullData, handleCache, treeOpts);
                 }
                 else {
                     tableFullData.forEach(handleCache);
@@ -4651,10 +4758,10 @@ export default defineComponent({
             triggerHeaderHelpEvent: function (evnt, params) {
                 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;
                     if ($tooltip) {
@@ -5248,6 +5355,18 @@ export default 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 () {
+                    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);
         /**
          * 渲染浮固定列
@@ -5435,12 +5554,16 @@ export default 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))) {
                         errLog('vxe.error.reqProp', ['id']);
                     }
                     if (props.treeConfig && checkboxOpts.range) {
                         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']);

package/es/v-x-e-table/src/conf.js

@@ -17,7 +17,6 @@ var GlobalConfig = {
         // resizeInterval: 500,
         // size: null,
         // zIndex: null,
-        // resizable: false,
         // autoResize: false,
         // stripe: false,
         // border: false,
@@ -63,6 +62,8 @@ var GlobalConfig = {
             showIcon: true
         },
         treeConfig: {
+            rowtKey: 'id',
+            parentKey: 'parentId',
             children: 'children',
             hasChild: 'hasChild',
             indent: 20,

package/es/validator/src/hook.js

@@ -30,13 +30,20 @@ var Rule = /** @class */ (function () {
             maxWidth: rule.maxWidth
         });
     }
-    Object.defineProperty(Rule.prototype, "message", {
+    Object.defineProperty(Rule.prototype, "content", {
         /**
          * 获取校验不通过的消息
          * 支持国际化翻译
          */
         get: function () {
-            return getFuncText(this.$options.message);
+            return getFuncText(this.$options.content || this.$options.message);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Rule.prototype, "message", {
+        get: function () {
+            return this.content;
         },
         enumerable: false,
         configurable: true
@@ -297,13 +304,13 @@ var validatorHook = {
                                     if (customValid) {
                                         if (XEUtils.isError(customValid)) {
                                             validRuleErr = true;
-                                            errorRules.push(new Rule({ type: 'custom', trigger: trigger, message: customValid.message, rule: new Rule(rule) }));
+                                            errorRules.push(new Rule({ type: 'custom', trigger: trigger, content: customValid.message, rule: new Rule(rule) }));
                                         }
                                         else if (customValid.catch) {
                                             // 如果为异步校验（注：异步校验是并发无序的）
                                             syncVailds.push(customValid.catch(function (e) {
                                                 validRuleErr = true;
-                                                errorRules.push(new Rule({ type: 'custom', trigger: trigger, message: e && e.message ? e.message : rule.message, rule: new Rule(rule) }));
+                                                errorRules.push(new Rule({ type: 'custom', trigger: trigger, content: e && e.message ? e.message : (rule.content || rule.message), rule: new Rule(rule) }));
                                             }));
                                         }
                                     }
@@ -376,7 +383,7 @@ var validatorHook = {
                 var validOpts = computeValidOpts.value;
                 var rule = params.rule, row = params.row, column = params.column, cell = params.cell;
                 var validTip = refValidTooltip.value;
-                var content = rule.message;
+                var content = rule.content;
                 return nextTick().then(function () {
                     Object.assign(validStore, {
                         row: row,