update：更新

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/views/config/include-view-control.hbs

+{{#*inline "FORM"}}{{>@macro/front-end/views/view-form/view-control-form.hbs}}{{/inline}}
+{{#*inline "SEARCHFORM"}}{{>@macro/front-end/views/view-form/view-control-form.hbs}}{{/inline}}
+{{#*inline "GRID"}}{{>@macro/front-end/views/view-grid/view-control-grid.hbs}}{{/inline}}
+{{#*inline "APPMENU"}}{{>@macro/front-end/views/view-menu/view-control-menu.hbs}}{{/inline}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/views/common/view-base-config.hbs → modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/views/config/view-base-config.hbs

+{{> @macro/front-end/views/config/include-view-control}}
   viewCodeName: '{{page.codeName}}',
   viewName: '{{page.name}}',
   viewCaption: '{{page.caption}}',
@@ -23,4 +24,8 @@
     {{/items}}
   {{/page.viewToolBarItems}}
   ],
-{{> @macro/front-end/views/common/control-action}}
+{{#each page.ctrls  as | ctrl |}}
\ No newline at end of file
+{{#if (neq ctrl.controlType "TOOLBAR")}}
+  {{>(lookup . 'ctrl.controlType') ctrl=ctrl}}{{#unless @last}},{{/unless}}
+{{/if}}
+{{/each}}
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/views/view-form/view-control-form.hbs

+{{name}}:{
+    loadAction: '{{ctrl.getPSControlAction.psAppDEMethod.codeName}}',
+    removeAction: '{{ctrl.removePSControlAction.psAppDEMethod.codeName}}',
+    updateAction: '{{ctrl.updatePSControlAction.psAppDEMethod.codeName}}',
+    loadDraftAction: '{{ctrl.getDraftPSControlAction.psAppDEMethod.codeName}}',
+    createAction: '{{ctrl.createPSControlAction.psAppDEMethod.codeName}}'
+  }
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/views/common/control-action.hbs → modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/views/view-grid/view-control-grid.hbs

-  controlsAction:{
-{{#page.ctrls  as | ctrl |}}
-{{#neq controlType "TOOLBAR"}}
-    {{name}}:{
+{{name}}:{
+    action:{
       loadAction: '{{ctrl.getPSControlAction.psAppDEMethod.codeName}}',
       removeAction: '{{ctrl.removePSControlAction.psAppDEMethod.codeName}}',
       updateAction: '{{ctrl.updatePSControlAction.psAppDEMethod.codeName}}',
       loadDraftAction: '{{ctrl.getDraftPSControlAction.psAppDEMethod.codeName}}',
       createAction: '{{ctrl.createPSControlAction.psAppDEMethod.codeName}}',
       fetchAction:'{{ctrl.fetchPSControlAction.psAppDEMethod.codeName}}'
-    },
-{{/neq}}
-{{/page.ctrls}}
+    }  
   }
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/views/view-menu/view-control-menu.hbs

+{{name}}:{
+    loadAction: '{{ctrl.getPSControlAction.psAppDEMethod.codeName}}'
+  }
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/grid-view/grid-view-prop.ts

-import { MainViewProps } from "@core";
+import { MDViewProps } from "@core";
 
 /**
  * @description 表格视图props
  * @export
  * @interface GridViewProps
- * @extends {MainViewProps}
+ * @extends {MDViewProps}
  */
-export interface GridViewProps extends MainViewProps {
+export interface GridViewProps extends MDViewProps {
 
 }
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/grid-view/grid-view-state.ts

-import { MainViewState } from "@core";
+import { MDViewState } from "@core";
 
 /**
  * @description 表格视图状态
  * @export
  * @interface GridViewState
- * @extends {MainViewState}
+ * @extends {MDViewState}
  */
-export interface GridViewState extends MainViewState {
+export interface GridViewState extends MDViewState {
 
   /**
    * @description 表格行激活模式

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/grid-view/grid-view.ts

-import { GridViewProps, GridViewState, MainView } from '@core';
+import { GridViewProps, GridViewState, MDView } from '@core';
 
 /**
  * @description 表格视图
  * @export
  * @class GridView
- * @extends {MainView}
+ * @extends {MDView}
  */
-export class GridView extends MainView {
+export class GridView extends MDView {
 
   /**
    * @description 视图状态

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/index.ts

 export * from './view-base'
 export * from './main-view'
+export * from './md-view'
 export * from './exp-view'
 export * from './edit-view'
 export * from './index-view'

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/md-view/index.ts

+export * from './md-view-prop'
+export * from './md-view-state'
+export * from './md-view'
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/md-view/md-view-prop.ts

+import { MainViewProps } from '@core';
+
+/**
+ * 多数据视图输入参数
+ *
+ * @export
+ * @interface MDViewProps
+ * @extends {MainViewProps}
+ */
+export interface MDViewProps extends MainViewProps {
+}

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/md-view/md-view-state.ts

+import { MainViewState } from '@core';
+
+/**
+ *  多数据视图状态
+ *
+ * @export
+ * @interface MDViewState
+ * @extends {MainViewState}
+ */
+export interface MDViewState extends MainViewState {
+
+}

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/md-view/md-view.ts

+import { MainView, MDViewState } from '@core';
+
+/**
+ * 多数据视图
+ *
+ * @export
+ * @class MDView
+ * @extends {MainView}
+ */
+export class MDView extends MainView {
+  /**
+   * 视图状态数据
+   */
+  public declare viewState: MDViewState;
+
+}

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

 export const ViewConfig = {
-{{> @macro/front-end/views/common/view-base-config.hbs}}
+{{> @macro/front-end/views/config/view-base-config.hbs}}
 };
\ No newline at end of file

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

 export const ViewConfig = {
-{{> @macro/front-end/views/common/view-base-config.hbs}}
+{{> @macro/front-end/views/config/view-base-config.hbs}}
 };
\ No newline at end of file

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

 export const ViewConfig = {
   gridRowActiveMode: {{page.gridRowActiveMode}},
   rowEditState: {{#if page.enableRowEdit}}{{page.rowEditDefault}}{{else}}false{{/if}},
-{{> @macro/front-end/views/common/view-base-config.hbs}}
+{{> @macro/front-end/views/config/view-base-config.hbs}}
 };
\ No newline at end of file

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

@@ -55,7 +55,7 @@ const { state, handleCtrlEvent, handleToolbarEvent } = new GridView(ViewConfig).
       :rowActiveMode="state.gridRowActiveMode"
       :showBusyIndicator="true"
       :viewParams="state.viewParams"
-      :controlAction="state.controlsAction.{{name}}"
+      :controlAction="state.{{name}}.action"
       :viewSubject="state.viewSubject"
       @ctrlEvent="handleCtrlEvent"
     ></{{codeName}}Grid>

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

 export const ViewConfig = {
-{{> @macro/front-end/views/common/view-base-config.hbs}}
+{{> @macro/front-end/views/config/view-base-config.hbs}}
 };
\ No newline at end of file

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

 export const ViewConfig = {
-{{> @macro/front-end/views/common/view-base-config.hbs}}
+{{> @macro/front-end/views/config/view-base-config.hbs}}
 };
\ No newline at end of file

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

 export const ViewConfig = {
-{{> @macro/front-end/views/common/view-base-config.hbs}}
+{{> @macro/front-end/views/config/view-base-config.hbs}}
 };
\ No newline at end of file