@ibiz-template/runtime 0.0.3-beta.5 → 0.0.3-beta.7

package/src/controller/view/list-view.ts

@@ -35,9 +35,9 @@ export class ListViewController extends MDViewController<ListViewModel> {
    * @date 2022-08-30 19:08:59
    * @returns {*}  {Promise<void>}
    */
-  async load(): Promise<IData[]> {
+  async load(): Promise<IDatum[]> {
     const { list } = this.nerve;
-    return list.call.load();
+    return list.load();
   }
 
   /**
@@ -49,6 +49,6 @@ export class ListViewController extends MDViewController<ListViewModel> {
    */
   async remove(): Promise<void> {
     const { list } = this.nerve;
-    await list.call.remove();
+    await list.remove();
   }
 }

package/src/controller/view/main-view.ts

@@ -47,8 +47,8 @@ export class MainViewController<
     const res = await this.entityService.exec('Get', this.context, this.params);
     this.mainData = res.data;
     this.calcCaption(res.data);
-    if (this.state.toolbarState) {
-      this.state.toolbarState.update(res.data);
+    if (this.nerve.toolbar) {
+      this.nerve.toolbar.calcButtonState({ data: [res.data] });
     }
     return res.data;
   }

package/src/controller/view/md-view.ts

@@ -1,4 +1,5 @@
 import { MDViewModel } from '@ibiz-template/model';
+import { EventBase } from '../interface';
 import { MDViewNerve } from '../neuron';
 import { MDViewState } from '../state';
 import { ViewController } from './view';
@@ -28,7 +29,7 @@ export class MDViewController<
     await super.onInit();
     // 搜索表单默认展开与否
     this.state.showSearchForm = this.model.source.expandSearchForm;
-    this.nerve.self.evt.on('mounted', () => {
+    this.nerve.self.on('onMounted', () => {
       if (this.model.source.loadDefault) {
         this.load();
       }
@@ -59,14 +60,14 @@ export class MDViewController<
    * @author lxm
    * @date 2022-08-31 11:08:10
    */
-  async load(): Promise<IData[]> {
+  async load(): Promise<IDatum[]> {
     // 具体部件调用各自的数据部件加载
     return [];
   }
 
   async refresh(): Promise<void> {
-    const data = await this.load();
-    this.nerve.self.evt.asyncEmit('refreshed', data);
+    await this.load();
+    await this.nerve.self.emit('onRefreshed', undefined);
   }
 
   /**
@@ -148,12 +149,13 @@ export class MDViewController<
    *
    * @author lxm
    * @date 2022-08-28 18:08:50
-   * @param {IData[]} data 选中的数据集合
+   * @param {IDatum[]} data 选中的数据集合
    */
-  onSelectionChange(data: IData[]) {
+  onSelectionChange(event: EventBase) {
+    const data = event.data || [];
     this.state.selectedData = data;
-    if (this.state.toolbarState) {
-      this.state.toolbarState.update(data[0]?.getOrigin());
+    if (this.nerve.toolbar) {
+      this.nerve.toolbar.calcButtonState({ data });
     }
   }
 
@@ -164,8 +166,9 @@ export class MDViewController<
    * @date 2022-08-21 18:08:52
    * @param {IData} data
    */
-  onDataActive(data: IData, event?: MouseEvent) {
-    return this.openData(data, event);
+  onDataActive(event: EventBase) {
+    const data = event.data![0];
+    return this.openData(data, event.event);
   }
 
   /**
@@ -175,14 +178,15 @@ export class MDViewController<
    * @date 2022-08-31 11:08:29
    * @returns {*}  {IParams}
    */
-  onBeforeLoad(): IParams {
+  onBeforeLoad(): void {
     const params: IParams = { query: this.state.query.trim() };
     // 有搜索表单的整合相关参数
     if (this.nerve.searchForm) {
-      const addParams = this.nerve.searchForm.call.getParams();
+      const addParams = this.nerve.searchForm.data;
       Object.assign(params, addParams);
     }
-    return params;
+    // 直接替换之前的搜索参数，避免搜索参数不一致时上一次的参数遗留
+    this.nerve.xDataCtrl.searchparams = params;
   }
 
   /**
@@ -190,20 +194,15 @@ export class MDViewController<
    *
    * @author lxm
    * @date 2022-11-15 18:11:26
-   * @param {IData[]} data 保存的数据
+   * @param {IDatum[]} data 保存的数据
    * @param {boolean} isCreate 是否是创建
    * @param {string} controlName 部件名称
    * @returns {*}  {Promise<void>}
    */
-  async onAfterSave(
-    data: IData[],
-    isCreate: boolean,
-    controlName: string,
-  ): Promise<void> {
-    this.nerve.self.evt.asyncEmit('viewDataChange', {
-      type: isCreate ? 'CREATE' : 'UPDATE',
-      data,
-      control: controlName,
+  async onAfterSave(event: EventBase): Promise<void> {
+    await this.nerve.self.emit('onDataChange', {
+      data: event.data,
+      actionType: 'SAVE',
     });
   }
 
@@ -212,15 +211,14 @@ export class MDViewController<
    *
    * @author lxm
    * @date 2022-11-15 18:11:07
-   * @param {IData[]} data 删除的数据
+   * @param {IDatum[]} data 删除的数据
    * @param {string} controlName 部件名称
    * @returns {*}  {Promise<void>}
    */
-  async onAfterRemove(data: IData[], controlName: string): Promise<void> {
-    this.nerve.self.evt.asyncEmit('viewDataChange', {
-      type: 'REMOVE',
-      data,
-      control: controlName,
+  async onAfterRemove(event: EventBase): Promise<void> {
+    await this.nerve.self.emit('onDataChange', {
+      data: event.data,
+      actionType: 'REMOVE',
     });
   }
 }

package/src/controller/view/mpickup-view.ts

@@ -1,4 +1,5 @@
 import { MPickupViewModel } from '@ibiz-template/model';
+import { EventBase } from '../interface';
 import { MPickupViewNerve } from '../neuron';
 import { MPickupViewState } from '../state';
 import { PickupViewController } from './pickup-view';
@@ -33,10 +34,10 @@ export class MPickupViewController extends PickupViewController<MPickupViewModel
    *
    * @author lxm
    * @date 2022-09-12 01:09:06
-   * @param {IData[]} data
+   * @param {IDatum[]} data
    */
-  onSelectionChange(data: IData[]) {
-    this.state.embedSelection = data;
+  onSelectionChange(event: EventBase) {
+    this.state.embedSelection = event.data || [];
   }
 
   /**
@@ -46,7 +47,7 @@ export class MPickupViewController extends PickupViewController<MPickupViewModel
    * @date 2022-09-12 19:09:22
    */
   async selectAll() {
-    const allSelections = await this.nerve.viewPanel.call.selectAll();
+    const allSelections = await this.nerve.embedView.selectAll();
     if (allSelections.length > 0) {
       this.addSelections(allSelections);
     }
@@ -57,9 +58,9 @@ export class MPickupViewController extends PickupViewController<MPickupViewModel
    *
    * @author lxm
    * @date 2022-09-12 19:09:27
-   * @param {IData[]} data
+   * @param {IDatum[]} data
    */
-  addSelections(data: IData[]) {
+  addSelections(data: IDatum[]) {
     if (data.length > 0) {
       // 去重，过滤已经选中的数据
       const addData = data.filter(item => {
@@ -76,9 +77,9 @@ export class MPickupViewController extends PickupViewController<MPickupViewModel
    *
    * @author lxm
    * @date 2022-09-12 19:09:19
-   * @param {IData[]} data
+   * @param {IDatum[]} data
    */
-  removeSelections(data: IData[]) {
+  removeSelections(data: IDatum[]) {
     if (data.length > 0) {
       data.forEach(item => {
         const findIndex = this.state.selfSelection.findIndex(selection => {

package/src/controller/view/pickup-grid-view.ts

@@ -1,3 +1,4 @@
+import { EventBase } from '../interface';
 import { PickupGridViewNerve } from '../neuron';
 import { GridViewController } from './grid-view';
 
@@ -22,11 +23,13 @@ export class PickupGridViewController extends GridViewController {
    *
    * @author lxm
    * @date 2022-08-28 18:08:50
-   * @param {IData[]} data 选中的数据集合
+   * @param {IDatum[]} data 选中的数据集合
    */
-  onSelectionChange(data: IData[]) {
-    super.onSelectionChange(data);
-    this.nerve.self.evt.asyncEmit('selectionChange', this.state.selectedData);
+  onSelectionChange(event: EventBase) {
+    super.onSelectionChange(event);
+    this.nerve.self.emit('onSelectionChange', {
+      data: [...this.getData()],
+    });
   }
 
   /**
@@ -34,9 +37,9 @@ export class PickupGridViewController extends GridViewController {
    *
    * @author lxm
    * @date 2022-09-12 19:09:12
-   * @returns {*}  {Promise<IData[]>}
+   * @returns {*}  {Promise<IDatum[]>}
    */
-  async selectAll(): Promise<IData[]> {
-    return this.nerve.grid.call.selectAll();
+  async selectAll(): Promise<IDatum[]> {
+    return this.nerve.grid.selectAll();
   }
 }

package/src/controller/view/pickup-view.ts

@@ -1,4 +1,6 @@
 import { PickupViewModel } from '@ibiz-template/model';
+import { calcNavParams } from '../../utils';
+import { EventBase } from '../interface';
 import { PickupViewNerve } from '../neuron';
 import { PickupViewState } from '../state';
 import { ViewController } from './view';
@@ -25,13 +27,26 @@ export class PickupViewController<
 
   protected async onInit(): Promise<void> {
     await super.onInit();
-    // 选择视图面板适配器
-    const { pickupViewPanel } = this.model;
-    if (pickupViewPanel) {
-      this.providers[pickupViewPanel.name] = await ibiz.register.control.get(
-        pickupViewPanel,
-      );
-    }
+    // 初始化时算一次导航参数
+    this.calcNavParams();
+  }
+
+  /**
+   * 导航相关参数处理
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-03-28 14:23:38
+   */
+  calcNavParams() {
+    const { resultContext, resultParams } = calcNavParams(
+      {
+        navContexts: this.model.pickupViewPanel.source.getPSNavigateContexts(),
+        navParams: this.model.pickupViewPanel.source.getPSNavigateParams(),
+      },
+      { context: this.context, params: this.params, datum: {} },
+    );
+    Object.assign(this.context, resultContext);
+    Object.assign(this.params, resultParams);
   }
 
   /**
@@ -39,9 +54,13 @@ export class PickupViewController<
    *
    * @author lxm
    * @date 2022-09-12 01:09:06
-   * @param {IData[]} data
+   * @param {IDatum[]} data
    */
-  onSelectionChange(data: IData[]) {
-    this.nerve.self.evt.asyncEmit('closeView', { ok: true, data });
+  onSelectionChange(event: EventBase) {
+    const { data } = event;
+    this.nerve.self.emit('onCloseView', {
+      ok: true,
+      data,
+    });
   }
 }

package/src/controller/view/tab-exp-view.ts

@@ -45,8 +45,10 @@ export class TabExpViewController<
       });
     }
 
-    this.nerve.self.evt.on('mounted', () => {
-      if (this.model.source.loadDefault) {
+    this.nerve.self.on('onMounted', () => {
+      const { deName } = this.model.appEntity;
+      // 有主键才会加载主数据
+      if (this.context[deName] && this.model.source.loadDefault) {
         this.load();
       }
     });

package/src/controller/view/tree-exp-view.ts

@@ -2,9 +2,8 @@
 import { TreeDataSetNodeModel, TreeExpViewModel } from '@ibiz-template/model';
 import { TreeExpViewNerve } from '../neuron';
 import { TreeExpViewState } from '../state';
-import { ITreeNodeData } from '../../service';
 import { MDViewController } from './md-view';
-import { calcNavParams } from '../..';
+import { calcNavParams, EventBase } from '../..';
 
 /**
  * 树导航视图控制器
@@ -41,13 +40,21 @@ export class TreeExpViewController<
    * @author lxm
    * @date 2022-08-31 11:08:10
    */
-  async load(): Promise<IData[]> {
+  async load(): Promise<IDatum[]> {
     // 调用数部件加载
     const { tree } = this.nerve;
-    return tree.call.load();
+    return tree.load();
   }
 
-  async onDataActive(nodeData: ITreeNodeData) {
+  /**
+   * 点击激活回调
+   * @author lxm
+   * @date 2023-03-26 04:12:38
+   * @param {EventBase} event
+   * @return {*}
+   */
+  async onDataActive(event: EventBase) {
+    const nodeData = event.data![0];
     const nodeModel = this.model.tree.getNodeById(nodeData.nodeId)!;
     const { navView } = nodeModel;
     if (!navView) {

package/src/controller/view/view.ts

@@ -1,21 +1,16 @@
-import { IBizContext } from '@ibiz-template/core';
-import {
-  DefectModelError,
-  IPSAppViewLogic,
-  IPSDETBUIActionItem,
-  ViewModel,
-} from '@ibiz-template/model';
+import { IPSAppViewLogic, ViewModel } from '@ibiz-template/model';
 import { createUUID, notNilEmpty } from 'qx-util';
+import { IBizContext } from '@ibiz-template/core';
 import { LoadingState } from '../utils/loading/loading-state';
 import { ViewNerve } from '../neuron';
-import { ButtonContainerState, ButtonState } from '../utils';
-import { IButtonContainerState, IControlProvider } from '../interface';
+import { IControlProvider, EventBase, INeuronController } from '../interface';
 import { IModal, IModalData } from '../../interface';
 import { ViewMode } from '../../constant';
 import { convertNavData } from '../../utils';
-import { executeViewLogic } from '../../view-logic';
+import { executeViewLogic, ViewLogicDispatcher } from '../../view-logic';
 import { Application } from '../../application';
 import { ViewState } from '../state';
+import { CTX } from '../ctx';
 
 /**
  * 视图控制器
@@ -25,7 +20,9 @@ import { ViewState } from '../state';
  * @export
  * @class ViewController
  */
-export class ViewController<T extends ViewModel = ViewModel> {
+export class ViewController<T extends ViewModel = ViewModel>
+  implements INeuronController
+{
   /**
    * 视图模型
    *
@@ -66,9 +63,9 @@ export class ViewController<T extends ViewModel = ViewModel> {
    *
    * @author chitanda
    * @date 2022-07-24 17:07:46
-   * @type {IBizContext}
+   * @type {IContext}
    */
-  context: IBizContext;
+  context: IContext;
 
   /**
    * 视图参数
@@ -79,6 +76,14 @@ export class ViewController<T extends ViewModel = ViewModel> {
    */
   params: IParams;
 
+  /**
+   * 上下文环境对象
+   * @author lxm
+   * @date 2023-03-27 02:04:51
+   * @type {CTX}
+   */
+  ctx: CTX;
+
   /**
    * 控制器是否已经准备完成
    * @deprecated
@@ -107,16 +112,6 @@ export class ViewController<T extends ViewModel = ViewModel> {
    */
   caption!: string;
 
-  /**
-   * 视图工具栏界面状态
-   *
-   * @deprecated
-   * @author lxm
-   * @date 2022-10-13 23:10:20
-   * @type {IButtonContainerState}
-   */
-  toolbarState: IButtonContainerState | null = null;
-
   /**
    * 视图loading状态控制器
    *
@@ -134,6 +129,32 @@ export class ViewController<T extends ViewModel = ViewModel> {
    */
   providers: { [key: string]: IControlProvider } = {};
 
+  /**
+   * 视图逻辑的事件调度分发器
+   * @author lxm
+   * @date 2023-03-23 08:15:02
+   * @type {ViewLogicDispatcher}
+   */
+  logicDispatcher!: ViewLogicDispatcher;
+
+  /**
+   * 获取部件通用的事件参数
+   * @author lxm
+   * @date 2023-03-26 11:42:21
+   * @readonly
+   */
+  get eventArgs() {
+    return {
+      context: this.context,
+      params: this.params,
+      data: this.getData() || [],
+      targetName: this.model.name,
+      neuron: this.nerve.self,
+      view: this.nerve.self,
+      ctx: this.ctx,
+    };
+  }
+
   /**
    * Creates an instance of View.
    *
@@ -147,11 +168,13 @@ export class ViewController<T extends ViewModel = ViewModel> {
   constructor(
     public modelPath: string,
     context: IContext,
-    params: IParams = {},
+    params?: IParams,
+    ctx?: CTX,
   ) {
     this.context = IBizContext.create({}, context);
-    this.params = params;
+    this.params = params || {};
     this.nerve = this.createNerve();
+    this.ctx = new CTX(ctx);
   }
 
   /**
@@ -193,6 +216,7 @@ export class ViewController<T extends ViewModel = ViewModel> {
    * @returns {*}  {Promise<void>}
    */
   protected async onInit(): Promise<void> {
+    await this.ctx.init(this.nerve.self);
     this.emit('neuronInit', this.nerve.self);
     this.model = (await ibiz.model.getView(this.modelPath)) as T;
     this.app = ibiz.hub.getApp(this.model.modelService.app);
@@ -200,36 +224,22 @@ export class ViewController<T extends ViewModel = ViewModel> {
     // 处理上下文和导航参数
     this.handleViewParams();
 
-    this.initToolbarState();
-  }
+    // 初始化视图布局面板适配器
+    const { useDefaultLayout, viewLayoutPanel } = this.model;
+    if (!useDefaultLayout) {
+      const provider = await ibiz.register.control.get(viewLayoutPanel!);
+      this.providers.viewLayoutPanel = provider;
+    }
 
-  /**
-   * 初始化工具栏控制对象
-   *
-   * @author lxm
-   * @date 2022-10-13 23:10:37
-   * @returns {*}  {void}
-   */
-  initToolbarState(): void {
-    if (!this.model.toolbar) {
-      return;
+    this.logicDispatcher = new ViewLogicDispatcher(this.context, this.params);
+    if (this.model.source.getPSAppViewLogics()?.length) {
+      await this.logicDispatcher.init(this.model.source.getPSAppViewLogics()!);
     }
-    // 初始化工具栏状态控制对象
-    const toolbarState = new ButtonContainerState();
-    [...this.model.toolbar.actionItems.values()].forEach(item => {
-      const buttonState = new ButtonState(
-        item.id,
-        item.getPSUIAction()!,
-        this.model.appEntity,
-      );
-      if (['Edit', 'Remove'].includes(item.getPSUIAction()!.uIActionTag)) {
-        buttonState.noPermissionMode = 'DISABLED';
-      }
-
-      toolbarState.addState(item.id, buttonState);
+
+    // 监听视图事件
+    this.nerve.self.onAll((_name, event) => {
+      return this.logicDispatcher.view.fire(event);
     });
-    toolbarState.update();
-    this.state.toolbarState = toolbarState;
   }
 
   /**
@@ -240,11 +250,10 @@ export class ViewController<T extends ViewModel = ViewModel> {
    * @protected
    */
   protected handleViewParams(): void {
-    // 识别上下文的srfkey并转成实体名称，然后删除srfkey
+    // 识别上下文的srfkey并转成实体名称，然后置空srfkey
     if (this.context.srfkey && this.model.appEntity) {
       this.context[this.model.appEntity.deName] = this.context.srfkey;
-      this.context.srfkey = undefined; // 避免delete不掉，先置空
-      delete this.context.srfkey;
+      this.context.srfkey = undefined;
     }
 
     // 路由打开的设置srfsessionid
@@ -279,6 +288,8 @@ export class ViewController<T extends ViewModel = ViewModel> {
   destroy(): void {
     this.nerve.destroy();
     this.context.destroy();
+    this.logicDispatcher.destroy();
+    this.ctx.destory();
   }
 
   /**
@@ -298,9 +309,9 @@ export class ViewController<T extends ViewModel = ViewModel> {
    *
    * @author lxm
    * @date 2022-08-28 17:08:56
-   * @returns {*}  {IData[]}
+   * @returns {*}  {IDatum[]}
    */
-  getData(): IData[] {
+  getData(): IDatum[] {
     return [];
   }
 
@@ -310,20 +321,11 @@ export class ViewController<T extends ViewModel = ViewModel> {
    * @author lxm
    * @date 2022-08-29 01:08:50
    */
-  async closeView(data: IModalData = { ok: true, data: this.getData() }) {
-    this.nerve.self.evt.emit('closeView', data);
-  }
-
-  /**
-   * 注入neuron的能力，由外部接受close事件的父级去调用
-   *
-   * @author lxm
-   * @date 2022-09-09 16:09:41
-   * @returns {*}  {Promise<boolean>}
-   */
-  async beforeClose(): Promise<boolean> {
-    // todo关闭视图的判断，如弹出关闭提示
-    return true;
+  async closeView(modalData: IModalData = { ok: true, data: this.getData() }) {
+    this.nerve.self.emit('onCloseView', {
+      data: modalData.data,
+      ok: modalData.ok,
+    });
   }
 
   /**
@@ -352,46 +354,21 @@ export class ViewController<T extends ViewModel = ViewModel> {
     // 可外部覆盖实例的此方法，实现自定义的抛事件逻辑。
   }
 
-  /**
-   * 处理工具栏菜单项点击
-   *
-   * @author lxm
-   * @date 2022-08-28 20:08:25
-   * @param {IPSDETBUIActionItem} item
-   * @param {MouseEvent} _event
-   */
-  async onToolbarClick(
-    item: IPSDETBUIActionItem,
-    event: MouseEvent,
-  ): Promise<void> {
-    if (!item.getPSAppViewUIAction()) {
-      throw new DefectModelError(item, '没有配置界面行为！');
-    }
-    const viewLogicKey = `${item.getPSAppViewUIAction()!.name}_click`;
-    const appViewLogic = this.model.source.findPSAppViewLogic(viewLogicKey);
-    if (!appViewLogic) {
-      throw new DefectModelError(
-        item.getPSAppViewUIAction()!,
-        '没有找到对应的视图逻辑',
-      );
-    }
-    return this.executeViewLogic(appViewLogic, this.getData(), event);
-  }
-
   /**
    * 执行视图逻辑
    *
    * @author lxm
    * @date 2022-09-08 10:09:38
    * @param {IPSAppViewLogic} appViewLogic 视图逻辑
-   * @param {IData} data 数据
+   * @param {IDatum[]} data 数据
    * @param {MouseEvent} event 原生事件
    */
   async executeViewLogic(
     appViewLogic: IPSAppViewLogic,
-    data: IData[],
+    data: IDatum[],
     event?: MouseEvent,
   ): Promise<void> {
+    // todo 后面没用了
     const result = await executeViewLogic(
       appViewLogic,
       this.context,
@@ -421,7 +398,9 @@ export class ViewController<T extends ViewModel = ViewModel> {
    */
   setCaption(caption: string) {
     this.state.caption = caption;
-    this.nerve.self.evt.asyncEmit('setTitle', caption);
+    this.nerve.self.emit('onSetTitle', {
+      title: caption,
+    });
     this.force();
   }
 
@@ -431,7 +410,7 @@ export class ViewController<T extends ViewModel = ViewModel> {
    * @author lxm
    * @date 2022-09-19 14:09:00
    */
-  beginViewLoading() {
+  startLoading() {
     this.viewLoading.begin();
     this.state.isLoading = this.viewLoading.isLoading;
   }
@@ -442,8 +421,19 @@ export class ViewController<T extends ViewModel = ViewModel> {
    * @author lxm
    * @date 2022-09-19 14:09:09
    */
-  endViewLoading() {
+  endLoading() {
     this.viewLoading.end();
     this.state.isLoading = this.viewLoading.isLoading;
   }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  async onCtrlEvent(event: EventBase): Promise<void> {
+    if (event?.targetName === 'toolbar') {
+      event.context = this.context;
+      event.params = this.params;
+      event.data = this.getData();
+      event.neuron = this.nerve.self;
+    }
+    return this.logicDispatcher.ctrl.fire(event);
+  }
 }