feature: update seatunnel dag

flowerfine · Jan 18, 2024 · bca773f · bca773f
1 parent 724bec7
commit bca773f
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 6 deletions.
diff --git a/scaleph-ui-react2/src/pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/node/canvas-node.tsx b/scaleph-ui-react2/src/pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/node/canvas-node.tsx
@@ -98,13 +98,11 @@ const SeaTunnelConnectorDagNode = ({node}: { node: Node }) => {
             setDrawerForm({visible: visible, data: node});
           }}
           onOK={(values) => {
-            const graph = node?.model?.graph;
             node.setData({
               ...node.data,
               label: values[STEP_ATTR_TYPE.stepTitle],
               attrs: values
             })
-            graph?.updateCellId(node, node.id)
             setDrawerForm({visible: false, data: node});
           }}
           data={drawerForm.data}/>

diff --git a/scaleph-ui-react2/src/pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/node/init-node.tsx b/scaleph-ui-react2/src/pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/node/init-node.tsx
@@ -29,16 +29,19 @@ const InitShape: React.FC<Props<WsDiJob>> = ({data}) => {
           nodes.push({
             id: step.stepCode,
             shape: DAG_NODE,
+            view: "react-shape-view",
             position: {
               x: step.positionX,
               y: step.positionY
             },
-            ports: createPorts(step.stepMeta.type as string, step.stepCode),
+            ports: {
+              items: createItems(step.stepMeta.type as string, step.stepCode)
+            },
             data: {
               label: step.stepTitle,
               meta: step.stepMeta,
               attrs: step.stepAttrs
-            }
+            },
           });
         });
         addNodes(nodes)
@@ -62,7 +65,7 @@ const InitShape: React.FC<Props<WsDiJob>> = ({data}) => {
       });
     }, []);
 
-    const createPorts = (type: string, stepCode: string) => {
+    const createItems = (type: string, stepCode: string) => {
       if (type === 'source') {
         return [{
           id: stepCode + '-bottom',
@@ -88,6 +91,93 @@ const InitShape: React.FC<Props<WsDiJob>> = ({data}) => {
         return []
       }
     }
+
+    const createGroups = (type: string, name: string) => {
+    if (type === 'source') {
+      return {
+        top: {
+          position: "top",
+          attrs: {
+            circle: {
+              r: 4,
+              magnet: true,
+              stroke: '#C2C8D5',
+              strokeWidth: 1,
+              fill: "#fff"
+            }
+          }
+        },
+        bottom: {
+          position: "bottom",
+          attrs: {
+            circle: {
+              r: 4,
+              magnet: true,
+              stroke: '#C2C8D5',
+              strokeWidth: 1,
+              fill: "#fff"
+            }
+          }
+        }
+      }
+    } else if (type === 'sink') {
+      return {
+        top: {
+          position: "top",
+          attrs: {
+            circle: {
+              r: 4,
+              magnet: true,
+              stroke: '#C2C8D5',
+              strokeWidth: 1,
+              fill: "#fff"
+            }
+          }
+        },
+        bottom: {
+          position: "bottom",
+          attrs: {
+            circle: {
+              r: 4,
+              magnet: true,
+              stroke: '#C2C8D5',
+              strokeWidth: 1,
+              fill: "#fff"
+            }
+          }
+        }
+      }
+    } else if (type === 'transform') {
+      return {
+        top: {
+          position: "top",
+          attrs: {
+            circle: {
+              r: 4,
+              magnet: true,
+              stroke: '#C2C8D5',
+              strokeWidth: 1,
+              fill: "#fff"
+            }
+          }
+        },
+        bottom: {
+          position: "bottom",
+          attrs: {
+            circle: {
+              r: 4,
+              magnet: true,
+              stroke: '#C2C8D5',
+              strokeWidth: 1,
+              fill: "#fff"
+            }
+          }
+        }
+      }
+    } else {
+      return []
+    }
+  }
     return null;
   }
 ;

diff --git a/.../pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/node/steps/source/source-jdbc-step.tsx b/.../pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/node/steps/source/source-jdbc-step.tsx
@@ -33,8 +33,11 @@ const SourceJdbcStepForm: React.FC<ModalFormProps<Node>> = ({data, visible, onCa
             type="primary"
             onClick={() => {
               form.validateFields().then((values) => {
+                const attrs = Object.keys(values)
+                  .filter((key) => values[key] != null && values[key] != undefined)
+                  .reduce((acc, key) => ({...acc, [key]: values[key]}), {});
                 if (onOK) {
-                  onOK(values);
+                  onOK(attrs);
                 }
               });
             }}