openharmony/applications_notes
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_notes synced 2024-12-04 05:49:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!74 Bugfix

Browse Source 
Merge pull request !74 from 秦平/master
This commit is contained in:
openharmony_ci 2022-07-07 10:58:39 +00:00 committed by Gitee
commit 02f0511fde
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
common/component/src/main/ets/components/FolderListComp.ets
View File

@ -220,17 +220,32 @@ struct FolderItemComp {
let currentFolder = FolderUtil.getFolderData(this.AllFolderArray, this.folderItem.uuid)
let index = this.AllFolderArray.indexOf(currentFolder)
let currentNoteDataArray = NoteUtil.getNoteDataArray(AppStorage.Get('AllNoteArray'), this.folderItem.uuid)
let deleteNoteDataArray = NoteUtil.getNoteDataArray(AppStorage.Get('AllNoteArray'), 'sys_def_recentDeletes_uuid')
if (index > -1) {
this.AllFolderArray.splice(index, 1)
currentNoteDataArray.forEach((noteItem: NoteData) => {
noteItem.is_deleted = Delete.Yes
noteItem.folder_uuid = SysDefFolderUuid.UnClassified
noteItem.deleted_time = new Date().getTime()
// update note to db
let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)
predicates_note.equalTo(NoteTableColumn.Uuid, noteItem.uuid)
RdbStoreUtil.update(noteItem.toNoteObject(), predicates_note, null)
})
if (deleteNoteDataArray.length != 0) {
deleteNoteDataArray.forEach((noteItem: NoteData) => {
let folderData: FolderData = FolderUtil.getFolderData(this.AllFolderArray, noteItem.folder_uuid)
if (folderData == undefined) {
noteItem.folder_uuid = SysDefFolderUuid.UnClassified
// update note to db
let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)
predicates_note.equalTo(NoteTableColumn.Uuid, noteItem.uuid)
RdbStoreUtil.update(noteItem.toNoteObject(), predicates_note, null)
}
})
}
if (currentNoteDataArray.length != 0) {
currentNoteDataArray.forEach((noteItem: NoteData) => {
noteItem.is_deleted = Delete.Yes
noteItem.folder_uuid = SysDefFolderUuid.UnClassified
noteItem.deleted_time = new Date().getTime()
// update note to db
let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)
predicates_note.equalTo(NoteTableColumn.Uuid, noteItem.uuid)
RdbStoreUtil.update(noteItem.toNoteObject(), predicates_note, null)
})
}
// delete folder from db
let predicates_folder = RdbStoreUtil.getRdbPredicates(TableName.FolderTable)
predicates_folder.equalTo(FolderTableColumn.Uuid, this.folderItem.uuid)