@flowgram.ai/free-layout-core 0.1.23 → 0.1.24

package/dist/esm/index.js

@@ -482,7 +482,7 @@ var _WorkflowNodeLinesData = class _WorkflowNodeLinesData extends EntityData2 {
   constructor(entity) {
     super(entity);
     this.entity = entity;
-    this.toDispose.push(
+    this.entity.preDispose.push(
       Disposable.create(() => {
         this.inputLines.slice().forEach((line) => line.dispose());
         this.outputLines.slice().forEach((line) => line.dispose());
@@ -1701,10 +1701,12 @@ var WorkflowDocument = class extends FlowDocument {
    * @param json
    */
   fromJSON(json, fireRender = true) {
-    const { flattenJSON, nodeBlocks, nodeEdges } = this.flatJSON(json);
-    const nestedJSON = this.nestJSON(flattenJSON, nodeBlocks, nodeEdges);
+    const workflowJSON = {
+      nodes: json.nodes ?? [],
+      edges: json.edges ?? []
+    };
     this.entityManager.changeEntityLocked = true;
-    this.renderJSON(nestedJSON);
+    this.renderJSON(workflowJSON);
     this.entityManager.changeEntityLocked = false;
     this.transformer.loading = false;
     if (fireRender) {
@@ -2042,112 +2044,17 @@ var WorkflowDocument = class extends FlowDocument {
     this.disposed = true;
     this._onReloadEmitter.dispose();
   }
-  getEdgeID(edge) {
-    return WorkflowLineEntity.portInfoToLineId({
-      from: edge.sourceNodeID,
-      to: edge.targetNodeID,
-      fromPort: edge.sourcePortID,
-      toPort: edge.targetPortID
-    });
-  }
-  /**
-   * 拍平树形json结构，将结构信息提取到map
-   */
-  flatJSON(json = { nodes: [], edges: [] }) {
-    const nodeBlocks = /* @__PURE__ */ new Map();
-    const nodeEdges = /* @__PURE__ */ new Map();
-    const rootNodes = json.nodes ?? [];
-    const rootEdges = json.edges ?? [];
-    const flattenNodeJSONs = [...rootNodes];
-    const flattenEdgeJSONs = [...rootEdges];
-    const rootBlockIDs = rootNodes.map((node) => node.id);
-    const rootEdgeIDs = rootEdges.map((edge) => this.getEdgeID(edge));
-    nodeBlocks.set(FlowNodeBaseType.ROOT, rootBlockIDs);
-    nodeEdges.set(FlowNodeBaseType.ROOT, rootEdgeIDs);
-    rootNodes.forEach((nodeJSON) => {
-      const { blocks, edges } = nodeJSON;
-      if (blocks) {
-        flattenNodeJSONs.push(...blocks);
-        const blockIDs = [];
-        blocks.forEach((block) => {
-          blockIDs.push(block.id);
-        });
-        nodeBlocks.set(nodeJSON.id, blockIDs);
-        delete nodeJSON.blocks;
-      }
-      if (edges) {
-        flattenEdgeJSONs.push(...edges);
-        const edgeIDs = [];
-        edges.forEach((edge) => {
-          const edgeID = this.getEdgeID(edge);
-          edgeIDs.push(edgeID);
-        });
-        nodeEdges.set(nodeJSON.id, edgeIDs);
-        delete nodeJSON.edges;
-      }
-    });
-    const flattenJSON = {
-      nodes: flattenNodeJSONs,
-      edges: flattenEdgeJSONs
-    };
-    return {
-      flattenJSON,
-      nodeBlocks,
-      nodeEdges
-    };
-  }
-  /**
-   * 对JSON进行分层
-   */
-  nestJSON(flattenJSON, nodeBlocks, nodeEdges) {
-    const nestJSON = {
-      nodes: [],
-      edges: []
-    };
-    const nodeMap = /* @__PURE__ */ new Map();
-    const edgeMap = /* @__PURE__ */ new Map();
-    const rootBlockSet = new Set(nodeBlocks.get(FlowNodeBaseType.ROOT) ?? []);
-    const rootEdgeSet = new Set(nodeEdges.get(FlowNodeBaseType.ROOT) ?? []);
-    flattenJSON.nodes.forEach((nodeJSON) => {
-      nodeMap.set(nodeJSON.id, nodeJSON);
-    });
-    flattenJSON.edges.forEach((edgeJSON) => {
-      const edgeID = this.getEdgeID(edgeJSON);
-      edgeMap.set(edgeID, edgeJSON);
-    });
-    flattenJSON.nodes.forEach((nodeJSON) => {
-      if (rootBlockSet.has(nodeJSON.id)) {
-        nestJSON.nodes.push(nodeJSON);
-      }
-      if (nodeBlocks.has(nodeJSON.id)) {
-        const blockIDs = nodeBlocks.get(nodeJSON.id);
-        const blockJSONs = blockIDs.map((blockID) => nodeMap.get(blockID)).filter(Boolean);
-        nodeJSON.blocks = blockJSONs;
-      }
-      if (nodeEdges.has(nodeJSON.id)) {
-        const edgeIDs = nodeEdges.get(nodeJSON.id);
-        const edgeJSONs = edgeIDs.map((edgeID) => edgeMap.get(edgeID)).filter(Boolean);
-        nodeJSON.edges = edgeJSONs;
-      }
-    });
-    flattenJSON.edges.forEach((edgeJSON) => {
-      const edgeID = this.getEdgeID(edgeJSON);
-      if (rootEdgeSet.has(edgeID)) {
-        nestJSON.edges.push(edgeJSON);
-      }
-    });
-    return nestJSON;
-  }
   /**
    * 逐层创建节点和线条
    */
   renderJSON(json, options) {
     const { parent = this.root, isClone = false } = options ?? {};
     const containerID = this.getNodeSubCanvas(parent)?.canvasNode.id ?? parent.id;
-    json.nodes.forEach((nodeJSON) => {
-      this.createWorkflowNode(nodeJSON, isClone, containerID);
-    }), // 创建线条
-    json.edges.forEach((edge) => this.createWorkflowLine(edge, containerID));
+    const nodes = json.nodes.map(
+      (nodeJSON) => this.createWorkflowNode(nodeJSON, isClone, containerID)
+    );
+    const edges = json.edges.map((edge) => this.createWorkflowLine(edge, containerID)).filter(Boolean);
+    return { nodes, edges };
   }
   getNodeSubCanvas(node) {
     if (!node) return;
@@ -2287,7 +2194,7 @@ var WorkflowDragService = class {
    * 拖拽选中节点
    * @param triggerEvent
    */
-  startDragSelectedNodes(triggerEvent) {
+  async startDragSelectedNodes(triggerEvent) {
     let { selectedNodes } = this.selectService;
     if (selectedNodes.length === 0 || this.playgroundConfig.readonly || this.playgroundConfig.disabled || this.isDragging) {
       return Promise.resolve(false);