marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-19 15:30:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

clean up for eslint

Browse Source
This commit is contained in:
Adrian Hall
2020-03-09 12:36:43 +00:00
parent 9aacc85a16
commit 29b6e00071
2 changed files with 65 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/diagrams/er/erMarkers.js
View File

@@ -1,4 +1,4 @@
import * as d3 from 'd3'; //import * as d3 from 'd3';
const ERMarkers = { const ERMarkers = {
ONLY_ONE_START: 'ONLY_ONE_START', ONLY_ONE_START: 'ONLY_ONE_START',
@@ -20,7 +20,6 @@ const ERMarkers = {
const insertMarkers = function(elem, conf) { const insertMarkers = function(elem, conf) {
let marker; let marker;
const markerWidth =
elem elem
.append('defs') .append('defs')
.append('marker') .append('marker')

96
src/diagrams/er/erRenderer.js
View File

@@ -110,7 +110,7 @@ const drawRelationshipFromLayout = function(diagram, rel, g) {
const edge = g.edge({ v: rel.entityA, w: rel.entityB }); const edge = g.edge({ v: rel.entityA, w: rel.entityB });
// Using it's points, generate a line function // Using it's points, generate a line function
edge.points = edge.points.filter(p => !Number.isNaN(p.y)); // TODO: why is necessary? edge.points = edge.points.filter(p => !Number.isNaN(p.y)); // TODO: why is necessary?
// Get a function that will generate the line path // Get a function that will generate the line path
const lineFunction = d3 const lineFunction = d3
@@ -155,31 +155,52 @@ const drawRelationshipFromLayout = function(diagram, rel, g) {
svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_END + ')'); svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_END + ')');
break; break;
case erDb.Cardinality.ZERO_OR_ONE_TO_ZERO_OR_MORE: case erDb.Cardinality.ZERO_OR_ONE_TO_ZERO_OR_MORE:
svgPath.attr('marker-start', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_START + ')'); svgPath.attr(
'marker-start',
'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_START + ')'
);
svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_END + ')'); svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_END + ')');
break; break;
case erDb.Cardinality.ZERO_OR_ONE_TO_ONE_OR_MORE: case erDb.Cardinality.ZERO_OR_ONE_TO_ONE_OR_MORE:
svgPath.attr('marker-start', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_START + ')'); svgPath.attr(
'marker-start',
'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_START + ')'
);
svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ONE_OR_MORE_END + ')'); svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ONE_OR_MORE_END + ')');
break; break;
case erDb.Cardinality.ONE_OR_MORE_TO_ONLY_ONE: case erDb.Cardinality.ONE_OR_MORE_TO_ONLY_ONE:
svgPath.attr('marker-start', 'url(' + url + '#' + erMarkers.ERMarkers.ONE_OR_MORE_START + ')'); svgPath.attr(
'marker-start',
'url(' + url + '#' + erMarkers.ERMarkers.ONE_OR_MORE_START + ')'
);
svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ONLY_ONE_END + ')'); svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ONLY_ONE_END + ')');
break; break;
case erDb.Cardinality.ZERO_OR_MORE_TO_ONLY_ONE: case erDb.Cardinality.ZERO_OR_MORE_TO_ONLY_ONE:
svgPath.attr('marker-start', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_START + ')'); svgPath.attr(
'marker-start',
'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_START + ')'
);
svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ONLY_ONE_END + ')'); svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ONLY_ONE_END + ')');
break; break;
case erDb.Cardinality.ZERO_OR_MORE_TO_ZERO_OR_ONE: case erDb.Cardinality.ZERO_OR_MORE_TO_ZERO_OR_ONE:
svgPath.attr('marker-start', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_START + ')'); svgPath.attr(
'marker-start',
'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_START + ')'
);
svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_END + ')'); svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_END + ')');
break; break;
case erDb.Cardinality.ONE_OR_MORE_TO_ZERO_OR_ONE: case erDb.Cardinality.ONE_OR_MORE_TO_ZERO_OR_ONE:
svgPath.attr('marker-start', 'url(' + url + '#' + erMarkers.ERMarkers.ONE_OR_MORE_START + ')'); svgPath.attr(
'marker-start',
'url(' + url + '#' + erMarkers.ERMarkers.ONE_OR_MORE_START + ')'
);
svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_END + ')'); svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_END + ')');
break; break;
case erDb.Cardinality.ZERO_OR_ONE_TO_ONLY_ONE: case erDb.Cardinality.ZERO_OR_ONE_TO_ONLY_ONE:
svgPath.attr('marker-start', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_START + ')'); svgPath.attr(
'marker-start',
'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_START + ')'
);
svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ONLY_ONE_END + ')'); svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ONLY_ONE_END + ')');
break; break;
case erDb.Cardinality.ONLY_ONE_TO_ONLY_ONE: case erDb.Cardinality.ONLY_ONE_TO_ONLY_ONE:
@@ -191,28 +212,44 @@ const drawRelationshipFromLayout = function(diagram, rel, g) {
svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_END + ')'); svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_END + ')');
break; break;
case erDb.Cardinality.ZERO_OR_ONE_TO_ZERO_OR_ONE: case erDb.Cardinality.ZERO_OR_ONE_TO_ZERO_OR_ONE:
svgPath.attr('marker-start', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_START + ')'); svgPath.attr(
'marker-start',
'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_START + ')'
);
svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_END + ')'); svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_ONE_END + ')');
break; break;
case erDb.Cardinality.ZERO_OR_MORE_TO_ZERO_OR_MORE: case erDb.Cardinality.ZERO_OR_MORE_TO_ZERO_OR_MORE:
svgPath.attr('marker-start', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_START + ')'); svgPath.attr(
'marker-start',
'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_START + ')'
);
svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_END + ')'); svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_END + ')');
break; break;
case erDb.Cardinality.ZERO_OR_MORE_TO_ONE_OR_MORE: case erDb.Cardinality.ZERO_OR_MORE_TO_ONE_OR_MORE:
svgPath.attr('marker-start', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_START + ')'); svgPath.attr(
'marker-start',
'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_START + ')'
);
svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ONE_OR_MORE_END + ')'); svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ONE_OR_MORE_END + ')');
break; break;
case erDb.Cardinality.ONE_OR_MORE_TO_ZERO_OR_MORE: case erDb.Cardinality.ONE_OR_MORE_TO_ZERO_OR_MORE:
svgPath.attr('marker-start', 'url(' + url + '#' + erMarkers.ERMarkers.ONE_OR_MORE_START + ')'); svgPath.attr(
'marker-start',
'url(' + url + '#' + erMarkers.ERMarkers.ONE_OR_MORE_START + ')'
);
svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_END + ')'); svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ZERO_OR_MORE_END + ')');
break; break;
case erDb.Cardinality.ONE_OR_MORE_TO_ONE_OR_MORE: case erDb.Cardinality.ONE_OR_MORE_TO_ONE_OR_MORE:
svgPath.attr('marker-start', 'url(' + url + '#' + erMarkers.ERMarkers.ONE_OR_MORE_START + ')'); svgPath.attr(
'marker-start',
'url(' + url + '#' + erMarkers.ERMarkers.ONE_OR_MORE_START + ')'
);
svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ONE_OR_MORE_END + ')'); svgPath.attr('marker-end', 'url(' + url + '#' + erMarkers.ERMarkers.ONE_OR_MORE_END + ')');
break; break;
} }
}; };
/*
const drawRelationship = function(diagram, relationship, g) { const drawRelationship = function(diagram, relationship, g) {
// Set the from and to co-ordinates using the graph vertices // Set the from and to co-ordinates using the graph vertices
@@ -234,7 +271,9 @@ const drawRelationship = function(diagram, relationship, g) {
.attr('y2', to.y) .attr('y2', to.y)
.attr('stroke', conf.stroke); .attr('stroke', conf.stroke);
}; // drawRelationship }; // drawRelationship
*/
/*
const drawFeet = function(diagram, relationships, g) { const drawFeet = function(diagram, relationships, g) {
relationships.forEach(function(rel) { relationships.forEach(function(rel) {
// Get the points of intersection with the entities // Get the points of intersection with the entities
@@ -307,7 +346,8 @@ const getToePath = function(heel, toe, tip) {
return `M ${heel.x} ${heel.y} Q ${toe.x} ${toe.y} ${tip.x} ${tip.y}`; return `M ${heel.x} ${heel.y} Q ${toe.x} ${toe.y} ${tip.x} ${tip.y}`;
} }
}; };
*/
/*
const getToes = function(relationship, fromPoint, toPoint, distance) { const getToes = function(relationship, fromPoint, toPoint, distance) {
if (conf.toeStyle === 'curved') { if (conf.toeStyle === 'curved') {
distance *= 2; distance *= 2;
@@ -347,8 +387,8 @@ const getToes = function(relationship, fromPoint, toPoint, distance) {
from: fromPoint.x < toPoint.x ? upper : lower from: fromPoint.x < toPoint.x ? upper : lower
}; };
} }
*/
/* /*
if (fromPoint.x < toPoint.x) { if (fromPoint.x < toPoint.x) {
// Scenario A // Scenario A
@@ -377,9 +417,11 @@ const getToes = function(relationship, fromPoint, toPoint, distance) {
} else { } else {
// Scenario E // Scenario E
} }
*/ */
/*
}; // getToes }; // getToes
*/
/*
const getJoints = function(relationship, fromPoint, toPoint, distance) { const getJoints = function(relationship, fromPoint, toPoint, distance) {
const gradient = (fromPoint.y - toPoint.y) / (fromPoint.x - toPoint.x); const gradient = (fromPoint.y - toPoint.y) / (fromPoint.x - toPoint.x);
let jointXDelta = getXDelta(distance, gradient); let jointXDelta = getXDelta(distance, gradient);
@@ -453,21 +495,9 @@ const getJoints = function(relationship, fromPoint, toPoint, distance) {
to: { x: toX, y: toY } to: { x: toX, y: toY }
}; };
}; };
*/
// Calculate point pXDelta w.r.t. an intersect point /*
// Calcualate point pYDelta w.r.t. an intersect point
// Calculate point qXDelta w.r.t. an intersect point
// Calculate point qYDelta w.r.t. an intersect point
// Now draw from the heel to point P then to the centre of the target entity
// Now do the same again using point Q instead of P
// Now draw the ankle
const getXDelta = function(hypotenuse, gradient) { const getXDelta = function(hypotenuse, gradient) {
return Math.sqrt((hypotenuse * hypotenuse) / (Math.abs(gradient) + 1)); return Math.sqrt((hypotenuse * hypotenuse) / (Math.abs(gradient) + 1));
}; };
@@ -493,7 +523,7 @@ const dot = function(diagram, p, color) {
.attr('fill', color); .attr('fill', color);
} }
}; // dot }; // dot
*/
/** /**
* Draw en E-R diagram in the tag with id: id based on the text definition of the graph * Draw en E-R diagram in the tag with id: id based on the text definition of the graph
* @param text * @param text