update：更新

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/PageModel.java

@@ -103,6 +103,7 @@ public class PageModel extends BaseModel{
                                     appUIAction.put("uIActionTag",UIAction.getUIActionTag());
                                     appUIAction.put("uIActionType",UIAction.getUIActionType());
                                     appUIAction.put("actionTarget",UIAction.getActionTarget());
+                                    appUIAction.put("dataAccessAction",UIAction.getDataAccessAction());
                                     toolbarItem.put("uIAction",appUIAction);
                                 }
                             }

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/views/view-base-config.hbs

@@ -60,7 +60,7 @@
   {{#page.viewToolBarItems}}
    toolbar: [
     {{#items}}
-    { id:'{{id}}',name:'{{name}}',caption:'{{caption}}',groupExtractMode:'{{groupExtractMode}}',itemType:'{{itemType}}',noPrivDisplayMode:'{{noPrivDisplayMode}}',showIcon:{{showIcon}},showCaption:{{showCaption}},tooltip:'{{tooltip}}',disabled: false, visible: true, imgPath: '{{imgPath}}',iconClass: '{{iconClass}}',xDataControlName:'{{xDataControlName}}',{{#if uIAction}}uIAction:{codeName:'{{uIAction.codeName}}',fullCodeName:'{{uIAction.fullCodeName}}',uIActionMode:'{{uIAction.uIActionMode}}',actionTarget:'{{uIAction.actionTarget}}',uIActionTag:'{{uIAction.uIActionTag}}',uIActionType:'{{uIAction.uIActionType}}'}{{/if}} },
+    { id:'{{id}}',name:'{{name}}',caption:'{{caption}}',groupExtractMode:'{{groupExtractMode}}',itemType:'{{itemType}}',noPrivDisplayMode:'{{noPrivDisplayMode}}',showIcon:{{showIcon}},showCaption:{{showCaption}},tooltip:'{{tooltip}}',disabled: false, visible: true, imgPath: '{{imgPath}}',iconClass: '{{iconClass}}',xDataControlName:'{{xDataControlName}}',{{#if uIAction}}uIAction:{codeName:'{{uIAction.codeName}}',fullCodeName:'{{uIAction.fullCodeName}}',uIActionMode:'{{uIAction.uIActionMode}}',actionTarget:'{{uIAction.actionTarget}}',uIActionTag:'{{uIAction.uIActionTag}}',dataAccessAction:'{{uIAction.dataAccessAction}}',uIActionType:'{{uIAction.uIActionType}}'}{{/if}} },
     {{/items}}
     ],
   {{/page.viewToolBarItems}}

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

@@ -72,10 +72,10 @@ export class EditView extends MainView {
    * 表单事件
    *
    * @param {string} action
-   * @param {*} data
+   * @param {IParam[]} data
    * @memberof EditView
    */
-  public formEvent(action: string, data: IParam): void {
+  public formEvent(action: string, data: IParam[]): void {
     if (Object.is(action, 'load')) {
       this.onFormLoad(data);
     }
@@ -90,32 +90,34 @@ export class EditView extends MainView {
   /**
    * 表单加载完成
    *
-   * @param {*} data
+   * @param {IParam[]} data
    * @memberof EditView
    */
-  public onFormLoad(data: IParam): void {
+  public onFormLoad(data: IParam[]): void {
+    // 抛出数据
+    this.emit("onViewEvent", { tag: this.state.viewName, action: 'viewLoad', data: data });
     // 设置工具栏状态
-    const state: boolean = !Object.is(data.srfuf, '1');
-    this.setToolbarItemState(state);
+    const state: boolean = !Object.is(data[0].srfuf, '1');
+    this.setToolbarItemState(state, data[0]);
   }
 
   /**
    * 表单保存完成
    *
-   * @param {*} data
+   * @param {IParam[]} data
    * @memberof EditView
    */
-  public onFormSave(data: IParam): void {
+  public onFormSave(data: IParam[]): void {
 
   }
 
   /**
    * 表单删除完成
    *
-   * @param {*} data
+   * @param {IParam[]} data
    * @memberof EditView
    */
-  public onFormRemove(data: IParam): void {
+  public onFormRemove(data: IParam[]): void {
   }
 
   /**

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

@@ -19,14 +19,17 @@ export class MainView extends ViewBase {
    * 设置工具栏项状态
    *
    * @param {boolean} state 初始化状态
+   * @param {IParam} data 数据
    * @return {*} 
    * @memberof MainView
    */
-  public setToolbarItemState(state: boolean) {
+  public async setToolbarItemState(state: boolean, data?: IParam) {
     if (!this.state.toolbar) {
       return;
     }
+    const appUIService = await this.getUIService();
     for (const key in this.state.toolbar) {
+      // 设置初始化状态
       if (!this.state.toolbar.hasOwnProperty(key)) {
         return;
       }
@@ -38,6 +41,43 @@ export class MainView extends ViewBase {
       if (item.noPrivDisplayMode && Object.is(item.noPrivDisplayMode, '6')) {
         item.visible = false;
       }
+      // 设置权限状态
+      if (item && item.uIAction && item.uIAction.dataAccessAction) {
+        let dataActionResult: any;
+        const { actionTarget, uIActionTag, dataAccessAction } = item.uIAction;
+        // 不需要数据的界面行为
+        if (item.uIAction && (Object.is(actionTarget, "NONE") || !actionTarget)) {
+          if (!actionTarget && Object.is(uIActionTag, "Save") && appUIService.isEnableDEMainState) {
+            if (data && Object.keys(data).length > 0) {
+              dataActionResult = appUIService.getAllOPPrivs(data, dataAccessAction);
+            }
+          } else {
+            dataActionResult = appUIService.getAllOPPrivs(undefined, dataAccessAction);
+          }
+        } else {
+          if (data && Object.keys(data).length > 0 && appUIService?.isEnableDEMainState) {
+            dataActionResult = appUIService.getAllOPPrivs(data, dataAccessAction);
+          } else {
+            dataActionResult = appUIService.getAllOPPrivs(undefined, dataAccessAction);
+          }
+        }
+        // 无权限:0;有权限:1
+        if (dataActionResult === 0) {
+          // 禁用:1;隐藏:2;隐藏且默认隐藏:6
+          if (item.noPrivDisplayMode === 1) {
+            item.disabled = true;
+          }
+          if ((item.noPrivDisplayMode === 2) || (item.noPrivDisplayMode === 6)) {
+            item.visible = false;
+          } else {
+            item.visible = true;
+          }
+        }
+        if (dataActionResult === 1) {
+          item.visible = true;
+          item.visible = false;
+        }
+      }
     }
   }
 

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

@@ -202,10 +202,12 @@ export class MDView extends MainView {
   /**
    * 多数据部件加载完成
    *
-   * @param {*} args
+   * @param {IParam[]} data
    * @memberof MDView
    */
-  public MDCtrlLoaded(args: any) {
+  public MDCtrlLoaded(data: IParam[]) {
+    // 抛出数据
+    this.emit("onViewEvent", { tag: this.state.viewName, action: 'viewLoad', data: data });
     // 设置工具栏状态
     this.setToolbarItemState(true);
   }
@@ -213,13 +215,15 @@ export class MDView extends MainView {
   /**
    * 多数据部件选中数据
    *
-   * @param {*} args
+   * @param {IParam[]} data
    * @memberof MDView
    */
-  public selectionChange(args: any) {
+  public selectionChange(data: IParam[]) {
     // 抛出数据
-    this.emit("onViewEvent", { tag: this.state.viewName, action: 'selectionChange', data: args });
-    // 计算按钮权限 todo
+    this.emit("onViewEvent", { tag: this.state.viewName, action: 'viewDataChange', data: data });
+    // 设置工具栏状态
+    const state: boolean = !Object.is(data[0]?.srfuf, '1');
+    this.setToolbarItemState(state, data[0]?.$DO);
   }
 
   /**

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

@@ -41,22 +41,6 @@ export class ViewBase {
    */
   public declare xDataControl: IParam;
 
-  /**
-   * 界面行为服务
-   *
-   * @type {(IParam | undefined)}
-   * @memberof ViewBase
-   */
-  public appUIService: IParam | undefined;
-
-  /**
-   * 数据服务
-   *
-   * @type {(IParam | undefined)}
-   * @memberof ViewBase
-   */
-  public appDataService: IParam | undefined;
-
   /**
    * Creates an instance of ViewBase.
    * @param {*} options 配置参数
@@ -184,30 +168,26 @@ export class ViewBase {
   }
 
   /**
-   *@description 使用UI服务
+   *@description 获取UI服务
    *
    * @memberof ViewBase
    */
-  public useUIService() {
+  public async getUIService() {
     const { appEntityCodeName, context } = this.state;
     if (appEntityCodeName) {
-      App.getUIService(appEntityCodeName.toLowerCase(), context).then((service: IParam) => {
-        this.appUIService = service;
-      })
+      return await App.getUIService(appEntityCodeName.toLowerCase(), context);
     }
   }
 
   /**
-   *@description 使用数据服务
+   *@description 获取数据服务
    *
    * @memberof ViewBase
    */
-  public useDataService() {
+  public async getDataService() {
     const { appEntityCodeName, context } = this.state;
     if (appEntityCodeName) {
-      App.getDataService(appEntityCodeName.toLowerCase(), context).then((service: IParam) => {
-        this.appDataService = service;
-      })
+      return await App.getDataService(appEntityCodeName.toLowerCase(), context)
     }
   }
 
@@ -243,10 +223,6 @@ export class ViewBase {
     this.useViewContextParams();
     // 使用计数器服务
     this.useCounterService();
-    // 使用数据服务
-    this.useDataService();
-    // 使用UI服务
-    this.useUIService();
     // 处理视图初始化
     this.useViewInit();
     return {

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

@@ -462,7 +462,7 @@ export class FormControl extends MainControl {
         );
         if (response.status && response.status == 200) {
           this.state.data = response.data;
-          this.emit('ctrlEvent', { tag: this.props.name, action: 'load', data: response.data });
+          this.emit('ctrlEvent', { tag: this.props.name, action: 'load', data: [response.data] });
           this.afterFormAction('load');
         }
       } catch (error) {