@next-core/editor-bricks-helper 0.40.0 → 0.41.1

package/dist/index.esm.js

@@ -814,7 +814,8 @@ class BuilderDataManager {
       nodeUid,
       parentUid,
       nodeUids,
-      nodeData
+      nodeData,
+      sort
     } = detail;
     var {
       nodes: addNodes,
@@ -825,7 +826,7 @@ class BuilderDataManager {
       parent: parentUid,
       child: nodeUid,
       mountPoint: nodeData.mountPoint,
-      sort: undefined,
+      sort: sort !== null && sort !== void 0 ? sort : undefined,
       $$isTemplateDelegated: isParentExpandableTemplate(nodes, parentUid)
     }).concat(addEdges);
     var newData = {
@@ -1063,30 +1064,35 @@ class BuilderDataManager {
     this.reorder(parentUid, orderedEdges);
   }
 
-  workbenchTreeNodeMove(detail) {
-    var {
-      rootId,
-      nodes,
-      edges,
-      wrapperNode
-    } = this.data;
+  getDragInfo(_ref3) {
+    var _dragEdge$mountPoint;
+
     var {
+      nodeData,
       dragNodeUid,
       dragOverNodeUid,
-      dragParentNodeUid,
       dragStatus
-    } = detail;
+    } = _ref3;
+    var {
+      rootId,
+      nodes,
+      edges
+    } = this.data;
     var isDragRoot = dragOverNodeUid === rootId;
-    var nodeData = nodes.find(item => item.$$uid === dragNodeUid);
-    var dragEdge = edges.find(item => item.child === dragNodeUid);
+    /*
+     * 如果没有id, 则为新增状态, 没有edge, 否则为移动状态
+     */
+
+    var isAdd = nodeData.id;
+    var dragEdge = !isAdd ? edges.find(item => item.child === dragNodeUid) : null;
     var dragOverEdge = edges.find(item => item.child === dragOverNodeUid);
     /**
      * 如果是根节点, 则mountPoint强制等于 bricks
-     * 如果是属于拖动进某个节点中, 则使用原mountPoint
+     * 如果是属于拖动进某个节点中, 则使用原mountPoint(新增节点为content)
      * 其他情况, 使用被拖拽节点的mountPoint
      */
 
-    var mountPoint = isDragRoot ? "bricks" : dragStatus === "inside" ? dragEdge.mountPoint : dragOverEdge.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 parentEdge = edges.find(item => item.child === dragOverNodeUid);
     /**
      * 如果是根节点, parentUid强制等于rootId
@@ -1109,31 +1115,121 @@ class BuilderDataManager {
 
       sortNodeIds.push(nodeData.id);
     } else if (dragStatus === "top" || dragStatus === "bottom") {
-      var _dragEdge = edges.find(edge => edge.child === dragNodeUid);
+      var _dragEdge$child;
 
       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);
+      sortUids.splice(sortIndex, 0, (_dragEdge$child = dragEdge === null || dragEdge === void 0 ? void 0 : dragEdge.child) !== null && _dragEdge$child !== void 0 ? _dragEdge$child : null);
+    }
+
+    return {
+      parentUid,
+      mountPoint,
+      sortIndex,
+      parnetNodeData,
+      sortUids,
+      sortNodeIds
+    };
+  }
+
+  workbenchNodeAdd(detail) {
+    var {
+      rootId,
+      nodes
+    } = this.data;
+    var {
+      nodeData,
+      dragOverNodeInstanceId,
+      dragStatus
+    } = detail;
+
+    if (nodeData.instanceId) ; else {
+      var _nodes$find;
+
+      // insert
+      var newNodeUid = getUniqueNodeId();
+      var isRoot = dragOverNodeInstanceId === "#main-mount-point";
+      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 {
+        parentUid,
+        mountPoint,
+        sortIndex,
+        sortUids: nodeUids,
+        sortNodeIds: nodeIds
+      } = this.getDragInfo({
+        nodeData: {
+          id: null
+        },
+        dragNodeUid: newNodeUid,
+        dragOverNodeUid,
+        dragStatus
+      });
+      nodeData.parent = nodes.find(item => item.$$uid === parentUid).instanceId;
+      nodeData.mountPoint = mountPoint;
+      this.runAddNodeAction({
+        nodeUid: newNodeUid,
+        parentUid,
+        nodeUids,
+        nodeIds,
+        nodeData,
+        sort: sortIndex
+      });
+      this.eventTarget.dispatchEvent(new CustomEvent(BuilderInternalEventType.NODE_ADD, {
+        detail: {
+          nodeUid: newNodeUid,
+          parentUid,
+          nodeUids,
+          nodeIds,
+          nodeData
+        }
+      }));
     }
+  }
 
+  workbenchTreeNodeMove(detail) {
+    var {
+      rootId,
+      nodes,
+      edges,
+      wrapperNode
+    } = this.data;
+    var {
+      dragNodeUid,
+      dragOverNodeUid,
+      dragStatus
+    } = detail;
+    var nodeData = nodes.find(item => item.$$uid === dragNodeUid);
+    var {
+      parentUid,
+      parnetNodeData,
+      mountPoint,
+      sortIndex,
+      sortUids: nodeUids,
+      sortNodeIds: nodeIds
+    } = this.getDragInfo({
+      nodeData,
+      dragNodeUid,
+      dragOverNodeUid,
+      dragStatus
+    });
     var newData = {
       rootId,
       nodes,
       edges: edges.filter(edge => edge.child !== dragNodeUid).concat({
-        parent: dragParentNodeUid,
+        parent: parentUid,
         child: dragNodeUid,
         mountPoint: mountPoint,
         sort: sortIndex,
-        $$isTemplateDelegated: isParentExpandableTemplate(nodes, dragParentNodeUid)
+        $$isTemplateDelegated: isParentExpandableTemplate(nodes, parentUid)
       }),
       wrapperNode
     };
     this.data = _objectSpread(_objectSpread({}, newData), {}, {
       edges: reorderBuilderEdges(newData, {
         parentUid,
-        nodeUids: sortUids
+        nodeUids
       })
     });
     this.triggerDataChange();
@@ -1141,7 +1237,7 @@ class BuilderDataManager {
       detail: {
         nodeUid: dragNodeUid,
         nodeInstanceId: nodeData.instanceId,
-        nodeIds: sortNodeIds,
+        nodeIds,
         nodeData: {
           parent: parnetNodeData.instanceId,
           mountPoint: mountPoint
@@ -1154,10 +1250,10 @@ class BuilderDataManager {
    */
 
 
-  moveMountPoint(_ref3, mountPoint, direction) {
+  moveMountPoint(_ref4, mountPoint, direction) {
     var {
       $$uid: parentUid
-    } = _ref3;
+    } = _ref4;
     var {
       relatedEdges,
       mountPoints