From 70de3c68a8c3683cd638ecbe3591908ec1ec65ed Mon Sep 17 00:00:00 2001 From: libertyspy Date: Sun, 8 Feb 2026 18:41:38 +0800 Subject: [PATCH] Initial commit --- modeler/src/views/decision/builder/element.ts | 27 +++++++++++-------- modeler/src/views/decision/builder/hooks.ts | 11 +++++--- modeler/src/views/decision/builder/node.vue | 4 +-- modeler/src/views/decision/properties.vue | 2 +- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/modeler/src/views/decision/builder/element.ts b/modeler/src/views/decision/builder/element.ts index af077fa..7d9bf03 100644 --- a/modeler/src/views/decision/builder/element.ts +++ b/modeler/src/views/decision/builder/element.ts @@ -22,7 +22,6 @@ export interface DraggableElement { [key: string]: unknown; } - export type ElementStatus = 'default' | 'success' | 'failed' | 'running' | string | null export interface ElementPosition { @@ -39,10 +38,15 @@ export interface ElementVariable { } export interface BaseElement { - id: number; - key: NullableString; - type: NullableString; - status: ElementStatus; + key: string; + name: string; + type: string; + width: number; + height: number; + position: ElementPosition; + category: NullableString; + element?: DraggableElement; + [key: string]: unknown; } export interface TaskNodeRect { @@ -54,11 +58,6 @@ export interface TaskNodeRect { export interface TaskNodeElement extends BaseElement { template: number; - name: NullableString; - description: NullableString; - width: number; - height: number; - position: ElementPosition; inputs: any; outputs: any; variables: ElementVariable[]; @@ -73,10 +72,16 @@ export interface SettingTaskNodeElement extends TaskNodeElement { settings: NodeSetting[]; } +export interface ModelElement extends BaseElement { + edges: EdgeNodeElement[]; +} -export interface EdgeNodeElement extends BaseElement { +export interface EdgeNodeElement { + key: NullableString; source: NullableString; + sourceName: NullableString; target: NullableString; + targetName: NullableString; attrs: Record; router: Record; connector: any; diff --git a/modeler/src/views/decision/builder/hooks.ts b/modeler/src/views/decision/builder/hooks.ts index dd5606d..e6f8667 100644 --- a/modeler/src/views/decision/builder/hooks.ts +++ b/modeler/src/views/decision/builder/hooks.ts @@ -151,15 +151,18 @@ export const useGraphCanvas = (readonly: boolean = false): UseGraphCanvas => { // 将连线存储到节点数据中 const sourceEdges = sourceData.edges || []; - const existingEdge = sourceEdges.find(e => e.targetKey === targetNode.id); + const existingEdge = sourceEdges.find(e => e.target === targetNode.id); if (!existingEdge) { sourceEdges.push({ key: edge.id, - sourceKey: sourceNode.id, + source: sourceNode.id, sourceName: sourceData.name, - targetKey: targetNode.id, - targetName: targetData.name, + connector: {}, + router: {}, + attrs: {}, + target: targetNode.id, + targetName: targetData.name }); sourceNode.replaceData({ ...sourceData, edges: sourceEdges }); } diff --git a/modeler/src/views/decision/builder/node.vue b/modeler/src/views/decision/builder/node.vue index 8282732..3f7170a 100644 --- a/modeler/src/views/decision/builder/node.vue +++ b/modeler/src/views/decision/builder/node.vue @@ -18,7 +18,7 @@
@@ -43,7 +43,7 @@ >
-
+
{{ element?.name ?? '-' }} diff --git a/modeler/src/views/decision/properties.vue b/modeler/src/views/decision/properties.vue index 165d59b..faa3ebb 100644 --- a/modeler/src/views/decision/properties.vue +++ b/modeler/src/views/decision/properties.vue @@ -111,7 +111,7 @@