From 10c57d22f5d41242cfc530a4e384bae95f5618d0 Mon Sep 17 00:00:00 2001
From: zhujiamin <1147570162@qq.com>
Date: Thu, 15 Jun 2023 15:48:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A2=84=E7=BD=AE=E7=9A=84=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=BA=E8=B5=B0uIActionTag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view-engine/wf-dyna-action-view.engine.ts |  4 +--
 src/view-engine/wf-edit-view.engine.ts        | 33 ++++++++-----------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/view-engine/wf-dyna-action-view.engine.ts b/src/view-engine/wf-dyna-action-view.engine.ts
index e56ab251..c703f87b 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<IData | null | undefined> {
-    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 573455b2..e84a6b4c 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!);
+    }
   }
 
   /**
-- 
Gitee