@ibiz-template/runtime 0.0.3-beta.6 → 0.0.4-beta.2

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 { IAppViewLogic, ViewModel } from '@ibiz/model-core';
 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: any;
+        neuron: import("../neuron").ViewNeuron<import("../interface").IViewEvent, ViewController<ViewModel>>;
+        view: import("../neuron").ViewNeuron<import("../interface").IViewEvent, ViewController<ViewModel>>;
+        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,25 +230,16 @@ 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>;
     /**
      * 执行视图逻辑
      *
      * @author lxm
      * @date 2022-09-08 10:09:38
-     * @param {IPSAppViewLogic} appViewLogic 视图逻辑
+     * @param {IAppViewLogic} appViewLogic 视图逻辑
      * @param {IDatum[]} data 数据
      * @param {MouseEvent} event 原生事件
      */
-    executeViewLogic(appViewLogic: IPSAppViewLogic, data: IDatum[], event?: MouseEvent): Promise<void>;
+    executeViewLogic(appViewLogic: IAppViewLogic, data: IDatum[], 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":"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"}

package/out/controller/view/view.js

@@ -1,13 +1,12 @@
-import { IBizContext } from '@ibiz-template/core';
-import { DefectModelError, } 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 { ViewMode } from '../../constant';
 import { convertNavData } from '../../utils';
-import { executeViewLogic } from '../../view-logic';
+import { executeViewLogic, ViewLogicDispatcher } from '../../view-logic';
 import { ViewState } from '../state';
+import { CTX } from '../ctx';
 /**
  * 视图控制器
  *
@@ -17,6 +16,23 @@ import { ViewState } from '../state';
  * @class ViewController
  */
 export class ViewController {
+    /**
+     * 获取部件通用的事件参数
+     * @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.
      *
@@ -27,7 +43,7 @@ export class ViewController {
      * @param {IContext} context 上下文
      * @param {IParams} params 视图参数
      */
-    constructor(modelPath, context, params = {}) {
+    constructor(modelPath, context, params, ctx) {
         this.modelPath = modelPath;
         /**
          * 视图UI状态
@@ -51,15 +67,6 @@ export class ViewController {
          * @type {boolean}
          */
         this.complete = false;
-        /**
-         * 视图工具栏界面状态
-         *
-         * @deprecated
-         * @author lxm
-         * @date 2022-10-13 23:10:20
-         * @type {IButtonContainerState}
-         */
-        this.toolbarState = null;
         /**
          * 视图loading状态控制器
          *
@@ -76,8 +83,9 @@ export class ViewController {
          */
         this.providers = {};
         this.context = IBizContext.create({}, context);
-        this.params = params;
+        this.params = params || {};
         this.nerve = this.createNerve();
+        this.ctx = new CTX(ctx);
     }
     /**
      * 创建视图神经系统，子类覆盖
@@ -116,41 +124,27 @@ export class ViewController {
      * @returns {*}  {Promise<void>}
      */
     async onInit() {
+        await this.ctx.init(this.nerve.self);
         this.emit('neuronInit', this.nerve.self);
-        this.model = (await ibiz.model.getView(this.modelPath));
-        this.app = ibiz.hub.getApp(this.model.modelService.app);
+        // TODO
+        // this.model = (await ibiz.model.getView(this.modelPath)) as T;
+        // this.app = ibiz.hub.getApp(this.model.modelService.app);
         // 处理上下文和导航参数
         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() {
-        if (!this.model.toolbar) {
-            return;
-        }
-        // 初始化工具栏状态控制对象
-        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.logicDispatcher = new ViewLogicDispatcher(this.context, this.params);
+        // if (this.model.getPSAppViewLogics()?.length) {
+        //   await this.logicDispatcher.init(this.model.getPSAppViewLogics()!);
+        // }
+        // 监听视图事件
+        this.nerve.self.onAll((_name, event) => {
+            return this.logicDispatcher.view.fire(event);
         });
-        toolbarState.update();
-        this.state.toolbarState = toolbarState;
     }
     /**
      * 处理上下文和导航参数相关的，如自定义导航参数的处理
@@ -170,14 +164,14 @@ export class ViewController {
             this.context.srfsessionid = createUUID();
         }
         // 处理自定义导航上下文
-        const navContexts = this.model.source.getPSAppViewNavContexts();
+        const navContexts = this.model.appViewNavContexts;
         let context = {};
         if (notNilEmpty(navContexts)) {
             context = convertNavData(navContexts, this.context, this.params);
         }
         Object.assign(this.context, context);
         // 处理自定义视图参数
-        const navParams = this.model.source.getPSAppViewNavParams();
+        const navParams = this.model.appViewNavParams;
         let params = {};
         if (notNilEmpty(navParams)) {
             params = convertNavData(navParams, this.context, this.params);
@@ -194,6 +188,8 @@ export class ViewController {
     destroy() {
         this.nerve.destroy();
         this.context.destroy();
+        this.logicDispatcher.destroy();
+        this.ctx.destory();
     }
     /**
      * 刷新方法
@@ -222,19 +218,11 @@ export class ViewController {
      * @author lxm
      * @date 2022-08-29 01:08:50
      */
-    async closeView(data = { 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() {
-        // todo关闭视图的判断，如弹出关闭提示
-        return true;
+    async closeView(modalData = { ok: true, data: this.getData() }) {
+        this.nerve.self.emit('onCloseView', {
+            data: modalData.data,
+            ok: modalData.ok,
+        });
     }
     /**
      * 强制更新视图（框架级）
@@ -260,35 +248,17 @@ export class ViewController {
         // 在需要向父组件抛事件时，会调用此方法。
         // 可外部覆盖实例的此方法，实现自定义的抛事件逻辑。
     }
-    /**
-     * 处理工具栏菜单项点击
-     *
-     * @author lxm
-     * @date 2022-08-28 20:08:25
-     * @param {IPSDETBUIActionItem} item
-     * @param {MouseEvent} _event
-     */
-    async onToolbarClick(item, event) {
-        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 {IAppViewLogic} appViewLogic 视图逻辑
      * @param {IDatum[]} data 数据
      * @param {MouseEvent} event 原生事件
      */
     async executeViewLogic(appViewLogic, data, event) {
+        // todo 后面没用了
         const result = await executeViewLogic(appViewLogic, this.context, data, this.params, {
             event,
             neuron: this.nerve.self,
@@ -310,7 +280,9 @@ export class ViewController {
      */
     setCaption(caption) {
         this.state.caption = caption;
-        this.nerve.self.evt.asyncEmit('setTitle', caption);
+        this.nerve.self.emit('onSetTitle', {
+            title: caption,
+        });
         this.force();
     }
     /**
@@ -319,7 +291,7 @@ export class ViewController {
      * @author lxm
      * @date 2022-09-19 14:09:00
      */
-    beginViewLoading() {
+    startLoading() {
         this.viewLoading.begin();
         this.state.isLoading = this.viewLoading.isLoading;
     }
@@ -329,8 +301,18 @@ export class ViewController {
      * @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) {
+        if ((event === null || event === void 0 ? void 0 : 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);
+    }
 }

package/out/controller/view/wf-dyna-action-view.d.ts

@@ -1,4 +1,4 @@
-import { WFDynaActionViewModel } from '@ibiz-template/model';
+import { WFDynaActionViewModel } from '@ibiz/model-core';
 import { WFDynaActionViewNerve } from '..';
 import { WFEditViewController } from '.';
 /**

package/out/controller/view/wf-dyna-action-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wf-dyna-action-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/wf-dyna-action-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAC;AAEzC;;;;;;;;GAQG;AACH,qBAAa,0BAA0B,CACrC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,CACvD,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IACvB,KAAK,EAAE,qBAAqB,CAAC;IAErC,SAAS,CAAC,WAAW,IAAI,qBAAqB;IAI9C;;;;;;OAMG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAarC;;;;;OAKG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAStC;;;;;OAKG;IACG,mBAAmB;CAG1B"}
+{"version":3,"file":"wf-dyna-action-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/wf-dyna-action-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAC;AAEzC;;;;;;;;GAQG;AACH,qBAAa,0BAA0B,CACrC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,CACvD,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IACvB,KAAK,EAAE,qBAAqB,CAAC;IAErC,SAAS,CAAC,WAAW,IAAI,qBAAqB;IAI9C;;;;;;OAMG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAarC;;;;;OAKG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAStC;;;;;OAKG;IACG,mBAAmB;CAG1B"}

package/out/controller/view/wf-dyna-action-view.js

@@ -44,7 +44,7 @@ export class WFDynaActionViewController extends WFEditViewController {
         if (this.context.isEditable) {
             await this.save();
         }
-        await this.nerve.form.call.wfSubmit();
+        await this.nerve.form.wfSubmit();
         await this.closeView({ ok: true, data: this.getData() });
     }
     /**

package/out/controller/view/wf-dyna-edit-view.d.ts

@@ -1,4 +1,4 @@
-import { WFDynaEditViewModel } from '@ibiz-template/model';
+import { WFDynaEditViewModel } from '@ibiz/model-core';
 import { WFDynaEditViewNerve } from '..';
 import { WFEditViewController } from '.';
 import { WFLink } from '../interface';
@@ -40,6 +40,13 @@ export declare class WFDynaEditViewController<T extends WFDynaEditViewModel = WF
      * @returns {*}  {Promise<void>}
      */
     onLinkClick(link: WFLink): Promise<void>;
+    /**
+     * 根据工作流link处理工作流提交
+     *
+     * @param {WFLink} link
+     * @returns {*}
+     * @memberof WFDynaEditViewController
+     */
     wfSubmitByLink(link: WFLink): Promise<void>;
 }
 //# sourceMappingURL=wf-dyna-edit-view.d.ts.map

package/out/controller/view/wf-dyna-edit-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wf-dyna-edit-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/wf-dyna-edit-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,IAAI,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAItC;;;;;;;;GAQG;AACH,qBAAa,wBAAwB,CACnC,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CACnD,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IAC/B;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,EAAE,CAAM;IAEf,KAAK,EAAE,mBAAmB,CAAC;IAEnC,SAAS,CAAC,WAAW,IAAI,mBAAmB;IAItC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAM5B;;;;;;OAMG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAUpC;;;;;;;OAOG;IACG,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASxC,cAAc,CAAC,IAAI,EAAE,MAAM;CA2ClC"}
+{"version":3,"file":"wf-dyna-edit-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/wf-dyna-edit-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,IAAI,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAItC;;;;;;;;GAQG;AACH,qBAAa,wBAAwB,CACnC,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CACnD,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IAC/B;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,EAAE,CAAM;IAEf,KAAK,EAAE,mBAAmB,CAAC;IAEnC,SAAS,CAAC,WAAW,IAAI,mBAAmB;IAItC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAM5B;;;;;;OAMG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAUpC;;;;;;;OAOG;IACG,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9C;;;;;;OAMG;IACG,cAAc,CAAC,IAAI,EAAE,MAAM;CA6ClC"}

package/out/controller/view/wf-dyna-edit-view.js

@@ -40,7 +40,7 @@ export class WFDynaEditViewController extends WFEditViewController {
     async calcWfToolbar() {
         const res = await this.entityService.wf.getWFLink(Object.assign(this.context.clone(), {
             taskDefinitionKey: this.params.taskDefinitionKey,
-        }), this.getData());
+        }), this.getData()[0].getRequestData());
         this.wfLinks = res.data;
     }
     /**
@@ -60,8 +60,14 @@ export class WFDynaEditViewController extends WFEditViewController {
             return this.wfSubmitByLink(link);
         }
     }
+    /**
+     * 根据工作流link处理工作流提交
+     *
+     * @param {WFLink} link
+     * @returns {*}
+     * @memberof WFDynaEditViewController
+     */
     async wfSubmitByLink(link) {
-        var _a;
         // 流程表单可以编辑才会先保存
         if (this.isEditable) {
             await this.save();
@@ -73,13 +79,16 @@ export class WFDynaEditViewController extends WFEditViewController {
         });
         // 处理视图参数
         const newParams = Object.assign({}, link);
-        const { sequenceFlowView } = link;
+        // todo
+        // const { sequenceFlowView } = link;
         // 查找工作流提交视图
-        const submitView = (_a = this.model.source
-            .findPSAppViewRef(`WFACTION@${sequenceFlowView}`)) === null || _a === void 0 ? void 0 : _a.getRefPSAppView();
+        // const submitView = this.model
+        //   .findPSAppViewRef(`WFACTION@${sequenceFlowView}`)
+        //   ?.getRefPSAppView();
+        let submitView;
         // *没有工作流操作视图的，自己提交工作流
         if (!submitView) {
-            await this.nerve.form.call.wfSubmit(newParams);
+            await this.nerve.form.wfSubmit(newParams);
             await this.closeView();
             return;
         }

package/out/controller/view/wf-dyna-edit-view3.d.ts

@@ -1,4 +1,4 @@
-import { WFDynaEditView3Model } from '@ibiz-template/model';
+import { WFDynaEditView3Model } from '@ibiz/model-core';
 import { WFDynaEditViewController } from '.';
 import { WFDynaEditView3Nerve } from '..';
 /**
@@ -18,7 +18,7 @@ export declare class WFDynaEditView3Controller<T extends WFDynaEditView3Model =
      * @date 2022-08-31 22:08:44
      * @type {boolean}
      */
-    isNewData: boolean;
+    isNewData(): boolean;
     /**
      * 关系界面绘制参数
      *

package/out/controller/view/wf-dyna-edit-view3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wf-dyna-edit-view3.d.ts","sourceRoot":"","sources":["../../../src/controller/view/wf-dyna-edit-view3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,GAAG,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAI1C;;;;;;;;GAQG;AACH,qBAAa,yBAAyB,CACpC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,CACrD,SAAQ,wBAAwB,CAAC,CAAC,CAAC;IACnC;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAQ;IAE1B;;;;;OAKG;IACH,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG;YACb,OAAO,EAAE,QAAQ,CAAC;YAClB,MAAM,EAAE,OAAO,CAAC;YAChB,GAAG,EAAE,MAAM,CAAC;SACb,CAAC;KACH,CAAM;IAEC,KAAK,EAAE,oBAAoB,CAAC;IAEpC,SAAS,CAAC,WAAW,IAAI,oBAAoB;cAI7B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAejC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAO5B;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;CAsClC"}
+{"version":3,"file":"wf-dyna-edit-view3.d.ts","sourceRoot":"","sources":["../../../src/controller/view/wf-dyna-edit-view3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,wBAAwB,EAAE,MAAM,GAAG,CAAC;AAC7C,OAAO,EAAc,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAGtD;;;;;;;;GAQG;AACH,qBAAa,yBAAyB,CACpC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,CACrD,SAAQ,wBAAwB,CAAC,CAAC,CAAC;IACnC;;;;;;OAMG;IACH,SAAS,IAAI,OAAO;IAKpB;;;;;OAKG;IACH,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG;YACb,OAAO,EAAE,QAAQ,CAAC;YAClB,MAAM,EAAE,OAAO,CAAC;YAChB,GAAG,EAAE,MAAM,CAAC;SACb,CAAC;KACH,CAAM;IAEC,KAAK,EAAE,oBAAoB,CAAC;IAEpC,SAAS,CAAC,WAAW,IAAI,oBAAoB;cAI7B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAejC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAM5B;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;CAsClC"}

package/out/controller/view/wf-dyna-edit-view3.js

@@ -1,7 +1,6 @@
 import { createUUID, notNilEmpty } from 'qx-util';
 import { WFDynaEditViewController } from '.';
 import { WFDynaEditView3Nerve } from '..';
-import { Srfuf } from '../../service';
 import { convertNavData } from '../../utils';
 /**
  * 工作流动态编辑视图控制器
@@ -15,14 +14,6 @@ import { convertNavData } from '../../utils';
 export class WFDynaEditView3Controller extends WFDynaEditViewController {
     constructor() {
         super(...arguments);
-        /**
-         * 是否是新建数据
-         *
-         * @author lxm
-         * @date 2022-08-31 22:08:44
-         * @type {boolean}
-         */
-        this.isNewData = true;
         /**
          * 关系界面绘制参数
          *
@@ -31,6 +22,17 @@ export class WFDynaEditView3Controller extends WFDynaEditViewController {
          */
         this.drPages = {};
     }
+    /**
+     * 是否是新建数据
+     *
+     * @author lxm
+     * @date 2022-08-31 22:08:44
+     * @type {boolean}
+     */
+    isNewData() {
+        const { deName } = this.model.appEntity;
+        return !!this.context[deName];
+    }
     createNerve() {
         return new WFDynaEditView3Nerve(this);
     }
@@ -50,7 +52,6 @@ export class WFDynaEditView3Controller extends WFDynaEditViewController {
     }
     async load() {
         const data = await super.load();
-        this.isNewData = data.srfuf === Srfuf.CREATE;
         this.calcViewParams(data);
         return data;
     }
@@ -64,21 +65,21 @@ export class WFDynaEditView3Controller extends WFDynaEditViewController {
         var _a;
         const { pages } = this.model.drTab;
         for (const page of pages) {
-            const { name } = page.source;
+            const name = page.source.name;
             // 计算导航上下文
             let newContext = this.context.clone();
-            const navContexts = page.source.getPSNavigateContexts();
+            const navContexts = page.source.navigateContexts;
             if (notNilEmpty(navContexts)) {
                 newContext = Object.assign(newContext, convertNavData(navContexts, this.context, this.params, data));
             }
             // 处理导航视图参数
-            const navParams = page.source.getPSNavigateParams();
+            const navParams = page.source.navigateParams;
             let newParams = {};
             if (notNilEmpty(navParams)) {
                 newParams = convertNavData(navParams, this.params, this.context, data);
             }
             // 视图参数或上下文发生变化时，销毁重绘视图
-            if (!this.nerve.drViews.has(name) ||
+            if (!this.nerve.children.has(name) ||
                 JSON.stringify(this.drPages[name].context) !==
                     JSON.stringify(newContext) ||
                 JSON.stringify(this.drPages[name].params) !== JSON.stringify(newParams)) {
@@ -88,7 +89,7 @@ export class WFDynaEditView3Controller extends WFDynaEditViewController {
             }
             else {
                 // 不变的情况重新加载视图的数据
-                (_a = this.nerve.drViews.get(name)) === null || _a === void 0 ? void 0 : _a.call.refresh();
+                (_a = this.nerve.children.get(name)) === null || _a === void 0 ? void 0 : _a.refresh();
             }
         }
         this.force();

package/out/controller/view/wf-dyna-start-view.d.ts

@@ -1,4 +1,4 @@
-import { WFDynaStartViewModel } from '@ibiz-template/model';
+import { WFDynaStartViewModel } from '@ibiz/model-core';
 import { WFDynaStartViewNerve } from '..';
 import { WFEditViewController } from '.';
 /**

package/out/controller/view/wf-dyna-start-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wf-dyna-start-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/wf-dyna-start-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAC;AAEzC;;;;;;;;GAQG;AACH,qBAAa,yBAAyB,CACpC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,CACrD,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IACvB,KAAK,EAAE,oBAAoB,CAAC;IAEpC,SAAS,CAAC,WAAW,IAAI,oBAAoB;IAI7C;;;;;;OAMG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAarC;;;;;OAKG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAOtC;;;;;OAKG;IACG,mBAAmB;CAG1B"}
+{"version":3,"file":"wf-dyna-start-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/wf-dyna-start-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAC;AAEzC;;;;;;;;GAQG;AACH,qBAAa,yBAAyB,CACpC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,CACrD,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IACvB,KAAK,EAAE,oBAAoB,CAAC;IAEpC,SAAS,CAAC,WAAW,IAAI,oBAAoB;IAI7C;;;;;;OAMG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAarC;;;;;OAKG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAOtC;;;;;OAKG;IACG,mBAAmB;CAG1B"}