zhaoyk před 3 roky
rodič
revize
80eb4a7a30

+ 22 - 23
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/model/Diagram.java

@@ -94,35 +94,34 @@ public class Diagram {
 	@Expose //TODO 删掉
 	private List<DiagramNode> nodes = new ArrayList<>();
 
-
 	public void init(){
 		if (template != null) {
 			template.init();
 
-			List<Container> containers = template.getContainers();
-			for(Container con : containers) {
-				if(con.isEquipmentBox()) {
-					for(IComponent comp : con.getChildren()) {
-						if(comp instanceof DiagramNode){
-							nodes.add((DiagramNode) comp);
-						}
-					}
-				}
-			}
+//			List<Container> containers = template.getContainers();
+//			for(Container con : containers) {
+//				if(con.isEquipmentBox()) {
+//					for(IComponent comp : con.getChildren()) {
+//						if(comp instanceof DiagramNode){
+//							nodes.add((DiagramNode) comp);
+//						}
+//					}
+//				}
+//			}
 		}
 
-//		nodes.sort(new Comparator<DiagramNode>() {
-//			@Override
-//			public int compare(DiagramNode o1, DiagramNode o2) {
-//				return o1.getLayoutIndex() - o2.getLayoutIndex();
-//			}
-//		});
-//		for (DiagramNode node : nodes) {
-//			Container con = template.getContainerById(node.getContainerId());
-//			if (con != null) {
-//				con.addComp(node);
-//			}
-//		}
+		nodes.sort(new Comparator<DiagramNode>() {
+			@Override
+			public int compare(DiagramNode o1, DiagramNode o2) {
+				return o1.getLayoutIndex() - o2.getLayoutIndex();
+			}
+		});
+		for (DiagramNode node : nodes) {
+			Container con = template.getContainerById(node.getContainerId());
+			if (con != null) {
+				con.addComp(node);
+			}
+		}
 	}
 
 	public void layout(CalcContext context){