vxe-table 3.14.0-beta.2 → 3.14.0-beta.20

package/es/table/src/methods.js

@@ -3,10 +3,11 @@ import { browse, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEv
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import Cell from './cell';
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, getRefElem } from './util';
+import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeUI;
+const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;
 const maxXWidth = 5e6;
@@ -218,7 +219,7 @@ function cacheColumnMap($xeTable) {
         }
         else {
             if ((storage && !type) || (columnOpts.drag && (isCrossDrag || isSelfToChildDrag))) {
-                errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
+                errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`]);
             }
         }
         if (!hasFixed && fixed) {
@@ -750,6 +751,25 @@ function updateStyle($xeTable) {
     }
     return $xeTable.$nextTick();
 }
+function checkValidate($xeTable, type) {
+    if ($xeTable.triggerValidate) {
+        return $xeTable.triggerValidate(type);
+    }
+    return $xeTable.$nextTick();
+}
+/**
+ * 当单元格发生改变时
+ * 如果存在规则，则校验
+ */
+function handleChangeCell($xeTable, evnt, params) {
+    checkValidate($xeTable, 'blur')
+        .catch((e) => e)
+        .then(() => {
+        $xeTable.handleEdit(params, evnt)
+            .then(() => checkValidate($xeTable, 'change'))
+            .catch((e) => e);
+    });
+}
 function handleRadioReserveRow($xeTable, row) {
     const internalData = $xeTable;
     const radioOpts = $xeTable.computeRadioOpts;
@@ -800,6 +820,8 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const { checkField, reserve, checkMethod } = checkboxOpts;
+    const { handleGetRowId } = createHandleGetRowId($xeTable);
+    // indeterminateField 仅支持读取
     const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     const selectRowMaps = {};
     /**
@@ -840,7 +862,8 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
                    */
                 XEUtils.eachTree(afterFullData, (row) => {
                     if (isForce || (!checkMethod || checkMethod({ row }))) {
-                        selectRowMaps[getRowid($xeTable, row)] = row;
+                        const rowid = handleGetRowId(row);
+                        selectRowMaps[rowid] = row;
                     }
                 }, { children: childrenField });
             }
@@ -851,7 +874,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
                    */
                 if (!isForce && checkMethod) {
                     XEUtils.eachTree(afterFullData, (row) => {
-                        const rowid = getRowid($xeTable, row);
+                        const rowid = handleGetRowId(row);
                         if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
                             selectRowMaps[rowid] = row;
                         }
@@ -868,7 +891,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
                    */
                 if (!isForce && checkMethod) {
                     afterFullData.forEach((row) => {
-                        const rowid = getRowid($xeTable, row);
+                        const rowid = handleGetRowId(row);
                         if (selectCheckboxMaps[rowid] || checkMethod({ row })) {
                             selectRowMaps[rowid] = row;
                         }
@@ -876,7 +899,8 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
                 }
                 else {
                     afterFullData.forEach(row => {
-                        selectRowMaps[getRowid($xeTable, row)] = row;
+                        const rowid = handleGetRowId(row);
+                        selectRowMaps[rowid] = row;
                     });
                 }
             }
@@ -888,7 +912,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
                    */
                 if (!isForce && checkMethod) {
                     afterFullData.forEach((row) => {
-                        const rowid = getRowid($xeTable, row);
+                        const rowid = handleGetRowId(row);
                         if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
                             selectRowMaps[rowid] = row;
                         }
@@ -2263,6 +2287,10 @@ const Methods = {
         }
         return [];
     },
+    getEl() {
+        const $xeTable = this;
+        return $xeTable.$refs.refElem;
+    },
     /**
      * 获取父容器元素
      */
@@ -2274,10 +2302,26 @@ const Methods = {
      * 获取父容器的高度
      */
     getParentHeight() {
-        const { $el, $xegrid, height } = this;
-        const parentElem = $el.parentNode;
-        const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
-        return Math.floor($xegrid ? $xegrid.getParentHeight() : XEUtils.toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
+        const $xeTable = this;
+        const $xeGrid = $xeTable.$xeGrid;
+        const props = $xeTable;
+        const { height } = props;
+        const el = $xeTable.$refs.refElem;
+        if (el) {
+            const parentElem = el.parentNode;
+            const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
+            let parentWrapperHeight = 0;
+            if (parentElem) {
+                if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+                    parentWrapperHeight = $xeGrid.getParentHeight();
+                }
+                else {
+                    parentWrapperHeight = parentElem.clientHeight;
+                }
+            }
+            return Math.floor(parentWrapperHeight - parentPaddingSize);
+        }
+        return 0;
     },
     /**
      * 获取需要排除的高度
@@ -2365,6 +2409,9 @@ const Methods = {
         const childrenField = treeOpts.children || treeOpts.childrenField;
         let treeData = [];
         let fullData = datas ? datas.slice(0) : [];
+        if (fullData.length > supportMaxRow) {
+            errLog('vxe.error.errMaxRow', [supportMaxRow]);
+        }
         if (treeConfig) {
             // 树结构自动转换
             if (treeOpts.transform) {
@@ -2459,7 +2506,7 @@ const Methods = {
                 //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
                 // }
                 if (this.spanMethod) {
-                    warnLog('vxe.error.scrollErrProp', ['table.span-method']);
+                    errLog('vxe.error.scrollErrProp', ['table.span-method']);
                 }
             }
             handleReserveStatus($xeTable);
@@ -2612,30 +2659,13 @@ const Methods = {
         const treeOpts = $xeTable.computeTreeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
-        const rowkey = getRowkey($xeTable);
+        const { lazy } = treeOpts;
         const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
         const fullDataRowIdMaps = {};
         const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
-        const handleRow = (row, index, items, path, parentRow, nodes) => {
-            let rowid = getRowid($xeTable, row);
-            const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
-            const level = nodes ? nodes.length - 1 : 0;
-            if (eqEmptyValue(rowid)) {
-                rowid = getRowUniqueId();
-                XEUtils.set(row, rowkey, rowid);
-            }
-            if (treeConfig && treeOpts.lazy) {
-                const treeExpRest = treeExpandedMaps[rowid];
-                if (row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
-                    row[childrenField] = null;
-                }
-                if (treeExpRest) {
-                    if (!row[childrenField] || !row[childrenField].length) {
-                        delete treeTempExpandedMaps[rowid];
-                    }
-                }
-            }
-            let rowRest = fullAllDataRowIdData[rowid];
+        const { handleUpdateRowId } = createHandleUpdateRowId($xeTable);
+        const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
+            let rowRest = fullAllDataRowIdMaps[rowid];
             if (!rowRest) {
                 rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
             }
@@ -2645,35 +2675,49 @@ const Methods = {
             rowRest.items = items;
             rowRest.parent = parentRow;
             rowRest.level = level;
-            rowRest.index = treeConfig && parentRow ? -1 : index;
+            rowRest.index = currIndex;
+            rowRest.treeIndex = index;
             fullDataRowIdMaps[rowid] = rowRest;
             fullAllDataRowIdMaps[rowid] = rowRest;
         };
         if (treeConfig) {
-            XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField });
+            XEUtils.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
+                const rowid = handleUpdateRowId(row);
+                if (treeConfig && lazy) {
+                    const treeExpRest = treeTempExpandedMaps[rowid];
+                    if (row[hasChildField] && row[childrenField] === undefined) {
+                        row[childrenField] = null;
+                    }
+                    if (treeExpRest) {
+                        if (!row[childrenField] || !row[childrenField].length) {
+                            delete treeTempExpandedMaps[rowid];
+                        }
+                    }
+                }
+                handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, toTreePathSeq(path));
+            }, { children: childrenField });
         }
         else {
-            tableFullData.forEach(handleRow);
+            tableFullData.forEach((row, index, items) => {
+                handleRowCache(row, index, items, index, null, handleUpdateRowId(row), 0, index + 1);
+            });
         }
         internalData.fullDataRowIdData = fullDataRowIdMaps;
         internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
         reactData.treeExpandedMaps = treeTempExpandedMaps;
     },
     cacheSourceMap(fullData) {
-        let { treeConfig, treeOpts, sourceDataRowIdData } = this;
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const treeOpts = $xeTable.computeTreeOpts;
         const sourceData = XEUtils.clone(fullData, true);
-        const rowkey = getRowkey(this);
-        sourceDataRowIdData = this.sourceDataRowIdData = {};
+        const { handleUpdateRowId } = createHandleUpdateRowId($xeTable);
+        const sourceRowIdData = {};
         const handleSourceRow = (row) => {
-            let rowid = getRowid(this, row);
-            if (eqEmptyValue(rowid)) {
-                rowid = getRowUniqueId();
-                XEUtils.set(row, rowkey, rowid);
-            }
-            sourceDataRowIdData[rowid] = {
-                row,
-                rowid
-            };
+            const rowid = handleUpdateRowId(row);
+            sourceRowIdData[rowid] = row;
         };
         // 源数据缓存
         if (treeConfig) {
@@ -2683,7 +2727,8 @@ const Methods = {
         else {
             sourceData.forEach(handleSourceRow);
         }
-        this.tableSourceData = sourceData;
+        internalData.sourceDataRowIdData = sourceRowIdData;
+        internalData.tableSourceData = sourceData;
     },
     getParams() {
         return this.params;
@@ -2982,12 +3027,14 @@ const Methods = {
         const reactData = $xeTable;
         const internalData = $xeTable;
         const { keepSource, treeConfig } = props;
-        const { fullAllDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
+        const { editStore } = reactData;
+        const { fullAllDataRowIdData, fullDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
+        const removeTempMaps = Object.assign({}, editStore.removeMaps);
         const treeOpts = $xeTable.computeTreeOpts;
         const { transform } = treeOpts;
         if (!keepSource) {
             if (process.env.NODE_ENV === 'development') {
-                warnLog('vxe.error.reqProp', ['keep-source']);
+                errLog('vxe.error.reqProp', ['keep-source']);
             }
             return $xeTable.$nextTick();
         }
@@ -3002,23 +3049,24 @@ const Methods = {
         }
         let reDelFlag = false;
         if (targetRows.length) {
-            targetRows.forEach((row) => {
-                if (!$xeTable.isInsertByRow(row)) {
-                    const rowid = getRowid($xeTable, row);
-                    const oRow = sourceDataRowIdData[rowid];
-                    if (oRow && row) {
-                        if (field) {
-                            XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true));
-                        }
-                        else {
-                            XEUtils.destructuring(row, XEUtils.clone(oRow, true));
-                        }
-                        if ($xeTable.isRemoveByRow(row)) {
-                            const rowRest = fullAllDataRowIdData[rowid];
-                            if (rowRest) {
-                                const reRow = rowRest.row;
-                                tableFullData.unshift(reRow);
-                                afterFullData.unshift(reRow);
+            targetRows.forEach((item) => {
+                const rowid = getRowid($xeTable, item);
+                const rowRest = fullAllDataRowIdData[rowid];
+                if (rowRest) {
+                    const row = rowRest.row;
+                    if (!$xeTable.isInsertByRow(row)) {
+                        const oRow = sourceDataRowIdData[rowid];
+                        if (oRow && row) {
+                            if (field) {
+                                XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true));
+                            }
+                            else {
+                                XEUtils.destructuring(row, XEUtils.clone(oRow, true));
+                            }
+                            if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                                delete removeTempMaps[rowid];
+                                tableFullData.unshift(row);
+                                afterFullData.unshift(row);
                                 reDelFlag = true;
                             }
                         }
@@ -3028,6 +3076,7 @@ const Methods = {
         }
         if (rows) {
             if (reDelFlag) {
+                editStore.removeMaps = removeTempMaps;
                 $xeTable.updateFooter();
                 $xeTable.cacheRowMap(false);
                 $xeTable.handleTableData(treeConfig && transform);
@@ -3190,20 +3239,25 @@ const Methods = {
     },
     /**
      * 检查行或列数据是否发生改变
-     * @param {Row} row 行对象
+     * @param {Row} rowOrId 行对象
      * @param {String} field 字段名
      */
-    isUpdateByRow(row, field) {
-        const { tableFullColumn, keepSource, sourceDataRowIdData, fullDataRowIdData } = this;
+    isUpdateByRow(rowOrId, field) {
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { keepSource } = props;
+        const { tableFullColumn, fullDataRowIdData, sourceDataRowIdData } = internalData;
         if (keepSource) {
-            const rowid = getRowid(this, row);
+            const rowid = XEUtils.isString(rowOrId) || XEUtils.isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
+            const rowRest = fullDataRowIdData[rowid];
             // 新增的数据不需要检测
-            if (!fullDataRowIdData[rowid]) {
+            if (!rowRest) {
                 return false;
             }
-            const oldRest = sourceDataRowIdData[rowid];
-            if (oldRest) {
-                const oRow = oldRest.row;
+            const row = rowRest.row;
+            const oRow = sourceDataRowIdData[rowid];
+            if (oRow) {
                 if (arguments.length > 1) {
                     return !eqCellValue(oRow, row, field);
                 }
@@ -3265,6 +3319,99 @@ const Methods = {
             tableColumn: this.tableColumn.slice(0)
         };
     },
+    /**
+     * 移动列到指定列的位置
+     * @param fieldOrColumn
+     * @param targetFieldOrColumn
+     * @param options
+     */
+    moveColumnTo(fieldOrColumn, targetFieldOrColumn, options) {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        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 $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { fullAllDataRowIdData, afterFullData } = internalData;
+        const { dragToChild, dragPos, isCrossDrag } = Object.assign({}, options);
+        const treeOpts = $xeTable.computeTreeOpts;
+        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);
+    },
     /**
      * 获取表格的全量列
      */
@@ -3285,22 +3432,30 @@ const Methods = {
      * 用于多选行，获取已选中的数据
      */
     getCheckboxRecords(isFull) {
-        const { tableFullData, afterFullData, treeConfig, treeOpts, checkboxOpts, tableFullTreeData, afterTreeFullData, afterFullRowMaps } = this;
+        const $xeTable = this;
+        const props = $xeTable;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { selectCheckboxMaps } = reactData;
+        const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
+        const checkboxOpts = $xeTable.computeCheckboxOpts;
         const { transform, mapChildrenField } = treeOpts;
         const { checkField } = checkboxOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
-        const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData);
         let rowList = [];
         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, fullDataRowIdData } = this;
             XEUtils.each(selectCheckboxMaps, (row, rowid) => {
                 if (isFull) {
                     if (fullDataRowIdData[rowid]) {
@@ -3885,8 +4040,19 @@ const Methods = {
         }
     },
     getCustomStoreData() {
-        const { id, customOpts, collectColumn } = this;
-        const { checkMethod } = customOpts;
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { id } = props;
+        const customOpts = $xeTable.computeCustomOpts;
+        const { collectColumn } = internalData;
+        const { storage, checkMethod } = customOpts;
+        const isAllCustom = storage === true;
+        const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
+        const isCustomResizable = isAllCustom || storageOpts.resizable;
+        const isCustomVisible = isAllCustom || storageOpts.visible;
+        const isCustomFixed = isAllCustom || storageOpts.fixed;
+        const isCustomSort = isAllCustom || storageOpts.sort;
         const resizableData = {};
         const sortData = {};
         const visibleData = {};
@@ -3903,47 +4069,37 @@ const Methods = {
         }
         let hasResizable = 0;
         let hasSort = 0;
-        let hasFixedt = 0;
+        let hasFixed = 0;
         let hasVisible = 0;
         XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+            const colKey = column.getKey();
+            if (!colKey) {
+                errLog('vxe.error.reqProp', [`${column.getTitle() || column.type || ''} -> column.field=?`]);
+                return;
+            }
             // 只支持一级
             if (!parentColumn) {
-                collectColumn.forEach((column) => {
-                    const colKey = column.getKey();
-                    if (colKey) {
-                        hasSort = 1;
-                        sortData[colKey] = column.renderSortNumber;
-                    }
-                });
-                if (column.fixed !== column.defaultFixed) {
-                    const colKey = column.getKey();
-                    if (colKey) {
-                        hasFixedt = 1;
-                        fixedData[colKey] = column.fixed;
-                    }
+                if (isCustomSort) {
+                    hasSort = 1;
+                    sortData[colKey] = column.renderSortNumber;
                 }
-            }
-            if (column.resizeWidth) {
-                const colKey = column.getKey();
-                if (colKey) {
-                    hasResizable = 1;
-                    resizableData[colKey] = column.renderWidth;
+                if (isCustomFixed && column.fixed !== column.defaultFixed) {
+                    hasFixed = 1;
+                    fixedData[colKey] = column.fixed;
                 }
             }
-            if (!checkMethod || checkMethod({ column })) {
+            if (isCustomResizable && column.resizeWidth) {
+                hasResizable = 1;
+                resizableData[colKey] = column.renderWidth;
+            }
+            if (isCustomVisible && (!checkMethod || checkMethod({ column }))) {
                 if (!column.visible && column.defaultVisible) {
-                    const colKey = column.getKey();
-                    if (colKey) {
-                        hasVisible = 1;
-                        visibleData[colKey] = false;
-                    }
+                    hasVisible = 1;
+                    visibleData[colKey] = false;
                 }
                 else if (column.visible && !column.defaultVisible) {
-                    const colKey = column.getKey();
-                    if (colKey) {
-                        hasVisible = 1;
-                        visibleData[colKey] = true;
-                    }
+                    hasVisible = 1;
+                    visibleData[colKey] = true;
                 }
             }
         });
@@ -3953,7 +4109,7 @@ const Methods = {
         if (hasSort) {
             storeData.sortData = sortData;
         }
-        if (hasFixedt) {
+        if (hasFixed) {
             storeData.fixedData = fixedData;
         }
         if (hasVisible) {
@@ -4626,8 +4782,22 @@ const Methods = {
             }
         }
         // 兼容老版本
-        let rest;
-        if (!evntList.some(func => func(Object.assign({ $grid: this.$xegrid, $table: this, $event: evnt }, args)) === false)) {
+        let rest = null;
+        let isStop = false;
+        for (let i = 0; i < evntList.length; i++) {
+            const func = evntList[i];
+            const fnRest = func(Object.assign({ $grid: this.$xegrid, $table: this, $event: evnt }, args));
+            if (fnRest === false) {
+                isStop = true;
+                break;
+            }
+            else if (fnRest && fnRest.status === false) {
+                rest = fnRest.result;
+                isStop = true;
+                break;
+            }
+        }
+        if (!isStop) {
             if (next) {
                 rest = next();
             }
@@ -4821,7 +4991,8 @@ const Methods = {
         if (this.isActivated) {
             this.preventEvent(evnt, 'event.keydown', null, () => {
                 const { afterFullData } = internalData;
-                const { filterStore, isCtxMenu, ctxMenuStore, editStore, editOpts, editConfig, mouseConfig, mouseOpts, keyboardConfig, keyboardOpts, treeConfig, treeOpts, highlightCurrentRow, currentRow, bodyCtxMenu, rowOpts } = this;
+                const { filterStore, isCtxMenu, ctxMenuStore, editStore, editOpts, editConfig, mouseConfig, mouseOpts, keyboardConfig, keyboardOpts, treeConfig, treeOpts, highlightCurrentRow, highlightCurrentColumn, currentRow, bodyCtxMenu, rowOpts } = this;
+                const columnOpts = $xeTable.computeColumnOpts;
                 const { selected, actived } = editStore;
                 const { keyCode } = evnt;
                 const hasBackspaceKey = keyCode === 8;
@@ -4975,11 +5146,15 @@ const Methods = {
                     if (!isEditStatus) {
                         // 如果按下了方向键
                         if (selected.row && selected.column) {
-                            this.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
+                            $xeTable.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
+                        }
+                        // 当前行按键上下移动
+                        if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
+                            $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
                         }
-                        else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-                            // 当前行按键上下移动
-                            this.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+                        // 当前行按键左右移动
+                        if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
+                            $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt);
                         }
                     }
                 }
@@ -5429,6 +5604,8 @@ const Methods = {
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const checkboxOpts = $xeTable.computeCheckboxOpts;
         const { checkField, checkStrictly, checkMethod } = checkboxOpts;
+        const { handleGetRowId } = createHandleGetRowId($xeTable);
+        // indeterminateField 仅支持读取
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
         if (checkField) {
             // 树结构
@@ -5462,7 +5639,7 @@ const Methods = {
         if (treeConfig && !checkStrictly) {
             // 更新子节点状态
             XEUtils.eachTree(rows, (row) => {
-                const rowid = getRowid($xeTable, row);
+                const rowid = handleGetRowId(row);
                 if (isForce || (!checkMethod || checkMethod({ row }))) {
                     if (checked) {
                         selectRowMaps[rowid] = row;
@@ -5480,7 +5657,7 @@ const Methods = {
         }
         // 列表
         rows.forEach(row => {
-            const rowid = getRowid($xeTable, row);
+            const rowid = handleGetRowId(row);
             if (isForce || (!checkMethod || checkMethod({ row }))) {
                 if (checked) {
                     if (!selectRowMaps[rowid]) {
@@ -5506,7 +5683,10 @@ const Methods = {
         $xeTable.handleBatchSelectRows([row], checked, isForce);
     },
     handleToggleCheckRowEvent(evnt, params) {
-        const { selectCheckboxMaps, checkboxOpts } = this;
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const { selectCheckboxMaps } = reactData;
+        const checkboxOpts = $xeTable.computeCheckboxOpts;
         const { checkField, trigger } = checkboxOpts;
         const { row } = params;
         if (trigger === 'manual') {
@@ -5520,44 +5700,46 @@ const Methods = {
             checked = !selectCheckboxMaps[getRowid(this, row)];
         }
         if (evnt) {
-            this.triggerCheckRowEvent(evnt, params, checked);
+            $xeTable.triggerCheckRowEvent(evnt, params, checked);
         }
         else {
-            this.handleSelectRow(params, checked);
-            this.checkSelectionStatus();
+            $xeTable.handleBatchSelectRows(params, checked);
+            $xeTable.checkSelectionStatus();
         }
     },
     triggerCheckRowEvent(evnt, params, checked) {
         const $xeTable = this;
-        const { checkboxOpts, afterFullData } = this;
-        const { checkMethod, trigger } = checkboxOpts;
+        const internalData = $xeTable;
         const { row } = params;
+        const { afterFullData } = internalData;
+        const checkboxOpts = $xeTable.computeCheckboxOpts;
+        const { checkMethod, trigger } = checkboxOpts;
         if (trigger === 'manual') {
             return;
         }
         evnt.stopPropagation();
         if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
-            const checkboxRecords = this.getCheckboxRecords();
+            const checkboxRecords = $xeTable.getCheckboxRecords();
             if (checkboxRecords.length) {
                 const firstRow = checkboxRecords[0];
-                const _rowIndex = this.getVTRowIndex(row);
-                const _firstRowIndex = this.getVTRowIndex(firstRow);
+                const _rowIndex = $xeTable.getVTRowIndex(row);
+                const _firstRowIndex = $xeTable.getVTRowIndex(firstRow);
                 if (_rowIndex !== _firstRowIndex) {
-                    this.setAllCheckboxRow(false);
+                    $xeTable.setAllCheckboxRow(false);
                     const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1);
                     handleCheckedCheckboxRow($xeTable, rangeRows, true, false);
-                    this.emitEvent('checkbox-range-select', Object.assign({ rangeRecords: rangeRows }, params), evnt);
+                    $xeTable.dispatchEvent('checkbox-range-select', Object.assign({ rangeRecords: rangeRows }, params), evnt);
                     return;
                 }
             }
         }
         if (!checkMethod || checkMethod({ row })) {
-            this.handleSelectRow(params, checked);
-            this.checkSelectionStatus();
-            this.emitEvent('checkbox-change', Object.assign({
-                records: this.getCheckboxRecords(),
-                reserves: this.getCheckboxReserveRecords(),
-                indeterminates: this.getCheckboxIndeterminateRecords(),
+            $xeTable.handleBatchSelectRows(params, checked);
+            $xeTable.checkSelectionStatus();
+            $xeTable.dispatchEvent('checkbox-change', Object.assign({
+                records: () => $xeTable.getCheckboxRecords(),
+                reserves: () => $xeTable.getCheckboxReserveRecords(),
+                indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
                 checked
             }, params), evnt);
         }
@@ -5602,10 +5784,11 @@ const Methods = {
         }
         // 树结构
         if (treeConfig) {
+            const { handleGetRowId } = createHandleGetRowId($xeTable);
             const childRowMaps = {};
             const childRowList = [];
             XEUtils.eachTree(afterTreeFullData, (row) => {
-                const rowid = getRowid($xeTable, row);
+                const rowid = handleGetRowId(row);
                 const childList = row[transform ? mapChildrenField : childrenField];
                 if (childList && childList.length && !childRowMaps[rowid]) {
                     childRowMaps[rowid] = 1;
@@ -5621,7 +5804,7 @@ const Methods = {
                 let vLen = 0; // 有效行
                 childList.forEach(checkMethod
                     ? (item) => {
-                        const childRowid = getRowid($xeTable, item);
+                        const childRowid = handleGetRowId(item);
                         const isSelect = checkField ? XEUtils.get(item, checkField) : selectRowMaps[childRowid];
                         if (checkMethod({ row: item })) {
                             if (isSelect) {
@@ -5642,7 +5825,7 @@ const Methods = {
                         }
                     }
                     : item => {
-                        const childRowid = getRowid($xeTable, item);
+                        const childRowid = handleGetRowId(item);
                         const isSelect = checkField ? XEUtils.get(item, checkField) : selectRowMaps[childRowid];
                         if (isSelect) {
                             sLen++;
@@ -5695,13 +5878,14 @@ const Methods = {
         const checkboxOpts = $xeTable.computeCheckboxOpts;
         const { checkField, checkMethod, showReserveStatus } = checkboxOpts;
         const { afterFullData, afterTreeFullData, checkboxReserveRowMap } = internalData;
+        const { handleGetRowId } = createHandleGetRowId($xeTable);
         let sLen = 0; // 已选
         let hLen = 0; // 半选
         let vLen = 0; // 有效行
         const rootList = (treeConfig ? afterTreeFullData : afterFullData);
         rootList.forEach(checkMethod
             ? row => {
-                const childRowid = getRowid($xeTable, row);
+                const childRowid = handleGetRowId(row);
                 const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid];
                 if (checkMethod({ row })) {
                     if (selected) {
@@ -5722,7 +5906,7 @@ const Methods = {
                 }
             }
             : row => {
-                const childRowid = getRowid($xeTable, row);
+                const childRowid = handleGetRowId(row);
                 const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid];
                 if (selected) {
                     sLen++;
@@ -5837,9 +6021,9 @@ const Methods = {
         handleCheckedAllCheckboxRow($xeTable, value);
         if (evnt) {
             $xeTable.dispatchEvent('checkbox-all', {
-                records: $xeTable.getCheckboxRecords(),
-                reserves: $xeTable.getCheckboxReserveRecords(),
-                indeterminates: $xeTable.getCheckboxIndeterminateRecords(),
+                records: () => $xeTable.getCheckboxRecords(),
+                reserves: () => $xeTable.getCheckboxReserveRecords(),
+                indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
                 checked: value
             }, evnt);
         }
@@ -5874,6 +6058,7 @@ const Methods = {
         const { tableFullData, treeConfig, treeOpts, checkboxOpts } = this;
         const { checkField, reserve } = checkboxOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
+        // indeterminateField 仅支持读取
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
         if (checkField) {
             const handleClearChecked = (item) => {
@@ -6092,10 +6277,12 @@ const Methods = {
     },
     triggerHeaderCellClickEvent(evnt, params) {
         const $xeTable = this;
+        const props = $xeTable;
         const internalData = $xeTable;
         const { _lastResizeTime } = internalData;
         const sortOpts = $xeTable.computeSortOpts;
         const columnOpts = $xeTable.computeColumnOpts;
+        const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
         const { column } = params;
         const cell = evnt.currentTarget;
         const triggerResizable = _lastResizeTime && _lastResizeTime > Date.now() - 300;
@@ -6105,7 +6292,7 @@ const Methods = {
             $xeTable.triggerSortEvent(evnt, column, getNextSortOrder($xeTable, column));
         }
         $xeTable.dispatchEvent('header-cell-click', Object.assign({ triggerResizable, triggerSort, triggerFilter, cell }, params), evnt);
-        if (columnOpts.isCurrent || $xeTable.highlightCurrentColumn) {
+        if ((columnOpts.isCurrent || props.highlightCurrentColumn) && (!currentColumnOpts.trigger || ['header', 'default'].includes(currentColumnOpts.trigger))) {
             $xeTable.triggerCurrentColumnEvent(evnt, params);
         }
         return $xeTable.$nextTick();
@@ -6121,13 +6308,23 @@ const Methods = {
      * @param {ColumnInfo} fieldOrColumn 列配置
      */
     setCurrentColumn(fieldOrColumn) {
-        const column = handleFieldOrColumn(this, fieldOrColumn);
+        const $xeTable = this;
+        const props = $xeTable;
+        const reactData = $xeTable;
+        const { mouseConfig } = props;
+        const mouseOpts = $xeTable.computeMouseOpts;
+        const isMouseSelected = mouseConfig && mouseOpts.selected;
+        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
         if (column) {
-            // this.clearCurrentRow()
-            this.clearCurrentColumn();
-            this.currentColumn = column;
+            $xeTable.clearCurrentColumn();
+            reactData.currentColumn = column;
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick().then(() => {
+            // 更新状选中态
+            if (isMouseSelected) {
+                $xeTable.addCellSelectedClass();
+            }
+        });
     },
     /**
      * 用于当前列，手动清空当前高亮的状态
@@ -6136,25 +6333,6 @@ const Methods = {
         this.currentColumn = null;
         return this.$nextTick();
     },
-    checkValidate(type) {
-        if (this.triggerValidate) {
-            return this.triggerValidate(type);
-        }
-        return this.$nextTick();
-    },
-    /**
-     * 当单元格发生改变时
-     * 如果存在规则，则校验
-     */
-    handleChangeCell(evnt, params) {
-        this.checkValidate('blur')
-            .catch((e) => e)
-            .then(() => {
-            this.handleEdit(params, evnt)
-                .then(() => this.checkValidate('change'))
-                .catch((e) => e);
-        });
-    },
     /**
      * 列点击事件
      * 如果是单击模式，则激活为编辑状态
@@ -6164,7 +6342,7 @@ const Methods = {
         const $xeTable = this;
         const props = $xeTable;
         const reactData = $xeTable;
-        const { highlightCurrentRow, editConfig } = props;
+        const { highlightCurrentRow, highlightCurrentColumn, editConfig } = props;
         const { editStore, isDragResize } = reactData;
         if (isDragResize) {
             return;
@@ -6176,6 +6354,8 @@ const Methods = {
         const checkboxOpts = $xeTable.computeCheckboxOpts;
         const keyboardOpts = $xeTable.computeKeyboardOpts;
         const rowOpts = $xeTable.computeRowOpts;
+        const columnOpts = $xeTable.computeColumnOpts;
+        const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
         const { actived, focused } = editStore;
         const { row, column } = params;
         const { type, treeNode } = column;
@@ -6191,11 +6371,11 @@ const Methods = {
         if (!triggerCheckbox && !triggerRadio) {
             // 如果是展开行
             if (!triggerExpandNode && (expandOpts.trigger === 'row' || (isExpandType && expandOpts.trigger === 'cell'))) {
-                this.triggerRowExpandEvent(evnt, params);
+                $xeTable.triggerRowExpandEvent(evnt, params);
             }
             // 如果是树形表格
             if ((treeOpts.trigger === 'row' || (treeNode && treeOpts.trigger === 'cell'))) {
-                this.triggerTreeExpandEvent(evnt, params);
+                $xeTable.triggerTreeExpandEvent(evnt, params);
             }
         }
         // 如果点击了树节点
@@ -6204,16 +6384,22 @@ const Methods = {
                 // 如果是高亮行
                 if (rowOpts.isCurrent || highlightCurrentRow) {
                     if (!triggerCheckbox && !triggerRadio) {
-                        this.triggerCurrentRowEvent(evnt, params);
+                        $xeTable.triggerCurrentRowEvent(evnt, params);
+                    }
+                }
+                // 如果是当前列
+                if ((columnOpts.isCurrent || highlightCurrentColumn) && (!currentColumnOpts.trigger || ['cell', 'default'].includes(currentColumnOpts.trigger))) {
+                    if (!triggerCheckbox && !triggerRadio) {
+                        $xeTable.triggerCurrentColumnEvent(evnt, params);
                     }
                 }
                 // 如果是单选框
                 if (!triggerRadio && (radioOpts.trigger === 'row' || (isRadioType && radioOpts.trigger === 'cell'))) {
-                    this.triggerRadioRowEvent(evnt, params);
+                    $xeTable.triggerRadioRowEvent(evnt, params);
                 }
                 // 如果是复选框
                 if (!triggerCheckbox && (checkboxOpts.trigger === 'row' || (isCheckboxType && checkboxOpts.trigger === 'cell'))) {
-                    this.handleToggleCheckRowEvent(evnt, params);
+                    $xeTable.handleToggleCheckRowEvent(evnt, params);
                 }
             }
             // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
@@ -6225,16 +6411,16 @@ const Methods = {
                 }
                 if (editOpts.trigger === 'manual') {
                     if (actived.args && actived.row === row && column !== actived.column) {
-                        this.handleChangeCell(evnt, params);
+                        handleChangeCell($xeTable, evnt, params);
                     }
                 }
                 else if (!actived.args || row !== actived.row || column !== actived.column) {
                     if (editOpts.trigger === 'click') {
-                        this.handleChangeCell(evnt, params);
+                        handleChangeCell($xeTable, evnt, params);
                     }
                     else if (editOpts.trigger === 'dblclick') {
                         if (editOpts.mode === 'row' && actived.row === row) {
-                            this.handleChangeCell(evnt, params);
+                            handleChangeCell($xeTable, evnt, params);
                         }
                     }
                 }
@@ -6255,7 +6441,7 @@ const Methods = {
                 }
             }
         }
-        this.emitEvent('cell-click', params, evnt);
+        $xeTable.dispatchEvent('cell-click', params, evnt);
     },
     /**
      * 列双击点击事件
@@ -6277,17 +6463,17 @@ const Methods = {
         if (isEnableConf(editConfig) && editOpts.trigger === 'dblclick') {
             if (!actived.args || evnt.currentTarget !== actived.args.cell) {
                 if (editOpts.mode === 'row') {
-                    this.checkValidate('blur')
+                    checkValidate($xeTable, 'blur')
                         .catch((e) => e)
                         .then(() => {
                         this.handleEdit(params, evnt)
-                            .then(() => this.checkValidate('change'))
+                            .then(() => checkValidate($xeTable, 'change'))
                             .catch((e) => e);
                     });
                 }
                 else if (editOpts.mode === 'cell') {
                     this.handleEdit(params, evnt)
-                        .then(() => this.checkValidate('change'))
+                        .then(() => checkValidate($xeTable, 'change'))
                         .catch((e) => e);
                 }
             }
@@ -6481,6 +6667,9 @@ const Methods = {
         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) {
@@ -6495,7 +6684,7 @@ const Methods = {
                 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;
@@ -6520,12 +6709,12 @@ const Methods = {
                                     if (isPeerDrag && !isCrossDrag) {
                                         if (oldRest.row[parentField] !== newRest.row[parentField]) {
                                             // 非同级
-                                            return;
+                                            return errRest;
                                         }
                                     }
                                     else {
                                         if (!isCrossDrag) {
-                                            return;
+                                            return errRest;
                                         }
                                         if (oldAllMaps[newRowid]) {
                                             isSelfToChildStatus = true;
@@ -6536,7 +6725,7 @@ const Methods = {
                                                         content: getI18n('vxe.error.treeDragChild')
                                                     });
                                                 }
-                                                return;
+                                                return errRest;
                                             }
                                         }
                                     }
@@ -6544,13 +6733,13 @@ const Methods = {
                                 else if (oldLevel) {
                                     // 子到根
                                     if (!isCrossDrag) {
-                                        return;
+                                        return errRest;
                                     }
                                 }
                                 else if (newLevel) {
                                     // 根到子
                                     if (!isCrossDrag) {
-                                        return;
+                                        return errRest;
                                     }
                                     if (oldAllMaps[newRowid]) {
                                         isSelfToChildStatus = true;
@@ -6561,7 +6750,7 @@ const Methods = {
                                                     content: getI18n('vxe.error.treeDragChild')
                                                 });
                                             }
-                                            return;
+                                            return errRest;
                                         }
                                     }
                                 }
@@ -6621,27 +6810,34 @@ const Methods = {
                     if (reactData.scrollYLoad) {
                         $xeTable.updateScrollYSpace();
                     }
-                    $xeTable.$nextTick().then(() => {
+                    if (evnt) {
+                        $xeTable.dispatchEvent('row-dragend', {
+                            oldRow: dragRow,
+                            newRow: prevDragRow,
+                            dragRow,
+                            dragPos: prevDragPos,
+                            dragToChild: isDragToChildFlag,
+                            offsetIndex: dragOffsetIndex,
+                            _index: {
+                                newIndex: nafIndex,
+                                oldIndex: oafIndex
+                            }
+                        }, evnt);
+                    }
+                    return $xeTable.$nextTick().then(() => {
                         $xeTable.updateCellAreas();
                         $xeTable.recalculate();
+                    }).then(() => {
+                        return {
+                            status: true
+                        };
                     });
-                    $xeTable.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 $xeTable = this;
@@ -6786,6 +6982,9 @@ const Methods = {
         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) {
@@ -6802,7 +7001,7 @@ const Methods = {
                 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;
@@ -6816,12 +7015,12 @@ const Methods = {
                         if (isPeerDrag && !isCrossDrag) {
                             if (dragColumn.parentId !== newColumn.parentId) {
                                 // 非同级
-                                return;
+                                return errRest;
                             }
                         }
                         else {
                             if (!isCrossDrag) {
-                                return;
+                                return errRest;
                             }
                             if (oldAllMaps[newColumn.id]) {
                                 isSelfToChildStatus = true;
@@ -6832,7 +7031,7 @@ const Methods = {
                                             content: getI18n('vxe.error.treeDragChild')
                                         });
                                     }
-                                    return;
+                                    return errRest;
                                 }
                             }
                         }
@@ -6840,13 +7039,13 @@ const Methods = {
                     else if (dragColumn.parentId) {
                         // 子到根
                         if (!isCrossDrag) {
-                            return;
+                            return errRest;
                         }
                     }
                     else if (newColumn.parentId) {
                         // 根到子
                         if (!isCrossDrag) {
-                            return;
+                            return errRest;
                         }
                         if (oldAllMaps[newColumn.id]) {
                             isSelfToChildStatus = true;
@@ -6857,7 +7056,7 @@ const Methods = {
                                         content: getI18n('vxe.error.treeDragChild')
                                     });
                                 }
-                                return;
+                                return errRest;
                             }
                         }
                     }
@@ -6918,26 +7117,32 @@ const Methods = {
                             $xeTable.clearCopyCellArea();
                         }
                     }
-                    $xeTable.dispatchEvent('column-dragend', {
-                        oldColumn: dragColumn,
-                        newColumn,
-                        dragColumn,
-                        dragPos: prevDragPos,
-                        dragToChild: isDragToChildFlag,
-                        offsetIndex: dragOffsetIndex,
-                        _index: {
-                            newIndex: nafIndex,
-                            oldIndex: oafIndex
-                        }
-                    }, evnt);
+                    if (evnt) {
+                        $xeTable.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 $xeTable = this;
@@ -7285,7 +7490,9 @@ const Methods = {
      * @param {Event} evnt 事件
      */
     closeFilter() {
-        const { filterStore } = this;
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const { filterStore } = reactData;
         const { column, visible } = filterStore;
         Object.assign(filterStore, {
             isAllSelected: false,
@@ -7294,9 +7501,15 @@ const Methods = {
             visible: false
         });
         if (visible) {
-            this.emitEvent('filter-visible', { column, field: column.field, property: column.field, filterList: this.getCheckedFilters(), visible: false }, null);
+            $xeTable.dispatchEvent('filter-visible', {
+                column,
+                field: column.field,
+                property: column.field,
+                filterList: () => $xeTable.getCheckedFilters(),
+                visible: false
+            }, null);
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     /**
      * 判断指定列是否为筛选状态，如果为空则判断所有列
@@ -8282,10 +8495,10 @@ const Methods = {
             return;
         }
         const { highlightHoverRow } = tableProps;
-        const { scrollXLoad, scrollYLoad } = reactData;
+        const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
         const leftFixedWidth = $xeTable.computeLeftFixedWidth;
         const rightFixedWidth = $xeTable.computeRightFixedWidth;
-        if (!(scrollYLoad || leftFixedWidth || rightFixedWidth)) {
+        if (!(scrollYLoad || leftFixedWidth || rightFixedWidth || expandColumn)) {
             return;
         }
         const { elemStore, lastScrollTop, lastScrollLeft } = internalData;