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

package/dist/index.esm.js

@@ -1177,8 +1177,9 @@ class BuilderDataManager {
       var overIndex = sortUids.findIndex(item => item === dragOverNodeUid);
       sortIndex = dragStatus === "top" ? overIndex : overIndex + 1; // 排序修正
 
-      sortNodeIds.splice(sortIndex, 0, nodeData.id);
-      sortUids.splice(sortIndex, 0, (_dragEdge$child = dragEdge === null || dragEdge === void 0 ? void 0 : dragEdge.child) !== null && _dragEdge$child !== void 0 ? _dragEdge$child : null);
+      sortNodeIds.splice(sortIndex, 0, nodeData.id); // 如果是新增的情况下, 没有edge, 则取dragNodeUid(新创建的uid)
+
+      sortUids.splice(sortIndex, 0, (_dragEdge$child = dragEdge === null || dragEdge === void 0 ? void 0 : dragEdge.child) !== null && _dragEdge$child !== void 0 ? _dragEdge$child : dragNodeUid);
     }
 
     return {
@@ -1193,26 +1194,40 @@ class BuilderDataManager {
 
   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 => dragStatus === "inside" ? item.$$uid === overEdge.child : 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
@@ -1222,9 +1237,9 @@ class BuilderDataManager {
         },
         dragNodeUid: newNodeUid,
         dragOverNodeUid,
-        dragStatus
+        dragStatus: realDragStatus
       });
-      nodeData.parent = nodes.find(item => item.$$uid === parentUid).instanceId;
+      nodeData.parent = parentInstanceId;
       nodeData.mountPoint = mountPoint;
 
       if (nodeData.bricks) {