Merge remote-tracking branch 'origin/master'

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

@@ -139,7 +139,7 @@ public class CodegenConfig {
         }
         else {
             String path=file.getPath().replace("\\","/");
-            templateDefinitions.add(new TemplateDefinition(Paths.get("/",path.replace(this.getTemplateDir(),"")).toString()));
+            templateDefinitions.add(new TemplateDefinition(path.replace(this.getTemplateDir(),"").toString()));
         }
     }
 

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/components/form-group.hbs

-这里是表单分组子模板 输出{{item.codeName}}-{{item.caption}}
-
-    {{#each item.psDEFormDetails as | detail | }}
-          加载表单分组 {{item.codeName}}-{{item.caption}} 的 第 {{@index}} 个组件 {{detail.detailType}} {{detail.codeName}}
-          {{>(lookup . 'detail.detailType') item=detail}}
-
-    
-    {{/each}}
\ No newline at end of file
+{{#eq item.pSLayoutPos 'FLEX'}}
+<div style="flex-grow: {{#if item.pSLayoutPos.grow}}{{item.pSLayoutPos.grow}}{{else}}0{{/if}};">
+  <AppFormGroup name="{{item.codeName}}" title="{{item.caption}}">
+  {{#each item.psDEFormDetails as | formDetail | }}   
+  {{>(lookup . 'formDetail.detailType') item=formDetail}}
+  {{/each}}
+  </AppFormGroup>
+</div>
+{{else}}
+<!-- 栅格样式需要方法计算" -->
+<a-col :span="24">
+  <AppFormGroup name="{{item.codeName}}" title="{{item.caption}}">
+  {{#each item.psDEFormDetails as | formDetail | }}   
+  {{>(lookup . 'formDetail.detailType') item=formDetail}}
+  {{/each}}
+  </AppFormGroup>
+</a-col>
+{{/eq}}
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/components/form-item.hbs

-这里是表单项的子模板 输出 {{item.codeName}}-{{item.caption}}
-
+{{#eq item.pSLayoutPos 'FLEX'}}
+<div style="flex-grow: {{#if item.pSLayoutPos.grow}}{{item.pSLayoutPos.grow}}{{else}}0{{/if}};">
+  <AppFormItem name="{{item.codeName}}" label="{{item.caption}}">
     {{#if item.psEditor}}
-    开始加载表单项 {{item.codeName}}--{{item.caption}} 的 编辑器 {{item.psEditor.editorType}}
     {{>(lookup . 'item.psEditor.editorType') item=item}}
-
-    
-    {{/if}}
\ No newline at end of file
+    {{/if}}
+  </AppFormItem>
+</div>
+{{else}}
+<!-- 栅格样式需要方法计算" -->
+<a-col :span="24">
+  <AppFormItem name="{{item.codeName}}" label="{{item.caption}}">
+    {{#if item.psEditor}}
+    {{>(lookup . 'item.psEditor.editorType') item=item}}
+    {{/if}}
+  </AppFormItem>
+</a-col>
+{{/eq}}
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/components/form-page.hbs

-这里是表单分页子模板，输出{{formPage.codeName}}-{{formPage.caption}}
 
-    {{#each formPage.psDEFormDetails as | formPageDetail |}}
-    {{secNo}}.{{@index}}. {{formPageDetail.detailType}} {{formPageDetail.codeName}}
-    {{>(lookup . 'formPageDetail.detailType') item=formPageDetail}}
-
-
-    {{/each}}
\ No newline at end of file
+<a-tab-pane key="{{formPage.codeName}}" tab="{{formPage.caption}}">
+  {{#eq formPage.pSLayout.layout "FLEX"}}
+  <div class="app-form-layout-flex" style="{{#if formPage.pSLayout.dir}}flex-direction: {{formPage.pSLayout.dir}};{{/if}}{{#if formPage.pSLayout.align}}justify-content: {{formPage.pSLayout.align}};{{/if}}{{#if formPage.pSLayout.vAlign}}align-items: {{formPage.pSLayout.vAlign}};{{/if}}">
+    {{#each formPage.psDEFormDetails as | formDetail |}}
+    {{>(lookup . 'formDetail.detailType') item=formDetail}}
+    {{/each}}
+  </div>
+  {{else}}
+  <a-row>
+    {{#each formPage.psDEFormDetails as | formDetail |}}
+    {{>(lookup . 'formDetail.detailType') item=formDetail}}
+    {{/each}}
+  </a-row>
+  {{/eq}}
+</a-tab-pane>
\ No newline at end of file

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

 {{!引用子模板注册器 include}}
 {{>@macro/components/include-ctrls.hbs}}
 
-{{ctrl.name}}
-
-{{#each ctrl.psDEFormPages as | ctrlPart | }}
-{{@index}}.表单分页{{ctrlPart.codeName}}-{{ctrlPart.caption}}
-{{>(lookup . 'ctrlPart.detailType') formPage=ctrlPart secNo=@index}}
-{{/each}}
-
-这里是部件所属应用实体的代码名称{{ctrl.appEntity.codeName}}
\ No newline at end of file
+<template>
+  <a-form 
+    name="{{ctrl.codeName}}" 
+    class="app-form{{#if ctrl.pSSysCss}} {{ctrl.pSSysCss.cssName}}{{/if}}{{#if ctrl.infoFormMode}} info-form-mode{{/if}}"
+    style="{{#if ctrl.formWidth}}width: {{ctrl.formWidth}}px;{{/if}}"
+    :model="data" 
+    :rules="rules">
+    {{#if ctrl.noTabHeader}}
+      {{#each ctrl.psDEFormPages as | ctrlPage | }}
+        {{#each ctrlPage.pSDEFormDetails as | formDetail | }}
+        {{>(lookup . 'formDetail.detailType') item=formDetail}}
+        {{/each }}
+      {{/each}}
+    {{else}}
+      <a-tabs class="app-form-page">
+        {{#each ctrl.psDEFormPages as | ctrlPage | }}
+        {{>(lookup . 'ctrlPage.detailType') formPage=ctrlPage }}
+        {{/each}}
+      </a-tabs>
+    {{/if}}
+  </a-form>
+</template>
\ No newline at end of file