@ibiz-template/runtime 0.0.3-beta.5 → 0.0.4-beta.1

package/out/controller/view/list-exp-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-exp-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/list-exp-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAiB,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,qBAAa,qBAAsB,SAAQ,gBAAgB,CAAC,gBAAgB,CAAC;IAC3E,KAAK,mBAA0B;IAEvB,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;cAIzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAK9B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK;IA+B9B;;;;;;;;OAQG;IACG,cAAc,CAClB,IAAI,EAAE,mBAAmB,EACzB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAajB"}
+{"version":3,"file":"list-exp-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/list-exp-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAEL,SAAS,EACT,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,qBAAa,qBAAsB,SAAQ,gBAAgB,CAAC,gBAAgB,CAAC;IAC3E,KAAK,mBAA0B;IAEvB,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;cAIzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAK/B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;;;;;OAMG;IACG,YAAY,CAAC,KAAK,EAAE,SAAS;IAgCnC;;;;;;;;OAQG;IACG,cAAc,CAClB,IAAI,EAAE,iBAAiB,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAcjB"}

package/out/controller/view/list-exp-view.js

@@ -1,5 +1,4 @@
-import { DefectModelError, } from '@ibiz-template/model';
-import { calcNavParams, ListExpViewState, MDViewController } from '../..';
+import { calcNavParams, ListExpViewState, MDViewController, } from '../..';
 import { ListExpViewNerve } from '../neuron';
 export class ListExpViewController extends MDViewController {
     constructor() {
@@ -25,11 +24,11 @@ export class ListExpViewController extends MDViewController {
      *
      * @author chitanda
      * @date 2022-12-28 16:12:23
-     * @return {*}  {Promise<IData[]>}
+     * @return {*}  {Promise<IDatum[]>}
      */
     async load() {
         const { list } = this.nerve;
-        return list.call.load();
+        return list.load();
     }
     /**
      * 视图删除方法
@@ -40,7 +39,7 @@ export class ListExpViewController extends MDViewController {
      */
     async remove() {
         const { list } = this.nerve;
-        await list.call.remove();
+        await list.remove();
     }
     /**
      * 激活数据变更
@@ -49,10 +48,8 @@ export class ListExpViewController extends MDViewController {
      * @date 2022-08-28 18:08:50
      * @param {IData} data 选中的数据
      */
-    async onDataActive(data) {
-        if (this.state.toolbarState) {
-            this.state.toolbarState.update(data === null || data === void 0 ? void 0 : data.getOrigin());
-        }
+    async onDataActive(event) {
+        const data = event.data[0];
         const { list } = this.model.listExpBar;
         if (list && list.navView) {
             if (!list.navView.initialized) {
@@ -65,7 +62,10 @@ export class ListExpViewController extends MDViewController {
             Object.assign(tempContext, resultContext);
             // 路由模式下跳转视图，变更路由
             if (this.context.isRouter) {
-                Object.assign(tempContext, { toRouteLevel: this.modal.level + 1 });
+                Object.assign(tempContext, {
+                    toRouteLevel: this.modal.level + 1,
+                    currentSrfNav: data.srfkey,
+                });
                 ibiz.openView.root(list.navView.source, tempContext, tempParams);
             }
             else {
@@ -79,20 +79,22 @@ export class ListExpViewController extends MDViewController {
      *
      * @author chitanda
      * @date 2022-12-28 21:12:18
-     * @param {IPSDETBUIActionItem} item
+     * @param {IDETBUIActionItem} item
      * @param {MouseEvent} event
      * @return {*}  {Promise<void>}
      */
     async onToolbarClick(item, event) {
-        const action = item.getPSAppViewUIAction();
-        if (!action) {
-            throw new DefectModelError(item, '没有配置界面行为!');
-        }
-        const viewLogicKey = `${action.name}_click`;
-        const appViewLogic = this.model.listExpBar.source.findPSAppViewLogic(viewLogicKey);
-        if (!appViewLogic) {
-            throw new DefectModelError(action, '没有找到对应的视图逻辑');
-        }
-        return this.executeViewLogic(appViewLogic, this.getData(), event);
+        // todo
+        // const action = item.getPSAppViewUIAction();
+        // if (!action) {
+        //   throw new RuntimeModelError(item, '没有配置界面行为!');
+        // }
+        // const viewLogicKey = `${action.name}_click`;
+        // const appViewLogic =
+        //   this.model.listExpBar.source.findPSAppViewLogic(viewLogicKey);
+        // if (!appViewLogic) {
+        //   throw new RuntimeModelError(action, '没有找到对应的视图逻辑');
+        // }
+        // return this.executeViewLogic(appViewLogic, this.getData(), event);
     }
 }

package/out/controller/view/list-view.d.ts

@@ -1,4 +1,4 @@
-import { ListViewModel } from '@ibiz-template/model';
+import { ListViewModel } from '@ibiz/model-core';
 import { ListViewNerve } from '../neuron';
 import { ListViewState } from '../state';
 import { MDViewController } from './md-view';
@@ -21,7 +21,7 @@ export declare class ListViewController extends MDViewController<ListViewModel>
      * @date 2022-08-30 19:08:59
      * @returns {*}  {Promise<void>}
      */
-    load(): Promise<IData[]>;
+    load(): Promise<IDatum[]>;
     /**
      * 视图删除方法
      *

package/out/controller/view/list-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/list-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C;;;;;;GAMG;AACH,qBAAa,kBAAmB,SAAQ,gBAAgB,CAAC,aAAa,CAAC;IACrE,KAAK,gBAAuB;IAEpB,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;cAItB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAK9B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAI9B"}
+{"version":3,"file":"list-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/list-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C;;;;;;GAMG;AACH,qBAAa,kBAAmB,SAAQ,gBAAgB,CAAC,aAAa,CAAC;IACrE,KAAK,gBAAuB;IAEpB,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;cAItB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAK/B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAI9B"}

package/out/controller/view/list-view.js

@@ -33,7 +33,7 @@ export class ListViewController extends MDViewController {
      */
     async load() {
         const { list } = this.nerve;
-        return list.call.load();
+        return list.load();
     }
     /**
      * 视图删除方法
@@ -44,6 +44,6 @@ export class ListViewController extends MDViewController {
      */
     async remove() {
         const { list } = this.nerve;
-        await list.call.remove();
+        await list.remove();
     }
 }

package/out/controller/view/main-view.d.ts

@@ -1,4 +1,4 @@
-import { ViewModel } from '@ibiz-template/model';
+import { ViewModel } from '@ibiz/model-core';
 import { EntityService } from '../../service';
 import { ViewController } from './view';
 /**

package/out/controller/view/main-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/main-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;;;;;GAOG;AACH,qBAAa,kBAAkB,CAC7B,CAAC,SAAS,SAAS,GAAG,SAAS,CAC/B,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC;IAEjB;;;;;OAKG;IACU,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAgBnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;CAY/B"}
+{"version":3,"file":"main-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/main-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;;;;;GAOG;AACH,qBAAa,kBAAkB,CAC7B,CAAC,SAAS,SAAS,GAAG,SAAS,CAC/B,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC;IAEjB;;;;;OAKG;IACU,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAkBnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;CAY/B"}

package/out/controller/view/main-view.js

@@ -17,13 +17,16 @@ export class MainViewController extends ViewController {
     async load() {
         // 初始化实体服务
         if (!this.entityService) {
-            this.entityService = await this.app.es.getService(this.model.appEntity.codeName);
+            this.entityService = await this.app.es.getService(
+            // todo
+            // this.model.appEntity.codeName,
+            '');
         }
         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/out/controller/view/md-view.d.ts

@@ -1,4 +1,5 @@
-import { MDViewModel } from '@ibiz-template/model';
+import { MDViewModel } from '@ibiz/model-core';
+import { EventBase } from '../interface';
 import { MDViewNerve } from '../neuron';
 import { MDViewState } from '../state';
 import { ViewController } from './view';
@@ -24,14 +25,14 @@ export declare class MDViewController<T extends MDViewModel = MDViewModel> exten
      * @date 2022-08-28 18:08:59
      * @returns {*}
      */
-    getData(): IData[];
+    getData(): IDatum[];
     /**
      * 加载方法（子类实现）
      *
      * @author lxm
      * @date 2022-08-31 11:08:10
      */
-    load(): Promise<IData[]>;
+    load(): Promise<IDatum[]>;
     refresh(): Promise<void>;
     /**
      * 打开编辑数据视图
@@ -88,9 +89,9 @@ export declare class MDViewController<T extends MDViewModel = MDViewModel> exten
      *
      * @author lxm
      * @date 2022-08-28 18:08:50
-     * @param {IData[]} data 选中的数据集合
+     * @param {IDatum[]} data 选中的数据集合
      */
-    onSelectionChange(data: IData[]): void;
+    onSelectionChange(event: EventBase): void;
     /**
      * 处理单条数据激活
      *
@@ -98,7 +99,7 @@ export declare class MDViewController<T extends MDViewModel = MDViewModel> exten
      * @date 2022-08-21 18:08:52
      * @param {IData} data
      */
-    onDataActive(data: IData, event?: MouseEvent): Promise<void>;
+    onDataActive(event: EventBase): Promise<void>;
     /**
      * 处理多数据部件的beforeLoad事件
      *
@@ -106,27 +107,27 @@ export declare class MDViewController<T extends MDViewModel = MDViewModel> exten
      * @date 2022-08-31 11:08:29
      * @returns {*}  {IParams}
      */
-    onBeforeLoad(): IParams;
+    onBeforeLoad(): void;
     /**
      * 处理保存之后事件
      *
      * @author lxm
      * @date 2022-11-15 18:11:26
-     * @param {IData[]} data 保存的数据
+     * @param {IDatum[]} data 保存的数据
      * @param {boolean} isCreate 是否是创建
      * @param {string} controlName 部件名称
      * @returns {*}  {Promise<void>}
      */
-    onAfterSave(data: IData[], isCreate: boolean, controlName: string): Promise<void>;
+    onAfterSave(event: EventBase): Promise<void>;
     /**
      * 处理删除结束之后事件
      *
      * @author lxm
      * @date 2022-11-15 18:11:07
-     * @param {IData[]} data 删除的数据
+     * @param {IDatum[]} data 删除的数据
      * @param {string} controlName 部件名称
      * @returns {*}  {Promise<void>}
      */
-    onAfterRemove(data: IData[], controlName: string): Promise<void>;
+    onAfterRemove(event: EventBase): Promise<void>;
 }
 //# sourceMappingURL=md-view.d.ts.map

package/out/controller/view/md-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/md-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;;;;;;;GASG;AACH,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,WAAW,GAAG,WAAW,CACnC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB,KAAK,cAAqB;IAElB,KAAK,EAAE,WAAW,CAAC;IAE3B,SAAS,CAAC,WAAW,IAAI,WAAW;cAIpB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBvC;;;;;;OAMG;IACH,OAAO;IAIP;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAKxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9B;;;;;;;;OAQG;IACG,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9D;;;;;;;;OAQG;IACG,OAAO,CAAC,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAOhD;;;;;OAKG;IACH,YAAY,IAAI,IAAI;IAIpB;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC;;;;;;OAMG;IACG,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE;IAO/B;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU;IAI5C;;;;;;OAMG;IACH,YAAY,IAAI,OAAO;IAUvB;;;;;;;;;OASG;IACG,WAAW,CACf,IAAI,EAAE,KAAK,EAAE,EACb,QAAQ,EAAE,OAAO,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC;IAQhB;;;;;;;;OAQG;IACG,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAOvE"}
+{"version":3,"file":"md-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/md-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;;;;;;;GASG;AACH,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,WAAW,GAAG,WAAW,CACnC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB,KAAK,cAAqB;IAElB,KAAK,EAAE,WAAW,CAAC;IAE3B,SAAS,CAAC,WAAW,IAAI,WAAW;cAIpB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBvC;;;;;;OAMG;IACH,OAAO;IAIP;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9B;;;;;;;;OAQG;IACG,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ9D;;;;;;;;OAQG;IACG,OAAO,CAAC,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAOhD;;;;;OAKG;IACH,YAAY,IAAI,IAAI;IAIpB;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC;;;;;;OAMG;IACG,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;;;;;OAMG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS;IAQlC;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,SAAS;IAK7B;;;;;;OAMG;IACH,YAAY,IAAI,IAAI;IAWpB;;;;;;;;;OASG;IACG,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlD;;;;;;;;OAQG;IACG,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAMrD"}

package/out/controller/view/md-view.js

@@ -22,9 +22,9 @@ export class MDViewController extends ViewController {
     async onInit() {
         await super.onInit();
         // 搜索表单默认展开与否
-        this.state.showSearchForm = this.model.source.expandSearchForm;
-        this.nerve.self.evt.on('mounted', () => {
-            if (this.model.source.loadDefault) {
+        this.state.showSearchForm = !!this.model.expandSearchForm;
+        this.nerve.self.on('onMounted', () => {
+            if (this.model.loadDefault) {
                 this.load();
             }
         });
@@ -55,8 +55,8 @@ export class MDViewController extends ViewController {
         return [];
     }
     async refresh() {
-        const data = await this.load();
-        this.nerve.self.evt.asyncEmit('refreshed', data);
+        await this.load();
+        await this.nerve.self.emit('onRefreshed', undefined);
     }
     /**
      * 打开编辑数据视图
@@ -68,10 +68,11 @@ export class MDViewController extends ViewController {
      * @returns {*}
      */
     async openData(data, event) {
-        const openAppViewLogic = this.model.source.findPSAppViewLogic('opendata');
-        if (openAppViewLogic) {
-            await this.executeViewLogic(openAppViewLogic, [data], event);
-        }
+        // todo
+        // const openAppViewLogic = this.model.findPSAppViewLogic('opendata');
+        // if (openAppViewLogic) {
+        //   await this.executeViewLogic(openAppViewLogic, [data], event);
+        // }
     }
     /**
      * 打开新建数据视图
@@ -83,10 +84,10 @@ export class MDViewController extends ViewController {
      * @returns {*}
      */
     async newData(event) {
-        const openAppViewLogic = this.model.source.findPSAppViewLogic('newdata');
-        if (openAppViewLogic) {
-            await this.executeViewLogic(openAppViewLogic, [{}], event);
-        }
+        // const openAppViewLogic = this.model.findPSAppViewLogic('newdata');
+        // if (openAppViewLogic) {
+        //   await this.executeViewLogic(openAppViewLogic, [{}], event);
+        // }
     }
     /**
      * 切换搜索表单的显示
@@ -131,13 +132,13 @@ export class MDViewController extends ViewController {
      *
      * @author lxm
      * @date 2022-08-28 18:08:50
-     * @param {IData[]} data 选中的数据集合
+     * @param {IDatum[]} data 选中的数据集合
      */
-    onSelectionChange(data) {
-        var _a;
+    onSelectionChange(event) {
+        const data = event.data || [];
         this.state.selectedData = data;
-        if (this.state.toolbarState) {
-            this.state.toolbarState.update((_a = data[0]) === null || _a === void 0 ? void 0 : _a.getOrigin());
+        if (this.nerve.toolbar) {
+            this.nerve.toolbar.calcButtonState({ data });
         }
     }
     /**
@@ -147,8 +148,9 @@ export class MDViewController extends ViewController {
      * @date 2022-08-21 18:08:52
      * @param {IData} data
      */
-    onDataActive(data, event) {
-        return this.openData(data, event);
+    onDataActive(event) {
+        const data = event.data[0];
+        return this.openData(data, event.event);
     }
     /**
      * 处理多数据部件的beforeLoad事件
@@ -161,26 +163,26 @@ export class MDViewController extends ViewController {
         const params = { 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;
     }
     /**
      * 处理保存之后事件
      *
      * @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, isCreate, controlName) {
-        this.nerve.self.evt.asyncEmit('viewDataChange', {
-            type: isCreate ? 'CREATE' : 'UPDATE',
-            data,
-            control: controlName,
+    async onAfterSave(event) {
+        await this.nerve.self.emit('onDataChange', {
+            data: event.data,
+            actionType: 'SAVE',
         });
     }
     /**
@@ -188,15 +190,14 @@ export class MDViewController extends ViewController {
      *
      * @author lxm
      * @date 2022-11-15 18:11:07
-     * @param {IData[]} data 删除的数据
+     * @param {IDatum[]} data 删除的数据
      * @param {string} controlName 部件名称
      * @returns {*}  {Promise<void>}
      */
-    async onAfterRemove(data, controlName) {
-        this.nerve.self.evt.asyncEmit('viewDataChange', {
-            type: 'REMOVE',
-            data,
-            control: controlName,
+    async onAfterRemove(event) {
+        await this.nerve.self.emit('onDataChange', {
+            data: event.data,
+            actionType: 'REMOVE',
         });
     }
 }

package/out/controller/view/mpickup-view.d.ts

@@ -1,4 +1,5 @@
-import { MPickupViewModel } from '@ibiz-template/model';
+import { MPickupViewModel } from '@ibiz/model-core';
+import { EventBase } from '../interface';
 import { MPickupViewNerve } from '../neuron';
 import { MPickupViewState } from '../state';
 import { PickupViewController } from './pickup-view';
@@ -21,9 +22,9 @@ export declare class MPickupViewController extends PickupViewController<MPickupV
      *
      * @author lxm
      * @date 2022-09-12 01:09:06
-     * @param {IData[]} data
+     * @param {IDatum[]} data
      */
-    onSelectionChange(data: IData[]): void;
+    onSelectionChange(event: EventBase): void;
     /**
      * 选中所有数据
      *
@@ -36,17 +37,17 @@ export declare class MPickupViewController extends PickupViewController<MPickupV
      *
      * @author lxm
      * @date 2022-09-12 19:09:27
-     * @param {IData[]} data
+     * @param {IDatum[]} data
      */
-    addSelections(data: IData[]): void;
+    addSelections(data: IDatum[]): void;
     /**
      * 删除已选中项
      *
      * @author lxm
      * @date 2022-09-12 19:09:19
-     * @param {IData[]} data
+     * @param {IDatum[]} data
      */
-    removeSelections(data: IData[]): void;
+    removeSelections(data: IDatum[]): void;
     /**
      * 确认按钮回调
      *

package/out/controller/view/mpickup-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mpickup-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/mpickup-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB,CAAC,gBAAgB,CAAC;IAC/E,KAAK,mBAA0B;IAEvB,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;cAIzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvC;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE;IAI/B;;;;;OAKG;IACG,SAAS;IAOf;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE;IAY3B;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE;IAa9B;;;;;OAKG;IACH,eAAe;IAIf;;;;;OAKG;IACH,mBAAmB;CAGpB"}
+{"version":3,"file":"mpickup-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/mpickup-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB,CAAC,gBAAgB,CAAC;IAC/E,KAAK,mBAA0B;IAEvB,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;cAIzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvC;;;;;;OAMG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS;IAIlC;;;;;OAKG;IACG,SAAS;IAOf;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE;IAY5B;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE;IAa/B;;;;;OAKG;IACH,eAAe;IAIf;;;;;OAKG;IACH,mBAAmB;CAGpB"}

package/out/controller/view/mpickup-view.js

@@ -29,10 +29,10 @@ export class MPickupViewController extends PickupViewController {
      *
      * @author lxm
      * @date 2022-09-12 01:09:06
-     * @param {IData[]} data
+     * @param {IDatum[]} data
      */
-    onSelectionChange(data) {
-        this.state.embedSelection = data;
+    onSelectionChange(event) {
+        this.state.embedSelection = event.data || [];
     }
     /**
      * 选中所有数据
@@ -41,7 +41,7 @@ export class MPickupViewController extends PickupViewController {
      * @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);
         }
@@ -51,7 +51,7 @@ export class MPickupViewController extends PickupViewController {
      *
      * @author lxm
      * @date 2022-09-12 19:09:27
-     * @param {IData[]} data
+     * @param {IDatum[]} data
      */
     addSelections(data) {
         if (data.length > 0) {
@@ -67,7 +67,7 @@ export class MPickupViewController extends PickupViewController {
      *
      * @author lxm
      * @date 2022-09-12 19:09:19
-     * @param {IData[]} data
+     * @param {IDatum[]} data
      */
     removeSelections(data) {
         if (data.length > 0) {

package/out/controller/view/opt-view.d.ts

@@ -1,4 +1,4 @@
-import { OptViewModel } from '@ibiz-template/model';
+import { OptViewModel } from '@ibiz/model-core';
 import { OptViewNerve } from '../neuron';
 import { EditViewController } from '.';
 /**

package/out/controller/view/opt-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opt-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/opt-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,GAAG,CAAC;AAEvC;;;;;;;;GAQG;AACH,qBAAa,iBAAkB,SAAQ,kBAAkB,CAAC,YAAY,CAAC;IAC7D,KAAK,EAAE,YAAY,CAAC;IAE5B,SAAS,CAAC,WAAW,IAAI,YAAY;IAIrC;;;;;;OAMG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtC;;;;;;OAMG;IACH,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAGrC"}
+{"version":3,"file":"opt-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/opt-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,GAAG,CAAC;AAEvC;;;;;;;;GAQG;AACH,qBAAa,iBAAkB,SAAQ,kBAAkB,CAAC,YAAY,CAAC;IAC7D,KAAK,EAAE,YAAY,CAAC;IAE5B,SAAS,CAAC,WAAW,IAAI,YAAY;IAIrC;;;;;;OAMG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtC;;;;;;OAMG;IACH,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAGrC"}

package/out/controller/view/pickup-grid-view.d.ts

@@ -1,3 +1,4 @@
+import { EventBase } from '../interface';
 import { PickupGridViewNerve } from '../neuron';
 import { GridViewController } from './grid-view';
 /**
@@ -17,16 +18,16 @@ export declare class PickupGridViewController extends GridViewController {
      *
      * @author lxm
      * @date 2022-08-28 18:08:50
-     * @param {IData[]} data 选中的数据集合
+     * @param {IDatum[]} data 选中的数据集合
      */
-    onSelectionChange(data: IData[]): void;
+    onSelectionChange(event: EventBase): void;
     /**
      * 选中所有数据并返回
      *
      * @author lxm
      * @date 2022-09-12 19:09:12
-     * @returns {*}  {Promise<IData[]>}
+     * @returns {*}  {Promise<IDatum[]>}
      */
-    selectAll(): Promise<IData[]>;
+    selectAll(): Promise<IDatum[]>;
 }
 //# sourceMappingURL=pickup-grid-view.d.ts.map

package/out/controller/view/pickup-grid-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pickup-grid-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/pickup-grid-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,wBAAyB,SAAQ,kBAAkB;IACtD,KAAK,EAAE,mBAAmB,CAAC;IAEnC,SAAS,CAAC,WAAW,IAAI,mBAAmB;IAI5C;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE;IAK/B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;CAGpC"}
+{"version":3,"file":"pickup-grid-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/pickup-grid-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,wBAAyB,SAAQ,kBAAkB;IACtD,KAAK,EAAE,mBAAmB,CAAC;IAEnC,SAAS,CAAC,WAAW,IAAI,mBAAmB;IAI5C;;;;;;OAMG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS;IAOlC;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAGrC"}

package/out/controller/view/pickup-grid-view.js

@@ -18,20 +18,22 @@ export class PickupGridViewController extends GridViewController {
      *
      * @author lxm
      * @date 2022-08-28 18:08:50
-     * @param {IData[]} data 选中的数据集合
+     * @param {IDatum[]} data 选中的数据集合
      */
-    onSelectionChange(data) {
-        super.onSelectionChange(data);
-        this.nerve.self.evt.asyncEmit('selectionChange', this.state.selectedData);
+    onSelectionChange(event) {
+        super.onSelectionChange(event);
+        this.nerve.self.emit('onSelectionChange', {
+            data: [...this.getData()],
+        });
     }
     /**
      * 选中所有数据并返回
      *
      * @author lxm
      * @date 2022-09-12 19:09:12
-     * @returns {*}  {Promise<IData[]>}
+     * @returns {*}  {Promise<IDatum[]>}
      */
     async selectAll() {
-        return this.nerve.grid.call.selectAll();
+        return this.nerve.grid.selectAll();
     }
 }

package/out/controller/view/pickup-view.d.ts

@@ -1,4 +1,5 @@
-import { PickupViewModel } from '@ibiz-template/model';
+import { PickupViewModel } from '@ibiz/model-core';
+import { EventBase } from '../interface';
 import { PickupViewNerve } from '../neuron';
 import { PickupViewState } from '../state';
 import { ViewController } from './view';
@@ -16,13 +17,20 @@ export declare class PickupViewController<T extends PickupViewModel = PickupView
     nerve: PickupViewNerve;
     protected createNerve(): PickupViewNerve;
     protected onInit(): Promise<void>;
+    /**
+     * 导航相关参数处理
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-03-28 14:23:38
+     */
+    calcNavParams(): void;
     /**
      * 选择视图选中数据变更事件处理
      *
      * @author lxm
      * @date 2022-09-12 01:09:06
-     * @param {IData[]} data
+     * @param {IDatum[]} data
      */
-    onSelectionChange(data: IData[]): void;
+    onSelectionChange(event: EventBase): void;
 }
 //# sourceMappingURL=pickup-view.d.ts.map

package/out/controller/view/pickup-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pickup-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/pickup-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;;;;;;GAQG;AACH,qBAAa,oBAAoB,CAC/B,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB,KAAK,kBAAyB;IAEtB,KAAK,EAAE,eAAe,CAAC;IAE/B,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAWvC;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE;CAGhC"}
+{"version":3,"file":"pickup-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/pickup-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;;;;;;GAQG;AACH,qBAAa,oBAAoB,CAC/B,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB,KAAK,kBAAyB;IAEtB,KAAK,EAAE,eAAe,CAAC;IAE/B,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC;;;;;OAKG;IACH,aAAa;IAYb;;;;;;OAMG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS;CAOnC"}

package/out/controller/view/pickup-view.js

@@ -1,3 +1,4 @@
+import { calcNavParams } from '../../utils';
 import { PickupViewNerve } from '../neuron';
 import { PickupViewState } from '../state';
 import { ViewController } from './view';
@@ -20,20 +21,35 @@ export class PickupViewController extends ViewController {
     }
     async onInit() {
         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.navigateContexts,
+            navParams: this.model.pickupViewPanel.source.navigateParams,
+        }, { context: this.context, params: this.params, datum: {} });
+        Object.assign(this.context, resultContext);
+        Object.assign(this.params, resultParams);
     }
     /**
      * 选择视图选中数据变更事件处理
      *
      * @author lxm
      * @date 2022-09-12 01:09:06
-     * @param {IData[]} data
+     * @param {IDatum[]} data
      */
-    onSelectionChange(data) {
-        this.nerve.self.evt.asyncEmit('closeView', { ok: true, data });
+    onSelectionChange(event) {
+        const { data } = event;
+        this.nerve.self.emit('onCloseView', {
+            ok: true,
+            data,
+        });
     }
 }