fix: fix build war package error problem

ww
1 parent 9f3d936f
Showing 2 changed files with 37 additions and 55 deletions
etc/build/build.xml
src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Basic-Components.js
--- a/etc/build/build.xml
View file @72bbf66
+++ b/etc/build/build.xml
View file @72bbf66
@@ -142,28 +142,28 @@
 				<file name="Sidebar-Veeam2.js" />
 				<file name="Sidebar-VVD.js" />
 				<file name="Sidebar-WebIcons.js" />
-                <!-- 基础元件 -->
+				<!-- 基础元件 -->
 				<file name="./thingskit/Sidebar-Basic-Components.js" />
-                <!-- 图表 -->
-                <file name="./thingskit/Sidebar-Charts.js" />
-                <!-- 管道 -->
-                <file name="./thingskit/Sidebar-Conduit.js" />
-                <!-- 控制元件 -->
-                <file name="./thingskit/Sidebar-Controller-Components.js" />
-                <!-- 发动机 -->
-                <file name="./thingskit/Sidebar-Engine.js" />
-                <!-- 风机 -->
-                <file name="./thingskit/Sidebar-Fan.js" />
-                <!-- 污水处理 -->
-                <file name="./thingskit/Sidebar-Sewage.js" />
-                <!-- 阀门 -->
-                <file name="./thingskit/Sidebar-Valve.js" />
-                <!-- 灯 -->
-                <file name="./thingskit/Sidebar-Light.js" />
-                <!-- 仪表 -->
-                <file name="./thingskit/Sidebar-Instrument.js" />
-                <!-- 按钮 -->
-                <file name="./thingskit/Sidebar-Button.js" />
+				<!-- 图表 -->
+				<file name="./thingskit/Sidebar-Charts.js" />
+				<!-- 管道 -->
+				<file name="./thingskit/Sidebar-Conduit.js" />
+				<!-- 控制元件 -->
+				<file name="./thingskit/Sidebar-Controller-Components.js" />
+				<!-- 发动机 -->
+				<file name="./thingskit/Sidebar-Engine.js" />
+				<!-- 风机 -->
+				<file name="./thingskit/Sidebar-Fan.js" />
+				<!-- 污水处理 -->
+				<file name="./thingskit/Sidebar-Sewage.js" />
+				<!-- 阀门 -->
+				<file name="./thingskit/Sidebar-Valve.js" />
+				<!-- 灯 -->
+				<file name="./thingskit/Sidebar-Light.js" />
+				<!-- 仪表 -->
+				<file name="./thingskit/Sidebar-Instrument.js" />
+				<!-- 按钮 -->
+				<file name="./thingskit/Sidebar-Button.js" />
 			</sources>
 		</jscomp>
--- a/src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Basic-Components.js
View file @72bbf66
+++ b/src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Basic-Components.js
View file @72bbf66
@@ -3,7 +3,7 @@
 	Sidebar.prototype.addBasicComponentsPalette = function () {
 		this.setCurrentSearchEntryLibrary('component');
 		const dt = 'basic'
-		const gn = `mxgraph.${dt}`
+		const gn = `mxgraph.${ dt }`
 		const currentDate = getCurrentDate();
 		const basicAttr = this.enumCellBasicAttribute
 		const componentType = this.enumComponentType
@@ -13,25 +13,15 @@
 			this.addEntry(this.getTagsForStencil(gn, 'Title', dt).join(' '), mxUtils.bind(this, function () {
 				const cell = new mxCell('Title', new mxGeometry(0, 0, 100, 40), transparentBg);
 				cell.setVertex(true)
-				this.setCellAttributes(
-					cell,
-					{
-						[basicAttr.COMPONENT_TYPE]: componentType.TITLE,
-					},
-				)
-				return this.createVertexTemplateFromCells([cell], cell.geometry.width, cell.geometry.height, 'Title');
+				this.setCellAttributes(cell, { [basicAttr.COMPONENT_TYPE]: componentType.TITLE })
+				return this.createVertexTemplateFromCells([ cell ], cell.geometry.width, cell.geometry.height, 'Title');
 			})),
 			this.addEntry(this.getTagsForStencil(gn, 'variable', dt).join(' '), mxUtils.bind(this, function () {
 				const cell = new mxCell('变量', new mxGeometry(0, 0, 100, 40), transparentBg);
 				cell.setVertex(true)
-				this.setCellAttributes(
-					cell,
-					{
-						[basicAttr.COMPONENT_TYPE]: componentType.VARIABLE,
-					},
-				)
-				return this.createVertexTemplateFromCells([cell], cell.geometry.width, cell.geometry.height, '变量');
+				this.setCellAttributes(cell, { [basicAttr.COMPONENT_TYPE]: componentType.VARIABLE })
+				return this.createVertexTemplateFromCells([ cell ], cell.geometry.width, cell.geometry.height, '变量');
 			})),
 			this.addEntry(this.getTagsForStencil(gn, 'line', dt).join(' '), mxUtils.bind(this, function () {
@@ -42,33 +32,25 @@
 				cell.geometry.relative = true;
 				cell.edge = true;
 				cell.setVertex(true)
-				this.setCellAttributes(
-					cell,
-					{
-						[basicAttr.COMPONENT_TYPE]: componentType.LINE,
-					},
-				)
-				return this.createEdgeTemplateFromCells([cell], 60, 40, '线条');
+				this.setCellAttributes(cell, { [basicAttr.COMPONENT_TYPE]: componentType.LINE })
+				return this.createEdgeTemplateFromCells([ cell ], 60, 40, '线条');
 			})),
 			this.addEntry('real time', mxUtils.bind(this, function () {
 				const template = `<div class="thingKit-component__real-time"><div class="real-time__date"></div> <div style="font-size:30px" class="real-time__now">时间</div></div>`
 				const cell = new mxCell(template, new mxGeometry(0, 0, 180, 60), 'text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;');
 				cell.vertex = true;
-				this.setCellAttributes(
-					cell,
-					{
-						[basicAttr.COMPONENT_TYPE]: componentType.REAL_TIME,
-						placeholders: '1',
-						currentDate: currentDate,
-					},
-				)
-				return this.createVertexTemplateFromCells([cell], cell.geometry.width, cell.geometry.height, '实时时间');
+				this.setCellAttributes(cell, {
+					[basicAttr.COMPONENT_TYPE]: componentType.LINE,
+					placeholders: '1',
+					currentDate: currentDate,
+				})
+				return this.createVertexTemplateFromCells([ cell ], cell.geometry.width, cell.geometry.height, '实时时间');
 			})),
 			this.addEntry(this.getTagsForStencil('mxgraph.basic', '变量图片', '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, '变量图片');
+				return this.createVertexTemplateFromCells([ cell ], cell.geometry.width, cell.geometry.height, '变量图片');
 			})),
 		];
@@ -82,7 +64,7 @@
 		var year = date.getFullYear();
 		var month = date.getMonth() + 1;
 		var dates = date.getDate();
-		arr = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
+		arr = [ '星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六' ]
 		var day = date.getDay();
 		return year + '年' + month + '月' + dates + '日 ' + arr[day];
 	}
@@ -95,7 +77,7 @@
 			const allTimeNode = document.querySelectorAll('.thingKit-component__real-time .real-time__now')
 			for (const time of allTimeNode) {
 				const date = new Date()
-				time.innerHTML = `${date.getHours() < 10 ? '0' : ''}${date.getHours()}:${date.getMinutes() < 10 ? '0' : ''}${date.getMinutes()}:${date.getSeconds() < 10 ? '0' : ''}${date.getSeconds()}`
+				time.innerHTML = `${ date.getHours() < 10 ? '0' : '' }${ date.getHours() }:${ date.getMinutes() < 10 ? '0' : '' }${ date.getMinutes() }:${ date.getSeconds() < 10 ? '0' : '' }${ date.getSeconds() }`
 			}
 		}, 1000)
 	}