Merge branch 'sqy_dev' into 'main'

'fix:修改drawIO的一些初始化地方' See merge request huang/thingskit-drawio!1

Merge branch 'sqy_dev' into 'main'
'fix:修改drawIO的一些初始化地方' See merge request huang/thingskit-drawio!1
xp.Huang
2 parents b044fb58 b75acf1a
Showing 6 changed files with 90 additions and 55 deletions
package.json
src/main/webapp/index.html
src/main/webapp/js/PreConfig.js
src/main/webapp/js/diagramly/App.js
src/main/webapp/js/diagramly/Init.js
src/main/webapp/js/diagramly/Menus.js
--- a/package.json 0 → 100644
View file @407ba01
+++ b/package.json 0 → 100644
View file @407ba01
+{
+  "name": "drawio-dev",
+  "version": "1.0.0",
+  "main": "src/main/webapp/index.html",
+  "scripts": {
+    "start": "cd src/main/webapp && serve",
+    "build": "cd etc/build && ant"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "serve": "^13.0.2"
+  }
+}
--- a/src/main/webapp/index.html
View file @407ba01
+++ b/src/main/webapp/index.html
View file @407ba01
@@ -261,7 +261,12 @@
 				// Forces includes for dev environment in node.js
 				mxForceIncludes = true;
 			}
-
+			if (location.hostname == 'localhost' || location.hostname == '127.0.0.1') {
+				drawDevUrl = `http://${location.host}/`;
+				geBasePath = `http://${location.host}/js/grapheditor`;
+				mxBasePath = `http://${location.host}/mxgraph`;
+				mxForceIncludes = true;
+			}
 			mxForceIncludes = false;
 			mxscript(drawDevUrl + 'js/PreConfig.js');
@@ -428,18 +433,18 @@
 </head>
 <body class="geEditor">
 <div id="geInfo">
-	<div class="geBlock">
-		<h1>Flowchart Maker and Online Diagram Software</h1>
-		<p>
+	 <div class="geBlock">
+		<h1>云组态启动中 ...</h1>
+		<!-- <p>
 			diagrams.net (formerly draw.io) is free online diagram software. You can use it as a flowchart maker, network diagram software, to create UML online, as an ER diagram tool, 
 			to design database schema, to build BPMN online, as a circuit diagram maker, and more. draw.io can import .vsdx, Gliffy&trade; and Lucidchart&trade; files .
 		</p>
 		<h2 id="geStatus">Loading...</h2>
 		<p>
 			Please ensure JavaScript is enabled.
-		</p>
+		</p> -->
 	</div>
-</div>
+ </div>
 <script type="text/javascript">
 /**
  * Main
--- a/src/main/webapp/js/PreConfig.js
View file @407ba01
+++ b/src/main/webapp/js/PreConfig.js
View file @407ba01
@@ -3,11 +3,22 @@
  * Copyright (c) 2006-2020, draw.io AG
  */
 // Overrides of global vars need to be pre-loaded
-window.EXPORT_URL = 'REPLACE_WITH_YOUR_IMAGE_SERVER';
-window.PLANT_URL = 'REPLACE_WITH_YOUR_PLANTUML_SERVER';
-window.DRAWIO_BASE_URL = null; // Replace with path to base of deployment, e.g. https://www.example.com/folder
-window.DRAWIO_VIEWER_URL = null; // Replace your path to the viewer js, e.g. https://www.example.com/js/viewer.min.js
-window.DRAWIO_LIGHTBOX_URL = null; // Replace with your lightbox URL, eg. https://www.example.com
-window.DRAW_MATH_URL = 'math';
+window.DRAW_MATH_URL = "math";
 window.DRAWIO_CONFIG = null; // Replace with your custom draw.io configurations. For more details, https://www.diagrams.net/doc/faq/configure-diagram-editor
-urlParams['sync'] = 'manual';
+
+window.EXPORT_URL = "REPLACE_WITH_YOUR_IMAGE_SERVER";
+window.PLANT_URL = "REPLACE_WITH_YOUR_PLANTUML_SERVER";
+window.DRAWIO_BASE_URL = window.location.protocol + "//" + window.location.host; // Replace with path to base of deployment, e.g. https://www.example.com/folder
+window.DRAWIO_VIEWER_URL =
+  window.location.protocol + "//" + window.location.host + "/js/viewer.min.js"; // Replace your path to the viewer js, e.g. https://www.example.com/js/viewer.min.js
+window.DRAWIO_LIGHTBOX_URL =null; // Replace with your lightbox URL, eg. https://www.example.com
+urlParams["sync"] = "manual";
+urlParams["lang"] = "zh";
+urlParams["browser"] = 0;
+urlParams["gapi"] = 0;
+urlParams["db"] = 0;
+urlParams["od"] = 0;
+urlParams["tr"] = 0;
+urlParams["gh"] = 0;
+urlParams["gl"] = 0;
+urlParams["mode"] = "browser";
--- a/src/main/webapp/js/diagramly/App.js
View file @407ba01
+++ b/src/main/webapp/js/diagramly/App.js
View file @407ba01
@@ -13,6 +13,11 @@
  */
 App = function(editor, container, lightbox)
 {
+  if (urlParams["dev"] === "1") {
+    alert("欢迎~开发环境");
+  } else {
+    alert("欢迎~生产环境");
+  }
 	EditorUi.call(this, editor, container, (lightbox != null) ? lightbox :
 		(urlParams['lightbox'] == '1' || (uiTheme == 'min' &&
 		urlParams['chrome'] != '0')));
@@ -1904,10 +1909,10 @@ App.prototype.showNameConfBanner = function()
  */
 App.prototype.showDownloadDesktopBanner = function()
 {
-	this.showBanner('DesktopFooter', mxResources.get('downloadDesktop'), mxUtils.bind(this, function()
-	{
-		this.openLink('https://get.diagrams.net/');
-	}));
+	// this.showBanner('DesktopFooter', mxResources.get('downloadDesktop'), mxUtils.bind(this, function()
+	// {
+	// 	this.openLink('https://get.diagrams.net/');
+	// }));
 };
 /**
@@ -6131,7 +6136,7 @@ App.prototype.showNotification = function(notifs, lsReadFlag)
 App.prototype.save = function(name, done)
 {
 	var file = this.getCurrentFile();
-	
+	console.log('file',file)
 	if (file != null && this.spinner.spin(document.body, mxResources.get('saving')))
 	{
 		this.editor.setStatus('');
--- a/src/main/webapp/js/diagramly/Init.js
View file @407ba01
+++ b/src/main/webapp/js/diagramly/Init.js
View file @407ba01
@@ -116,44 +116,44 @@ window.mxLanguage = window.mxLanguage || (function()
 // in the menu defintion in Diagramly.js.
 window.mxLanguageMap = window.mxLanguageMap ||
 {
-	'i18n': '',
-	'id' : 'Bahasa Indonesia',
-	'ms' : 'Bahasa Melayu',
-	'bs' : 'Bosanski',
-	'bg' : 'Bulgarian',
-	'ca' : 'Català',
-	'cs' : 'Čeština',
-	'da' : 'Dansk',
-	'de' : 'Deutsch',
-	'et' : 'Eesti',
+	// 'i18n': '',
+	// 'id' : 'Bahasa Indonesia',
+	// 'ms' : 'Bahasa Melayu',
+	// 'bs' : 'Bosanski',
+	// 'bg' : 'Bulgarian',
+	// 'ca' : 'Català',
+	// 'cs' : 'Čeština',
+	// 'da' : 'Dansk',
+	// 'de' : 'Deutsch',
+	// 'et' : 'Eesti',
 	'en' : 'English',
-	'es' : 'Español',
-	'eu' : 'Euskara',
-	'fil' : 'Filipino',
-	'fr' : 'Français',
-	'gl' : 'Galego',
-	'it' : 'Italiano',
-	'hu' : 'Magyar',
-	'nl' : 'Nederlands',
-	'no' : 'Norsk',
-	'pl' : 'Polski',
-	'pt-br' : 'Português (Brasil)',
-	'pt' : 'Português (Portugal)',
-	'ro' : 'Română',
-	'fi' : 'Suomi',
-	'sv' : 'Svenska',
-	'vi' : 'Tiếng Việt',
-	'tr' : 'Türkçe',
-	'el' : 'Ελληνικά',
-	'ru' : 'Русский',
-	'sr' : 'Српски',
-	'uk' : 'Українська',
-	'he' : 'עברית',
-	'ar' : 'العربية',
-	'fa' : 'فارسی',
-	'th' : 'ไทย',
-	'ko' : '한국어',
-	'ja' : '日本語',
+	// 'es' : 'Español',
+	// 'eu' : 'Euskara',
+	// 'fil' : 'Filipino',
+	// 'fr' : 'Français',
+	// 'gl' : 'Galego',
+	// 'it' : 'Italiano',
+	// 'hu' : 'Magyar',
+	// 'nl' : 'Nederlands',
+	// 'no' : 'Norsk',
+	// 'pl' : 'Polski',
+	// 'pt-br' : 'Português (Brasil)',
+	// 'pt' : 'Português (Portugal)',
+	// 'ro' : 'Română',
+	// 'fi' : 'Suomi',
+	// 'sv' : 'Svenska',
+	// 'vi' : 'Tiếng Việt',
+	// 'tr' : 'Türkçe',
+	// 'el' : 'Ελληνικά',
+	// 'ru' : 'Русский',
+	// 'sr' : 'Српски',
+	// 'uk' : 'Українська',
+	// 'he' : 'עברית',
+	// 'ar' : 'العربية',
+	// 'fa' : 'فارسی',
+	// 'th' : 'ไทย',
+	// 'ko' : '한국어',
+	// 'ja' : '日本語',
 	'zh' : '简体中文',
 	'zh-tw' : '繁體中文'
 };
--- a/src/main/webapp/js/diagramly/Menus.js
View file @407ba01
+++ b/src/main/webapp/js/diagramly/Menus.js
View file @407ba01
@@ -3090,6 +3090,7 @@
 		{
 			editorUi.openLink('https://get.draw.io/')
 		}));
+		// 禁用掉菜单中某一项功能 -- 分享
 		this.editorUi.actions.addAction('share...', mxUtils.bind(this, function()
 		{