vxe-table 3.18.3 → 3.18.5

package/packages/table/src/methods.ts

@@ -8925,11 +8925,20 @@ const Methods = {
     const rowDragOpts = $xeTable.computeRowDragOpts
     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
+      const { $oldTable, $newTable } = crossTableDragRowObj
+      if ($oldTable) {
+        const oldTableReactData = $oldTable as unknown as TableReactData
+        if ($oldTable.xID !== $xeTable.xID) {
+          if ($newTable && $newTable.xID !== $xeTable.xID) {
+            $newTable.hideCrossTableRowDropClearStatus()
+          }
+          evnt.preventDefault()
+          $oldTable.hideCrossTableRowDropClearStatus()
+          crossTableDragRowObj.$newTable = $xeTable
+          internalData.prevDragRow = null
+          reactData.dragTipText = oldTableReactData.dragTipText
+          showDropTip($xeTable, evnt, evnt.currentTarget as HTMLDivElement, null, true, '')
+        }
       }
     }
   },
@@ -9160,6 +9169,9 @@ const Methods = {
             oldTableReactData.isCrossDragRow = false
             crossTableDragRowObj.$newTable = null
           } else if (!treeConfig || isCrossDrag) {
+            if ($newTable && $newTable.xID !== $xeTable.xID) {
+              $newTable.hideCrossTableRowDropClearStatus()
+            }
             $oldTable.hideCrossTableRowDropClearStatus()
             oldTableReactData.isCrossDragRow = true
             reactData.dragTipText = oldTableReactData.dragTipText

package/packages/table/src/table.ts

@@ -2042,9 +2042,14 @@ export default {
     const scrollbarXToTop = $xeTable.computeScrollbarXToTop
     const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft
     const { isCrossTableDrag } = rowDragOpts
-    const rwOns: Record<string, any> = {}
+    const tbOns: {
+        keydown: (...args: any[]) => void
+        dragover?: (...args: any[]) => void
+      } = {
+        keydown: this.keydownEvent
+      }
     if (isCrossTableDrag && !tableData.length) {
-      rwOns.onDragover = $xeTable.handleCrossTableRowDragoverEmptyEvent
+      tbOns.dragover = $xeTable.handleCrossTableRowDragoverEmptyEvent
     }
     return h('div', {
       ref: 'refElem',
@@ -2082,9 +2087,7 @@ export default {
       attrs: {
         spellcheck: false
       },
-      on: {
-        keydown: this.keydownEvent
-      }
+      on: tbOns
     }, [
       /**
        * 隐藏列
@@ -2112,8 +2115,7 @@ export default {
       ]),
       h('div', {
         key: 'tw',
-        class: 'vxe-table--render-wrapper',
-        on: rwOns
+        class: 'vxe-table--render-wrapper'
       }, scrollbarXToTop
         ? [
             renderScrollX(h, $xeTable),

package/packages/ui/src/vn.ts

@@ -1,21 +1,27 @@
 import XEUtils from 'xe-utils'
 
+import type { VxeGlobalRendererHandles } from 'vxe-pc-ui'
 import type { VxeComponentSlotType } from '../../../types'
 
 export function getOnName (type: string) {
   return XEUtils.kebabCase(type)
 }
 
-export function getModelEvent (name: string) {
-  switch (name) {
+export function getModelEvent (renderOpts: VxeGlobalRendererHandles.RenderOptions) {
+  switch (renderOpts.name) {
     case 'VxeInput':
     case 'VxeTextarea':
     case 'VxeNumberInput':
+    case 'VxePasswordInput':
     case 'VxeSelect':
     case 'VxeTreeSelect':
     case 'VxeTableSelect':
     case 'VxeDatePicker':
     case 'VxeDateRangePicker':
+    case 'VxeIconPicker':
+    case 'VxeColorPicker':
+    case 'VxeSlider':
+    case 'VxeUpload':
       return 'modelValue'
     case 'select':
       return 'change'
@@ -23,8 +29,8 @@ export function getModelEvent (name: string) {
   return 'input'
 }
 
-export function getChangeEvent (name: string) {
-  switch (name) {
+export function getChangeEvent (renderOpts: VxeGlobalRendererHandles.RenderOptions) {
+  switch (renderOpts.name) {
     case 'input':
     case 'textarea':
     case 'VxeInput':