update：调整宏引用，适配TS版本Cli

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/include-editor.hbs

-{{#*inline "AC"}}{{>@macro/front-end/editors/auto-complete.hbs}}{{/inline}}
-{{#*inline "AC_FS"}}{{>@macro/front-end/editors/auto-complete.hbs}}{{/inline}}
-{{#*inline "AC_NOBUTTON"}}{{>@macro/front-end/editors/auto-complete.hbs}}{{/inline}}
-{{#*inline "AC_FS_NOBUTTON"}}{{>@macro/front-end/editors/auto-complete.hbs}}{{/inline}}
-{{#*inline "CHECKBOXLIST"}}{{>@macro/front-end/editors/checkbox-list.hbs}}{{/inline}}
-{{#*inline "CHECKBOX"}}{{>@macro/front-end/editors/checkbox.hbs}}{{/inline}}
-{{#*inline "LISTBOXPICKUP"}}{{>@macro/front-end/editors/list-box.hbs}}{{/inline}}
-{{#*inline "LISTBOX"}}{{>@macro/front-end/editors/list-box.hbs}}{{/inline}}
-{{#*inline "PICKEREX_LINKONLY"}}{{>@macro/front-end/editors/data-picker.hbs}}{{/inline}}
-{{#*inline "PICKER"}}{{>@macro/front-end/editors/data-picker.hbs}}{{/inline}}
-{{#*inline "PICKEREX_NOBUTTON"}}{{>@macro/front-end/editors/data-picker.hbs}}{{/inline}}
-{{#*inline "PICKEREX_NOAC_LINK"}}{{>@macro/front-end/editors/data-picker.hbs}}{{/inline}}
-{{#*inline "PICKEREX_TRIGGER_LINK"}}{{>@macro/front-end/editors/data-picker.hbs}}{{/inline}}
-{{#*inline "PICKEREX_TRIGGER"}}{{>@macro/front-end/editors/data-picker.hbs}}{{/inline}}
-{{#*inline "PICKEREX_NOAC"}}{{>@macro/front-end/editors/data-picker.hbs}}{{/inline}}
-{{#*inline "PICKEREX_LINK"}}{{>@macro/front-end/editors/data-picker.hbs}}{{/inline}}
-{{#*inline "PICKEREX_DROPDOWNVIEW"}}{{>@macro/front-end/editors/data-picker.hbs}}{{/inline}}
-{{#*inline "PICKEREX_DROPDOWNVIEW_LINK"}}{{>@macro/front-end/editors/data-picker.hbs}}{{/inline}}
-{{#*inline "ADDRESSPICKUP"}}{{>@macro/front-end/editors/data-picker.hbs}}{{/inline}}
-{{#*inline "ADDRESSPICKUP_AC"}}{{>@macro/front-end/editors/data-picker.hbs}}{{/inline}}
-{{#*inline "DATEPICKEREX"}}{{>@macro/front-end/editors/date-picker.hbs}}{{/inline}}
-{{#*inline "DATEPICKEREX_NOTIME"}}{{>@macro/front-end/editors/date-picker.hbs}}{{/inline}}
-{{#*inline "DATEPICKER"}}{{>@macro/front-end/editors/date-picker.hbs}}{{/inline}}
-{{#*inline "DATEPICKEREX_HOUR"}}{{>@macro/front-end/editors/date-picker.hbs}}{{/inline}}
-{{#*inline "DATEPICKEREX_MINUTE"}}{{>@macro/front-end/editors/date-picker.hbs}}{{/inline}}
-{{#*inline "DATEPICKEREX_SECOND"}}{{>@macro/front-end/editors/date-picker.hbs}}{{/inline}}
-{{#*inline "DATEPICKEREX_NODAY"}}{{>@macro/front-end/editors/date-picker.hbs}}{{/inline}}
-{{#*inline "DATEPICKEREX_NODAY_NOSECOND"}}{{>@macro/front-end/editors/date-picker.hbs}}{{/inline}}
-{{#*inline "DATEPICKEREX_NOSECOND"}}{{>@macro/front-end/editors/date-picker.hbs}}{{/inline}}
-{{#*inline "DROPDOWNLIST"}}{{>@macro/front-end/editors/dropdown-list.hbs}}{{/inline}}
-{{#*inline "DROPDOWNLIST_100"}}{{>@macro/front-end/editors/dropdown-list.hbs}}{{/inline}}
-{{#*inline "MDROPDOWNLIST"}}{{>@macro/front-end/editors/dropdown-list.hbs}}{{/inline}}
-{{#*inline "IPADDRESSTEXTBOX"}}{{>@macro/front-end/editors/input-ip.hbs}}{{/inline}}
-{{#*inline "TEXTBOX"}}{{>@macro/front-end/editors/input.hbs}}{{/inline}}
-{{#*inline "NUMBER"}}{{>@macro/front-end/editors/input.hbs}}{{/inline}}
-{{#*inline "PASSWORD"}}{{>@macro/front-end/editors/input.hbs}}{{/inline}}
-{{#*inline "TEXTAREA"}}{{>@macro/front-end/editors/input.hbs}}{{/inline}}
-{{#*inline "TEXTAREA_10"}}{{>@macro/front-end/editors/input.hbs}}{{/inline}}
-{{#*inline "RADIOBUTTONLIST"}}{{>@macro/front-end/editors/radio-group.hbs}}{{/inline}}
-{{#*inline "RATING"}}{{>@macro/front-end/editors/rating.hbs}}{{/inline}}
-{{#*inline "RAW"}}{{>@macro/front-end/editors/raw.hbs}}{{/inline}}
-{{#*inline "SLIDER"}}{{>@macro/front-end/editors/slider.hbs}}{{/inline}}
-{{#*inline "SPAN"}}{{>@macro/front-end/editors/span.hbs}}{{/inline}}
-{{#*inline "STEPPER"}}{{>@macro/front-end/editors/stepper.hbs}}{{/inline}}
-{{#*inline "SWITCH"}}{{>@macro/front-end/editors/switch.hbs}}{{/inline}}
-{{#*inline "FILEUPLOADER"}}{{>@macro/front-end/editors/upload.hbs}}{{/inline}}
-{{#*inline "FILEUPLOADER_ONE"}}{{>@macro/front-end/editors/upload.hbs}}{{/inline}}
-{{#*inline "PICTURE"}}{{>@macro/front-end/editors/upload.hbs}}{{/inline}}
-{{#*inline "PICTURE_ONE"}}{{>@macro/front-end/editors/upload.hbs}}{{/inline}}
-{{#*inline "PICTURE_ONE_RAW"}}{{>@macro/front-end/editors/upload.hbs}}{{/inline}}
-{{#*inline "PICKUPVIEW"}}{{>@macro/front-end/editors/data-picker-view.hbs}}{{/inline}}
-{{#*inline "PICKEREX_DROPDOWNVIEW"}}{{>@macro/front-end/editors/data-picker-view.hbs}}{{/inline}}
-{{#*inline "PICKEREX_DROPDOWNVIEW_LINK"}}{{>@macro/front-end/editors/data-picker-view.hbs}}{{/inline}}
-{{#*inline "CODE"}}{{>@macro/front-end/editors/code.hbs}}{{/inline}}
-{{#*inline "HTMLEDITOR"}}{{>@macro/front-end/editors/rich-text.hbs}}{{/inline}}
\ No newline at end of file
+{{#eq type "AC"}}{{> @macro/front-end/editors/auto-complete.hbs}}{{/eq}}
+{{#eq type "AC_FS"}}{{> @macro/front-end/editors/auto-complete.hbs}}{{/eq}}
+{{#eq type "AC_NOBUTTON"}}{{> @macro/front-end/editors/auto-complete.hbs}}{{/eq}}
+{{#eq type "AC_FS_NOBUTTON"}}{{> @macro/front-end/editors/auto-complete.hbs}}{{/eq}}
+{{#eq type "CHECKBOXLIST"}}{{> @macro/front-end/editors/checkbox-list.hbs}}{{/eq}}
+{{#eq type "CHECKBOX"}}{{> @macro/front-end/editors/checkbox.hbs}}{{/eq}}
+{{#eq type "LISTBOXPICKUP"}}{{> @macro/front-end/editors/list-box.hbs}}{{/eq}}
+{{#eq type "LISTBOX"}}{{> @macro/front-end/editors/list-box.hbs}}{{/eq}}
+{{#eq type "PICKEREX_LINKONLY"}}{{> @macro/front-end/editors/data-picker.hbs}}{{/eq}}
+{{#eq type "PICKER"}}{{> @macro/front-end/editors/data-picker.hbs}}{{/eq}}
+{{#eq type "PICKEREX_NOBUTTON"}}{{> @macro/front-end/editors/data-picker.hbs}}{{/eq}}
+{{#eq type "PICKEREX_NOAC_LINK"}}{{> @macro/front-end/editors/data-picker.hbs}}{{/eq}}
+{{#eq type "PICKEREX_TRIGGER_LINK"}}{{> @macro/front-end/editors/data-picker.hbs}}{{/eq}}
+{{#eq type "PICKEREX_TRIGGER"}}{{> @macro/front-end/editors/data-picker.hbs}}{{/eq}}
+{{#eq type "PICKEREX_NOAC"}}{{> @macro/front-end/editors/data-picker.hbs}}{{/eq}}
+{{#eq type "PICKEREX_LINK"}}{{> @macro/front-end/editors/data-picker.hbs}}{{/eq}}
+{{#eq type "PICKEREX_DROPDOWNVIEW"}}{{> @macro/front-end/editors/data-picker.hbs}}{{/eq}}
+{{#eq type "PICKEREX_DROPDOWNVIEW_LINK"}}{{> @macro/front-end/editors/data-picker.hbs}}{{/eq}}
+{{#eq type "ADDRESSPICKUP"}}{{> @macro/front-end/editors/data-picker.hbs}}{{/eq}}
+{{#eq type "ADDRESSPICKUP_AC"}}{{> @macro/front-end/editors/data-picker.hbs}}{{/eq}}
+{{#eq type "DATEPICKEREX"}}{{> @macro/front-end/editors/date-picker.hbs}}{{/eq}}
+{{#eq type "DATEPICKEREX_NOTIME"}}{{> @macro/front-end/editors/date-picker.hbs}}{{/eq}}
+{{#eq type "DATEPICKER"}}{{> @macro/front-end/editors/date-picker.hbs}}{{/eq}}
+{{#eq type "DATEPICKEREX_HOUR"}}{{> @macro/front-end/editors/date-picker.hbs}}{{/eq}}
+{{#eq type "DATEPICKEREX_MINUTE"}}{{> @macro/front-end/editors/date-picker.hbs}}{{/eq}}
+{{#eq type "DATEPICKEREX_SECOND"}}{{> @macro/front-end/editors/date-picker.hbs}}{{/eq}}
+{{#eq type "DATEPICKEREX_NODAY"}}{{> @macro/front-end/editors/date-picker.hbs}}{{/eq}}
+{{#eq type "DATEPICKEREX_NODAY_NOSECOND"}}{{> @macro/front-end/editors/date-picker.hbs}}{{/eq}}
+{{#eq type "DATEPICKEREX_NOSECOND"}}{{> @macro/front-end/editors/date-picker.hbs}}{{/eq}}
+{{#eq type "DROPDOWNLIST"}}{{> @macro/front-end/editors/dropdown-list.hbs}}{{/eq}}
+{{#eq type "DROPDOWNLIST_100"}}{{> @macro/front-end/editors/dropdown-list.hbs}}{{/eq}}
+{{#eq type "MDROPDOWNLIST"}}{{> @macro/front-end/editors/dropdown-list.hbs}}{{/eq}}
+{{#eq type "IPADDRESSTEXTBOX"}}{{> @macro/front-end/editors/input-ip.hbs}}{{/eq}}
+{{#eq type "TEXTBOX"}}{{> @macro/front-end/editors/input.hbs}}{{/eq}}
+{{#eq type "NUMBER"}}{{> @macro/front-end/editors/input.hbs}}{{/eq}}
+{{#eq type "PASSWORD"}}{{> @macro/front-end/editors/input.hbs}}{{/eq}}
+{{#eq type "TEXTAREA"}}{{> @macro/front-end/editors/input.hbs}}{{/eq}}
+{{#eq type "TEXTAREA_10"}}{{> @macro/front-end/editors/input.hbs}}{{/eq}}
+{{#eq type "RADIOBUTTONLIST"}}{{> @macro/front-end/editors/radio-group.hbs}}{{/eq}}
+{{#eq type "RATING"}}{{> @macro/front-end/editors/rating.hbs}}{{/eq}}
+{{#eq type "RAW"}}{{> @macro/front-end/editors/raw.hbs}}{{/eq}}
+{{#eq type "SLIDER"}}{{> @macro/front-end/editors/slider.hbs}}{{/eq}}
+{{#eq type "SPAN"}}{{> @macro/front-end/editors/span.hbs}}{{/eq}}
+{{#eq type "STEPPER"}}{{> @macro/front-end/editors/stepper.hbs}}{{/eq}}
+{{#eq type "SWITCH"}}{{> @macro/front-end/editors/switch.hbs}}{{/eq}}
+{{#eq type "FILEUPLOADER"}}{{> @macro/front-end/editors/upload.hbs}}{{/eq}}
+{{#eq type "FILEUPLOADER_ONE"}}{{> @macro/front-end/editors/upload.hbs}}{{/eq}}
+{{#eq type "PICTURE"}}{{> @macro/front-end/editors/upload.hbs}}{{/eq}}
+{{#eq type "PICTURE_ONE"}}{{> @macro/front-end/editors/upload.hbs}}{{/eq}}
+{{#eq type "PICTURE_ONE_RAW"}}{{> @macro/front-end/editors/upload.hbs}}{{/eq}}
+{{#eq type "PICKUPVIEW"}}{{> @macro/front-end/editors/data-picker-view.hbs}}{{/eq}}
+{{#eq type "PICKEREX_DROPDOWNVIEW"}}{{> @macro/front-end/editors/data-picker-view.hbs}}{{/eq}}
+{{#eq type "PICKEREX_DROPDOWNVIEW_LINK"}}{{> @macro/front-end/editors/data-picker-view.hbs}}{{/eq}}
+{{#eq type "CODE"}}{{> @macro/front-end/editors/code.hbs}}{{/eq}}
+{{#eq type "HTMLEDITOR"}}{{> @macro/front-end/editors/rich-text.hbs}}{{/eq}}
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/span.hbs

@@ -15,9 +15,9 @@
 {{/if}}
 {{#if item.psEditor.editorParams.valueFormat}}
   valueFormat="{{item.psEditor.editorParams.valueFormat}}"
-{{else if (item.valueFormat)}}
+{{else if item.valueFormat}}
   valueFormat="{{item.valueFormat}}"
-{{else if (item.psAppDEField.valueFormat)}}
+{{else if item.psAppDEField.valueFormat}}
   valueFormat="{{item.psAppDEField.valueFormat}}"
 {{/if}}
 {{#if item.psEditor.editorParams.precision}}

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

-{{#*inline "FORM"}}{{>@macro/front-end/views/view-control/view-form/view-control-form.hbs}}{{/inline}}
-{{#*inline "SEARCHFORM"}}{{>@macro/front-end/views/view-control/view-search-form/view-control-search-form.hbs}}{{/inline}}
-{{#*inline "GRID"}}{{>@macro/front-end/views/view-control/view-grid/view-control-grid.hbs}}{{/inline}}
-{{#*inline "APPMENU"}}{{>@macro/front-end/views/view-control/view-menu/view-control-menu.hbs}}{{/inline}}
-{{#*inline "PICKUPVIEWPANEL"}}{{>@macro/front-end/views/view-control/view-pickup-panel/view-pickup-panel.hbs}}{{/inline}}
-{{#*inline "TREEVIEW"}}{{>@macro/front-end/views/view-control/view-tree/view-control-tree.hbs}}{{/inline}}
+{{~#eq ctrl.controlType "FORM"}}{{> @macro/front-end/views/view-control/view-form/view-control-form.hbs}}{{/eq}}
+{{~#eq ctrl.controlType "SEARCHFORM"}}{{> @macro/front-end/views/view-control/view-search-form/view-control-search-form.hbs}}{{/eq}}
+{{~#eq ctrl.controlType "GRID"}}{{> @macro/front-end/views/view-control/view-grid/view-control-grid.hbs}}{{/eq}}
+{{~#eq ctrl.controlType "APPMENU"}}{{> @macro/front-end/views/view-control/view-menu/view-control-menu.hbs}}{{/eq}}
+{{~#eq ctrl.controlType "PICKUPVIEWPANEL"}}{{> @macro/front-end/views/view-control/view-pickup-panel/view-pickup-panel.hbs}}{{/eq}}
+{{~#eq ctrl.controlType "TREEVIEW"}}{{> @macro/front-end/views/view-control/view-tree/view-control-tree.hbs}}{{/eq}}
\ No newline at end of file

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

-{{> @macro/front-end/views/include-view-control}}
   {{!-- 视图基本信息 --}}
   viewCodeName: '{{page.codeName}}',
   viewName: '{{page.name}}',
@@ -58,14 +57,14 @@
 {{/each}}
   },
   {{#page.viewToolBarItems}}
-   toolbar: [
+  toolbar: [
     {{#items}}
     { id:'{{id}}',name:'{{name}}',caption:'{{caption}}',groupExtractMode:'{{groupExtractMode}}',itemType:'{{itemType}}',noPrivDisplayMode:'{{noPrivDisplayMode}}',showIcon:{{showIcon}},showCaption:{{showCaption}},tooltip:'{{tooltip}}',disabled: false, visible: true, imgPath: '{{imgPath}}',iconClass: '{{iconClass}}',xDataControlName:'{{xDataControlName}}',{{#if uIAction}}uIAction:{codeName:'{{uIAction.codeName}}',fullCodeName:'{{uIAction.fullCodeName}}',uIActionMode:'{{uIAction.uIActionMode}}',actionTarget:'{{uIAction.actionTarget}}',uIActionTag:'{{uIAction.uIActionTag}}',dataAccessAction:'{{uIAction.dataAccessAction}}',uIActionType:'{{uIAction.uIActionType}}'}{{/if}} },
     {{/items}}
-    ],
+  ],
   {{/page.viewToolBarItems}}
 {{#each page.ctrls  as | ctrl |}}
 {{#if (neq ctrl.controlType "TOOLBAR")}}
-  {{>(lookup . 'ctrl.controlType') ctrl=ctrl}}{{#unless @last}},{{/unless}}
+  {{> @macro/front-end/views/include-view-control type=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-control/view-search-form/view-control-search-form.hbs

@@ -12,4 +12,4 @@
       {{/eq}}
       {{/each}}
     } 
-  }
+  }
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/dashboard-detail/container.hbs

@@ -16,9 +16,9 @@
 >
   {{#each portlet.psControls as | subPortlet | }}
     {{#eq subPortlet.portletType 'CONTAINER'}}
-      {{>(lookup 'PORTLET_CONTAINER') portlet=subPortlet}}
+      {{> @macro/front-end/widgets/dashboard-detail/include-dashboard.hbs type='PORTLET_CONTAINER' portlet=subPortlet}}
     {{else}}
-      {{>(lookup 'PORTLET') portlet=subPortlet}}
+      {{> @macro/front-end/widgets/dashboard-detail/include-dashboard.hbs type='PORTLET' portlet=subPortlet}}
     {{/eq}}
   {{/each}}
 </AppPortletCard>

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/dashboard-detail/include-dashboard.hbs

-{{#*inline "PORTLET_CONTAINER"}}{{>@macro/front-end/widgets/dashboard-detail/container.hbs}}{{/inline}}
-{{#*inline "PORTLET"}}{{>@macro/front-end/widgets/dashboard-detail/portlet.hbs}}{{/inline}}
\ No newline at end of file
+{{#eq type "PORTLET_CONTAINER"}}{{> @macro/front-end/widgets/dashboard-detail/container.hbs}}{{/eq}}
+{{#eq type "PORTLET"}}{{> @macro/front-end/widgets/dashboard-detail/portlet.hbs}}{{/eq}}
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-action-model.hbs

-{{#each items as | formDetail |}}
-{{#if (and (eq formDetail.detailType "BUTTON") (formDetail.psUIAction))}}
-{{#formDetail.psUIAction}}
+{{#each item.psDEFormDetails as | tempDetail |}}
+{{#if (and (eq tempDetail.detailType "BUTTON") tempDetail.psUIAction)}}
+{{#tempDetail.psUIAction}}
     '{{uIActionTag}}': { disabled: false, visible: true, noPrivDisplayMode: "{{noPrivDisplayMode}}", dataAccessAction: '{{dataAccessAction}}', actionTarget: '{{actionTarget}}' },
-{{/formDetail.psUIAction}}
+{{/tempDetail.psUIAction}}
 {{/if}}
-{{#if (and (eq formDetail.detailType "GROUPPANEL") (formDetail.psSUIActionGroup.psUIActionGroupDetails))}}
-{{#each formDetail.psSUIActionGroup.psUIActionGroupDetails as | detail | }}
+{{#if (and (eq tempDetail.detailType "GROUPPANEL") tempDetail.psSUIActionGroup tempDetail.psSUIActionGroup.psUIActionGroupDetails)}}
+{{#each tempDetail.psSUIActionGroup.psUIActionGroupDetails as | detail | }}
 {{#detail.psUIAction}}
    '{{uIActionTag}}': { disabled: false, visible: true, noPrivDisplayMode: "{{noPrivDisplayMode}}", dataAccessAction: '{{dataAccessAction}}', actionTarget: '{{actionTarget}}' },
 {{/detail.psUIAction}}
 {{/each}}
 {{/if}}
-{{#if formDetail.psDEFormDetails}}
-{{>(lookup 'FORMACTIONMODEL') items=formDetail.psDEFormDetails}}
+{{#if tempDetail.psDEFormDetails}}
+{{> @macro/front-end/widgets/form-detail/form-action-model.hbs item=tempDetail}}
 {{/if}}
 {{/each}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-button.hbs

 <AppFormButton
   name="{{item.codeName}}"
-  :layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=formDetail.psLayout layoutPos=formDetail.psLayoutPos}}"
+  :layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=item.psLayout layoutPos=item.psLayoutPos}}"
   :visible="state.detailsModel.{{item.codeName}}.visible"
 {{#if item.psSysCss}}
   class="{{item.psSysCss.cssName}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-details-model.hbs

-    {{formDetail.codeName}}: {
-      caption: '{{formDetail.caption}}',
-      name: '{{formDetail.name}}',
-      disabled: false, 
-      visible: true,
-      detailStyle: '{{formDetail.detailStyle}}',
-      detailType: '{{formDetail.detailType}}',
-      showCaption: {{#if formDetail.showCaption}}true{{else}}false{{/if}},
-      {{#if formDetail.valueFormat}}
-      valueFormat: '{{formDetail.valueFormat}}',
-      {{else if (formDetail.psAppDEField)}}
-      valueFormat: '{{formDetail.psAppDEField.valueFormat}}',
-      {{/if}}
-      {{#if (eq formDetail.detailType "FORMITEM")}}
-      dataType: '{{formDetail.dataType}}',
-      required: {{#if formDetail.allowEmpty}}false{{else}}true{{/if}},
-      enableCond: {{formDetail.enableCond}},
-      {{#if formDetail.psDEFormItemUpdate}}
-      formItemUpdate: {
-        {{#if formDetail.psDEFormItemUpdate.customCode}}
-        customCode: {{formDetail.psDEFormItemUpdate.customCode}},
-        scriptCode: `{{formDetail.psDEFormItemUpdate.scriptCode}}`,
-        {{else}}
-        showBusyIndicator: "{{formDetail.psDEFormItemUpdate.showBusyIndicator}}",
-        appDEMethod: "{{formDetail.psDEFormItemUpdate.psAppDEMethod}}",
-        updateDetails: [
-        {{#each formDetail.psDEFormItemUpdate.psDEFIUpdateDetails as | updateDetails | }}
-        "{{updateDetails.codeName}}",
-        {{/each}}
-        ],
-        {{/if}}
-      },
-      {{/if}}
-      {{#if formDetail.createDVT}}
-      createDVT: "{{formDetail.createDVT}}",
-      createDV: "{{formDetail.createDV}}",
-      {{/if}}
-      {{#if formDetail.updateDVT}}
-      updateDVT: "{{formDetail.updateDVT}}",
-      updateDV: "{{formDetail.updateDV}}",
-      {{/if}}
-      {{#if formDetail.resetItemName}}
-      resetItemName: '{{formDetail.resetItemName}}',
-      {{/if}}
-      {{#if formDetail.valueItemName}}
-      valueItemName: '{{formDetail.valueItemName}}',
-      {{/if}}
-      {{/if}}
-      {{#if (and (eq formDetail.detailType "BUTTON") (formDetail.psUIAction))}}
-      uIActionTag: '{{formDetail.psUIAction.uIActionTag}}',
-      {{/if}}
-      {{#if (and (eq formDetail.detailType "GROUPPANEL") (formDetail.psUIActionGroup))}}
-      uIActionGroup: {
-        extractMode: '{{formDetail.psUIActionGroup.actionGroupExtractMode}}',
-        caption: '{{formDetail.psUIActionGroup.name}}',
-        details: [
-        {{#each formDetail.psUIActionGroup.psUIActionGroupDetails as | detail | }}
-        { caption: '{{detail.psUIAction.caption}}', disabled: false, visible: true, uIActionTag: '{{detail.psUIAction.uIActionTag}}', showCaption: {{detail.showCaption}}, showIcon: {{detail.showIcon}}, {{#if detail.psUIAction.psSysImage}}{{#if detail.psUIAction.psSysImage.imagePath}} imgPath: "{{detail.psUIAction.psSysImage.imagePath}}",{{/if}}{{#if detail.psUIAction.psSysImage.cssClass}} iconClass: "{{detail.psUIAction.psSysImage.cssClass}}",{{/if}}{{/if}} },
-        {{/each}}
-        ],
-      },
-      {{/if}}
-      {{#if formDetail.psDEFDGroupLogics}}
-      groupLogics: [
-        {{#each formDetail.psDEFDGroupLogics as | groupLogic |}}
-        {
-          name: '{{groupLogic.name}}',
-          groupOP: '{{groupLogic.groupOP}}',
-          relatedDetailNames: '{{groupLogic.relatedDetailNames}}',
-          logicCat: '{{groupLogic.logicCat}}',
-          logicType: '{{groupLogic.logicType}}',
-          notMode: {{groupLogic.notMode}},
-          logics: [
-          {{#each groupLogic.psDEFDLogics as | logic |}}
-          {condOP: '{{logic.condOP}}',dEFDName: '{{logic.dEFDName}}',logicType: '{{logic.logicType}}',name: '{{logic.name}}',value:'{{logic.value}}'},
-          {{/each}}
-          ],
-        },
-        {{/each}}
+{{item.codeName}}: {
+  caption: '{{item.caption}}',
+  name: '{{item.name}}',
+  disabled: false, 
+  visible: true,
+  detailStyle: '{{item.detailStyle}}',
+  detailType: '{{item.detailType}}',
+  showCaption: {{#if item.showCaption}}true{{else}}false{{/if}},
+  {{#if item.valueFormat}}
+  valueFormat: '{{item.valueFormat}}',
+  {{else}}
+  {{#if item.psAppDEField}}
+  valueFormat: '{{item.psAppDEField.valueFormat}}',
+  {{/if}}
+  {{/if}}
+  {{#if (eq item.detailType "FORMITEM")}}
+  dataType: '{{item.dataType}}',
+  required: {{#if item.allowEmpty}}false{{else}}true{{/if}},
+  enableCond: {{item.enableCond}},
+  {{#if item.psDEFormItemUpdate}}
+  formItemUpdate: {
+    {{#if item.psDEFormItemUpdate.customCode}}
+    customCode: {{item.psDEFormItemUpdate.customCode}},
+    scriptCode: `{{item.psDEFormItemUpdate.scriptCode}}`,
+    {{else}}
+    showBusyIndicator: "{{item.psDEFormItemUpdate.showBusyIndicator}}",
+    {{!-- appDEMethod: "{{item.psDEFormItemUpdate.psAppDEMethod.codeName}}", --}}
+    updateDetails: [
+    {{#each item.psDEFormItemUpdate.psDEFIUpdateDetails as | updateDetails | }}
+    "{{updateDetails.name}}",
+    {{/each}}
+    ],
+    {{/if}}
+  },
+  {{/if}}
+  {{#if item.createDVT}}
+  createDVT: "{{item.createDVT}}",
+  createDV: "{{item.createDV}}",
+  {{/if}}
+  {{#if item.updateDVT}}
+  updateDVT: "{{item.updateDVT}}",
+  updateDV: "{{item.updateDV}}",
+  {{/if}}
+  {{#if item.resetItemName}}
+  resetItemName: '{{item.resetItemName}}',
+  {{/if}}
+  {{#if item.valueItemName}}
+  valueItemName: '{{item.valueItemName}}',
+  {{/if}}
+  {{/if}}
+  {{#if (and (eq item.detailType "BUTTON") item.psUIAction)}}
+  uIActionTag: '{{item.psUIAction.uIActionTag}}',
+  {{/if}}
+  {{#if (and (eq item.detailType "GROUPPANEL") item.psUIActionGroup)}}
+  uIActionGroup: {
+    extractMode: '{{item.psUIActionGroup.actionGroupExtractMode}}',
+    caption: '{{item.psUIActionGroup.name}}',
+    details: [
+    {{#each item.psUIActionGroup.psUIActionGroupDetails as | detail | }}
+    { caption: '{{detail.psUIAction.caption}}', disabled: false, visible: true, uIActionTag: '{{detail.psUIAction.uIActionTag}}', showCaption: {{detail.showCaption}}, showIcon: {{detail.showIcon}}, {{#if detail.psUIAction.psSysImage}}{{#if detail.psUIAction.psSysImage.imagePath}} imgPath: "{{detail.psUIAction.psSysImage.imagePath}}",{{/if}}{{#if detail.psUIAction.psSysImage.cssClass}} iconClass: "{{detail.psUIAction.psSysImage.cssClass}}",{{/if}}{{/if}} },
+    {{/each}}
+    ],
+  },
+  {{/if}}
+  {{#if item.psDEFDGroupLogics}}
+  groupLogics: [
+    {{#each item.psDEFDGroupLogics as | groupLogic |}}
+    {
+      name: '{{groupLogic.name}}',
+      groupOP: '{{groupLogic.groupOP}}',
+      relatedDetailNames: '{{groupLogic.relatedDetailNames}}',
+      logicCat: '{{groupLogic.logicCat}}',
+      logicType: '{{groupLogic.logicType}}',
+      notMode: {{groupLogic.notMode}},
+      logics: [
+      {{#each groupLogic.psDEFDLogics as | logic |}}
+      {condOP: '{{logic.condOP}}',dEFDName: '{{logic.dEFDName}}',logicType: '{{logic.logicType}}',name: '{{logic.name}}',value:'{{logic.value}}'},
+      {{/each}}
       ],
-      {{/if}}
     },
-{{#if formDetail.psDEFormDetails}}
-  {{#each formDetail.psDEFormDetails as | tempDetail |}}
-    {{>(lookup 'FORMDETAILSMODEL') formDetail=tempDetail}}
-  {{/each}}
+    {{/each}}
+  ],
+  {{/if}}
+},
+{{#if item.psDEFormDetails}}
+{{#each item.psDEFormDetails as | tempDetail |}}
+{{> @macro/front-end/widgets/form-detail/include-form.hbs type="FORMDETAILSMODEL" item=tempDetail}}
+{{/each}}
 {{/if}}
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-druipart.hbs

@@ -2,7 +2,7 @@
   name="{{item.codeName}}" 
   title="{{item.caption}}" 
   :visible="state.detailsModel.{{item.codeName}}.visible"
-  :layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=formDetail.psLayout layoutPos=formDetail.psLayoutPos}}"
+  :layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=item.psLayout layoutPos=item.psLayoutPos}}"
 {{#if item.psSysCss}}
   class="{{item.psSysCss.cssName}}"
 {{/if}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-group-panel.hbs

@@ -2,7 +2,7 @@
   name="{{item.codeName}}"
   title="{{item.caption}}"
   :visible="state.detailsModel.{{item.codeName}}.visible" 
-  :layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=formDetail.psLayout layoutPos=formDetail.psLayoutPos}}"
+  :layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=item.psLayout layoutPos=item.psLayoutPos}}"
 {{#if item.psSysCss}}
   class="{{item.psSysCss.cssName}}"
 {{/if}}
@@ -21,6 +21,6 @@
   :uIActionGroup="state.detailsModel.{{item.codeName}}.uIActionGroup"
   @componentEvent="onComponentEvent">
     {{#each item.psDEFormDetails as | formDetail |}}
-    {{>(lookup . 'formDetail.detailType') item=formDetail}}
+    {{> @macro/front-end/widgets/form-detail/include-form.hbs type=formDetail.detailType item=formDetail}}
     {{/each}}
 </AppFormGroup>

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-iframe.hbs

 <AppFormIframe
   name="{{item.codeName}}"
   :visible="state.detailsModel.{{item.codeName}}.visible"
-  :layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=formDetail.psLayout layoutPos=formDetail.psLayoutPos}}"
+  :layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=item.psLayout layoutPos=item.psLayoutPos}}"
 {{#if item.psSysCss}}
   class="{{item.psSysCss.cssName}}"
 {{/if}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-item.hbs

-{{>@macro/front-end/editors/include-editor.hbs}}
 {{#neq item.psEditor.editorType "HIDDEN"}}
   <AppFormItem 
     name="{{item.codeName}}"
@@ -7,7 +6,7 @@
     :rules="state.rules.{{item.codeName}}"
     :required="state.detailsModel.{{item.codeName}}.required"
     :visible="state.detailsModel.{{item.codeName}}.visible" 
-    :layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=formDetail.psLayout layoutPos=formDetail.psLayoutPos}}"
+    :layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=item.psLayout layoutPos=item.psLayoutPos}}"
 {{#if item.psSysCss}}
     class="{{item.psSysCss.cssName}}"
 {{/if}}
@@ -20,7 +19,7 @@
   >
 {{#if item.psEditor}}
     <div class="form-editor-container" style="{{#if item.editorWidth}}width: {{item.editorWidth}}px;{{/if}}{{#if item.editorHeight}}height: {{item.editorHeight}}px{{/if}}">
-    {{>(lookup . 'item.psEditor.editorType') item=item ctrlType="form"}}
+    {{> @macro/front-end/editors/include-editor.hbs type=item.psEditor.editorType item=item ctrlType="form"}}
     </div>
 {{/if}}
   </AppFormItem>

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-page.hbs

@@ -12,6 +12,6 @@
     <AppIconText {{#if item.labelPSSysCss}}class="{{item.labelPSSysCss.cssName}}" {{/if}}{{#if item.psSysImage}}{{#if item.psSysImage.cssClass}}iconClass="{{item.psSysImage.cssClass}}" {{/if}}{{#if item.psSysImage.imagePath}}imgPath="{{item.psSysImage.imagePath}}" {{/if}}{{/if}}text="{{item.caption}}"/>
   </template>
   {{#each item.psDEFormDetails as | formDetail |}}
-  {{>(lookup . 'formDetail.detailType') item=formDetail}}
+  {{> @macro/front-end/widgets/form-detail/include-form.hbs type=formDetail.detailType item=formDetail}}
   {{/each}}
 </AppFormPage>
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-tabpage.hbs

 <AppFormTabpage
   name="{{item.codeName}}"
   :visible="state.detailsModel.{{item.codeName}}.visible"
-  :layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=formDetail.psLayout layoutPos=formDetail.psLayoutPos}}"
+  :layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=item.psLayout layoutPos=item.psLayoutPos}}"
 {{#if item.psSysCss}}
   class="{{item.psSysCss.cssName}}"
 {{/if}} 
@@ -9,6 +9,6 @@
   caption="{{#if item.caption}}{{item.caption}}{{/if}}"    
 >
   {{#each item.psDEFormDetails as | formDetail |}}
-  {{>(lookup . 'formDetail.detailType') item=formDetail}}
+  {{> @macro/front-end/widgets/form-detail/include-form.hbs type=formDetail.detailType item=formDetail}}
   {{/each}}
 </AppFormTabpage>

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-tabpanel.hbs

 <AppFormTabpanel 
   name="{{item.codeName}}"
   :visible="state.detailsModel.{{item.codeName}}.visible"
-  :layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=formDetail.psLayout layoutPos=formDetail.psLayoutPos}}"
+  :layoutOpts="{{> @macro/front-end/common/layoutPos.hbs layout=item.psLayout layoutPos=item.psLayoutPos}}"
   name={{item.name}}>
   {{#each item.psDEFormPages as | formPage | }}
-  {{>(lookup . 'formPage.detailType') item=formPage }}
+  {{> @macro/front-end/widgets/form-detail/include-form.hbs type=formPage.detailType item=formPage}}
   {{/each}}
 </AppFormTabpanel>

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/include-form.hbs

-{{#*inline "FORMPAGE"}}{{>@macro/front-end/widgets/form-detail/form-page.hbs}}{{/inline}}
-{{#*inline "GROUPPANEL"}}{{>@macro/front-end/widgets/form-detail/form-group-panel.hbs}}{{/inline}}
-{{#*inline "FORMITEM"}}{{>@macro/front-end/widgets/form-detail/form-item.hbs}}{{/inline}}
-{{#*inline "TABPANEL"}}{{>@macro/front-end/widgets/form-detail/form-tabpanel.hbs}}{{/inline}}
-{{#*inline "BUTTON"}}{{>@macro/front-end/widgets/form-detail/form-button.hbs}}{{/inline}}
-{{#*inline "RAWITEM"}}{{>@macro/front-end/widgets/form-detail/form-rawitem.hbs}}{{/inline}}
-{{#*inline "IFRAME"}}{{>@macro/front-end/widgets/form-detail/form-iframe.hbs}}{{/inline}}
-{{#*inline "FORMPART"}}{{>@macro/front-end/widgets/form-detail/form-formpart.hbs}}{{/inline}}
-{{#*inline "TABPAGE"}}{{>@macro/front-end/widgets/form-detail/form-tabpage.hbs}}{{/inline}}
-{{#*inline "DRUIPART"}}{{>@macro/front-end/widgets/form-detail/form-druipart.hbs}}{{/inline}}
-{{#*inline "FORMDETAILSMODEL"}}{{>@macro/front-end/widgets/form-detail/form-details-model.hbs}}{{/inline}}
-{{#*inline "FORMACTIONMODEL"}}{{>@macro/front-end/widgets/form-detail/form-action-model.hbs}}{{/inline}}
\ No newline at end of file
+{{#eq type "FORMPAGE"}}{{> @macro/front-end/widgets/form-detail/form-page.hbs}}{{/eq}}
+{{#eq type "GROUPPANEL"}}{{> @macro/front-end/widgets/form-detail/form-group-panel.hbs}}{{/eq}}
+{{#eq type "FORMITEM"}}{{> @macro/front-end/widgets/form-detail/form-item.hbs}}{{/eq}}
+{{#eq type "TABPANEL"}}{{> @macro/front-end/widgets/form-detail/form-tabpanel.hbs}}{{/eq}}
+{{#eq type "BUTTON"}}{{> @macro/front-end/widgets/form-detail/form-button.hbs}}{{/eq}}
+{{#eq type "IFRAME"}}{{> @macro/front-end/widgets/form-detail/form-iframe.hbs}}{{/eq}}
+{{#eq type "FORMPART"}}{{> @macro/front-end/widgets/form-detail/form-formpart.hbs}}{{/eq}}
+{{#eq type "TABPAGE"}}{{> @macro/front-end/widgets/form-detail/form-druipart.hbs}}{{/eq}}
+{{#eq type "DRUIPART"}}{{> @macro/front-end/widgets/form-detail/form-druipart.hbs}}{{/eq}}
+{{#eq type "FORMDETAILSMODEL"}}{{> @macro/front-end/widgets/form-detail/form-details-model.hbs}}{{/eq}}
+{{#eq type "FORMACTIONMODEL"}}{{> @macro/front-end/widgets/form-detail/form-action-model.hbs}}{{/eq}}
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/grid-detail/grid-column-model.hbs

@@ -5,7 +5,7 @@
       {{#if item.align}}
       align: "{{lowerCase item.align}}",
       {{/if}}
-        {{#if item.widthUnit 'PX'}}
+        {{#if (eq item.widthUnit 'PX')}}
       width: {{item.width}},
         {{else}}
       minWidth: {{item.width}},
@@ -14,7 +14,7 @@
       {{#eq item.columnType 'GROUPGRIDCOLUMN'}}
       children: [
         {{#each item.psDEGridColumns as | column |}}
-          {{>(lookup 'COLUMNMODEL') item=column}}
+          {{> @macro/front-end/widgets/grid-detail/include-grid.hbs type="COLUMNMODEL" item=column}}
         {{/each}}
       ],
       {{else}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/grid-detail/grid-column.hbs

-{{>@macro/front-end/editors/include-editor.hbs}}
 {{#if (eq item.columnType 'GROUPGRIDCOLUMN')}}
   {{#each item.psDEGridColumns as | column |}}
-{{>(lookup 'COLUMN') item=column ctrl=ctrl}}
+{{> @macro/front-end/widgets/grid-detail/include-grid.hbs type="COLUMN" item=column}}
   {{/each}}
 {{else}}
   {{#unless (or item.hideDefault item.hiddenDataItem)}}
@@ -16,7 +15,7 @@
       >
     {{#each ctrl.psDEGridEditItems as | editColumn | }}
     {{#if (eq editColumn.codeName item.codeName)}}
-    {{>(lookup . 'editColumn.psEditor.editorType') item=editColumn ctrlType="grid"}}
+    {{> @macro/front-end/editors/include-editor.hbs type=editColumn.psEditor.editorType item=editColumn ctrlType="grid"}}
     {{/if}}
     {{/each}}
     </AppFormItem>

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/grid-detail/grid-uacolumn-model.hbs

 {{#if (eq item.columnType 'GROUPGRIDCOLUMN')}}
   {{#each item.psDEGridColumns as | column |}}
-{{>(lookup 'UACOLUMNMODEL') item=column}}
+{{> @macro/front-end/widgets/grid-detail/include-grid.hbs type="UACOLUMNMODEL" item=column}}
   {{/each}}
 {{else if (eq item.columnType 'UAGRIDCOLUMN')}}
   {{#each item.psDEUIActionGroup.psUIActionGroupDetails as | action |}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/grid-detail/include-grid.hbs

-{{#*inline "COLUMN"}}{{>@macro/front-end/widgets/grid-detail/grid-column.hbs}}{{/inline}}
-{{#*inline "COLUMNMODEL"}}{{>@macro/front-end/widgets/grid-detail/grid-column-model.hbs}}{{/inline}}
-{{#*inline "UACOLUMNMODEL"}}{{>@macro/front-end/widgets/grid-detail/grid-uacolumn-model.hbs}}{{/inline}}
-{{#*inline "COLUMNHEADER"}}{{>@macro/front-end/widgets/grid-detail/grid-column-header.hbs}}{{/inline}}
\ No newline at end of file
+{{#eq type "COLUMN"}}{{> @macro/front-end/widgets/grid-detail/grid-column.hbs}}{{/eq}}
+{{#eq type "COLUMNMODEL"}}{{> @macro/front-end/widgets/grid-detail/grid-column-model.hbs}}{{/eq}}
+{{#eq type "UACOLUMNMODEL"}}{{> @macro/front-end/widgets/grid-detail/grid-uacolumn-model.hbs}}{{/eq}}
+{{#eq type "COLUMNHEADER"}}{{> @macro/front-end/widgets/grid-detail/grid-column-header.hbs}}{{/eq}}
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/menu-detail/include-menu.hbs

-{{#*inline "MENUITEM"}}{{>@macro/front-end/widgets/menu-detail/menu-item.hbs}}{{/inline}}
+{{#eq type "MENUITEM"}}{{> @macro/front-end/widgets/menu-detail/menu-item.hbs}}{{/eq}}
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/menu-detail/menu-item.hbs

@@ -35,7 +35,7 @@
   {{#if item.psAppMenuItems}}
   items: [
     {{#each item.psAppMenuItems as | item |}}
-      {{>(lookup 'MENUITEM') item=item}}
+      {{> @macro/front-end/widgets/menu-detail/include-menu.hbs type="MENUITEM" item=item}}
     {{/each}}
   ]
   {{/if}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@APPMENU}}-menu/{{ctrls@APPMENU}}-menu-state.ts.hbs

-{{>@macro/front-end/widgets/menu-detail/include-menu.hbs}}
 export const ctrlState = {
   controlCodeName: '{{ctrl.codeName}}',
   controlName: '{{ctrl.name}}',
@@ -6,7 +5,7 @@ export const ctrlState = {
   defaultSelect: [],
   menus: [
     {{#each ctrl.psAppMenuItems as | item |}}
-      {{>(lookup 'MENUITEM') item=item}}
+      {{> @macro/front-end/widgets/menu-detail/include-menu.hbs type="MENUITEM" item=item}}
     {{/each}}
   ],
   funcs: [],

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@DASHBOARD}}-dashboard/{{ctrls@DASHBOARD}}-dashboard.vue.hbs

-{{>@macro/front-end/widgets/dashboard-detail/include-dashboard.hbs}}
 <script setup lang="ts">
 import { Subject } from 'rxjs';
 import { ctrlState } from './{{spinalCase ctrl.codeName}}-dashboard-state';
@@ -41,9 +40,9 @@ defineExpose({ name, state });
     <template v-if="!state.isEnableCustomized">
   {{#each ctrl.psControls as |portlet|}}
     {{#eq portlet.portletType 'CONTAINER'}}
-      {{>(lookup 'PORTLET_CONTAINER') portlet=portlet}}
+      {{> @macro/front-end/widgets/dashboard-detail/include-dashboard.hbs type='PORTLET_CONTAINER' portlet=portlet}}
     {{else}}
-      {{>(lookup 'PORTLET') portlet=portlet}}
+      {{> @macro/front-end/widgets/dashboard-detail/include-dashboard.hbs type='PORTLET' portlet=portlet}}
     {{/eq}}
   {{/each}}
     </template>

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@FORM}}-form/{{ctrls@FORM}}-form-state.ts.hbs

-{{>@macro/front-end/widgets/form-detail/include-form.hbs}}
 import { ControlVOBase, EditFormService } from '@core';
 import { {{pascalCase ctrl.psAppDataEntity.codeName}}Service } from '@api/{{spinalCase ctrl.psAppDataEntity.codeName}}/{{spinalCase ctrl.psAppDataEntity.codeName}}-service';
 
@@ -64,18 +63,18 @@ export const ctrlState = {
   detailsModel: {
   {{#if ctrl.psDEFormPages}}
     {{#each ctrl.psDEFormPages as | FormPage | }}
-      {{>(lookup 'FORMDETAILSMODEL') formDetail=FormPage}}
+    {{> @macro/front-end/widgets/form-detail/include-form.hbs type="FORMDETAILSMODEL" item=FormPage}}
     {{/each}}
   {{/if}}
   },
   actionModel: {
     {{#each ctrl.psDEFormPages as | FormPage | }}
-    {{>(lookup 'FORMACTIONMODEL') items=FormPage.psDEFormDetails}}
+    {{> @macro/front-end/widgets/form-detail/include-form.hbs type="FORMACTIONMODEL" item=FormPage}}
     {{/each}}
   },
   rules: {
         {{#each ctrl.psDEFormItemVRs as | ruleItem |}}
-          {{#if ruleItem.valueRuleType 'SYSVALUERULE'}}
+          {{#if (eq ruleItem.valueRuleType 'SYSVALUERULE')}}
           {{ruleItem.psDEFormItemName}}: [
             {
                 trigger: ['change', 'blur'],

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@FORM}}-form/{{ctrls@FORM}}-form.vue.hbs

-{{>@macro/front-end/widgets/form-detail/include-form.hbs}}
 <script setup lang="ts">
 import { Subject } from 'rxjs';
 import { ctrlState } from './{{spinalCase ctrl.codeName}}-form-state';
@@ -9,13 +8,13 @@ import { FormControl, IActionParam, IParam, ControlAction, IContext } from '@cor
 import {{formDetail.psAppView.codeName}} from '@views/{{spinalCase formDetail.psAppView.psAppModule.codeName}}/{{spinalCase formDetail.psAppView.codeName}}';
             {{/eq}}
            {{#if formDetail.psDEFormDetails}}
-           {{>(lookup 'importFormDruipart') items=formDetail.psDEFormDetails}}
+           {{> importFormDruipart items=formDetail.psDEFormDetails}}
            {{/if}}
        {{/each }}
 {{/inline}}
 {{#each ctrl.psDEFormPages as | items | }}
 {{#if items.psDEFormDetails}}
-{{>(lookup 'importFormDruipart') items=items.psDEFormDetails}}
+{{> importFormDruipart items=items.psDEFormDetails}}
 {{/if}}
 {{/each}}
 interface Props {
@@ -50,13 +49,13 @@ defineExpose({ name, state, load, loadDraft, save, remove, refresh, getData });
     {{#if ctrl.noTabHeader}}
     {{#each ctrl.psDEFormPages as | ctrlPage | }}
     {{#each ctrlPage.psDEFormDetails as | formDetail | }}
-    {{>(lookup . 'formDetail.detailType') item=formDetail}}
+    {{> @macro/front-end/widgets/form-detail/include-form.hbs type=formDetail.detailType item=formDetail}}
     {{/each }}
     {{/each}}
     {{else}}
     <a-tabs class="app-form-page">
       {{#each ctrl.psDEFormPages as | ctrlPage | }}
-      {{>(lookup . 'ctrlPage.detailType') item=ctrlPage }}
+      {{> @macro/front-end/widgets/form-detail/include-form.hbs type=ctrlPage.detailType item=ctrlPage}}
       {{/each}}
     </a-tabs>
     {{/if}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@GRID}}-grid/{{ctrls@GRID}}-grid-state.ts.hbs

-{{>@macro/front-end/widgets/grid-detail/include-grid.hbs}}
 import { ControlVOBase, IParam, GridService } from '@core';
 import { {{pascalCase ctrl.psAppDataEntity.codeName}}Service } from '@api/{{spinalCase ctrl.psAppDataEntity.codeName}}/{{spinalCase ctrl.psAppDataEntity.codeName}}-service';
 
@@ -8,13 +7,14 @@ export class ControlVO extends ControlVOBase {
     super(data);
   }
   {{#each ctrl.psDEGridDataItems as | dataItem |}}
-
+  {{#if dataItem.psAppDEField}}
   get {{lowerCase dataItem.name}}() {
     return this.$DO.{{lowerCase dataItem.psAppDEField.codeName}};
   }
   set {{lowerCase dataItem.name}}(value: any) {
     this.$DO.{{lowerCase dataItem.psAppDEField.codeName}} = value;
   }
+  {{/if}}
   {{/each}}
 
 }
@@ -67,7 +67,7 @@ export const ctrlState = {
   },
   uAColumnModel:[
   {{#each ctrl.psDEGridColumns as | column |}}
-    {{>(lookup 'UACOLUMNMODEL') item=column}}
+    {{> @macro/front-end/widgets/grid-detail/include-grid.hbs type="UACOLUMNMODEL" item=column}}
   {{/each}}
   ],
   gridEditState:{
@@ -92,14 +92,14 @@ export const ctrlState = {
     {{/if}}
     {{/if}}
     {{#each ctrl.psDEGridColumns as | column |}}
-    {{>(lookup 'COLUMNMODEL') item=column}}
+    {{> @macro/front-end/widgets/grid-detail/include-grid.hbs type="COLUMNMODEL" item=column}}
     {{/each}}
   ],
   // 是否单选
   isSingleSelect:{{#if ctrl.singleSelect}}{{ctrl.singleSelect}}{{else}}false{{/if}},
   rules:{
           {{#each ctrl.psDEGridEditItemVRs as | ruleItem |}}
-            {{#if ruleItem.valueRuleType 'SYSVALUERULE'}}
+            {{#if (eq ruleItem.valueRuleType 'SYSVALUERULE')}}
             {{ruleItem.psDEGridEditItemName}}: [
               {
                   trigger: ['change', 'blur'],

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@GRID}}-grid/{{ctrls@GRID}}-grid.vue.hbs

@@ -75,12 +75,12 @@ defineExpose({ name, state, newRow, remove, save, load, refresh, getData });
         </template>
         <template #headerCell="{title, column}">
           {{#each ctrl.psDEGridColumns as | column |}}
-          {{>(lookup 'COLUMNHEADER') item=column ctrl=ctrl}}
+          {{> @macro/front-end/widgets/grid-detail/include-grid.hbs type="COLUMNHEADER" item=column}}
           {{/each}}
         </template>
         <template #bodyCell="{ column, text, record, index }">
           {{#each ctrl.psDEGridColumns as | column |}}
-          {{>(lookup 'COLUMN') item=column ctrl=ctrl}}
+          {{> @macro/front-end/widgets/grid-detail/include-grid.hbs type="COLUMN" item=column}}
           {{/each}}
         </template>
         {{#neq ctrl.aggMode 'NONE'}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@SEARCHFORM}}-search-form/{{ctrls@SEARCHFORM}}-search-form-state.ts.hbs

-{{>@macro/front-end/widgets/form-detail/include-form.hbs}}
 import { ControlVOBase, EditFormService } from '@core';
 import { {{pascalCase ctrl.psAppDataEntity.codeName}}Service } from '@api/{{spinalCase ctrl.psAppDataEntity.codeName}}/{{spinalCase ctrl.psAppDataEntity.codeName}}-service';
 
@@ -60,7 +59,7 @@ export const ctrlState = {
   detailsModel: {
   {{#if ctrl.psDEFormPages}}
     {{#each ctrl.psDEFormPages as | FormPage | }}
-      {{>(lookup 'FORMDETAILSMODEL') formDetail=FormPage}}
+      {{> @macro/front-end/widgets/form-detail/include-form.hbs type="FORMDETAILSMODEL" item=FormPage}}
     {{/each}}
   {{/if}}
   },

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@SEARCHFORM}}-search-form/{{ctrls@SEARCHFORM}}-search-form.vue.hbs

-{{>@macro/front-end/widgets/form-detail/include-form.hbs}}
 <script setup lang="ts">
 import { Subject } from 'rxjs';
 import { SaveOutlined, CloseOutlined } from '@ant-design/icons-vue';
@@ -43,13 +42,13 @@ const { state, onEditorEvent, onComponentEvent, onSearch, loadDraft, onSaveHisto
         <a-row>
         {{#each ctrl.psDEFormPages as | ctrlPage | }}
           {{#each ctrlPage.psDEFormDetails as | formDetail | }}
-          {{>(lookup . 'formDetail.detailType') item=formDetail}}
+          {{> @macro/front-end/widgets/form-detail/include-form.hbs type=formDetail.detailType item=formDetail}}
           {{/each }}
         {{/each}}
       {{else}}
       <a-tabs class="app-form-page">
         {{#each ctrl.psDEFormPages as | ctrlPage | }}
-        {{>(lookup . 'ctrlPage.detailType') item=ctrlPage }}
+        {{> @macro/front-end/widgets/form-detail/include-form.hbs type=ctrlPage.detailType item=ctrlPage}}
         {{/each}}
       </a-tabs>
       {{/if}}