update: 更新

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

 <IbizAutoComplete
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
   :data="state.data"
 {{#if item.valueItemName}}
   valueItem="{{item.valueItemName}}"
@@ -39,4 +38,12 @@
 {{#eq item.psEditor.editorType "AC_FS_NOBUTTON"}}
   :showButton="false"
 {{/eq}}
-  @editorEvent="handleEditorEvent"/>
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/>

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

 <IbizCheckboxList
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
   :data="state.data"
 {{#if item.psEditor.disabled}}
   :disabled="{{item.psEditor.disabled}}"
@@ -21,4 +20,12 @@
 {{/if}}
   :contextProp="state.context"
   :viewParamsProp="state.viewParams"
-  @editorEvent="handleEditorEvent"/>  
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 

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

 <IbizCheckbox
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
 {{#if item.psEditor.disabled}}
   :disabled="{{item.psEditor.disabled}}"
 {{/if}}
 {{#if item.psEditor.isReadOnly}}
   :readonly="{{item.psEditor.isReadOnly}}"
 {{/if}}
-  @editorEvent="handleEditorEvent"/>  
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 

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

 <IbizDataPickerView
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
   :data="state.data"
 {{#if item.valueItemName}}
   valueItem="{{item.valueItemName}}"
@@ -25,4 +24,12 @@
 {{#if item.psEditor.pickUpData}}
   pickUpData="{{item.psEditor.pickUpData}}"
 {{/if}}
-  @editorEvent="handleEditorEvent"/>
\ No newline at end of file
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 
\ No newline at end of file

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

 <IbizDataPicker
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
   :data="state.data"
 {{#if item.valueItemName}}
   valueItem="{{item.valueItemName}}"
@@ -48,4 +47,12 @@
 {{#if (or (eq item.psEditor.editorType "ADDRESSPICKUP")  (eq item.psEditor.editorType "ADDRESSPICKUP_AC"))}}
   :multiple="true"
 {{/if}}
-  @editorEvent="handleEditorEvent"/>
\ No newline at end of file
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 
\ No newline at end of file

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

 <IbizDatePicker
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
 {{#if item.psEditor.placeHolder}}
   placeholder="{{item.psEditor.placeHolder}}"
 {{/if}}
@@ -46,4 +45,12 @@
   dateFormat="YYYY-MM-DD HH:mm"
   dateType="dateTime"
 {{/eq}}
-  @editorEvent="handleEditorEvent"/>
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 

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

 <IbizDropdownList
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
   :data="state.data"
 {{#if item.psEditor.codeList}}
   codeListTag="{{item.psEditor.codeList.codeListTag}}"
@@ -27,4 +26,12 @@
 {{/eq}}
   :contextProp="state.context"
   :viewParamsProp="state.viewParams"
-  @editorEvent="handleEditorEvent"/>
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 

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

 <IbizInputIp
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
 {{#if item.psEditor.disabled}}
   :disabled="{{item.psEditor.disabled}}"
 {{/if}}
 {{#if item.psEditor.readOnly}}
   :readonly="{{item.psEditor.readOnly}}"
 {{/if}}
-  @editorEvent="handleEditorEvent"/>
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 
     

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

 <IbizInput
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
 {{#if item.psEditor.placeHolder}}
   placeholder="{{item.psEditor.placeHolder}}"
 {{/if}}
@@ -37,5 +36,13 @@
 {{#eq item.psEditor.editorType "TEXTAREA"}}
   type="textarea"
 {{/eq}}
-  @editorEvent="handleEditorEvent"/>
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 
     

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

 <IbizRadioGroup
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
   :data="state.data"
 {{#if item.psEditor.codeList}}
   codeListTag="{{item.psEditor.codeList.codeListTag}}"
@@ -21,4 +20,12 @@
 {{/if}}
   :contextProp="state.context"
   :viewParamsProp="state.viewParams"
-  @editorEvent="handleEditorEvent"/>
\ No newline at end of file
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 
\ No newline at end of file

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

 <IbizRating
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
 {{#if item.psEditor.disabled}}
   :disabled="{{item.psEditor.disabled}}"
 {{/if}}
@@ -13,4 +12,12 @@
 {{#if item.psEditor.editorParams.allowHalf}}
   :allowHalf="{{item.psEditor.editorParams.allowHalf}}"
 {{/if}}
-  @editorEvent="handleEditorEvent"/>
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 

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

 <IbizRaw
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
   :date="state.data"
 {{#if item.psEditor.editorParams.contentType}}
   :contentType="{{item.psEditor.editorParams.contentType}}"
@@ -13,4 +12,12 @@
 {{/if}}
   :contextProp="state.context"
   :viewParamsProp="state.viewParams"
-  @editorEvent="handleEditorEvent"/>
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 

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

 <IbizSlider
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
   :date="state.data"
 {{#if item.psEditor.disabled}}
   :disabled="{{item.psEditor.disabled}}"
@@ -17,4 +16,12 @@
 {{#if item.psEditor.editorParams.max}}
   :max="{{item.psEditor.editorParams.max}}"
 {{/if}}
-  @editorEvent="handleEditorEvent"/>
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 

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

 <IbizSpan
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
 {{#if item.psEditor.codeList}}
   codeListTag="{{item.psEditor.codeList.codeListTag}}"
   codeListType="{{item.psEditor.codeList.codeListType}}"
@@ -23,5 +22,12 @@
 {{#if item.psEditor.psNavigateParams}}
   localParam="{{item.psEditor.psNavigateParams}}"
 {{/if}}
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+{{/if}}
+/> 
   :contextProp="state.context"
   :viewParamsProp="state.viewParams"/>

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

 <IbizStepper
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
 {{#if item.psEditor.disabled}}
   :disabled="{{item.psEditor.disabled}}"
 {{/if}}
@@ -19,4 +18,12 @@
 {{#if item.psEditor.editorParams.max}}
   :max="{{item.psEditor.editorParams.max}}"
 {{/if}}
-  @editorEvent="handleEditorEvent"/>
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 

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

 <IbizSwitch
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
 {{#if item.psEditor.disabled}}
   :disabled="{{item.psEditor.disabled}}"
 {{/if}}
@@ -10,4 +9,12 @@
 {{#if item.psEditor.editorParams.size}}
   size="{{item.psEditor.editorParams.size}}"
 {{/if}}
-  @editorEvent="handleEditorEvent"/>  
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 

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

 <IbizUpload
   name="{{item.codeName}}"
-  :value="state.data.{{item.psEditor.name}}"
 {{#if item.psEditor.editorParams.method}}
   method="{{item.psEditor.editorParams.method}}"
 {{/if}}
@@ -30,4 +29,12 @@
   accept='image/*'
   listType="picture-card"
 {{/eq}}
-  @editorEvent="handleEditorEvent"/>
+{{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
+  :value="state.data.{{item.psEditor.name}}"
+  @editorEvent="handleEditorEvent"
+{{/if}}
+{{#if ctrlType 'grid'}}
+  :value="record.{{item.psEditor.name}}"
+  @editorEvent="($event) => handleEditorEvent(index,$event)"
+{{/if}}
+/> 

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

@@ -11,7 +11,7 @@
 <a-col :span="24">
   <IbizFormItem name="{{item.codeName}}" label="{{item.caption}}">
     {{#if item.psEditor}}
-    {{>(lookup . 'item.psEditor.editorType') item=item controlType="form"}}
+    {{>(lookup . 'item.psEditor.editorType') item=item ctrlType="form"}}
     {{/if}}
   </IbizFormItem>
 </a-col>