@flowgram.ai/free-layout-core 0.5.1 → 0.5.3

package/dist/esm/typings/index.js

@@ -15,7 +15,7 @@ import {
 import "../chunk-DDJTYHXN.js";
 import {
   WorkflowOperationBaseService
-} from "../chunk-O4WKIIW2.js";
+} from "../chunk-3UW6BHP2.js";
 import "../chunk-EUXUH3YW.js";
 export {
   LineColors,

package/dist/esm/typings/workflow-operation.js

@@ -1,6 +1,6 @@
 import {
   WorkflowOperationBaseService
-} from "../chunk-O4WKIIW2.js";
+} from "../chunk-3UW6BHP2.js";
 import "../chunk-EUXUH3YW.js";
 export {
   WorkflowOperationBaseService

package/dist/index.d.mts

@@ -2,8 +2,8 @@ import { PlaygroundConfigEntity, CommandService, PlaygroundDragEvent, EntityData
 export { bindConfigEntity, useConfigEntity, useEntities, useEntityDataFromContext, useEntityFromContext, useListenEvents, usePlayground, usePlaygroundContainer, usePlaygroundContext, 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 WorkflowJSON, L as LineCenterPoint, a as WorkflowDocument, b as WorkflowNodeEntity, c as WorkflowHoverService, d as WorkflowLinesManager, e as WorkflowSelectService, f as WorkflowDocumentOptions, g as LineEventProps, N as NodesDragEvent, h as WorkflowNodeJSON, i as WorkflowPortEntity, j as WorkflowLineEntity, O as OnDragLineEnd, k as LineRenderType, l as WorkflowLineRenderContribution, m as LinePosition } from './workflow-node-entity-lKu00Aj4.mjs';
-export { X as HoverPosition, F as LINE_HOVER_DISTANCE, x as LineColor, y as LineColors, w as LinePoint, v as LinePointLocation, u as LineType, C as NodesDragEndEvent, B as NodesDragStartEvent, D as NodesDraggingEvent, P as POINT_RADIUS, K as PORT_SIZE, p as WORKFLOW_LINE_ENTITY, Y as WorkfloEntityHoverable, s as WorkflowContentChangeEvent, r as WorkflowContentChangeType, _ as WorkflowDocumentOptionsDefault, Z as WorkflowDocumentProvider, V as WorkflowEntityHoverable, H as WorkflowLineEntityOpts, I as WorkflowLineInfo, G as WorkflowLinePortInfo, z as WorkflowLineRenderContributionFactory, J as WorkflowLineUIState, T as WorkflowNodeLines, U as WorkflowNodeLinesData, t as WorkflowNodeMeta, S as WorkflowNodePortsData, M as WorkflowPort, R as WorkflowPortEntityOpts, n as WorkflowPortType, Q as WorkflowPorts, A as WorkflowSubCanvas, q as domReactToBounds, o as getPortEntityId, E as onDragLineEndParams } from './workflow-node-entity-lKu00Aj4.mjs';
+import { W as WorkflowJSON, L as LineCenterPoint, a as WorkflowDocument, b as WorkflowNodeEntity, c as WorkflowHoverService, d as WorkflowLinesManager, e as WorkflowSelectService, f as WorkflowDocumentOptions, g as LineEventProps, N as NodesDragEvent, h as WorkflowNodeJSON, i as WorkflowPortEntity, j as WorkflowLineEntity, O as OnDragLineEnd, k as LineRenderType, l as WorkflowLineRenderContribution, m as LinePosition } from './workflow-node-entity-DgQT-wl9.mjs';
+export { X as HoverPosition, F as LINE_HOVER_DISTANCE, x as LineColor, y as LineColors, w as LinePoint, v as LinePointLocation, u as LineType, C as NodesDragEndEvent, B as NodesDragStartEvent, D as NodesDraggingEvent, P as POINT_RADIUS, K as PORT_SIZE, p as WORKFLOW_LINE_ENTITY, Y as WorkfloEntityHoverable, s as WorkflowContentChangeEvent, r as WorkflowContentChangeType, _ as WorkflowDocumentOptionsDefault, Z as WorkflowDocumentProvider, V as WorkflowEntityHoverable, H as WorkflowLineEntityOpts, I as WorkflowLineInfo, G as WorkflowLinePortInfo, z as WorkflowLineRenderContributionFactory, J as WorkflowLineUIState, T as WorkflowNodeLines, U as WorkflowNodeLinesData, t as WorkflowNodeMeta, S as WorkflowNodePortsData, M as WorkflowPort, R as WorkflowPortEntityOpts, n as WorkflowPortType, Q as WorkflowPorts, A as WorkflowSubCanvas, q as domReactToBounds, o as getPortEntityId, E as onDragLineEndParams } from './workflow-node-entity-DgQT-wl9.mjs';
 import * as _flowgram_ai_utils from '@flowgram.ai/utils';
 import { IPoint, Rectangle, DisposableCollection, Disposable } from '@flowgram.ai/utils';
 export { compose, composeAsync, delay } from '@flowgram.ai/utils';
@@ -228,9 +228,11 @@ declare class WorkflowResetLayoutService {
 
 declare class WorkflowOperationBaseServiceImpl extends FlowOperationBaseServiceImpl implements WorkflowOperationBaseService {
     protected document: WorkflowDocument;
+    linesManager: WorkflowLinesManager;
     private onNodePostionUpdateEmitter;
     readonly onNodePostionUpdate: _flowgram_ai_utils.Event<NodePostionUpdateEvent>;
     updateNodePosition(nodeOrId: FlowNodeEntityOrId, position: IPoint): void;
+    fromJSON(json: WorkflowJSON): void;
 }
 
 /**

package/dist/index.d.ts

@@ -2,8 +2,8 @@ import { PlaygroundConfigEntity, CommandService, PlaygroundDragEvent, EntityData
 export { bindConfigEntity, useConfigEntity, useEntities, useEntityDataFromContext, useEntityFromContext, useListenEvents, usePlayground, usePlaygroundContainer, usePlaygroundContext, 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 WorkflowJSON, L as LineCenterPoint, a as WorkflowDocument, b as WorkflowNodeEntity, c as WorkflowHoverService, d as WorkflowLinesManager, e as WorkflowSelectService, f as WorkflowDocumentOptions, g as LineEventProps, N as NodesDragEvent, h as WorkflowNodeJSON, i as WorkflowPortEntity, j as WorkflowLineEntity, O as OnDragLineEnd, k as LineRenderType, l as WorkflowLineRenderContribution, m as LinePosition } from './workflow-node-entity-Cnte2phX.js';
-export { X as HoverPosition, F as LINE_HOVER_DISTANCE, x as LineColor, y as LineColors, w as LinePoint, v as LinePointLocation, u as LineType, C as NodesDragEndEvent, B as NodesDragStartEvent, D as NodesDraggingEvent, P as POINT_RADIUS, K as PORT_SIZE, p as WORKFLOW_LINE_ENTITY, Y as WorkfloEntityHoverable, s as WorkflowContentChangeEvent, r as WorkflowContentChangeType, _ as WorkflowDocumentOptionsDefault, Z as WorkflowDocumentProvider, V as WorkflowEntityHoverable, H as WorkflowLineEntityOpts, I as WorkflowLineInfo, G as WorkflowLinePortInfo, z as WorkflowLineRenderContributionFactory, J as WorkflowLineUIState, T as WorkflowNodeLines, U as WorkflowNodeLinesData, t as WorkflowNodeMeta, S as WorkflowNodePortsData, M as WorkflowPort, R as WorkflowPortEntityOpts, n as WorkflowPortType, Q as WorkflowPorts, A as WorkflowSubCanvas, q as domReactToBounds, o as getPortEntityId, E as onDragLineEndParams } from './workflow-node-entity-Cnte2phX.js';
+import { W as WorkflowJSON, L as LineCenterPoint, a as WorkflowDocument, b as WorkflowNodeEntity, c as WorkflowHoverService, d as WorkflowLinesManager, e as WorkflowSelectService, f as WorkflowDocumentOptions, g as LineEventProps, N as NodesDragEvent, h as WorkflowNodeJSON, i as WorkflowPortEntity, j as WorkflowLineEntity, O as OnDragLineEnd, k as LineRenderType, l as WorkflowLineRenderContribution, m as LinePosition } from './workflow-node-entity-kGsp2Roz.js';
+export { X as HoverPosition, F as LINE_HOVER_DISTANCE, x as LineColor, y as LineColors, w as LinePoint, v as LinePointLocation, u as LineType, C as NodesDragEndEvent, B as NodesDragStartEvent, D as NodesDraggingEvent, P as POINT_RADIUS, K as PORT_SIZE, p as WORKFLOW_LINE_ENTITY, Y as WorkfloEntityHoverable, s as WorkflowContentChangeEvent, r as WorkflowContentChangeType, _ as WorkflowDocumentOptionsDefault, Z as WorkflowDocumentProvider, V as WorkflowEntityHoverable, H as WorkflowLineEntityOpts, I as WorkflowLineInfo, G as WorkflowLinePortInfo, z as WorkflowLineRenderContributionFactory, J as WorkflowLineUIState, T as WorkflowNodeLines, U as WorkflowNodeLinesData, t as WorkflowNodeMeta, S as WorkflowNodePortsData, M as WorkflowPort, R as WorkflowPortEntityOpts, n as WorkflowPortType, Q as WorkflowPorts, A as WorkflowSubCanvas, q as domReactToBounds, o as getPortEntityId, E as onDragLineEndParams } from './workflow-node-entity-kGsp2Roz.js';
 import * as _flowgram_ai_utils from '@flowgram.ai/utils';
 import { IPoint, Rectangle, DisposableCollection, Disposable } from '@flowgram.ai/utils';
 export { compose, composeAsync, delay } from '@flowgram.ai/utils';
@@ -228,9 +228,11 @@ declare class WorkflowResetLayoutService {
 
 declare class WorkflowOperationBaseServiceImpl extends FlowOperationBaseServiceImpl implements WorkflowOperationBaseService {
     protected document: WorkflowDocument;
+    linesManager: WorkflowLinesManager;
     private onNodePostionUpdateEmitter;
     readonly onNodePostionUpdate: _flowgram_ai_utils.Event<NodePostionUpdateEvent>;
     updateNodePosition(nodeOrId: FlowNodeEntityOrId, position: IPoint): void;
+    fromJSON(json: WorkflowJSON): void;
 }
 
 /**

package/dist/index.js

@@ -2105,6 +2105,9 @@ var WorkflowDocument = class extends import_document8.FlowDocument {
     this._loading = false;
     this.onLoadedEmitter.fire();
   }
+  /**
+   * @deprecated use `ctx.operation.fromJSON` instead
+   */
   async reload(json, delayTime = 0) {
     if (this.disposed) return;
     this._loading = true;
@@ -2125,7 +2128,7 @@ var WorkflowDocument = class extends import_document8.FlowDocument {
       edges: json.edges ?? []
     };
     this.entityManager.changeEntityLocked = true;
-    this.renderJSON(workflowJSON);
+    this.batchAddFromJSON(workflowJSON);
     this.entityManager.changeEntityLocked = false;
     this.transformer.loading = false;
     if (fireRender) {
@@ -2145,9 +2148,17 @@ var WorkflowDocument = class extends import_document8.FlowDocument {
    * 创建流程节点
    * @param json
    */
-  createWorkflowNode(json, isClone = false, parentId) {
+  createWorkflowNode(json, isClone = false, parentID) {
+    return this._createWorkflowNode(json, { parentID });
+  }
+  /**
+   * 创建流程节点
+   * @param json
+   */
+  _createWorkflowNode(json, options) {
+    const { parentID, onNodeCreated, onEdgeCreated } = options ?? {};
     const isExistedNode = this.getNode(json.id);
-    const parent = this.getNode(parentId ?? this.root.id) ?? this.root;
+    const parent = this.getNode(parentID ?? this.root.id) ?? this.root;
     const node = this.addNode(
       {
         ...json,
@@ -2174,15 +2185,19 @@ var WorkflowDocument = class extends import_document8.FlowDocument {
     node.getData(import_core14.TransformData).update({
       position
     });
-    if (formMeta && formData && !formData.formModel.initialized) {
-      formData.createForm(formMeta, json.data);
-      formData.onDataChange(() => {
-        this.fireContentChange({
-          type: "NODE_DATA_CHANGE" /* NODE_DATA_CHANGE */,
-          toJSON: () => formData.toJSON(),
-          entity: node
+    if (formMeta && formData) {
+      if (!formData.formModel.initialized) {
+        formData.createForm(formMeta, json.data);
+        formData.onDataChange(() => {
+          this.fireContentChange({
+            type: "NODE_DATA_CHANGE" /* NODE_DATA_CHANGE */,
+            toJSON: () => formData.toJSON(),
+            entity: node
+          });
         });
-      });
+      } else {
+        formData.updateFormValues(json.data);
+      }
     }
     const positionData = node.getData(import_core14.PositionData);
     if (!isExistedNode) {
@@ -2221,11 +2236,12 @@ var WorkflowDocument = class extends import_document8.FlowDocument {
       });
     }
     if (json.blocks) {
-      this.renderJSON(
+      this.batchAddFromJSON(
         { nodes: json.blocks, edges: json.edges ?? [] },
         {
           parent: node,
-          isClone
+          onNodeCreated,
+          onEdgeCreated
         }
       );
     }
@@ -2357,7 +2373,7 @@ var WorkflowDocument = class extends import_document8.FlowDocument {
         throw new Error(`[WorkflowDocument.createWorkflowNodeByType] Node Id "${id}" duplicated.`);
       }
     }
-    return this.createWorkflowNode(
+    return this._createWorkflowNode(
       {
         ...json,
         id,
@@ -2368,13 +2384,15 @@ var WorkflowDocument = class extends import_document8.FlowDocument {
         blocks: json?.blocks,
         edges: json?.edges
       },
-      false,
-      parentID
+      { parentID }
     );
   }
   getAllNodes() {
     return this.entityManager.getEntities(WorkflowNodeEntity).filter((n) => n.id !== import_document8.FlowNodeBaseType.ROOT);
   }
+  getAllEdges() {
+    return this.entityManager.getEntities(WorkflowLineEntity);
+  }
   getAllPorts() {
     return this.entityManager.getEntities(WorkflowPortEntity).filter((p) => p.node.id !== import_document8.FlowNodeBaseType.ROOT);
   }
@@ -2475,7 +2493,7 @@ var WorkflowDocument = class extends import_document8.FlowDocument {
       x: json.meta.position.x + 30,
       y: json.meta.position.y + 30
     };
-    return this.createWorkflowNode(
+    return this._createWorkflowNode(
       {
         id: newNodeId || `1${nanoid2()}`,
         type: node.flowNodeType,
@@ -2487,16 +2505,17 @@ var WorkflowDocument = class extends import_document8.FlowDocument {
         blocks: json.blocks,
         edges: json.edges
       },
-      true,
-      node.parent?.id
+      {
+        parentID: node.parent?.id
+      }
     );
   }
-  copyNodeFromJSON(flowNodeType, nodeJSON, newNodeId, position, parentId) {
+  copyNodeFromJSON(flowNodeType, nodeJSON, newNodeId, position, parentID) {
     position = position || {
       x: nodeJSON.meta.position.x + 30,
       y: nodeJSON.meta.position.y + 30
     };
-    return this.createWorkflowNode(
+    return this._createWorkflowNode(
       {
         id: newNodeId || `1${nanoid2()}`,
         type: flowNodeType,
@@ -2508,8 +2527,9 @@ var WorkflowDocument = class extends import_document8.FlowDocument {
         blocks: nodeJSON.blocks,
         edges: nodeJSON.edges
       },
-      true,
-      parentId
+      {
+        parentID
+      }
     );
   }
   canRemove(node, silent) {
@@ -2564,13 +2584,19 @@ var WorkflowDocument = class extends import_document8.FlowDocument {
    * 批量添加节点
    */
   batchAddFromJSON(json, options) {
-    const { parent = this.root, isClone = false } = options ?? {};
-    const containerID = this.getNodeSubCanvas(parent)?.canvasNode.id ?? parent.id;
+    const { parent = this.root, onNodeCreated, onEdgeCreated } = options ?? {};
+    const parentID = this.getNodeSubCanvas(parent)?.canvasNode.id ?? parent.id;
     const processedJSON = buildGroupJSON(json);
     const nodes = processedJSON.nodes.map(
-      (nodeJSON) => this.createWorkflowNode(nodeJSON, isClone, containerID)
+      (nodeJSON) => this._createWorkflowNode(nodeJSON, {
+        parentID,
+        onNodeCreated,
+        onEdgeCreated
+      })
     );
-    const edges = processedJSON.edges.map((edge) => this.createWorkflowLine(edge, containerID)).filter(Boolean);
+    const edges = processedJSON.edges.map((edge) => this.createWorkflowLine(edge, parentID)).filter(Boolean);
+    nodes.forEach((node) => options?.onNodeCreated?.(node));
+    edges.forEach((edge) => options?.onEdgeCreated?.(edge));
     return { nodes, edges };
   }
   getNodeSubCanvas(node) {
@@ -2619,7 +2645,7 @@ var WorkflowDocument = class extends import_document8.FlowDocument {
     }
     return lineJSON;
   }
-  createWorkflowLine(json, parentId) {
+  createWorkflowLine(json, parentID) {
     const fromNode = this.getNode(json.sourceNodeID);
     const toNode = this.getNode(json.targetNodeID);
     if (!fromNode || !toNode) {
@@ -2632,10 +2658,10 @@ var WorkflowDocument = class extends import_document8.FlowDocument {
       toPort: json.targetPortID,
       data: json.data
     };
-    if (!parentId) {
+    if (!parentID) {
       return this.linesManager.createLine(lineInfo);
     }
-    const canvasNode = this.getNode(parentId);
+    const canvasNode = this.getNode(parentID);
     if (!canvasNode) {
       return this.linesManager.createLine(lineInfo);
     }
@@ -3580,10 +3606,64 @@ var WorkflowOperationBaseServiceImpl = class extends import_document12.FlowOpera
       newPosition: position
     });
   }
+  fromJSON(json) {
+    if (this.document.disposed) return;
+    const workflowJSON = {
+      nodes: json.nodes ?? [],
+      edges: json.edges ?? []
+    };
+    const oldNodes = this.document.getAllNodes();
+    const oldEdges = this.linesManager.getAllLines();
+    const oldPositionMap = new Map(
+      oldNodes.map((node) => [
+        node.id,
+        {
+          x: node.transform.transform.position.x,
+          y: node.transform.transform.position.y
+        }
+      ])
+    );
+    const newNodes = [];
+    const newEdges = [];
+    this.document.batchAddFromJSON(workflowJSON, {
+      onNodeCreated: (node) => newNodes.push(node),
+      onEdgeCreated: (edge) => newEdges.push(edge)
+    });
+    const newEdgeIDSet = new Set(newEdges.map((edge) => edge.id));
+    oldEdges.forEach((edge) => {
+      if (!newEdgeIDSet.has(edge.id)) {
+        edge.dispose();
+        return;
+      }
+    });
+    const newNodeIDSet = new Set(newNodes.map((node) => node.id));
+    oldNodes.forEach((node) => {
+      if (!newNodeIDSet.has(node.id)) {
+        node.dispose();
+        return;
+      }
+      const oldPosition = oldPositionMap.get(node.id);
+      const newPosition = {
+        x: node.transform.transform.position.x,
+        y: node.transform.transform.position.y
+      };
+      if (oldPosition && (oldPosition.x !== newPosition.x || oldPosition.y !== newPosition.y)) {
+        this.onNodePostionUpdateEmitter.fire({
+          node,
+          oldPosition,
+          newPosition
+        });
+      }
+    });
+    this.document.fireRender();
+  }
 };
 __decorateClass([
   (0, import_inversify8.inject)(WorkflowDocument)
 ], WorkflowOperationBaseServiceImpl.prototype, "document", 2);
+__decorateClass([
+  (0, import_inversify8.inject)(WorkflowLinesManager)
+], WorkflowOperationBaseServiceImpl.prototype, "linesManager", 2);
 
 // src/hooks/use-playground-readonly-state.ts
 var import_react = require("react");