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

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

@@ -23,7 +23,7 @@ export class MDViewController extends ViewController {
         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();
             }
@@ -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);
     }
     /**
      * 打开编辑数据视图
@@ -133,11 +133,11 @@ export class MDViewController extends ViewController {
      * @date 2022-08-28 18:08:50
      * @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 +147,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,10 +162,11 @@ 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;
     }
     /**
      * 处理保存之后事件
@@ -176,11 +178,10 @@ export class MDViewController extends ViewController {
      * @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',
         });
     }
     /**
@@ -192,11 +193,10 @@ export class MDViewController extends ViewController {
      * @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 { EventBase } from '../interface';
 import { MPickupViewNerve } from '../neuron';
 import { MPickupViewState } from '../state';
 import { PickupViewController } from './pickup-view';
@@ -23,7 +24,7 @@ export declare class MPickupViewController extends PickupViewController<MPickupV
      * @date 2022-09-12 01:09:06
      * @param {IDatum[]} data
      */
-    onSelectionChange(data: IDatum[]): void;
+    onSelectionChange(event: EventBase): 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,MAAM,EAAE;IAIhC;;;;;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"}
+{"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,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

@@ -31,8 +31,8 @@ export class MPickupViewController extends PickupViewController {
      * @date 2022-09-12 01:09:06
      * @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);
         }

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';
 /**
@@ -19,7 +20,7 @@ export declare class PickupGridViewController extends GridViewController {
      * @date 2022-08-28 18:08:50
      * @param {IDatum[]} data 选中的数据集合
      */
-    onSelectionChange(data: IDatum[]): void;
+    onSelectionChange(event: EventBase): void;
     /**
      * 选中所有数据并返回
      *

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,MAAM,EAAE;IAKhC;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAGrC"}
+{"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

@@ -20,9 +20,11 @@ export class PickupGridViewController extends GridViewController {
      * @date 2022-08-28 18:08:50
      * @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()],
+        });
     }
     /**
      * 选中所有数据并返回
@@ -32,6 +34,6 @@ export class PickupGridViewController extends GridViewController {
      * @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 { EventBase } from '../interface';
 import { PickupViewNerve } from '../neuron';
 import { PickupViewState } from '../state';
 import { ViewController } from './view';
@@ -16,6 +17,13 @@ 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;
     /**
      * 选择视图选中数据变更事件处理
      *
@@ -23,6 +31,6 @@ export declare class PickupViewController<T extends PickupViewModel = PickupView
      * @date 2022-09-12 01:09:06
      * @param {IDatum[]} data
      */
-    onSelectionChange(data: IDatum[]): 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,MAAM,EAAE;CAGjC"}
+{"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;AAEvD,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,11 +21,22 @@ 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.getPSNavigateContexts(),
+            navParams: this.model.pickupViewPanel.source.getPSNavigateParams(),
+        }, { context: this.context, params: this.params, datum: {} });
+        Object.assign(this.context, resultContext);
+        Object.assign(this.params, resultParams);
     }
     /**
      * 选择视图选中数据变更事件处理
@@ -33,7 +45,11 @@ export class PickupViewController extends ViewController {
      * @date 2022-09-12 01:09:06
      * @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,
+        });
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"tab-exp-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/tab-exp-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,oBAAoB,CAC/B,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IACrB,KAAK,EAAE,eAAe,CAAC;IAE/B;;;;OAIG;IACH,WAAW,EAAE;QACX,CAAC,GAAG,EAAE,MAAM,GAAG;YACb,GAAG,EAAE,MAAM,CAAC;SACb,CAAC;KACH,CAAM;IAEP,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAmBxC"}
+{"version":3,"file":"tab-exp-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/tab-exp-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,oBAAoB,CAC/B,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IACrB,KAAK,EAAE,eAAe,CAAC;IAE/B;;;;OAIG;IACH,WAAW,EAAE;QACX,CAAC,GAAG,EAAE,MAAM,GAAG;YACb,GAAG,EAAE,MAAM,CAAC;SACb,CAAC;KACH,CAAM;IAEP,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAqBxC"}

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

@@ -34,8 +34,10 @@ export class TabExpViewController extends MainViewController {
                 };
             });
         }
-        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/out/controller/view/tree-exp-view.d.ts

@@ -1,8 +1,8 @@
 import { TreeExpViewModel } from '@ibiz-template/model';
 import { TreeExpViewNerve } from '../neuron';
 import { TreeExpViewState } from '../state';
-import { ITreeNodeData } from '../../service';
 import { MDViewController } from './md-view';
+import { EventBase } from '../..';
 /**
  * 树导航视图控制器
  *
@@ -24,6 +24,13 @@ export declare class TreeExpViewController<T extends TreeExpViewModel = TreeExpV
      * @date 2022-08-31 11:08:10
      */
     load(): Promise<IDatum[]>;
-    onDataActive(nodeData: ITreeNodeData): Promise<void>;
+    /**
+     * 点击激活回调
+     * @author lxm
+     * @date 2023-03-26 04:12:38
+     * @param {EventBase} event
+     * @return {*}
+     */
+    onDataActive(event: EventBase): Promise<void>;
 }
 //# sourceMappingURL=tree-exp-view.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tree-exp-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/tree-exp-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAG7C;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAChC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAC7C,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC3B,KAAK,mBAA0B;IAEvB,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;cAIzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAMzB,YAAY,CAAC,QAAQ,EAAE,aAAa;CA+C3C"}
+{"version":3,"file":"tree-exp-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/tree-exp-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAiB,SAAS,EAAE,MAAM,OAAO,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAChC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAC7C,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC3B,KAAK,mBAA0B;IAEvB,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;cAIzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAM/B;;;;;;OAMG;IACG,YAAY,CAAC,KAAK,EAAE,SAAS;CAgDpC"}

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

@@ -36,10 +36,18 @@ export class TreeExpViewController extends MDViewController {
     async load() {
         // 调用数部件加载
         const { tree } = this.nerve;
-        return tree.call.load();
+        return tree.load();
     }
-    async onDataActive(nodeData) {
+    /**
+     * 点击激活回调
+     * @author lxm
+     * @date 2023-03-26 04:12:38
+     * @param {EventBase} event
+     * @return {*}
+     */
+    async onDataActive(event) {
         var _a;
+        const nodeData = event.data[0];
         const nodeModel = this.model.tree.getNodeById(nodeData.nodeId);
         const { navView } = nodeModel;
         if (!navView) {

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

@@ -1,11 +1,12 @@
-import { IBizContext } from '@ibiz-template/core';
-import { IPSAppViewLogic, IPSDETBUIActionItem, ViewModel } from '@ibiz-template/model';
+import { IPSAppViewLogic, ViewModel } from '@ibiz-template/model';
 import { LoadingState } from '../utils/loading/loading-state';
 import { ViewNerve } from '../neuron';
-import { IButtonContainerState, IControlProvider } from '../interface';
+import { IControlProvider, EventBase, INeuronController } from '../interface';
 import { IModal, IModalData } from '../../interface';
+import { ViewLogicDispatcher } from '../../view-logic';
 import { Application } from '../../application';
 import { ViewState } from '../state';
+import { CTX } from '../ctx';
 /**
  * 视图控制器
  *
@@ -14,7 +15,7 @@ import { ViewState } from '../state';
  * @export
  * @class ViewController
  */
-export declare class ViewController<T extends ViewModel = ViewModel> {
+export declare class ViewController<T extends ViewModel = ViewModel> implements INeuronController {
     modelPath: string;
     /**
      * 视图模型
@@ -52,9 +53,9 @@ export declare class ViewController<T extends ViewModel = ViewModel> {
      *
      * @author chitanda
      * @date 2022-07-24 17:07:46
-     * @type {IBizContext}
+     * @type {IContext}
      */
-    context: IBizContext;
+    context: IContext;
     /**
      * 视图参数
      *
@@ -63,6 +64,13 @@ export declare class ViewController<T extends ViewModel = ViewModel> {
      * @type {IParams}
      */
     params: IParams;
+    /**
+     * 上下文环境对象
+     * @author lxm
+     * @date 2023-03-27 02:04:51
+     * @type {CTX}
+     */
+    ctx: CTX;
     /**
      * 控制器是否已经准备完成
      * @deprecated
@@ -88,15 +96,6 @@ export declare class ViewController<T extends ViewModel = ViewModel> {
      * @type {string}
      */
     caption: string;
-    /**
-     * 视图工具栏界面状态
-     *
-     * @deprecated
-     * @author lxm
-     * @date 2022-10-13 23:10:20
-     * @type {IButtonContainerState}
-     */
-    toolbarState: IButtonContainerState | null;
     /**
      * 视图loading状态控制器
      *
@@ -114,6 +113,28 @@ export declare 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(): {
+        context: IContext;
+        params: IParams;
+        data: IDatum[];
+        targetName: string;
+        neuron: import("../neuron").ViewNeuron<import("../interface").IViewEvent, ViewController<ViewModel<import("@ibiz-template/model").IPSAppView>>>;
+        view: import("../neuron").ViewNeuron<import("../interface").IViewEvent, ViewController<ViewModel<import("@ibiz-template/model").IPSAppView>>>;
+        ctx: CTX;
+    };
     /**
      * Creates an instance of View.
      *
@@ -124,7 +145,7 @@ export declare class ViewController<T extends ViewModel = ViewModel> {
      * @param {IContext} context 上下文
      * @param {IParams} params 视图参数
      */
-    constructor(modelPath: string, context: IContext, params?: IParams);
+    constructor(modelPath: string, context: IContext, params?: IParams, ctx?: CTX);
     /**
      * 创建视图神经系统，子类覆盖
      *
@@ -152,14 +173,6 @@ export declare class ViewController<T extends ViewModel = ViewModel> {
      * @returns {*}  {Promise<void>}
      */
     protected onInit(): Promise<void>;
-    /**
-     * 初始化工具栏控制对象
-     *
-     * @author lxm
-     * @date 2022-10-13 23:10:37
-     * @returns {*}  {void}
-     */
-    initToolbarState(): void;
     /**
      * 处理上下文和导航参数相关的，如自定义导航参数的处理
      *
@@ -199,15 +212,7 @@ export declare class ViewController<T extends ViewModel = ViewModel> {
      * @author lxm
      * @date 2022-08-29 01:08:50
      */
-    closeView(data?: IModalData): Promise<void>;
-    /**
-     * 注入neuron的能力，由外部接受close事件的父级去调用
-     *
-     * @author lxm
-     * @date 2022-09-09 16:09:41
-     * @returns {*}  {Promise<boolean>}
-     */
-    beforeClose(): Promise<boolean>;
+    closeView(modalData?: IModalData): Promise<void>;
     /**
      * 强制更新视图（框架级）
      *
@@ -225,15 +230,6 @@ export declare class ViewController<T extends ViewModel = ViewModel> {
      * @param {...any[]} args
      */
     emit(_event: string, ..._args: any[]): void;
-    /**
-     * 处理工具栏菜单项点击
-     *
-     * @author lxm
-     * @date 2022-08-28 20:08:25
-     * @param {IPSDETBUIActionItem} item
-     * @param {MouseEvent} _event
-     */
-    onToolbarClick(item: IPSDETBUIActionItem, event: MouseEvent): Promise<void>;
     /**
      * 执行视图逻辑
      *
@@ -258,13 +254,14 @@ export declare class ViewController<T extends ViewModel = ViewModel> {
      * @author lxm
      * @date 2022-09-19 14:09:00
      */
-    beginViewLoading(): void;
+    startLoading(): void;
     /**
      *关闭视图loading
      *
      * @author lxm
      * @date 2022-09-19 14:09:09
      */
-    endViewLoading(): void;
+    endLoading(): void;
+    onCtrlEvent(event: EventBase): Promise<void>;
 }
 //# sourceMappingURL=view.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/view.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGlE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAGrD,OAAO,EAAoB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B;;;;;;;GAOG;AACH,qBAAa,cAAc,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,CACzD,YAAW,iBAAiB;IAiJnB,SAAS,EAAE,MAAM;IA/I1B;;;;;;;OAOG;IACH,KAAK,EAAG,CAAC,CAAC;IAEV;;;;OAIG;IACH,KAAK,YAAmB;IAExB;;;;;;OAMG;IACH,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAA4B;IAEzC;;;;;;OAMG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,GAAG,EAAE,GAAG,CAAC;IAET;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,KAAK,EAAG,SAAS,CAAC;IAElB;;;;;;;OAOG;IACH,OAAO,EAAG,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,WAAW,eAAsB;IAEjC;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;OAKG;IACH,eAAe,EAAG,mBAAmB,CAAC;IAEtC;;;;;OAKG;IACH,IAAI,SAAS;;;;;;;;MAUZ;IAED;;;;;;;;;OASG;gBAEM,SAAS,EAAE,MAAM,EACxB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG;IAQX;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,SAAS;IAIlC;;;;;;;OAOG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAU3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BvC;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IA6BlC;;;;;;OAMG;IACH,OAAO,IAAI,IAAI;IAOf;;;;;OAKG;IACG,OAAO;IAIb;;;;;;;;OAQG;IACH,OAAO,IAAI,MAAM,EAAE;IAInB;;;;;OAKG;IACG,SAAS,CAAC,SAAS,GAAE,UAA+C;IAO1E;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;;;OAOG;IAEH,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI;IAK3C;;;;;;;;OAQG;IACG,gBAAgB,CACpB,YAAY,EAAE,eAAe,EAC7B,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,IAAI,CAAC;IAsBhB;;;;;;OAMG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM;IAQ1B;;;;;OAKG;IACH,YAAY;IAKZ;;;;;OAKG;IACH,UAAU;IAMJ,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CASnD"}