vxe-table 4.1.0 → 4.1.3

package/README.md

@@ -24,6 +24,7 @@
   * [x] v2.0 基于 vue2.6+，支持所有主流的浏览器，同时兼具功能与性能
   * [x] v3.0 基于 vue2.6+，支持现代浏览器并保留兼容 IE11，提升渲染性能
   * [x] v4.0 基于 vue3.0+，只支持现代浏览器，不支持 IE
+  * [] 下一阶段：sticky 表格、虚拟树、css 变量、虚拟滚动与动态行高、数据可视化
 
 ## QQ 交流群
 

package/README.zh-TW.md

@@ -24,6 +24,7 @@
   * [x] v2.0 基於 vue2.6+，支持所有主流的瀏覽器，同時兼具功能與效能
   * [x] v3.0 基於 vue2.6+，支持現代瀏覽器並保留相容IE11，提升渲染效能
   * [x] v4.0 基于 vue3.0+，只支持現代瀏覽器，不支持IE
+  * [] 下一阶段：sticky 表格、虚拟树、css 变量、虚拟滚动与动态行高、数据可视化
 
 ## QQ 交流群
 

package/es/edit/src/hook.js

@@ -141,7 +141,7 @@ var editHook = {
                 (_a = editStore.insertList).unshift.apply(_a, newRecords);
                 reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
                 $xetable.updateFooter();
-                $xetable.updateCache();
+                $xetable.cacheRowMap();
                 $xetable.handleTableData();
                 $xetable.updateAfterDataIndex();
                 $xetable.checkSelectionStatus();
@@ -237,7 +237,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();

package/es/export/src/hook.js

@@ -688,6 +688,12 @@ var tableExportHook = {
             }
             saveLocalFile({ filename: filename, type: type, content: content }).then(function () {
                 if (opts.message !== false) {
+                    // 检测弹窗模块
+                    if (process.env.NODE_ENV === 'development') {
+                        if (!VXETable.modal) {
+                            errLog('vxe.error.reqModule', ['Modal']);
+                        }
+                    }
                     VXETable.modal.message({ content: GlobalConfig.i18n('vxe.table.expSuccess'), status: 'success' });
                 }
             });
@@ -754,6 +760,12 @@ var tableExportHook = {
                         loadRest = $xetable.reloadData(data);
                     }
                     if (opts.message !== false) {
+                        // 检测弹窗模块
+                        if (process.env.NODE_ENV === 'development') {
+                            if (!VXETable.modal) {
+                                errLog('vxe.error.reqModule', ['Modal']);
+                            }
+                        }
                         VXETable.modal.message({ content: GlobalConfig.i18n('vxe.table.impSuccess', [rows.length]), status: 'success' });
                     }
                     return loadRest.then(function () {
@@ -764,6 +776,12 @@ var tableExportHook = {
                 });
             }
             else if (opts.message !== false) {
+                // 检测弹窗模块
+                if (process.env.NODE_ENV === 'development') {
+                    if (!VXETable.modal) {
+                        errLog('vxe.error.reqModule', ['Modal']);
+                    }
+                }
                 VXETable.modal.message({ content: GlobalConfig.i18n('vxe.error.impFields'), status: 'error' });
                 if (_importReject) {
                     _importReject({ status: false });
@@ -776,6 +794,12 @@ var tableExportHook = {
             // 检查类型，如果为自定义导出，则不需要校验类型
             if (!importMethod && !XEUtils.includes(VXETable.config.importTypes, type)) {
                 if (opts.message !== false) {
+                    // 检测弹窗模块
+                    if (process.env.NODE_ENV === 'development') {
+                        if (!VXETable.modal) {
+                            errLog('vxe.error.reqModule', ['Modal']);
+                        }
+                    }
                     VXETable.modal.message({ content: GlobalConfig.i18n('vxe.error.notType', [type]), status: 'error' });
                 }
                 var params = { status: false };

package/es/export/src/util.js

@@ -2,7 +2,7 @@ import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
 import { browse } from '../../tools/dom';
-import { getLog, parseFile } from '../../tools/utils';
+import { getLog, parseFile, errLog } from '../../tools/utils';
 // 导入
 var fileForm;
 var fileInput;
@@ -74,6 +74,12 @@ export var readLocalFile = function (options) {
             }
             else {
                 if (opts.message !== false) {
+                    // 检测弹窗模块
+                    if (process.env.NODE_ENV === 'development') {
+                        if (!VXETable.modal) {
+                            errLog('vxe.error.reqModule', ['Modal']);
+                        }
+                    }
                     VXETable.modal.message({ content: GlobalConfig.i18n('vxe.error.notType', [errType]), status: 'error' });
                 }
                 var params = { status: false, files: files, file: file };
@@ -146,13 +152,19 @@ export var saveLocalFile = function (options) {
             navigator.msSaveBlob(blob, name);
         }
         else {
-            var linkElem = document.createElement('a');
-            linkElem.target = '_blank';
-            linkElem.download = name;
-            linkElem.href = URL.createObjectURL(blob);
-            document.body.appendChild(linkElem);
-            linkElem.click();
-            document.body.removeChild(linkElem);
+            var url_1 = URL.createObjectURL(blob);
+            var linkElem_1 = document.createElement('a');
+            linkElem_1.target = '_blank';
+            linkElem_1.download = name;
+            linkElem_1.href = url_1;
+            document.body.appendChild(linkElem_1);
+            linkElem_1.click();
+            requestAnimationFrame(function () {
+                if (linkElem_1.parentNode) {
+                    linkElem_1.parentNode.removeChild(linkElem_1);
+                }
+                URL.revokeObjectURL(url_1);
+            });
         }
         return Promise.resolve();
     }

package/es/footer/src/footer.js

@@ -92,11 +92,11 @@ export default defineComponent({
             var fixedType = props.fixedType, fixedColumn = props.fixedColumn, tableColumn = props.tableColumn, footerTableData = props.footerTableData;
             var footerRowClassName = tableProps.footerRowClassName, footerCellClassName = tableProps.footerCellClassName, footerRowStyle = tableProps.footerRowStyle, footerCellStyle = tableProps.footerCellStyle, allFooterAlign = tableProps.footerAlign, footerSpanMethod = tableProps.footerSpanMethod, allAlign = tableProps.align, columnKey = tableProps.columnKey, allColumnFooterOverflow = tableProps.showFooterOverflow;
             var visibleColumn = tableInternalData.visibleColumn;
-            var scrollXLoad = tableReactData.scrollXLoad, overflowX = tableReactData.overflowX, scrollbarWidth = tableReactData.scrollbarWidth, currentColumn = tableReactData.currentColumn, mergeFooterList = tableReactData.mergeFooterList;
+            var scrollYLoad = tableReactData.scrollYLoad, overflowX = tableReactData.overflowX, scrollbarWidth = tableReactData.scrollbarWidth, currentColumn = tableReactData.currentColumn, mergeFooterList = tableReactData.mergeFooterList;
             var tooltipOpts = computeTooltipOpts.value;
             // 如果是使用优化模式
             if (fixedType) {
-                if (scrollXLoad || allColumnFooterOverflow) {
+                if (scrollYLoad || allColumnFooterOverflow) {
                     if (!mergeFooterList.length || !footerSpanMethod) {
                         tableColumn = fixedColumn;
                     }
@@ -169,8 +169,8 @@ export default defineComponent({
                             var _columnIndex = $xetable.getVTColumnIndex(column);
                             var itemIndex = _columnIndex;
                             var params = { $table: $xetable, _rowIndex: _rowIndex, $rowIndex: $rowIndex, column: column, columnIndex: columnIndex, $columnIndex: $columnIndex, _columnIndex: _columnIndex, itemIndex: itemIndex, items: list, fixed: fixedType, type: renderType, data: footerTableData };
-                            // 虚拟滚动不支持动态高度
-                            if (scrollXLoad && !hasEllipsis) {
+                            // 纵向虚拟滚动不支持动态行高
+                            if (scrollYLoad && !hasEllipsis) {
                                 showEllipsis = hasEllipsis = true;
                             }
                             if (showTitle || showTooltip || showAllTip) {

package/es/form/src/form.js

@@ -32,9 +32,16 @@ var Rule = /** @class */ (function () {
             maxWidth: rule.maxWidth
         });
     }
+    Object.defineProperty(Rule.prototype, "content", {
+        get: function () {
+            return getFuncText(this.$options.content || this.$options.message);
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(Rule.prototype, "message", {
         get: function () {
-            return getFuncText(this.$options.message);
+            return this.content;
         },
         enumerable: false,
         configurable: true
@@ -76,10 +83,10 @@ export default defineComponent({
         loading: Boolean,
         data: Object,
         size: { type: String, default: function () { return GlobalConfig.form.size || GlobalConfig.size; } },
-        span: [String, Number],
+        span: { type: [String, Number], default: function () { return GlobalConfig.form.span; } },
         align: { type: String, default: function () { return GlobalConfig.form.align; } },
         titleAlign: { type: String, default: function () { return GlobalConfig.form.titleAlign; } },
-        titleWidth: [String, Number],
+        titleWidth: { type: [String, Number], default: function () { return GlobalConfig.form.titleWidth; } },
         titleColon: { type: Boolean, default: function () { return GlobalConfig.form.titleColon; } },
         titleAsterisk: { type: Boolean, default: function () { return GlobalConfig.form.titleAsterisk; } },
         titleOverflow: { type: [Boolean, String], default: null },
@@ -311,12 +318,12 @@ export default defineComponent({
                                 });
                                 if (customValid) {
                                     if (XEUtils.isError(customValid)) {
-                                        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) {
-                                            errorRules.push(new Rule({ type: 'custom', trigger: trigger, message: e ? e.message : rule.message, rule: new Rule(rule) }));
+                                            errorRules.push(new Rule({ type: 'custom', trigger: trigger, content: e ? e.message : (rule.content || rule.message), rule: new Rule(rule) }));
                                         }));
                                     }
                                 }
@@ -558,7 +565,7 @@ export default defineComponent({
                         style: errRule.maxWidth ? {
                             width: errRule.maxWidth + "px"
                         } : null
-                    }, errRule.message));
+                    }, errRule.content));
                 }
                 var ons = showTooltip ? {
                     onMouseenter: function (evnt) {

package/es/form/src/render.js

@@ -29,9 +29,9 @@ export function renderTitle($xeform, item) {
     var contVNs = [];
     var titVNs = [];
     if (titlePrefix) {
-        titVNs.push(titlePrefix.message
+        titVNs.push((titlePrefix.content || titlePrefix.message)
             ? h(resolveComponent('vxe-tooltip'), {
-                content: getFuncText(titlePrefix.message),
+                content: getFuncText(titlePrefix.content || titlePrefix.message),
                 enterable: titlePrefix.enterable,
                 theme: titlePrefix.theme
             }, {
@@ -47,9 +47,9 @@ export function renderTitle($xeform, item) {
     }, titVNs));
     var fixVNs = [];
     if (titleSuffix) {
-        fixVNs.push(titleSuffix.message
+        fixVNs.push((titleSuffix.content || titleSuffix.message)
             ? h(resolveComponent('vxe-tooltip'), {
-                content: getFuncText(titleSuffix.message),
+                content: getFuncText(titleSuffix.content || titleSuffix.message),
                 enterable: titleSuffix.enterable,
                 theme: titleSuffix.theme
             }, {

package/es/grid/src/grid.js

@@ -25,7 +25,7 @@ import tableComponentEmits from '../../table/src/emits';
 import { useSize } from '../../hooks/size';
 import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event';
 var tableComponentPropKeys = Object.keys(tableComponentProps);
-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 = __spreadArray(__spreadArray([], tableComponentEmits), [
     'page-change',
     'form-submit',
@@ -244,6 +244,12 @@ export default defineComponent({
             }
             else {
                 if (isMsg) {
+                    // 检测弹窗模块
+                    if (process.env.NODE_ENV === 'development') {
+                        if (!VXETable.modal) {
+                            errLog('vxe.error.reqModule', ['Modal']);
+                        }
+                    }
                     VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' });
                 }
             }
@@ -269,6 +275,12 @@ export default defineComponent({
                     });
                 }
                 else {
+                    // 检测弹窗模块
+                    if (process.env.NODE_ENV === 'development') {
+                        if (!VXETable.modal) {
+                            errLog('vxe.error.reqModule', ['Modal']);
+                        }
+                    }
                     VXETable.modal.message({ id: "msg_" + code, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' });
                 }
             }
@@ -761,6 +773,12 @@ export default defineComponent({
                                         reactData.tableLoading = false;
                                         reactData.pendingRecords = reactData.pendingRecords.filter(function (row) { return $xetable.findRowIndexOf(removeRecords_1, row) === -1; });
                                         if (isMsg) {
+                                            // 检测弹窗模块
+                                            if (process.env.NODE_ENV === 'development') {
+                                                if (!VXETable.modal) {
+                                                    errLog('vxe.error.reqModule', ['Modal']);
+                                                }
+                                            }
                                             VXETable.modal.message({ content: getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' });
                                         }
                                         if (afterDelete) {
@@ -773,6 +791,11 @@ export default defineComponent({
                                         .catch(function (rest) {
                                         reactData.tableLoading = false;
                                         if (isMsg) {
+                                            if (process.env.NODE_ENV === 'development') {
+                                                if (!VXETable.modal.message) {
+                                                    errLog('vxe.error.reqModule', ['Modal']);
+                                                }
+                                            }
                                             VXETable.modal.message({ id: code, content: getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
                                         }
                                     });
@@ -780,6 +803,12 @@ export default defineComponent({
                             }
                             else {
                                 if (isMsg) {
+                                    // 检测弹窗模块
+                                    if (process.env.NODE_ENV === 'development') {
+                                        if (!VXETable.modal) {
+                                            errLog('vxe.error.reqModule', ['Modal']);
+                                        }
+                                    }
                                     VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' });
                                 }
                             }
@@ -814,6 +843,12 @@ export default defineComponent({
                                         reactData.tableLoading = false;
                                         reactData.pendingRecords = [];
                                         if (isMsg) {
+                                            // 检测弹窗模块
+                                            if (process.env.NODE_ENV === 'development') {
+                                                if (!VXETable.modal) {
+                                                    errLog('vxe.error.reqModule', ['Modal']);
+                                                }
+                                            }
                                             VXETable.modal.message({ content: getRespMsg(rest, 'vxe.grid.saveSuccess'), status: 'success' });
                                         }
                                         if (afterSave) {
@@ -826,12 +861,24 @@ export default defineComponent({
                                         .catch(function (rest) {
                                         reactData.tableLoading = false;
                                         if (isMsg) {
+                                            // 检测弹窗模块
+                                            if (process.env.NODE_ENV === 'development') {
+                                                if (!VXETable.modal) {
+                                                    errLog('vxe.error.reqModule', ['Modal']);
+                                                }
+                                            }
                                             VXETable.modal.message({ id: code, content: getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
                                         }
                                     });
                                 }
                                 else {
                                     if (isMsg) {
+                                        // 检测弹窗模块
+                                        if (process.env.NODE_ENV === 'development') {
+                                            if (!VXETable.modal) {
+                                                errLog('vxe.error.reqModule', ['Modal']);
+                                            }
+                                        }
                                         VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.dataUnchanged'), status: 'info' });
                                     }
                                 }

package/es/header/src/header.js

@@ -28,6 +28,7 @@ export default defineComponent({
         var $xetable = inject('$xetable', {});
         var xID = $xetable.xID, tableProps = $xetable.props, tableReactData = $xetable.reactData, tableInternalData = $xetable.internalData;
         var _a = $xetable.getRefMaps(), tableRefElem = _a.refElem, refTableBody = _a.refTableBody, refLeftContainer = _a.refLeftContainer, refRightContainer = _a.refRightContainer, refCellResizeBar = _a.refCellResizeBar;
+        var computeColumnOpts = $xetable.getComputeMaps().computeColumnOpts;
         var headerColumn = ref([]);
         var refElem = ref();
         var refHeaderTable = ref();
@@ -145,12 +146,13 @@ export default defineComponent({
         var renderVN = function () {
             var fixedType = props.fixedType, fixedColumn = props.fixedColumn, tableColumn = props.tableColumn;
             var resizable = tableProps.resizable, border = tableProps.border, columnKey = tableProps.columnKey, headerRowClassName = tableProps.headerRowClassName, headerCellClassName = tableProps.headerCellClassName, headerRowStyle = tableProps.headerRowStyle, headerCellStyle = tableProps.headerCellStyle, allColumnHeaderOverflow = tableProps.showHeaderOverflow, allHeaderAlign = tableProps.headerAlign, allAlign = tableProps.align, mouseConfig = tableProps.mouseConfig;
-            var isGroup = tableReactData.isGroup, currentColumn = tableReactData.currentColumn, scrollXLoad = tableReactData.scrollXLoad, overflowX = tableReactData.overflowX, scrollbarWidth = tableReactData.scrollbarWidth;
+            var isGroup = tableReactData.isGroup, currentColumn = tableReactData.currentColumn, 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;
                     }
                 }
@@ -216,8 +218,8 @@ export default defineComponent({
                                 onClick: function (evnt) { return $xetable.triggerHeaderCellClickEvent(evnt, params); },
                                 onDblclick: function (evnt) { return $xetable.triggerHeaderCellDblclickEvent(evnt, params); }
                             };
-                            // 虚拟滚动不支持动态高度
-                            if (scrollXLoad && !hasEllipsis) {
+                            // 纵向虚拟滚动不支持动态行高
+                            if (scrollYLoad && !hasEllipsis) {
                                 showEllipsis = hasEllipsis = true;
                             }
                             // 按下事件处理
@@ -248,7 +250,7 @@ export default defineComponent({
                                 /**
                                  * 列宽拖动
                                  */
-                                !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : resizable) ? h('div', {
+                                !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || resizable)) ? h('div', {
                                     class: ['vxe-resizable', {
                                             'is--line': !border || border === 'none'
                                         }],

package/es/select/src/select.js

@@ -171,7 +171,7 @@ export default defineComponent({
             }
             return nextTick();
         };
-        var updateCache = function () {
+        var cacheItemMap = function () {
             var fullOptionList = reactData.fullOptionList, fullGroupList = reactData.fullGroupList;
             var groupOptionsField = computeGroupOptionsField.value;
             var key = getOptkey();
@@ -674,17 +674,17 @@ export default defineComponent({
                 reactData.fullGroupList = [];
                 reactData.fullOptionList = value || [];
             }
-            updateCache();
+            cacheItemMap();
         });
         watch(function () { return props.options; }, function (value) {
             reactData.fullGroupList = [];
             reactData.fullOptionList = value || [];
-            updateCache();
+            cacheItemMap();
         });
         watch(function () { return props.optionGroups; }, function (value) {
             reactData.fullOptionList = [];
             reactData.fullGroupList = value || [];
-            updateCache();
+            cacheItemMap();
         });
         onMounted(function () {
             nextTick(function () {
@@ -695,7 +695,7 @@ export default defineComponent({
                 else if (options) {
                     reactData.fullOptionList = options;
                 }
-                updateCache();
+                cacheItemMap();
             });
             GlobalEvent.on($xeselect, 'mousewheel', handleGlobalMousewheelEvent);
             GlobalEvent.on($xeselect, 'mousedown', handleGlobalMousedownEvent);

package/es/table/src/body.js

@@ -40,7 +40,7 @@ export default defineComponent({
         var xesize = inject('xesize', null);
         var xID = $xetable.xID, tableProps = $xetable.props, tableContext = $xetable.context, tableReactData = $xetable.reactData, tableInternalData = $xetable.internalData;
         var _a = $xetable.getRefMaps(), refTableHeader = _a.refTableHeader, refTableBody = _a.refTableBody, refTableFooter = _a.refTableFooter, refTableLeftBody = _a.refTableLeftBody, refTableRightBody = _a.refTableRightBody, refValidTooltip = _a.refValidTooltip;
-        var _b = $xetable.getComputeMaps(), computeEditOpts = _b.computeEditOpts, computeMouseOpts = _b.computeMouseOpts, computeSYOpts = _b.computeSYOpts, computeEmptyOpts = _b.computeEmptyOpts, computeKeyboardOpts = _b.computeKeyboardOpts, computeTooltipOpts = _b.computeTooltipOpts, computeRadioOpts = _b.computeRadioOpts, computeTreeOpts = _b.computeTreeOpts, computeCheckboxOpts = _b.computeCheckboxOpts, computeValidOpts = _b.computeValidOpts;
+        var _b = $xetable.getComputeMaps(), computeEditOpts = _b.computeEditOpts, computeMouseOpts = _b.computeMouseOpts, computeSYOpts = _b.computeSYOpts, computeEmptyOpts = _b.computeEmptyOpts, computeKeyboardOpts = _b.computeKeyboardOpts, computeTooltipOpts = _b.computeTooltipOpts, computeRadioOpts = _b.computeRadioOpts, computeTreeOpts = _b.computeTreeOpts, computeCheckboxOpts = _b.computeCheckboxOpts, computeValidOpts = _b.computeValidOpts, computeRowOpts = _b.computeRowOpts;
         var refElem = ref();
         var refBodyTable = ref();
         var refBodyColgroup = ref();
@@ -113,16 +113,18 @@ export default defineComponent({
         var renderColumn = function ($seq, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
             var _a;
             var columnKey = tableProps.columnKey, height = tableProps.height, allColumnOverflow = tableProps.showOverflow, cellClassName = tableProps.cellClassName, cellStyle = tableProps.cellStyle, allAlign = tableProps.align, spanMethod = tableProps.spanMethod, mouseConfig = tableProps.mouseConfig, editConfig = tableProps.editConfig, editRules = tableProps.editRules, tooltipConfig = tableProps.tooltipConfig;
-            var tableData = tableReactData.tableData, overflowX = tableReactData.overflowX, scrollXLoad = tableReactData.scrollXLoad, scrollYLoad = tableReactData.scrollYLoad, currentColumn = tableReactData.currentColumn, mergeList = tableReactData.mergeList, editStore = tableReactData.editStore, validStore = tableReactData.validStore, isAllOverflow = tableReactData.isAllOverflow;
+            var tableData = tableReactData.tableData, overflowX = tableReactData.overflowX, scrollYLoad = tableReactData.scrollYLoad, currentColumn = tableReactData.currentColumn, mergeList = tableReactData.mergeList, editStore = tableReactData.editStore, validStore = tableReactData.validStore, isAllOverflow = tableReactData.isAllOverflow;
             var afterFullData = tableInternalData.afterFullData;
             var validOpts = computeValidOpts.value;
             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, editRender = column.editRender, align = column.align, showOverflow = column.showOverflow, 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);
             var _columnIndex = $xetable.getVTColumnIndex(column);
@@ -141,7 +143,7 @@ export default defineComponent({
             var attrs = { colid: column.id };
             var params = { $table: $xetable, $seq: $seq, seq: seq, rowid: rowid, row: row, rowIndex: rowIndex, $rowIndex: $rowIndex, _rowIndex: _rowIndex, column: column, columnIndex: columnIndex, $columnIndex: $columnIndex, _columnIndex: _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items: items };
             // 虚拟滚动不支持动态高度
-            if ((scrollXLoad || scrollYLoad) && !hasEllipsis) {
+            if (scrollYLoad && !hasEllipsis) {
                 showEllipsis = hasEllipsis = true;
             }
             // hover 进入事件
@@ -234,7 +236,7 @@ export default defineComponent({
                             'c--ellipsis': showEllipsis
                         }],
                     style: {
-                        maxHeight: hasEllipsis && rHeight ? rHeight + "px" : ''
+                        maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? (scrollYRHeight || rowHeight) + "px" : ''
                     }
                 }));
             }
@@ -247,7 +249,7 @@ export default defineComponent({
                                 'c--ellipsis': showEllipsis
                             }],
                         style: {
-                            maxHeight: hasEllipsis && rHeight ? rHeight + "px" : ''
+                            maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? (scrollYRHeight || rowHeight) + "px" : ''
                         },
                         title: showTitle ? $xetable.getCellLabel(row, column) : null
                     }, column.renderCell(params))]));
@@ -277,13 +279,13 @@ export default defineComponent({
                         _a['col--valid-error'] = hasValidError,
                         _a['col--current'] = currentColumn === column,
                         _a), getPropClass(className, params), getPropClass(cellClassName, params)], key: columnKey ? column.id : $columnIndex }, attrs), { style: Object.assign({
-                    height: hasEllipsis && rHeight ? rHeight + "px" : ''
+                    height: hasEllipsis && (scrollYRHeight || rowHeight) ? (scrollYRHeight || rowHeight) + "px" : ''
                 }, cellStyle ? (XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle) : null) }), tdOns), tdVNs);
         };
-        var renderRows = function ($seq, rowLevel, fixedType, tableData, tableColumn) {
+        var renderRows = function ($seq, fixedType, tableData, tableColumn) {
             var stripe = tableProps.stripe, rowKey = tableProps.rowKey, highlightHoverRow = tableProps.highlightHoverRow, rowClassName = tableProps.rowClassName, rowStyle = tableProps.rowStyle, allColumnOverflow = tableProps.showOverflow, editConfig = tableProps.editConfig, treeConfig = tableProps.treeConfig;
             var hasFixedColumn = tableReactData.hasFixedColumn, treeExpandeds = tableReactData.treeExpandeds, scrollYLoad = tableReactData.scrollYLoad, editStore = tableReactData.editStore, 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;
@@ -315,6 +317,8 @@ export default defineComponent({
                     };
                 }
                 var rowid = getRowid($xetable, row);
+                var rest = fullAllDataRowIdData[rowid];
+                var rowLevel = rest ? rest.level : 0;
                 var params = { $table: $xetable, $seq: $seq, seq: seq, rowid: rowid, fixed: fixedType, type: renderType, level: rowLevel, row: row, rowIndex: rowIndex, $rowIndex: $rowIndex, _rowIndex: _rowIndex };
                 var isNewRow = false;
                 if (editConfig) {
@@ -358,10 +362,10 @@ export default defineComponent({
                     ]));
                 }
                 // 如果是树形表格
-                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, renderRows($seq ? $seq + "." + seq : "" + seq, rowLevel + 1, fixedType, rowChildren, tableColumn));
+                        rows.push.apply(rows, renderRows($seq ? $seq + "." + seq : "" + seq, fixedType, rowChildren, tableColumn));
                     }
                 }
             });
@@ -570,7 +574,7 @@ export default defineComponent({
         var renderVN = function () {
             var fixedColumn = props.fixedColumn, fixedType = props.fixedType, tableColumn = props.tableColumn;
             var keyboardConfig = tableProps.keyboardConfig, allColumnOverflow = tableProps.showOverflow, spanMethod = tableProps.spanMethod, mouseConfig = tableProps.mouseConfig;
-            var tableData = tableReactData.tableData, mergeList = tableReactData.mergeList, scrollXLoad = tableReactData.scrollXLoad, scrollYLoad = tableReactData.scrollYLoad, isAllOverflow = tableReactData.isAllOverflow;
+            var tableData = tableReactData.tableData, mergeList = tableReactData.mergeList, scrollYLoad = tableReactData.scrollYLoad, isAllOverflow = tableReactData.isAllOverflow;
             var visibleColumn = tableInternalData.visibleColumn;
             var slots = tableContext.slots;
             var sYOpts = computeSYOpts.value;
@@ -581,7 +585,7 @@ export default defineComponent({
             // const isMergeRightFixedExceeded = computeIsMergeRightFixedExceeded.value
             // 如果是使用优化模式
             if (fixedType) {
-                if (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
+                if (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
                     if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
                         tableColumn = fixedColumn;
                     }
@@ -648,7 +652,7 @@ export default defineComponent({
                      */
                     h('tbody', {
                         ref: refBodyTBody
-                    }, renderRows('', 0, fixedType, tableData, tableColumn))
+                    }, renderRows('', fixedType, tableData, tableColumn))
                 ]),
                 h('div', {
                     class: 'vxe-table--checkbox-range'