vxe-table 3.18.0-beta.8 → 3.18.1

package/es/table/src/table.js

@@ -10,6 +10,7 @@ import TableFooterComponent from './footer';
 import { tableProps } from './props';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
+import { crossTableDragRowGlobal, getCrossTableDragRowInfo } from './store';
 import TableCustomPanelComponent from '../module/custom/panel';
 import TableFilterPanelComponent from '../module/filter/panel';
 import TableImportPanelComponent from '../module/export/import-panel';
@@ -119,6 +120,7 @@ function renderEmptyBody(h, $xeTable) {
 const renderDragTipContents = (h, $xeTable) => {
     const props = $xeTable;
     const reactData = $xeTable;
+    const crossTableDragRowInfo = getCrossTableDragRowInfo($xeTable);
     const { dragConfig } = props;
     const { dragRow, dragCol, dragTipText } = reactData;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
@@ -127,8 +129,9 @@ const renderDragTipContents = (h, $xeTable) => {
     const rTipSlot = rowDragSlots.tip || (dragConfig && dragConfig.slots ? dragConfig.slots.rowTip : null);
     const columnDragSlots = columnDragOpts.slots || {};
     const cTipSlot = columnDragSlots.tip;
-    if (dragRow && rTipSlot) {
-        return $xeTable.callSlot(rTipSlot, { row: dragRow }, h);
+    const dRow = dragRow || (rowDragOpts.isCrossTableDrag ? crossTableDragRowInfo.row : null);
+    if (dRow && rTipSlot) {
+        return $xeTable.callSlot(rTipSlot, { row: dRow }, h);
     }
     if (dragCol && cTipSlot) {
         return $xeTable.callSlot(cTipSlot, { column: dragCol }, h);
@@ -137,11 +140,13 @@ const renderDragTipContents = (h, $xeTable) => {
 };
 const renderDragTip = (h, $xeTable) => {
     const reactData = $xeTable;
+    const crossTableDragRowInfo = getCrossTableDragRowInfo($xeTable);
     const { dragRow, dragCol } = reactData;
     const rowOpts = $xeTable.computeRowOpts;
     const columnOpts = $xeTable.computeColumnOpts;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
+    const dRow = dragRow || (rowDragOpts.isCrossTableDrag ? crossTableDragRowInfo.row : null);
     if (rowOpts.drag || columnOpts.drag) {
         return h('div', {
             class: 'vxe-table--drag-wrapper'
@@ -158,7 +163,7 @@ const renderDragTip = (h, $xeTable) => {
                         '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'
@@ -170,7 +175,7 @@ const renderDragTip = (h, $xeTable) => {
                             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]
@@ -699,9 +704,9 @@ export default {
             resizeHeightFlag: 1,
             resizeWidthFlag: 1,
             isCustomStatus: false,
-            isDragRowMove: false,
+            isCrossDragRow: false,
             dragRow: null,
-            isDragColMove: false,
+            isCrossDragCol: false,
             dragCol: null,
             dragTipText: '',
             isDragResize: false,
@@ -709,7 +714,8 @@ export default {
             isColLoading: false,
             reScrollFlag: 0,
             reLayoutFlag: 0,
-            footFlag: 0
+            footFlag: 0,
+            crossTableDragRowInfo: crossTableDragRowGlobal
         };
     },
     computed: Object.assign(Object.assign({}, {}), { tableId() {
@@ -1435,6 +1441,7 @@ export default {
         const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
         const keyboardOpts = $xeTable.computeKeyboardOpts;
         const aggregateOpts = $xeTable.computeAggregateOpts;
+        const rowDragOpts = $xeTable.computeRowDragOpts;
         const { groupFields } = aggregateOpts;
         if (props.rowId) {
             warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
@@ -1540,7 +1547,10 @@ export default {
             }
         }
         if (treeConfig && rowOpts.drag && !treeOpts.transform) {
-            warnLog('vxe.error.notSupportProp', ['column-config.drag', 'tree-config.transform=false', 'tree-config.transform=true']);
+            warnLog('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']);
@@ -1776,6 +1786,15 @@ export default {
         this.preventEvent(null, 'activated');
     },
     deactivated() {
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { filterStore } = reactData;
+        if (filterStore.visible) {
+            $xeTable.clearFilter();
+        }
+        $xeTable.closeTooltip();
+        internalData.isActivated = false;
         this.preventEvent(null, 'deactivated');
     },
     beforeDestroy() {
@@ -1825,6 +1844,7 @@ export default {
         const { isGroup, overflowX, overflowY, scrollXLoad, scrollYLoad, tableData, initStore, isRowGroupStatus, columnStore, filterStore, customStore } = reactData;
         const { leftList, rightList } = columnStore;
         const loadingSlot = slots.loading;
+        const rowDragOpts = $xeTable.computeRowDragOpts;
         const tableTipConfig = $xeTable.computeTableTipConfig;
         const validTipConfig = $xeTable.computeValidTipConfig;
         const validOpts = $xeTable.computeValidOpts;
@@ -1844,6 +1864,11 @@ export default {
         const columnDragOpts = $xeTable.computeColumnDragOpts;
         const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
         const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
+        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'}`, {
@@ -1910,7 +1935,8 @@ export default {
             ]),
             h('div', {
                 key: 'tw',
-                class: 'vxe-table--render-wrapper'
+                class: 'vxe-table--render-wrapper',
+                on: rwOns
             }, scrollbarXToTop
                 ? [
                     renderScrollX(h, $xeTable),

package/es/ui/index.js

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