update：更新

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/grid-view/grid-view.ts

@@ -72,8 +72,7 @@ public declare state: GridViewState;
     const superParams = super.moduleInstall();
     return {
       ...superParams,
-      grid: this.grid,
-      onSearchFormSearch: this.onSearchFormSearch.bind(this)
+      grid: this.grid
     };
   }
 }

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/md-view/md-view.ts

@@ -127,6 +127,12 @@ export class MDView extends MainView {
    * @memberof MDView
    */
   public MDCtrlEvent(eventName: string, args: any): void {
+    if (Object.is(eventName, 'beforeload')) {
+      this.MDCtrlBeforeLoad(args)
+    }
+    if (Object.is(eventName, 'load')) {
+      this.MDCtrlLoaded(args);
+    }
     if (Object.is(eventName, 'rowclick')) {
       this.doEdit(args);
     }
@@ -136,12 +142,6 @@ export class MDView extends MainView {
     if (Object.is(eventName, 'selectionchange')) {
       this.selectionChange(args);
     }
-    if (Object.is(eventName, 'load')) {
-      this.MDCtrlLoaded(args);
-    }
-    if (Object.is(eventName, 'beforeload')) {
-      this.MDCtrlBeforeLoad(args)
-    }
   }
 
   /**
@@ -157,6 +157,7 @@ export class MDView extends MainView {
     if (this.getSearchBar()) {
       Object.assign(args, this.getSearchBar().getData());
     }
+    Object.assign(args, { test: 111 });
     // if (this.view && !this.view.isExpandSearchForm) {
     //   Object.assign(args, { query: this.view.query });
     // }
@@ -181,7 +182,7 @@ export class MDView extends MainView {
    * @memberof MDView
    */
   public MDCtrlLoaded(args: any) {
-    throw new Error('Method not implemented.');
+    console.log("数据加载完成", args);
   }
 
   /**

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/pickup-view/pickup-view.ts

@@ -50,7 +50,6 @@ export class PickupView extends MainView {
   }
 
   public handleCtrlEvent(actionParam: IActionParam) {
-    debugger
     const { tag, action, data } = actionParam;
     // TODO
 

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

-import { ControlPropsBase, ControlStateBase, IParam, UIBase } from '@core';
+import { ControlPropsBase, ControlStateBase, IActionParam, IParam, UIBase } from '@core';
 
 /**
  * @description 部件基类
@@ -31,11 +31,6 @@ export class ControlBase {
    */
   public declare emit: Function;
 
-  /**
-   * Creates an instance of ControlBase.
-   * @param {*} options 配置参数
-   * @memberof ControlBase
-   */
   /**
    * Creates an instance of ControlBase.
    * @param {*} options 配置参数
@@ -68,8 +63,15 @@ export class ControlBase {
     // 把Ref赋值到State上进行解包
     this.state.context = context;
     this.state.viewParams = viewParams;
+  }
 
-    return { context, viewParams };
+  /**
+   * 获取当前激活数据
+   *
+   * @memberof ControlBase
+   */
+  public getData(): IParam[] {
+    return [];
   }
 
   /**
@@ -83,7 +85,8 @@ export class ControlBase {
     this.setState();
     this.useControlContextParams();
     return {
-      state: this.state
+      state: this.state,
+      activeData: this.getData()
     };
   }
 }

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

-import { IParam, MainControlProps } from "@core";
+import { MDControlProps } from "@core";
 
 /**
  * @description 表格部件的props
  * @export
  * @interface GridControlProps
- * @extends {MainControlProps}
+ * @extends {MDControlProps}
  */
-export interface GridControlProps extends MainControlProps {
+export interface GridControlProps extends MDControlProps {
 
-  /**
-   * @description 是否多选
-   * @type {boolean}
-   * @memberof GridControlProps
-   */
-  multiple: boolean;
-
-  /**
-   * @description 行编辑状态
-   * @type {boolean}
-   * @memberof GridControlProps
-   */
-  rowEditState: boolean;
-
-  /**
-   * @description 行激活模式
-   * @type {(0 | 1 | 2)} 不激活 | 单击激活 | 双击激活
-   * @memberof GridControlProps
-   */
-  rowActiveMode: 0 | 1 | 2;
-
-  /**
-   * @description 选中数据
-   * @type {IParam[]}
-   * @memberof GridControlProps
-   */
-  selectedData: IParam[];
-
-  /**
-   * @description 是否默认选中第一项数据
-   * @type {boolean}
-   * @memberof GridControlProps
-   */
-  selectFirstDefault: boolean;
 }
\ No newline at end of file

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

-import { IParam, MainControlState } from '@core';
+import { IParam, MDControlState } from '@core';
 
 /**
  * @description 表格部件状态
  * @export
  * @interface GridControlState
- * @extends {MainControlState}
+ * @extends {MDControlState}
  */
-export interface GridControlState extends MainControlState {
-
-  /**
-   * @description 表格数据集合
-   * @type {IParam[]}
-   * @memberof GridControlState
-   */
-  data: IParam[];
+export interface GridControlState extends MDControlState {
 
   /**
    * @description 表格列模型
@@ -36,48 +29,6 @@ export interface GridControlState extends MainControlState {
    */
   rules: IParam;
 
-  /**
-   * @description 是否多选
-   * @type {boolean}
-   * @memberof GridControlState
-   */
-  multiple: boolean;
-
-  /**
-   * @description 行编辑状态
-   * @type {boolean}
-   * @memberof GridControlState
-   */
-  rowEditState: boolean;
-
-  /**
-   * @description 行激活模式
-   * @type {(0 | 1 | 2)} 不激活 | 单击激活 | 双击激活
-   * @memberof GridControlState
-   */
-  rowActiveMode: 0 | 1 | 2;
-
-  /**
-   * @description 选中数据
-   * @type {IParam[]}
-   * @memberof GridControlState
-   */
-  selectedData: IParam[];
-
-  /**
-   * @description 选中行keys
-   * @type {string[]}
-   * @memberof GridControlState
-   */
-  selectedRowKeys: string[];
-
-  /**
-   * @description 是否默认选中第一条数据
-   * @type {boolean}
-   * @memberof GridControlState
-   */
-  selectFirstDefault: boolean;
-
   /**
    * @description 表格聚合
    * @type {IParam}
@@ -85,24 +36,4 @@ export interface GridControlState extends MainControlState {
    */
   gridAgg: IParam;
 
-  /**
-   * @description 表格分组
-   * @type {IParam}
-   * @memberof GridControlState
-   */
-  gridGroup: IParam;
-
-  /**
-   * @description 表格排序
-   * @type {IParam}
-   * @memberof GridControlState
-   */
-  gridSort: IParam;
-
-  /**
-   * @description 表格分页
-   * @type {IParam}
-   * @memberof GridControlState
-   */
-  gridPaging: IParam;
 }

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

-import { ControlBase, MainControlProps, MainControlState } from '@core';
+import { ControlBase, IParam, MainControlProps, MainControlState, UIUtil } from '@core';
 
 /**
  * @description 实体部件
@@ -24,6 +24,20 @@ export class MainControl extends ControlBase {
     this.state.controlAction = toRef(this.props, 'controlAction') as any;
   }
 
+  /**
+   * 获取指定数据的操作权限
+   *
+   * @param {IParam} data 指定数据
+   * @param {IParam} actionModel 界面行为模型
+   * @memberof MainControl
+   */
+  public async getActionAuthState(data: IParam, actionModel: IParam) {
+    const { context, appEntityCodeName } = this.state;
+    const tempUIservice = await App.getUIService(appEntityCodeName.toLowerCase(), context);
+    UIUtil.calcActionItemAuthState(data, actionModel, tempUIservice);
+    return actionModel;
+  }
+
   /**
    * @description 安装部件所有功能模块的方法
    * @return {*} 

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

+export * from './md-control-prop'
+export * from './md-control-state'
+export * from './md-control'
\ No newline at end of file

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

+import { IParam, MainControlProps } from "@core";
+
+/**
+ * @description 多数据部件的props
+ * @export
+ * @interface MDControlProps
+ * @extends {MainControlProps}
+ */
+export interface MDControlProps extends MainControlProps {
+
+  /**
+   * @description 是否多选
+   * @type {boolean}
+   * @memberof MDControlProps
+   */
+  isMultiple: boolean;
+
+  /**
+   * @description 行编辑状态
+   * @type {boolean}
+   * @memberof MDControlProps
+   */
+  rowEditState: boolean;
+
+  /**
+   * @description 行激活模式
+   * @type {(0 | 1 | 2)} 不激活 | 单击激活 | 双击激活
+   * @memberof MDControlProps
+   */
+  rowActiveMode: 0 | 1 | 2;
+
+  /**
+   * @description 选中数据
+   * @type {IParam[]}
+   * @memberof MDControlProps
+   */
+  selectedData: IParam[];
+
+  /**
+   * @description 是否默认选中第一项数据
+   * @type {boolean}
+   * @memberof MDControlProps
+   */
+  isSelectDefault: boolean;
+}
\ No newline at end of file

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

+import { IParam, MainControlState } from '@core';
+
+/**
+ * @description 多数据部件状态
+ * @export
+ * @interface MDControlState
+ * @extends {MainControlState}
+ */
+export interface MDControlState extends MainControlState {
+
+  /**
+   * @description 多数据部件数据
+   * @type {IParam[]}
+   * @memberof MDControlState
+   */
+  items: IParam[];
+
+  /**
+   * @description 是否多选
+   * @type {boolean}
+   * @memberof MDControlState
+   */
+  isMultiple: boolean;
+
+  /**
+   * @description 行编辑状态
+   * @type {boolean}
+   * @memberof MDControlState
+   */
+  rowEditState: boolean;
+
+  /**
+   * @description 行激活模式
+   * @type {(0 | 1 | 2)} 不激活 | 单击激活 | 双击激活
+   * @memberof MDControlState
+   */
+  rowActiveMode: 0 | 1 | 2;
+
+  /**
+   * @description 选中数据
+   * @type {IParam[]}
+   * @memberof MDControlState
+   */
+  selectedData: IParam[];
+
+  /**
+   * @description 选中行keys
+   * @type {string[]}
+   * @memberof MDControlState
+   */
+  selectedRowKeys: string[];
+
+  /**
+   * @description 是否默认选中第一条数据
+   * @type {boolean}
+   * @memberof MDControlState
+   */
+  isSelectDefault: boolean;
+
+}

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

@@ -23,7 +23,6 @@ export class GridService<T extends ControlVOBase> extends ControlServiceBase<T>
     // todo主键
     const action = hasFunction(_entityService, opts.action) ? opts.action : 'GetDraft';
     const response = await _entityService[action](Context, Data, opts.isLoading);
-    // this.setRemoteCopyData(response);
     response.data = this.newControlVO(response.data);
     response.data.srfuf = '0';
     return this.handleResponse(response, opts);
@@ -37,13 +36,12 @@ export class GridService<T extends ControlVOBase> extends ControlServiceBase<T>
    * @return {*}  {Promise<any>}
    * @memberof GridService
    */
-  public async get(context: IParam, data: IParam, opts: { action: string; isLoading?: boolean }): Promise<any> {
+  public async search(context: IParam, data: IParam, opts: { action: string; isLoading?: boolean }): Promise<any> {
     let _entityService: any = this.entityService;
     const { context: Context, data: Data } = this.handleRequestData(context, data, opts);
     const action = hasFunction(_entityService, opts.action) ? opts.action : 'GET';
     const response = await _entityService[action](Context, Data, opts.isLoading);
-    //this.setCopynativeData(response.data);
-    response.data?.forEach((item: IParam) =>{
+    response.data?.forEach((item: IParam) => {
       item = this.newControlVO(item);
     })
     return this.handleResponse(response, opts);