fix: 修复基础组件dt标识符不统一

ww
1 parent de61e896
Showing 4 changed files with 22 additions and 21 deletions
.gitignore
src/main/webapp/index.html
src/main/webapp/js/diagramly/sidebar/Sidebar.js
src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Basic-Components.js
--- a/.gitignore
View file @1c917a3
+++ b/.gitignore
View file @1c917a3
@@ -8,3 +8,4 @@ yarn.lock
 **/.DS_Store
 **/*.min.js
 dist
+src/main/webapp/js/grapheditor/compiled/Format.js
--- a/src/main/webapp/index.html
View file @1c917a3
+++ b/src/main/webapp/index.html
View file @1c917a3
@@ -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 () {
--- a/src/main/webapp/js/diagramly/sidebar/Sidebar.js
View file @1c917a3
+++ b/src/main/webapp/js/diagramly/sidebar/Sidebar.js
View file @1c917a3
@@ -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' },
--- a/src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Basic-Components.js
View file @1c917a3
+++ b/src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Basic-Components.js
View file @1c917a3
 (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();
 	};