From d792ee872e60be716395c5a6edce3020eb85aa35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <2645604041@qq.com>
Date: Fri, 8 Mar 2024 11:25:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96ArkUi=20JSCustomDialogControl?=
 =?UTF-8?q?ler=E5=86=85=E5=AD=98=E6=B3=84=E9=9C=B2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 赵鹏 <2645604041@qq.com>
---
 .../src/main/ets/components/FolderListComp.ets    | 15 +++++++++++++++
 features/src/main/ets/components/NoteContent.ets  |  8 ++++++++
 .../src/main/ets/components/NoteContentComp.ets   |  9 +++++++++
 .../ets/components/NoteContentCompPortrait.ets    | 13 +++++++++++++
 features/src/main/ets/components/NoteListComp.ets | 10 ++++++++++
 5 files changed, 55 insertions(+)

diff --git a/features/src/main/ets/components/FolderListComp.ets b/features/src/main/ets/components/FolderListComp.ets
index 9ccc36d..0203355 100644
--- a/features/src/main/ets/components/FolderListComp.ets
+++ b/features/src/main/ets/components/FolderListComp.ets
@@ -135,6 +135,11 @@ export struct NoteAndCreateComp {
     customStyle: true,
   })
 
+  aboutToDisappear() {
+    this.folderCreateDialogCtl = null
+    this.folderCreateDialogCtlBottom = null
+  }
+
   onCreateConfirm(color: string, name: string) {
     let folderData = new FolderData(0, name, new Date().getTime() + "", color, FolderType.CusDef, Delete.No, new Date().getTime(), new Date().getTime()) // 新的的笔记本都是自定义类型 type为1
     this.AllFolderArray.push(folderData)
@@ -209,6 +214,16 @@ struct FolderItemComp {
     autoCancel: false,
     customStyle: true,
   })
+
+  aboutToDisappear() {
+    this.folderEditDialogCtl = null
+    this.folderEditDialogCtlBottom = null
+    this.folderDeleteDialogCtl = null
+    this.folderDeleteDialogCtlBottom = null
+    this.folderCreateDialogCtl = null
+    this.folderCreateDialogCtlBottom = null
+  }
+
   // Folder Edit Callback
   onEditConfirm(color: string, name: string) {
     this.folderItem.color = color
diff --git a/features/src/main/ets/components/NoteContent.ets b/features/src/main/ets/components/NoteContent.ets
index aefe438..63cfe74 100644
--- a/features/src/main/ets/components/NoteContent.ets
+++ b/features/src/main/ets/components/NoteContent.ets
@@ -269,6 +269,10 @@ export struct ToolBarComp {
     customStyle: true,
   })
 
+  aboutToDisappear() {
+    this.editContentDialogCtl = null
+  }
+
   confirm(excuteJs: string) {
     this.controllerShow.runJavaScript(excuteJs)
   }
@@ -453,6 +457,10 @@ export struct NoteContentOverViewComp {
     customStyle: true,
   })
 
+  aboutToDisappear() {
+    this.editTitleDialogCtl = null
+  }
+
   confirm(newTitle: string) {
     this.selectedNoteData.title = newTitle
     this.selectedNoteData.modified_time = new Date().getTime()
diff --git a/features/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets
index 58052e5..eab792e 100644
--- a/features/src/main/ets/components/NoteContentComp.ets
+++ b/features/src/main/ets/components/NoteContentComp.ets
@@ -365,6 +365,10 @@ export struct NoteContentOverViewComp {
     this.NoteDataMoveArray.push(this.AllFolderArray[1]);
   }
 
+  aboutToDisappear() {
+    this.editTitleDialogCtl = null
+  }
+
   confirm(newTitle: string) {
     this.selectedNoteData.title = newTitle
     this.selectedNoteData.modified_time = new Date().getTime()
@@ -489,6 +493,11 @@ export struct ToolBarComp {
   })
   @Consume('AsideWidth') asideWidth: number
 
+  aboutToDisappear() {
+    this.noteDataDeleteDialogCtl = null
+    this.editContentDialogCtl = null
+  }
+
   onDeleteConfirm() {
     if (this.selectedFolderData.uuid != SysDefFolderUuid.RecentDeletes) {
       this.selectedNoteData.is_deleted = Delete.Yes
diff --git a/features/src/main/ets/components/NoteContentCompPortrait.ets b/features/src/main/ets/components/NoteContentCompPortrait.ets
index 6f3d391..20da32a 100644
--- a/features/src/main/ets/components/NoteContentCompPortrait.ets
+++ b/features/src/main/ets/components/NoteContentCompPortrait.ets
@@ -345,6 +345,7 @@ export struct NoteContentCompPortrait {
     clearInterval(time_id)
     NoteUtil.refreshAll()
     LogUtil.info(TAG, "aboutToDisappear")
+    this.editContentDialogCtl = null
   }
 }
 
@@ -371,6 +372,10 @@ export struct NoteContentOverViewComp {
     this.NoteDataMoveArray.push(this.AllFolderArray[1]);
   }
 
+  aboutToDisappear() {
+    this.editTitleDialogCtl = null
+  }
+
   confirm(newTitle: string) {
     this.selectedNoteData.title = newTitle
     this.selectedNoteData.modified_time = new Date().getTime()
@@ -501,6 +506,10 @@ export struct ToolBarComp {
     customStyle: true,
   })
 
+  aboutToDisappear() {
+    this.noteDataDeleteDialogCtl = null
+  }
+
   build() {
     Flex({ direction: FlexDirection.Row, wrap: FlexWrap.NoWrap,
       justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
@@ -637,6 +646,10 @@ export struct DeleteNoteComp {
     customStyle: true,
   })
 
+  aboutToDisappear() {
+    this.noteDataDeleteDialogCtlBottom = null
+  }
+
   onDeleteConfirm() {
     if (this.selectedFolderData.uuid != SysDefFolderUuid.RecentDeletes) {
       this.selectedNoteData.is_deleted = Delete.Yes
diff --git a/features/src/main/ets/components/NoteListComp.ets b/features/src/main/ets/components/NoteListComp.ets
index b21cac3..42c4357 100644
--- a/features/src/main/ets/components/NoteListComp.ets
+++ b/features/src/main/ets/components/NoteListComp.ets
@@ -546,6 +546,11 @@ export struct OperateNoteComp {
     customStyle: true,
   })
 
+  aboutToDisappear() {
+    this.noteDataMoveDialogCtl = null
+    this.noteDataDeleteDialogCtl = null
+  }
+
   onMoveConfirm(folderUuid: string) {
     this.CheckedNoteArray.forEach((noteItem) => {
       noteItem.folder_uuid = folderUuid
@@ -854,6 +859,11 @@ export struct OperateNoteCompForPortrait {
     customStyle: true,
   })
 
+  aboutToDisappear() {
+    this.noteDataMoveDialogCtlBottom = null
+    this.noteDataDeleteDialogCtlBottom = null
+  }
+
   opacityChange() {
     if (this.CheckedNoteArray.length == 0 && this.longpress == true) {
       this.greyOpacity = true
-- 
Gitee