update：更新

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

 {{#each items as | formDetail |}}
-    {
+    {{formDetail.codeName}}: {
       caption: '{{formDetail.caption}}',
-      codeName: '{{formDetail.codeName}}',
       name: '{{formDetail.name}}',
+      disabled: false, 
+      visible: true,
+      detailStyle: '{{formDetail.detailStyle}}',
+      detailType: '{{formDetail.detailType}}',
+      showCaption: {{#if formDetail.showCaption}}true{{else}}false{{/if}},
       {{#if (eq formDetail.detailType "FORMITEM")}}
       dataType: '{{formDetail.dataType}}',
-      detailStyle: '{{formDetail.detailStyle}}',
-      {{#formDetail.resetItemName}}
+      {{#if formDetail.resetItemName}}
       resetItemName: '{{formDetail.resetItemName}}',
-      {{/formDetail.resetItemName}}
-      {{#formDetail.valueItemName}}
+      {{/if}}
+      {{#if formDetail.valueItemName}}
       valueItemName: '{{formDetail.valueItemName}}',
-      {{/formDetail.valueItemName}}
+      {{/if}}
+      {{/if}}
+      {{#if (and (eq formDetail.detailType "BUTTON") formDetail.psUIAction)}}
+      {{#formDetail.psUIAction}}
+      uIAction: {
+        uIActionType: '{{uIActionType}}',
+        uIActionTag: '{{uIActionTag}}',
+      }
+      {{/formDetail.psUIAction}}
+      {{/if}}
+      {{#if (eq formDetail.detailType "GROUPPANEL")}}
+      
+      {{/if}}
       {{#each formDetail.psDEFDGroupLogics as | groupLogic |}}
       groupLogics: {
         name: '{{groupLogic.name}}',
@@ -27,7 +42,6 @@
         ],
       }
       {{/each}}
-      {{/if}}
     },
 {{#if formDetail.psDEFormDetails}}
 {{>(lookup 'FORMDETAILSMODEL') items=formDetail.psDEFormDetails}}

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

@@ -13,7 +13,7 @@ export interface GridControlState extends MainControlState {
    * @type {IParam[]}
    * @memberof GridControlState
    */
-  items: IParam[];
+  data: IParam[];
 
   /**
    * @description 表格列模型
@@ -79,93 +79,30 @@ export interface GridControlState extends MainControlState {
   selectFirstDefault: boolean;
 
   /**
-   * @description 当前页
-   * @type {number}
-   * @memberof GridControlState
-   */
-  current: number;
-
-  /**
-   * @description 分页大小
-   * @type {number}
-   * @memberof GridControlState
-   */
-  pageSize: number;
-
-  /**
-   * @description 是否启用分页
-   * @type {boolean}
-   * @memberof GridControlState
-   */
-  enablePagingBar: boolean;
-
-  /**
-   * @description 数据聚合
+   * @description 表格聚合
    * @type {IParam}
    * @memberof GridControlState
    */
-  dataAgg: string[];
-
-  /**
-   * @description 聚合模式
-   * @type {string}
-   * @memberof GridControlState
-   */
-  aggMode: string;
-
-  /**
-   * @description 聚合实体
-   * @type {string}
-   * @memberof GridControlState
-   */
-  aggEntity: string,
+  gridAgg: IParam;
 
   /**
-   * @description 聚合数据集
-   * @type {string}
-   * @memberof GridControlState
-   */
-  aggDataSet: string,
-
-  /**
-   * @description 分组模式
-   * @type {string}
-   * @memberof GridControlState
-   */
-  groupMode: string;
-
-  /**
-   * @description 分组属性
-   * @type {string}
-   * @memberof GridControlState
-   */
-  groupField: string;
-
-  /**
-   * @description 分组代码表
-   * @type {*}
-   * @memberof GridControlState
-   */
-  groupCodeList: any;
-
-  /**
-   * @description 禁用排序
-   * @type {boolean}
+   * @description 表格分组
+   * @type {IParam}
    * @memberof GridControlState
    */
-  noSort: boolean;
+  gridGroup: IParam;
 
   /**
-   * @description 排序方向
-   * @type {string}
+   * @description 表格排序
+   * @type {IParam}
    * @memberof GridControlState
    */
-  minorSortDir: string;
+  gridSort: IParam;
 
   /**
-   * @description 排序属性
-   * @type {string}
+   * @description 表格分页
+   * @type {IParam}
    * @memberof GridControlState
    */
-  minorSortPSDEF: string;
+  gridPaging: IParam;
 }

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

@@ -52,11 +52,11 @@ export const CtrlConfig = {
   controlName: '{{ctrl.name}}',
   controlService: new EditFormService<ControlVO>(ControlVO, new {{pascalCase ctrl.psAppDataEntity.codeName}}Service() ),
   data: new ControlVO({}),
-  formDetails: [
+  formDetails: {
     {{#each ctrl.psDEFormPages as | FormPage | }}
     {{>(lookup 'FORMDETAILSMODEL') items=FormPage.psDEFormDetails}}
     {{/each}}
-  ],
+  },
   rules: {
     {{#each ctrl.psDEFormEditItemVRs as | ruleItem |}}
     {{#neq ruleItem 2}}