From 15ff85c97dea26082915f64e34ba5a545d60ba2e Mon Sep 17 00:00:00 2001
From: ShineKOT <1917095344@qq.com>
Date: Mon, 6 May 2024 19:03:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=20=E4=BF=AE=E5=A4=8DUI=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=9F=9F=E8=8E=B7=E5=8F=96=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                        | 2 ++
 src/view-engine/edit-view.engine.ts | 7 ++++++-
 src/view-engine/opt-view.engine.ts  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d0b69bf..124e8499 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,9 @@
 并且此项目遵循 [Semantic Versioning](https://semver.org/lang/zh-CN/).
 
 ## [Unreleased]
+### Fixed
 
+- 修复UI界面域获取异常
 ## [0.7.8] - 2024-04-30
 
 ### Added
diff --git a/src/view-engine/edit-view.engine.ts b/src/view-engine/edit-view.engine.ts
index 17b61540..8f67b93b 100644
--- a/src/view-engine/edit-view.engine.ts
+++ b/src/view-engine/edit-view.engine.ts
@@ -100,7 +100,7 @@ export class EditViewEngine extends ViewEngineBase {
     modal.hooks.shouldDismiss.tapPromise(async context => {
       const uiDomain = ibiz.uiDomainManager.get(this.view.context.srfsessionid);
       const isChange =
-        (this.form.state.modified || uiDomain.dataModification) &&
+        (this.form.state.modified || uiDomain?.dataModification) &&
         this.view.model.enableDirtyChecking === true;
       if (isChange && context.allowClose == null) {
         const isAllow = await ibiz.confirm.error({
@@ -167,6 +167,11 @@ export class EditViewEngine extends ViewEngineBase {
     }
   }
 
+  async onDestroyed(): Promise<void> {
+    console.log('引擎销毁');
+    await super.onDestroyed();
+  }
+
   getData(): IData[] {
     return this.form.getData();
   }
diff --git a/src/view-engine/opt-view.engine.ts b/src/view-engine/opt-view.engine.ts
index adb7e518..9188bd45 100644
--- a/src/view-engine/opt-view.engine.ts
+++ b/src/view-engine/opt-view.engine.ts
@@ -60,7 +60,7 @@ export class OptViewEngine extends ViewEngineBase {
     modal.hooks.shouldDismiss.tapPromise(async context => {
       const uiDomain = ibiz.uiDomainManager.get(this.view.context.srfsessionid);
       const isChange =
-        (this.form.state.modified || uiDomain.dataModification) &&
+        (this.form.state.modified || uiDomain?.dataModification) &&
         this.view.model.enableDirtyChecking === true;
       if (isChange && context.allowClose == null) {
         const isAllow = await ibiz.confirm.error({
-- 
Gitee


From f6e86486de19e9c03dc7147fb68ff706346dbc23 Mon Sep 17 00:00:00 2001
From: ShineKOT <1917095344@qq.com>
Date: Mon, 6 May 2024 19:05:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8DUI=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=9F=9F=E8=8E=B7=E5=8F=96=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view-engine/edit-view.engine.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/view-engine/edit-view.engine.ts b/src/view-engine/edit-view.engine.ts
index 8f67b93b..0a976282 100644
--- a/src/view-engine/edit-view.engine.ts
+++ b/src/view-engine/edit-view.engine.ts
@@ -167,11 +167,6 @@ export class EditViewEngine extends ViewEngineBase {
     }
   }
 
-  async onDestroyed(): Promise<void> {
-    console.log('引擎销毁');
-    await super.onDestroyed();
-  }
-
   getData(): IData[] {
     return this.form.getData();
   }
-- 
Gitee