From 9a72dd72758c148d916cec1ff4b03157e1b5c1ad Mon Sep 17 00:00:00 2001
From: "mario.gk" <mario.gk@alibaba-inc.com>
Date: Wed, 15 Jul 2020 13:55:03 +0800
Subject: [PATCH] fix: modal node locate

---
 packages/designer/src/builtin-simulator/host.ts |  8 ++++++--
 packages/plugin-outline-pane/src/main.ts        | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts
index ed0a9382b..d71715cc6 100644
--- a/packages/designer/src/builtin-simulator/host.ts
+++ b/packages/designer/src/builtin-simulator/host.ts
@@ -826,10 +826,14 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
       event: e,
     };
 
-    if (e.dragObject.nodes[0].getPrototype().isModal()) {
+    if (e.dragObject.type === 'node' && e.dragObject.nodes[0].getPrototype().isModal()) {
       return this.designer.createLocation({
         target: this.document.rootNode,
-        detail,
+        detail: {
+          type: LocationDetailType.Children,
+          index: 0,
+          valid: true,
+        },
         source: 'simulator' + this.document.id,
         event: e,
       }); 
diff --git a/packages/plugin-outline-pane/src/main.ts b/packages/plugin-outline-pane/src/main.ts
index 651981aa7..dcbbcce20 100644
--- a/packages/plugin-outline-pane/src/main.ts
+++ b/packages/plugin-outline-pane/src/main.ts
@@ -134,6 +134,20 @@ export class OutlineMain implements ISensor, ITreeBoard, IScrollable {
     const pos = getPosFromEvent(e, this._shell);
     const irect = this.getInsertionRect();
     const originLoc = document.dropLocation;
+
+    if (e.dragObject.type === 'node' && e.dragObject.nodes[0].getPrototype().isModal()) {
+      return designer.createLocation({
+        target: document.rootNode,
+        detail: {
+          type: LocationDetailType.Children,
+          index: 0,
+          valid: true,
+        },
+        source: this.id,
+        event: e,
+      });
+    }
+
     if (originLoc && ((pos && pos === 'unchanged') || (irect && globalY >= irect.top && globalY <= irect.bottom))) {
       const loc = originLoc.clone(e);
       const indented = this.indentTrack.getIndentParent(originLoc, loc);