diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/workflow/page.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/workflow/page.tsx
index 29b46ddc22..fa7434e745 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/workflow/page.tsx
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/workflow/page.tsx
@@ -8,7 +8,7 @@ const Page = () => {
     {
       id: '1',
       type: 'custom',
-      position: { x: 180, y: 180 },
+      position: { x: 0, y: 0 },
       data: { type: 'start' },
     },
   ]
diff --git a/web/app/components/workflow/hooks.ts b/web/app/components/workflow/hooks.ts
index 17235e6456..175ad19f2d 100644
--- a/web/app/components/workflow/hooks.ts
+++ b/web/app/components/workflow/hooks.ts
@@ -6,10 +6,12 @@ import type {
   NodeMouseHandler,
   OnConnect,
   OnEdgesChange,
+  Viewport,
 } from 'reactflow'
 import {
   getConnectedEdges,
   getIncomers,
+  useReactFlow,
   useStoreApi,
 } from 'reactflow'
 import type {
@@ -23,6 +25,7 @@ import { useStore } from './store'
 
 export const useWorkflow = () => {
   const store = useStoreApi()
+  const reactFlow = useReactFlow()
 
   const handleLayout = useCallback(async () => {
     const {
@@ -45,6 +48,10 @@ export const useWorkflow = () => {
     setNodes(newNodes)
   }, [store])
 
+  const handleSetViewport = useCallback((viewPort: Viewport) => {
+    reactFlow.setViewport(viewPort)
+  }, [reactFlow])
+
   const handleNodeDragStart = useCallback<NodeDragHandler>(() => {
     useStore.getState().setIsDragging(true)
   }, [])
@@ -54,6 +61,7 @@ export const useWorkflow = () => {
       getNodes,
       setNodes,
     } = store.getState()
+    const { setHelpLine } = useStore.getState()
     e.stopPropagation()
 
     const nodes = getNodes()
@@ -65,10 +73,53 @@ export const useWorkflow = () => {
     })
 
     setNodes(newNodes)
+
+    const showVerticalHelpLine = nodes.find((n) => {
+      if (n.id === node.id)
+        return false
+
+      if (
+        n.position.x === node.position.x
+        || n.position.x + n.width! === node.position.x
+        || n.position.x === node.position.x + node.width!
+      )
+        return true
+
+      return false
+    })
+    const showHorizontalHelpLine = nodes.find((n) => {
+      if (n.id === node.id)
+        return false
+
+      if (
+        n.position.y === node.position.y
+        || n.position.y === node.position.y + node.height!
+        || n.position.y + n.height! === node.position.y
+        || n.position.y + n.height! === node.position.y + node.height!
+      )
+        return true
+
+      return false
+    })
+
+    if (showVerticalHelpLine || showHorizontalHelpLine) {
+      setHelpLine({
+        x: showVerticalHelpLine ? node.position.x : undefined,
+        y: showHorizontalHelpLine ? node.position.y : undefined,
+      })
+    }
+    else {
+      setHelpLine()
+    }
   }, [store])
 
   const handleNodeDragStop = useCallback<NodeDragHandler>(() => {
-    useStore.getState().setIsDragging(false)
+    const {
+      setIsDragging,
+      setHelpLine,
+    } = useStore.getState()
+    setIsDragging(false)
+    setHelpLine()
   }, [])
 
   const handleNodeEnter = useCallback<NodeMouseHandler>((_, node) => {
@@ -353,6 +404,7 @@ export const useWorkflow = () => {
 
   return {
     handleLayout,
+    handleSetViewport,
 
     handleNodeDragStart,
     handleNodeDrag,
diff --git a/web/app/components/workflow/store.ts b/web/app/components/workflow/store.ts
index 64645b46f4..28d2e17ced 100644
--- a/web/app/components/workflow/store.ts
+++ b/web/app/components/workflow/store.ts
@@ -6,6 +6,7 @@ type State = {
   showFeaturesPanel: boolean
   runStaus: string
   isDragging: boolean
+  helpLine?: { x?: number; y?: number }
 }
 
 type Action = {
@@ -13,6 +14,7 @@ type Action = {
   setShowFeaturesPanel: (showFeaturesPanel: boolean) => void
   setRunStaus: (runStaus: string) => void
   setIsDragging: (isDragging: boolean) => void
+  setHelpLine: (helpLine?: { x?: number; y?: number }) => void
 }
 
 export const useStore = create<State & Action>(set => ({
@@ -25,4 +27,6 @@ export const useStore = create<State & Action>(set => ({
   setRunStaus: runStaus => set(() => ({ runStaus })),
   isDragging: false,
   setIsDragging: isDragging => set(() => ({ isDragging })),
+  helpLine: undefined,
+  setHelpLine: helpLine => set(() => ({ helpLine })),
 }))
diff --git a/web/app/components/workflow/utils.ts b/web/app/components/workflow/utils.ts
index f41a1fcb3c..c9c6b10dac 100644
--- a/web/app/components/workflow/utils.ts
+++ b/web/app/components/workflow/utils.ts
@@ -34,7 +34,7 @@ export const nodesLevelOrderTraverse = (
 
     callback({ node, depth, breath })
 
-    const targetBranches = node.data.targetBranches
+    const targetBranches = node.data._targetBranches
     if (targetBranches?.length) {
       const targetEdges = getConnectedEdges([node], edges)
 
@@ -133,9 +133,7 @@ export const getLayoutByDagre = (nodes: Node[], edges: Edge[]) => {
   })
 
   edges.forEach((edge) => {
-    dagreGraph.setEdge(edge.source, edge.target, {
-      weight: edge?.data?.weight || 1,
-    })
+    dagreGraph.setEdge(edge.source, edge.target)
   })
 
   dagre.layout(dagreGraph)