update：更新

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

@@ -3,16 +3,16 @@
   <a-button 
     type="primary"
     v-show="state.detailsModel.{{item.codeName}}.visible"
-    class="app-form-button{{#if item.psSysCss}}{{item.psSysCss.cssName}}{{/if}}"
+    class="app-form-button{{#if item.psSysCss}} {{item.psSysCss.cssName}}{{/if}}"
     style="{{#if item.width}}width: {{item.width}}px;{{/if}}{{#if item.height}}height: {{item.height}}px;{{/if}}">
-    {{#if item.psSysImage}}
-    <template #icon>
-      <AppIconText {{#if item.psSysImage.cssClass}}:iconClass="{{item.psSysImage.cssClass}}"{{/if}} {{#if item.psSysImage.imagePath}}:imgPath="{{item.psSysImage.imagePath}}"{{/if}}/>
-    </template>
-    {{/if}}
-    {{#if item.showCaption}}
-    {{item.caption}}
-    {{/if}}
+      {{#if item.psSysImage}}
+      <template #icon>
+        <AppIconText {{#if item.psSysImage.cssClass}}:iconClass="{{item.psSysImage.cssClass}}"{{/if}} {{#if item.psSysImage.imagePath}}:imgPath="{{item.psSysImage.imagePath}}"{{/if}}/>
+      </template>
+      {{/if}}
+      {{#if item.showCaption}}
+      <span {{#if item.labelPSSysCss}}class="{{item.labelPSSysCss.cssName}}"{{/if}}>{{item.caption}}</span>
+      {{/if}}
   </a-button>
 </div>
 {{else}}
@@ -21,16 +21,16 @@
   <a-button 
     type="primary"
     v-show="state.detailsModel.{{item.codeName}}.visible"
-    class="app-form-button{{#if item.psSysCss}}{{item.psSysCss.cssName}}{{/if}}"
+    class="app-form-button{{#if item.psSysCss}} {{item.psSysCss.cssName}}{{/if}}"
     style="{{#if item.width}}width: {{item.width}}px;{{/if}}{{#if item.height}}height: {{item.height}}px;{{/if}}">
-    {{#if item.psSysImage}}
-    <template #icon>
-      <AppIconText {{#if item.psSysImage.cssClass}}:iconClass="{{item.psSysImage.cssClass}}"{{/if}} {{#if item.psSysImage.imagePath}}:imgPath="{{item.psSysImage.imagePath}}"{{/if}}/>
-    </template>
-    {{/if}}
-    {{#if item.showCaption}}
-    {{item.caption}}
-    {{/if}}
+      {{#if item.psSysImage}}
+      <template #icon>
+        <AppIconText {{#if item.psSysImage.cssClass}}:iconClass="{{item.psSysImage.cssClass}}"{{/if}} {{#if item.psSysImage.imagePath}}:imgPath="{{item.psSysImage.imagePath}}"{{/if}}/>
+      </template>
+      {{/if}}
+      {{#if item.showCaption}}
+      <span {{#if item.labelPSSysCss}}class="{{item.labelPSSysCss.cssName}}"{{/if}}>{{item.caption}}</span>
+      {{/if}}
   </a-button>
 </a-col>
 {{/eq}}
\ No newline at end of file

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

@@ -3,6 +3,7 @@
   <AppFormDruipart 
     v-show="state.detailsModel.{{item.codeName}}.visible" 
     {{#if item.psSysCss}}class="{{item.psSysCss.cssName}}"{{/if}}
+    style="{{#if item.width}}width: {{item.width}}px;{{/if}}{{#if item.height}}height: {{item.height}}px{{/if}}"
     name="{{item.codeName}}" 
     title="{{item.caption}}" 
     :context="context"
@@ -27,6 +28,7 @@
   <AppFormDruipart 
     v-show="state.detailsModel.{{item.codeName}}.visible" 
     {{#if item.psSysCss}}class="{{item.psSysCss.cssName}}"{{/if}}
+    style="{{#if item.width}}width: {{item.width}}px;{{/if}}{{#if item.height}}height: {{item.height}}px{{/if}}"
     name="{{item.codeName}}" 
     title="{{item.caption}}" 
     :context="context"

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

@@ -4,10 +4,16 @@
     v-show="state.detailsModel.{{item.codeName}}.visible" 
     name="{{item.codeName}}" 
     title="{{item.caption}}"
+    {{#if item.psSysCss}}
+    class="{{item.psSysCss.cssName}}"
+    {{/if}}
+    style="{{#if item.width}}width: {{item.width}}px;{{/if}}{{#if item.height}}height: {{item.height}}px{{/if}}"
     {{#if item.psSysImage}}
     {{#if item.psSysImage.imagePath}}imgPath="{{item.psSysImage.imagePath}}"{{else if item.psSysImage.cssClass}}iconClass="{{item.psSysImage.cssClass}}"{{/if}}
     {{/if}}
+    {{#if item.labelPSSysCss}}
     titleStyle="{{item.labelPSSysCss.cssName}}"
+    {{/if}}
     :infoGroupMode="{{item.infoGroupMode}}"
     :titleBarCloseMode="{{item.titleBarCloseMode}}"
     :showCaption="{{item.showCaption}}"
@@ -38,10 +44,13 @@
     {{#if item.psSysCss}}
     class="{{item.psSysCss.cssName}}"
     {{/if}}
+    style="{{#if item.width}}width: {{item.width}}px;{{/if}}{{#if item.height}}height: {{item.height}}px{{/if}}"
     {{#if item.psSysImage}}
     {{#if item.psSysImage.imagePath}}imgPath="{{item.psSysImage.imagePath}}"{{else if item.psSysImage.cssClass}}iconClass="{{item.psSysImage.cssClass}}"{{/if}}
     {{/if}}
+    {{#if item.labelPSSysCss}}
     titleStyle="{{item.labelPSSysCss.cssName}}"
+    {{/if}}
     :infoGroupMode="{{item.infoGroupMode}}"
     :titleBarCloseMode="{{item.titleBarCloseMode}}"
     :showCaption="{{item.showCaption}}"

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}}
 {{#eq item.psLayoutPos 'FLEX'}}
 <div style="flex-grow: {{#if item.psLayoutPos.grow}}{{item.psLayoutPos.grow}}{{else}}0{{/if}};">
-  <AppFormItem v-show="state.detailsModel.{{item.codeName}}.visible" {{#if item.psSysCss}}class="{{item.psSysCss.cssName}}"{{/if}} name="{{item.codeName}}" :rules="state.rules.{{item.codeName}}" :labelWidth="{{item.labelWidth}}" label="{{item.caption}}">
-    {{#if item.psEditor}}
-    {{>(lookup . 'item.psEditor.editorType') item=item ctrlType="form"}}
+  <AppFormItem 
+    v-show="state.detailsModel.{{item.codeName}}.visible" 
+    {{#if item.psSysCss}}
+    class="{{item.psSysCss.cssName}}"
     {{/if}}
+    {{#if item.labelPSSysCss}}
+    titleStyle="{{item.labelPSSysCss.cssName}}"
+    {{/if}}
+    name="{{item.codeName}}"
+    :rules="state.rules.{{item.codeName}}"
+    :labelWidth="{{item.labelWidth}}"
+    :required="state.detailsModel.{{item.codeName}}.required"
+    label="{{item.caption}}"
+    style="{{#if item.width}}width: {{item.width}}px;{{/if}}{{#if item.height}}height: {{item.height}}px{{/if}}">
+      {{#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"}}
+      </div>
+      {{/if}}
   </AppFormItem>
 </div>
 {{else}}
 <a-col
 {{> @macro/front-end/widgets/common/layout-pos.hbs item=item.psLayoutPos}} >
-  <AppFormItem v-show="state.detailsModel.{{item.codeName}}.visible" {{#if item.psSysCss}}class="{{item.psSysCss.cssName}}"{{/if}} name="{{item.codeName}}" :rules="state.rules.{{item.codeName}}" :labelWidth="{{item.labelWidth}}" :required="state.detailsModel.{{item.codeName}}.required" label="{{item.caption}}">
-    {{#if item.psEditor}}
-    {{>(lookup . 'item.psEditor.editorType') item=item ctrlType="form"}}
+  <AppFormItem 
+    v-show="state.detailsModel.{{item.codeName}}.visible"
+    {{#if item.psSysCss}}
+    class="{{item.psSysCss.cssName}}"
+    {{/if}}
+    {{#if item.labelPSSysCss}}
+    titleStyle="{{item.labelPSSysCss.cssName}}"
     {{/if}}
+    name="{{item.codeName}}"
+    :rules="state.rules.{{item.codeName}}"
+    :labelWidth="{{item.labelWidth}}"
+    :required="state.detailsModel.{{item.codeName}}.required"
+    label="{{item.caption}}"
+    style="{{#if item.width}}width: {{item.width}}px;{{/if}}{{#if item.height}}height: {{item.height}}px{{/if}}">
+      {{#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"}}
+      </div>
+      {{/if}}
   </AppFormItem>
 </a-col>
 {{/eq}}
\ No newline at end of file

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

@@ -20,5 +20,5 @@
     contentType="{{item.contentType}}"
     style="{{#if item.rawItemHeight}}height: {{item.rawItemHeight}}px;{{/if}}{{#if item.rawItemWidth}}width: {{item.rawItemWidth}}px{{/if}}"
     {{#if (eq item.contentType 'RAW')}}value="{{item.rawContent}}"{{else if (eq item.contentType 'HTML')}}:value="`{{item.htmlContent}}`"{{/if}}/>
-  </a-col>
+</a-col>
 {{/eq}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/components/render/app-form-group.vue

@@ -39,7 +39,7 @@ const handleMenuGroupAction = ($event: IParam) => {
     :headStyle="titleStyle"
     :bordered="false">
     <template v-if="showCaption" #title>
-      <p :class="['app-form-group-title', `${titleStyle}`]">
+      <p class="app-form-group-title">
         <AppIconText :iconClass="iconClass" :imgPath="imgPath" :text="title"/>
       </p>
     </template>

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/components/render/app-form-item.vue

@@ -3,11 +3,12 @@ import { IActionParam } from '@core';
 
 interface FormGroupProps {
   name: string;
-  error?: string;
   label: string;
   required: boolean;
-  rules?: any;
   labelWidth: number;
+  rules?: any;
+  error?: string;
+  titleStyle?: string;
 }
 interface FormGroupEmit {
   (name: 'componentEvent', value: IActionParam): void;
@@ -44,7 +45,7 @@ const initRules = () => {
     :validateStatus="error ? 'error' : 'validating'"
   >
     <template #label>
-      <label :style="{ width: labelWidth + 'px' }">\{{ label }}</label>
+      <label :style="{ width: labelWidth + 'px' }" :class="titleStyle">\{{ label }}</label>
     </template>
     <slot></slot>
   </a-form-item>