update：更新表格

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

@@ -33,32 +33,33 @@
   {{/if}}
   {{/eq}}
   {{#if item.enableRowEdit}}
-  {{#each ctrl.psDEGridEditItems as | editColumn | }}
+{{#each ctrl.psDEGridEditItems as | editColumn | }}
   {{#if (eq editColumn.codeName item.codeName)}}
-  {{#if editColumn.resetItemName}}
+    {{#if editColumn.resetItemName}}
   resetItemName: "{{editColumn.resetItemName}}",
-  {{/if}}
-  {{#if editColumn.valueItemName}}
+    {{/if}}
+    {{#if editColumn.valueItemName}}
   valueItemName: "{{editColumn.valueItemName}}",
-  {{/if}}
-  {{#each ctrl.psDEGridEditItemUpdates as | updateItem | }}
-  {{#if (eq updateItem.codeName editColumn.codeName)}}
+    {{/if}}
+    {{!-- TODO编辑项模型存在问题 --}}
+    {{!-- {{#if editColumn.psDEGridEditItemUpdate}}
+      {{#with editColumn.psDEGridEditItemUpdate as | updateItem |}}
   updateItem: {
     name: "{{updateItem.name}}",
-    codeName: "{{updateItem.codeName}}", 
-    {{#if updateItem.customCode}}
+    codeName: "{{updateItem.codeName}}",
+        {{#if updateItem.customCode}}
     customCode: {{updateItem.customCode}},
     scriptCode: `{{updateItem.scriptCode}}`,
-    {{else}}
+        {{else}}
     showBusyIndicator: {{updateItem.showBusyIndicator}},
-    appDEMethod: "{{updateItem.psAppDEMethod.id}}",
+    appDEMethod: "{{updateItem.psAppDEMethod.codeName}}",
     updateDetails: [{{#each updateItem.psDEGEIUpdateDetails as | updateDetails | }}"{{updateDetails.name}}",{{/each}}],
-    {{/if}}
+        {{/if}}
   },
+      {{/with}}
+    {{/if}} --}}
   {{/if}}
-  {{/each}}
-  {{/if}}
-  {{/each}}
+{{/each}}
   {{/if}}
 },
 {{/unless}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@GRID}}-grid/{{ctrls@GRID}}-grid-state.ts.hbs

@@ -36,8 +36,8 @@ export const ctrlState = {
     {
       createDV: "{{editItem.createDV}}",
       createDVT: "{{editItem.createDVT}}",
-      {{#if editItem.psAppDEField}}
-      property: "{{lowerCase editItem.psAppDEField.codeName}}",
+      {{#if editItem.dataItemName}}
+      property: "{{lowerCase editItem.dataItemName}}",
       {{else}}
       property: "{{lowerCase editItem.codeName}}",
       {{/if}}
@@ -152,8 +152,8 @@ export const ctrlState = {
     {
       updateDV: "{{editItem.updateDV}}",
       updateDVT: "{{editItem.updateDVT}}",
-      {{#if editItem.psAppDEField}}
-      property: "{{lowerCase editItem.psAppDEField.codeName}}",
+      {{#if editItem.dataItemName}}
+      property: "{{lowerCase editItem.dataItemName}}",
       {{else}}
       property: "{{lowerCase editItem.codeName}}",
       {{/if}}
@@ -203,11 +203,11 @@ export const ctrlState = {
           {{#eq editItem.codeName ruleItem.psDEGridEditItemName}}
       {
         validator: async (rule: any, value: any, callback: any, source: any) => {
-          if (!source || isEmpty(source['{{#if editItem.valueItemName}}{{editItem.valueItemName}}{{else}}{{ruleItem.psDEGridEditItemName}}{{/if}}'])) {
+          if (!source || isEmpty(source['{{#if editItem.valueItemName}}{{editItem.valueItemName}}{{else if editItem.dataItemName}}{{editItem.dataItemName}}{{else}}{{ruleItem.psDEGridEditItemName}}{{/if}}'])) {
             return Promise.resolve();
           }
           const { isPast, infoMessage } = Verify.verifyDeRules(
-            '{{#if editItem.valueItemName}}{{editItem.valueItemName}}{{else}}{{ruleItem.psDEGridEditItemName}}{{/if}}',
+            '{{#if editItem.valueItemName}}{{editItem.valueItemName}}{{else if editItem.dataItemName}}{{editItem.dataItemName}}{{else}}{{ruleItem.psDEGridEditItemName}}{{/if}}',
             source,
             {{> @macro/front-end/common/derules.hbs item=ruleItem.psDEFValueRule.getPSDEFVRGroupCondition}}
           );