Merge branch 'dev' of https://github.com/jgraph/drawio into dev

louyongjiu · May 12, 2024 · 301dd27 · 301dd27
2 parents 5ecbe2e + e30be6f
commit 301dd27
Show file tree

Hide file tree

Showing 40 changed files with 8,062 additions and 7,595 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,20 @@
+10-MAY-2024: 24.4.0
+
+- [vsdx] Fixes attribute labels [drawio-4299]
+- Fixes built-in plugins enabling in windows [drawio-desktop-1508]
+- Adds full support for fullscreen menu option [drawio-desktop-1638]
+- Improves font support in PDF export
+- Improves refresh when Math rendered
+- Adds my.microsoftpersonalcontent.com to CSP
+- Fixes first page title when a file is imported into an empty diagram [drawio-3519]
+- [conf cloud] Adds global config to disable diagram revisions (disableVersioning: true) [DID-10247]
+- Adds grid, selection cells to mxPrintPreview
+- Merges print, PDF and advanced PDF export dialog
+- Fixes bounding box for edge shapes [DID-11356]
+- Fixes label position for Kubernetes shapes [drawio-4386]
+- Updates DOMPurify from 3.1.0 to 3.1.2
+- Handles possible errors in App.clearServiceWorker [drawio-4340]
+
 26-APR-2024: 24.3.1
 
 - Fixes breadcrumb trail after refresh in OneDrive picker [drawio-4339]

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-24.3.1
+24.4.0
diff --git a/etc/dependencies/package.json b/etc/dependencies/package.json
@@ -15,7 +15,7 @@
 	  "mermaid": "10.0.2",
 	  "pako": "2.1.0",
 	  "crypto-js": "3.1.2",
-	  "dompurify": "3.1.0",
+	  "dompurify": "3.1.2",
 	  "spin.js": "2.0.0",
 	  "roughjs": "4.6.6",
 	  "mathjax": "3.2.2",

diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -263,10 +263,6 @@
 
 			if (document.location.protocol == 'file:')
 			{
-				geBasePath = 'js/grapheditor';
-				mxBasePath = 'mxgraph';
-				drawDevUrl = '';
-
 				// Forces includes for dev environment in node.js
 				mxForceIncludes = true;
 			}

diff --git a/src/main/webapp/js/diagramly/App.js b/src/main/webapp/js/diagramly/App.js
@@ -727,7 +727,7 @@ App.main = function(callback, createUi)
 				{
 					var content = mxUtils.getTextContent(bootstrap);
 
-					if (CryptoJS.MD5(content).toString() != '9c693e05e3598c1b18eae12d147a29aa')
+					if (CryptoJS.MD5(content).toString() != 'e67d72090cb74390e6c8d29461b8a907')
 					{
 						console.log('Change bootstrap script MD5 in the previous line:', CryptoJS.MD5(content).toString());
 						alert('[Dev] Bootstrap script change requires update of CSP');

diff --git a/src/main/webapp/js/diagramly/Devel.js b/src/main/webapp/js/diagramly/Devel.js
@@ -18,6 +18,8 @@ if (!mxIsElectron)
 			//----------------------------------------------------------//
 			//------------- Bootstrap script in index.html -------------//
 			//----------------------------------------------------------//
+			// Version 24.3.2
+			'\'sha256-qgjuMiWd1HsOihB9Ppd7j72lY0gT8BpBkiRIJFO3sRQ=\' ' +
 			// Version 24.2.6
 			'\'sha256-CuxCZzdV/xHExthsNvH0rD+sU8zQAaYT5XLu6LHfH78=\' ' +
 			// Version 21.7.0
@@ -74,7 +76,7 @@ if (!mxIsElectron)
 			// Adds script tags and loads shapes with eval
 			replace(/%script-src%/g, 'https://www.dropbox.com https://api.trello.com \'unsafe-eval\'').
 			// Adds Trello and Dropbox backend storage
-			replace(/%connect-src%/g, 'https://*.dropboxapi.com https://trello.com https://api.trello.com').
+			replace(/%connect-src%/g, 'https://*.dropboxapi.com https://trello.com https://api.trello.com https://my.microsoftpersonalcontent.com').
 			// Loads common.css from mxgraph
 			replace(/%style-src%/g, '').
 			replace(/%frame-src%/g, '').

diff --git a/src/main/webapp/js/diagramly/Dialogs.js b/src/main/webapp/js/diagramly/Dialogs.js
@@ -1387,13 +1387,15 @@ var CreateGraphDialog = function(editorUi, title, type)
 			layout = new mxCompactTreeLayout(graph);
 			layout.edgeRouting = false;
 			layout.levelDistance = 30;
+			layout.sortEdges = true;
 			edgeStyle = 'edgeStyle=elbowEdgeStyle;elbow=horizontal;';
 		}
 		else if (type == 'verticalTree')
 		{
 			layout = new mxCompactTreeLayout(graph, false);
 			layout.edgeRouting = false;
 			layout.levelDistance = 30;
+			layout.sortEdges = true;
 			edgeStyle = 'edgeStyle=elbowEdgeStyle;elbow=vertical;';
 		}
 		else if (type == 'radialTree')

diff --git a/src/main/webapp/js/diagramly/DrawioFile.js b/src/main/webapp/js/diagramly/DrawioFile.js
@@ -661,15 +661,30 @@ DrawioFile.prototype.checksumError = function(error, patches, details, etag, fun
 					var type = (data != null) ? 'Report' : 'Error';
 					var latest = this.ui.getHashValueForPages(latestFile.getShadowPages());
 					var latestVersion = 'unknown';
+					var latestAgent = 'unknown';
+					var latestType = 'unknown';
 
 					try
 					{
 						var node = (latestFile.initialData != null && latestFile.initialData.length > 0) ?
 							mxUtils.parseXml(latestFile.initialData).documentElement : null;
 
-						if (node != null && node.getAttribute('version') != null)
+						if (node != null)
 						{
-							latestVersion = node.getAttribute('version');
+							if (node.getAttribute('version') != null)
+							{
+								latestVersion = node.getAttribute('version');
+							}
+
+							if (node.getAttribute('agent') != null)
+							{
+								latestAgent = node.getAttribute('agent');
+							}
+
+							if (node.getAttribute('type') != null)
+							{
+								latestType = node.getAttribute('type');
+							}
 						}
 					}
 					catch (e)
@@ -690,8 +705,10 @@ DrawioFile.prototype.checksumError = function(error, patches, details, etag, fun
 						((latest != null) ? ('-latest_' + latest) : '') +
 						'-latestRev_' + this.ui.hashValue(
 							latestFile.getCurrentRevisionId()) +
-						('-latestVersion_' + latestVersion));
-
+						('-latestVersion_' + latestVersion) +
+						('-latestAgent_' + latestAgent) +
+						('-latestType_' + latestType));
+
 					EditorUi.logEvent({category: 'CHECKSUM-ERROR-SYNC-FILE-' + id,
 						action: functionName, label: 'user_' + uid + ((this.sync != null) ?
 						'-client_' + this.sync.clientId : '-nosync') +