update: 更新

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

+{{#each items as | formDetail |}}
+{
+  caption: '{{formDetail.caption}}',
+  codeName: '{{formDetail.codeName}}',
+  name: '{{formDetail.name}}',
+  {{#if (eq formDetail.detailType "FORMITEM")}}
+  dataType: '{{formDetail.dataType}}',
+  detailStyle: '{{formDetail.detailStyle}}',
+  resetItemName: '{{formDetail.resetItemName}}',
+  valueItemName: '{{formDetail.valueItemName}}',
+  {{/if}}
+},
+{{#if formDetail.psDEFormDetails}}
+{{>(lookup 'FORMDETAILSMODEL') items=formDetail.psDEFormDetails}}
+{{/if}}
+{{/each}}

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

 {{#*inline "FORMPAGE"}}{{>@macro/form-detail/form-page.hbs}}{{/inline}}
 {{#*inline "GROUPPANEL"}}{{>@macro/form-detail/form-group.hbs}}{{/inline}}
-{{#*inline "FORMITEM"}}{{>@macro/form-detail/form-item.hbs}}{{/inline}}
+{{#*inline "FORMITEM"}}{{>@macro/form-detail/form-item.hbs}}{{/inline}}
\ No newline at end of file
+{{#*inline "FORMDETAILSMODEL"}}{{>@macro/form-detail/form-details-model.hbs}}{{/inline}}
\ No newline at end of file

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

@@ -28,12 +28,31 @@ export class FormControl extends MainControl {
    */
   public formDataChange(name: string, value: any) {
     this.controlState.data[name] = value;
-    // TODO 重置项逻辑
+    this.resetFormData(name);
     // TODO 表单项更新
     // TODO 动态控制逻辑
     // TODO 自动保存（可以单独做一个逻辑块，监听data的变化）
   }
 
+  /**
+   * @description 表单项重置
+   * @param {string} name
+   * @memberof FormControl
+   */
+  public resetFormData(name: string) {
+    const formItems: any[] = this.controlState.itemsModel;
+    if (formItems && formItems.length > 0) {
+      for (const item of formItems) {
+          if (item.resetItemName && item.resetItemName == name) {
+              this.formDataChange( item.name, null);
+              if (item.valueItemName) {
+                  this.formDataChange(item.valueItemName, null);
+              }
+          }
+      }
+  }
+  }
+
   /**
    * 在表单执行某些行为能力后，表单整体数据发生改变后被调用。会依次执行以下逻辑：
    * 1.
@@ -301,17 +320,12 @@ export class FormControl extends MainControl {
     const { load } = this.useLoad(props);
     const { save } = this.useSave(props);
 
-    const handleEditorEvent = this.handleEditorEvent.bind(this);
-    this.handleEditorEvent = (actionParam: IActionParam) => {
-      handleEditorEvent(actionParam);
-    };
-
     return {
       ...superParams,
       state: this.controlState,
       load,
       save,
-      handleEditorEvent: this.handleEditorEvent,
+      handleEditorEvent: this.handleEditorEvent.bind(this),
     };
   }
 }

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

+{{>@macro/form-detail/include-form.hbs}}
 import { ControlVOBase, verifyRules } from '@ibiz-core';
 import { ControlService } from './{{spinalCase ctrl.codeName}}-form-service';
 
@@ -6,6 +7,11 @@ export const CtrlConfig = {
   controlName: '{{ctrl.name}}',
   controlService: new ControlService(),
   data: {},
+  itemsModel: [
+    {{#each ctrl.psDEFormPages as | FormPage | }}
+    {{>(lookup 'FORMDETAILSMODEL') items=FormPage.psDEFormDetails}}
+    {{/each}}
+  ],
   rules: {
     {{#each ctrl.psDEFormEditItemVRs as | ruleItem |}}
     {{#neq ruleItem 2}}
@@ -14,20 +20,20 @@ export const CtrlConfig = {
       {{#each ruleItem.psDEFVRGroupCondition as | condition |}}
       {trigger: ['change', 'blur'],
       validator: (_rule: RuleObject, value: string) => verifyRules(_rule,value,{
-        {{#condition.condType}}'Type': {{condition.condType}},{{/condition.condType}}
-        {{#condition.name}}'name': {{condition.name}},{{/condition.name}}
-        {{#condition.maxValue}}'maxValue': {{condition.maxValue}},{{/condition.maxValue}}
-        {{#condition.minValue}}'minValue': {{condition.minValue}},{{/condition.minValue}}
-        {{#condition.ruleInfo}}'ruleInfo': {{condition.ruleInfo}},{{/condition.ruleInfo}}
-        {{#condition.includeMaxValue}}'includeMaxValue': {{condition.includeMaxValue}},{{/condition.includeMaxValue}}
-        {{#condition.includeMinValue}}'includeMinValue': {{condition.includeMinValue}},{{/condition.includeMinValue}}
+        {{#condition.condType}}type: {{condition.condType}},{{/condition.condType}}
+        {{#condition.name}}name: {{condition.name}},{{/condition.name}}
+        {{#condition.maxValue}}maxValue: {{condition.maxValue}},{{/condition.maxValue}}
+        {{#condition.minValue}}minValue: {{condition.minValue}},{{/condition.minValue}}
+        {{#condition.ruleInfo}}ruleInfo: {{condition.ruleInfo}},{{/condition.ruleInfo}}
+        {{#condition.includeMaxValue}}includeMaxValue: {{condition.includeMaxValue}},{{/condition.includeMaxValue}}
+        {{#condition.includeMinValue}}includeMinValue: {{condition.includeMinValue}},{{/condition.includeMinValue}}
       }) }
       {{/each}}
       ]
       {{/if}}
     {{/neq}}
     {{/each}}
-  }
+  },
 };
 
 /**