From 6a56d6751d7787ce46dce2db17e6f25debfd1394 Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Fri, 13 Dec 2024 11:16:44 +0800
Subject: [PATCH] 1

---
 frontend/package-lock.json                    |  5 +-
 .../Workflow/Definition/Design/constants.ts   | 59 +++++++++++++++----
 .../Workflow/Definition/Design/index.tsx      |  5 +-
 3 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 989783cd..ef4a4968 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -176,6 +176,7 @@
       "version": "1.2.14-beta.8",
       "resolved": "https://registry.npmmirror.com/@antv/layout/-/layout-1.2.14-beta.8.tgz",
       "integrity": "sha512-/zP8pRz28ahYSVk4fsfhl3T1X3FvCAi7Q3YQ8H2LZEvTojYYrJtO2AXFsojehU6HGVnIAq+QIjd3He6ot8+gvA==",
+      "license": "MIT",
       "dependencies": {
         "@antv/event-emitter": "^0.1.3",
         "@antv/graphlib": "^2.0.0",
@@ -1854,7 +1855,8 @@
       "version": "0.7.52",
       "resolved": "https://registry.npmmirror.com/@types/dagre/-/dagre-0.7.52.tgz",
       "integrity": "sha512-XKJdy+OClLk3hketHi9Qg6gTfe1F3y+UFnHxKA2rn9Dw+oXa4Gb378Ztz9HlMgZKSxpPmn4BNVh9wgkpvrK1uw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/eslint": {
       "version": "9.6.1",
@@ -2919,6 +2921,7 @@
       "version": "0.8.5",
       "resolved": "https://registry.npmmirror.com/dagre/-/dagre-0.8.5.tgz",
       "integrity": "sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==",
+      "license": "MIT",
       "dependencies": {
         "graphlib": "^2.1.8",
         "lodash": "^4.17.15"
diff --git a/frontend/src/pages/Workflow/Definition/Design/constants.ts b/frontend/src/pages/Workflow/Definition/Design/constants.ts
index a4ec5634..b106bd49 100644
--- a/frontend/src/pages/Workflow/Definition/Design/constants.ts
+++ b/frontend/src/pages/Workflow/Definition/Design/constants.ts
@@ -1,6 +1,36 @@
 // 节点端口配置
 export const PORT_GROUPS = ['top', 'right', 'bottom', 'left'] as const;
 
+// 转换后端端口配置为X6格式
+export const convertPortConfig = (ports: any = {}) => {
+    const { groups = {}, types = [] } = ports;
+    
+    // 转换groups配置
+    const processedGroups: any = {};
+    Object.entries(groups).forEach(([key, group]: [string, any]) => {
+        processedGroups[key] = {
+            ...group,
+            attrs: {
+                circle: {
+                    ...group.attrs?.circle,
+                    magnet: true,
+                }
+            },
+            position: group.position
+        };
+    });
+
+    // 转换items配置
+    const items = types.map(type => ({
+        group: type
+    }));
+
+    return {
+        groups: processedGroups,
+        items
+    };
+};
+
 // 默认样式配置
 export const DEFAULT_STYLES = {
     node: {
@@ -51,17 +81,26 @@ export const GRID_CONFIG = {
 
 // 连接配置
 export const CONNECTING_CONFIG = {
-    router: 'manhattan',
-    connector: {
-        name: 'rounded',
-        args: {
-            radius: 8,
-        },
-    },
-    anchor: 'center',
-    connectionPoint: 'anchor',
-    allowBlank: false,
     snap: true,
+    allowBlank: false,
+    allowLoop: false,
+    highlight: true,
+    connector: 'rounded',
+    connectionPoint: 'boundary',
+    router: {
+        name: 'manhattan'
+    },
+    validateConnection({
+        sourceView,
+        targetView,
+        sourceMagnet,
+        targetMagnet
+    }: any) {
+        if (!sourceMagnet || !targetMagnet) {
+            return false;
+        }
+        return true;
+    }
 } as const;
 
 // 高亮配置
diff --git a/frontend/src/pages/Workflow/Definition/Design/index.tsx b/frontend/src/pages/Workflow/Definition/Design/index.tsx
index 63be9032..eeff5c26 100644
--- a/frontend/src/pages/Workflow/Definition/Design/index.tsx
+++ b/frontend/src/pages/Workflow/Definition/Design/index.tsx
@@ -13,7 +13,8 @@ import {
     GRID_CONFIG,
     CONNECTING_CONFIG,
     HIGHLIGHTING_CONFIG,
-    DEFAULT_STYLES
+    DEFAULT_STYLES,
+    convertPortConfig
 } from './constants';
 
 const WorkflowDesign: React.FC = () => {
@@ -108,7 +109,7 @@ const WorkflowDesign: React.FC = () => {
                             fontSize: 12,
                         }
                     },
-                    ports: nodeData.graph.ports
+                    ports: convertPortConfig(nodeData.graph.ports)
                 };
 
                 // 注册节点类型