Merge remote-tracking branch 'origin/master'

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

-<appAutoComplete
+<AppAutoComplete
   name="{{item.codeName}}"
   :data="state.data"
 {{#eq ctrlType 'form'}}

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

-<appCheckboxList
+<AppCheckboxList
   name="{{item.codeName}}"
   :data="state.data"
 {{#eq ctrlType 'form'}}

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

-<appCheckbox
+<AppCheckbox
   name="{{item.codeName}}"
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"

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

-<appCode
+<AppCode
   name="{{item.codeName}}"
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"

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

-<appDataPickerView
+<AppDataPickerView
   name="{{item.codeName}}"
   :data="state.data"
 {{#if item.valueItemName}}

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

-<appDataPicker
+<AppDataPicker
   name="{{item.codeName}}"
   :data="state.data"
 {{#if item.valueItemName}}

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

-<appDatePicker
+<AppDatePicker
   name="{{item.codeName}}"
 {{#if item.psEditor.placeHolder}}
   placeholder="{{item.psEditor.placeHolder}}"

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

-<appDropdownList
+<AppDropdownList
   name="{{item.codeName}}"
 {{#if item.psEditor.psAppCodeList}}
   codeListTag="{{item.psEditor.psAppCodeList.codeListTag}}"

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

-<appInputIp
+<AppInputIp
   name="{{item.codeName}}"
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"

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

-<appInput
+<AppInput
   name="{{item.codeName}}"
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"

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

-<appListBox
+<AppListBox
   name="{{item.codeName}}"
   :data="state.data"
   :server="state.controlService"

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

-<appRadioGroup
+<AppRadioGroup
   name="{{item.codeName}}"
   :data="state.data"
 {{#if item.psEditor.psAppCodeList}}

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

-<appRating
+<AppRating
   name="{{item.codeName}}"
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"

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

-<appRichText
+<AppRichText
   name="{{item.codeName}}"
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"

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

-<appSlider
+<AppSlider
   name="{{item.codeName}}"
   :date="state.data"
 {{#eq ctrlType 'form'}}

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

-<appSpan
+<AppSpan
   name="{{item.codeName}}"
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"

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

-<appStepper
+<AppStepper
   name="{{item.codeName}}"
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"

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

-<appSwitch
+<AppSwitch
   name="{{item.codeName}}"
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"

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

-<appUpload
+<AppUpload
   name="{{item.codeName}}"
 {{#if item.psEditor.editorParams.method}}
   method="{{item.psEditor.editorParams.method}}"

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

-{{#each items as | formDetail |}}
     {{formDetail.codeName}}: {
       caption: '{{formDetail.caption}}',
       name: '{{formDetail.name}}',
@@ -82,6 +81,7 @@
       {{/if}}
     },
 {{#if formDetail.psDEFormDetails}}
-{{>(lookup 'FORMDETAILSMODEL') items=formDetail.psDEFormDetails}}
-{{/if}}
-{{/each}}
+  {{#each formDetail.psDEFormDetails as | tempDetail |}}
+    {{>(lookup 'FORMDETAILSMODEL') formDetail=tempDetail}}
+  {{/each}}
+{{/if}}
\ 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

@@ -50,7 +50,7 @@ const { state, grid, onCtrlEvent, onToolbarEvent, onQuickGroupEvent, onQuickSear
     </template>
     {{#if page.enableQuickGroup}}
     <template v-slot:quickGroupSearch>
-      <app-quick-group v-if="state.enableQuickGroup" :quickGroupModel="state.quickGroupPSCodeList" @onQuickGroupEvent="onQuickGroupEvent" />
+      <AppQuickGroup v-if="state.enableQuickGroup" :quickGroupModel="state.quickGroupPSCodeList" @onQuickGroupEvent="onQuickGroupEvent" />
     </template>
     {{/if}}
     {{#page.ctrls}}

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

@@ -63,7 +63,7 @@ export const ctrlState = {
   enableAutoSave: {{ctrl.enableAutoSave}},
   detailsModel: {
     {{#each ctrl.psDEFormPages as | FormPage | }}
-    {{>(lookup 'FORMDETAILSMODEL') items=FormPage.psDEFormDetails}}
+      {{>(lookup 'FORMDETAILSMODEL') formDetail=FormPage}}
     {{/each}}
   },
   actionModel: {

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

@@ -28,7 +28,7 @@ defineExpose({ state, name: '{{ctrl.name}}' });
 </script>
 <template>
 <div class="search-bar{{#if ctrl.psSysCss}} {{ctrl.psSysCss.cssName}}{{/if}}">
-  <app-filter-tree :datas="state.filterItems" :fields="state.filterFields"/>
+  <AppFilterTree :datas="state.filterItems" :fields="state.filterFields"/>
 </div>
 </template>
 <style lang="scss">

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

@@ -59,7 +59,7 @@ export const ctrlState = {
   historyItems: [],
   detailsModel: {
     {{#each ctrl.psDEFormPages as | FormPage | }}
-    {{>(lookup 'FORMDETAILSMODEL') items=FormPage.psDEFormDetails}}
+      {{>(lookup 'FORMDETAILSMODEL') formDetail=FormPage}}
     {{/each}}
   },
   rules: {