vxe-table 4.16.0-beta.8 → 4.16.1

package/es/table/src/table.js

@@ -8,6 +8,7 @@ import { createInternalData, getRowUniqueId, clearTableAllStatus, getColumnList,
 import { getSlotVNs } from '../../ui/src/vn';
 import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from './anime';
 import { warnLog, errLog } from '../../ui/src/log';
+import { getCrossTableDragRowInfo } from './store';
 import Cell from './cell';
 import TableBodyComponent from './body';
 import TableHeaderComponent from './header';
@@ -32,6 +33,7 @@ const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;
 const maxXWidth = 5e6;
+let crossTableDragRowObj = null;
 export default defineVxeComponent({
     name: 'VxeTable',
     props: tableProps,
@@ -48,6 +50,7 @@ export default defineVxeComponent({
         const $xeGantt = inject('$xeGantt', null);
         const $xeGGWrapper = $xeGrid || $xeGantt;
         const { computeSize } = useFns.useSize(props);
+        const crossTableDragRowInfo = getCrossTableDragRowInfo();
         const reactData = reactive({
             // 低性能的静态列
             staticColumns: [],
@@ -279,9 +282,9 @@ export default defineVxeComponent({
             resizeHeightFlag: 1,
             resizeWidthFlag: 1,
             isCustomStatus: false,
-            isDragRowMove: false,
+            isCrossDragRow: false,
             dragRow: null,
-            isDragColMove: false,
+            isCrossDragCol: false,
             dragCol: null,
             dragTipText: '',
             isDragResize: false,
@@ -2190,22 +2193,28 @@ export default defineVxeComponent({
                 emptyPlaceholderElem.style.top = `${tHeaderHeight}px`;
                 emptyPlaceholderElem.style.height = bodyWrapperElem ? `${bodyWrapperElem.offsetHeight - osbHeight}px` : '';
             }
+            const scrollbarXConf = scrollbarOpts.x || {};
             const scrollbarXToTop = computeScrollbarXToTop.value;
+            const scrollbarYConf = scrollbarOpts.y || {};
             const scrollbarYToLeft = computeScrollbarYToLeft.value;
             let xScrollbarVisible = overflowX ? 'visible' : 'hidden';
-            if ($xeGanttView) {
+            if (scrollbarXConf.visible === 'visible' || $xeGanttView) {
                 osbHeight = scrollbarHeight;
                 xScrollbarVisible = 'visible';
             }
-            else if (scrollbarOpts.x && scrollbarOpts.x.visible === false) {
+            else if (scrollbarXConf.visible === 'hidden' || scrollbarXConf.visible === false) {
                 osbHeight = 0;
                 xScrollbarVisible = 'hidden';
             }
             let yScrollbarVisible = overflowY ? 'visible' : 'hidden';
-            if ((scrollbarOpts.y && scrollbarOpts.y.visible === false) || ($xeGanttView && !scrollbarYToLeft)) {
+            if ((scrollbarYConf.visible === 'hidden' || scrollbarYConf.visible === false) || ($xeGanttView && !scrollbarYToLeft)) {
                 osbWidth = 0;
                 yScrollbarVisible = 'hidden';
             }
+            else if (scrollbarYConf.visible === 'visible') {
+                osbWidth = scrollbarWidth;
+                yScrollbarVisible = 'visible';
+            }
             let tbHeight = 0;
             let bodyMaxHeight = 0;
             const bodyMinHeight = customMinHeight - tHeaderHeight - tFooterHeight - osbHeight;
@@ -4903,7 +4912,9 @@ export default defineVxeComponent({
                         }
                     }
                 }
-                return $xeTable.handleRowDragSwapEvent(null, true, dragRow, prevDragRow, dragPos || defPos, dragToChild === true);
+                const rest = $xeTable.handleRowDragSwapEvent(null, true, dragRow, prevDragRow, dragPos || defPos, dragToChild === true);
+                clearRowDragData();
+                return rest;
             },
             /**
              * 获取表格的全量列
@@ -7627,12 +7638,17 @@ export default defineVxeComponent({
                 }
             }
         };
+        const clearCrossTableDragStatus = () => {
+            crossTableDragRowObj = null;
+            crossTableDragRowInfo.row = null;
+        };
         const clearDragStatus = () => {
             const { dragRow, dragCol } = reactData;
             if (dragRow || dragCol) {
                 clearColDropOrigin();
                 clearRowDropOrigin();
                 hideDropTip();
+                clearCrossTableDragStatus();
                 reactData.dragRow = null;
                 reactData.dragCol = null;
             }
@@ -7821,6 +7837,24 @@ export default defineVxeComponent({
                 cdLineEl.style.display = '';
             }
         };
+        const clearRowDragData = () => {
+            let wrapperEl = refElem.value;
+            const dtClss = ['.vxe-body--row'];
+            if ($xeGantt) {
+                const { refGanttContainerElem } = $xeGantt.getRefMaps();
+                const ganttContainerElem = refGanttContainerElem.value;
+                if (ganttContainerElem) {
+                    wrapperEl = ganttContainerElem;
+                }
+                dtClss.push('.vxe-gantt-view--body-row', '.vxe-gantt-view--chart-row');
+            }
+            hideDropTip();
+            clearRowDropOrigin();
+            clearRowAnimate(wrapperEl, dtClss);
+            internalData.prevDragToChild = false;
+            reactData.dragRow = null;
+            reactData.dragCol = null;
+        };
         /**
          * 处理显示 tooltip
          * @param {Event} evnt 事件
@@ -9860,6 +9894,221 @@ export default defineVxeComponent({
                 }
                 return Promise.resolve(errRest);
             },
+            /**
+             * 处理跨表拖拽完成
+             */
+            handleCrossTableRowDragFinishEvent(evnt) {
+                const { tableData } = reactData;
+                const { fullAllDataRowIdData } = internalData;
+                const rowOpts = computeRowOpts.value;
+                const cellOpts = computeCellOpts.value;
+                const defaultRowHeight = computeDefaultRowHeight.value;
+                const rowDragOpts = computeRowDragOpts.value;
+                const { animation, isCrossTableDrag } = rowDragOpts;
+                const treeOpts = computeTreeOpts.value;
+                const { mapChildrenField } = treeOpts;
+                const el = refElem.value;
+                if (isCrossTableDrag && crossTableDragRowObj && crossTableDragRowInfo) {
+                    const { row: dragRow } = crossTableDragRowInfo;
+                    if (dragRow) {
+                        const dragRowid = getRowid($xeTable, dragRow);
+                        const dragRowRest = fullAllDataRowIdData[dragRowid];
+                        let dragRowHeight = 0;
+                        let rsIndex = -1;
+                        if (dragRowRest) {
+                            if (animation) {
+                                dragRowHeight = getCellRestHeight(dragRowRest, cellOpts, rowOpts, defaultRowHeight);
+                            }
+                            rsIndex = dragRowRest.$index;
+                        }
+                        const dragRangeList = rsIndex > -1 && rsIndex < tableData.length - 1 ? tableData.slice(rsIndex + 1) : [];
+                        const dragList = XEUtils.toTreeArray([dragRow], {
+                            updated: true,
+                            children: mapChildrenField
+                        });
+                        $xeTable.remove(dragList).then(() => {
+                            if (animation && dragRowHeight && dragRangeList.length) {
+                                const $xeGanttView = internalData.xeGanttView;
+                                let wrapperEl = el;
+                                if ($xeGantt && $xeGanttView) {
+                                    const { refGanttContainerElem } = $xeGantt.getRefMaps();
+                                    const ganttContainerElem = refGanttContainerElem.value;
+                                    if (ganttContainerElem) {
+                                        wrapperEl = ganttContainerElem;
+                                    }
+                                }
+                                const dtClss = [];
+                                dragRangeList.forEach(row => {
+                                    const rowid = getRowid($xeTable, row);
+                                    dtClss.push(`.vxe-body--row[rowid="${rowid}"]`);
+                                    if ($xeGantt) {
+                                        dtClss.push(`.vxe-gantt-view--body-row[rowid="${rowid}"]`, `.vxe-gantt-view--chart-row[rowid="${rowid}"]`);
+                                    }
+                                });
+                                const dtTrList = wrapperEl.querySelectorAll(dtClss.join(','));
+                                moveRowAnimateToTb(dtTrList, dragRowHeight);
+                            }
+                        });
+                        dispatchEvent('row-remove-dragend', {
+                            row: dragRow
+                        }, evnt);
+                        clearRowDragData();
+                        clearCrossTableDragStatus();
+                    }
+                }
+            },
+            /**
+             * 处理跨表拖至新的空表
+             */
+            handleCrossTableRowDragoverEmptyEvent(evnt) {
+                const { tableData } = reactData;
+                const rowDragOpts = computeRowDragOpts.value;
+                const { isCrossTableDrag } = rowDragOpts;
+                if (isCrossTableDrag && crossTableDragRowObj && !tableData.length) {
+                    const { $oldTable } = crossTableDragRowObj;
+                    if ($oldTable && $oldTable.xID !== $xeTable.xID) {
+                        evnt.preventDefault();
+                        crossTableDragRowObj.$newTable = $xeTable;
+                        internalData.prevDragRow = null;
+                    }
+                }
+            },
+            /**
+             * 处理跨表拖插入
+             */
+            handleCrossTableRowDragInsertEvent(evnt) {
+                const { treeConfig } = props;
+                const { prevDragRow, prevDragPos, prevDragToChild } = internalData;
+                const rowDragOpts = computeRowDragOpts.value;
+                const { animation, isSelfToChildDrag, isCrossTableDrag, dragEndMethod, dragToChildMethod } = rowDragOpts;
+                const rowOpts = computeRowOpts.value;
+                const cellOpts = computeCellOpts.value;
+                const defaultRowHeight = computeDefaultRowHeight.value;
+                const treeOpts = computeTreeOpts.value;
+                const { parentField, mapChildrenField } = treeOpts;
+                const childrenField = treeOpts.children || treeOpts.childrenField;
+                // 跨表拖拽
+                if (isCrossTableDrag && crossTableDragRowObj && crossTableDragRowInfo) {
+                    const { row: oldRow } = crossTableDragRowInfo;
+                    const { $oldTable } = crossTableDragRowObj;
+                    const el = refElem.value;
+                    if ($oldTable && oldRow) {
+                        const dragRow = oldRow;
+                        let dragOffsetIndex = -1;
+                        if (prevDragRow) {
+                            dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
+                        }
+                        const dragParams = {
+                            oldRow: dragRow,
+                            newRow: prevDragRow,
+                            dragRow,
+                            dragPos: prevDragPos,
+                            dragToChild: !!prevDragToChild,
+                            offsetIndex: dragOffsetIndex
+                        };
+                        const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
+                        const errRest = {
+                            status: false
+                        };
+                        Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
+                            if (!status) {
+                                return errRest;
+                            }
+                            let insertRest = Promise.resolve();
+                            if (treeConfig) {
+                                const dragList = XEUtils.toTreeArray([dragRow], {
+                                    updated: true,
+                                    children: mapChildrenField
+                                });
+                                $oldTable.handleCrossTableRowDragFinishEvent(evnt);
+                                if (prevDragRow) {
+                                    dragRow[parentField] = prevDragRow[parentField];
+                                }
+                                else {
+                                    dragRow[parentField] = null;
+                                }
+                                dragList.forEach(row => {
+                                    row[childrenField] = undefined;
+                                    row[mapChildrenField] = undefined;
+                                });
+                                if (prevDragRow) {
+                                    if (prevDragPos === 'bottom') {
+                                        insertRest = $xeTable.insertNextAt(dragList, prevDragRow);
+                                    }
+                                    else {
+                                        insertRest = $xeTable.insertAt(dragList, prevDragRow);
+                                    }
+                                }
+                                else {
+                                    insertRest = $xeTable.insert(dragList);
+                                }
+                            }
+                            else {
+                                $oldTable.handleCrossTableRowDragFinishEvent(evnt);
+                                if (prevDragRow) {
+                                    if (prevDragPos === 'bottom') {
+                                        insertRest = $xeTable.insertNextAt(dragRow, prevDragRow);
+                                    }
+                                    else {
+                                        insertRest = $xeTable.insertAt(dragRow, prevDragRow);
+                                    }
+                                }
+                                else {
+                                    insertRest = $xeTable.insert(dragRow);
+                                }
+                            }
+                            dispatchEvent('row-insert-dragend', {
+                                oldRow,
+                                newRow: prevDragRow,
+                                dragRow,
+                                dragPos: prevDragPos,
+                                dragToChild: isDragToChildFlag,
+                                offsetIndex: dragOffsetIndex
+                            }, evnt);
+                            clearRowDragData();
+                            insertRest.then(() => {
+                                const { tableData } = reactData;
+                                const { fullAllDataRowIdData } = internalData;
+                                const oldRowid = getRowid($xeTable, dragRow);
+                                const oldRowRest = fullAllDataRowIdData[oldRowid];
+                                let dragRowHeight = 0;
+                                let rsIndex = -1;
+                                if (oldRowRest) {
+                                    if (animation) {
+                                        dragRowHeight = getCellRestHeight(oldRowRest, cellOpts, rowOpts, defaultRowHeight);
+                                    }
+                                    rsIndex = oldRowRest.$index;
+                                }
+                                const dragRangeList = rsIndex > -1 ? tableData.slice(rsIndex) : [];
+                                if (animation && dragRowHeight && dragRangeList.length) {
+                                    const $xeGanttView = internalData.xeGanttView;
+                                    let wrapperEl = el;
+                                    if ($xeGantt && $xeGanttView) {
+                                        const { refGanttContainerElem } = $xeGantt.getRefMaps();
+                                        const ganttContainerElem = refGanttContainerElem.value;
+                                        if (ganttContainerElem) {
+                                            wrapperEl = ganttContainerElem;
+                                        }
+                                    }
+                                    const dtClss = [];
+                                    dragRangeList.forEach(row => {
+                                        const rowid = getRowid($xeTable, row);
+                                        dtClss.push(`.vxe-body--row[rowid="${rowid}"]`);
+                                        if ($xeGantt) {
+                                            dtClss.push(`.vxe-gantt-view--body-row[rowid="${rowid}"]`, `.vxe-gantt-view--chart-row[rowid="${rowid}"]`);
+                                        }
+                                    });
+                                    const dtTrList = wrapperEl.querySelectorAll(dtClss.join(','));
+                                    moveRowAnimateToTb(dtTrList, -dragRowHeight);
+                                }
+                            });
+                        });
+                    }
+                }
+            },
+            hideCrossTableRowDropClearStatus() {
+                hideDropTip();
+            },
             handleRowDragDragendEvent(evnt) {
                 const { treeConfig } = props;
                 const { fullAllDataRowIdData, prevDragToChild } = internalData;
@@ -9868,7 +10117,16 @@ export default defineVxeComponent({
                 const { lazy } = treeOpts;
                 const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
                 const { prevDragRow, prevDragPos } = internalData;
-                let wrapperEl = refElem.value;
+                const rowDragOpts = computeRowDragOpts.value;
+                const { isCrossTableDrag } = rowDragOpts;
+                // 跨表拖拽
+                if (isCrossTableDrag && crossTableDragRowObj) {
+                    const { $newTable } = crossTableDragRowObj;
+                    if ($newTable && $newTable.xID !== $xeTable.xID) {
+                        $newTable.handleCrossTableRowDragInsertEvent(evnt);
+                        return;
+                    }
+                }
                 if (treeConfig && lazy && prevDragToChild) {
                     // 懒加载
                     const newRowid = getRowid($xeTable, prevDragRow);
@@ -9885,21 +10143,8 @@ export default defineVxeComponent({
                 else {
                     $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
                 }
-                const dtClss = ['.vxe-body--row'];
-                if ($xeGantt) {
-                    const { refGanttContainerElem } = $xeGantt.getRefMaps();
-                    const ganttContainerElem = refGanttContainerElem.value;
-                    if (ganttContainerElem) {
-                        wrapperEl = ganttContainerElem;
-                    }
-                    dtClss.push('.vxe-gantt-view--body-row', '.vxe-gantt-view--chart-row');
-                }
-                hideDropTip();
-                clearRowDropOrigin();
-                clearRowAnimate(wrapperEl, dtClss);
-                internalData.prevDragToChild = false;
-                reactData.dragRow = null;
-                reactData.dragCol = null;
+                clearRowDragData();
+                clearCrossTableDragStatus();
             },
             handleRowDragDragoverEvent(evnt) {
                 const { treeConfig } = props;
@@ -9909,8 +10154,8 @@ export default defineVxeComponent({
                 const { lazy, transform, parentField } = treeOpts;
                 const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
                 const rowDragOpts = computeRowDragOpts.value;
-                const { isPeerDrag, isCrossDrag, isToChildDrag } = rowDragOpts;
-                if (!dragRow) {
+                const { isPeerDrag, isCrossDrag, isToChildDrag, isCrossTableDrag } = rowDragOpts;
+                if (!dragRow && !(isCrossTableDrag && (!treeConfig || isCrossDrag) && crossTableDragRowObj)) {
                     evnt.preventDefault();
                     return;
                 }
@@ -9919,16 +10164,38 @@ export default defineVxeComponent({
                 const rowid = trEl.getAttribute('rowid') || '';
                 const rest = fullAllDataRowIdData[rowid];
                 if (rest) {
+                    evnt.preventDefault();
                     const row = rest.row;
                     const rowid = getRowid($xeTable, row);
                     const rowRest = fullAllDataRowIdData[rowid];
-                    evnt.preventDefault();
-                    const { dragRow } = reactData;
                     const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
                     const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
                     internalData.prevDragToChild = !!(treeConfig && transform && (isCrossDrag && isToChildDrag) && isControlKey);
                     internalData.prevDragRow = row;
                     internalData.prevDragPos = dragPos;
+                    // 跨表拖拽
+                    if (isCrossTableDrag && (!treeConfig || isCrossDrag) && crossTableDragRowObj) {
+                        const { $oldTable, $newTable } = crossTableDragRowObj;
+                        if ($oldTable) {
+                            const oldTableReactData = $oldTable.reactData;
+                            if ($oldTable.xID === $xeTable.xID) {
+                                if ($newTable) {
+                                    $newTable.hideCrossTableRowDropClearStatus();
+                                }
+                                reactData.isCrossDragRow = false;
+                                oldTableReactData.isCrossDragRow = false;
+                                crossTableDragRowObj.$newTable = null;
+                            }
+                            else {
+                                $oldTable.hideCrossTableRowDropClearStatus();
+                                oldTableReactData.isCrossDragRow = true;
+                                reactData.dragTipText = oldTableReactData.dragTipText;
+                                crossTableDragRowObj.$newTable = $xeTable;
+                                showDropTip(evnt, trEl, null, true, dragPos);
+                                return;
+                            }
+                        }
+                    }
                     if ($xeTable.eqRow(dragRow, row) ||
                         (isControlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded) ||
                         (!isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level))) {
@@ -9948,7 +10215,7 @@ export default defineVxeComponent({
                 evnt.stopPropagation();
                 const { dragConfig } = props;
                 const rowDragOpts = computeRowDragOpts.value;
-                const { trigger, dragStartMethod } = rowDragOpts;
+                const { isCrossTableDrag, trigger, dragStartMethod } = rowDragOpts;
                 const { row } = params;
                 const dragEl = evnt.currentTarget;
                 const tdEl = trigger === 'cell' || trigger === 'row' ? dragEl : (_a = dragEl.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
@@ -9959,10 +10226,16 @@ export default defineVxeComponent({
                     trEl.draggable = false;
                     reactData.dragRow = null;
                     reactData.dragCol = null;
+                    clearCrossTableDragStatus();
                     hideDropTip();
                     return;
                 }
+                if (isCrossTableDrag) {
+                    crossTableDragRowInfo.row = row;
+                    crossTableDragRowObj = { $oldTable: $xeTable, $newTable: null };
+                }
                 reactData.dragRow = row;
+                reactData.isCrossDragRow = false;
                 reactData.dragCol = null;
                 trEl.draggable = true;
                 updateRowDropOrigin(row);
@@ -10273,6 +10546,7 @@ export default defineVxeComponent({
                 internalData.prevDragToChild = false;
                 reactData.dragRow = null;
                 reactData.dragCol = null;
+                clearCrossTableDragStatus();
             },
             handleHeaderCellDragDragoverEvent(evnt) {
                 const { dragCol } = reactData;
@@ -10351,12 +10625,14 @@ export default defineVxeComponent({
                     thEl.draggable = false;
                     reactData.dragRow = null;
                     reactData.dragCol = null;
+                    clearCrossTableDragStatus();
                     hideDropTip();
                     return;
                 }
                 reactData.dragCol = column;
                 reactData.dragRow = null;
                 thEl.draggable = true;
+                clearCrossTableDragStatus();
                 updateColDropOrigin(column);
                 updateColDropTipContent(thEl);
                 dispatchEvent('column-dragstart', params, evnt);
@@ -10364,6 +10640,7 @@ export default defineVxeComponent({
             handleHeaderCellDragMouseupEvent() {
                 clearColDropOrigin();
                 hideDropTip();
+                clearCrossTableDragStatus();
                 reactData.dragRow = null;
                 reactData.dragCol = null;
             },
@@ -11252,8 +11529,9 @@ export default defineVxeComponent({
             const rTipSlot = rowDragSlots.tip || (dragConfig && dragConfig.slots ? dragConfig.slots.rowTip : null);
             const columnDragSlots = columnDragOpts.slots || {};
             const cTipSlot = columnDragSlots.tip;
-            if (dragRow && rTipSlot) {
-                return callSlot(rTipSlot, { row: dragRow });
+            const dRow = dragRow || (rowDragOpts.isCrossTableDrag ? crossTableDragRowInfo.row : null);
+            if (dRow && rTipSlot) {
+                return callSlot(rTipSlot, { row: dRow });
             }
             if (dragCol && cTipSlot) {
                 return callSlot(cTipSlot, { column: dragCol });
@@ -11266,6 +11544,7 @@ export default defineVxeComponent({
             const columnOpts = computeColumnOpts.value;
             const rowDragOpts = computeRowDragOpts.value;
             const columnDragOpts = computeColumnDragOpts.value;
+            const dRow = dragRow || (rowDragOpts.isCrossTableDrag ? crossTableDragRowInfo.row : null);
             if (rowOpts.drag || columnOpts.drag) {
                 return h('div', {
                     class: 'vxe-table--drag-wrapper'
@@ -11282,7 +11561,7 @@ export default defineVxeComponent({
                                 'is--guides': columnDragOpts.showGuidesStatus
                             }]
                     }),
-                    (dragRow && rowDragOpts.showDragTip) || (dragCol && columnDragOpts.showDragTip)
+                    (dRow && rowDragOpts.showDragTip) || (dragCol && columnDragOpts.showDragTip)
                         ? h('div', {
                             ref: refDragTipElem,
                             class: 'vxe-table--drag-sort-tip'
@@ -11294,7 +11573,7 @@ export default defineVxeComponent({
                                     class: 'vxe-table--drag-sort-tip-status'
                                 }, [
                                     h('span', {
-                                        class: ['vxe-table--drag-sort-tip-normal-status', dragRow ? getIcon().TABLE_DRAG_STATUS_ROW : getIcon().TABLE_DRAG_STATUS_COLUMN]
+                                        class: ['vxe-table--drag-sort-tip-normal-status', dRow ? getIcon().TABLE_DRAG_STATUS_ROW : getIcon().TABLE_DRAG_STATUS_COLUMN]
                                     }),
                                     h('span', {
                                         class: ['vxe-table--drag-sort-tip-sub-status', getIcon().TABLE_DRAG_STATUS_SUB_ROW]
@@ -11543,6 +11822,7 @@ export default defineVxeComponent({
             const { teleportToWrapperElem } = internalData;
             const { leftList, rightList } = columnStore;
             const loadingSlot = slots.loading;
+            const rowDragOpts = computeRowDragOpts.value;
             const tableTipConfig = computeTableTipConfig.value;
             const validTipConfig = computeValidTipConfig.value;
             const validOpts = computeValidOpts.value;
@@ -11562,6 +11842,11 @@ export default defineVxeComponent({
             const columnDragOpts = computeColumnDragOpts.value;
             const scrollbarXToTop = computeScrollbarXToTop.value;
             const scrollbarYToLeft = computeScrollbarYToLeft.value;
+            const { isCrossTableDrag } = rowDragOpts;
+            const rwOns = {};
+            if (isCrossTableDrag && !tableData.length) {
+                rwOns.onDragover = $xeTable.handleCrossTableRowDragoverEmptyEvent;
+            }
             return h('div', {
                 ref: refElem,
                 class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`, `sy-pos--${scrollbarYToLeft ? 'left' : 'right'}`, {
@@ -11621,10 +11906,7 @@ export default defineVxeComponent({
                         class: 'vxe-table-var-mini'
                     })
                 ]),
-                h('div', {
-                    key: 'tw',
-                    class: 'vxe-table--render-wrapper'
-                }, scrollbarXToTop
+                h('div', Object.assign({ key: 'tw', class: 'vxe-table--render-wrapper' }, rwOns), scrollbarXToTop
                     ? [
                         renderScrollX(),
                         renderBody()
@@ -11985,6 +12267,11 @@ export default defineVxeComponent({
             tablePrivateMethods.preventEvent(null, 'activated', { $table: $xeTable });
         });
         onDeactivated(() => {
+            const { filterStore } = reactData;
+            if (filterStore.visible) {
+                $xeTable.clearFilter();
+            }
+            $xeTable.closeTooltip();
             internalData.isActivated = false;
             tablePrivateMethods.preventEvent(null, 'deactivated', { $table: $xeTable });
         });
@@ -12023,6 +12310,7 @@ export default defineVxeComponent({
                 const currentColumnOpts = computeCurrentColumnOpts.value;
                 const keyboardOpts = computeKeyboardOpts.value;
                 const aggregateOpts = computeAggregateOpts.value;
+                const rowDragOpts = computeRowDragOpts.value;
                 if (props.rowId) {
                     warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
                 }
@@ -12124,7 +12412,10 @@ export default defineVxeComponent({
                     }
                 }
                 if (treeConfig && rowOpts.drag && !treeOpts.transform) {
-                    errLog('vxe.error.notSupportProp', ['column-config.drag', 'tree-config.transform=false', 'tree-config.transform=true']);
+                    errLog('vxe.error.notSupportProp', ['row-config.drag', 'tree-config.transform=false', 'tree-config.transform=true']);
+                }
+                if (treeConfig && rowDragOpts.isCrossTableDrag && !rowDragOpts.isCrossDrag) {
+                    errLog('vxe.error.reqSupportProp', ['tree-config & row-drag-config.isCrossTableDrag', 'row-drag-config.isCrossDrag']);
                 }
                 if (props.dragConfig) {
                     warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config']);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.16.0-beta.8";
+export const version = "4.16.1";
 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.16.0-beta.8"}`;
+const version = `table v${"4.16.1"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/grid/src/grid.js

@@ -31,7 +31,7 @@ const {
   renderEmptyElement
 } = _ui.VxeUI;
 const tableComponentPropKeys = Object.keys(_props2.tableProps);
-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', 'getTreeRowChildren', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'recalcRowHeight', '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', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'setFilterByEvent', 'sort', 'setSort', 'setSortByEvent', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', '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', 'setRowGroupExpand', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'isAggregateRecord', 'isAggregateExpandByRow', 'getAggregateContentByRow', 'getAggregateRowChildren', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect', 'connectToolbar'];
+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', 'getTreeRowChildren', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'recalcRowHeight', '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', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'setFilterByEvent', 'sort', 'setSort', 'setSortByEvent', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', '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', 'setRowGroupExpand', 'setRowGroupExpandByField', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'isAggregateRecord', 'isAggregateExpandByRow', 'getAggregateContentByRow', 'getAggregateRowChildren', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect', 'connectToolbar'];
 function createInternalData() {
   return {};
 }