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

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

@@ -3,6 +3,7 @@ import { EditViewModel } from '@ibiz-template/model';
 import { OpenAppViewCommand } from '../../command';
 import { IModalData } from '../../interface';
 import { EntityService } from '../../service';
+import { EventBase } from '../interface';
 
 import { EditViewNerve } from '../neuron';
 import { EditViewState } from '../state';
@@ -43,7 +44,7 @@ export class EditViewController<
     this.entityService = await this.app.es.getService(
       this.model.appEntity.codeName,
     );
-    this.nerve.self.evt.on('mounted', () => {
+    this.nerve.self.on('onMounted', () => {
       if (this.model.source.loadDefault) {
         this.load();
       }
@@ -56,7 +57,10 @@ export class EditViewController<
   }
 
   getData(): IDatum[] {
-    const formData = this.nerve.form.call.getData();
+    if (!this.nerve.form) {
+      return [];
+    }
+    const formData = this.nerve.form.getData();
     return formData;
   }
 
@@ -68,10 +72,10 @@ export class EditViewController<
    */
   async load(): Promise<IData> {
     const { form } = this.nerve;
-    const data = await form.call.load();
+    const data = await form.load();
     this.calcCaption(data);
-    if (this.state.toolbarState) {
-      this.state.toolbarState.update(data.getOrigin());
+    if (this.nerve.toolbar) {
+      this.nerve.toolbar.calcButtonState({ data: [data] });
     }
     return data;
   }
@@ -84,7 +88,7 @@ export class EditViewController<
    */
   async save(): Promise<IData> {
     const { form } = this.nerve;
-    const data = await form.call.save();
+    const data = await form.save();
     return data;
   }
 
@@ -97,17 +101,15 @@ export class EditViewController<
    * @param {IData} data 保存后返回的数据
    * @returns {*}  {Promise<void>}
    */
-  async onAfterFormSave(isNewData: boolean, data: IData): Promise<void> {
+  async onAfterFormSave(event: EventBase): Promise<void> {
+    const data = event.data![0];
     // 新建保存，更新上下文
-    if (isNewData) {
-      const { deName } = this.model.appEntity;
-      this.context[deName] = data[deName];
-    }
+    const { deName } = this.model.appEntity;
+    this.context[deName] = data[deName];
     this.calcCaption(data);
-    this.nerve.self.evt.asyncEmit('viewDataChange', {
-      type: isNewData ? 'CREATE' : 'UPDATE',
-      data: [data],
-      control: 'form',
+    this.nerve.self.emit('onDataChange', {
+      actionType: 'SAVE',
+      data: event.data,
     });
   }
 
@@ -119,11 +121,10 @@ export class EditViewController<
    * @param {IData} data
    * @returns {*}  {Promise<void>}
    */
-  async onAfterFormRemove(data: IData): Promise<void> {
-    this.nerve.self.evt.asyncEmit('viewDataChange', {
-      type: 'REMOVE',
-      data: [data],
-      control: 'form',
+  async onAfterFormRemove(event: EventBase): Promise<void> {
+    this.nerve.self.emit('onDataChange', {
+      actionType: 'REMOVE',
+      data: event.data,
     });
   }
 
@@ -148,12 +149,12 @@ export class EditViewController<
    */
   async remove() {
     const { form } = this.nerve;
-    await form.call.remove();
+    await form.remove();
   }
 
   async refresh() {
-    const data = await this.load();
-    this.nerve.self.evt.asyncEmit('refreshed', [data]);
+    await this.load();
+    await this.nerve.self.emit('onRefreshed', undefined);
   }
 
   /**
@@ -193,7 +194,7 @@ export class EditViewController<
 
     // *没有工作流启动视图的，自己启动工作流
     if (!startView) {
-      await this.nerve.form.call.wfStart(newParams);
+      await this.nerve.form.wfStart(newParams);
       await this.closeView();
       return;
     }
@@ -220,7 +221,7 @@ export class EditViewController<
    * @returns {*}  {Promise<void>}
    */
   wfSubmit(): Promise<void> {
-    return this.nerve.form.call.wfSubmit();
+    return this.nerve.form.wfSubmit();
   }
 
   /**

package/src/controller/view/edit-view3.ts

@@ -1,8 +1,7 @@
 import { EditView3Model } from '@ibiz-template/model';
 import { createUUID, notNilEmpty } from 'qx-util';
-import { Srfuf } from '../../service';
 import { convertNavData } from '../../utils';
-import { EditView3Nerve } from '../neuron';
+import { EditView3Nerve, ViewNeuron } from '../neuron';
 import { EditView3State } from '../state';
 import { EditViewController } from './edit-view';
 
@@ -25,7 +24,10 @@ export class EditView3Controller extends EditViewController<EditView3Model> {
    * @date 2022-08-31 22:08:44
    * @type {boolean}
    */
-  isNewData: boolean = true;
+  isNewData(): boolean {
+    const { deName } = this.model.appEntity;
+    return !!this.context[deName];
+  }
 
   /**
    * 关系界面绘制参数
@@ -64,7 +66,6 @@ export class EditView3Controller extends EditViewController<EditView3Model> {
 
   async load(): Promise<IData> {
     const data = await super.load();
-    this.isNewData = data.srfuf === Srfuf.CREATE;
     this.calcViewParams(data);
     return data;
   }
@@ -98,7 +99,7 @@ export class EditView3Controller extends EditViewController<EditView3Model> {
 
       // 视图参数或上下文发生变化时，销毁重绘视图
       if (
-        !this.nerve.drViews.has(name) ||
+        !this.nerve.children.has(name) ||
         JSON.stringify(this.drPages[name].context) !==
           JSON.stringify(newContext) ||
         JSON.stringify(this.drPages[name].params) !== JSON.stringify(newParams)
@@ -108,7 +109,7 @@ export class EditView3Controller extends EditViewController<EditView3Model> {
         this.drPages[name].key = createUUID();
       } else {
         // 不变的情况重新加载视图的数据
-        this.nerve.drViews.get(name)?.call.refresh();
+        (this.nerve.children.get(name) as ViewNeuron)?.refresh();
       }
     }
     this.force();

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

@@ -3,10 +3,15 @@ import {
   GridExpViewModel,
   IPSDETBUIActionItem,
 } from '@ibiz-template/model';
-import { calcNavParams, GridExpViewState, MDViewController } from '../..';
+import {
+  calcNavParams,
+  EventBase,
+  GridExpViewState,
+  GridViewController,
+} from '../..';
 import { GridExpViewNerve } from '../neuron';
 
-export class GridExpViewController extends MDViewController<GridExpViewModel> {
+export class GridExpViewController extends GridViewController<GridExpViewModel> {
   state = new GridExpViewState();
 
   declare nerve: GridExpViewNerve;
@@ -19,6 +24,7 @@ export class GridExpViewController extends MDViewController<GridExpViewModel> {
     await super.onInit();
     // 表格适配器
     const { gridExpBar } = this.model;
+
     if (gridExpBar) {
       const { grid } = gridExpBar;
       if (grid) {
@@ -36,7 +42,7 @@ export class GridExpViewController extends MDViewController<GridExpViewModel> {
    */
   async load(): Promise<IDatum[]> {
     const { grid } = this.nerve;
-    return grid.call.load();
+    return grid.load();
   }
 
   /**
@@ -48,7 +54,7 @@ export class GridExpViewController extends MDViewController<GridExpViewModel> {
    */
   async remove(): Promise<void> {
     const { grid } = this.nerve;
-    await grid.call.remove();
+    await grid.remove();
   }
 
   /**
@@ -60,7 +66,7 @@ export class GridExpViewController extends MDViewController<GridExpViewModel> {
    */
   async newRow(): Promise<void> {
     const { grid } = this.nerve;
-    await grid.call.newRow();
+    await grid.newRow();
   }
 
   /**
@@ -70,10 +76,8 @@ export class GridExpViewController extends MDViewController<GridExpViewModel> {
    * @date 2022-08-28 18:08:50
    * @param {IData} data 选中的数据
    */
-  async onDataActive(data: IData) {
-    if (this.state.toolbarState) {
-      this.state.toolbarState.update(data?.getOrigin());
-    }
+  async onDataActive(event: EventBase) {
+    const data = event.data![0];
 
     const { grid } = this.model.gridExpBar;
     if (grid && grid.navView) {

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

@@ -12,7 +12,9 @@ import { MDViewController } from './md-view';
  * @class GridViewController
  * @extends {MDViewController<GridViewModel>}
  */
-export class GridViewController extends MDViewController<GridViewModel> {
+export class GridViewController<
+  T extends GridViewModel = GridViewModel,
+> extends MDViewController<T> {
   state = new GridViewState();
 
   declare nerve: GridViewNerve;
@@ -39,7 +41,7 @@ export class GridViewController extends MDViewController<GridViewModel> {
    */
   async load(): Promise<IDatum[]> {
     const { grid } = this.nerve;
-    return grid.call.load();
+    return grid.load();
   }
 
   /**
@@ -51,7 +53,7 @@ export class GridViewController extends MDViewController<GridViewModel> {
    */
   async remove(): Promise<void> {
     const { grid } = this.nerve;
-    await grid.call.remove();
+    await grid.remove();
   }
 
   /**
@@ -63,16 +65,16 @@ export class GridViewController extends MDViewController<GridViewModel> {
    */
   async newRow(): Promise<void> {
     const { grid } = this.nerve;
-    await grid.call.newRow();
+    await grid.newRow();
   }
 
   async importData(): Promise<void> {
     const { grid } = this.nerve;
-    await grid.call.importData();
+    await grid.importData();
   }
 
   async exportData(event: MouseEvent): Promise<void> {
     const { grid } = this.nerve;
-    await grid.call.exportData(event);
+    await grid.exportData(event);
   }
 }

package/src/controller/view/index.ts

@@ -26,3 +26,4 @@ export { DashboardViewController } from './dashboard-view';
 export { WizardViewController } from './wizard-view';
 export { ListExpViewController } from './list-exp-view';
 export { KanbanViewController } from './kanban-view';
+export { CustomViewController } from './custom-view';

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

@@ -37,7 +37,7 @@ export class KanbanViewController extends MDViewController<KanbanViewModel> {
    */
   async load(): Promise<IDatum[]> {
     const { kanban } = this.nerve;
-    return kanban.call.load();
+    return kanban.load();
   }
 
   /**
@@ -49,6 +49,6 @@ export class KanbanViewController extends MDViewController<KanbanViewModel> {
    */
   async remove(): Promise<void> {
     const { kanban } = this.nerve;
-    await kanban.call.remove();
+    await kanban.remove();
   }
 }

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

@@ -3,7 +3,12 @@ import {
   ListExpViewModel,
   IPSDETBUIActionItem,
 } from '@ibiz-template/model';
-import { calcNavParams, ListExpViewState, MDViewController } from '../..';
+import {
+  calcNavParams,
+  EventBase,
+  ListExpViewState,
+  MDViewController,
+} from '../..';
 import { ListExpViewNerve } from '../neuron';
 
 export class ListExpViewController extends MDViewController<ListExpViewModel> {
@@ -36,7 +41,7 @@ export class ListExpViewController extends MDViewController<ListExpViewModel> {
    */
   async load(): Promise<IDatum[]> {
     const { list } = this.nerve;
-    return list.call.load();
+    return list.load();
   }
 
   /**
@@ -48,7 +53,7 @@ export class ListExpViewController extends MDViewController<ListExpViewModel> {
    */
   async remove(): Promise<void> {
     const { list } = this.nerve;
-    await list.call.remove();
+    await list.remove();
   }
 
   /**
@@ -58,10 +63,8 @@ export class ListExpViewController extends MDViewController<ListExpViewModel> {
    * @date 2022-08-28 18:08:50
    * @param {IData} data 选中的数据
    */
-  async onDataActive(data: IData) {
-    if (this.state.toolbarState) {
-      this.state.toolbarState.update(data?.getOrigin());
-    }
+  async onDataActive(event: EventBase) {
+    const data = event.data![0];
 
     const { list } = this.model.listExpBar;
     if (list && list.navView) {

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

@@ -37,7 +37,7 @@ export class ListViewController extends MDViewController<ListViewModel> {
    */
   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();
       }
@@ -65,8 +66,8 @@ export class MDViewController<
   }
 
   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);
   }
 
   /**
@@ -150,10 +151,11 @@ export class MDViewController<
    * @date 2022-08-28 18:08:50
    * @param {IDatum[]} data 选中的数据集合
    */
-  onSelectionChange(data: IDatum[]) {
+  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;
   }
 
   /**
@@ -195,15 +199,10 @@ export class MDViewController<
    * @param {string} controlName 部件名称
    * @returns {*}  {Promise<void>}
    */
-  async onAfterSave(
-    data: IDatum[],
-    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',
     });
   }
 
@@ -216,11 +215,10 @@ export class MDViewController<
    * @param {string} controlName 部件名称
    * @returns {*}  {Promise<void>}
    */
-  async onAfterRemove(data: IDatum[], 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';
@@ -35,8 +36,8 @@ export class MPickupViewController extends PickupViewController<MPickupViewModel
    * @date 2022-09-12 01:09:06
    * @param {IDatum[]} data
    */
-  onSelectionChange(data: IDatum[]) {
-    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);
     }

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';
 
@@ -24,9 +25,11 @@ export class PickupGridViewController extends GridViewController {
    * @date 2022-08-28 18:08:50
    * @param {IDatum[]} data 选中的数据集合
    */
-  onSelectionChange(data: IDatum[]) {
-    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()],
+    });
   }
 
   /**
@@ -37,6 +40,6 @@ export class PickupGridViewController extends GridViewController {
    * @returns {*}  {Promise<IDatum[]>}
    */
   async selectAll(): Promise<IDatum[]> {
-    return this.nerve.grid.call.selectAll();
+    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);
   }
 
   /**
@@ -41,7 +56,11 @@ export class PickupViewController<
    * @date 2022-09-12 01:09:06
    * @param {IDatum[]} data
    */
-  onSelectionChange(data: IDatum[]) {
-    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 '../..';
 
 /**
  * 树导航视图控制器
@@ -44,10 +43,18 @@ export class TreeExpViewController<
   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) {