update: 更新

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

@@ -38,14 +38,16 @@ const { state, handleToolbarEvent } = new EditView(ViewConfig).moduleInstall(pro
     <template v-slot:header-left>
       <IbizIconText class="ibiz-view__caption" size="large" :text="state.viewCaption" />
     </template>
-    <template v-slot:header-right>
+      {{#page.ctrls}}
+      {{#eq controlType "TOOLBAR"}}
+      <template v-slot:header-right>
       <IbizToolbar
-        :toolbarModel="state.editviewtoolbar"
+        :toolbarModel="state.{{lowerCase codeName}}"
         @toolbarEvent="handleToolbarEvent"
         :context="state.context"
         :viewParams="state.viewParams"/>
     </template>
-      {{#page.ctrls}}
+      {{/eq}}
       {{#eq controlType "FORM"}}
       <{{codeName}}Form
         :showBusyIndicator="true"

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

@@ -7,7 +7,6 @@ import { ViewConfig } from './{{spinalCase page.codeName}}-config';
 import { {{codeName}}Grid } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-grid';
 {{/eq}}
 {{/page.ctrls}}
-import { MainGrid } from '@widgets/example/main-grid';
 
 // props声明和默认值处理
 interface Props {
@@ -39,30 +38,19 @@ const { state } = new PickupGridView(ViewConfig).moduleInstall(props);
       <IbizIconText class="ibiz-view__caption" size="large" :text="state.viewCaption" />
     </template>
     {{#page.ctrls}}
-    {{controlType}}
-      {{#eq controlType "GRID"}}
-      <{{codeName}}Grid
-        :context="state.context"
-        :multiple="false"
-        :rowEditState="state.rowEditState"
-        :rowActiveMode="state.gridRowActiveMode"
-        :showBusyIndicator="true"
-        :viewParams="state.viewParams"
-        :controlAction="state.controlsAction"
-        :viewSubject="state.viewSubject"
-      ></{{codeName}}Grid>
-      {{/eq}}
-      {{/page.ctrls}}
-      <MainGrid
-        :context="state.context"
-        :multiple="false"
-        :rowEditState="state.rowEditState"
-        :rowActiveMode="state.gridRowActiveMode"
-        :showBusyIndicator="true"
-        :viewParams="state.viewParams"
-        :controlAction="state.controlsAction"
-        :viewSubject="state.viewSubject"
-      ></MainGrid>
+    {{#eq controlType "GRID"}}
+    <{{codeName}}Grid
+      :context="state.context"
+      :multiple="false"
+      :rowEditState="state.rowEditState"
+      :rowActiveMode="state.gridRowActiveMode"
+      :showBusyIndicator="true"
+      :viewParams="state.viewParams"
+      :controlAction="state.controlsAction"
+      :viewSubject="state.viewSubject"
+    ></{{codeName}}Grid>
+    {{/eq}}
+    {{/page.ctrls}}
     <template v-slot:footer>
       <a-space class="ibiz-pickup-grid-view--footer">
         <a-button @click="cancel">取消</a-button>