wbrawner/drawio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

13.7.4 release

Browse source
This commit is contained in:
David Benson [draw.io] 2020-09-22 10:40:55 +01:00
parent 9686d858e1
commit c9cac46f6a
12 changed files with 810 additions and 736 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
22-SEP-2020: 13.7.4
- Appends splash dialog libs to configured libs
17-SEP-2020: 13.7.3
- Moves viewer to viewer.diagrams.net

2
VERSION
View file

@ -1 +1 @@
13.7.3
13.7.4

67
src/main/webapp/js/app.min.js vendored
View file

File diff suppressed because one or more lines are too long

3
src/main/webapp/js/diagramly/Editor.js
View file

@ -7454,4 +7454,5 @@
};
mxCodecRegistry.register(codec);
})();
})();

483
src/main/webapp/js/diagramly/Extensions.js
View file

@ -3753,64 +3753,161 @@ LucidImporter = {};
// actual code start
//TODO This can be optimized more
function convertTxt2Html(txt, m)
function convertTxt2Html(txt, srcM)
{
var nlPos = [], p = -1, html = '';
var blockStyles = {'a': true, 'il': true, 'ir': true, 'mt': true, 'mb': true, 'p': true, 't': true, 'l': true};
var nonBlockStyles = {'lk': true, 's': true, 'c': true, 'b': true, 'fc': true, 'i': true, 'u': true};
while ((p = txt.indexOf('\n', p + 1)) > -1)
{
nlPos.push(p + 1);
}
m.sort(function(a, b)
srcM.sort(function(a, b)
{
return a.s - b.s;
});
var sMap = {}, ends = [];
for (var i = 0; i < m.length; i++) //TODO Using newlines to mark the end of blocks without end has some issues
var m = srcM.filter(function(m)
{
return nonBlockStyles[m.n];
});
var globalStyles = srcM.filter(function(m)
{
var item = m[i];
if (sMap[item.s] == null)
{
for (var j = 0; j < nlPos.length; j++)
{
if (nlPos[j] > item.s)
{
sMap[item.s] = nlPos[j];
break;
}
}
if (sMap[item.s] == null)
{
sMap[item.s] = txt.length;
}
}
if (item.e == null)
{
item.e = sMap[item.s];
}
ends.push(item);
}
return blockStyles[m.n];
});
var html = '', ends = m.slice();
ends.sort(function(a, b)
{
return a.e - b.e;
});
var i = 0, j = 0, curStyles = {}, openTags = [], openTagsCount = [], listActive = false, listType, listItemActive = false;
var i = 0, j = 0, k = 0, curStyles = {}, curBlockStyles = {}, openTags = [], openTagsCount = [],
openBlockTags = [], blockActive = false, listActive = false, listType;
function startTag(styles, newBlock)
function startBlockTag(styles)
{
var str = '';
var tagCount = 0;
var t = styles['t'];
var l = styles['l'] || {};
if (t != null && (listActive == false || listActive != t.v || listType != l.v))
{
if (listActive)
{
str += endBlockTag(true);
}
listActive = t.v;
listType = l.v;
if (t.v == 'ul')
{
str += '<ul ';
openBlockTags.push('ul');
}
else
{
str += '<ol ';
openBlockTags.push('ol');
}
str += 'style="margin: 0px; list-style-type:';
if (t.v == 'hl')
{
str += 'upper-roman';
}
else
{
switch(l.v)
{
case 'auto':
str += 'disc';
break;
case 'inv': //Approx
str += 'circle';
break;
case 'disc':
str += 'circle';
break;
case 'trib': //Approx
str += 'square';
break;
case 'square':
str += 'square';
break;
case 'dash': //Approx
str += 'square';
break;
case 'heart': //Approx
str += 'disc';
break;
default:
str += 'decimal';
}
}
str += '">';
}
else if (t == null)
{
if (listActive)
{
str += endBlockTag(true);
listActive = false;
}
str += '<div style="';
openBlockTags.push('div');
}
if (t != null)
{
str += '<li style="text-align:' + (styles['a']? styles['a'].v : 'left') + '>';
openBlockTags.push('li');
str += '<span style="';
openBlockTags.push('span');
}
if (!listActive)
{
str += 'text-align: ' + (styles['a']? styles['a'].v : 'center') + ';';
}
if (styles['il'])
{
str += 'margin-left: ' + Math.round(styles['il'].v * scale - (listActive? 21 : 0)) + 'px;';
}
if (styles['ir'])
{
str += 'margin-right: ' + Math.round(styles['ir'].v * scale) + 'px;';
}
if (styles['mt'])
{
str += 'margin-top: ' + Math.round(styles['mt'].v * scale) + 'px;';
}
if (styles['mb'])
{
str += 'margin-bottom: ' + Math.round(styles['mb'].v * scale) + 'px;';
}
str += '">'
return str;
};
function startTag(styles)
{
if (Object.keys(styles).length == 0) return '';
var str = '';
var tagCount = 0;
if (styles['lk'])
{
var lk = styles['lk'];
@ -3823,107 +3920,9 @@ LucidImporter = {};
}
}
if (newBlock)
{
var l = styles['l'] || {};
if (t != null && (listActive == false || listActive != t.v || listType != l.v))
{
if (listActive)
{
str += endTag();
}
listActive = t.v;
listType = l.v;
if (t.v == 'ul')
{
str += '<ul ';
openTags.push('ul');
}
else
{
str += '<ol ';
openTags.push('ol');
}
openTagsCount.push(1);
str += 'style="margin: 0px; text-align:' + (styles['a']? styles['a'].v : 'left') + '; list-style-type:';
if (t.v == 'hl')
{
str += 'upper-roman';
}
else
{
switch(l.v)
{
case 'auto':
str += 'disc';
break;
case 'inv': //Approx
str += 'circle';
break;
case 'disc':
str += 'circle';
break;
case 'trib': //Approx
str += 'square';
break;
case 'square':
str += 'square';
break;
case 'dash': //Approx
str += 'square';
break;
case 'heart': //Approx
str += 'disc';
break;
default:
str += 'decimal';
}
}
str += '">';
}
else if (t == null)
{
if (listActive)
{
str += endTag();
listActive = false;
}
str += '<div style="';
openTags.push('div');
tagCount++;
}
}
else
{
if (listActive && !listItemActive)
{
str += endTag();
listActive = false;
}
str += '<span style="';
openTags.push('span');
tagCount++;
}
if (newBlock && t != null)
{
listItemActive = true;
str += '<li>';
openTags.push('li');
tagCount++;
str += '<span style="';
openTags.push('span');
tagCount++;
}
str += '<span style="';
openTags.push('span');
tagCount++;
if (styles['s'])
{
@ -3961,45 +3960,41 @@ LucidImporter = {};
str += 'text-decoration: underline;';
}
if (!listActive)
{
str += 'text-align: ' + (styles['a']? styles['a'].v : 'center') + ';';
}
if (styles['il'])
{
str += 'margin-left: ' + Math.round(styles['il'].v * scale - (listActive? 21 : 0)) + 'px;';
}
if (styles['ir'])
{
str += 'margin-right: ' + Math.round(styles['ir'].v * scale) + 'px;';
}
if (styles['mt'])
{
str += 'margin-top: ' + Math.round(styles['mt'].v * scale) + 'px;';
}
if (styles['mb'])
{
str += 'margin-bottom: ' + Math.round(styles['mb'].v * scale) + 'px;';
}
str += '">'
openTagsCount.push(tagCount);
return str;
};
function endBlockTag(force)
{
var str = '';
do
{
var tag = openBlockTags.pop();
if (!force && listActive && (tag == 'ul' || tag == 'ol'))
{
openBlockTags.push(tag);
break;
}
str += '</' + tag + '>';
}
while(openBlockTags.length > 0);
return str;
};
function endTag(txt, curS, curE, all)
{
var str = txt? txt.substring(curS, curE) : '';
//TODO Check this is always the case. Most of the time this is correct, also, the empty tag should be removed
if (str == '\n')
if (listActive)
{
str = '';
str = str.trim();
}
str = str.replace(/</g, '&lt;').replace(/>/g, '&gt;');
@ -4011,68 +4006,108 @@ LucidImporter = {};
for (var i = 0; i < count; i++)
{
var tag = openTags.pop();
if (tag == 'li')
{
listItemActive = false;
}
str += '</' + tag + '>';
}
}
while(all && openTags.length > 0);
return str;
}
};
var curS = 0, curE = 0;
var curS = 0, curE = 0, maxE = txt.length, firstBlock = true;
while(i >= j && (i < m.length || j < ends.length))
while (k < globalStyles.length || firstBlock)
{
var s = m[i], e = ends[j];
if (s && e && s.s < e.e) //s can be null when all starts are used, e ends after s BUT sometimes there are errors in the file
firstBlock = false;
if (k < globalStyles.length)
{
curS = s.s;
var newBlock = false;
if (curS - curE > 0)
var bs = globalStyles[k], curBS = globalStyles[k].s;
if (blockActive)
{
html += startTag(curStyles, newBlock) + endTag(txt, curE, curS);
curBlockStyles = {};
html += endTag(txt, maxE, curS, true); //End any open tag
curS = maxE;
html += endBlockTag();
}
while(bs != null && bs.s == curBS)
{
curBlockStyles[bs.n] = bs;
bs = globalStyles[++k];
}
while(s != null && s.s == curS)
if (bs != null)
{
//TODO alignment ('a') sometimes introduce unnecessary new lines. Maybe use newline to define block elements
if (s.n == 'a' || s.n == 'il' || s.n == 'ir' || s.n == 'mt' || s.n == 'mb' || s.n == 't')
maxE = bs.s;
}
else
{
maxE = txt.length;
}
html += startBlockTag(curBlockStyles);
if (blockActive)
{
html += startTag(curStyles);
}
blockActive = true;
}
while(i >= j && (i < m.length || j < ends.length))
{
var s = m[i], e = ends[j];
if (s && e && s.s < e.e) //s can be null when all starts are used, e ends after s BUT sometimes there are errors in the file
{
if (s.s > maxE) break;
curS = s.s;
if (curS - curE > 0)
{
newBlock = true;
html += endTag(txt, curE, curS);
}
curStyles[s.n] = s;
s = m[++i];
while(s != null && s.s == curS)
{
curStyles[s.n] = s;
s = m[++i];
}
html += startTag(curStyles);
}
html += startTag(curStyles, newBlock);
}
else if (e)
{
curE = e.e;
do
else if (e)
{
delete curStyles[e.n];
e = ends[++j];
if (e.e > maxE) break;
curE = e.e;
do
{
delete curStyles[e.n];
e = ends[++j];
}
while(e != null && e.e == curE);
html += endTag(txt, curS, curE);
curS = curE;
}
else
{
break;
}
while(e != null && e.e == curE);
html += endTag(txt, curS, curE);
curS = curE;
}
}
html += endTag(null, null, null, true); //End any open tag
if (blockActive)
{
html += endBlockTag(true);
}
return html;
};
@ -5210,14 +5245,7 @@ LucidImporter = {};
}
else if (p.Shape == 'elbow')
{
if (p.Endpoint1.Block != null && p.Endpoint2.Block != null)
{
cell.style += 'edgeStyle=orthogonalEdgeStyle;';
}
else
{
cell.style += 'edgeStyle=elbowEdgeStyle;';
}
cell.style += 'edgeStyle=orthogonalEdgeStyle;';
}
else if (p.Endpoint1.Block != null && p.Endpoint2.Block != null)
{
@ -8390,7 +8418,7 @@ LucidImporter = {};
break;
case 'BPMNGateway' :
v.style += 'shape=mxgraph.bpmn.shape;perimeter=rhombusPerimeter;background=gateway;';
v.style += 'shape=mxgraph.bpmn.shape;perimeter=rhombusPerimeter;background=gateway;verticalLabelPosition=bottom;verticalAlign=top;';
switch (p.bpmnGatewayType)
{
@ -8421,7 +8449,8 @@ LucidImporter = {};
}
v.style += addAllStyles(v.style, p, a, v);
v.value = convertText(p.Text);
v.style += getLabelStyle(p, isLastLblHTML);
break;
case 'BPMNData' :
v.style += 'shape=note;size=14;';
@ -11313,7 +11342,7 @@ LucidImporter = {};
}
v.value = convertText(p.Title);
v.style += 'swimlane;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=0;marginBottom=0;' + st +
v.style += 'swimlane;childLayout=stackLayout;horizontal=1;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=0;marginBottom=0;' + st +
'startSize=' + th + ';' +
getLabelStyle(p.Title, isLastLblHTML);
v.style += addAllStyles(v.style, p, a, v, isLastLblHTML);
@ -11391,7 +11420,7 @@ LucidImporter = {};
}
v.value = convertText(p.Name);
v.style += 'swimlane;childLayout=stackLayout;horizontal=1;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;' + st +
v.style += 'swimlane;childLayout=stackLayout;horizontal=1;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=0;marginBottom=0;' + st +
'startSize=' + th + ';' +
getLabelStyle(p.Name, isLastLblHTML);
v.style += addAllStyles(v.style, p, a, v, isLastLblHTML);
@ -12164,6 +12193,22 @@ LucidImporter = {};
v.style += 'html=1;';
}
if (p.Title && p.Text)
{
try
{
var geo = v.geometry;
var title = new mxCell(convertText(p.Title), new mxGeometry(0, geo.height,geo.width, 10), 'strokeColor=none;fillColor=none;');
title.vertex = true;
v.insert(title);
v.style += getLabelStyle(p.Title, isLastLblHTML);
}
catch(e)
{
console.log(e);
}
}
handleTextRotation(v, p);
return v;

29
src/main/webapp/js/diagramly/sidebar/Sidebar.js
View file

@ -360,10 +360,31 @@
*/
Sidebar.prototype.showEntries = function(stc, remember, force)
{
this.libs = (stc != null && (force || stc.length > 0)) ? stc : ((urlParams['libs'] != null &&
urlParams['libs'].length > 0) ? decodeURIComponent(urlParams['libs']) :
((mxSettings != null && mxSettings.settings != null) ? mxSettings.getLibraries() :
this.defaultEntries));
this.libs = [];
if(stc != null && (force || stc.length > 0))
{
this.libs.push(stc);
}
else
{
if(urlParams['libs'] != null && urlParams['libs'].length > 0)
{
this.libs.push(decodeURIComponent(urlParams['libs']));
}
if(mxSettings != null && mxSettings.settings != null)
{
this.libs.push(mxSettings.getLibraries());
}
else
{
this.libs.push(this.defaultEntries);
}
}
this.libs = this.libs.join(';');
var tmp = this.libs.split(';');
// Maps library names via the alias table

946
src/main/webapp/js/extensions.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
src/main/webapp/js/viewer-static.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
src/main/webapp/js/viewer.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
src/main/webapp/package.json
View file

@ -1,6 +1,6 @@
{
"name": "draw.io",
"version": "13.7.3",
"version": "13.7.4",
"description": "diagrams.net desktop",
"main": "electron.js",
"scripts": {

4
src/main/webapp/service-worker.js
View file

@ -6,11 +6,11 @@ if (workbox)
workbox.precaching.precacheAndRoute([
{
"url": "js/app.min.js",
"revision": "45047a15101629583ab0b42062eead4f"
"revision": "d38d8c6197bf84fc384e3d8fab9927db"
},
{
"url": "js/extensions.min.js",
"revision": "d39776c1b124b1c6af6953932b53911e"
"revision": "b87d013e7a5e514e686d9999aaea23fa"
},
{
"url": "js/shapes.min.js",

2
src/main/webapp/templates/basic/orgchart.xml
View file

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<mxfile><diagram id="prtHgNgQTEPvFCAcTncT" name="Page-1">7VjbctowEP0aHmF84ZZHIJDMtCQzIW2fhbXYamSJygJDv74rW45tTGkyTUo6w5Oto/Xe98h2y5/EuxtF1tFcUuAtz6G7ln/d8jzX83y8GGSfI8OBmwOhYtQKlcCC/QQLOhbdMApJTVBLyTVb18FACgGBrmFEKZnWxVaS162uSQgNYBEQ3kS/MaojG4U3KPFbYGFUWHb7V/lOTAphG0kSESrTCuRPW/5ESanzu3g3AW6SV+Qlf272m91nxxQI/ZIH6N1uf/dpEAyGy8/pNqEwv+21XatmS/jGRnyvwiAiSluv9b5IRZKymBOBq3GkY46gi7eJRllbN/QA96RiP6XQpJAIzIIJUI/7tZHSCoyOkJPEFMc804yl8AuUhl0FsrHdgIxBqz2K2N2uTXPRZ3aZlkUbFD0VVQrmXVmQ2EYJnzWXucQbm85s+SUBdb/8btrNczhZAs8fbXk9QWLAS8vrczQwXiq8C3UWYY6wWk77Pzam/JgiLlXLH2VjQPblRvl4by0TppkUFfXoFzs00DRJTMgKVjWLMWFcy8xkD8wiV3tgdprvPFsjpW6TsyzaLPTplqBjzpxxDspWs/A3E5jM7nOYy4CU8P1qxQLMmGPrnbuSbaHqrgM7Eq85dAIZW62cBBDhFIOqTzZn4ikHIq0NOYxM+bxZmqYdqkjaYTIXPD0PXqXJ7ABVRsAWe8zinDbqpgIq/A7Ddl8xgf7lTs8o0cQUCvEErxtsnjbZIqiSNvo+6xmbGZy0r9oeujDsrEWIVtKIaVisMWA0lSK/1idPyQ2aoXaEquNkJmwut8xoyUQNMMOklUhz4k7zw4vn0OvXB7HXHER3eGQQB6+fQ1xWRvE1rOc3WK/BdiDoyJwfuFpizz49Rgx7dozwjPGiBCukNst9rlkDxcPD6gC+lOm0BMYZgBsmlyww9HhQwlfWJJEbFcAfmxkPTKJCOKmxa6eP1g7DZo0VcBzebf1svDDnXzEnTYmihjulUiwxXjbZc6yIyGSIQOJRJ5nU+yBM2j0rk7pO238rKq0zZ4Nc341KD15p3CPvNEepdPgvqbR3odKaYP9Cpeei0kdIEmPnK3696WM0evuA0DVTmDR5mkSLA/HcJNo/K4n+9wx6+DL6MSl0cKHQmuDwQqHnotAH45dzLYXMPuibFLrYJxqQR5wRjZk4yaH+B+HQ4Vk59E0+6N/vFfPqrASJUPkDNBOv/Eb2p78A</diagram></mxfile>
<mxfile><diagram id="prtHgNgQTEPvFCAcTncT" name="Page-1">7ZjbctowEIafhksYH8LpEggkM22SmZK218JabDWy5MoCQ56+K1uObZzSZJqUdIYrW7/W2tWu9rOh48/i3ZUiSXQjKfCO59Bdx7/seJ7reT5ejLIvlNHQLYRQMWqNKmHJHsGKjlU3jELaMNRScs2SphhIISDQDY0oJbOm2VrypteEhNASlgHhbfU7ozqyu/CGlX4NLIxKz+5gXMzEpDS2O0kjQmVWk/x5x58pKXVxF+9mwE3yyrwUzy1+M/sUmAKhX/IAvd3tbz8Ng+Fo9TnbphRurvtd1y6zJXxjd3ynwiAiStuo9b5MRZqxmBOBo2mkY46ii7epRltbN4wA56Rij1JoUloEZsAEqPt9Yqy0ArNGyElqimOeae+ljAuUhl1Nsnu7AhmDVns0sbMXNs3lObPDrCrasDxTUa1g3tiKxB6U8GnlKpd4Y9OZD7+moO5WP8xx8xxOVsCLRzteX5AY8NLxBhwdTFcK70Kd77BQWCOng58bU35MEZeq40/yNiD7aqJ6vJ/IlGkmRW15jIsdOmi7JGbLCtYNjzFhXMvcZR/MoFj2wO28mHnyRqq1Tc7y3eZbv4c0NX5uGOegbDnLgHOL2eKukLkMSCXfrdcswJQ5tuBFLPkUrn3hwI7ECYdeIGO7KicBRNjGoJqtzZl4KIRIa0OHiamft8iyrEcVyXpMFobHG8KrnTLbQbUesNWesrjgRtNVQIXfY3je10xgfEXQC0o0MZVCPcXrBk9Pl2xRVGkXY1/0jc9cTrs+BjDqJSJEH1nENCwT3C46yhCvzcZTcoNOqO2gejeZBruRW2ZWyU2NsMCUVUq74Y7j4cVt6A2afdhv96E7eqYPh69vQxzWOvE10PNb0GvBDgSdmNcHjlZ4Yh/uI4YndorygvGyBGskm0Wfa8ZA8d1h1wC+ktm8Eqa5gBMmlywwdDwo4StrksqNCuCPRxnfl0SFcHTFC9t7tPEubNdYAcfW3TZfjWdw/g045zQjihpySqVYaqJss3OqiMhtiEDsqKMc9T4IRy9OylHXeTuUNsnZguu7ofTgi8Z95pPmWZSO/iVK+2eUNgwHZ5SeDKVbgoE53/C3m36OotdfULpkCnMmjzO0fB+emqGDkzJ03PX+d4Qefo1+TIYOzwxtGI7ODD0VQye8+AZ1LqWQOU/bHF3uUw0IE2dCYyaOgtT/ICAdnRSkb4LR9/vMHJ+UkShV/4Hm5rV/kv35Lw==</diagram></mxfile>