@next-core/editor-bricks-helper 0.42.0 → 0.42.1

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.42.1](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.42.0...@next-core/editor-bricks-helper@0.42.1) (2022-06-15)
+
+**Note:** Version bump only for package @next-core/editor-bricks-helper
+
+
+
+
+
 # [0.42.0](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.41.1...@next-core/editor-bricks-helper@0.42.0) (2022-06-14)
 
 

package/dist/index.bundle.js

@@ -1195,26 +1195,40 @@
 
     workbenchNodeAdd(detail) {
       var {
-        rootId,
-        nodes
+        nodes,
+        edges,
+        rootId
       } = this.data;
       var {
         nodeData,
-        dragOverNodeInstanceId,
-        dragStatus
+        dragOverInstanceId,
+        parentInstanceId,
+        dragStatus,
+        mountPoint
       } = detail;
 
       if (nodeData.instanceId) ; else {
-        var _nodes$find;
-
         // insert
         var newNodeUid = getUniqueNodeId();
-        var isRoot = dragOverNodeInstanceId === "#main-mount-point";
-        var parentInstanceId = isRoot ? nodes.find(item => item.$$uid === rootId).instanceId : dragOverNodeInstanceId;
-        var dragOverNodeUid = (_nodes$find = nodes.find(item => isRoot ? item.$$uid === rootId : item.instanceId === dragOverNodeInstanceId)) === null || _nodes$find === void 0 ? void 0 : _nodes$find.$$uid;
+        var overNode = nodes.find(item => item.instanceId === dragOverInstanceId);
+        var dragOverNodeUid = overNode.$$uid;
+        var realDragStatus = dragStatus;
+
+        if (dragOverNodeUid === rootId) {
+          realDragStatus = "inside";
+        } else {
+          var overEdge = edges.find(item => item.child === dragOverNodeUid);
+          var overParentNode = nodes.find(item => item.$$uid === overEdge.parent);
+
+          if (overParentNode.instanceId !== parentInstanceId) {
+            // 如果instanceId不相同, 说明父元素被修改, dragStatus强制等于inside, uid也需要切换成实际父元素的uid
+            realDragStatus = "inside";
+            dragOverNodeUid = nodes.find(item => item.instanceId === parentInstanceId).$$uid;
+          }
+        }
+
         var {
           parentUid,
-          mountPoint,
           sortIndex,
           sortUids: nodeUids,
           sortNodeIds: nodeIds
@@ -1224,9 +1238,9 @@
           },
           dragNodeUid: newNodeUid,
           dragOverNodeUid,
-          dragStatus
+          dragStatus: realDragStatus
         });
-        nodeData.parent = nodes.find(item => item.$$uid === parentUid).instanceId;
+        nodeData.parent = parentInstanceId;
         nodeData.mountPoint = mountPoint;
 
         if (nodeData.bricks) {