diff --git a/src/view-engine/wf-dyna-action-view.engine.ts b/src/view-engine/wf-dyna-action-view.engine.ts index e56ab251e7f914a840a47ced6c1f9efde07cb081..c703f87b42ec2b61255318df2d997ce5402a253f 100644 --- a/src/view-engine/wf-dyna-action-view.engine.ts +++ b/src/view-engine/wf-dyna-action-view.engine.ts @@ -70,11 +70,11 @@ export class WFDynaActionViewEngine extends WFEditViewEngine { // eslint-disable-next-line @typescript-eslint/no-explicit-any async call(key: string, args: any): Promise { - if (key === SysUIActionTag.WF_ACTION_OK) { + if (key === SysUIActionTag.OK) { this.onOkButtonClick(); return null; } - if (key === SysUIActionTag.WF_ACTION_CANCEL) { + if (key === SysUIActionTag.CANCEL) { await this.onCancelButtonClick(); return null; } diff --git a/src/view-engine/wf-edit-view.engine.ts b/src/view-engine/wf-edit-view.engine.ts index 573455b2bc462c576be2c08768a6e55237ce82c5..e84a6b4c5913ad0589e8547d9bb74b8792a07a9e 100644 --- a/src/view-engine/wf-edit-view.engine.ts +++ b/src/view-engine/wf-edit-view.engine.ts @@ -3,6 +3,7 @@ import { ViewController, IWFEditViewState, IWFEditViewEvent, + IEditFormController, } from '@ibiz-template/runtime'; import { IAppDEWFEditView, IDEEditForm } from '@ibiz/model-core'; import { EditViewEngine } from './edit-view.engine'; @@ -39,31 +40,23 @@ export class WFEditViewEngine extends EditViewEngine { */ activeForm?: IDEEditForm; - /** - * 是否已经完成视图的第一次加载 - * - * @author lxm - * @date 2022-09-29 17:09:49 - * @type {boolean} - */ - isFirstLoaded: boolean = false; + get form() { + if (this.activeForm) { + return this.view.getController( + this.activeForm.name!, + ) as IEditFormController; + } + return this.view.getController('form') as IEditFormController; + } async doCreated() { await super.doCreated(); // 第一次计算 await this.calcActiveForm(); - } - - /** - * 加载 - * @return {*} - * @author: zhujiamin - * @Date: 2023-06-09 15:18:51 - */ - async load() { - const res = await super.load(); - this.isFirstLoaded = true; - return res; + const { childNames } = this.view; + if (this.activeForm) { + childNames.push(this.activeForm.name!); + } } /**