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

Arguments handling for flow chart functions

Browse Source
This commit is contained in:
Matthieu MOREL
2020-12-06 10:27:54 +01:00
parent d8e57d1c01
commit 7b953ffefb
2 changed files with 88 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/diagrams/flowchart/flowDb.js
View File

@@ -247,7 +247,7 @@ const setTooltip = function(ids, tooltip) {
});
};
const setClickFun = function(id, functionName) {
const setClickFun = function(id, functionName, functionArgs) {
let domId = lookUpDomId(id);
// if (_id[0].match(/\d/)) id = MERMAID_DOM_ID_PREFIX + id;
if (configApi.getConfig().securityLevel !== 'loose') {
@@ -256,6 +256,29 @@ const setClickFun = function(id, functionName) {
if (typeof functionName === 'undefined') {
return;
}
let argList = [];
if (typeof functionArgs === 'string') {
/* Splits functionArgs by ',', ignoring all ',' in double quoted strings */
argList = functionArgs.split(/,(?=(?:(?:[^"]*"){2})*[^"]*$)/);
for (let i = 0; i < argList.length; i++) {
let item = argList[i].trim();
/* Removes all double quotes at the start and end of an argument */
/* This preserves all starting and ending whitespace inside */
if (item.charAt(0) === '"' && item.charAt(item.length - 1) === '"') {
item = item.substr(1, item.length - 2);
}
argList[i] = item;
}
}
/* if no arguments passed into callback, default to passing in id */
if (argList.length === 0) {
argList.push(id);
}
if (typeof vertices[id] !== 'undefined') {
vertices[id].haveCallback = true;
funs.push(function() {
@@ -264,7 +287,7 @@ const setClickFun = function(id, functionName) {
elem.addEventListener(
'click',
function() {
utils.runFunc(functionName, id);
utils.runFunc(functionName, ...argList);
},
false
);
@@ -277,16 +300,14 @@ const setClickFun = function(id, functionName) {
* Called by parser when a link is found. Adds the URL to the vertex data.
* @param ids Comma separated list of ids
* @param linkStr URL to create a link for
* @param tooltip Tooltip for the clickable element
*/
export const setLink = function(ids, linkStr, tooltip, target) {
export const setLink = function(ids, linkStr, target) {
ids.split(',').forEach(function(id) {
if (typeof vertices[id] !== 'undefined') {
vertices[id].link = utils.formatUrl(linkStr, config);
vertices[id].linkTarget = target;
}
});
setTooltip(ids, tooltip);
setClass(ids, 'clickable');
};
export const getTooltip = function(id) {
@@ -299,11 +320,10 @@ export const getTooltip = function(id) {
* @param functionName Function to be called on click
* @param tooltip Tooltip for the clickable element
*/
export const setClickEvent = function(ids, functionName, tooltip) {
export const setClickEvent = function(ids, functionName, functionArgs) {
ids.split(',').forEach(function(id) {
setClickFun(id, functionName);
setClickFun(id, functionName, functionArgs);
});
setTooltip(ids, tooltip);
setClass(ids, 'clickable');
};