marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-28 11:49:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

#3358 Edge labels

Browse Source
This commit is contained in:
Knut Sveidqvist
2024-01-04 16:28:13 +01:00
parent d0eca268ad
commit 72135c294e
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cypress/platform/knsv2.html
View File

@@ -79,7 +79,7 @@ block-beta
E E
F F
end end
E --> A E -- "apa" --> A
</pre> </pre>
<pre id="diagram" class="mermaid2"> <pre id="diagram" class="mermaid2">
block-beta block-beta

10
packages/mermaid/src/diagrams/block/parser/block.jison
View File

@@ -183,9 +183,9 @@ document
link link
: LINK : LINK
{ yy.getLogger().info("Rule: link: ", $1, yytext); } { yy.getLogger().info("Rule: link: ", $1, yytext); $$={edgeTypeStr: $1, label:''}; }
| START_LINK LINK_LABEL STR LINK | START_LINK LINK_LABEL STR LINK
{ yy.getLogger().info("Rule: LABEL link: ", $1, $3, $4); $$=$4; } { yy.getLogger().info("Rule: LABEL link: ", $1, $3, $4); $$={edgeTypeStr: $4, label:$3}; }
; ;
statement statement
@@ -198,11 +198,11 @@ statement
nodeStatement nodeStatement
: nodeStatement link node { : nodeStatement link node {
yy.getLogger().info('Rule: (nodeStatement link node) ', $1, $2, $3, 'abc88 typestr: ',$2); yy.getLogger().info('Rule: (nodeStatement link node) ', $1, $2, $3, 'abc88 typestr: ',$2.edgeTypeStr);
const edgeData = yy.edgeStrToEdgeData($2) const edgeData = yy.edgeStrToEdgeData($2.edgeTypeStr)
$$ = [ $$ = [
{id: $1.id, label: $1.label, type:$1.type, directions: $1.directions}, {id: $1.id, label: $1.label, type:$1.type, directions: $1.directions},
{id: $1.id + '-' + $3.id, start: $1.id, end: $3.id, label: $3.label, type: 'edge', directions: $3.directions, arrowTypeEnd: edgeData, arrowTypeStart: 'arrow_open' }, {id: $1.id + '-' + $3.id, start: $1.id, end: $3.id, label: $2.label, type: 'edge', directions: $3.directions, arrowTypeEnd: edgeData, arrowTypeStart: 'arrow_open' },
{id: $3.id, label: $3.label, type: yy.typeStr2Type($3.typeStr), directions: $3.directions} {id: $3.id, label: $3.label, type: yy.typeStr2Type($3.typeStr), directions: $3.directions}
]; ];
} }

14
packages/mermaid/src/diagrams/block/renderHelpers.ts
View File

@@ -1,6 +1,6 @@
import { getStylesFromArray } from '../../utils.js'; import { getStylesFromArray } from '../../utils.js';
import { insertNode, positionNode } from '../../dagre-wrapper/nodes.js'; import { insertNode, positionNode } from '../../dagre-wrapper/nodes.js';
import { insertEdge } from '../../dagre-wrapper/edges.js'; import { insertEdge, insertEdgeLabel } from '../../dagre-wrapper/edges.js';
import * as graphlib from 'dagre-d3-es/src/graphlib/index.js'; import * as graphlib from 'dagre-d3-es/src/graphlib/index.js';
import { getConfig } from '../../config.js'; import { getConfig } from '../../config.js';
import { ContainerElement } from 'd3'; import { ContainerElement } from 'd3';
@@ -243,7 +243,6 @@ export async function insertEdges(
{ v: edge.start, w: edge.end, name: edge.id }, { v: edge.start, w: edge.end, name: edge.id },
{ {
...edge, ...edge,
// arrowHead: 'normal',
arrowTypeEnd: edge.arrowTypeEnd, arrowTypeEnd: edge.arrowTypeEnd,
arrowTypeStart: edge.arrowTypeStart, arrowTypeStart: edge.arrowTypeStart,
points, points,
@@ -253,6 +252,17 @@ export async function insertEdges(
'block', 'block',
g g
); );
if (edge.label) {
await insertEdgeLabel(elem, {
...edge,
label: edge.label,
labelStyle: 'stroke: #333; stroke-width: 1.5px;fill:none;',
arrowTypeEnd: edge.arrowTypeEnd,
arrowTypeStart: edge.arrowTypeStart,
points,
classes: 'edge-thickness-normal edge-pattern-solid flowchart-link LS-a1 LE-b1',
});
}
} }
} }
} }