update: 更新

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

@@ -35,17 +35,22 @@ public class PageModel extends BaseModel{
         if(appView.getPSControls()!=null)
         {
             appView.getPSControls().forEach(item->{
+                if(appView.getCodeName().equals("ChartDataUsr2GridView")) {
+                    System.out.println(item.getId());
+                }
                 CtrlModel ctrl=new CtrlModel(appModel,item);
+                if(ctrl.getControl().getPSAppDataEntity()!=null) {
+                    AppEntityModel ctrlAppEntity=app.getAppEntity(ctrl.getControl().getPSAppDataEntity().getCodeName());
+                    ctrl.setAppEntity(ctrlAppEntity);
+                    ctrlAppEntity.addCtrl(ctrl.getId(),ctrl);
+                }
                 if(!this.app.getCtrlsMap().containsKey(ctrl.getId()))
                 {
-                    if(ctrl.getControl().getPSAppDataEntity()!=null) {
-                        AppEntityModel ctrlAppEntity=app.getAppEntity(ctrl.getControl().getPSAppDataEntity().getCodeName());
-                        ctrl.setAppEntity(ctrlAppEntity);
-                        ctrlAppEntity.addCtrl(ctrl.getId(),ctrl);
-                    }
                     this.app.getCtrlsMap().put(ctrl.getId(),ctrl);
                 }
-                this.ctrlsMap.put(ctrl.getId(),ctrl);
+                if(!this.ctrlsMap.containsKey(ctrl.getId())){
+                    this.ctrlsMap.put(ctrl.getId(),ctrl);
+                }
                 //  树导航栏获取数据部件
                 if ("TREEEXPBAR".equals(ctrl.getControl().getControlType())) {
                     List<IPSControl> controls = ((IPSExpBar)item).getPSControls();

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/views/{{appModules}}/{{pages@DEGRIDVIEW}}/{{pages@DEGRIDVIEW}}.vue.hbs

@@ -7,9 +7,9 @@ import { ViewConfig } from './{{spinalCase page.codeName}}-config';
 {{#eq controlType "GRID"}}
 import { {{codeName}}Grid } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-grid';
 {{/eq}}
-{{#eq controlType "SEARCHFORM"}}
+{{#if (and (eq controlType "SEARCHFORM") (eq name 'searchform'))}}
 import { {{codeName}}SearchForm } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-searchForm';
-{{/eq}}
+{{/if}}
 {{/page.ctrls}}
 
 // props声明和默认值处理