Merge branch 'ww' into 'main'

feat: 新增组态分享功能

See merge request yunteng/thingskit-scada!59

@@ -8,3 +8,4 @@ yarn.lock
 **/.DS_Store
 **/*.min.js
 dist
+src/main/webapp/js/grapheditor/compiled/Format.js

@@ -57,7 +57,7 @@ public class Xml2Js
 					String name = f.getCanonicalPath()
 							.substring(basePath.length() + 1);
 					result.add(
-							"f['" + name + "'] = '" + processFile(f) + "';\n");
+							"f['" + name.replace("\\", "/") + "'] = '" + processFile(f) + "';\n");
 				}
 			}
 		}

@@ -22,26 +22,26 @@
 	<meta name="mobile-web-app-capable" content="yes">
 	<meta name="theme-color" content="#d89000">
 
-	<link rel="stylesheet" href="./js/plugin/layui/css/layui.css?v=1670325027797">
+	<link rel="stylesheet" href="./js/plugin/layui/css/layui.css?v=1679478216446">
 
 	<!-- load configure file -->
-	<script src="./js/config/config.js?v=1670325027797"></script>
+	<script src="./js/config/config.js?v=1679478216446"></script>
 
 	<!-- crypto-js	-->
-	<script src="./js/plugin/crypto-js/crypto-js.js?v=1670325027797"></script>
+	<script src="./js/plugin/crypto-js/crypto-js.js?v=1679478216446"></script>
 
 	<!-- storage persistent	-->
-	<script src="./js/const/persistentStorage.js?v=1670325027797"></script>
+	<script src="./js/const/persistentStorage.js?v=1679478216446"></script>
 	<!-- Global const -->
-	<script src="./js/const/const.js?v=1670325027797"></script>
+	<script src="./js/const/const.js?v=1679478216446"></script>
 
 	<!-- Axios	-->
-	<script src="./js/plugin/axios/axios.min.js?v=1670325027797"></script>
-	<script src="./js/plugin/axios/DefHttp.js?v=1670325027797"></script>
-	<script src="./js/api/index.js?v=1670325027797"></script>
+	<script src="./js/plugin/axios/axios.min.js?v=1679478216446"></script>
+	<script src="./js/plugin/axios/DefHttp.js?v=1679478216446"></script>
+	<script src="./js/api/index.js?v=1679478216446"></script>
 
 	<!-- load script -->
-	<script src="./js/config/loadScript.js?v=1670325027797"></script>
+	<script src="./js/config/loadScript.js?v=1679478216446"></script>
 
 	<!-- act editor -->
 	<!-- <script src="https://oss.yuntengcloud.com/iotdocs/thingskit-scada/ace.js"></script> -->
@@ -54,7 +54,7 @@
 	<!-- <script src="https://vjs.zencdn.net/7.10.2/video.min.js"></script> -->
 	<!-- <script src="https://oss.yuntengcloud.com/iotdocs/thingskit-scada/video.min.js"></script> -->
 
-	<script src="./js/plugin/layui/layui.js?v=1670325027797"></script>
+	<script src="./js/plugin/layui/layui.js?v=1679478216446"></script>
 	<!-- <link rel="stylesheet" href="https://cdnjs.loli.net/ajax/libs/layui/2.6.8/css/layui.min.css"
 		integrity="sha512-iQBJbsNHXUcgEIgWThd2dr8tOdKPvICwqjPEZYY81z3eMya44A5MiAqfWSCh+Ee1YzNYkdrI982Qhwgr8LEYOQ=="
 		crossorigin="anonymous" referrerpolicy="no-referrer" />
@@ -63,7 +63,7 @@
 		crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
 
 	<!-- 引入修改样式	-->
-	<link rel="stylesheet" href="./styles/formatChange.css?v=1670325027797">
+	<link rel="stylesheet" href="./styles/formatChange.css?v=1679478216446">
 
 	<script type="text/javascript">
 		/**
@@ -306,7 +306,7 @@
 				var supportedDomain = (hostName.substring(hostName.length - 8, hostName.length) === '.draw.io') ||
 					(hostName.substring(hostName.length - 13, hostName.length) === '.diagrams.net');
 
-				const releaseVersion = '1670325027797'
+				const releaseVersion = '1679478216446'
 				const appMinSrc = Enable_OSS ? `${OSS_Prefix}app.min.js?v=${releaseVersion}` : `js/app.min.js?v=${releaseVersion}`
 				function loadAppJS() {
 					mxscript(appMinSrc, function () {

@@ -65,8 +65,7 @@ App = function (editor, container, lightbox) {
 	// Pre-fetches images
 	if (mxClient.IS_SVG) {
 		mxGraph.prototype.warningImage.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAE7SURBVHjaYvz//z8DJQAggBjwGXDuHMP/tWuD/uPTCxBAOA0AaQRK/f/+XeJ/cbHlf1wGAAQQTgPu3QNLgfHSpZo4DQAIIKwGwGyH4e/fFbG6AiQJEEAs2Ew2NFzH8OOHBMO6dT/A/KCg7wxGRh+wuhQggDBcALMdFIAcHBxgDGJjcwVIIUAAYbhAUXEdVos4OO4DXcGBIQ4QQCguQPY7sgtgAYruCpAgQACx4LJdU1OCwctLEcyWlLwPJF+AXQE0EMUBAAEEdwF6yMOiD4RRY0QT7gqQAEAAseDzu6XldYYPH9DD4joQa8L5AAEENgWb7SBcXa0JDQMBrK4AcQACiAlfyOMCEFdAnAYQQEz4FLa0XGf4/v0H0IIPONUABBAjyBmMjIwMS5cK/L927QORbtBkaG29DtYLEGAAH6f7oq3Zc+kAAAAASUVORK5CYII=';
-	}
-	else {
+	} else {
 		var img = new Image();
 		img.src = mxGraph.prototype.warningImage.src;
 	}
@@ -82,15 +81,13 @@ App = function (editor, container, lightbox) {
 
 		try {
 			wnd = window.open(url);
-		}
-		catch (e) {
+		} catch (e) {
 			// ignore
 		}
 
 		if (wnd == null || wnd === undefined) {
 			this.showDialog(new PopupDialog(this, url, pre, fallback).container, 320, 140, true, true);
-		}
-		else if (pre != null) {
+		} else if (pre != null) {
 			pre();
 		}
 	});
@@ -119,13 +116,11 @@ App = function (editor, container, lightbox) {
 		for (var i = 0; i < App.DrawPlugins.length; i++) {
 			try {
 				App.DrawPlugins[i](this);
-			}
-			catch (e) {
+			} catch (e) {
 				if (window.console != null) {
 					console.log('Plugin Error:', e, App.DrawPlugins[i]);
 				}
-			}
-			finally {
+			} finally {
 				App.embedModePluginsCount--;
 				this.initializeEmbedMode();
 			}
@@ -135,8 +130,7 @@ App = function (editor, container, lightbox) {
 		window.Draw.loadPlugin = mxUtils.bind(this, function (callback) {
 			try {
 				callback(this);
-			}
-			finally {
+			} finally {
 				App.embedModePluginsCount--;
 				this.initializeEmbedMode();
 			}
@@ -425,8 +419,7 @@ App.getStoredMode = function () {
 							// Disables loading of client
 							window.DriveClient = null;
 						}
-					}
-					else {
+					} else {
 						// Disables loading of client
 						window.DriveClient = null;
 					}
@@ -444,12 +437,10 @@ App.getStoredMode = function () {
 								// Must load this after the dropbox SDK since they use the same namespace
 								mxscript(App.DROPINS_URL, null, 'dropboxjs', App.DROPBOX_APPKEY, true);
 							});
-						}
-						else if (urlParams['chrome'] == '0') {
+						} else if (urlParams['chrome'] == '0') {
 							window.DropboxClient = null;
 						}
-					}
-					else {
+					} else {
 						// Disables loading of client
 						window.DropboxClient = null;
 					}
@@ -464,12 +455,10 @@ App.getStoredMode = function () {
 							window.location.hash.substring(0, 2) == '#W')) {
 							//Editor.oneDriveInlinePicker can be set with configuration which is done later, so load it all time
 							mxscript(App.ONEDRIVE_URL);
-						}
-						else if (urlParams['chrome'] == '0') {
+						} else if (urlParams['chrome'] == '0') {
 							window.OneDriveClient = null;
 						}
-					}
-					else {
+					} else {
 						// Disables loading of client
 						window.OneDriveClient = null;
 					}
@@ -485,12 +474,10 @@ App.getStoredMode = function () {
 							mxscript(App.TRELLO_JQUERY_URL, function () {
 								mxscript(App.TRELLO_URL);
 							});
-						}
-						else if (urlParams['chrome'] == '0') {
+						} else if (urlParams['chrome'] == '0') {
 							window.TrelloClient = null;
 						}
-					}
-					else {
+					} else {
 						// Disables loading of client
 						window.TrelloClient = null;
 					}
@@ -530,7 +517,7 @@ App.main = function (callback, createUi) {
 	// 应用启动入口时创建一个axios实例，供全局使用
 	defHttp = createAxios({
 		timeout: 10 * 1000,
-		baseURL: '/api',
+		baseURL: '/api'
 	})
 	// Logs uncaught errors
 	window.onerror = function (message, url, linenumber, colno, err) {
@@ -605,13 +592,11 @@ App.main = function (callback, createUi) {
 						alert('Cache cleared');
 					}
 				});
-			}
-			else if (Editor.enableServiceWorker) {
+			} else if (Editor.enableServiceWorker) {
 				// Runs as progressive web app if service workers are supported
 				navigator.serviceWorker.register('/service-worker.js');
 			}
-		}
-		catch (e) {
+		} catch (e) {
 			if (window.console != null) {
 				console.error(e);
 			}
@@ -646,8 +631,7 @@ App.main = function (callback, createUi) {
 					if (temp != null) {
 						plugins = temp.plugins;
 					}
-				}
-				catch (e) {
+				} catch (e) {
 					// ignore
 				}
 			}
@@ -686,8 +670,7 @@ App.main = function (callback, createUi) {
 
 								mxscript(plugins[i]);
 							}
-						}
-						catch (e) {
+						} catch (e) {
 							// ignore
 						}
 					}
@@ -766,13 +749,11 @@ App.main = function (callback, createUi) {
 										}
 
 										value = config;
-									}
-									catch (e) {
+									} catch (e) {
 										window.location.hash = '';
 										alert(e);
 									}
-								}
-								else {
+								} else {
 									value = value.merge;
 								}
 							}
@@ -786,8 +767,7 @@ App.main = function (callback, createUi) {
 						}
 
 						window.location.hash = '';
-					}
-					catch (e) {
+					} catch (e) {
 						window.location.hash = '';
 						alert(e);
 					}
@@ -877,8 +857,7 @@ App.main = function (callback, createUi) {
 				if (urlParams['dev'] == '1' || EditorUi.isElectronApp) //TODO check if we can remove these scripts loading from index.html
 				{
 					realMain();
-				}
-				else {
+				} else {
 					mxStencilRegistry.allowEval = false;
 					let loadScriptList = [
 						'js/shapes-14-6-5.min.js',
@@ -926,8 +905,7 @@ App.main = function (callback, createUi) {
 					if (!isNaN(val) && val > 0) {
 						DrawioFile.prototype.autosaveDelay = val;
 						EditorUi.debug('Setting autosaveDelay', val);
-					}
-					else {
+					} else {
 						EditorUi.debug('Invalid autosaveDelay', val);
 					}
 				}
@@ -938,14 +916,12 @@ App.main = function (callback, createUi) {
 					if (!isNaN(val) && val > 0) {
 						Graph.prototype.defaultEdgeLength = val;
 						EditorUi.debug('Using defaultEdgeLength', val);
-					}
-					else {
+					} else {
 						EditorUi.debug('Invalid defaultEdgeLength', val);
 					}
 				}
 			}
-		}
-		catch (e) {
+		} catch (e) {
 			if (window.console != null) {
 				console.error(e);
 			}
@@ -986,8 +962,7 @@ App.main = function (callback, createUi) {
 						mxSettings.load();
 						doMain();
 					}
-				}
-				catch (e) {
+				} catch (e) {
 					if (window.console != null) {
 						console.log('Error in configure message: ' + e, evt.data);
 					}
@@ -998,8 +973,7 @@ App.main = function (callback, createUi) {
 		// Receives XML message from opener and puts it into the graph
 		mxEvent.addListener(window, 'message', configHandler);
 		op.postMessage(JSON.stringify({ event: 'configure' }), '*');
-	}
-	else {
+	} else {
 		if (Editor.config == null) {
 			// Loads configuration from global scope or local storage
 			if (window.DRAWIO_CONFIG != null) {
@@ -1007,8 +981,7 @@ App.main = function (callback, createUi) {
 					EditorUi.debug('Using global configuration', window.DRAWIO_CONFIG);
 					Editor.configure(window.DRAWIO_CONFIG);
 					mxSettings.load();
-				}
-				catch (e) {
+				} catch (e) {
 					if (window.console != null) {
 						console.error(e);
 					}
@@ -1028,8 +1001,7 @@ App.main = function (callback, createUi) {
 							Editor.configure(configData);
 							mxSettings.load();
 						}
-					}
-					catch (e) {
+					} catch (e) {
 						if (window.console != null) {
 							console.error(e);
 						}
@@ -1101,8 +1073,7 @@ App.prototype.fullscreenMode = false;
  */
 if (urlParams['embed'] != '1') {
 	App.prototype.menubarHeight = 64;
-}
-else {
+} else {
 	App.prototype.footerHeight = 0;
 }
 
@@ -1148,26 +1119,21 @@ App.loadPlugins = function (plugins, useInclude) {
 						if (typeof window.drawDevUrl === 'undefined') {
 							if (useInclude) {
 								mxinclude(url);
-							}
-							else {
+							} else {
 								mxscript(url);
 							}
-						}
-						else {
+						} else {
 							if (useInclude) {
 								mxinclude(url);
-							}
-							else {
+							} else {
 								mxscript(drawDevUrl + url);
 							}
 						}
 					}
-				}
-				else if (window.console != null) {
+				} else if (window.console != null) {
 					console.log('Unknown plugin:', plugins[i]);
 				}
-			}
-			catch (e) {
+			} catch (e) {
 				if (window.console != null) {
 					console.log('Error loading plugin:', plugins[i], e);
 				}
@@ -1188,8 +1154,7 @@ App.prototype.initializeEmbedMode = function () {
 
 		if (App.embedModePluginsCount > 0 || this.initEmbedDone) {
 			return; //Wait for plugins to load, or this is a duplicate call due to timeout
-		}
-		else {
+		} else {
 			this.initEmbedDone = true;
 		}
 
@@ -1212,7 +1177,7 @@ App.prototype.initializeViewerMode = function () {
 
 /**
  * Translates this point by the given vector.
- *	原型初始化，所有的原型调用此方法初始化
+ *    原型初始化，所有的原型调用此方法初始化
  * @param {number} dx X-coordinate of the translation.
  * @param {number} dy Y-coordinate of the translation.
  */
@@ -1280,8 +1245,7 @@ App.prototype.init = function () {
 
 				// Notifies listeners of new client
 				this.fireEvent(new mxEventObject('clientLoaded', 'client', this.oneDrive));
-			}
-			else if (window.DrawOneDriveClientCallback == null) {
+			} else if (window.DrawOneDriveClientCallback == null) {
 				window.DrawOneDriveClientCallback = initOneDriveClient;
 			}
 		});
@@ -1309,14 +1273,12 @@ App.prototype.init = function () {
 
 					// Notifies listeners of new client
 					this.fireEvent(new mxEventObject('clientLoaded', 'client', this.trello));
-				}
-				catch (e) {
+				} catch (e) {
 					if (window.console != null) {
 						console.error(e);
 					}
 				}
-			}
-			else if (window.DrawTrelloClientCallback == null) {
+			} else if (window.DrawTrelloClientCallback == null) {
 				window.DrawTrelloClientCallback = initTrelloClient;
 			}
 		});
@@ -1353,12 +1315,10 @@ App.prototype.init = function () {
 					 * Clears any callbacks.
 					 */
 					window.DrawGapiClientCallback = null;
-				}
-				else {
+				} else {
 					doInit();
 				}
-			}
-			else if (window.DrawGapiClientCallback == null) {
+			} else if (window.DrawGapiClientCallback == null) {
 				window.DrawGapiClientCallback = initDriveClient;
 			}
 		});
@@ -1390,14 +1350,12 @@ App.prototype.init = function () {
 
 					// Notifies listeners of new client
 					this.fireEvent(new mxEventObject('clientLoaded', 'client', this.dropbox));
-				}
-				catch (e) {
+				} catch (e) {
 					if (window.console != null) {
 						console.error(e);
 					}
 				}
-			}
-			else if (window.DrawDropboxClientCallback == null) {
+			} else if (window.DrawDropboxClientCallback == null) {
 				window.DrawDropboxClientCallback = initDropboxClient;
 			}
 		});
@@ -1420,8 +1378,7 @@ App.prototype.init = function () {
 		// Sets the initial mode
 		if (urlParams['local'] == '1') {
 			this.setMode(App.MODE_DEVICE);
-		}
-		else {
+		} else {
 			this.mode = App.mode;
 		}
 
@@ -1445,8 +1402,7 @@ App.prototype.init = function () {
 				if (urlParams['extAuth'] != '1' && (mode == App.MODE_DEVICE || mode == App.MODE_BROWSER)) {
 					//关闭桌面弹出广告
 					//this.showDownloadDesktopBanner();
-				}
-				else if (urlParams['embed'] != '1' && this.getServiceName() == 'draw.io') {
+				} else if (urlParams['embed'] != '1' && this.getServiceName() == 'draw.io') {
 					// just app.diagrams.net users
 					// this.showNameConfBanner();
 				}
@@ -1485,8 +1441,7 @@ App.prototype.init = function () {
 				window.clearTimeout(timeoutThread);
 			}));
 		}
-	}
-	else if (this.menubar != null) {
+	} else if (this.menubar != null) {
 		this.menubar.container.style.paddingTop = '0px';
 	}
 
@@ -1823,8 +1778,7 @@ App.prototype.checkLicense = function () {
 							}
 						}
 					}
-				}
-				catch (e) {
+				} catch (e) {
 					// ignore
 				}
 			}));
@@ -1848,8 +1802,7 @@ App.prototype.getEditBlankXml = function () {
 
 	if (file != null && this.editor.isChromelessView() && this.editor.graph.isLightboxView()) {
 		return file.getData();
-	}
-	else {
+	} else {
 		return this.getFileData(true);
 	}
 };
@@ -1872,8 +1825,7 @@ App.prototype.addRecent = function (entry) {
 
 		if (recent == null) {
 			recent = [];
-		}
-		else {
+		} else {
 			for (var i = 0; i < recent.length; i++) {
 				if (recent[i].id == entry.id) {
 					recent.splice(i, 1);
@@ -1900,8 +1852,7 @@ App.prototype.getRecent = function () {
 			if (recent != null) {
 				return JSON.parse(recent);
 			}
-		}
-		catch (e) {
+		} catch (e) {
 			// ignore
 		}
 
@@ -1916,8 +1867,7 @@ App.prototype.resetRecent = function (entry) {
 	if (isLocalStorage && localStorage != null) {
 		try {
 			localStorage.removeItem('.recent');
-		}
-		catch (e) {
+		} catch (e) {
 			// ignore
 		}
 	}
@@ -1929,8 +1879,7 @@ App.prototype.resetRecent = function (entry) {
 App.prototype.onBeforeUnload = function () {
 	if (urlParams['embed'] == '1' && this.editor.modified) {
 		return mxResources.get('allChangesLost');
-	}
-	else {
+	} else {
 		var file = this.getCurrentFile();
 
 		if (file != null) {
@@ -1939,11 +1888,9 @@ App.prototype.onBeforeUnload = function () {
 				urlParams['nowarn'] != '1' && !this.isDiagramEmpty() && urlParams['url'] == null &&
 				!this.editor.isChromelessView() && file.fileHandle == null) {
 				return mxResources.get('ensureDataSaved');
-			}
-			else if (file.isModified()) {
+			} else if (file.isModified()) {
 				return mxResources.get('allChangesLost');
-			}
-			else {
+			} else {
 				file.close(true);
 			}
 		}
@@ -2023,8 +1970,7 @@ App.prototype.getThumbnail = function (width, fn) {
 
 			if (this.currentPage == page) {
 				graph.setBackgroundImage(bgImg);
-			}
-			else if (page.viewState != null && page.viewState != null) {
+			} else if (page.viewState != null && page.viewState != null) {
 				bgImg = page.viewState.backgroundImage;
 				graph.setBackgroundImage(bgImg);
 			}
@@ -2032,8 +1978,7 @@ App.prototype.getThumbnail = function (width, fn) {
 			graph.getGlobalVariable = function (name) {
 				if (name == 'page') {
 					return page.getName();
-				}
-				else if (name == 'pagenumber') {
+				} else if (name == 'pagenumber') {
 					return 1;
 				}
 
@@ -2053,8 +1998,7 @@ App.prototype.getThumbnail = function (width, fn) {
 					if (graph != this.editor.graph && graph.container.parentNode != null) {
 						graph.container.parentNode.removeChild(graph.container);
 					}
-				}
-				catch (e) {
+				} catch (e) {
 					canvas = null;
 				}
 
@@ -2066,8 +2010,7 @@ App.prototype.getThumbnail = function (width, fn) {
 				null, 'diagram', null);
 
 			result = true;
-		}
-		else if (this.canvasSupported && this.getCurrentFile() != null) {
+		} else if (this.canvasSupported && this.getCurrentFile() != null) {
 			var canvas = document.createElement('canvas');
 			var bounds = graph.getGraphBounds();
 			var t = graph.view.translate;
@@ -2157,8 +2100,7 @@ App.prototype.getThumbnail = function (width, fn) {
 					if (graph != this.editor.graph && graph.container.parentNode != null) {
 						graph.container.parentNode.removeChild(graph.container);
 					}
-				}
-				catch (e) {
+				} catch (e) {
 					canvas = null;
 				}
 
@@ -2167,8 +2109,7 @@ App.prototype.getThumbnail = function (width, fn) {
 
 			result = true;
 		}
-	}
-	catch (e) {
+	} catch (e) {
 		result = false;
 
 		// Removes temporary graph from DOM
@@ -2229,16 +2170,13 @@ App.prototype.createBackground = function () {
 			if (mode == App.MODE_GOOGLE) {
 				this.appIcon.setAttribute('title', mxResources.get('openIt', [mxResources.get('googleDrive')]));
 				this.appIcon.style.cursor = 'pointer';
-			}
-			else if (mode == App.MODE_DROPBOX) {
+			} else if (mode == App.MODE_DROPBOX) {
 				this.appIcon.setAttribute('title', mxResources.get('openIt', [mxResources.get('dropbox')]));
 				this.appIcon.style.cursor = 'pointer';
-			}
-			else if (mode == App.MODE_ONEDRIVE) {
+			} else if (mode == App.MODE_ONEDRIVE) {
 				this.appIcon.setAttribute('title', mxResources.get('openIt', [mxResources.get('oneDrive')]));
 				this.appIcon.style.cursor = 'pointer';
-			}
-			else {
+			} else {
 				this.appIcon.removeAttribute('title');
 				this.appIcon.style.cursor = (mode == App.MODE_DEVICE) ? 'pointer' : 'default';
 			}
@@ -2248,14 +2186,12 @@ App.prototype.createBackground = function () {
 			try {
 				if (isLocalStorage) {
 					localStorage.setItem('.mode', mode);
-				}
-				else if (typeof (Storage) != 'undefined') {
+				} else if (typeof (Storage) != 'undefined') {
 					var expiry = new Date();
 					expiry.setYear(expiry.getFullYear() + 1);
 					document.cookie = 'MODE=' + mode + '; expires=' + expiry.toUTCString();
 				}
-			}
-			catch (e) {
+			} catch (e) {
 				// ignore possible access denied
 			}
 		}
@@ -2270,8 +2206,7 @@ App.prototype.createBackground = function () {
 App.prototype.appIconClicked = function (evt) {
 	if (mxEvent.isAltDown(evt)) {
 		this.showSplash(true);
-	}
-	else {
+	} else {
 		var file = this.getCurrentFile();
 		var mode = (file != null) ? file.getMode() : null;
 
@@ -2280,15 +2215,12 @@ App.prototype.appIconClicked = function (evt) {
 				file.desc.parents.length > 0 && !mxEvent.isShiftDown(evt)) {
 				// Opens containing folder
 				this.openLink('https://drive.google.com/drive/folders/' + file.desc.parents[0].id);
-			}
-			else if (file != null && file.getId() != null) {
+			} else if (file != null && file.getId() != null) {
 				this.openLink('https://drive.google.com/open?id=' + file.getId());
-			}
-			else {
+			} else {
 				this.openLink('https://drive.google.com/?authuser=0');
 			}
-		}
-		else if (mode == App.MODE_ONEDRIVE) {
+		} else if (mode == App.MODE_ONEDRIVE) {
 			if (file != null && file.meta != null && file.meta.webUrl != null) {
 				var url = file.meta.webUrl;
 				var name = encodeURIComponent(file.meta.name);
@@ -2298,12 +2230,10 @@ App.prototype.appIconClicked = function (evt) {
 				}
 
 				this.openLink(url);
-			}
-			else {
+			} else {
 				this.openLink('https://onedrive.live.com/');
 			}
-		}
-		else if (mode == App.MODE_DROPBOX) {
+		} else if (mode == App.MODE_DROPBOX) {
 			if (file != null && file.stat != null && file.stat.path_display != null) {
 				var url = 'https://www.dropbox.com/home/Apps/drawio' + file.stat.path_display;
 
@@ -2312,31 +2242,24 @@ App.prototype.appIconClicked = function (evt) {
 				}
 
 				this.openLink(url);
-			}
-			else {
+			} else {
 				this.openLink('https://www.dropbox.com/');
 			}
-		}
-		else if (mode == App.MODE_TRELLO) {
+		} else if (mode == App.MODE_TRELLO) {
 			this.openLink('https://trello.com/');
-		}
-		else if (mode == App.MODE_GITHUB) {
+		} else if (mode == App.MODE_GITHUB) {
 			if (file != null && file.constructor == GitHubFile) {
 				this.openLink(file.meta.html_url);
-			}
-			else {
+			} else {
 				this.openLink('https://github.com/');
 			}
-		}
-		else if (mode == App.MODE_GITLAB) {
+		} else if (mode == App.MODE_GITLAB) {
 			if (file != null && file.constructor == GitLabFile) {
 				this.openLink(file.meta.html_url);
-			}
-			else {
+			} else {
 				this.openLink(DRAWIO_GITLAB_URL);
 			}
-		}
-		else if (mode == App.MODE_DEVICE) {
+		} else if (mode == App.MODE_DEVICE) {
 			this.openLink('https://get.draw.io/');
 		}
 	}
@@ -2352,8 +2275,7 @@ App.prototype.appIconClicked = function (evt) {
 App.prototype.clearMode = function () {
 	if (isLocalStorage) {
 		localStorage.removeItem('.mode');
-	}
-	else if (typeof (Storage) != 'undefined') {
+	} else if (typeof (Storage) != 'undefined') {
 		var expiry = new Date();
 		expiry.setYear(expiry.getFullYear() - 1);
 		document.cookie = 'MODE=; expires=' + expiry.toUTCString();
@@ -2408,8 +2330,7 @@ App.prototype.open = function () {
 				value.substring(0, 8) != 'https://') {
 				var doc = mxUtils.parseXml(window.opener[value]);
 				this.editor.setGraphXml(doc.documentElement);
-			}
-			else if (window.opener.openFile != null) {
+			} else if (window.opener.openFile != null) {
 				window.opener.openFile.setConsumer(mxUtils.bind(this, function (xml, filename, temp) {
 					this.spinner.stop();
 
@@ -2419,8 +2340,7 @@ App.prototype.open = function () {
 
 						if (title != null) {
 							filename = decodeURIComponent(title);
-						}
-						else {
+						} else {
 							filename = this.defaultFilename;
 						}
 					}
@@ -2438,8 +2358,7 @@ App.prototype.open = function () {
 				}));
 			}
 		}
-	}
-	catch (e) {
+	} catch (e) {
 		// ignore
 	}
 };
@@ -2462,8 +2381,7 @@ App.prototype.load = function () {
 		if (this.spinner.spin(document.body, mxResources.get('starting'))) {
 			try {
 				this.stateArg = (urlParams['state'] != null && this.drive != null) ? JSON.parse(decodeURIComponent(urlParams['state'])) : null;
-			}
-			catch (e) {
+			} catch (e) {
 				// ignores invalid state args
 			}
 
@@ -2479,8 +2397,7 @@ App.prototype.load = function () {
 			if (urlParams['fileId'] != null) {
 				window.location.hash = 'G' + urlParams['fileId'];
 				window.location.search = this.getSearch(['fileId']);
-			}
-			else {
+			} else {
 				// Asynchronous or disabled loading of client
 				if (this.drive == null) {
 					if (this.mode == App.MODE_GOOGLE) {
@@ -2488,20 +2405,19 @@ App.prototype.load = function () {
 					}
 
 					this.start();
-				}
-				else {
+				} else {
 					this.loadGapi(mxUtils.bind(this, function () {
 						this.start();
 					}));
 				}
 			}
 		}
-	}
-	else {
+	} else {
 		this.restoreLibraries();
 
 		if (urlParams['gapi'] == '1') {
-			this.loadGapi(function () { });
+			this.loadGapi(function () {
+			});
 		}
 	}
 };
@@ -2648,8 +2564,7 @@ App.prototype.start = function () {
 					(!this.editor.chromeless || this.editor.editable)) {
 					this.showNameChangeBanner();
 				}
-			}
-			catch (e) {
+			} catch (e) {
 				// ignore
 			}
 
@@ -2662,8 +2577,7 @@ App.prototype.start = function () {
 					if (file == null || file.getHash() != id) {
 						this.loadFile(id, true);
 					}
-				}
-				catch (e) {
+				} catch (e) {
 					// Workaround for possible scrollWidth of null in Dialog ctor
 					if (document.body != null) {
 						this.handleError(e, mxResources.get('errorLoadingFile'), mxUtils.bind(this, function () {
@@ -2682,8 +2596,7 @@ App.prototype.start = function () {
 					null, mxUtils.bind(this, function (e) {
 						this.handleError(e, mxResources.get('errorLoadingFile'));
 					}));
-			}
-			catch (e) {
+			} catch (e) {
 				this.handleError(e, mxResources.get('errorLoadingFile'));
 			}
 		}
@@ -2708,8 +2621,7 @@ App.prototype.start = function () {
 
 						if (title != null) {
 							title = decodeURIComponent(title);
-						}
-						else {
+						} else {
 							title = this.defaultFilename;
 						}
 
@@ -2732,14 +2644,12 @@ App.prototype.start = function () {
 
 						if (value != null) {
 							doLoadFile(parent[decodeURIComponent(value)]);
-						}
-						else {
+						} else {
 							value = urlParams['data'];
 
 							if (value != null) {
 								doLoadFile(decodeURIComponent(value));
-							}
-							else {
+							} else {
 								this.installMessageHandler(mxUtils.bind(this, function (xml, evt) {
 									// Ignores messages from other windows
 									if (evt.source == parent) {
@@ -2756,8 +2666,7 @@ App.prototype.start = function () {
 						var prev = Editor.useLocalStorage;
 						this.createFile(this.defaultFilename, null, null, null, null, null, null, true);
 						Editor.useLocalStorage = prev;
-					}
-					else {
+					} else {
 						var waiting = false;
 
 						// Checks if we're waiting for some asynchronous file to be loaded
@@ -2765,24 +2674,21 @@ App.prototype.start = function () {
 						// were opened from another domain then this will fail.
 						try {
 							waiting = window.opener != null && window.opener.openFile != null;
-						}
-						catch (e) {
+						} catch (e) {
 							// ignore
 						}
 
 						if (waiting) {
 							// Spinner is stopped in App.open
 							this.spinner.spin(document.body, mxResources.get('loading'))
-						}
-						else {
+						} else {
 							var id = this.getDiagramId();
 
 							if (EditorUi.enableDrafts && urlParams['mode'] == null &&
 								this.getServiceName() == 'draw.io' && (id == null || id.length == 0) &&
 								!this.editor.isChromelessView()) {
 								this.checkDrafts();
-							}
-							else if (id != null && id.length > 0) {
+							} else if (id != null && id.length > 0) {
 								this.loadFile(id, null, null, mxUtils.bind(this, function () {
 									var temp = decodeURIComponent(urlParams['viewbox'] || '');
 
@@ -2790,18 +2696,15 @@ App.prototype.start = function () {
 										try {
 											var bounds = JSON.parse(temp);
 											this.editor.graph.fitWindow(bounds, bounds.border);
-										}
-										catch (e) {
+										} catch (e) {
 											// Ignore invalid viewport
 											console.error(e);
 										}
 									}
 								}));
-							}
-							else if (urlParams['splash'] != '0' || urlParams['mode'] != null) {
+							} else if (urlParams['splash'] != '0' || urlParams['mode'] != null) {
 								this.loadFile();
-							}
-							else if (!EditorUi.isElectronApp) {
+							} else if (!EditorUi.isElectronApp) {
 								this.createFile(this.defaultFilename, this.getFileData(), null, null, null, null, null, true);
 							}
 						}
@@ -2817,7 +2720,8 @@ App.prototype.start = function () {
 					// Removes URL parameter and reloads the page
 					if (this.spinner.spin(document.body, mxResources.get('reconnecting'))) {
 						window.location.search = this.getSearch(['create', 'title']);
-					};
+					}
+					;
 				});
 
 				var showCreateDialog = mxUtils.bind(this, function (xml) {
@@ -2833,8 +2737,7 @@ App.prototype.start = function () {
 
 						if (title != null) {
 							title = decodeURIComponent(title);
-						}
-						else {
+						} else {
 							title = this.defaultFilename;
 						}
 
@@ -2853,8 +2756,7 @@ App.prototype.start = function () {
 								this.createFile((filename.length > 0) ? filename : this.defaultFilename,
 									this.getFileData(), null, null, null, true, null, true);
 								Editor.useLocalStorage = prev;
-							}
-							else {
+							} else {
 								this.pickFolder(mode, mxUtils.bind(this, function (folderId) {
 									this.createFile(filename, this.getFileData(true),
 										null, mode, null, true, folderId);
@@ -2881,24 +2783,20 @@ App.prototype.start = function () {
 					try {
 						if (window.opener != null && window.opener[value] != null) {
 							showCreateDialog(window.opener[value]);
-						}
-						else {
+						} else {
 							this.handleError(null, mxResources.get('errorLoadingFile'));
 						}
-					}
-					catch (e) {
+					} catch (e) {
 						this.handleError(e, mxResources.get('errorLoadingFile'));
 					}
-				}
-				else {
+				} else {
 					this.loadTemplate(value, function (text) {
 						showCreateDialog(text);
 					}, mxUtils.bind(this, function () {
 						this.handleError(null, mxResources.get('errorLoadingFile'), reconnect);
 					}));
 				}
-			}
-			else {
+			} else {
 				// Passes the fileId from the state parameter to the hash tag and reloads
 				// the page without the state parameter
 				if ((window.location.hash == null || window.location.hash.length <= 1) &&
@@ -2912,8 +2810,7 @@ App.prototype.start = function () {
 
 						window.location.hash = 'G' + this.stateArg.ids[0];
 					}
-				}
-				else if ((window.location.hash == null || window.location.hash.length <= 1) &&
+				} else if ((window.location.hash == null || window.location.hash.length <= 1) &&
 					this.drive != null && this.stateArg != null && this.stateArg.action == 'create') {
 					if (window.history && window.history.replaceState) {
 						// Removes state URL parameter without reloading the page
@@ -2927,12 +2824,10 @@ App.prototype.start = function () {
 						this.createFile((urlParams['title'] != null) ?
 							decodeURIComponent(urlParams['title']) :
 							this.defaultFilename);
-					}
-					else {
+					} else {
 						this.actions.get('new').funct();
 					}
-				}
-				else {
+				} else {
 					// Removes open URL parameter. Hash is also updated in Init to load client.
 					if (urlParams['open'] != null && window.history && window.history.replaceState) {
 
@@ -2945,8 +2840,7 @@ App.prototype.start = function () {
 				}
 			}
 		}
-	}
-	catch (e) {
+	} catch (e) {
 		this.handleError(e);
 	}
 };
@@ -2994,16 +2888,14 @@ App.prototype.filterDrafts = function (filePath, guid, callback) {
 							drafts.push(obj);
 						}
 					}
-				}
-				catch (e) {
+				} catch (e) {
 					// ignore
 				}
 			}
 
 			result();
 		}, result));
-	}
-	catch (e) {
+	} catch (e) {
 		result();
 	}
 };
@@ -3025,8 +2917,7 @@ App.prototype.checkDrafts = function () {
 					this.loadDraft(drafts[0].data, mxUtils.bind(this, function () {
 						this.removeDatabaseItem(drafts[0].key);
 					}));
-				}
-				else if (drafts.length > 1) {
+				} else if (drafts.length > 1) {
 					var ts = new Date(drafts[0].modified);
 
 					var dlg = new DraftDialog(this, (drafts.length > 1) ? mxResources.get('selectDraft') :
@@ -3053,23 +2944,19 @@ App.prototype.checkDrafts = function () {
 					this.showDialog(dlg.container, 640, 480, true, false, mxUtils.bind(this, function (cancel) {
 						if (urlParams['splash'] != '0') {
 							this.loadFile();
-						}
-						else {
+						} else {
 							this.createFile(this.defaultFilename, this.getFileData(), null, null, null, null, null, true);
 						}
 					}));
 					dlg.init();
-				}
-				else if (urlParams['splash'] != '0') {
+				} else if (urlParams['splash'] != '0') {
 					this.loadFile();
-				}
-				else {
+				} else {
 					this.createFile(this.defaultFilename, this.getFileData(), null, null, null, null, null, true);
 				}
 			}));
 		}), 0);
-	}
-	catch (e) {
+	} catch (e) {
 		// ignore
 	}
 };
@@ -3108,8 +2995,7 @@ App.prototype.showSplash = function (force) {
 			mxResources.get('errorLoadingFile'), mxUtils.bind(this, function () {
 				this.showSplash();
 			}));
-	}
-	else if (!mxClient.IS_CHROMEAPP && (this.mode == null || force)) {
+	} else if (!mxClient.IS_CHROMEAPP && (this.mode == null || force)) {
 		var rowLimit = (serviceCount == 4) ? 2 : 3;
 
 		var dlg = new StorageDialog(this, mxUtils.bind(this, function () {
@@ -3119,8 +3005,7 @@ App.prototype.showSplash = function (force) {
 
 		this.showDialog(dlg.container, (rowLimit < 3) ? 200 : 300,
 			((serviceCount > 3) ? 320 : 210), true, false);
-	}
-	else if (urlParams['create'] == null) {
+	} else if (urlParams['create'] == null) {
 		showSecondDialog();
 	}
 };
@@ -3209,12 +3094,10 @@ App.prototype.loadFileSystemEntry = function (fileHandle, success, error) {
 						}
 
 						success(new LocalFile(this, data, file.name, null, fileHandle, file));
-					}
-					else {
+					} else {
 						this.openFileHandle(e.target.result, file.name, file, false, fileHandle);
 					}
-				}
-				catch (e) {
+				} catch (e) {
 					error(e);
 				}
 			});
@@ -3225,13 +3108,11 @@ App.prototype.loadFileSystemEntry = function (fileHandle, success, error) {
 				file.type === 'application/pdf') &&
 				file.type.substring(0, 9) !== 'image/svg') {
 				reader.readAsDataURL(file);
-			}
-			else {
+			} else {
 				reader.readAsText(file);
 			}
 		}), error);
-	}
-	catch (e) {
+	} catch (e) {
 		error(e);
 	}
 };
@@ -3261,12 +3142,10 @@ App.prototype.createFileSystemOptions = function (name) {
 
 		if (this.editor.diagramFileTypes[i].extension == temp) {
 			ext.splice(0, 0, obj);
-		}
-		else {
+		} else {
 			if (this.editor.diagramFileTypes[i].extension == temp) {
 				ext.splice(0, 0, obj);
-			}
-			else {
+			} else {
 				ext.push(obj);
 			}
 		}
@@ -3310,18 +3189,15 @@ App.prototype.pickFile = function (mode) {
 		if (mode == App.MODE_GOOGLE) {
 			if (this.drive != null && typeof (google) != 'undefined' && typeof (google.picker) != 'undefined') {
 				this.drive.pickFile();
-			}
-			else {
+			} else {
 				this.openLink('https://drive.google.com');
 			}
-		}
-		else {
+		} else {
 			var peer = this.getPeerForMode(mode);
 
 			if (peer != null) {
 				peer.pickFile();
-			}
-			else if (mode == App.MODE_DEVICE && EditorUi.nativeFileSupport) {
+			} else if (mode == App.MODE_DEVICE && EditorUi.nativeFileSupport) {
 				window.showOpenFilePicker().then(mxUtils.bind(this, function (fileHandles) {
 					if (fileHandles != null && fileHandles.length > 0 &&
 						this.spinner.spin(document.body, mxResources.get('loading'))) {
@@ -3332,8 +3208,7 @@ App.prototype.pickFile = function (mode) {
 						this.handleError(e);
 					}
 				}));
-			}
-			else if (mode == App.MODE_DEVICE && Graph.fileSupport) {
+			} else if (mode == App.MODE_DEVICE && Graph.fileSupport) {
 				if (this.openFileInputElt == null) {
 					var input = document.createElement('input');
 					input.setAttribute('type', 'file');
@@ -3356,8 +3231,7 @@ App.prototype.pickFile = function (mode) {
 				}
 
 				this.openFileInputElt.click();
-			}
-			else {
+			} else {
 				this.hideDialog();
 				window.openNew = this.getCurrentFile() != null && !this.isDiagramEmpty();
 				window.baseUrl = this.getUrl();
@@ -3398,8 +3272,7 @@ App.prototype.pickFile = function (mode) {
 
 					if (currentFile == null || !currentFile.isModified()) {
 						doOpenFile();
-					}
-					else {
+					} else {
 						this.confirm(mxResources.get('allChangesLost'), null, doOpenFile,
 							mxResources.get('cancel'), mxResources.get('discardChanges'));
 					}
@@ -3419,8 +3292,7 @@ App.prototype.pickFile = function (mode) {
 				});
 			}
 		}
-	}
-	catch (e) {
+	} catch (e) {
 		this.handleError(e);
 	}
 };
@@ -3448,20 +3320,17 @@ App.prototype.pickLibrary = function (mode) {
 				if (optionalFile != null) {
 					try {
 						this.loadLibrary(optionalFile);
-					}
-					catch (e) {
+					} catch (e) {
 						this.handleError(e, mxResources.get('errorLoadingFile'));
 					}
-				}
-				else {
+				} else {
 					if (this.spinner.spin(document.body, mxResources.get('loading'))) {
 						peer.getLibrary(id, mxUtils.bind(this, function (file) {
 							this.spinner.stop();
 
 							try {
 								this.loadLibrary(file);
-							}
-							catch (e) {
+							} catch (e) {
 								this.handleError(e, mxResources.get('errorLoadingFile'));
 							}
 						}), mxUtils.bind(this, function (resp) {
@@ -3471,8 +3340,7 @@ App.prototype.pickLibrary = function (mode) {
 				}
 			}));
 		}
-	}
-	else if (mode == App.MODE_DEVICE && Graph.fileSupport) {
+	} else if (mode == App.MODE_DEVICE && Graph.fileSupport) {
 		if (this.libFileInputElt == null) {
 			var input = document.createElement('input');
 			input.setAttribute('type', 'file');
@@ -3486,8 +3354,7 @@ App.prototype.pickLibrary = function (mode) {
 							reader.onload = mxUtils.bind(this, function (e) {
 								try {
 									this.loadLibrary(new LocalLibrary(this, e.target.result, file.name));
-								}
-								catch (e) {
+								} catch (e) {
 									this.handleError(e, mxResources.get('errorLoadingFile'));
 								}
 							});
@@ -3509,8 +3376,7 @@ App.prototype.pickLibrary = function (mode) {
 		}
 
 		this.libFileInputElt.click();
-	}
-	else {
+	} else {
 		window.openNew = false;
 		window.openKey = 'open';
 
@@ -3538,8 +3404,7 @@ App.prototype.pickLibrary = function (mode) {
 			try {
 				this.loadLibrary((mode == App.MODE_BROWSER) ? new StorageLibrary(this, xml, filename) :
 					new LocalLibrary(this, xml, filename));
-			}
-			catch (e) {
+			} catch (e) {
 				this.handleError(e, mxResources.get('errorLoadingFile'));
 			}
 		}));
@@ -3589,43 +3454,37 @@ App.prototype.saveLibrary = function (name, images, file, mode, noSpin, noReload
 						this.hideDialog(true);
 						this.libraryLoaded(newFile, images);
 					}), error, this.drive.libraryMimeType);
-				}
-				else if (mode == App.MODE_GITHUB && this.gitHub != null && this.spinner.spin(document.body, mxResources.get('inserting'))) {
+				} else if (mode == App.MODE_GITHUB && this.gitHub != null && this.spinner.spin(document.body, mxResources.get('inserting'))) {
 					this.gitHub.insertLibrary(name, xml, mxUtils.bind(this, function (newFile) {
 						this.spinner.stop();
 						this.hideDialog(true);
 						this.libraryLoaded(newFile, images);
 					}), error, folderId);
-				}
-				else if (mode == App.MODE_GITLAB && this.gitLab != null && this.spinner.spin(document.body, mxResources.get('inserting'))) {
+				} else if (mode == App.MODE_GITLAB && this.gitLab != null && this.spinner.spin(document.body, mxResources.get('inserting'))) {
 					this.gitLab.insertLibrary(name, xml, mxUtils.bind(this, function (newFile) {
 						this.spinner.stop();
 						this.hideDialog(true);
 						this.libraryLoaded(newFile, images);
 					}), error, folderId);
-				}
-				else if (mode == App.MODE_TRELLO && this.trello != null && this.spinner.spin(document.body, mxResources.get('inserting'))) {
+				} else if (mode == App.MODE_TRELLO && this.trello != null && this.spinner.spin(document.body, mxResources.get('inserting'))) {
 					this.trello.insertLibrary(name, xml, mxUtils.bind(this, function (newFile) {
 						this.spinner.stop();
 						this.hideDialog(true);
 						this.libraryLoaded(newFile, images);
 					}), error, folderId);
-				}
-				else if (mode == App.MODE_DROPBOX && this.dropbox != null && this.spinner.spin(document.body, mxResources.get('inserting'))) {
+				} else if (mode == App.MODE_DROPBOX && this.dropbox != null && this.spinner.spin(document.body, mxResources.get('inserting'))) {
 					this.dropbox.insertLibrary(name, xml, mxUtils.bind(this, function (newFile) {
 						this.spinner.stop();
 						this.hideDialog(true);
 						this.libraryLoaded(newFile, images);
 					}), error, folderId);
-				}
-				else if (mode == App.MODE_ONEDRIVE && this.oneDrive != null && this.spinner.spin(document.body, mxResources.get('inserting'))) {
+				} else if (mode == App.MODE_ONEDRIVE && this.oneDrive != null && this.spinner.spin(document.body, mxResources.get('inserting'))) {
 					this.oneDrive.insertLibrary(name, xml, mxUtils.bind(this, function (newFile) {
 						this.spinner.stop();
 						this.hideDialog(true);
 						this.libraryLoaded(newFile, images);
 					}), error, folderId);
-				}
-				else if (mode == App.MODE_BROWSER) {
+				} else if (mode == App.MODE_BROWSER) {
 					var fn = mxUtils.bind(this, function () {
 						var file = new StorageLibrary(this, xml, name);
 
@@ -3638,17 +3497,14 @@ App.prototype.saveLibrary = function (name, images, file, mode, noSpin, noReload
 
 					if (localStorage.getItem(name) == null) {
 						fn();
-					}
-					else {
+					} else {
 						this.confirm(mxResources.get('replaceIt', [name]), fn);
 					}
-				}
-				else {
+				} else {
 					this.handleError({ message: mxResources.get('serviceUnavailableOrBlocked') });
 				}
 			}));
-		}
-		else if (noSpin || this.spinner.spin(document.body, mxResources.get('saving'))) {
+		} else if (noSpin || this.spinner.spin(document.body, mxResources.get('saving'))) {
 			file.setData(xml);
 
 			var doSave = mxUtils.bind(this, function () {
@@ -3683,13 +3539,11 @@ App.prototype.saveLibrary = function (name, images, file, mode, noSpin, noReload
 
 					doSave();
 				}), error)
-			}
-			else {
+			} else {
 				doSave();
 			}
 		}
-	}
-	catch (e) {
+	} catch (e) {
 		this.handleError(e);
 	}
 };
@@ -3712,8 +3566,7 @@ App.prototype.saveFile = function (forceDialog, success) {
 				// is to show no saved status for device files
 				if (file.getMode() != App.MODE_DEVICE) {
 					this.editor.setStatus(mxUtils.htmlEntities(mxResources.get('allChangesSaved')));
-				}
-				else {
+				} else {
 					this.editor.setStatus('');
 				}
 			}
@@ -3725,8 +3578,7 @@ App.prototype.saveFile = function (forceDialog, success) {
 
 		if (!forceDialog && file.getTitle() != null && file.invalidFileHandle == null && this.mode != null) {
 			this.save(file.getTitle(), done);
-		}
-		else if (file != null && file.constructor == LocalFile && file.fileHandle != null) {
+		} else if (file != null && file.constructor == LocalFile && file.fileHandle != null) {
 			this.showSaveFilePicker(mxUtils.bind(this, function (fileHandle, desc) {
 				file.invalidFileHandle = null;
 				file.fileHandle = fileHandle;
@@ -3734,8 +3586,7 @@ App.prototype.saveFile = function (forceDialog, success) {
 				file.desc = desc;
 				this.save(desc.name, done);
 			}), null, this.createFileSystemOptions(file.getTitle()));
-		}
-		else {
+		} else {
 			var filename = (file.getTitle() != null) ? file.getTitle() : this.defaultFilename;
 			var allowTab = !mxClient.IS_IOS || !navigator.standalone;
 			var prev = this.mode;
@@ -3760,13 +3611,11 @@ App.prototype.saveFile = function (forceDialog, success) {
 
 							if (mxClient.IS_GC || mxClient.IS_FF || document.documentMode >= 5) {
 								input.select();
-							}
-							else {
+							} else {
 								document.execCommand('selectAll', false, null);
 							}
 						}), mxResources.get('yes'), mxResources.get('no'));
-					}
-					else {
+					} else {
 						this.hideDialog();
 
 						if (prev == null && mode == App.MODE_DEVICE) {
@@ -3784,17 +3633,14 @@ App.prototype.saveFile = function (forceDialog, success) {
 										this.handleError(e);
 									}
 								}), this.createFileSystemOptions(name));
-							}
-							else {
+							} else {
 								this.setMode(App.MODE_DEVICE);
 								this.save(name, done);
 							}
-						}
-						else if (mode == 'download') {
+						} else if (mode == 'download') {
 							var tmp = new LocalFile(this, null, name);
 							tmp.save();
-						}
-						else if (mode == '_blank') {
+						} else if (mode == '_blank') {
 							window.openFile = new OpenFile(function () {
 								window.openFile = null;
 							});
@@ -3802,16 +3648,14 @@ App.prototype.saveFile = function (forceDialog, success) {
 							// Do not use a filename to use undefined mode
 							window.openFile.setData(this.getFileData(true));
 							this.openLink(this.getUrl(window.location.pathname), null, true);
-						}
-						else if (prev != mode) {
+						} else if (prev != mode) {
 							this.pickFolder(mode, mxUtils.bind(this, function (folderId) {
 								this.createFile(name, this.getFileData(/(\.xml)$/i.test(name) ||
 									name.indexOf('.') < 0 || /(\.drawio)$/i.test(name),
 									/(\.svg)$/i.test(name), /(\.html)$/i.test(name)),
 									null, mode, done, this.mode == null, folderId);
 							}));
-						}
-						else if (mode != null) {
+						} else if (mode != null) {
 							this.save(name, done);
 						}
 					}
@@ -3857,8 +3701,7 @@ App.prototype.loadTemplate = function (url, onload, onerror, templateFilename, a
 				if (!isVisioFilename) {
 					if (asLibrary) {
 						filterFn = this.isRemoteVisioData(data) ? 'raw.vss' : 'raw.vssx';
-					}
-					else {
+					} else {
 						filterFn = this.isRemoteVisioData(data) ? 'raw.vsd' : 'raw.vsdx';
 					}
 				}
@@ -3866,8 +3709,7 @@ App.prototype.loadTemplate = function (url, onload, onerror, templateFilename, a
 				this.importVisio(this.base64ToBlob(responseData.substring(responseData.indexOf(',') + 1)), function (xml) {
 					onload(xml);
 				}, onerror, filterFn);
-			}
-			else if (new XMLHttpRequest().upload && this.isRemoteFileFormat(data, filterFn)) {
+			} else if (new XMLHttpRequest().upload && this.isRemoteFileFormat(data, filterFn)) {
 				if (this.isExternalDataComms()) {
 					// Asynchronous parsing via server
 					this.parseFileData(data, mxUtils.bind(this, function (xhr) {
@@ -3876,27 +3718,23 @@ App.prototype.loadTemplate = function (url, onload, onerror, templateFilename, a
 							onload(xhr.responseText);
 						}
 					}), url);
-				}
-				else {
+				} else {
 					this.showError(mxResources.get('error'), mxResources.get('notInOffline'), null, onerror);
 				}
-			}
-			else if (this.isLucidChartData(data)) {
+			} else if (this.isLucidChartData(data)) {
 				this.convertLucidChart(data, mxUtils.bind(this, function (xml) {
 					onload(xml);
 				}), mxUtils.bind(this, function (e) {
 					onerror(e);
 				}));
-			}
-			else {
+			} else {
 				if (/(\.png)($|\?)/i.test(filterFn) || Editor.isPngData(data)) {
 					data = Editor.extractGraphModelFromPng(responseData);
 				}
 
 				onload(data);
 			}
-		}
-		catch (e) {
+		} catch (e) {
 			onerror(e);
 		}
 	}), onerror, /(\.png)($|\?)/i.test(filterFn) || /(\.v(dx|sdx?))($|\?)/i.test(filterFn) ||
@@ -3912,23 +3750,17 @@ App.prototype.loadTemplate = function (url, onload, onerror, templateFilename, a
 App.prototype.getPeerForMode = function (mode) {
 	if (mode == App.MODE_GOOGLE) {
 		return this.drive;
-	}
-	else if (mode == App.MODE_GITHUB) {
+	} else if (mode == App.MODE_GITHUB) {
 		return this.gitHub;
-	}
-	else if (mode == App.MODE_GITLAB) {
+	} else if (mode == App.MODE_GITLAB) {
 		return this.gitLab;
-	}
-	else if (mode == App.MODE_DROPBOX) {
+	} else if (mode == App.MODE_DROPBOX) {
 		return this.dropbox;
-	}
-	else if (mode == App.MODE_ONEDRIVE) {
+	} else if (mode == App.MODE_ONEDRIVE) {
 		return this.oneDrive;
-	}
-	else if (mode == App.MODE_TRELLO) {
+	} else if (mode == App.MODE_TRELLO) {
 		return this.trello;
-	}
-	else {
+	} else {
 		return null;
 	}
 };
@@ -3954,8 +3786,7 @@ App.prototype.createFile = function (title, data, libs, mode, done, replace, fol
 
 			if (resp == null && this.getCurrentFile() == null && this.dialog == null) {
 				this.showSplash();
-			}
-			else if (resp != null) {
+			} else if (resp != null) {
 				this.handleError(resp);
 			}
 		});
@@ -3970,44 +3801,37 @@ App.prototype.createFile = function (title, data, libs, mode, done, replace, fol
 					complete();
 					this.fileCreated(file, libs, replace, done, clibs);
 				}), error);
-			}
-			else if (mode == App.MODE_GITHUB && this.gitHub != null) {
+			} else if (mode == App.MODE_GITHUB && this.gitHub != null) {
 				this.gitHub.insertFile(title, data, mxUtils.bind(this, function (file) {
 					complete();
 					this.fileCreated(file, libs, replace, done, clibs);
 				}), error, false, folderId);
-			}
-			else if (mode == App.MODE_GITLAB && this.gitLab != null) {
+			} else if (mode == App.MODE_GITLAB && this.gitLab != null) {
 				this.gitLab.insertFile(title, data, mxUtils.bind(this, function (file) {
 					complete();
 					this.fileCreated(file, libs, replace, done, clibs);
 				}), error, false, folderId);
-			}
-			else if (mode == App.MODE_TRELLO && this.trello != null) {
+			} else if (mode == App.MODE_TRELLO && this.trello != null) {
 				this.trello.insertFile(title, data, mxUtils.bind(this, function (file) {
 					complete();
 					this.fileCreated(file, libs, replace, done, clibs);
 				}), error, false, folderId);
-			}
-			else if (mode == App.MODE_DROPBOX && this.dropbox != null) {
+			} else if (mode == App.MODE_DROPBOX && this.dropbox != null) {
 				this.dropbox.insertFile(title, data, mxUtils.bind(this, function (file) {
 					complete();
 					this.fileCreated(file, libs, replace, done, clibs);
 				}), error);
-			}
-			else if (mode == App.MODE_ONEDRIVE && this.oneDrive != null) {
+			} else if (mode == App.MODE_ONEDRIVE && this.oneDrive != null) {
 				this.oneDrive.insertFile(title, data, mxUtils.bind(this, function (file) {
 					complete();
 					this.fileCreated(file, libs, replace, done, clibs);
 				}), error, false, folderId);
-			}
-			else if (mode == App.MODE_BROWSER) {
+			} else if (mode == App.MODE_BROWSER) {
 				StorageFile.insertFile(this, title, data, mxUtils.bind(this, function (file) {
 					complete();
 					this.fileCreated(file, libs, replace, done, clibs);
 				}), error);
-			}
-			else if (!tempFile && mode == App.MODE_DEVICE && EditorUi.nativeFileSupport) {
+			} else if (!tempFile && mode == App.MODE_DEVICE && EditorUi.nativeFileSupport) {
 				complete();
 
 				this.showSaveFilePicker(mxUtils.bind(this, function (fileHandle, desc) {
@@ -4021,13 +3845,11 @@ App.prototype.createFile = function (title, data, libs, mode, done, replace, fol
 						error(e);
 					}
 				}), this.createFileSystemOptions(title));
-			}
-			else {
+			} else {
 				complete();
 				this.fileCreated(new LocalFile(this, data, title, mode == null), libs, replace, done, clibs);
 			}
-		}
-		catch (e) {
+		} catch (e) {
 			complete();
 			this.handleError(e);
 		}
@@ -4121,8 +3943,7 @@ App.prototype.fileCreated = function (file, libs, replace, done, clibs) {
 			var fn2 = mxUtils.bind(this, function () {
 				if (replace || currentFile == null || !currentFile.isModified()) {
 					fn3();
-				}
-				else {
+				} else {
 					this.confirm(mxResources.get('allChangesLost'), null, fn3,
 						mxResources.get('cancel'), mxResources.get('discardChanges'));
 				}
@@ -4148,8 +3969,7 @@ App.prototype.fileCreated = function (file, libs, replace, done, clibs) {
 				}
 
 				window.openWindow(url, null, fn2);
-			}
-			else {
+			} else {
 				fn2();
 			}
 		});
@@ -4157,8 +3977,7 @@ App.prototype.fileCreated = function (file, libs, replace, done, clibs) {
 		// Updates data in memory for local files
 		if (file.constructor == LocalFile) {
 			fn();
-		}
-		else {
+		} else {
 			file.saveFile(file.getTitle(), false, mxUtils.bind(this, function () {
 				fn();
 			}), mxUtils.bind(this, function (resp) {
@@ -4185,6 +4004,11 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
 	}
 
 	function getToken() {
+
+		/**
+		 * @description
+		 * @type {{userId: string, dev?: string, share?: string, configuration: string, publicId?: string }}
+		 */
 		const urlParams = (function () {
 			var result = new Object();
 			var params = window.location.search.slice(1).split('&');
@@ -4199,8 +4023,11 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
 
 			return result;
 		})();
-
+		console.log(urlParams)
 		if (urlParams.userId) {
+			/**
+			 * @description 小程序第三方登录获取token
+			 */
 			axios.get(`/api/yt/third/login/id/${urlParams.userId}`)
 				.then(res => {
 					const { token, refreshToken } = res.data || {}
@@ -4209,78 +4036,155 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
 					getSaveContent()
 				})
 		} else {
-			getSaveContent()
+			/**
+			 * @description 分享页面获取token
+			 */
+			if (urlParams.share && urlParams.publicId) {
+				axios.post('/api/auth/login/public', { publicId: urlParams.publicId })
+					.then(res => {
+						const { token, refreshToken } = res.data || {}
+						GLOBAL_TOKEN.token = token
+						GLOBAL_TOKEN.refreshToken = refreshToken
+						getSaveContent()
+					})
+			} else {
+				getSaveContent()
+			}
 		}
 	}
 
 	getToken()
 
 	var updateButtonContainer = this.updateButtonContainer
-	// var lockUnlock = this.actions.actions.lockUnlock.funct
-	// var selectAll = this.actions.actions.selectAll.funct
 	function getUserPermission() {
 		defHttp.get('/yt/role/me/permissions')
 			.then(res => {
 				USER_PERMISSION.permission = res
 				updateButtonContainer()
-				// var flag = hasSavePermission()
-				// if (!flag) {
-				// 	selectAll()
-				// 	lockUnlock()
-				// }
 			})
 	}
+
+	function afterSaveContent(response) {
+		getUserPermission()
+		const { platform } = response || {}
+		const pageSizeControl = PageSetupDialog.getFormats
+		PageSetupDialog.getFormats = function () {
+			if (platform === 'phone') {
+				return [
+					{ key: 'iPhone 8', title: 'iPhone 8', format: new mxRectangle(0, 0, 375, 667) },
+					{ key: 'iPhone 8 Plus', title: 'iPhone 8 Plus', format: new mxRectangle(0, 0, 415, 737) },
+					{ key: 'iPhone X/XS', title: 'iPhone X/XS', format: new mxRectangle(0, 0, 376, 813) },
+					{
+						key: 'iPhone XR/XS Max',
+						title: 'iPhone XR/XS Max',
+						format: new mxRectangle(0, 0, 415, 897)
+					},
+					{ key: 'iPad 4', title: 'iPad 4', format: new mxRectangle(0, 0, 709, 1025) },
+					{ key: 'Galaxy S9', title: 'Galaxy S9', format: new mxRectangle(0, 0, 361, 741) },
+					{ key: 'Galaxy S10E', title: 'Galaxy S10E', format: new mxRectangle(0, 0, 361, 741) },
+					{ key: 'Galaxy S10E', title: 'Galaxy S10E', format: new mxRectangle(0, 0, 361, 741) },
+					{ key: 'Galaxy S10/S10+', title: 'Galaxy S10/S10+', format: new mxRectangle(0, 0, 413, 870) },
+					{ key: 'Pixel 2', title: 'Pixel 2', format: new mxRectangle(0, 0, 413, 732) },
+					{ key: 'Pixel 3', title: 'Pixel 3', format: new mxRectangle(0, 0, 413, 825) },
+					{ key: 'Pixel 3', title: 'Pixel 3', format: new mxRectangle(0, 0, 413, 825) },
+					{ key: 'Pixel XL', title: 'Pixel XL', format: new mxRectangle(0, 0, 413, 848) },
+					{ key: 'custom', title: mxResources.get('custom'), format: null }
+				]
+			}
+			return pageSizeControl.apply(this, arguments)
+		}
+		Editor.configurationName = response.configurationName + ".drawio";
+		if (response.configurationContentList.length > 0) {
+			response.configurationContentList.forEach((item) => {
+				Editor.configurationContentId = item.id;
+				if (item.content) {
+					Editor.defaultContent = item.content;
+				} else {
+					//默认空白内容
+					Editor.defaultContent = EditorUi.prototype.emptyDiagramXml;
+				}
+			})
+		}
+		if (id == null || id.length == 0) {
+			fn();
+		} else if (currentFile != null && !sameWindow) {
+			this.showDialog(new PopupDialog(this, this.getUrl() + '#' + id,
+				null, fn).container, 320, 140, true, true);
+		} else {
+			fn();
+		}
+
+	}
+
 	var pageFormat = this.editor.graph.pageFormat
 
-	// 调用API,获取保存的内容
-	function getSaveContent() {
-		defHttp.get('/yt/configuration/center/get_configuration_info/' + Editor.configurationId)
+	function createAccessTokenFormLayer() {
+		var field = 'accessCredentials'
+		var formSubmitFilter = 'formData'
+		var index = layer.open({
+			type: 1,
+			title: '访问令牌',
+			area: ['350px', '200px'],
+			closeBtn: 0,
+			content: `
+			<section style="padding: 20px;display: flex;justify-content: center;align-items: center;flex-direction: column;">
+				<form class="layui-form" action="">
+					<div class="layui-form-item"> 
+						<label class="layui-form-label" style="width: 60px;padding: 9px 0;">访问令牌</label>
+						<div class="layui-input-block" style="margin-left: 70px;">
+							<input required lay-verify="required" type="text" name="${field}" lay-verify="title" autocomplete="off" placeholder="请输入访问令牌" class="layui-input">
+						</div>
+					</div>
+					<button lay-submit lay-filter="${formSubmitFilter}" type="button" class="layui-btn layui-btn-normal" style="width: 100%; margin-top: 10px;">进入</button> 
+				</form>
+			</section>
+			`,
+		});
+		var form = layui.form
+		form.on(`submit(${formSubmitFilter})`, function (data) {
+			var value = data.field.accessCredentials
+			getShareContentData(value, index)
+		})
+	}
+
+	function getShareContentData(accessCredentials, index) {
+		var id = urlParams.configurationId
+		var share = urlParams.share
+		defHttp.get(`/yt/share/${share}/share_data/${id}${accessCredentials ? `?accessCredentials=${accessCredentials}` : ''}`)
+			.then(function (res) {
+				var layer = layui.layer
+				index && layer.close(index)
+				afterSaveContent(res.data)
+			})
+			.catch(function (error) {
+				var msg = error.response ? (error.response.data || {}).msg || '' : error.message
+				var layer = layui.layer
+				layer.msg(msg, { icon: 5, offset: 't' });
+			})
+	}
+
+	function checkSharePageNeedAccessToken() {
+		var id = urlParams.configurationId
+		var share = urlParams.share
+		defHttp.get(`/yt/share/check/${share}/${id}`)
 			.then(function (response) {
-				getUserPermission()
-				const { platform } = response || {}
-				const pageSizeControl = PageSetupDialog.getFormats
-				PageSetupDialog.getFormats = function () {
-					if (platform === 'phone') {
-						return [
-							{ key: 'iPhone 8', title: 'iPhone 8', format: new mxRectangle(0, 0, 375, 667) },
-							{ key: 'iPhone 8 Plus', title: 'iPhone 8 Plus', format: new mxRectangle(0, 0, 415, 737) },
-							{ key: 'iPhone X/XS', title: 'iPhone X/XS', format: new mxRectangle(0, 0, 376, 813) },
-							{ key: 'iPhone XR/XS Max', title: 'iPhone XR/XS Max', format: new mxRectangle(0, 0, 415, 897) },
-							{ key: 'iPad 4', title: 'iPad 4', format: new mxRectangle(0, 0, 709, 1025) },
-							{ key: 'Galaxy S9', title: 'Galaxy S9', format: new mxRectangle(0, 0, 361, 741) },
-							{ key: 'Galaxy S10E', title: 'Galaxy S10E', format: new mxRectangle(0, 0, 361, 741) },
-							{ key: 'Galaxy S10E', title: 'Galaxy S10E', format: new mxRectangle(0, 0, 361, 741) },
-							{ key: 'Galaxy S10/S10+', title: 'Galaxy S10/S10+', format: new mxRectangle(0, 0, 413, 870) },
-							{ key: 'Pixel 2', title: 'Pixel 2', format: new mxRectangle(0, 0, 413, 732) },
-							{ key: 'Pixel 3', title: 'Pixel 3', format: new mxRectangle(0, 0, 413, 825) },
-							{ key: 'Pixel 3', title: 'Pixel 3', format: new mxRectangle(0, 0, 413, 825) },
-							{ key: 'Pixel XL', title: 'Pixel XL', format: new mxRectangle(0, 0, 413, 848) },
-							{ key: 'custom', title: mxResources.get('custom'), format: null }
-						]
-					}
-					return pageSizeControl.apply(this, arguments)
-				}
-				Editor.configurationName = response.configurationName + ".drawio";
-				if (response.configurationContentList.length > 0) {
-					response.configurationContentList.forEach((item) => {
-						Editor.configurationContentId = item.id;
-						if (item.content) {
-							Editor.defaultContent = item.content;
-						} else {
-							//默认空白内容
-							Editor.defaultContent = EditorUi.prototype.emptyDiagramXml;
-						}
-					})
-				}
-				if (id == null || id.length == 0) {
-					fn();
-				} else if (currentFile != null && !sameWindow) {
-					this.showDialog(new PopupDialog(this, this.getUrl() + '#' + id,
-						null, fn).container, 320, 140, true, true);
+				if (response.data) {
+					createAccessTokenFormLayer()
 				} else {
-					fn();
+					getShareContentData()
 				}
+			})
+	}
 
+	// 调用API,获取保存的内容
+	function getSaveContent() {
+		if (urlParams.share) {
+			checkSharePageNeedAccessToken()
+			return
+		}
+		defHttp.get('/yt/configuration/center/get_configuration_info/' + Editor.configurationId)
+			.then(function (response) {
+				afterSaveContent(response)
 			})
 			.catch(function (error) {
 			});
@@ -4710,23 +4614,17 @@ App.prototype.getLibraryStorageHint = function (file) {
 
 	if (file.constructor == DriveLibrary) {
 		tip += ' (' + mxResources.get('googleDrive') + ')';
-	}
-	else if (file.constructor == GitHubLibrary) {
+	} else if (file.constructor == GitHubLibrary) {
 		tip += ' (' + mxResources.get('github') + ')';
-	}
-	else if (file.constructor == TrelloLibrary) {
+	} else if (file.constructor == TrelloLibrary) {
 		tip += ' (' + mxResources.get('trello') + ')';
-	}
-	else if (file.constructor == DropboxLibrary) {
+	} else if (file.constructor == DropboxLibrary) {
 		tip += ' (' + mxResources.get('dropbox') + ')';
-	}
-	else if (file.constructor == OneDriveLibrary) {
+	} else if (file.constructor == OneDriveLibrary) {
 		tip += ' (' + mxResources.get('oneDrive') + ')';
-	}
-	else if (file.constructor == StorageLibrary) {
+	} else if (file.constructor == StorageLibrary) {
 		tip += ' (' + mxResources.get('browser') + ')';
-	}
-	else if (file.constructor == LocalLibrary) {
+	} else if (file.constructor == LocalLibrary) {
 		tip += ' (' + mxResources.get('device') + ')';
 	}
 
@@ -4831,19 +4729,16 @@ App.prototype.loadLibraries = function (libs, done) {
 
 											if (xml != null) {
 												onload(new StorageLibrary(this, xml, name));
-											}
-											else {
+											} else {
 												onerror();
 											}
 										}), onerror);
-									}
-									catch (e) {
+									} catch (e) {
 										onerror();
 									}
 								}), 0);
 							}
-						}
-						else if (service == 'U') {
+						} else if (service == 'U') {
 							var url = decodeURIComponent(id.substring(1));
 
 							if (!this.isOffline()) {
@@ -4851,16 +4746,14 @@ App.prototype.loadLibraries = function (libs, done) {
 									if (text != null && text.length > 0) {
 										// LATER: Convert mxfile to mxlibrary using code from libraryLoaded
 										onload(new UrlLibrary(this, text, url));
-									}
-									else {
+									} else {
 										onerror();
 									}
 								}), function () {
 									onerror();
 								}, null, true);
 							}
-						}
-						else if (service == 'R') {
+						} else if (service == 'R') {
 							var libDesc = decodeURIComponent(id.substring(1));
 
 							try {
@@ -4874,52 +4767,43 @@ App.prototype.loadLibraries = function (libs, done) {
 								this.remoteInvoke('getFileContent', [libObj.downloadUrl], null, mxUtils.bind(this, function (libContent) {
 									try {
 										onload(new RemoteLibrary(this, libContent, libObj));
-									}
-									catch (e) {
+									} catch (e) {
 										onerror();
 									}
 								}), function () {
 									onerror();
 								});
-							}
-							catch (e) {
+							} catch (e) {
 								onerror();
 							}
-						}
-						else if (service == 'S' && this.loadDesktopLib != null) {
+						} else if (service == 'S' && this.loadDesktopLib != null) {
 							try {
 								this.loadDesktopLib(decodeURIComponent(id.substring(1)), function (desktopLib) {
 									onload(desktopLib);
 								}, onerror);
-							}
-							catch (e) {
+							} catch (e) {
 								onerror();
 							}
-						}
-						else {
+						} else {
 							var peer = null;
 
 							if (service == 'G') {
 								if (this.drive != null && this.drive.user != null) {
 									peer = this.drive;
 								}
-							}
-							else if (service == 'H') {
+							} else if (service == 'H') {
 								if (this.gitHub != null && this.gitHub.getUser() != null) {
 									peer = this.gitHub;
 								}
-							}
-							else if (service == 'T') {
+							} else if (service == 'T') {
 								if (this.trello != null && this.trello.isAuthorized()) {
 									peer = this.trello;
 								}
-							}
-							else if (service == 'D') {
+							} else if (service == 'D') {
 								if (this.dropbox != null && this.dropbox.getUser() != null) {
 									peer = this.dropbox;
 								}
-							}
-							else if (service == 'W') {
+							} else if (service == 'W') {
 								if (this.oneDrive != null && this.oneDrive.getUser() != null) {
 									peer = this.oneDrive;
 								}
@@ -4929,15 +4813,13 @@ App.prototype.loadLibraries = function (libs, done) {
 								peer.getLibrary(decodeURIComponent(id.substring(1)), mxUtils.bind(this, function (file) {
 									try {
 										onload(file);
-									}
-									catch (e) {
+									} catch (e) {
 										onerror();
 									}
 								}), function (resp) {
 									onerror();
 								});
-							}
-							else {
+							} else {
 								onerror(true);
 							}
 						}
@@ -4946,8 +4828,7 @@ App.prototype.loadLibraries = function (libs, done) {
 			}
 
 			checkDone();
-		}
-		else {
+		} else {
 			checkDone();
 		}
 	}
@@ -4968,8 +4849,7 @@ App.prototype.updateButtonContainer = function () {
 				this.buttonContainer.style.paddingRight = '12px';
 				this.buttonContainer.style.paddingTop = '6px';
 				this.buttonContainer.style.right = urlParams['noLangIcon'] == '1' ? '0' : '25px';
-			}
-			else if (uiTheme != 'min') {
+			} else if (uiTheme != 'min') {
 				this.buttonContainer.style.paddingRight = '38px';
 				this.buttonContainer.style.paddingTop = '6px';
 			}
@@ -4989,14 +4869,11 @@ App.prototype.updateButtonContainer = function () {
 				if (uiTheme == 'atlas') {
 					this.commentButton.style.marginRight = '10px';
 					this.commentButton.style.marginTop = '-3px';
-				}
-				else if (uiTheme == 'min') {
+				} else if (uiTheme == 'min') {
 					this.commentButton.style.marginTop = '1px';
-				}
-				else if (urlParams['atlas'] == '1') {
+				} else if (urlParams['atlas'] == '1') {
 					this.commentButton.style.marginTop = '-2px';
-				}
-				else {
+				} else {
 					this.commentButton.style.marginTop = '-5px';
 				}
 
@@ -5010,8 +4887,7 @@ App.prototype.updateButtonContainer = function () {
 					this.commentButton.style.filter = 'invert(100%)';
 				}
 			}
-		}
-		else if (this.commentButton != null) {
+		} else if (this.commentButton != null) {
 			this.commentButton.parentNode.removeChild(this.commentButton);
 			this.commentButton = null;
 		}
@@ -5140,8 +5016,7 @@ App.prototype.updateButtonContainer = function () {
 					this.rightContainer.appendChild(this.saveButton);
 
 				}
-			}
-			else if (this.shareButton != null) {
+			} else if (this.shareButton != null) {
 				this.shareButton.parentNode.removeChild(this.shareButton);
 				this.shareButton = null;
 				this.saveButton.parentNode.removeChild(this.saveButton);
@@ -5160,8 +5035,7 @@ App.prototype.updateButtonContainer = function () {
 				// TODO thingskit close notify bell
 				// this.fetchAndShowNotification('online', this.mode);
 			}
-		}
-		else if (urlParams['notif'] != null) //Notif for embed mode
+		} else if (urlParams['notif'] != null) //Notif for embed mode
 		{
 			// TODO thingskit close notify bell
 			// this.fetchAndShowNotification(urlParams['notif']);
@@ -5204,8 +5078,8 @@ App.prototype.fetchAndShowNotification = function (target, subtarget) {
 		if (localStorage != null) {
 			cachedNotif = JSON.parse(localStorage.getItem(cachedNotifKey));
 		}
-	}
-	catch (e) { } //Ignore
+	} catch (e) {
+	} //Ignore
 
 	if (cachedNotif == null || cachedNotif.ts + 24 * 60 * 60 * 1000 < Date.now()) //Cache for one day
 	{
@@ -5228,8 +5102,7 @@ App.prototype.fetchAndShowNotification = function (target, subtarget) {
 				processNotif(notifs);
 			}
 		}));
-	}
-	else {
+	} else {
 		processNotif(cachedNotif.notifs);
 	}
 };
@@ -5291,8 +5164,7 @@ App.prototype.showNotification = function (notifs, lsReadFlag) {
 		if (uiTheme == 'min') {
 			this.notificationBtn.style.width = '30px';
 			this.notificationBtn.style.top = '4px';
-		}
-		else if (urlParams['atlas'] == '1') {
+		} else if (urlParams['atlas'] == '1') {
 			this.notificationBtn.style.top = '2px';
 		}
 
@@ -5353,15 +5225,13 @@ App.prototype.showNotification = function (notifs, lsReadFlag) {
 				this.notificationWin.style.top = (r.top + this.notificationBtn.clientHeight) + 'px';
 				this.notificationWin.style.left = (r.right - this.notificationWin.clientWidth) + 'px';
 				shouldAnimate(0); //Stop animation once notifications are open
-			}
-			else {
+			} else {
 				markAllAsRead();
 			}
 		}));
 
 		mxEvent.addListener(winClose, 'click', markAllAsRead);
-	}
-	else {
+	} else {
 		this.notificationBtn.style.display = ''; //In case it was hidden
 	}
 
@@ -5370,8 +5240,7 @@ App.prototype.showNotification = function (notifs, lsReadFlag) {
 
 	if (notifListEl == null) {
 		return; //This shouldn't happen and no meaning of continuing
-	}
-	else {
+	} else {
 		notifListEl.innerHTML = '<div class="line"></div>';
 
 		for (var i = 0; i < notifs.length; i++) {
@@ -5442,14 +5311,12 @@ App.prototype.save = function (name, done) {
 		try {
 			if (name == file.getTitle()) {
 				file.save(true, success, error);
-			}
-			else {
+			} else {
 				file.saveAs(name, success, error)
 			}
 
 			console.log('file', file)
-		}
-		catch (err) {
+		} catch (err) {
 			error(err);
 		}
 	}
@@ -5479,8 +5346,7 @@ App.prototype.pickFolder = function (mode, fn, enabled, direct, force) {
 				fn(folderId);
 			}
 		}), force);
-	}
-	else if (enabled && mode == App.MODE_ONEDRIVE && this.oneDrive != null) {
+	} else if (enabled && mode == App.MODE_ONEDRIVE && this.oneDrive != null) {
 		this.oneDrive.pickFolder(mxUtils.bind(this, function (files) {
 			var folderId = null;
 			resume();
@@ -5490,26 +5356,22 @@ App.prototype.pickFolder = function (mode, fn, enabled, direct, force) {
 				fn(folderId);
 			}
 		}), direct);
-	}
-	else if (enabled && mode == App.MODE_GITHUB && this.gitHub != null) {
+	} else if (enabled && mode == App.MODE_GITHUB && this.gitHub != null) {
 		this.gitHub.pickFolder(mxUtils.bind(this, function (folderPath) {
 			resume();
 			fn(folderPath);
 		}));
-	}
-	else if (enabled && mode == App.MODE_GITLAB && this.gitLab != null) {
+	} else if (enabled && mode == App.MODE_GITLAB && this.gitLab != null) {
 		this.gitLab.pickFolder(mxUtils.bind(this, function (folderPath) {
 			resume();
 			fn(folderPath);
 		}));
-	}
-	else if (enabled && mode == App.MODE_TRELLO && this.trello != null) {
+	} else if (enabled && mode == App.MODE_TRELLO && this.trello != null) {
 		this.trello.pickFolder(mxUtils.bind(this, function (cardId) {
 			resume();
 			fn(cardId);
 		}));
-	}
-	else {
+	} else {
 		EditorUi.prototype.pickFolder.apply(this, arguments);
 	}
 };
@@ -5529,8 +5391,7 @@ App.prototype.exportFile = function (data, filename, mimeType, base64Encoded, mo
 					this.handleError(resp);
 				}));
 		}
-	}
-	else if (mode == App.MODE_GOOGLE) {
+	} else if (mode == App.MODE_GOOGLE) {
 		if (this.drive != null && this.spinner.spin(document.body, mxResources.get('saving'))) {
 			this.drive.insertFile(filename, data, folderId, mxUtils.bind(this, function (resp) {
 				// TODO: Add callback with url param for clickable status message
@@ -5563,8 +5424,7 @@ App.prototype.exportFile = function (data, filename, mimeType, base64Encoded, mo
 				this.handleError(resp);
 			}), mimeType, base64Encoded);
 		}
-	}
-	else if (mode == App.MODE_ONEDRIVE) {
+	} else if (mode == App.MODE_ONEDRIVE) {
 		if (this.oneDrive != null && this.spinner.spin(document.body, mxResources.get('saving'))) {
 			// KNOWN: OneDrive does not show .svg extension
 			this.oneDrive.insertFile(filename, (base64Encoded) ? this.base64ToBlob(data, mimeType) :
@@ -5575,8 +5435,7 @@ App.prototype.exportFile = function (data, filename, mimeType, base64Encoded, mo
 					this.handleError(resp);
 				}), false, folderId);
 		}
-	}
-	else if (mode == App.MODE_GITHUB) {
+	} else if (mode == App.MODE_GITHUB) {
 		if (this.gitHub != null && this.spinner.spin(document.body, mxResources.get('saving'))) {
 			// Must insert file as library to force the file to be written
 			this.gitHub.insertFile(filename, data, mxUtils.bind(this, function () {
@@ -5586,8 +5445,7 @@ App.prototype.exportFile = function (data, filename, mimeType, base64Encoded, mo
 				this.handleError(resp);
 			}), true, folderId, base64Encoded);
 		}
-	}
-	else if (mode == App.MODE_GITLAB) {
+	} else if (mode == App.MODE_GITLAB) {
 		if (this.gitHub != null && this.spinner.spin(document.body, mxResources.get('saving'))) {
 			// Must insert file as library to force the file to be written
 			this.gitLab.insertFile(filename, data, mxUtils.bind(this, function () {
@@ -5597,8 +5455,7 @@ App.prototype.exportFile = function (data, filename, mimeType, base64Encoded, mo
 				this.handleError(resp);
 			}), true, folderId, base64Encoded);
 		}
-	}
-	else if (mode == App.MODE_TRELLO) {
+	} else if (mode == App.MODE_TRELLO) {
 		if (this.trello != null && this.spinner.spin(document.body, mxResources.get('saving'))) {
 			this.trello.insertFile(filename, (base64Encoded) ? this.base64ToBlob(data, mimeType) :
 				data, mxUtils.bind(this, function () {
@@ -5608,16 +5465,14 @@ App.prototype.exportFile = function (data, filename, mimeType, base64Encoded, mo
 					this.handleError(resp);
 				}), false, folderId);
 		}
-	}
-	else if (mode == App.MODE_BROWSER) {
+	} else if (mode == App.MODE_BROWSER) {
 		var fn = mxUtils.bind(this, function () {
 			localStorage.setItem(filename, data);
 		});
 
 		if (localStorage.getItem(filename) == null) {
 			fn();
-		}
-		else {
+		} else {
 			this.confirm(mxResources.get('replaceIt', [filename]), fn);
 		}
 	}
@@ -5657,8 +5512,7 @@ App.prototype.descriptorChanged = function () {
 
 			if (newHash.length > 0) {
 				window.location.hash = newHash;
-			}
-			else if (window.location.hash.length > 0) {
+			} else if (window.location.hash.length > 0) {
 				window.location.hash = '';
 			}
 		}
@@ -5691,8 +5545,7 @@ App.prototype.showAuthDialog = function (peer, showRememberOption, fn, closeFn)
 					resume();
 				}));
 			}
-		}
-		catch (e) {
+		} catch (e) {
 			this.editor.setStatus(mxUtils.htmlEntities(e.message));
 		}
 	})).container, 300, (showRememberOption) ? 180 : 140, true, true, mxUtils.bind(this, function (cancel) {
@@ -5748,24 +5601,21 @@ App.prototype.convertFile = function (url, filename, mimeType, extension, succes
 				if (gitHubUrl) {
 					var file = JSON.parse(req.responseText);
 					blob = this.base64ToBlob(file.content, 'application/octet-stream');
-				}
-				else {
+				} else {
 					blob = new Blob([req.response], { type: 'application/octet-stream' });
 				}
 
 				this.importVisio(blob, mxUtils.bind(this, function (xml) {
 					success(new LocalFile(this, xml, name, true));
 				}), error, filename)
-			}
-			else if (error != null) {
+			} else if (error != null) {
 				error({ message: mxResources.get('errorLoadingFile') });
 			}
 		});
 
 		req.onerror = error;
 		req.send();
-	}
-	else {
+	} else {
 		var handleData = mxUtils.bind(this, function (data) {
 			try {
 				if (/\.pdf$/i.test(filename)) {
@@ -5774,34 +5624,28 @@ App.prototype.convertFile = function (url, filename, mimeType, extension, succes
 					if (temp != null && temp.length > 0) {
 						success(new LocalFile(this, temp, name, true));
 					}
-				}
-				else if (/\.png$/i.test(filename)) {
+				} else if (/\.png$/i.test(filename)) {
 					var temp = this.extractGraphModelFromPng(data);
 
 					if (temp != null) {
 						success(new LocalFile(this, temp, name, true));
-					}
-					else {
+					} else {
 						success(new LocalFile(this, data, filename, true));
 					}
-				}
-				else if (Graph.fileSupport && new XMLHttpRequest().upload && this.isRemoteFileFormat(data, url)) {
+				} else if (Graph.fileSupport && new XMLHttpRequest().upload && this.isRemoteFileFormat(data, url)) {
 					this.parseFileData(data, mxUtils.bind(this, function (xhr) {
 						if (xhr.readyState == 4) {
 							if (xhr.status >= 200 && xhr.status <= 299) {
 								success(new LocalFile(this, xhr.responseText, name, true));
-							}
-							else if (error != null) {
+							} else if (error != null) {
 								error({ message: mxResources.get('errorLoadingFile') });
 							}
 						}
 					}), filename);
-				}
-				else {
+				} else {
 					success(new LocalFile(this, data, name, true));
 				}
-			}
-			catch (e) {
+			} catch (e) {
 				if (error != null) {
 					error(e);
 				}
@@ -5824,11 +5668,9 @@ App.prototype.convertFile = function (url, filename, mimeType, extension, succes
 						if (file.encoding === 'base64') {
 							if (/\.png$/i.test(filename)) {
 								data = 'data:image/png;base64,' + data;
-							}
-							else if (/\.pdf$/i.test(filename)) {
+							} else if (/\.pdf$/i.test(filename)) {
 								data = 'data:application/pdf;base64,' + data;
-							}
-							else {
+							} else {
 								// Workaround for character encoding issues in IE10/11
 								data = (window.atob && !mxClient.IS_IE && !mxClient.IS_IE11) ? atob(data) : Base64.decode(data);
 							}
@@ -5836,8 +5678,7 @@ App.prototype.convertFile = function (url, filename, mimeType, extension, succes
 
 						handleData(data);
 					}
-				}
-				else if (error != null) {
+				} else if (error != null) {
 					error({ code: App.ERROR_UNKNOWN });
 				}
 			}), function () {
@@ -5849,11 +5690,9 @@ App.prototype.convertFile = function (url, filename, mimeType, extension, succes
 					error({ code: App.ERROR_TIMEOUT, retry: fn });
 				}
 			}, headers);
-		}
-		else if (executeRequest != null) {
+		} else if (executeRequest != null) {
 			executeRequest(url, handleData, error, binary);
-		}
-		else {
+		} else {
 			this.editor.loadUrl(url, handleData, error, binary, null, null, null, headers);
 		}
 	}
@@ -5908,24 +5747,19 @@ App.prototype.updateHeader = function () {
 				if (mode == App.MODE_GOOGLE) {
 					this.appIcon.style.backgroundImage = 'url(' + IMAGE_PATH + '/google-drive-logo-white.svg)';
 					this.appIcon.style.backgroundSize = '70% 70%';
-				}
-				else if (mode == App.MODE_DROPBOX) {
+				} else if (mode == App.MODE_DROPBOX) {
 					this.appIcon.style.backgroundImage = 'url(' + IMAGE_PATH + '/dropbox-logo-white.svg)';
 					this.appIcon.style.backgroundSize = '70% 70%';
-				}
-				else if (mode == App.MODE_ONEDRIVE) {
+				} else if (mode == App.MODE_ONEDRIVE) {
 					this.appIcon.style.backgroundImage = 'url(' + IMAGE_PATH + '/onedrive-logo-white.svg)';
 					this.appIcon.style.backgroundSize = '70% 70%';
-				}
-				else if (mode == App.MODE_GITHUB) {
+				} else if (mode == App.MODE_GITHUB) {
 					this.appIcon.style.backgroundImage = 'url(' + IMAGE_PATH + '/github-logo-white.svg)';
 					this.appIcon.style.backgroundSize = '70% 70%';
-				}
-				else if (mode == App.MODE_GITLAB) {
+				} else if (mode == App.MODE_GITLAB) {
 					this.appIcon.style.backgroundImage = 'url(' + IMAGE_PATH + '/gitlab-logo-white.svg)';
 					this.appIcon.style.backgroundSize = '100% 100%';
-				}
-				else if (mode == App.MODE_TRELLO) {
+				} else if (mode == App.MODE_TRELLO) {
 					this.appIcon.style.backgroundImage = 'url(' + IMAGE_PATH + '/trello-logo-white-orange.svg)';
 					this.appIcon.style.backgroundSize = '70% 70%';
 				}
@@ -6037,8 +5871,7 @@ App.prototype.updateHeader = function () {
 		var toggleFormatPanel = mxUtils.bind(this, function () {
 			if (this.formatWidth > 0) {
 				this.toggleFormatElement.style.backgroundImage = 'url(\'' + this.formatShowImage + '\')';
-			}
-			else {
+			} else {
 				this.toggleFormatElement.style.backgroundImage = 'url(\'' + this.formatHideImage + '\')';
 			}
 		});
@@ -6180,8 +6013,7 @@ App.prototype.toggleCompactMode = function (visible) {
 		this.menubarHeight = App.prototype.menubarHeight;
 		this.refresh();
 		this.toggleElement.style.backgroundImage = 'url(\'' + this.chevronUpImage + '\')';
-	}
-	else {
+	} else {
 		this.menubar.container.style.position = 'relative';
 		this.menubar.container.style.paddingLeft = '4px';
 		this.menubar.container.style.paddingTop = '0px';
@@ -6216,8 +6048,7 @@ App.prototype.updateUserElement = function () {
 			this.userElement.parentNode.removeChild(this.userElement);
 			this.userElement = null;
 		}
-	}
-	else {
+	} else {
 		if (this.userElement == null) {
 			this.userElement = document.createElement('a');
 			this.userElement.className = 'geItem';
@@ -6259,8 +6090,7 @@ App.prototype.updateUserElement = function () {
 
 				if (this.userPanel.parentNode != null) {
 					this.userPanel.parentNode.removeChild(this.userPanel);
-				}
-				else {
+				} else {
 					var connected = false;
 					this.userPanel.innerHTML = '';
 
@@ -6300,8 +6130,7 @@ App.prototype.updateUserElement = function () {
 										this.spinner.stop();
 										callback();
 									}), 2000);
-								}
-								else {
+								} else {
 									callback();
 								}
 							});
@@ -6531,13 +6360,11 @@ App.prototype.updateUserElement = function () {
 
 								if (!file.isModified()) {
 									doLogout();
-								}
-								else {
+								} else {
 									this.confirm(mxResources.get('allChangesLost'), null, doLogout,
 										mxResources.get('cancel'), mxResources.get('discardChanges'));
 								}
-							}
-							else {
+							} else {
 								this.dropbox.logout();
 							}
 						}), mxResources.get('dropbox'));
@@ -6555,13 +6382,11 @@ App.prototype.updateUserElement = function () {
 
 								if (!file.isModified()) {
 									doLogout();
-								}
-								else {
+								} else {
 									this.confirm(mxResources.get('allChangesLost'), null, doLogout,
 										mxResources.get('cancel'), mxResources.get('discardChanges'));
 								}
-							}
-							else {
+							} else {
 								this.oneDrive.logout();
 							}
 						}), mxResources.get('oneDrive'));
@@ -6579,13 +6404,11 @@ App.prototype.updateUserElement = function () {
 
 								if (!file.isModified()) {
 									doLogout();
-								}
-								else {
+								} else {
 									this.confirm(mxResources.get('allChangesLost'), null, doLogout,
 										mxResources.get('cancel'), mxResources.get('discardChanges'));
 								}
-							}
-							else {
+							} else {
 								this.gitHub.logout();
 							}
 						}), mxResources.get('github'));
@@ -6603,13 +6426,11 @@ App.prototype.updateUserElement = function () {
 
 								if (!file.isModified()) {
 									doLogout();
-								}
-								else {
+								} else {
 									this.confirm(mxResources.get('allChangesLost'), null, doLogout,
 										mxResources.get('cancel'), mxResources.get('discardChanges'));
 								}
-							}
-							else {
+							} else {
 								this.gitLab.logout();
 							}
 						}), mxResources.get('gitlab'));
@@ -6628,13 +6449,11 @@ App.prototype.updateUserElement = function () {
 
 								if (!file.isModified()) {
 									doLogout();
-								}
-								else {
+								} else {
 									this.confirm(mxResources.get('allChangesLost'), null, doLogout,
 										mxResources.get('cancel'), mxResources.get('discardChanges'));
 								}
-							}
-							else {
+							} else {
 								this.trello.logout();
 							}
 						}), mxResources.get('trello'));
@@ -6672,8 +6491,7 @@ App.prototype.updateUserElement = function () {
 							div.appendChild(btn);
 							this.userPanel.appendChild(div);
 						}
-					}
-					else {
+					} else {
 						var btn = mxUtils.button(mxResources.get('close'), mxUtils.bind(this, function () {
 							if (!mxEvent.isConsumed(evt) && this.userPanel != null && this.userPanel.parentNode != null) {
 								this.userPanel.parentNode.removeChild(this.userPanel);
@@ -6701,17 +6519,13 @@ App.prototype.updateUserElement = function () {
 
 		if (this.drive != null && this.drive.getUser() != null) {
 			user = this.drive.getUser();
-		}
-		else if (this.oneDrive != null && this.oneDrive.getUser() != null) {
+		} else if (this.oneDrive != null && this.oneDrive.getUser() != null) {
 			user = this.oneDrive.getUser();
-		}
-		else if (this.dropbox != null && this.dropbox.getUser() != null) {
+		} else if (this.dropbox != null && this.dropbox.getUser() != null) {
 			user = this.dropbox.getUser();
-		}
-		else if (this.gitHub != null && this.gitHub.getUser() != null) {
+		} else if (this.gitHub != null && this.gitHub.getUser() != null) {
 			user = this.gitHub.getUser();
-		}
-		else if (this.gitLab != null && this.gitLab.getUser() != null) {
+		} else if (this.gitLab != null && this.gitLab.getUser() != null) {
 			user = this.gitLab.getUser();
 		}
 		//TODO Trello no user issue
@@ -6723,8 +6537,7 @@ App.prototype.updateUserElement = function () {
 				mxUtils.write(this.userElement, user.displayName);
 				this.userElement.style.display = 'block';
 			}
-		}
-		else {
+		} else {
 			this.userElement.style.display = 'none';
 		}
 	}
@@ -6736,14 +6549,11 @@ App.prototype.getCurrentUser = function () {
 
 	if (this.drive != null && this.drive.getUser() != null) {
 		user = this.drive.getUser();
-	}
-	else if (this.oneDrive != null && this.oneDrive.getUser() != null) {
+	} else if (this.oneDrive != null && this.oneDrive.getUser() != null) {
 		user = this.oneDrive.getUser();
-	}
-	else if (this.dropbox != null && this.dropbox.getUser() != null) {
+	} else if (this.dropbox != null && this.dropbox.getUser() != null) {
 		user = this.dropbox.getUser();
-	}
-	else if (this.gitHub != null && this.gitHub.getUser() != null) {
+	} else if (this.gitHub != null && this.gitHub.getUser() != null) {
 		user = this.gitHub.getUser();
 	}
 	//TODO Trello no user issue

@@ -26,7 +26,7 @@
 	 *
 	 */
 	// Sidebar.prototype.defaultEntries = 'component;fan;engine;valve;controller;light;button;conduit;instrument;sewage;air;filters;pumps;factoryFacilities;flowMeter;foodProcessing;heater;industrial;plant;power;processCooling;processHeating;sink;';
-	Sidebar.prototype.defaultEntries = 'component;fan;engine;valve;control;light;button;conduit;instrument;sewage;factoryFacilities;flowMeter;industrial;sink;';
+	Sidebar.prototype.defaultEntries = 'basicComponent;fan;engine;valve;control;light;button;conduit;instrument;sewage;factoryFacilities;flowMeter;industrial;sink;';
 
 	/**
 	 * Library definitions
@@ -373,7 +373,7 @@
 	Sidebar.prototype.configuration = [
 		{ id: 'general', libs: ['general', 'misc', 'advanced'] },
 		//加入自定义图形ID
-		{ id: 'fan' }, { id: 'engine' }, { id: 'valve' }, { id: 'component' }, { id: 'control' }, { id: 'sewage' }, { id: 'conduit' }, { id: 'light' }, { id: 'instrument' }, { id: 'button' },
+		{ id: 'fan' }, { id: 'engine' }, { id: 'valve' }, { id: 'basicComponent' }, { id: 'control' }, { id: 'sewage' }, { id: 'conduit' }, { id: 'light' }, { id: 'instrument' }, { id: 'button' },
 		{ id: 'air' }, { id: 'filters' }, { id: 'pumps' }, { id: 'factoryFacilities' }, { id: 'flowMeter' }, { id: 'foodProcessing' }, { id: 'heater' }, { id: 'industrial' }, { id: 'plant' }, { id: 'power' }, { id: 'processCooling' }, { id: 'processHeating' }, { id: 'sink' },
 
 
@@ -744,7 +744,7 @@
 			{ title: "风机", id: 'fan', image: IMAGE_PATH + '/thingskit/风机.png' },
 			{ title: "发动机", id: 'engine', image: IMAGE_PATH + '/thingskit/发动机.png' },
 			{ title: "阀门", id: 'valve', image: IMAGE_PATH + '/thingskit/阀门.png' },
-			{ title: "基础组件", id: 'component', image: IMAGE_PATH + '/thingskit/基础元件.png' },
+			{ title: "基础组件", id: 'basicComponent', image: IMAGE_PATH + '/thingskit/基础元件.png' },
 			{ title: "污水处理", id: 'sewage', image: IMAGE_PATH + '/thingskit/污水处理.png' },
 			{ title: "管道", id: 'conduit', image: IMAGE_PATH + '/thingskit/管道.png' },
 			{ title: "灯", id: 'light', image: IMAGE_PATH + '/thingskit/灯.png' },

 (function () {
 	// Adds Atlassian shapes
 	Sidebar.prototype.addBasicComponentsPalette = function () {
-		this.setCurrentSearchEntryLibrary('component');
-		const dt = 'basic'
+		this.setCurrentSearchEntryLibrary('basicComponent');
+		const dt = 'basicComponent'
 		const gn = `mxgraph.${dt}`
 		const currentDate = getCurrentDate();
 		const basicAttr = this.enumCellBasicAttribute
@@ -46,20 +46,20 @@
 				})
 				return this.createVertexTemplateFromCells([cell], cell.geometry.width, cell.geometry.height, '实时时间');
 			})),
-			this.addEntry(this.getTagsForStencil('mxgraph.basic', '变量图片', 'basic').join(' '), mxUtils.bind(this, function () {
+			this.addEntry(this.getTagsForStencil(gn, '变量图片', 'basic').join(' '), mxUtils.bind(this, function () {
 				const cell = new mxCell('', new mxGeometry(0, 0, 194, 95), 'image;image=images/thingskit/img-placeholder.png;imageAspect=0;');
 				cell.setVertex(true)
 				this.setCellAttributes(cell, { [basicAttr.COMPONENT_TYPE]: componentType.VAR_IMAGE })
 				return this.createVertexTemplateFromCells([cell], cell.geometry.width, cell.geometry.height, '变量图片');
 			})),
-			this.addEntry(this.getTagsForStencil('mxgraph.basic', '视频', 'basic').join(' '), mxUtils.bind(this, function () {
+			this.addEntry(this.getTagsForStencil(gn, '视频', 'basic').join(' '), mxUtils.bind(this, function () {
 				const template = createVideoTemplate(300, 150)
 				const cell = new mxCell(template, new mxGeometry(0, 0, 300, 150), 'text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;');
 				cell.setVertex(true)
 				this.setCellAttributes(cell, { [basicAttr.COMPONENT_TYPE]: componentType.VIDEO })
 				return this.createVertexTemplateFromCells([cell], cell.geometry.width, cell.geometry.height, '视频');
 			})),
-			this.addEntry(this.getTagsForStencil('mxgraph.basic', '图片', 'basic').join(' '), mxUtils.bind(this, function () {
+			this.addEntry(this.getTagsForStencil(gn, '图片', 'basic').join(' '), mxUtils.bind(this, function () {
 				const cell = new mxCell(`<img class="basic-component__image" src="${Proxy_Prefix}/images/thingskit/img-placeholder.png" />`, new mxGeometry(0, 0, 190, 190), 'text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;');
 				cell.setVertex(true)
 				this.setCellAttributes(cell, { [basicAttr.COMPONENT_TYPE]: componentType.IMAGE })
@@ -67,7 +67,7 @@
 			})),
 		];
 
-		this.addPaletteFunctions('component', '基础元件', true, fns);
+		this.addPaletteFunctions(dt, '基础元件', true, fns);
 		this.setCurrentSearchEntryLibrary();
 	};