[activityDiagram] Fix condition layout in groups

hikerpig · Jan 30, 2022 · a264b27 · a264b27
1 parent d5bab84
commit a264b27
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/demo/cypress/integration/activity/activity.spec.ts b/demo/cypress/integration/activity/activity.spec.ts
@@ -10,6 +10,12 @@ describe('Activity Diagram', () => {
 activityDiagram
 start
 partition Outer {
+  if (diagram registered ?) then
+    :get implementation;
+  else (no)
+    :print error;
+  endif
+
   group Inner {
     while (data available?) is (available)
       :read data;
@@ -19,7 +25,7 @@ partition Outer {
 }
 end`),
       onRender(c) {
-        c.get('.component__group-rect').should('exist')
+        c.get('.activity__group-rect').should('exist')
       },
     },
   ])

diff --git a/packages/pintora-diagrams/src/activity/artist.ts b/packages/pintora-diagrams/src/activity/artist.ts
@@ -668,7 +668,7 @@ class ActivityDraw {
         ...fontConfig,
         fontWeight: 'bold',
       },
-      { class: 'component__group-rect' },
+      { class: 'activity__group-rect' },
     )
     const labelTextDims = calcTextDims(groupLabel, fontConfig)
 
@@ -692,12 +692,10 @@ class ActivityDraw {
         // console.log('will set parent', modelId, id, m.type)
         if (modelId) this.g.setParent(modelId, id)
       })
-      if ('children' in m.value) {
-        m.value.children.forEach(child => {
-          const childStepModel = this.model.stepModelMap.get(child.value.id)
-          if (childStepModel) setParentRecursive(childStepModel)
-        })
-      }
+      this.traverseStep(m, child => {
+        const childStepModel = this.model.stepModelMap.get(child.value.id)
+        if (childStepModel) setParentRecursive(childStepModel)
+      })
     }
 
     aGroup.children.map(s => {