diff --git a/features/src/main/ets/components/FolderListComp.ets b/features/src/main/ets/components/FolderListComp.ets index 9ccc36d49cd011c5458fb23a75e2fd877075c991..02033558ed118398ef1da16645fd7964b6afc9fc 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 aefe438bbd00e1691b5ab9b605e9114afb3b2a42..63cfe741ed408d2666d41944fb1209fe1e5a75c7 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 58052e554c317282c5f4e19671a10f7c6d77af8e..eab792e72de3d1c353018f5e5aa40820ba6a9938 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 6f3d39167a91a9615cc71efdb01d94c7497a25e7..20da32a487d8910ddcc5fe553370ff2f210d013a 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 b21cac36e977d42afcfc06c56e2dd30d184bb810..42c4357a3d35cb50c6641d4072f93cde3f5a5cf9 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