vxe-table 3.11.21 → 3.11.22

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

@@ -21,11 +21,15 @@ function updateDropHint(_vm, evnt) {
 }
 const renderSimplePanel = (h, _vm) => {
     const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
+    const props = _vm;
     const $xeTable = _vm.$xeTable;
-    const { _e, customStore, dragColumn } = _vm;
-    const { customColumnList, customOpts, isMaxFixedColumn } = $xeTable;
+    const reactData = $xeTable;
+    const { customStore } = props;
+    const { isCustomStatus, customColumnList } = reactData;
+    const customOpts = $xeTable.computeCustomOpts;
     const { maxHeight } = customStore;
     const { checkMethod, visibleMethod, allowVisible, allowSort, allowFixed, trigger, placement } = customOpts;
+    const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
     const slots = customOpts.slots || {};
     const headerSlot = slots.header;
     const topSlot = slots.top;
@@ -34,19 +38,21 @@ const renderSimplePanel = (h, _vm) => {
     const footerSlot = slots.footer;
     const colVNs = [];
     const customWrapperOns = {};
+    const isAllChecked = customStore.isAll;
+    const isAllIndeterminate = customStore.isIndeterminate;
+    const dragColumn = _vm.dragColumn;
     // hover 触发
     if (trigger === 'hover') {
         customWrapperOns.mouseenter = _vm.handleWrapperMouseenterEvent;
         customWrapperOns.mouseleave = _vm.handleWrapperMouseleaveEvent;
     }
-    const isAllChecked = customStore.isAll;
-    const isAllIndeterminate = customStore.isIndeterminate;
     const params = {
         $table: $xeTable,
         $grid: $xeTable.xegrid,
         columns: customColumnList,
         isAllChecked,
-        isAllIndeterminate
+        isAllIndeterminate,
+        isCustomStatus
     };
     XEUtils.eachTree(customColumnList, (column, index, items, path, parent) => {
         const isVisible = visibleMethod ? visibleMethod({ column }) : true;
@@ -94,7 +100,7 @@ const renderSimplePanel = (h, _vm) => {
                             class: ['vxe-checkbox--icon', isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
                         })
                     ])
-                    : _e(),
+                    : renderEmptyElement($xeTable),
                 allowSort && column.level === 1
                     ? h('div', {
                         class: 'vxe-table-custom--sort-option'
@@ -118,7 +124,7 @@ const renderSimplePanel = (h, _vm) => {
                             })
                         ])
                     ])
-                    : _e(),
+                    : renderEmptyElement($xeTable),
                 column.type === 'html'
                     ? h('div', {
                         key: '1',
@@ -167,7 +173,7 @@ const renderSimplePanel = (h, _vm) => {
                             }
                         })
                     ])
-                    : _e()
+                    : renderEmptyElement($xeTable)
             ]));
         }
     });
@@ -263,7 +269,8 @@ const renderSimplePanel = (h, _vm) => {
                             h(VxeUIButtonComponent, {
                                 props: {
                                     mode: 'text',
-                                    content: customOpts.resetButtonText || getI18n('vxe.table.customRestore')
+                                    content: customOpts.resetButtonText || getI18n('vxe.table.customRestore'),
+                                    disabled: !isCustomStatus
                                 },
                                 on: {
                                     click: _vm.resetCustomEvent
@@ -289,7 +296,7 @@ const renderSimplePanel = (h, _vm) => {
                                     }
                                 }),
                             customOpts.immediate
-                                ? _e()
+                                ? renderEmptyElement($xeTable)
                                 : h(VxeUIButtonComponent, {
                                     props: {
                                         mode: 'text',
@@ -313,15 +320,22 @@ const renderPopupPanel = (h, _vm) => {
     const VxeUINumberInputComponent = VxeUI.getComponent('VxeInput');
     const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
     const $xeTableCustomPanel = _vm;
+    const props = _vm;
     const $xeTable = _vm.$xeTable;
-    const { _e, customStore } = _vm;
-    const { resizable: allResizable, customOpts, customColumnList, columnOpts, isMaxFixedColumn } = $xeTable;
+    const tableProps = $xeTable;
+    const reactData = $xeTable;
+    const { customStore } = props;
+    const { resizable: allResizable } = tableProps;
+    const { isCustomStatus, customColumnList } = reactData;
+    const customOpts = $xeTable.computeCustomOpts;
     const { mode, modalOptions, drawerOptions, allowVisible, allowSort, allowFixed, allowResizable, checkMethod, visibleMethod } = customOpts;
+    const columnOpts = $xeTable.computeColumnOpts;
     const { maxFixedSize } = columnOpts;
     const resizableOpts = $xeTable.computeResizableOpts;
     const { minWidth: reMinWidth, maxWidth: reMaxWidth } = resizableOpts;
     const modalOpts = Object.assign({}, modalOptions);
     const drawerOpts = Object.assign({}, drawerOptions);
+    const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
     const slots = customOpts.slots || {};
     const headerSlot = slots.header;
     const topSlot = slots.top;
@@ -331,12 +345,14 @@ const renderPopupPanel = (h, _vm) => {
     const trVNs = [];
     const isAllChecked = customStore.isAll;
     const isAllIndeterminate = customStore.isIndeterminate;
+    const dragColumn = _vm.dragColumn;
     const params = {
         $table: $xeTable,
         $grid: $xeTable.xegrid,
         columns: customColumnList,
         isAllChecked,
-        isAllIndeterminate
+        isAllIndeterminate,
+        isCustomStatus
     };
     XEUtils.eachTree(customColumnList, (column, index, items, path, parent) => {
         const isVisible = visibleMethod ? visibleMethod({ column }) : true;
@@ -405,7 +421,7 @@ const renderPopupPanel = (h, _vm) => {
                             })
                         ])
                     ])
-                    : _e(),
+                    : renderEmptyElement($xeTable),
                 allowSort
                     ? h('td', {
                         class: 'vxe-table-custom-popup--column-item col--sort'
@@ -431,7 +447,7 @@ const renderPopupPanel = (h, _vm) => {
                             ])
                             : h('span', '-')
                     ])
-                    : _e(),
+                    : renderEmptyElement($xeTable),
                 h('td', {
                     class: 'vxe-table-custom-popup--column-item col--name'
                 }, [
@@ -475,7 +491,7 @@ const renderPopupPanel = (h, _vm) => {
                                 })
                                 : renderEmptyElement($xeTableCustomPanel))
                     ])
-                    : _e(),
+                    : renderEmptyElement($xeTable),
                 allowFixed
                     ? h('td', {
                         class: 'vxe-table-custom-popup--column-item col--fixed'
@@ -501,7 +517,7 @@ const renderPopupPanel = (h, _vm) => {
                                 }
                             })
                     ])
-                    : _e()
+                    : renderEmptyElement($xeTable)
             ]));
         }
     });
@@ -528,12 +544,12 @@ const renderPopupPanel = (h, _vm) => {
                                 ? h('col', {
                                     class: 'vxe-table-custom-popup--table-col-seq'
                                 })
-                                : _e(),
+                                : renderEmptyElement($xeTable),
                             allowSort
                                 ? h('col', {
                                     class: 'vxe-table-custom-popup--table-col-sort'
                                 })
-                                : _e(),
+                                : renderEmptyElement($xeTable),
                             h('col', {
                                 class: 'vxe-table-custom-popup--table-col-title'
                             }),
@@ -541,12 +557,12 @@ const renderPopupPanel = (h, _vm) => {
                                 ? h('col', {
                                     class: 'vxe-table-custom-popup--table-col-width'
                                 })
-                                : _e(),
+                                : renderEmptyElement($xeTable),
                             allowFixed
                                 ? h('col', {
                                     class: 'vxe-table-custom-popup--table-col-fixed'
                                 })
-                                : _e()
+                                : renderEmptyElement($xeTable)
                         ]),
                         h('thead', {}, [
                             h('tr', {}, [
@@ -572,7 +588,7 @@ const renderPopupPanel = (h, _vm) => {
                                             }, getI18n('vxe.toolbar.customAll'))
                                         ])
                                     ])
-                                    : _e(),
+                                    : renderEmptyElement($xeTable),
                                 allowSort
                                     ? h('th', {}, [
                                         h('span', {
@@ -595,14 +611,14 @@ const renderPopupPanel = (h, _vm) => {
                                             })
                                             : renderEmptyElement($xeTableCustomPanel)
                                     ])
-                                    : _e(),
+                                    : renderEmptyElement($xeTable),
                                 h('th', {}, getI18n('vxe.custom.setting.colTitle')),
                                 allowResizable
                                     ? h('th', {}, getI18n('vxe.custom.setting.colResizable'))
-                                    : _e(),
+                                    : renderEmptyElement($xeTable),
                                 allowFixed
                                     ? h('th', {}, getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize]))
-                                    : _e()
+                                    : renderEmptyElement($xeTable)
                             ])
                         ]),
                         h('transition-group', {
@@ -622,7 +638,7 @@ const renderPopupPanel = (h, _vm) => {
                 h('div', {
                     ref: 'dragHintElemRef',
                     class: 'vxe-table-custom-popup--drag-hint'
-                }, getI18n('vxe.custom.cstmDragTarget', [_vm.dragColumn ? _vm.dragColumn.getTitle() : '']))
+                }, getI18n('vxe.custom.cstmDragTarget', [dragColumn ? dragColumn.getTitle() : '']))
             ]);
         },
         footer: () => {
@@ -634,7 +650,8 @@ const renderPopupPanel = (h, _vm) => {
             }, [
                 h(VxeUIButtonComponent, {
                     props: {
-                        content: customOpts.resetButtonText || getI18n('vxe.custom.cstmRestore')
+                        content: customOpts.resetButtonText || getI18n('vxe.custom.cstmRestore'),
+                        disabled: !isCustomStatus
                     },
                     on: {
                         click: _vm.resetCustomEvent

package/es/table/src/body.js

@@ -330,12 +330,12 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         if (editConfig) {
             isNewRow = $xeTable.isInsertByRow(row);
         }
-        if (treeConfig && !scrollYLoad && !treeOpts.transform) {
+        if (treeConfig && !scrollYLoad && !transform) {
             rowChildren = row[childrenField];
             isExpandTree = rowChildren && rowChildren.length && !!treeExpandedMaps[rowid];
         }
         // 拖拽行事件
-        if (rowOpts.drag && !rowLevel) {
+        if (rowOpts.drag && (!treeConfig || transform)) {
             trOn.dragstart = (evnt) => {
                 $xeTable.handleRowDragDragstartEvent(evnt);
             };

package/es/table/src/cell.js

@@ -75,11 +75,16 @@ function renderCellBaseVNs(h, params, content) {
     const { treeConfig, dragConfig } = tableProps;
     const rowOpts = $table.computeRowOpts;
     const rowDragOpts = $table.computeRowDragOpts;
-    const { showIcon, visibleMethod } = rowDragOpts;
+    const { showIcon, isCrossDrag, visibleMethod } = rowDragOpts;
     const rVisibleMethod = visibleMethod || (dragConfig ? dragConfig.rowVisibleMethod : null);
     const vns = XEUtils.isArray(content) ? content : [content];
     if (dragSort && rowOpts.drag && ((showIcon || (dragConfig ? dragConfig.showRowIcon : false)) && (!rVisibleMethod || rVisibleMethod(params)))) {
-        if (!treeConfig || !level) {
+        if (treeConfig) {
+            if (isCrossDrag || !level) {
+                vns.unshift(renderCellDragIcon(h, params));
+            }
+        }
+        else {
             vns.unshift(renderCellDragIcon(h, params));
         }
     }

package/es/table/src/header.js

@@ -42,7 +42,7 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
             thOns.mousedown = (evnt) => $xetable.triggerHeaderCellMousedownEvent(evnt, params);
         }
         // 拖拽行事件
-        if (columnOpts.drag && !column.parentId) {
+        if (columnOpts.drag) {
             thOns.dragstart = $xetable.handleHeaderCellDragDragstartEvent;
             thOns.dragend = $xetable.handleHeaderCellDragDragendEvent;
             thOns.dragover = $xetable.handleHeaderCellDragDragoverEvent;

package/es/table/src/methods.js

@@ -414,7 +414,7 @@ const updateColDropTipContent = ($xeTable, tdEl) => {
     }
     reactData.dragTipText = tipContent;
 };
-function showDropTip($xeTable, evnt, trEl, thEl, dragPos) {
+function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
     const reactData = $xeTable;
     const el = $xeTable.$refs.refElem;
     if (!el) {
@@ -425,27 +425,33 @@ function showDropTip($xeTable, evnt, trEl, thEl, dragPos) {
     if (trEl) {
         const rdLineEl = $xeTable.$refs.refDragRowLineElem;
         if (rdLineEl) {
-            const trRect = trEl.getBoundingClientRect();
-            let top = Math.max(1, trRect.y - wrapperRect.y);
-            if (dragPos === 'bottom') {
-                top = Math.min(wrapperRect.height - 1, trRect.y - wrapperRect.y + trRect.height);
+            if (showLine) {
+                const trRect = trEl.getBoundingClientRect();
+                rdLineEl.style.display = 'block';
+                rdLineEl.style.top = `${Math.max(1, trRect.y - wrapperRect.y)}px`;
+                rdLineEl.style.height = `${trRect.height}px`;
+                rdLineEl.style.width = `${wrapperRect.width - scrollbarWidth}px`;
+                rdLineEl.setAttribute('drag-pos', dragPos);
+            }
+            else {
+                rdLineEl.style.display = '';
             }
-            rdLineEl.style.top = `${top}px`;
-            rdLineEl.style.width = `${wrapperRect.width - scrollbarWidth}px`;
-            rdLineEl.style.display = 'block';
         }
     }
     else if (thEl) {
         const cdLineEl = $xeTable.$refs.refDragColLineElem;
         if (cdLineEl) {
-            const thRect = thEl.getBoundingClientRect();
-            let left = Math.max(1, thRect.x - wrapperRect.x);
-            if (dragPos === 'right') {
-                left = Math.min(wrapperRect.width - 2, thRect.x - wrapperRect.x + thRect.width);
+            if (showLine) {
+                const thRect = thEl.getBoundingClientRect();
+                cdLineEl.style.display = 'block';
+                cdLineEl.style.left = `${Math.max(1, thRect.x - wrapperRect.x)}px`;
+                cdLineEl.style.width = `${thRect.width}px`;
+                cdLineEl.style.height = `${wrapperRect.height - scrollbarHeight}px`;
+                cdLineEl.setAttribute('drag-pos', dragPos);
+            }
+            else {
+                cdLineEl.style.display = '';
             }
-            cdLineEl.style.left = `${left}px`;
-            cdLineEl.style.height = `${wrapperRect.height - scrollbarHeight}px`;
-            cdLineEl.style.display = 'block';
         }
     }
     const rdTipEl = $xeTable.$refs.refDragTipElem;
@@ -453,6 +459,7 @@ function showDropTip($xeTable, evnt, trEl, thEl, dragPos) {
         rdTipEl.style.display = 'block';
         rdTipEl.style.top = `${Math.min(el.clientHeight - el.scrollTop - rdTipEl.clientHeight, evnt.clientY - wrapperRect.y)}px`;
         rdTipEl.style.left = `${Math.min(el.clientWidth - el.scrollLeft - rdTipEl.clientWidth - 16, evnt.clientX - wrapperRect.x)}px`;
+        rdTipEl.setAttribute('drag-status', showLine ? 'normal' : 'disabled');
     }
 }
 const hideDropTip = ($xeTable) => {
@@ -932,6 +939,7 @@ const Methods = {
                 cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, items, parent, level, height: 0 };
             }
             if (isSource) {
+                cacheItem.level = level;
                 cacheItem.index = treeConfig && parent ? -1 : index;
                 fullDataRowIdMaps[rowid] = cacheItem;
             }
@@ -1634,6 +1642,15 @@ const Methods = {
             tableColumn: this.tableColumn.slice(0)
         };
     },
+    /**
+     * 获取表格的全量列
+     */
+    getFullColumns() {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const { collectColumn } = internalData;
+        return collectColumn.slice(0);
+    },
     /**
      * 获取数据，和 data 的行为一致，也可以指定索引获取数据
      */
@@ -2000,6 +2017,28 @@ const Methods = {
             footerData: footerTableData.slice(0)
         };
     },
+    /**
+     * 获取表格的全量数据，如果是 tree-config 则返回带层级的树结构
+     */
+    getFullData() {
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { tableFullData, tableFullTreeData } = internalData;
+        if (treeConfig) {
+            const treeOpts = $xeTable.computeTreeOpts;
+            const { transform, mapChildrenField } = treeOpts;
+            const childrenField = treeOpts.children || treeOpts.childrenField;
+            if (transform) {
+                return XEUtils.toArrayTree(XEUtils.toTreeArray(tableFullTreeData, {
+                    children: mapChildrenField
+                }), { children: childrenField });
+            }
+            return tableFullTreeData.slice(0);
+        }
+        return tableFullData.slice(0);
+    },
     /**
      * 处理数据加载默认行为
      * 默认执行一次，除非被重置
@@ -2197,7 +2236,10 @@ const Methods = {
         return this.refreshColumn(true);
     },
     handleCustomRestore(storeData) {
-        let { collectColumn } = this;
+        const $xetable = this;
+        const reactData = $xetable;
+        const internalData = $xetable;
+        let { collectColumn } = internalData;
         const { resizableData, sortData, visibleData, fixedData } = storeData;
         let hasCustomSort = false;
         // 处理还原
@@ -2224,9 +2266,13 @@ const Methods = {
             // 如果自定义了顺序
             if (hasCustomSort) {
                 collectColumn = XEUtils.orderBy(collectColumn, 'renderSortNumber');
-                this.collectColumn = collectColumn;
-                this.tableFullColumn = getColumnList(collectColumn);
+                internalData.collectColumn = collectColumn;
+                internalData.tableFullColumn = getColumnList(collectColumn);
             }
+            reactData.isCustomStatus = true;
+        }
+        else {
+            reactData.isCustomStatus = false;
         }
     },
     /**
@@ -5012,11 +5058,13 @@ const Methods = {
         const internalData = $xeTable;
         const { treeConfig, dragConfig } = props;
         const rowDragOpts = $xeTable.computeRowDragOpts;
-        const { dragEndMethod } = rowDragOpts;
+        const { fullAllDataRowIdData } = internalData;
+        const { isCrossDrag, isSelfToChildDrag, dragEndMethod } = rowDragOpts;
         const treeOpts = $xeTable.computeTreeOpts;
-        const { transform } = treeOpts;
+        const { transform, mapChildrenField, parentField } = treeOpts;
+        const childrenField = treeOpts.children || treeOpts.childrenField;
         const { dragRow } = reactData;
-        const { afterFullData, afterTreeFullData, tableFullData, tableFullTreeData, prevDragRow, prevDragPos } = internalData;
+        const { afterFullData, tableFullData, prevDragRow, prevDragPos } = internalData;
         const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
         const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
         if (prevDragRow && dragRow) {
@@ -5035,27 +5083,98 @@ const Methods = {
                     }
                     let oafIndex = -1;
                     let nafIndex = -1;
+                    // 如果为树结构
                     if (treeConfig) {
-                        // 移出源位置
-                        oafIndex = $xeTable.findRowIndexOf(afterTreeFullData, dragRow);
-                        const otfIndex = $xeTable.findRowIndexOf(tableFullTreeData, dragRow);
-                        afterTreeFullData.splice(oafIndex, 1);
-                        tableFullTreeData.splice(otfIndex, 1);
-                        // 插新位置
-                        const pafIndex = $xeTable.findRowIndexOf(afterTreeFullData, prevDragRow);
-                        const ptfIndex = $xeTable.findRowIndexOf(tableFullTreeData, prevDragRow);
-                        nafIndex = pafIndex + dragOffsetIndex;
-                        const ntfIndex = ptfIndex + dragOffsetIndex;
-                        afterTreeFullData.splice(nafIndex, 0, dragRow);
-                        tableFullTreeData.splice(ntfIndex, 0, dragRow);
+                        if (transform) {
+                            // 移出源位置
+                            const oldRowid = getRowid($xeTable, dragRow);
+                            const oldRest = fullAllDataRowIdData[oldRowid];
+                            const newRowid = getRowid($xeTable, prevDragRow);
+                            const newRest = fullAllDataRowIdData[newRowid];
+                            if (oldRest && newRest) {
+                                const { level: oldLevel } = oldRest;
+                                const { level: newLevel } = newRest;
+                                const oldAllMaps = {};
+                                XEUtils.eachTree([dragRow], item => {
+                                    oldAllMaps[getRowid($xeTable, item)] = item;
+                                }, { children: mapChildrenField });
+                                let isSelfToChildStatus = false;
+                                if (oldLevel && newLevel) {
+                                    // 子到子
+                                    if (!isCrossDrag) {
+                                        return;
+                                    }
+                                    if (oldAllMaps[newRowid]) {
+                                        if (!isSelfToChildDrag) {
+                                            isSelfToChildStatus = true;
+                                            if (VxeUI.modal) {
+                                                VxeUI.modal.message({
+                                                    status: 'error',
+                                                    content: getI18n('vxe.error.treeDragChild')
+                                                });
+                                            }
+                                            return;
+                                        }
+                                    }
+                                }
+                                else if (oldLevel) {
+                                    // 子到根
+                                    if (!isCrossDrag) {
+                                        return;
+                                    }
+                                }
+                                else if (newLevel) {
+                                    // 根到子
+                                    if (!isCrossDrag) {
+                                        return;
+                                    }
+                                    if (oldAllMaps[newRowid]) {
+                                        isSelfToChildStatus = true;
+                                        if (!isSelfToChildDrag) {
+                                            if (VxeUI.modal) {
+                                                VxeUI.modal.message({
+                                                    status: 'error',
+                                                    content: getI18n('vxe.error.treeDragChild')
+                                                });
+                                            }
+                                            return;
+                                        }
+                                    }
+                                }
+                                else {
+                                    // 根到根
+                                }
+                                const fullList = XEUtils.toTreeArray(internalData.afterTreeFullData, { children: childrenField });
+                                // 移出
+                                const otfIndex = $xeTable.findRowIndexOf(fullList, dragRow);
+                                fullList.splice(otfIndex, 1);
+                                // 插入
+                                const ptfIndex = $xeTable.findRowIndexOf(fullList, prevDragRow);
+                                const ntfIndex = ptfIndex + dragOffsetIndex;
+                                fullList.splice(ntfIndex, 0, dragRow);
+                                // 改变层级
+                                if (isSelfToChildStatus && isSelfToChildDrag) {
+                                    XEUtils.each(dragRow[childrenField], childRow => {
+                                        childRow[parentField] = dragRow[parentField];
+                                    });
+                                }
+                                dragRow[parentField] = prevDragRow[parentField];
+                                internalData.tableFullTreeData = XEUtils.toArrayTree(fullList, {
+                                    key: treeOpts.rowField,
+                                    parentKey: treeOpts.parentField,
+                                    children: childrenField,
+                                    mapChildren: treeOpts.mapChildrenField
+                                });
+                            }
+                        }
                     }
                     else {
-                        // 移出源位置
+                        // 移出
                         oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
                         const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
                         afterFullData.splice(oafIndex, 1);
                         tableFullData.splice(otfIndex, 1);
-                        // 插新位置
+                        // 插入
                         const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
                         const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
                         nafIndex = pafIndex + dragOffsetIndex;
@@ -5064,9 +5183,9 @@ const Methods = {
                         tableFullData.splice(ntfIndex, 0, dragRow);
                     }
                     reactData.isDragRowMove = true;
-                    $xeTable.cacheRowMap();
-                    $xeTable.updateScrollYStatus();
                     $xeTable.handleTableData(treeConfig && transform);
+                    $xeTable.cacheRowMap(true);
+                    $xeTable.updateScrollYStatus();
                     if (!(treeConfig && transform)) {
                         $xeTable.updateAfterDataIndex();
                     }
@@ -5102,25 +5221,34 @@ const Methods = {
     },
     handleRowDragDragoverEvent(evnt) {
         const $xeTable = this;
+        const props = $xeTable;
         const internalData = $xeTable;
         const reactData = $xeTable;
+        const { treeConfig } = props;
+        const { fullAllDataRowIdData } = internalData;
         const { dragRow } = reactData;
+        const rowDragOpts = $xeTable.computeRowDragOpts;
+        const { isCrossDrag } = rowDragOpts;
         if (!dragRow) {
             evnt.preventDefault();
             return;
         }
         const trEl = evnt.currentTarget;
-        const rowid = trEl.getAttribute('rowid');
-        const row = $xeTable.getRowById(rowid);
-        if (row) {
-            evnt.preventDefault();
+        const rowid = trEl.getAttribute('rowid') || '';
+        const rest = fullAllDataRowIdData[rowid];
+        if (rest) {
+            const row = rest.row;
             evnt.preventDefault();
             const { dragRow } = reactData;
             const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
             const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
+            if ($xeTable.eqRow(dragRow, row) || (!isCrossDrag && treeConfig && rest.level)) {
+                showDropTip($xeTable, evnt, trEl, null, false, dragPos);
+                return;
+            }
             internalData.prevDragRow = row;
             internalData.prevDragPos = dragPos;
-            showDropTip($xeTable, evnt, trEl, null, dragPos);
+            showDropTip($xeTable, evnt, trEl, null, true, dragPos);
             $xeTable.dispatchEvent('row-dragover', {
                 oldRow: dragRow,
                 targetRow: row,
@@ -5274,9 +5402,13 @@ const Methods = {
             const { dragCol } = reactData;
             const offsetX = evnt.clientX - thEl.getBoundingClientRect().x;
             const dragPos = offsetX < thEl.clientWidth / 2 ? 'left' : 'right';
+            if (dragCol.id === column.id || column.parentId) {
+                showDropTip($xeTable, evnt, null, thEl, false, dragPos);
+                return;
+            }
             internalData.prevDragCol = column;
             internalData.prevDragPos = dragPos;
-            showDropTip($xeTable, evnt, null, thEl, dragPos);
+            showDropTip($xeTable, evnt, null, thEl, true, dragPos);
             $xeTable.dispatchEvent('column-dragover', {
                 oldColumn: dragCol,
                 targetColumn: column,