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

#1092 Fix for mangling of multiple classDiagrams

Browse Source
This commit is contained in:
Ashish Jain 2020-01-08 20:48:57 +01:00
parent 144f65c459
commit 48c345a403
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/diagrams/class/classDb.js
View File

@ -9,6 +9,7 @@ const config = getConfig();
let relations = []; let relations = [];
let classes = {}; let classes = {};
let classCounter = 0;
let funs = []; let funs = [];
@ -41,8 +42,24 @@ export const addClass = function(id) {
cssClasses: [], cssClasses: [],
methods: [], methods: [],
members: [], members: [],
annotations: [] annotations: [],
domId: MERMAID_DOM_ID_PREFIX + classId.className + '-' + classCounter
}; };
classCounter++;
};
/**
* Function to lookup domId from id in the graph definition.
* @param id
* @public
*/
export const lookUpDomId = function(id) {
const classKeys = Object.keys(classes);
for (let i = 0; i < classKeys.length; i++) {
if (classes[classKeys[i]].id === id) {
return classes[classKeys[i]].domId;
}
}
}; };
export const clear = function() { export const clear = function() {
@ -178,9 +195,9 @@ export const setClickEvent = function(ids, functionName, tooltip) {
setCssClass(ids, 'clickable'); setCssClass(ids, 'clickable');
}; };
const setClickFunc = function(_id, functionName, tooltip) { const setClickFunc = function(domId, functionName, tooltip) {
let id = _id; let id = domId;
let elemId = MERMAID_DOM_ID_PREFIX + id; let elemId = lookUpDomId(id);
if (config.securityLevel !== 'loose') { if (config.securityLevel !== 'loose') {
return; return;
@ -286,5 +303,6 @@ export default {
relationType, relationType,
setClickEvent, setClickEvent,
setCssClass, setCssClass,
setLink setLink,
lookUpDomId
}; };

9
src/diagrams/class/classRenderer.js
View File

@ -2,13 +2,12 @@ import * as d3 from 'd3';
import dagre from 'dagre'; import dagre from 'dagre';
import graphlib from 'graphlib'; import graphlib from 'graphlib';
import { logger } from '../../logger'; import { logger } from '../../logger';
import classDb from './classDb'; import classDb, { lookUpDomId } from './classDb';
import utils from '../../utils'; import utils from '../../utils';
import { parser } from './parser/classDiagram'; import { parser } from './parser/classDiagram';
parser.yy = classDb; parser.yy = classDb;
const MERMAID_DOM_ID_PREFIX = 'classid-';
let idCache = {}; let idCache = {};
const conf = { const conf = {
@ -322,7 +321,7 @@ const drawClass = function(elem, classDef) {
} }
}; };
const id = MERMAID_DOM_ID_PREFIX + classDef.id; const id = classDef.id;
const classInfo = { const classInfo = {
id: id, id: id,
label: classDef.id, label: classDef.id,
@ -333,7 +332,7 @@ const drawClass = function(elem, classDef) {
// add class group // add class group
const g = elem const g = elem
.append('g') .append('g')
.attr('id', id) .attr('id', lookUpDomId(id))
.attr('class', cssClassStr); .attr('class', cssClassStr);
// add title // add title
@ -514,7 +513,7 @@ export const draw = function(text, id) {
g.nodes().forEach(function(v) { g.nodes().forEach(function(v) {
if (typeof v !== 'undefined' && typeof g.node(v) !== 'undefined') { if (typeof v !== 'undefined' && typeof g.node(v) !== 'undefined') {
logger.debug('Node ' + v + ': ' + JSON.stringify(g.node(v))); logger.debug('Node ' + v + ': ' + JSON.stringify(g.node(v)));
d3.select('#' + v).attr( d3.select('#' + lookUpDomId(v)).attr(
'transform', 'transform',
'translate(' + 'translate(' +
(g.node(v).x - g.node(v).width / 2) + (g.node(v).x - g.node(v).width / 2) +