vxe-table 3.14.0-beta.9 → 3.14.1

package/es/table/module/export/mixin.js

@@ -195,24 +195,24 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
         return item;
     });
 }
-function getExportData($xetable, opts) {
+function getExportData($xeTable, opts) {
     const { columns, dataFilterMethod } = opts;
     let datas = opts.data;
     if (dataFilterMethod) {
         datas = datas.filter((row, index) => dataFilterMethod({ row, $rowIndex: index }));
     }
-    return getBodyLabelData($xetable, opts, columns, datas);
+    return getBodyLabelData($xeTable, opts, columns, datas);
 }
 function getBooleanValue(cellValue) {
     return cellValue === 'TRUE' || cellValue === 'true' || cellValue === true;
 }
-function getHeaderTitle($xetable, opts, column) {
-    const { columnOpts } = $xetable;
+function getHeaderTitle($xeTable, opts, column) {
+    const columnOpts = $xeTable.computeColumnOpts;
     const headExportMethod = column.headerExportMethod || columnOpts.headerExportMethod;
-    return headExportMethod ? headExportMethod({ column, options: opts, $table: $xetable }) : ((opts.original ? column.field : column.getTitle()) || '');
+    return headExportMethod ? headExportMethod({ column, options: opts, $table: $xeTable }) : ((opts.original ? column.field : column.getTitle()) || '');
 }
-function getFooterCellValue($xetable, opts, row, column) {
-    const { columnOpts } = $xetable;
+function getFooterCellValue($xeTable, opts, row, column) {
+    const columnOpts = $xeTable.computeColumnOpts;
     const renderOpts = column.editRender || column.cellRender;
     let footLabelMethod = column.footerExportMethod;
     if (!footLabelMethod && renderOpts && renderOpts.name) {
@@ -224,9 +224,9 @@ function getFooterCellValue($xetable, opts, row, column) {
     if (!footLabelMethod) {
         footLabelMethod = columnOpts.footerExportMethod;
     }
-    const _columnIndex = $xetable.getVTColumnIndex(column);
+    const _columnIndex = $xeTable.getVTColumnIndex(column);
     if (footLabelMethod) {
-        return footLabelMethod({ $table: $xetable, items: row, itemIndex: _columnIndex, row, _columnIndex, column, options: opts });
+        return footLabelMethod({ $table: $xeTable, items: row, itemIndex: _columnIndex, row, _columnIndex, column, options: opts });
     }
     // 兼容老模式
     if (XEUtils.isArray(row)) {
@@ -477,7 +477,8 @@ function toHtml($xeTable, opts, columns, datas) {
     tables.push('</table>', script);
     return isPrint ? tables.join('') : createHtmlPage(opts, tables.join(''));
 }
-function toXML($xetable, opts, columns, datas) {
+function toXML($xeTable, opts, columns, datas) {
+    const reactData = $xeTable;
     let xml = [
         '<?xml version="1.0"?>',
         '<?mso-application progid="Excel.Sheet"?>',
@@ -498,16 +499,16 @@ function toXML($xetable, opts, columns, datas) {
         columns.map(column => `<Column ss:Width="${column.renderWidth}"/>`).join('')
     ].join('');
     if (opts.isHeader) {
-        xml += `<Row>${columns.map(column => `<Cell><Data ss:Type="String">${getHeaderTitle($xetable, opts, column)}</Data></Cell>`).join('')}</Row>`;
+        xml += `<Row>${columns.map(column => `<Cell><Data ss:Type="String">${getHeaderTitle($xeTable, opts, column)}</Data></Cell>`).join('')}</Row>`;
     }
     datas.forEach(row => {
         xml += '<Row>' + columns.map(column => `<Cell><Data ss:Type="String">${row[column.id]}</Data></Cell>`).join('') + '</Row>';
     });
     if (opts.isFooter) {
-        const footerTableData = $xetable.footerTableData;
+        const { footerTableData } = reactData;
         const footers = getFooterData(opts, footerTableData);
         footers.forEach((row) => {
-            xml += `<Row>${columns.map(column => `<Cell><Data ss:Type="String">${getFooterCellValue($xetable, opts, row, column)}</Data></Cell>`).join('')}</Row>`;
+            xml += `<Row>${columns.map(column => `<Cell><Data ss:Type="String">${getFooterCellValue($xeTable, opts, row, column)}</Data></Cell>`).join('')}</Row>`;
         });
     }
     return `${xml}</Table></Worksheet></Workbook>`;
@@ -559,7 +560,7 @@ export function saveLocalFile(options) {
     }
     return Promise.reject(new Error(getI18n('vxe.error.notExp')));
 }
-function downloadFile($xetable, opts, content) {
+function downloadFile($xeTable, opts, content) {
     const { filename, type, download } = opts;
     if (!download) {
         const blob = getExportBlobByContent(content, opts);
@@ -821,8 +822,9 @@ function handleImport($xeTable, content, opts) {
         }
     }
 }
-function handleFileImport($xetable, file, opts) {
-    const { importOpts } = $xetable;
+function handleFileImport($xeTable, file, opts) {
+    const internalData = $xeTable;
+    const importOpts = $xeTable.computeImportOpts;
     const { importMethod, afterImportMethod } = opts;
     const { type, filename } = parseFile(file);
     // 检查类型，如果为自定义导出，则不需要校验类型
@@ -840,21 +842,21 @@ function handleFileImport($xetable, file, opts) {
     const rest = new Promise((resolve, reject) => {
         const _importResolve = (params) => {
             resolve(params);
-            $xetable._importResolve = null;
-            $xetable._importReject = null;
+            $xeTable._importResolve = null;
+            $xeTable._importReject = null;
         };
         const _importReject = (params) => {
             reject(params);
-            $xetable._importResolve = null;
-            $xetable._importReject = null;
+            $xeTable._importResolve = null;
+            $xeTable._importReject = null;
         };
-        $xetable._importResolve = _importResolve;
-        $xetable._importReject = _importReject;
+        $xeTable._importResolve = _importResolve;
+        $xeTable._importReject = _importReject;
         if (window.FileReader) {
             const options = Object.assign({ mode: 'insertTop' }, opts, { type, filename });
             if (options.remote) {
                 if (importMethod) {
-                    Promise.resolve(importMethod({ file, options, $table: $xetable })).then(() => {
+                    Promise.resolve(importMethod({ file, options, $table: $xeTable })).then(() => {
                         _importResolve({ status: true });
                     }).catch(() => {
                         _importResolve({ status: true });
@@ -865,14 +867,15 @@ function handleFileImport($xetable, file, opts) {
                 }
             }
             else {
-                $xetable.preventEvent(null, 'event.import', { file, options, columns: $xetable.tableFullColumn }, () => {
+                const { tableFullColumn } = internalData;
+                $xeTable.preventEvent(null, 'event.import', { file, options, columns: tableFullColumn }, () => {
                     const reader = new FileReader();
                     reader.onerror = () => {
                         errLog('vxe.error.notType', [type]);
                         _importReject({ status: false });
                     };
                     reader.onload = (e) => {
-                        handleImport($xetable, e.target.result, options);
+                        handleImport($xeTable, e.target.result, options);
                     };
                     reader.readAsText(file, options.encoding || 'UTF-8');
                 });
@@ -886,11 +889,11 @@ function handleFileImport($xetable, file, opts) {
     });
     return rest.then(() => {
         if (afterImportMethod) {
-            afterImportMethod({ status: true, options: opts, $table: $xetable });
+            afterImportMethod({ status: true, options: opts, $table: $xeTable });
         }
     }).catch((e) => {
         if (afterImportMethod) {
-            afterImportMethod({ status: false, options: opts, $table: $xetable });
+            afterImportMethod({ status: false, options: opts, $table: $xeTable });
         }
         return Promise.reject(e);
     });

package/es/table/module/filter/panel.js

@@ -54,14 +54,24 @@ export default {
             if (filterSlot) {
                 return [
                     h('div', {
-                        class: 'vxe-table--filter-template'
+                        class: 'vxe-table--filter-template',
+                        style: maxHeight
+                            ? {
+                                maxHeight: `${maxHeight}px`
+                            }
+                            : {}
                     }, $xeTable.callSlot(filterSlot, params, h))
                 ];
             }
             else if (rtFilter) {
                 return [
                     h('div', {
-                        class: 'vxe-table--filter-template'
+                        class: 'vxe-table--filter-template',
+                        style: maxHeight
+                            ? {
+                                maxHeight: `${maxHeight}px`
+                            }
+                            : {}
                     }, getSlotVNs(rtFilter.call($xeTable, h, filterRender, params)))
                 ];
             }
@@ -180,19 +190,20 @@ export default {
          *************************/
         // （单选）筛选发生改变
         changeRadioOption(evnt, checked, item) {
-            const { $parent: $xetable, filterStore } = this;
+            const $xeTable = this.$parent;
+            const { filterStore } = this;
             filterStore.options.forEach((option) => {
                 option._checked = false;
             });
             item._checked = checked;
-            $xetable.checkFilterOptions();
+            $xeTable.checkFilterOptions();
             this.confirmFilter(evnt);
         },
         // （多选）筛选发生改变
         changeMultipleOption(evnt, checked, item) {
-            const { $parent: $xetable } = this;
+            const $xeTable = this.$parent;
             item._checked = checked;
-            $xetable.checkFilterOptions();
+            $xeTable.checkFilterOptions();
         },
         changeAllOption(evnt, checked) {
             if (this.filterStore.multiple) {
@@ -213,13 +224,13 @@ export default {
         },
         // 确认筛选
         confirmFilter(evnt) {
-            const { $parent: $xetable } = this;
-            $xetable.handleFilterConfirmFilter(evnt);
+            const $xeTable = this.$parent;
+            $xeTable.handleFilterConfirmFilter(evnt);
         },
         // 重置筛选
         resetFilter(evnt) {
-            const { $parent: $xetable } = this;
-            $xetable.handleFilterResetFilter(evnt);
+            const $xeTable = this.$parent;
+            $xeTable.handleFilterResetFilter(evnt);
         }
         /*************************
          * Publish methods

package/es/table/module/keyboard/mixin.js

@@ -95,17 +95,59 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
     }
     return rangeRows;
 }
+function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow) {
+    const internalData = $xeTable;
+    const { afterFullData, visibleColumn } = internalData;
+    const params = Object.assign({}, args);
+    const _rowIndex = $xeTable.getVTRowIndex(params.row);
+    const _columnIndex = $xeTable.getVTColumnIndex(params.column);
+    evnt.preventDefault();
+    if (isUpArrow && _rowIndex > 0) {
+        // 移动到上一行
+        params.rowIndex = _rowIndex - 1;
+        params.row = afterFullData[params.rowIndex];
+    }
+    else if (isDwArrow && _rowIndex < afterFullData.length - 1) {
+        // 移动到下一行
+        params.rowIndex = _rowIndex + 1;
+        params.row = afterFullData[params.rowIndex];
+    }
+    else if (isLeftArrow && _columnIndex) {
+        // 移动到左侧单元格
+        params.columnIndex = _columnIndex - 1;
+        params.column = visibleColumn[params.columnIndex];
+    }
+    else if (isRightArrow && _columnIndex < visibleColumn.length - 1) {
+        // 移动到右侧单元格
+        params.columnIndex = _columnIndex + 1;
+        params.column = visibleColumn[params.columnIndex];
+    }
+    $xeTable.scrollToRow(params.row, params.column).then(() => {
+        params.cell = $xeTable.getCellElement(params.row, params.column);
+        $xeTable.handleSelected(params, evnt);
+    });
+    return params;
+}
 export default {
     methods: {
         // 处理 Tab 键移动
         moveTabSelected(args, isLeft, evnt) {
-            const { afterFullData, visibleColumn, editConfig, editOpts } = this;
+            const $xeTable = this;
+            const props = $xeTable;
+            const internalData = $xeTable;
+            const { editConfig } = props;
+            const { afterFullData, visibleColumn } = internalData;
+            const editOpts = $xeTable.computeEditOpts;
+            const rowOpts = $xeTable.computeRowOpts;
+            const currentRowOpts = $xeTable.computeCurrentRowOpts;
+            const columnOpts = $xeTable.computeColumnOpts;
+            const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
             let targetRow;
             let targetRowIndex;
             let targetColumnIndex;
             const params = Object.assign({}, args);
-            const _rowIndex = this.getVTRowIndex(params.row);
-            const _columnIndex = this.getVTColumnIndex(params.column);
+            const _rowIndex = $xeTable.getVTRowIndex(params.row);
+            const _columnIndex = $xeTable.getVTColumnIndex(params.column);
             evnt.preventDefault();
             if (isLeft) {
                 // 向左
@@ -145,30 +187,46 @@ export default {
                 }
                 params.columnIndex = targetColumnIndex;
                 params.column = targetColumn;
-                params.cell = this.getCellElement(params.row, params.column);
+                params.cell = $xeTable.getCellElement(params.row, params.column);
+                if (rowOpts.isCurrent && currentRowOpts.isFollowSelected) {
+                    $xeTable.triggerCurrentRowEvent(evnt, params);
+                }
+                if (columnOpts.isCurrent && currentColumnOpts.isFollowSelected) {
+                    $xeTable.triggerCurrentColumnEvent(evnt, params);
+                }
                 if (editConfig) {
                     if (editOpts.trigger === 'click' || editOpts.trigger === 'dblclick') {
                         if (editOpts.mode === 'row') {
-                            this.handleEdit(params, evnt);
+                            $xeTable.handleEdit(params, evnt);
                         }
                         else {
-                            this.scrollToRow(params.row, params.column)
-                                .then(() => this.handleSelected(params, evnt));
+                            $xeTable.scrollToRow(params.row, params.column)
+                                .then(() => {
+                                $xeTable.handleSelected(params, evnt);
+                            });
                         }
                     }
                 }
                 else {
-                    this.scrollToRow(params.row, params.column)
-                        .then(() => this.handleSelected(params, evnt));
+                    $xeTable.scrollToRow(params.row, params.column)
+                        .then(() => {
+                        $xeTable.handleSelected(params, evnt);
+                    });
                 }
             }
         },
         // 处理当前行方向键移动
         moveCurrentRow(isUpArrow, isDwArrow, evnt) {
-            const { currentRow, treeConfig, treeOpts, afterFullData } = this;
+            const $xeTable = this;
+            const props = $xeTable;
+            const reactData = $xeTable;
+            const internalData = $xeTable;
+            const { treeConfig } = props;
+            const { currentRow } = reactData;
+            const { afterFullData } = internalData;
+            const treeOpts = $xeTable.computeTreeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             let targetRow;
-            evnt.preventDefault();
             if (currentRow) {
                 if (treeConfig) {
                     const { index, items } = XEUtils.findTree(afterFullData, item => item === currentRow, { children: childrenField });
@@ -180,7 +238,7 @@ export default {
                     }
                 }
                 else {
-                    const _rowIndex = this.getVTRowIndex(currentRow);
+                    const _rowIndex = $xeTable.getVTRowIndex(currentRow);
                     if (isUpArrow && _rowIndex > 0) {
                         targetRow = afterFullData[_rowIndex - 1];
                     }
@@ -193,42 +251,84 @@ export default {
                 targetRow = afterFullData[0];
             }
             if (targetRow) {
-                const params = { $table: this, row: targetRow };
-                this.scrollToRow(targetRow)
-                    .then(() => this.triggerCurrentRowEvent(evnt, params));
+                evnt.preventDefault();
+                const params = {
+                    $table: $xeTable,
+                    row: targetRow,
+                    rowIndex: $xeTable.getRowIndex(targetRow),
+                    $rowIndex: $xeTable.getVMRowIndex(targetRow)
+                };
+                $xeTable.scrollToRow(targetRow)
+                    .then(() => $xeTable.triggerCurrentRowEvent(evnt, params));
+            }
+        },
+        // 处理当前列方向键移动
+        moveCurrentColumn(isLeftArrow, isRightArrow, evnt) {
+            const $xeTable = this;
+            const reactData = $xeTable;
+            const internalData = $xeTable;
+            const { currentColumn } = reactData;
+            const { visibleColumn } = internalData;
+            let targetCol = null;
+            if (currentColumn) {
+                const _columnIndex = $xeTable.getVTColumnIndex(currentColumn);
+                if (isLeftArrow && _columnIndex > 0) {
+                    targetCol = visibleColumn[_columnIndex - 1];
+                }
+                else if (isRightArrow && _columnIndex < visibleColumn.length - 1) {
+                    targetCol = visibleColumn[_columnIndex + 1];
+                }
+            }
+            else {
+                targetCol = visibleColumn[0];
+            }
+            if (targetCol) {
+                evnt.preventDefault();
+                const params = {
+                    $table: $xeTable,
+                    column: targetCol,
+                    columnIndex: $xeTable.getColumnIndex(targetCol),
+                    $columnIndex: $xeTable.getVMColumnIndex(targetCol)
+                };
+                $xeTable.scrollToColumn(targetCol)
+                    .then(() => $xeTable.triggerCurrentColumnEvent(evnt, params));
             }
         },
         // 处理可编辑方向键移动
-        moveSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
-            const { afterFullData, visibleColumn } = this;
-            const params = Object.assign({}, args);
-            const _rowIndex = this.getVTRowIndex(params.row);
-            const _columnIndex = this.getVTColumnIndex(params.column);
-            evnt.preventDefault();
-            if (isUpArrow && _rowIndex > 0) {
-                // 移动到上一行
-                params.rowIndex = _rowIndex - 1;
-                params.row = afterFullData[params.rowIndex];
+        moveArrowSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
+            const $xeTable = this;
+            const props = $xeTable;
+            const { highlightCurrentRow, highlightCurrentColumn } = props;
+            const rowOpts = $xeTable.computeRowOpts;
+            const columnOpts = $xeTable.computeColumnOpts;
+            handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow);
+            // 当前行按键上下移动
+            if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
+                $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
             }
-            else if (isDwArrow && _rowIndex < afterFullData.length - 1) {
-                // 移动到下一行
-                params.rowIndex = _rowIndex + 1;
-                params.row = afterFullData[params.rowIndex];
+            // 当前行按键左右移动
+            if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
+                $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt);
             }
-            else if (isLeftArrow && _columnIndex) {
-                // 移动到左侧单元格
-                params.columnIndex = _columnIndex - 1;
-                params.column = visibleColumn[params.columnIndex];
+        },
+        moveEnterSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
+            const $xeTable = this;
+            const rowOpts = $xeTable.computeRowOpts;
+            const currentRowOpts = $xeTable.computeCurrentRowOpts;
+            const columnOpts = $xeTable.computeColumnOpts;
+            const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
+            const params = handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow);
+            if ((rowOpts.isCurrent && currentRowOpts.isFollowSelected)) {
+                $xeTable.triggerCurrentRowEvent(evnt, params);
             }
-            else if (isRightArrow && _columnIndex < visibleColumn.length - 1) {
-                // 移动到右侧单元格
-                params.columnIndex = _columnIndex + 1;
-                params.column = visibleColumn[params.columnIndex];
+            if (columnOpts.isCurrent && currentColumnOpts.isFollowSelected) {
+                $xeTable.triggerCurrentColumnEvent(evnt, params);
             }
-            this.scrollToRow(params.row, params.column).then(() => {
-                params.cell = this.getCellElement(params.row, params.column);
-                this.handleSelected(params, evnt);
-            });
+        },
+        // 处理可编辑方向键移动
+        moveSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
+            const $xeTable = this;
+            handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow);
         },
         handleCellMousedownEvent(evnt, params) {
             const $xeTable = this;

package/es/table/module/menu/mixin.js

@@ -58,6 +58,7 @@ export default {
          */
         handleGlobalContextmenuEvent(evnt) {
             const $xeTable = this;
+            const $xeGrid = $xeTable.$xeGrid;
             const internalData = $xeTable;
             const { $refs, tId, editStore, menuConfig, contextMenu, ctxMenuStore, ctxMenuOpts, mouseConfig, mouseOpts } = this;
             const { selected } = editStore;
@@ -70,7 +71,7 @@ export default {
                 }
                 if (internalData._keyCtx) {
                     const type = 'body';
-                    const params = { type, $grid: this.$xegrid, $table: this, keyboard: true, columns: this.visibleColumn.slice(0), $event: evnt };
+                    const params = { type, $grid: $xeGrid, $table: this, keyboard: true, columns: this.visibleColumn.slice(0), $event: evnt };
                     // 如果开启单元格区域
                     if (mouseConfig && mouseOpts.area) {
                         const activeArea = this.getActiveCellArea();
@@ -98,7 +99,7 @@ export default {
                         // target=td|th，直接向上找 table 去匹配即可
                         return target.parentNode.parentNode.parentNode.getAttribute('xid') === tId;
                     });
-                    const params = { type: layout, $grid: this.$xegrid, $table: this, columns: this.visibleColumn.slice(0), $event: evnt };
+                    const params = { type: layout, $grid: $xeGrid, $table: this, columns: this.visibleColumn.slice(0), $event: evnt };
                     if (columnTargetNode.flag) {
                         const cell = columnTargetNode.targetElem;
                         const column = this.getColumnNode(cell).item;
@@ -261,10 +262,12 @@ export default {
          * 快捷菜单点击事件
          */
         ctxMenuLinkEvent(evnt, menu) {
+            const $xeTable = this;
+            const $xeGrid = $xeTable.$xeGrid;
             // 如果一级菜单有配置 code 则允许点击，否则不能点击
             if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
                 const gMenuOpts = menus.get(menu.code);
-                const params = Object.assign({ menu, $grid: this.$xegrid, $table: this, $event: evnt }, this.ctxMenuStore.args);
+                const params = Object.assign({ menu, $grid: $xeGrid, $table: this, $event: evnt }, this.ctxMenuStore.args);
                 if (gMenuOpts && gMenuOpts.menuMethod) {
                     gMenuOpts.menuMethod(params, evnt);
                 }

package/es/table/module/menu/panel.js

@@ -17,7 +17,7 @@ export default {
         }
     },
     render(h) {
-        const $xetable = this.$parent;
+        const $xeTable = this.$parent;
         const { _e, ctxMenuOpts, ctxMenuStore } = this;
         return h('div', {
             class: ['vxe-table--context-menu-wrapper', ctxMenuOpts.className, {
@@ -47,13 +47,13 @@ export default {
                                 class: 'vxe-context-menu--link',
                                 on: {
                                     click(evnt) {
-                                        $xetable.ctxMenuLinkEvent(evnt, item);
+                                        $xeTable.ctxMenuLinkEvent(evnt, item);
                                     },
                                     mouseover(evnt) {
-                                        $xetable.ctxMenuMouseoverEvent(evnt, item);
+                                        $xeTable.ctxMenuMouseoverEvent(evnt, item);
                                     },
                                     mouseout(evnt) {
-                                        $xetable.ctxMenuMouseoutEvent(evnt, item);
+                                        $xeTable.ctxMenuMouseoutEvent(evnt, item);
                                     }
                                 }
                             }, [
@@ -98,13 +98,13 @@ export default {
                                                 class: 'vxe-context-menu--link',
                                                 on: {
                                                     click(evnt) {
-                                                        $xetable.ctxMenuLinkEvent(evnt, child);
+                                                        $xeTable.ctxMenuLinkEvent(evnt, child);
                                                     },
                                                     mouseover(evnt) {
-                                                        $xetable.ctxMenuMouseoverEvent(evnt, item, child);
+                                                        $xeTable.ctxMenuMouseoverEvent(evnt, item, child);
                                                     },
                                                     mouseout(evnt) {
-                                                        $xetable.ctxMenuMouseoutEvent(evnt, item, child);
+                                                        $xeTable.ctxMenuMouseoutEvent(evnt, item);
                                                     }
                                                 }
                                             }, [

package/es/table/module/validator/mixin.js

@@ -149,13 +149,10 @@ export default {
         beginValidate(rows, cols, cb, isFull) {
             const $xeTable = this;
             const props = $xeTable;
-            const reactData = $xeTable;
             const internalData = $xeTable;
             const validRest = {};
             const { editRules, treeConfig } = props;
-            const { editStore, pendingRowMaps } = reactData;
-            const { afterFullData } = internalData;
-            const { removeMaps } = editStore;
+            const { afterFullData, pendingRowMaps, removeRowMaps } = internalData;
             const treeOpts = $xeTable.computeTreeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             let validList;
@@ -183,7 +180,7 @@ export default {
                 const handleVaild = (row) => {
                     const rowid = getRowid($xeTable, row);
                     // 是否删除
-                    if (removeMaps[rowid]) {
+                    if (removeRowMaps[rowid]) {
                         return;
                     }
                     // 是否标记删除

package/es/table/render/index.js

@@ -4,7 +4,7 @@ import { getCellValue, setCellValue } from '../src/util';
 import { getFuncText, formatText, isEmptyValue } from '../../ui/src/utils';
 import { getOnName, getModelEvent, getChangeEvent } from '../../ui/src/vn';
 import { errLog } from '../../ui/src/log';
-const { getConfig, renderer, getI18n } = VxeUI;
+const { getConfig, renderer, getI18n, getComponent } = VxeUI;
 const componentDefaultModelProp = 'value';
 const defaultCompProps = {};
 function handleDefaultValue(value, defaultVal, initVal) {
@@ -35,7 +35,7 @@ function getOldComponent({ name }) {
     return getOldComponentName(name);
 }
 function getDefaultComponent({ name }) {
-    return name;
+    return getComponent(name) || name;
 }
 function handleConfirmFilter(params, checked, option) {
     const { $panel } = params;