vxe-table 4.12.0-beta.7 → 4.12.0-beta.9

package/es/table/src/table.js

@@ -9,7 +9,7 @@ import TableHeaderComponent from './header';
 import TableFooterComponent from './footer';
 import tableProps from './props';
 import tableEmits from './emits';
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, updateDeepRowKey, updateFastRowKey } from './util';
+import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, updateDeepRowKey, updateFastRowKey } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 import TableCustomPanelComponent from '../module/custom/panel';
@@ -2238,6 +2238,7 @@ export default defineComponent({
             const childrenField = treeOpts.children || treeOpts.childrenField;
             const checkboxOpts = computeCheckboxOpts.value;
             const { checkField, reserve, checkMethod } = checkboxOpts;
+            // indeterminateField 仅支持读取
             const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
             const selectRowMaps = {};
             /**
@@ -3438,6 +3439,9 @@ export default defineComponent({
         };
         tableMethods = {
             dispatchEvent,
+            getEl() {
+                return refElem.value;
+            },
             /**
              * 重置表格的一切数据状态
              */
@@ -3740,7 +3744,9 @@ export default defineComponent({
              */
             revertData(rows, field) {
                 const { keepSource, treeConfig } = props;
+                const { editStore } = reactData;
                 const { fullAllDataRowIdData, fullDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
+                const removeTempMaps = Object.assign({}, editStore.removeMaps);
                 const treeOpts = computeTreeOpts.value;
                 const { transform } = treeOpts;
                 if (!keepSource) {
@@ -3775,6 +3781,7 @@ export default defineComponent({
                                         XEUtils.destructuring(row, XEUtils.clone(oRow, true));
                                     }
                                     if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                                        delete removeTempMaps[rowid];
                                         tableFullData.unshift(row);
                                         afterFullData.unshift(row);
                                         reDelFlag = true;
@@ -3786,6 +3793,7 @@ export default defineComponent({
                 }
                 if (rows) {
                     if (reDelFlag) {
+                        editStore.removeMaps = removeTempMaps;
                         $xeTable.updateFooter();
                         $xeTable.cacheRowMap(false);
                         $xeTable.handleTableData(treeConfig && transform);
@@ -3938,18 +3946,20 @@ export default defineComponent({
             },
             /**
              * 检查行或列数据是否发生改变
-             * @param {Row} row 行对象
+             * @param {Row} rowidOrRow 行对象、行主键
              * @param {String} field 字段名
              */
-            isUpdateByRow(row, field) {
+            isUpdateByRow(rowidOrRow, field) {
                 const { keepSource } = props;
                 const { tableFullColumn, fullDataRowIdData, sourceDataRowIdData } = internalData;
                 if (keepSource) {
-                    const rowid = getRowid($xeTable, row);
+                    const rowid = XEUtils.isString(rowidOrRow) || XEUtils.isNumber(rowidOrRow) ? rowidOrRow : getRowid($xeTable, rowidOrRow);
+                    const rowRest = fullDataRowIdData[rowid];
                     // 新增的数据不需要检测
-                    if (!fullDataRowIdData[rowid]) {
+                    if (!rowRest) {
                         return false;
                     }
+                    const row = rowRest.row;
                     const oRow = sourceDataRowIdData[rowid];
                     if (oRow) {
                         if (arguments.length > 1) {
@@ -4013,6 +4023,94 @@ export default defineComponent({
                     tableColumn: reactData.tableColumn.slice(0)
                 };
             },
+            /**
+             * 移动列到指定列的位置
+             * @param fieldOrColumn
+             * @param targetFieldOrColumn
+             * @param options
+             */
+            moveColumnTo(fieldOrColumn, targetFieldOrColumn, options) {
+                const { fullColumnIdData, visibleColumn } = internalData;
+                const { dragToChild, dragPos, isCrossDrag } = Object.assign({}, options);
+                const dragCol = handleFieldOrColumn($xeTable, fieldOrColumn);
+                let prevDragCol = null;
+                const colRest = dragCol ? fullColumnIdData[dragCol.id] : null;
+                let defPos = 'left';
+                if (XEUtils.isNumber(targetFieldOrColumn)) {
+                    if (colRest && targetFieldOrColumn) {
+                        let currList = colRest.items;
+                        let offsetIndex = colRest._index + targetFieldOrColumn;
+                        if (isCrossDrag) {
+                            currList = visibleColumn;
+                            offsetIndex = colRest._index + targetFieldOrColumn;
+                        }
+                        if (offsetIndex > 0 && offsetIndex < currList.length - 1) {
+                            prevDragCol = currList[offsetIndex];
+                        }
+                        if (targetFieldOrColumn > 0) {
+                            defPos = 'right';
+                        }
+                    }
+                }
+                else {
+                    prevDragCol = handleFieldOrColumn($xeTable, targetFieldOrColumn);
+                    const targetColRest = prevDragCol ? fullColumnIdData[prevDragCol.id] : null;
+                    if (colRest && targetColRest) {
+                        if (targetColRest._index > colRest._index) {
+                            defPos = 'right';
+                        }
+                    }
+                }
+                return $xeTable.handleColDragSwapEvent(null, true, dragCol, prevDragCol, dragPos || defPos, dragToChild === true);
+            },
+            /**
+             * 移动行到指定行的位置
+             * @param rowidOrRow
+             * @param targetRowidOrRow
+             * @param options
+             */
+            moveRowTo(rowidOrRow, targetRowidOrRow, options) {
+                const { treeConfig } = props;
+                const { fullAllDataRowIdData, afterFullData } = internalData;
+                const { dragToChild, dragPos, isCrossDrag } = Object.assign({}, options);
+                const treeOpts = computeTreeOpts.value;
+                const dragRow = handleRowidOrRow($xeTable, rowidOrRow);
+                let prevDragRow = null;
+                let defPos = 'top';
+                const rowRest = dragRow ? fullAllDataRowIdData[getRowid($xeTable, dragRow)] : null;
+                if (XEUtils.isNumber(targetRowidOrRow)) {
+                    if (rowRest && targetRowidOrRow) {
+                        let currList = afterFullData;
+                        let offsetIndex = rowRest._index + targetRowidOrRow;
+                        if (treeConfig) {
+                            currList = rowRest.items;
+                            if (treeOpts.transform) {
+                                offsetIndex = rowRest.treeIndex + targetRowidOrRow;
+                                if (isCrossDrag) {
+                                    currList = afterFullData;
+                                    offsetIndex = rowRest._index + targetRowidOrRow;
+                                }
+                            }
+                        }
+                        if (offsetIndex >= 0 && offsetIndex <= currList.length - 1) {
+                            prevDragRow = currList[offsetIndex];
+                        }
+                        if (targetRowidOrRow > 0) {
+                            defPos = 'bottom';
+                        }
+                    }
+                }
+                else {
+                    prevDragRow = handleRowidOrRow($xeTable, targetRowidOrRow);
+                    const targetRowRest = prevDragRow ? fullAllDataRowIdData[getRowid($xeTable, prevDragRow)] : null;
+                    if (rowRest && targetRowRest) {
+                        if (targetRowRest._index > rowRest._index) {
+                            defPos = 'bottom';
+                        }
+                    }
+                }
+                return $xeTable.handleRowDragSwapEvent(null, true, dragRow, prevDragRow, dragPos || defPos, dragToChild === true);
+            },
             /**
              * 获取表格的全量列
              */
@@ -4032,6 +4130,7 @@ export default defineComponent({
              */
             getCheckboxRecords(isFull) {
                 const { treeConfig } = props;
+                const { selectCheckboxMaps } = reactData;
                 const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const checkboxOpts = computeCheckboxOpts.value;
@@ -4039,17 +4138,17 @@ export default defineComponent({
                 const { checkField } = checkboxOpts;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 let rowList = [];
-                const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData);
                 if (checkField) {
                     if (treeConfig) {
+                        const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData);
                         rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, checkField), { children: transform ? mapChildrenField : childrenField });
                     }
                     else {
+                        const currTableData = isFull ? tableFullData : afterFullData;
                         rowList = currTableData.filter((row) => XEUtils.get(row, checkField));
                     }
                 }
                 else {
-                    const { selectCheckboxMaps } = reactData;
                     XEUtils.each(selectCheckboxMaps, (row, rowid) => {
                         if (isFull) {
                             if (fullDataRowIdData[rowid]) {
@@ -4734,6 +4833,7 @@ export default defineComponent({
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const { checkField, reserve } = checkboxOpts;
+                // indeterminateField 仅支持读取
                 const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
                 if (checkField) {
                     const handleClearChecked = (item) => {
@@ -6772,6 +6872,8 @@ export default defineComponent({
                     rowRest.level = level;
                     rowRest.index = currIndex;
                     rowRest.treeIndex = index;
+                    fullDataRowIdMaps[rowid] = rowRest;
+                    fullAllDataRowIdMaps[rowid] = rowRest;
                 };
                 if (treeConfig) {
                     XEUtils.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
@@ -7452,6 +7554,7 @@ export default defineComponent({
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const { checkField, checkStrictly, checkMethod } = checkboxOpts;
+                // indeterminateField 仅支持读取
                 const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
                 if (checkField) {
                     // 树结构
@@ -8099,6 +8202,9 @@ export default defineComponent({
                 const { afterFullData, tableFullData } = internalData;
                 const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
                 const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
+                const errRest = {
+                    status: false
+                };
                 if (prevDragRow && dragRow) {
                     // 判断是否有拖动
                     if (prevDragRow !== dragRow) {
@@ -8113,7 +8219,7 @@ export default defineComponent({
                         const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
                         return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
                             if (!status) {
-                                return;
+                                return errRest;
                             }
                             let oafIndex = -1;
                             let nafIndex = -1;
@@ -8138,12 +8244,12 @@ export default defineComponent({
                                             if (isPeerDrag && !isCrossDrag) {
                                                 if (oldRest.row[parentField] !== newRest.row[parentField]) {
                                                     // 非同级
-                                                    return;
+                                                    return errRest;
                                                 }
                                             }
                                             else {
                                                 if (!isCrossDrag) {
-                                                    return;
+                                                    return errRest;
                                                 }
                                                 if (oldAllMaps[newRowid]) {
                                                     isSelfToChildStatus = true;
@@ -8154,7 +8260,7 @@ export default defineComponent({
                                                                 content: getI18n('vxe.error.treeDragChild')
                                                             });
                                                         }
-                                                        return;
+                                                        return errRest;
                                                     }
                                                 }
                                             }
@@ -8162,13 +8268,13 @@ export default defineComponent({
                                         else if (oldLevel) {
                                             // 子到根
                                             if (!isCrossDrag) {
-                                                return;
+                                                return errRest;
                                             }
                                         }
                                         else if (newLevel) {
                                             // 根到子
                                             if (!isCrossDrag) {
-                                                return;
+                                                return errRest;
                                             }
                                             if (oldAllMaps[newRowid]) {
                                                 isSelfToChildStatus = true;
@@ -8179,7 +8285,7 @@ export default defineComponent({
                                                             content: getI18n('vxe.error.treeDragChild')
                                                         });
                                                     }
-                                                    return;
+                                                    return errRest;
                                                 }
                                             }
                                         }
@@ -8239,27 +8345,34 @@ export default defineComponent({
                             if (reactData.scrollYLoad) {
                                 $xeTable.updateScrollYSpace();
                             }
-                            nextTick().then(() => {
+                            if (evnt) {
+                                dispatchEvent('row-dragend', {
+                                    oldRow: dragRow,
+                                    newRow: prevDragRow,
+                                    dragRow,
+                                    dragPos: prevDragPos,
+                                    dragToChild: isDragToChildFlag,
+                                    offsetIndex: dragOffsetIndex,
+                                    _index: {
+                                        newIndex: nafIndex,
+                                        oldIndex: oafIndex
+                                    }
+                                }, evnt);
+                            }
+                            return nextTick().then(() => {
                                 $xeTable.updateCellAreas();
                                 $xeTable.recalculate();
+                            }).then(() => {
+                                return {
+                                    status: true
+                                };
                             });
-                            dispatchEvent('row-dragend', {
-                                oldRow: dragRow,
-                                newRow: prevDragRow,
-                                dragRow,
-                                dragPos: prevDragPos,
-                                dragToChild: isDragToChildFlag,
-                                offsetIndex: dragOffsetIndex,
-                                _index: {
-                                    newIndex: nafIndex,
-                                    oldIndex: oafIndex
-                                }
-                            }, evnt);
                         }).catch(() => {
+                            return errRest;
                         });
                     }
                 }
-                return Promise.resolve();
+                return Promise.resolve(errRest);
             },
             handleRowDragDragendEvent(evnt) {
                 const { treeConfig } = props;
@@ -8386,6 +8499,9 @@ export default defineComponent({
                 const { isPeerDrag, isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod, dragToChildMethod } = columnDragOpts;
                 const { collectColumn } = internalData;
                 const dragOffsetIndex = prevDragPos === 'right' ? 1 : 0;
+                const errRest = {
+                    status: false
+                };
                 if (prevDragCol && dragCol) {
                     // 判断是否有拖动
                     if (prevDragCol !== dragCol) {
@@ -8402,7 +8518,7 @@ export default defineComponent({
                         const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
                         return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
                             if (!status) {
-                                return;
+                                return errRest;
                             }
                             let oafIndex = -1;
                             let nafIndex = -1;
@@ -8416,12 +8532,12 @@ export default defineComponent({
                                 if (isPeerDrag && !isCrossDrag) {
                                     if (dragColumn.parentId !== newColumn.parentId) {
                                         // 非同级
-                                        return;
+                                        return errRest;
                                     }
                                 }
                                 else {
                                     if (!isCrossDrag) {
-                                        return;
+                                        return errRest;
                                     }
                                     if (oldAllMaps[newColumn.id]) {
                                         isSelfToChildStatus = true;
@@ -8432,7 +8548,7 @@ export default defineComponent({
                                                     content: getI18n('vxe.error.treeDragChild')
                                                 });
                                             }
-                                            return;
+                                            return errRest;
                                         }
                                     }
                                 }
@@ -8440,13 +8556,13 @@ export default defineComponent({
                             else if (dragColumn.parentId) {
                                 // 子到根
                                 if (!isCrossDrag) {
-                                    return;
+                                    return errRest;
                                 }
                             }
                             else if (newColumn.parentId) {
                                 // 根到子
                                 if (!isCrossDrag) {
-                                    return;
+                                    return errRest;
                                 }
                                 if (oldAllMaps[newColumn.id]) {
                                     isSelfToChildStatus = true;
@@ -8457,7 +8573,7 @@ export default defineComponent({
                                                 content: getI18n('vxe.error.treeDragChild')
                                             });
                                         }
-                                        return;
+                                        return errRest;
                                     }
                                 }
                             }
@@ -8518,26 +8634,32 @@ export default defineComponent({
                                     $xeTable.clearCopyCellArea();
                                 }
                             }
-                            dispatchEvent('column-dragend', {
-                                oldColumn: dragColumn,
-                                newColumn,
-                                dragColumn,
-                                dragPos: prevDragPos,
-                                dragToChild: isDragToChildFlag,
-                                offsetIndex: dragOffsetIndex,
-                                _index: {
-                                    newIndex: nafIndex,
-                                    oldIndex: oafIndex
-                                }
-                            }, evnt);
+                            if (evnt) {
+                                dispatchEvent('column-dragend', {
+                                    oldColumn: dragColumn,
+                                    newColumn,
+                                    dragColumn,
+                                    dragPos: prevDragPos,
+                                    dragToChild: isDragToChildFlag,
+                                    offsetIndex: dragOffsetIndex,
+                                    _index: {
+                                        newIndex: nafIndex,
+                                        oldIndex: oafIndex
+                                    }
+                                }, evnt);
+                            }
                             if (isSyncColumn) {
                                 $xeTable.handleColDragSwapColumn();
                             }
+                            return {
+                                status: true
+                            };
                         }).catch(() => {
+                            return errRest;
                         });
                     }
                 }
-                return Promise.resolve();
+                return Promise.resolve(errRest);
             },
             handleHeaderCellDragDragendEvent(evnt) {
                 const { dragCol } = reactData;

package/es/table/src/util.js

@@ -125,6 +125,13 @@ export const handleFieldOrColumn = ($xeTable, fieldOrColumn) => {
     }
     return null;
 };
+export const handleRowidOrRow = ($xeTable, rowidOrRow) => {
+    if (rowidOrRow) {
+        const rowid = XEUtils.isString(rowidOrRow) || XEUtils.isNumber(rowidOrRow) ? rowidOrRow : getRowid($xeTable, rowidOrRow);
+        return $xeTable.getRowById(rowid);
+    }
+    return null;
+};
 function getPaddingLeftRightSize(elem) {
     if (elem) {
         const computedStyle = getComputedStyle(elem);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.12.0-beta.7";
+export const version = "4.12.0-beta.9";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.12.0-beta.7"}`;
+const version = `table v${"4.12.0-beta.9"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/grid/src/grid.js

@@ -28,7 +28,7 @@ const {
   renderEmptyElement
 } = _ui.VxeUI;
 const tableComponentPropKeys = Object.keys(_props.default);
-const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
+const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
 const gridComponentEmits = [..._emits.default, 'page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'proxy-query', 'proxy-delete', 'proxy-save', 'toolbar-button-click', 'toolbar-tool-click', 'zoom'];
 var _default = exports.default = (0, _vue.defineComponent)({
   name: 'VxeGrid',
@@ -868,6 +868,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const gridMethods = {
       dispatchEvent,
+      getEl() {
+        return refElem.value;
+      },
       /**
        * 提交指令，支持 code 或 button
        * @param {String/Object} code 字符串或对象
@@ -1407,18 +1410,23 @@ var _default = exports.default = (0, _vue.defineComponent)({
           isZMax
         } = reactData;
         const el = refElem.value;
-        const formWrapper = refFormWrapper.value;
-        const toolbarWrapper = refToolbarWrapper.value;
-        const topWrapper = refTopWrapper.value;
-        const bottomWrapper = refBottomWrapper.value;
-        const pagerWrapper = refPagerWrapper.value;
-        const parentPaddingSize = isZMax ? 0 : (0, _dom.getPaddingTopBottomSize)(el.parentNode);
-        return parentPaddingSize + (0, _dom.getPaddingTopBottomSize)(el) + (0, _dom.getOffsetHeight)(formWrapper) + (0, _dom.getOffsetHeight)(toolbarWrapper) + (0, _dom.getOffsetHeight)(topWrapper) + (0, _dom.getOffsetHeight)(bottomWrapper) + (0, _dom.getOffsetHeight)(pagerWrapper);
+        if (el) {
+          const formWrapper = refFormWrapper.value;
+          const toolbarWrapper = refToolbarWrapper.value;
+          const topWrapper = refTopWrapper.value;
+          const bottomWrapper = refBottomWrapper.value;
+          const pagerWrapper = refPagerWrapper.value;
+          const parentEl = el.parentElement;
+          const parentPaddingSize = isZMax ? 0 : parentEl ? (0, _dom.getPaddingTopBottomSize)(parentEl) : 0;
+          return parentPaddingSize + (0, _dom.getPaddingTopBottomSize)(el) + (0, _dom.getOffsetHeight)(formWrapper) + (0, _dom.getOffsetHeight)(toolbarWrapper) + (0, _dom.getOffsetHeight)(topWrapper) + (0, _dom.getOffsetHeight)(bottomWrapper) + (0, _dom.getOffsetHeight)(pagerWrapper);
+        }
+        return 0;
       },
       getParentHeight() {
         const el = refElem.value;
         if (el) {
-          return (reactData.isZMax ? (0, _dom.getDomNode)().visibleHeight : _xeUtils.default.toNumber(getComputedStyle(el.parentNode).height)) - gridPrivateMethods.getExcludeHeight();
+          const parentEl = el.parentElement;
+          return (reactData.isZMax ? (0, _dom.getDomNode)().visibleHeight : parentEl ? _xeUtils.default.toNumber(getComputedStyle(parentEl).height) : 0) - gridPrivateMethods.getExcludeHeight();
         }
         return 0;
       },