GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-02-04 07:13:25 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release_9.2.0_buggfixes' into release/9.2.0

Browse Source
This commit is contained in:
Knut Sveidqvist 2022-10-12 11:54:22 +02:00
commit d348f2847c
6 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/flowchart.md
View File

@ -264,6 +264,20 @@ flowchart LR
A --- B A --- B
``` ```
### An invisisble link
This can be a usefull tool in some instances where you want to alter the default positining of a node.
```mermaid-example
flowchart LR
A ~~~ B
```
```mermaid
flowchart LR
A ~~~ B
```
### Text on links ### Text on links
```mermaid-example ```mermaid-example

3
packages/mermaid/src/dagre-wrapper/edges.js
View File

@ -438,6 +438,9 @@ export const insertEdge = function (elem, e, edge, clusterDb, diagramType, graph
case 'thick': case 'thick':
strokeClasses = 'edge-thickness-thick'; strokeClasses = 'edge-thickness-thick';
break; break;
case 'invisible':
strokeClasses = 'edge-thickness-thick';
break;
default: default:
strokeClasses = ''; strokeClasses = '';
} }

4
packages/mermaid/src/diagrams/flowchart/flowDb.js
View File

@ -674,6 +674,10 @@ const destructEndLink = (_str) => {
stroke = 'thick'; stroke = 'thick';
} }
if (line[0] === '~') {
stroke = 'invisible';
}
let dots = countChar('.', line); let dots = countChar('.', line);
if (dots) { if (dots) {

5
packages/mermaid/src/diagrams/flowchart/flowRenderer-v2.js
View File

@ -280,6 +280,11 @@ export const addEdges = function (edges, g, diagObj) {
edgeData.pattern = 'solid'; edgeData.pattern = 'solid';
edgeData.style = 'stroke-width: 3.5px;fill:none;'; edgeData.style = 'stroke-width: 3.5px;fill:none;';
break; break;
case 'invisible':
edgeData.thickness = 'invisible';
edgeData.pattern = 'solid';
edgeData.style = 'stroke-width: 0;fill:none;';
break;
} }
if (typeof edge.style !== 'undefined') { if (typeof edge.style !== 'undefined') {
const styles = getStylesFromArray(edge.style); const styles = getStylesFromArray(edge.style);

1
packages/mermaid/src/diagrams/flowchart/parser/flow.jison
View File

@ -120,6 +120,7 @@ that id.
\s*[xo<]?\-\-+[-xo>]\s* return 'LINK'; \s*[xo<]?\-\-+[-xo>]\s* return 'LINK';
\s*[xo<]?\=\=+[=xo>]\s* return 'LINK'; \s*[xo<]?\=\=+[=xo>]\s* return 'LINK';
\s*[xo<]?\-?\.+\-[xo>]?\s* return 'LINK'; \s*[xo<]?\-?\.+\-[xo>]?\s* return 'LINK';
\s*\~\~[\~]+\s* return 'LINK';
\s*[xo<]?\-\-\s* return 'START_LINK'; \s*[xo<]?\-\-\s* return 'START_LINK';
\s*[xo<]?\=\=\s* return 'START_LINK'; \s*[xo<]?\=\=\s* return 'START_LINK';
\s*[xo<]?\-\.\s* return 'START_LINK'; \s*[xo<]?\-\.\s* return 'START_LINK';

9
packages/mermaid/src/docs/flowchart.md
View File

@ -167,6 +167,15 @@ flowchart LR
A --- B A --- B
``` ```
### An invisisble link
This can be a usefull tool in some instances where you want to alter the default positining of a node.
```mermaid-example
flowchart LR
A ~~~ B
```
### Text on links ### Text on links
```mermaid-example ```mermaid-example