fix: 修复磁贴点击页面容器假死问题 to #34464969

packages/designer/src/designer/dragon.ts

@@ -322,34 +322,33 @@ export class Dragon {
         return;
       }
       lastArrive = e;
-
       const locateEvent = createLocateEvent(e);
       const sensor = chooseSensor(locateEvent);
-      this._canDrop = !!sensor?.locate(locateEvent);
       const { isRGL, rglNode } = getRGLObject(e);
       if (isRGL) {
-        // 禁止原生响应
+        this._canDrop = !!sensor?.locate(locateEvent);
-        if (!isFromRGLNode && this._canDrop) {
+        if (this._canDrop) {
           this.emitter.emit('rgl.add.placeholder', {
             rglNode,
             node: locateEvent.dragObject.nodes[0],
             event: e,
           });
-        }
           designer.clearLocation();
           this.clearState();
           this.emitter.emit('drag', locateEvent);
+          return;
+        }
       } else {
-        if (!isFromRGLNode && this._canDrop) {
+        this._canDrop = false;
         this.emitter.emit('rgl.remove.placeholder');
       }
       if (sensor) {
+        sensor.locate(locateEvent);
         sensor.fixEvent(locateEvent);
       } else {
         designer.clearLocation();
       }
       this.emitter.emit('drag', locateEvent);
-      }
     };
 
     const dragstart = () => {
@@ -405,8 +404,10 @@ export class Dragon {
       // 发送drop事件
       if (e) {
         const { isRGL, rglNode } = getRGLObject(e);
-        if (isRGL && !isFromRGLNode && this._canDrop) {
+        if (isRGL && this._canDrop) {
           const tarNode = dragObject.nodes[0];
+          if (rglNode.id !== tarNode.id) {
+            // 避免死循环
             this.emitter.emit('rgl.drop', {
               rglNode,
               node: tarNode,
@@ -415,6 +416,7 @@ export class Dragon {
             selection.select(tarNode.id);
           }
         }
+      }
 
       /* istanbul ignore next */
       if (e && isDragEvent(e)) {