@flowgram.ai/free-layout-core 0.1.0-alpha.5 → 0.1.0-alpha.7

package/dist/index.d.mts

@@ -2,8 +2,8 @@ import { PlaygroundConfigEntity, CommandService, PlaygroundDragEvent, EntityData
 export { bindConfigEntity, useConfigEntity, useEntities, useEntityDataFromContext, useEntityFromContext, useListenEvents, usePlayground, usePlaygroundContainer, usePlaygroundContext, usePlaygroundLatest, useRefresh, useService } from '@flowgram.ai/core';
 import { NodeFormProps } from '@flowgram.ai/node';
 import { FlowOperationBaseService, FlowNodeType, FlowOperationBaseServiceImpl, FlowNodeEntityOrId, FlowNodeEntity } from '@flowgram.ai/document';
-import { W as WorkflowHoverService, a as WorkflowDocument, b as WorkflowLinesManager, c as WorkflowSelectService, d as WorkflowDocumentOptions, L as LineEventProps, N as NodesDragEvent, e as WorkflowNodeJSON, f as WorkflowPortEntity, g as WorkflowLineEntity, O as OnDragLineEnd, h as WorkflowPorts, i as WorkflowPortType, j as WorkflowPort, k as LineRenderType, l as WorkflowLineRenderContribution, m as LinePosition } from './workflow-line-entity-CF97dniV.mjs';
-export { C as LINE_HOVER_DISTANCE, v as LineColor, w as LineColors, u as LineType, z as NodesDragEndEvent, y as NodesDragStartEvent, A as NodesDraggingEvent, P as POINT_RADIUS, G as PORT_SIZE, o as WORKFLOW_LINE_ENTITY, I as WorkfloEntityHoverable, s as WorkflowContentChangeEvent, r as WorkflowContentChangeType, K as WorkflowDocumentOptionsDefault, J as WorkflowDocumentProvider, q as WorkflowJSON, E as WorkflowLineEntityOpts, F as WorkflowLineInfo, D as WorkflowLinePortInfo, x as WorkflowLineRenderContributionFactory, t as WorkflowNodeMeta, H as WorkflowPortEntityOpts, p as domReactToBounds, n as getPortEntityId, B as onDragLineEndParams } from './workflow-line-entity-CF97dniV.mjs';
+import { W as WorkflowHoverService, a as WorkflowDocument, b as WorkflowLinesManager, c as WorkflowSelectService, d as WorkflowDocumentOptions, L as LineEventProps, N as NodesDragEvent, e as WorkflowNodeJSON, f as WorkflowPortEntity, g as WorkflowLineEntity, O as OnDragLineEnd, h as WorkflowPorts, i as WorkflowPortType, j as WorkflowPort, k as LineRenderType, l as WorkflowLineRenderContribution, m as LinePosition } from './workflow-line-entity-DgCmDX1d.mjs';
+export { C as LINE_HOVER_DISTANCE, v as LineColor, w as LineColors, u as LineType, z as NodesDragEndEvent, y as NodesDragStartEvent, A as NodesDraggingEvent, P as POINT_RADIUS, G as PORT_SIZE, o as WORKFLOW_LINE_ENTITY, I as WorkfloEntityHoverable, s as WorkflowContentChangeEvent, r as WorkflowContentChangeType, K as WorkflowDocumentOptionsDefault, J as WorkflowDocumentProvider, q as WorkflowJSON, E as WorkflowLineEntityOpts, F as WorkflowLineInfo, D as WorkflowLinePortInfo, x as WorkflowLineRenderContributionFactory, t as WorkflowNodeMeta, H as WorkflowPortEntityOpts, p as domReactToBounds, n as getPortEntityId, B as onDragLineEndParams } from './workflow-line-entity-DgCmDX1d.mjs';
 import { W as WorkflowNodeEntity } from './workflow-sub-canvas-DOVla1mw.mjs';
 export { a as WorkflowSubCanvas } from './workflow-sub-canvas-DOVla1mw.mjs';
 import * as _flowgram_ai_utils from '@flowgram.ai/utils';

package/dist/index.d.ts

@@ -2,8 +2,8 @@ import { PlaygroundConfigEntity, CommandService, PlaygroundDragEvent, EntityData
 export { bindConfigEntity, useConfigEntity, useEntities, useEntityDataFromContext, useEntityFromContext, useListenEvents, usePlayground, usePlaygroundContainer, usePlaygroundContext, usePlaygroundLatest, useRefresh, useService } from '@flowgram.ai/core';
 import { NodeFormProps } from '@flowgram.ai/node';
 import { FlowOperationBaseService, FlowNodeType, FlowOperationBaseServiceImpl, FlowNodeEntityOrId, FlowNodeEntity } from '@flowgram.ai/document';
-import { W as WorkflowHoverService, a as WorkflowDocument, b as WorkflowLinesManager, c as WorkflowSelectService, d as WorkflowDocumentOptions, L as LineEventProps, N as NodesDragEvent, e as WorkflowNodeJSON, f as WorkflowPortEntity, g as WorkflowLineEntity, O as OnDragLineEnd, h as WorkflowPorts, i as WorkflowPortType, j as WorkflowPort, k as LineRenderType, l as WorkflowLineRenderContribution, m as LinePosition } from './workflow-line-entity-niuFXSbE.js';
-export { C as LINE_HOVER_DISTANCE, v as LineColor, w as LineColors, u as LineType, z as NodesDragEndEvent, y as NodesDragStartEvent, A as NodesDraggingEvent, P as POINT_RADIUS, G as PORT_SIZE, o as WORKFLOW_LINE_ENTITY, I as WorkfloEntityHoverable, s as WorkflowContentChangeEvent, r as WorkflowContentChangeType, K as WorkflowDocumentOptionsDefault, J as WorkflowDocumentProvider, q as WorkflowJSON, E as WorkflowLineEntityOpts, F as WorkflowLineInfo, D as WorkflowLinePortInfo, x as WorkflowLineRenderContributionFactory, t as WorkflowNodeMeta, H as WorkflowPortEntityOpts, p as domReactToBounds, n as getPortEntityId, B as onDragLineEndParams } from './workflow-line-entity-niuFXSbE.js';
+import { W as WorkflowHoverService, a as WorkflowDocument, b as WorkflowLinesManager, c as WorkflowSelectService, d as WorkflowDocumentOptions, L as LineEventProps, N as NodesDragEvent, e as WorkflowNodeJSON, f as WorkflowPortEntity, g as WorkflowLineEntity, O as OnDragLineEnd, h as WorkflowPorts, i as WorkflowPortType, j as WorkflowPort, k as LineRenderType, l as WorkflowLineRenderContribution, m as LinePosition } from './workflow-line-entity-B8wC-OVt.js';
+export { C as LINE_HOVER_DISTANCE, v as LineColor, w as LineColors, u as LineType, z as NodesDragEndEvent, y as NodesDragStartEvent, A as NodesDraggingEvent, P as POINT_RADIUS, G as PORT_SIZE, o as WORKFLOW_LINE_ENTITY, I as WorkfloEntityHoverable, s as WorkflowContentChangeEvent, r as WorkflowContentChangeType, K as WorkflowDocumentOptionsDefault, J as WorkflowDocumentProvider, q as WorkflowJSON, E as WorkflowLineEntityOpts, F as WorkflowLineInfo, D as WorkflowLinePortInfo, x as WorkflowLineRenderContributionFactory, t as WorkflowNodeMeta, H as WorkflowPortEntityOpts, p as domReactToBounds, n as getPortEntityId, B as onDragLineEndParams } from './workflow-line-entity-B8wC-OVt.js';
 import { W as WorkflowNodeEntity } from './workflow-sub-canvas-DOVla1mw.js';
 export { a as WorkflowSubCanvas } from './workflow-sub-canvas-DOVla1mw.js';
 import * as _flowgram_ai_utils from '@flowgram.ai/utils';

package/dist/index.js

@@ -293,10 +293,17 @@ var WorkflowPortEntity = class extends import_core4.Entity {
   }
   /**
    * 当前点位上连接的线条
+   * @deprecated use `availableLines` instead
    */
   get lines() {
     return this.allLines.filter((line) => !line.isDrawing);
   }
+  /**
+   * 当前有效的线条，不包含正在画的线条和隐藏的线条（这个出现在线条重连会先把原来的线条隐藏）
+   */
+  get availableLines() {
+    return this.allLines.filter((line) => !line.isDrawing && !line.isHidden);
+  }
   /**
    * 当前点位上连接的线条（包含 isDrawing === true 的线条）
    */
@@ -521,7 +528,7 @@ var _WorkflowNodeLinesData = class _WorkflowNodeLinesData extends import_core6.E
   constructor(entity) {
     super(entity);
     this.entity = entity;
-    this.toDispose.push(
+    this.entity.preDispose.push(
       import_utils6.Disposable.create(() => {
         this.inputLines.slice().forEach((line) => line.dispose());
         this.outputLines.slice().forEach((line) => line.dispose());
@@ -1748,10 +1755,12 @@ var WorkflowDocument = class extends import_document7.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) {
@@ -2089,112 +2098,17 @@ var WorkflowDocument = class extends import_document7.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(import_document7.FlowNodeBaseType.ROOT, rootBlockIDs);
-    nodeEdges.set(import_document7.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(import_document7.FlowNodeBaseType.ROOT) ?? []);
-    const rootEdgeSet = new Set(nodeEdges.get(import_document7.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;
@@ -2214,7 +2128,7 @@ var WorkflowDocument = class extends import_document7.FlowDocument {
   }
   toLineJSON(line) {
     const lineJSON = line.toJSON();
-    if (!line.to || !line.info.to || !line.toPort) {
+    if (!line.from || !line.info.from || !line.fromPort || !line.to || !line.info.to || !line.toPort) {
       return;
     }
     const fromSubCanvas = this.getNodeSubCanvas(line.from);
@@ -2334,7 +2248,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);
@@ -2344,7 +2258,6 @@ var WorkflowDragService = class {
     if (sameParent && sameParent.flowNodeType !== import_document9.FlowNodeBaseType.ROOT) {
       selectedNodes = [sameParent];
     }
-    const { altKey } = triggerEvent;
     let startPosition = this.getNodesPosition(selectedNodes);
     let startPositions = selectedNodes.map((node) => {
       const transform = node.getData(import_core15.TransformData);
@@ -2358,7 +2271,6 @@ var WorkflowDragService = class {
           type: "onDragStart",
           nodes: selectedNodes,
           startPositions,
-          altKey,
           dragEvent,
           triggerEvent,
           dragger
@@ -2367,25 +2279,6 @@ var WorkflowDragService = class {
       onDrag: (dragEvent) => {
         if (!dragSuccess && checkDragSuccess(Date.now() - startTime, dragEvent)) {
           dragSuccess = true;
-          if (altKey) {
-            const tryCopyNodes = selectedNodes;
-            if (tryCopyNodes.length > 0) {
-              this.selectService.clear();
-              this.commandService.executeCommand("PASTE_NODES" /* PASTE_NODES */, tryCopyNodes, true).then((newNodes) => {
-                if (newNodes && Array.isArray(newNodes) && newNodes.length > 0) {
-                  selectedNodes = newNodes;
-                  startPosition = this.getNodesPosition(tryCopyNodes);
-                  startPositions = tryCopyNodes.filter((n) => !n.getNodeMeta().copyDisable).map((node) => {
-                    const transform = node.getData(import_core15.TransformData);
-                    return {
-                      x: transform.position.x,
-                      y: transform.position.y
-                    };
-                  });
-                }
-              });
-            }
-          }
         }
         const offset = this.getDragPosOffset({
           event: dragEvent,
@@ -2416,7 +2309,6 @@ var WorkflowDragService = class {
           nodes: selectedNodes,
           startPositions,
           positions,
-          altKey,
           dragEvent,
           triggerEvent,
           dragger
@@ -2428,7 +2320,6 @@ var WorkflowDragService = class {
           type: "onDragEnd",
           nodes: selectedNodes,
           startPositions,
-          altKey,
           dragEvent,
           triggerEvent,
           dragger
@@ -2511,10 +2402,7 @@ var WorkflowDragService = class {
           dragNodeType: type,
           dropNode
         });
-        if (!allowDrop) {
-          return this.clearDrop();
-        }
-        const dragNode = await this.dropCard(type, e, data, dropNode);
+        const dragNode = allowDrop ? await this.dropCard(type, e, data, dropNode) : void 0;
         this.clearDrop();
         if (dragNode) {
           domNode.remove();
@@ -2763,7 +2651,10 @@ var WorkflowDragService = class {
         this.setLineColor(line, this.linesManager.lineColor.drawing);
         if (toNode && !this.isContainer(toNode)) {
           const portsData = toNode.getData(WorkflowNodePortsData);
-          toPort = portsData.inputPorts[0];
+          const { inputPorts } = portsData;
+          if (inputPorts.length === 1) {
+            toPort = inputPorts[0];
+          }
           const { hasError } = this.handleDragOnNode(toNode, fromPort, line, toPort, originLine);
           lineErrorReset = hasError;
         }