diff --git a/src/control/form/form-detail/form-druipart/form-druipart.controller.ts b/src/control/form/form-detail/form-druipart/form-druipart.controller.ts index 859ddddd6b638d1536b9cd9175cbe97adc7a1111..4ec9e8b508cb8cf584130f9fa4004429ad7e8639 100644 --- a/src/control/form/form-detail/form-druipart/form-druipart.controller.ts +++ b/src/control/form/form-detail/form-druipart/form-druipart.controller.ts @@ -3,7 +3,7 @@ import { FormNotifyState, convertNavData, IViewController, - SysUIActionTag, + SysUIActionType, } from '@ibiz-template/runtime'; import { IAppView, IDEFormDRUIPart } from '@ibiz/model-core'; import { createUUID, notNilEmpty } from 'qx-util'; @@ -169,7 +169,7 @@ export class FormDRUIPartController extends FormDetailController { - if (key === SysUIActionTag.SAVE) { + if (key === SysUIActionType.SAVE) { await this.form.save(); return null; } - if (key === SysUIActionTag.SAVE_AND_EXIT) { + if (key === SysUIActionType.SAVE_AND_EXIT) { await this.form.save(); return { closeView: true }; } - if (key === SysUIActionTag.REMOVE_AND_EXIT) { + if (key === SysUIActionType.REMOVE_AND_EXIT) { const res = await this.form.remove(); return { closeView: res }; } - if (key === SysUIActionTag.SAVE_AND_NEW) { + if (key === SysUIActionType.SAVE_AND_NEW) { this.saveAndNew(); } - if (key === SysUIActionTag.REFRESH) { + if (key === SysUIActionType.REFRESH) { await this.refresh(); } return super.call(key, args); diff --git a/src/view-engine/mpickup-view-engine.ts b/src/view-engine/mpickup-view-engine.ts index 7a2a4275aeeb1e6501b20af641c45c2785938667..d337abb752c7592f3d20536762df1df92c58ebf1 100644 --- a/src/view-engine/mpickup-view-engine.ts +++ b/src/view-engine/mpickup-view-engine.ts @@ -2,7 +2,7 @@ import { ViewController, IMPickupViewState, IMPickupViewEvent, - SysUIActionTag, + SysUIActionType, IListController, } from '@ibiz-template/runtime'; // todo 缺失 IAppDEMPickupView @@ -83,27 +83,27 @@ export class MPickupViewEngine extends PickupViewEngine { // eslint-disable-next-line @typescript-eslint/no-explicit-any async call(key: string, args: any): Promise { - if (key === SysUIActionTag.CANCEL) { + if (key === SysUIActionType.CANCEL) { this.cancel(); return null; } - if (key === SysUIActionTag.OK) { + if (key === SysUIActionType.OK) { this.confirm(); return null; } - if (key === SysUIActionTag.ADD_SELECTION) { + if (key === SysUIActionType.ADD_SELECTION) { this.addSelection(); return null; } - if (key === SysUIActionTag.ADD_ALL) { + if (key === SysUIActionType.ADD_ALL) { this.addAll(); return null; } - if (key === SysUIActionTag.REMOVE_ALL) { + if (key === SysUIActionType.REMOVE_ALL) { this.removeAll(); return null; } - if (key === SysUIActionTag.REMOVE_SELECTION) { + if (key === SysUIActionType.REMOVE_SELECTION) { this.removeSelection(); return null; } diff --git a/src/view-engine/opt-view.engine.ts b/src/view-engine/opt-view.engine.ts index d8997b7c908b88fda4d3ac49bd33142a7a5f1a68..04a297e62c0323bef06c6eb4a7d968f7a3263244 100644 --- a/src/view-engine/opt-view.engine.ts +++ b/src/view-engine/opt-view.engine.ts @@ -2,7 +2,7 @@ import { ViewEngineBase, ViewController, IEditFormController, - SysUIActionTag, + SysUIActionType, EventBase, IOptViewState, IOptViewEvent, @@ -99,11 +99,11 @@ export class OptViewEngine extends ViewEngineBase { // eslint-disable-next-line @typescript-eslint/no-explicit-any async call(key: string, args: any): Promise { - if (key === SysUIActionTag.CANCEL) { + if (key === SysUIActionType.CANCEL) { this.cancel(); return null; } - if (key === SysUIActionTag.OK) { + if (key === SysUIActionType.OK) { await this.confirm(); return null; } diff --git a/src/view-engine/pickup-view.engine.ts b/src/view-engine/pickup-view.engine.ts index 77b579f391ded4a6c50e33484b8a38de04127aee..ea59e29661661f8a4ae7854d94e121c1a1ffd7c0 100644 --- a/src/view-engine/pickup-view.engine.ts +++ b/src/view-engine/pickup-view.engine.ts @@ -2,7 +2,7 @@ import { ViewEngineBase, ViewController, IPickupViewPanelController, - SysUIActionTag, + SysUIActionType, IPickupViewState, IPickupViewEvent, } from '@ibiz-template/runtime'; @@ -85,11 +85,11 @@ export class PickupViewEngine extends ViewEngineBase { // eslint-disable-next-line @typescript-eslint/no-explicit-any async call(key: string, args: any): Promise { - if (key === SysUIActionTag.CANCEL) { + if (key === SysUIActionType.CANCEL) { this.cancel(); return null; } - if (key === SysUIActionTag.OK) { + if (key === SysUIActionType.OK) { this.confirm(); return null; } diff --git a/src/view-engine/wf-dyna-action-view.engine.ts b/src/view-engine/wf-dyna-action-view.engine.ts index e56ab251e7f914a840a47ced6c1f9efde07cb081..2616a161d67587dde5eee284127ea943f1015f92 100644 --- a/src/view-engine/wf-dyna-action-view.engine.ts +++ b/src/view-engine/wf-dyna-action-view.engine.ts @@ -3,7 +3,7 @@ import { ViewController, IWFDynaActionViewState, IWFDynaActionViewEvent, - SysUIActionTag, + SysUIActionType, IEditFormController, } from '@ibiz-template/runtime'; import { IAppDEWFDynaActionView } from '@ibiz/model-core'; @@ -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 === SysUIActionType.WF_ACTION_OK) { this.onOkButtonClick(); return null; } - if (key === SysUIActionTag.WF_ACTION_CANCEL) { + if (key === SysUIActionType.WF_ACTION_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..1e3174696c197e61ccfad28299cb3b6612c44692 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'; @@ -48,10 +49,25 @@ export class WFEditViewEngine extends EditViewEngine { */ isFirstLoaded: boolean = false; + /** + * 当前激活表单tag(小写) + * + * @author lxm + * @date 2022-09-29 17:09:44 + * @type {string} + */ + processForm: string = ''; + + get form() { + return this.view.getController(this.processForm) as IEditFormController; + } + async doCreated() { await super.doCreated(); // 第一次计算 await this.calcActiveForm(); + const { childNames } = this.view; + childNames.push(this.processForm); } /** @@ -100,9 +116,10 @@ export class WFEditViewEngine extends EditViewEngine { const processForm = res.data['process-form'] ? `wfform_${res.data['process-form']}` : 'form'; + this.processForm = processForm.toLowerCase(); const formModel = this.view.model.viewLayoutPanel!.controls?.find( control => { - return control.name === processForm.toLowerCase(); + return control.name === this.processForm; }, ); if (!formModel) {