Kaynağa Gözat

细节调整

zhaoyk 3 yıl önce
ebeveyn
işleme
141893e4a9

+ 1 - 1
adm_comp/src/lib/DiagramEditor.ts

@@ -259,7 +259,7 @@ export class DiagramEditor extends Editor {
 		const sel = this.getSelComp();
 		if(sel != null) {
 			if(sel.compType == "equipmentNode") {
-				info = '设备id: ' + sel.objId;
+				info = '设备id: ' + sel.dataObjectId;
 				info += '  |  设备类型: ' + sel.dataObject.classCode;
 				info += '  |  设备名称: ' + sel.dataObject.name;
 			} else if(sel.compType == "mainPipe") {

+ 1 - 1
adm_comp/src/lib/DiagramModel.ts

@@ -301,7 +301,7 @@ export class DiagramNode extends Comp {
 
 export class EquipmentNode extends DiagramNode {
 	
-	objId: string;
+	dataObjectId: string;
 	
 	objClassCode: string;
 

+ 9 - 1
adm_comp/src/lib/TemplateEditor.ts

@@ -202,6 +202,10 @@ export class TemplateEditor extends Editor {
 				info += ViewTool.filterToStr(con.dataFilter);
 			if(con.equipPack)
 				info += "  <打包>";
+			if(con.props){
+				if(con.props['auto_hidden'] == true)
+					info += '  {自动隐藏}';	
+			}
 			ViewTool.drawText(this.ctx, info, new Point(location.x + 10, location.y + 10), con.size);
 			
 			var layoutInfo = "";
@@ -287,6 +291,10 @@ export class TemplateEditor extends Editor {
 			}
 			if(sel.equipPack)
 				info += '  |  <打包>';
+			if(sel.props){
+				if(sel.props['auto_hidden'] == true)
+					info += '  |  自动隐藏';	
+			}
 			if(sel.locationPath){
 				var str = '';
 				const arr:Array<Array<Point>> = new Array<Array<Point>>();
@@ -371,7 +379,7 @@ export class TemplateEditor extends Editor {
 			//重新绘制时,需要考虑关联容器
 			let relatedCons: Array<string>;
 			const sel = this.getSelComp();
-			if(sel.compType == 'mainPipe')
+			if(sel && sel.compType == 'mainPipe')
 				relatedCons = (<MainPipe>sel).relatedContainers;
 			if(relatedCons && relatedCons.length == 0)
 				relatedCons = null;