!150 代码同步

Merge pull request !150 from 黎思泉/master
This commit is contained in:
openharmony_ci 2022-12-14 10:12:05 +00:00 committed by Gitee
commit 7120fe0831
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 8 additions and 3 deletions

View File

@ -192,7 +192,7 @@ export struct NoteContent {
.onPageEnd((e) => {
if (this.dpi <= 240) {
this.controllerShow.runJavaScript({ script: "changeSizeToRk()" })
} else if (this.dpi >= 320 && this.dpi > 240) {
} else if (this.dpi <= 320 && this.dpi > 240) {
this.controllerShow.runJavaScript({ script: "changeSizeToPhone()" })
} else {
this.controllerShow.runJavaScript({ script: "changeSizeToTablet()" })
@ -250,6 +250,8 @@ export struct NoteContent {
}
aboutToDisappear(): void {
NoteUtil.refreshAll()
AppStorage.Set("refreshCurrentNote",true)
clearInterval(timeID)
LogUtil.info(TAG, "aboutToDisappear")
}
@ -287,6 +289,7 @@ export struct ToolBarComp {
LogUtil.info(TAG, "zoom, clearInterval timeID : " + timeID)
clearInterval(timeID)
}
AppStorage.Set("refreshCurrentNote",true)
router.back()
NoteUtil.refreshAll()
})

View File

@ -230,7 +230,7 @@ export struct NoteContentComp {
.onPageEnd((e) => {
if (this.dpi <= 240) {
this.controllerShow.runJavaScript({ script: "changeSizeToRk()" })
} else if (this.dpi >= 320 && this.dpi > 240) {
} else if (this.dpi <= 320 && this.dpi > 240) {
this.controllerShow.runJavaScript({ script: "changeSizeToPhone()" })
} else {
this.controllerShow.runJavaScript({ script: "changeSizeToTablet()" })

View File

@ -243,7 +243,7 @@ export struct NoteContentCompPortrait {
.onPageEnd((e) => {
if (this.dpi <= 240) {
this.controllerShow.runJavaScript({ script: "changeSizeToRk()" })
} else if (this.dpi >= 320 && this.dpi > 240) {
} else if (this.dpi <= 320 && this.dpi > 240) {
this.controllerShow.runJavaScript({ script: "changeSizeToPhone()" })
} else {
this.controllerShow.runJavaScript({ script: "changeSizeToTablet()" })
@ -301,6 +301,7 @@ export struct NoteContentCompPortrait {
}
aboutToDisappear(): void {
NoteUtil.refreshAll()
clearInterval(time_id)
LogUtil.info(TAG, "aboutToDisappear")
}
@ -580,6 +581,7 @@ export struct DeleteNoteComp {
let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)
predicates_note.equalTo(NoteTableColumn.Uuid, this.selectedNoteData.uuid)
RdbStoreUtil.delete(predicates_note, null)
NoteUtil.refreshAll()
routePage()
}
AppStorage.SetOrCreate('isUpdate', false)