update：动态控制

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

 <appAutoComplete
   name="{{item.codeName}}"
   :data="state.data"
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.valueItemName}}
   valueItem="{{item.valueItemName}}"
 {{/if}}

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

 <appCheckboxList
   name="{{item.codeName}}"
   :data="state.data"
-{{#if item.psEditor.disabled}}
-  :disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.isReadOnly}}
   :readonly="{{item.psEditor.isReadOnly}}"
 {{/if}}

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

 <appCheckbox
   name="{{item.codeName}}"
-{{#if item.psEditor.disabled}}
-  :disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.isReadOnly}}
   :readonly="{{item.psEditor.isReadOnly}}"
 {{/if}}

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

 <appCode
   name="{{item.codeName}}"
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.isReadOnly}}
   :readonly="{{item.psEditor.isReadOnly}}"
 {{/if}}

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

@@ -7,9 +7,9 @@
 {{#if item.psEditor.placeHolder}}
   placeholder="{{item.psEditor.placeHolder}}"
 {{/if}}
-{{#if item.psEditor.disabled}}
-  disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.psNavigateContexts}}
   localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}"
 {{/if}}

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

@@ -7,9 +7,9 @@
 {{#if item.psEditor.placeHolder}}
   placeholder="{{item.psEditor.placeHolder}}"
 {{/if}}
-{{#if item.psEditor.disabled}}
-  disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.psNavigateContexts}}
   localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}"
 {{/if}}

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

@@ -3,9 +3,9 @@
 {{#if item.psEditor.placeHolder}}
   placeholder="{{item.psEditor.placeHolder}}"
 {{/if}}
-{{#if item.psEditor.disabled}}
-  :disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.readOnly}}
   :readonly="{{item.psEditor.readOnly}}"
 {{/if}}

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

@@ -8,9 +8,9 @@
 {{#if item.psEditor.placeHolder}}
   placeholder="{{item.psEditor.placeHolder}}"
 {{/if}}
-{{#if item.psEditor.disabled}}
-  disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.editorParams.multiple}}
   :multiple="{{item.psEditor.editorParams.multiple}}"
 {{/if}}

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

 <appInputIp
   name="{{item.codeName}}"
-{{#if item.psEditor.disabled}}
-  :disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.readOnly}}
   :readonly="{{item.psEditor.readOnly}}"
 {{/if}}

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

 <appInput
   name="{{item.codeName}}"
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.placeHolder}}
   placeholder="{{item.psEditor.placeHolder}}"
 {{/if}}

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

@@ -17,9 +17,9 @@
 {{#if item.psEditor.editorParams.multiple}}
   :multiple="{{item.psEditor.editorParams.multiple}}"
 {{/if}}
-{{#if item.psEditor.disabled}}
-  :disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.isReadOnly}}
   :readonly="{{item.psEditor.isReadOnly}}"
 {{/if}}

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

@@ -6,9 +6,9 @@
   codeListType="{{item.psEditor.codeList.codeListType}}"
   valueSeparator="{{item.psEditor.codeList.valueSeparator}}"
 {{/if}}
-{{#if item.psEditor.disabled}}
-  disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.isReadOnly}}
   :readonly="{{item.psEditor.isReadOnly}}"
 {{/if}}

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

 <appRating
   name="{{item.codeName}}"
-{{#if item.psEditor.disabled}}
-  :disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.readOnly}}
   :readonly="{{item.psEditor.readOnly}}"
 {{/if}}

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

 <AppRaw
   name="{{item.codeName}}"
   :date="state.data"
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.editorParams.contentType}}
   :contentType="{{item.psEditor.editorParams.contentType}}"
 {{/if}}

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

 <appRichText
   name="{{item.codeName}}"
-{{#if item.psEditor.disabled}}
-  :disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.readOnly}}
   :readonly="{{item.psEditor.readOnly}}"
 {{/if}}

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

 <appSlider
   name="{{item.codeName}}"
   :date="state.data"
-{{#if item.psEditor.disabled}}
-  :disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.readOnly}}
   :readonly="{{item.psEditor.readOnly}}"
 {{/if}}

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

 <appSpan
   name="{{item.codeName}}"
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.codeList}}
   codeListTag="{{item.psEditor.codeList.codeListTag}}"
   codeListType="{{item.psEditor.codeList.codeListType}}"

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

 <appStepper
   name="{{item.codeName}}"
-{{#if item.psEditor.disabled}}
-  :disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.readOnly}}
   :readonly="{{item.psEditor.readOnly}}"
 {{/if}}

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

 <appSwitch
   name="{{item.codeName}}"
-{{#if item.psEditor.disabled}}
-  :disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.isReadOnly}}
   :readonly="{{item.psEditor.isReadOnly}}"
 {{/if}}

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

@@ -12,9 +12,9 @@
 {{#if item.psEditor.editorParams.tooltip}}
   tooltip="{{item.psEditor.editorParams.tooltip}}"
 {{/if}}
-{{#if item.psEditor.disabled}}
-  :disabled="{{item.psEditor.disabled}}"
-{{/if}}
+{{#eq ctrlType 'form'}}
+  :disabled="state.detailsModel.{{item.codeName}}.disabled"
+{{/eq}}
 {{#if item.psEditor.readOnly}}
   :readonly="{{item.psEditor.readOnly}}"
 {{/if}}

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

@@ -71,9 +71,9 @@
           logicCat: '{{groupLogic.logicCat}}',
           logicType: '{{groupLogic.logicType}}',
           notMode: '{{groupLogic.notMode}}',
-          Logics: [
+          logics: [
           {{#each groupLogic.psDEFDLogics as | logic |}}
-          {condOP: '{{logic.condOP}}',dEFDName: '{{logic.dEFDName}}',logicType: '{{logic.logicType}}',name: '{{logic.name}}'},
+          {condOP: '{{logic.condOP}}',dEFDName: '{{logic.dEFDName}}',logicType: '{{logic.logicType}}',name: '{{logic.name}}',value:'{{logic.value}}'},
           {{/each}}
           ],
         },

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

@@ -10,7 +10,7 @@
 {{else}}
 <a-col
 {{> @macro/front-end/widgets/common/layout-pos.hbs item=item.psLayoutPos}} >
-  <AppFormItem v-show="state.detailsModel.{{item.codeName}}.visible" name="{{item.codeName}}" label="{{item.caption}}">
+  <AppFormItem v-show="state.detailsModel.{{item.codeName}}.visible" name="{{item.codeName}}" :required="state.detailsModel.{{item.codeName}}.required" label="{{item.caption}}">
     {{#if item.psEditor}}
     {{>(lookup . 'item.psEditor.editorType') item=item ctrlType="form"}}
     {{/if}}

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

@@ -5,6 +5,7 @@ interface FormGroupProps{
   name: string;
   error?: string;
   label: string;
+  required:boolean;
 }
 interface FormGroupEmit{
   (name: 'componentEvent', value: IActionParam): void
@@ -15,7 +16,7 @@ const emit = defineEmits<FormGroupEmit>();
 </script>
 
 <template>
-  <a-form-item :name="name" :label="label" :help="error" :validateStatus="error ? 'error': 'validating'">
+  <a-form-item :name="name" :label="label" :help="error" :required="required" :validateStatus="error ? 'error': 'validating'">
     <slot></slot>
   </a-form-item>
 </template>

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/widgets/form-control/form-control.ts

@@ -50,7 +50,7 @@ export class FormControl extends MainControl {
       // 是否取反
       return logic.notMode ? !result : result;
     } else if (logic.logicType == 'SINGLE') {
-      return verifyValue(data[logic.name], logic.condOP, logic.value);
+      return verifyValue(data[logic.dEFDName], logic.condOP, logic.value);
     }
     return false;
   }