@next-core/editor-bricks-helper 0.46.28 → 0.47.0

package/dist/index.esm.js

@@ -1170,8 +1170,6 @@ class BuilderDataManager {
   }
 
   getDragInfo(_ref3) {
-    var _dragEdge$mountPoint;
-
     var {
       nodeData,
       dragNodeUid,
@@ -1185,19 +1183,18 @@ class BuilderDataManager {
     } = this.data;
     var isDragRoot = dragOverNodeUid === rootId;
     /*
-     * 如果没有id, 则为新增状态, 没有edge, 否则为移动状态
+     * 如果找不到edge, 则为新增状态, 否则为移动状态
      */
 
-    var isAdd = nodeData.id;
-    var dragEdge = !isAdd ? edges.find(item => item.child === dragNodeUid) : null;
+    var dragEdge = edges.find(item => item.child === dragNodeUid);
     var dragOverEdge = edges.find(item => item.child === dragOverNodeUid);
     /**
      * 如果是根节点, 则mountPoint强制等于 bricks
-     * 如果是属于拖动进某个节点中, 则使用原mountPoint(新增节点为content)
+     * 如果是属于拖动进某个节点中, 默认使用 content
      * 其他情况, 使用被拖拽节点的mountPoint
      */
 
-    var mountPoint = isDragRoot ? "bricks" : dragStatus === "inside" ? (_dragEdge$mountPoint = dragEdge === null || dragEdge === void 0 ? void 0 : dragEdge.mountPoint) !== null && _dragEdge$mountPoint !== void 0 ? _dragEdge$mountPoint : "content" : dragOverEdge.mountPoint;
+    var mountPoint = isDragRoot ? "bricks" : dragStatus === "inside" ? "content" : dragOverEdge.mountPoint;
     var parentEdge = edges.find(item => item.child === dragOverNodeUid);
     /**
      * 如果是根节点, parentUid强制等于rootId
@@ -1210,8 +1207,12 @@ class BuilderDataManager {
 
     var siblingEdge = edges.filter(edge => edge.child !== dragNodeUid && edge.parent === parentUid);
     var sortUids = sortBy(siblingEdge, "sort").map(item => item.child);
-    var sortNodeIds = sortUids.map(item => {
-      return nodes.find(node => node.$$uid === item).id;
+    var sortNodeIds = [];
+    var sortNodeInstanceIds = [];
+    sortUids.forEach(item => {
+      var node = nodes.find(node => node.$$uid === item);
+      sortNodeIds.push(node.id);
+      sortNodeInstanceIds.push(node.instanceId);
     });
     var sortIndex;
 
@@ -1219,6 +1220,7 @@ class BuilderDataManager {
       sortIndex = siblingEdge.length ? Math.max(...siblingEdge.map(item => item.sort)) + 1 : 0; // 插入默认插最后
 
       sortNodeIds.push(nodeData.id);
+      sortNodeInstanceIds.push(nodeData.instanceId);
     } else if (dragStatus === "top" || dragStatus === "bottom") {
       var _dragEdge$child;
 
@@ -1228,6 +1230,7 @@ class BuilderDataManager {
       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);
+      sortNodeInstanceIds.splice(sortIndex, 0, nodeData.instanceId);
     }
 
     return {
@@ -1236,7 +1239,8 @@ class BuilderDataManager {
       sortIndex,
       parnetNodeData,
       sortUids,
-      sortNodeIds
+      sortNodeIds,
+      sortNodeInstanceIds
     };
   }
 
@@ -1255,6 +1259,8 @@ class BuilderDataManager {
     } = detail;
 
     if (nodeData.instanceId && !nodeData.instanceId.startsWith("mock")) ; else {
+      var _nodeData$id, _nodeData$instanceId;
+
       // insert
       var parentInstanceId = detail.parent || detail.parentInstanceId;
       var newNodeUid = nodeData.$$uid || getUniqueNodeId();
@@ -1279,10 +1285,12 @@ class BuilderDataManager {
         parentUid,
         sortIndex,
         sortUids: nodeUids,
-        sortNodeIds: nodeIds
+        sortNodeIds: nodeIds,
+        sortNodeInstanceIds: nodeInstanceIds
       } = this.getDragInfo({
         nodeData: {
-          id: null
+          id: (_nodeData$id = nodeData.id) !== null && _nodeData$id !== void 0 ? _nodeData$id : null,
+          instanceId: (_nodeData$instanceId = nodeData.instanceId) !== null && _nodeData$instanceId !== void 0 ? _nodeData$instanceId : null
         },
         dragNodeUid: newNodeUid,
         dragOverNodeUid,
@@ -1323,11 +1331,18 @@ class BuilderDataManager {
         nodeData,
         sort: sortIndex
       });
+      var sortData = {
+        nodeUids,
+        nodeInstanceIds,
+        nodeIds
+      };
+      detail.sortData = sortData;
       this.eventTarget.dispatchEvent(new CustomEvent(BuilderInternalEventType.NODE_ADD, {
         detail: {
           nodeUid: newNodeUid,
           parentUid,
           nodeUids,
+          nodeInstanceIds,
           nodeIds,
           nodeData
         }