update：更新视图、部件模型组装逻辑（调整id）

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/CtrlModel.java

@@ -30,7 +30,7 @@ public class CtrlModel extends BaseModel{
         else
             folder=new LabelExt("app");
 
-        this.setId(String.format("%1$s-%2$s-%3$s",app.getCodeName(),folder,psControl.getCodeName()));
+        this.setId(String.format("%1$s-%2$s-%3$s-%4$s",app.getCodeName(),folder,psControl.getName(),psControl.getCodeName()));
 
     }
 

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/PageModel.java

@@ -41,11 +41,11 @@ public class PageModel extends BaseModel{
                     if(ctrl.getControl().getPSAppDataEntity()!=null) {
                         AppEntityModel ctrlAppEntity=app.getAppEntity(ctrl.getControl().getPSAppDataEntity().getCodeName());
                         ctrl.setAppEntity(ctrlAppEntity);
-                        ctrlAppEntity.addCtrl(ctrl.getCodeName().toString(),ctrl);
+                        ctrlAppEntity.addCtrl(ctrl.getId(),ctrl);
                     }
                     this.app.getCtrlsMap().put(ctrl.getId(),ctrl);
-                    this.ctrlsMap.put(ctrl.getCodeName().toString(),ctrl);
                 }
+                this.ctrlsMap.put(ctrl.getId(),ctrl);
                 //  树导航栏获取数据部件
                 if ("TREEEXPBAR".equals(ctrl.getControl().getControlType())) {
                     List<IPSControl> controls = ((IPSExpBar)item).getPSControls();
@@ -55,7 +55,7 @@ public class PageModel extends BaseModel{
                             if(ctrlModel.getControl().getPSAppDataEntity()!=null) {
                                 AppEntityModel ctrlAppEntity = app.getAppEntity(ctrlModel.getControl().getPSAppDataEntity().getCodeName());
                                 ctrlModel.setAppEntity(ctrlAppEntity);
-                                ctrlAppEntity.addCtrl(ctrlModel.getCodeName().toString(), ctrlModel);
+                                ctrlAppEntity.addCtrl(ctrlModel.getId(), ctrlModel);
                             }
                             ctrl.addCtrl(ctrlModel.getCodeName().toString(), ctrlModel);
                             if(!this.app.getCtrlsMap().containsKey(ctrlModel.getId())) {