GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-28 07:03:17 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #477 from brookhong/sequenceDiagram

Browse Source 
Fixed #456 sequenceDiagram: dotted line for alt and empty bracket sho…
This commit is contained in:
Knut Sveidqvist 2017-03-19 13:33:52 +01:00 committed by GitHub
commit acbbfbe419
3 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dist/mermaid.js vendored
View File

@ -57846,6 +57846,7 @@ exports.drawText = function (elem, textData, width) {
//span.attr('x', textData.x); //span.attr('x', textData.x);
span.attr('x', textData.x + textData.textMargin * 2); span.attr('x', textData.x + textData.textMargin * 2);
//span.attr('dy', textData.dy); //span.attr('dy', textData.dy);
span.attr("fill", textData.fill);
span.text(nText); span.text(nText);
if (typeof textElem.textwrap !== 'undefined') { if (typeof textElem.textwrap !== 'undefined') {
@ -57861,17 +57862,16 @@ exports.drawText = function (elem, textData, width) {
}; };
exports.drawLabel = function (elem, txtObject) { exports.drawLabel = function (elem, txtObject) {
var rectData = exports.getNoteRect(); function genPoints(x, y, width, height, cut) {
rectData.x = txtObject.x; return x + "," + y + " " +
rectData.y = txtObject.y; (x + width) + "," + y + " " +
rectData.width = 50; (x + width) + "," + (y + height - cut) + " " +
rectData.height = 20; (x + width - cut * 1.2) + "," + (y + height) + " " +
rectData.fill = '#526e52'; (x) + "," + (y + height);
rectData.stroke = 'none'; }
rectData['class'] = 'labelBox'; var polygon = elem.append("polygon");
//rectData.color = 'white'; polygon.attr("points" , genPoints(txtObject.x, txtObject.y, 50, 20, 7));
polygon.attr("style", "fill:#526e52;stroke:none");
exports.drawRect(elem, rectData);
txtObject.y = txtObject.y + txtObject.labelMargin; txtObject.y = txtObject.y + txtObject.labelMargin;
txtObject.x = txtObject.x + 0.5 * txtObject.labelMargin; txtObject.x = txtObject.x + 0.5 * txtObject.labelMargin;
@ -57938,14 +57938,14 @@ exports.drawActivation = function (elem, bounds, verticalPos) {
exports.drawLoop = function (elem, bounds, labelText, conf) { exports.drawLoop = function (elem, bounds, labelText, conf) {
var g = elem.append('g'); var g = elem.append('g');
var drawLoopLine = function drawLoopLine(startx, starty, stopx, stopy) { var drawLoopLine = function drawLoopLine(startx, starty, stopx, stopy) {
g.append('line').attr('x1', startx).attr('y1', starty).attr('x2', stopx).attr('y2', stopy).attr('stroke-width', 2).attr('stroke', '#526e52').attr('class', 'loopLine'); return g.append('line').attr('x1', startx).attr('y1', starty).attr('x2', stopx).attr('y2', stopy).attr('stroke-width', 2).attr('stroke', '#526e52').attr('class', 'loopLine');
}; };
drawLoopLine(bounds.startx, bounds.starty, bounds.stopx, bounds.starty); drawLoopLine(bounds.startx, bounds.starty, bounds.stopx, bounds.starty);
drawLoopLine(bounds.stopx, bounds.starty, bounds.stopx, bounds.stopy); drawLoopLine(bounds.stopx, bounds.starty, bounds.stopx, bounds.stopy);
drawLoopLine(bounds.startx, bounds.stopy, bounds.stopx, bounds.stopy); drawLoopLine(bounds.startx, bounds.stopy, bounds.stopx, bounds.stopy);
drawLoopLine(bounds.startx, bounds.starty, bounds.startx, bounds.stopy); drawLoopLine(bounds.startx, bounds.starty, bounds.startx, bounds.stopy);
if (typeof bounds.elsey !== 'undefined') { if (typeof bounds.elsey !== 'undefined') {
drawLoopLine(bounds.startx, bounds.elsey, bounds.stopx, bounds.elsey); drawLoopLine(bounds.startx, bounds.elsey, bounds.stopx, bounds.elsey).style('stroke-dasharray', '3, 3');
} }
var txt = exports.getTextObj(); var txt = exports.getTextObj();
@ -57967,7 +57967,7 @@ exports.drawLoop = function (elem, bounds, labelText, conf) {
exports.drawText(g, txt); exports.drawText(g, txt);
if (typeof bounds.elseText !== 'undefined') { if (typeof bounds.elseText !== 'undefined' && bounds.elseText !== "") {
txt.text = '[ ' + bounds.elseText + ' ]'; txt.text = '[ ' + bounds.elseText + ' ]';
txt.y = bounds.elsey + 1.5 * conf.boxMargin; txt.y = bounds.elsey + 1.5 * conf.boxMargin;
exports.drawText(g, txt); exports.drawText(g, txt);

32
src/diagrams/sequenceDiagram/svgDraw.js
View File

@ -44,6 +44,7 @@ exports.drawText = function(elem, textData, width) {
//span.attr('x', textData.x); //span.attr('x', textData.x);
span.attr('x', textData.x+textData.textMargin*2); span.attr('x', textData.x+textData.textMargin*2);
//span.attr('dy', textData.dy); //span.attr('dy', textData.dy);
span.attr("fill", textData.fill);
span.text(nText); span.text(nText);
if(typeof textElem.textwrap !== 'undefined'){ if(typeof textElem.textwrap !== 'undefined'){
@ -58,21 +59,20 @@ exports.drawText = function(elem, textData, width) {
return textElem; return textElem;
}; };
exports.drawLabel = function(elem , txtObject){ exports.drawLabel = function (elem, txtObject) {
var rectData = exports.getNoteRect(); function genPoints(x, y, width, height, cut) {
rectData.x = txtObject.x; return x + "," + y + " " +
rectData.y = txtObject.y; (x + width) + "," + y + " " +
rectData.width = 50; (x + width) + "," + (y + height - cut) + " " +
rectData.height = 20; (x + width - cut * 1.2) + "," + (y + height) + " " +
rectData.fill = '#526e52'; (x) + "," + (y + height);
rectData.stroke = 'none'; }
rectData.class = 'labelBox'; var polygon = elem.append("polygon");
//rectData.color = 'white'; polygon.attr("points" , genPoints(txtObject.x, txtObject.y, 50, 20, 7));
polygon.attr("style", "fill:#526e52;stroke:none");
exports.drawRect(elem, rectData);
txtObject.y = txtObject.y + txtObject.labelMargin; txtObject.y = txtObject.y + txtObject.labelMargin;
txtObject.x = txtObject.x + 0.5*txtObject.labelMargin; txtObject.x = txtObject.x + 0.5 * txtObject.labelMargin;
txtObject.fill = 'white'; txtObject.fill = 'white';
exports.drawText(elem, txtObject); exports.drawText(elem, txtObject);
@ -145,7 +145,7 @@ exports.drawActivation = function(elem,bounds,verticalPos){
exports.drawLoop = function(elem,bounds,labelText, conf){ exports.drawLoop = function(elem,bounds,labelText, conf){
var g = elem.append('g'); var g = elem.append('g');
var drawLoopLine = function(startx,starty,stopx,stopy){ var drawLoopLine = function(startx,starty,stopx,stopy){
g.append('line') return g.append('line')
.attr('x1', startx) .attr('x1', startx)
.attr('y1', starty) .attr('y1', starty)
.attr('x2', stopx ) .attr('x2', stopx )
@ -159,7 +159,7 @@ exports.drawLoop = function(elem,bounds,labelText, conf){
drawLoopLine(bounds.startx, bounds.stopy , bounds.stopx , bounds.stopy ); drawLoopLine(bounds.startx, bounds.stopy , bounds.stopx , bounds.stopy );
drawLoopLine(bounds.startx, bounds.starty, bounds.startx, bounds.stopy ); drawLoopLine(bounds.startx, bounds.starty, bounds.startx, bounds.stopy );
if(typeof bounds.elsey !== 'undefined'){ if(typeof bounds.elsey !== 'undefined'){
drawLoopLine(bounds.startx, bounds.elsey, bounds.stopx, bounds.elsey ); drawLoopLine(bounds.startx, bounds.elsey, bounds.stopx, bounds.elsey).style('stroke-dasharray', '3, 3');
} }
var txt = exports.getTextObj(); var txt = exports.getTextObj();
@ -181,7 +181,7 @@ exports.drawLoop = function(elem,bounds,labelText, conf){
exports.drawText(g,txt); exports.drawText(g,txt);
if(typeof bounds.elseText !== 'undefined') { if (typeof bounds.elseText !== 'undefined' && bounds.elseText !== "") {
txt.text = '[ ' + bounds.elseText + ' ]'; txt.text = '[ ' + bounds.elseText + ' ]';
txt.y = bounds.elsey + 1.5 * conf.boxMargin; txt.y = bounds.elsey + 1.5 * conf.boxMargin;
exports.drawText(g, txt); exports.drawText(g, txt);

16
test/web.html
View File

@ -226,6 +226,22 @@ end
</div> </div>
<div class="mermaid">
sequenceDiagram
loop Daily query
Alice->>Bob: Hello Bob, how are you?
alt is sick
Bob->>Alice: Not so good :(
else
Bob->>Alice: Feeling fresh like a daisy
end
opt Extra response
Bob->>Alice: Thanks for asking
end
end
</div>
<div class="mermaid"> <div class="mermaid">
graph LR; graph LR;
A[Start]-->B{a = '1,2'} A[Start]-->B{a = '1,2'}