From 6dd417f3344c2288c24e9b8c57bdb583e9e400c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?=
 <10549902+zhuangruibo@user.noreply.gitee.com>
Date: Tue, 21 Apr 2026 23:27:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/demo/wunderbaum/demo1.vue       | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/demo/wunderbaum/demo1.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/demo/wunderbaum/demo1.vue
index 6413831b..71a538c8 100644
--- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/demo/wunderbaum/demo1.vue
+++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/demo/wunderbaum/demo1.vue
@@ -45,6 +45,10 @@ const initTrees = async () => {
     const leftData = JSON.parse(JSON.stringify(wbData));
     const rightData = JSON.parse(JSON.stringify(wbData));
 
+    // 跨树拖拽时，目标树的 DnD 扩展实例拿不到 sourceNode（各树实例独立），
+    // 因此用闭包变量在 dragStart 中记住源节点，drop 中做 fallback。
+    let currentDragNode: any = null;
+
     // 共享的 DnD 配置
     const dndOptions = {
       preventForeignNodes: false, // 允许跨树拖拽
@@ -53,21 +57,30 @@ const initTrees = async () => {
       dropEffectDefault: 'move' as const,
       effectAllowed: 'all' as const,
       guessDropEffect: true,
-      dragStart: () => true,
+      dragStart: (e: any) => {
+        currentDragNode = e.node;
+        return true;
+      },
+      dragEnd: () => {
+        currentDragNode = null;
+      },
       dragEnter: () => {
         // 允许放置在 before / after / over 三个位置
         return new Set(['before', 'after', 'over'] as const);
       },
       drop: (e: any) => {
-        const sourceNode = e.sourceNode;
+        // 同树拖拽时 e.sourceNode 有值；跨树拖拽时为 null，回退到闭包变量
+        const sourceNode = e.sourceNode || currentDragNode;
         const targetNode = e.node;
         const suggestedDropMode = e.suggestedDropMode;
 
         if (sourceNode && targetNode) {
           sourceNode.moveTo(targetNode, suggestedDropMode);
-          // 更新两棵树的渲染
-          leftTree?.update('structure' as any);
-          rightTree?.update('structure' as any);
+          // moveTo 内部仅通过 setTimeout 更新源树，需额外更新目标树
+          setTimeout(() => {
+            leftTree?.update('any' as any);
+            rightTree?.update('any' as any);
+          }, 0);
         }
       }
     };