@next-core/editor-bricks-helper 0.39.32 → 0.41.0

package/CHANGELOG.md

@@ -3,6 +3,37 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.41.0](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.40.1...@next-core/editor-bricks-helper@0.41.0) (2022-06-10)
+
+
+### Features
+
+* **BuilderDataManager:** support preview addNode ([b5b0ee7](https://github.com/easyops-cn/next-core/commit/b5b0ee7e55466486a6d31656ec384d0114111ce7))
+
+
+
+
+
+## [0.40.1](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.40.0...@next-core/editor-bricks-helper@0.40.1) (2022-06-06)
+
+**Note:** Version bump only for package @next-core/editor-bricks-helper
+
+
+
+
+
+# [0.40.0](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.39.32...@next-core/editor-bricks-helper@0.40.0) (2022-06-02)
+
+
+### Features
+
+* **BuilderDataManager:** support workbench move ([d6f892e](https://github.com/easyops-cn/next-core/commit/d6f892e684586873098fa1790001b4c8c8d690db))
+* **BuilderDataManager:** support workbench move ([e37f490](https://github.com/easyops-cn/next-core/commit/e37f490c5580182da3638ad9ffa81267b51638aa))
+
+
+
+
+
 ## [0.39.32](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.39.31...@next-core/editor-bricks-helper@0.39.32) (2022-06-01)
 
 **Note:** Version bump only for package @next-core/editor-bricks-helper

package/dist/index.bundle.js

@@ -678,6 +678,7 @@
     BuilderInternalEventType["HIGHLIGHT_NODES_CHANGE"] = "builder.highlightNodes.change";
     BuilderInternalEventType["OUTLINE_DISABLED_NODES_CHANGE"] = "builder.outlineDisabledNodes.change";
     BuilderInternalEventType["DROPPING_STATUS_CHANGE"] = "builder.droppingStatus.change";
+    BuilderInternalEventType["WORKBENCH_TREE_NODE_MOVE"] = "workbench.tree.node.move";
   })(BuilderInternalEventType || (BuilderInternalEventType = {}));
 
   var storageKeyOfOutlineDisabledNodes = "builder-outline-disabled-nodes";
@@ -815,7 +816,8 @@
         nodeUid,
         parentUid,
         nodeUids,
-        nodeData
+        nodeData,
+        sort
       } = detail;
       var {
         nodes: addNodes,
@@ -826,7 +828,7 @@
         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,15 +1065,197 @@
       var orderedEdges = lodash.sortBy(relatedEdges, edge => mountPoints.indexOf(edge.mountPoint), edge => orderedSiblingEdges.indexOf(edge));
       this.reorder(parentUid, orderedEdges);
     }
+
+    getDragInfo(_ref3) {
+      var _dragEdge$mountPoint;
+
+      var {
+        nodeData,
+        dragNodeUid,
+        dragOverNodeUid,
+        dragStatus
+      } = _ref3;
+      var {
+        rootId,
+        nodes,
+        edges
+      } = this.data;
+      var isDragRoot = dragOverNodeUid === rootId;
+      /*
+       * 如果没有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(新增节点为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 parentEdge = edges.find(item => item.child === dragOverNodeUid);
+      /**
+       * 如果是根节点, parentUid强制等于rootId
+       * 如果是拖动进某个节点, 则当前节点为该节点parent
+       * 否则, 等于该节点的父节点
+       */
+
+      var parentUid = isDragRoot ? rootId : dragStatus === "inside" ? parentEdge.child : parentEdge.parent;
+      var parnetNodeData = nodes.find(item => item.$$uid === parentUid); // 找到节点父亲等于拖动节点的父节点(寻找兄弟节点)
+
+      var siblingEdge = edges.filter(edge => edge.child !== dragNodeUid && edge.parent === parentUid);
+      var sortUids = lodash.sortBy(siblingEdge, "sort").map(item => item.child);
+      var sortNodeIds = sortUids.map(item => {
+        return nodes.find(node => node.$$uid === item).id;
+      });
+      var sortIndex;
+
+      if (dragStatus === "inside") {
+        sortIndex = siblingEdge.length ? Math.max(...siblingEdge.map(item => item.sort)) + 1 : 0; // 插入默认插最后
+
+        sortNodeIds.push(nodeData.id);
+      } else if (dragStatus === "top" || dragStatus === "bottom") {
+        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 = 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: parentUid,
+          child: dragNodeUid,
+          mountPoint: mountPoint,
+          sort: sortIndex,
+          $$isTemplateDelegated: isParentExpandableTemplate(nodes, parentUid)
+        }),
+        wrapperNode
+      };
+      this.data = _objectSpread__default["default"](_objectSpread__default["default"]({}, newData), {}, {
+        edges: reorderBuilderEdges(newData, {
+          parentUid,
+          nodeUids
+        })
+      });
+      this.triggerDataChange();
+      this.eventTarget.dispatchEvent(new CustomEvent(BuilderInternalEventType.WORKBENCH_TREE_NODE_MOVE, {
+        detail: {
+          nodeUid: dragNodeUid,
+          nodeInstanceId: nodeData.instanceId,
+          nodeIds,
+          nodeData: {
+            parent: parnetNodeData.instanceId,
+            mountPoint: mountPoint
+          }
+        }
+      }));
+    }
     /**
      * Move mount-point up or down.
      */
 
 
-    moveMountPoint(_ref3, mountPoint, direction) {
+    moveMountPoint(_ref4, mountPoint, direction) {
       var {
         $$uid: parentUid
-      } = _ref3;
+      } = _ref4;
       var {
         relatedEdges,
         mountPoints
@@ -1196,6 +1380,13 @@
       };
     }
 
+    onWorkbenchTreeNodeMove(fn) {
+      this.eventTarget.addEventListener(BuilderInternalEventType.WORKBENCH_TREE_NODE_MOVE, fn);
+      return () => {
+        this.eventTarget.removeEventListener(BuilderInternalEventType.WORKBENCH_TREE_NODE_MOVE, fn);
+      };
+    }
+
     onNodeClick(fn) {
       this.eventTarget.addEventListener(BuilderInternalEventType.NODE_CLICK, fn);
       return () => {