diff --git a/common/component/src/main/ets/components/FolderListComp.ets b/common/component/src/main/ets/components/FolderListComp.ets index 7defca3a586565d4864bcc544b31f67458f9468c..3309946f732f11397075f0a540177ae19ae56884 100644 --- a/common/component/src/main/ets/components/FolderListComp.ets +++ b/common/component/src/main/ets/components/FolderListComp.ets @@ -254,9 +254,11 @@ struct FolderItemComp { this.selectedFolderData = FolderUtil.getFolderData(this.AllFolderArray, SysDefFolderUuid.AllNotes) this.selectedNoteData = NoteUtil.getFirstNoteData(this.AllNoteArray, SysDefFolderUuid.AllNotes) // 刷新web界面 - this.controllerShow.runJavaScript({ - script: "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')" - }) + if (this.portraitModel == false) { + this.controllerShow.runJavaScript({ + script: "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')" + }) + } // save continue data let continueNote: string = JSON.stringify(this.selectedNoteData.toNoteObject()) AppStorage.SetOrCreate('ContinueNote', continueNote) diff --git a/common/component/src/main/ets/components/NoteContent.ets b/common/component/src/main/ets/components/NoteContent.ets index 642575357bcb37c09637d485c42a6d7c8bd4e96c..1a005fe18f98ddc5e83b9a67131492686c02ee58 100644 --- a/common/component/src/main/ets/components/NoteContent.ets +++ b/common/component/src/main/ets/components/NoteContent.ets @@ -94,17 +94,13 @@ export struct NoteContent { Web({ src: $rawfile('editor.html'), controller: this.controllerShow }) .javaScriptAccess(true) + .javaScriptProxy({ + object: this.noteContent, + name: "callBackToApp", // html--> name.method + methodList: ["callbackhtml", "callbackScheduledSave"], + controller:this.controllerShow + }) .onPageEnd((e) => { - if (this.editContentFlag == false) { - this.controllerShow.registerJavaScriptProxy({ - object: this.noteContent, - name: "callBackToApp", // html--> name.method - methodList: ["callbackhtml", "callbackScheduledSave"], - }) - LogUtil.info(TAG, "finish register") - this.controllerShow.refresh() - this.editContentFlag = true - } LogUtil.info(TAG, "finish loadurl") if (this.selectedNoteData) { this.controllerShow.runJavaScript({ diff --git a/common/component/src/main/ets/components/NoteContentComp.ets b/common/component/src/main/ets/components/NoteContentComp.ets index 6d4e6ee55d902e8525f1b25687554a87d8ddc219..86c8c9670cf66701ee298bc4b53f9e2e9ac3ab12 100644 --- a/common/component/src/main/ets/components/NoteContentComp.ets +++ b/common/component/src/main/ets/components/NoteContentComp.ets @@ -130,17 +130,13 @@ export struct NoteContentComp { Web({ src: $rawfile('editor.html'), controller: this.controllerShow }) .javaScriptAccess(true) + .javaScriptProxy({ + object: this.noteContent, + name: "callBackToApp", // html--> name.method + methodList: ["callbackhtml", "callbackhtmlSave", "callbackScheduledSave", "callbackGetSize"], + controller:this.controllerShow + }) .onPageEnd((e) => { - if (this.editContentFlag == false) { - this.controllerShow.registerJavaScriptProxy({ - object: this.noteContent, - name: "callBackToApp", // html--> name.method - methodList: ["callbackhtml", "callbackhtmlSave", "callbackScheduledSave", "callbackGetSize"], - }) - LogUtil.info(TAG, "finish register") - this.controllerShow.refresh() - this.editContentFlag = true - } LogUtil.info(TAG, "finish loadurl") if(this.selectedNoteData){ this.controllerShow.runJavaScript({ diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index e33c9fa2fe9af6dfcac1ea2904ebf28e80623ba4..9edc0b505d9f413a7ebf8b81d3e9b39a9ea4952a 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -99,17 +99,13 @@ export struct NoteContentCompPortrait { Column() { Web({ src: $rawfile('editor.html'), controller: this.controllerShow }) .javaScriptAccess(true) + .javaScriptProxy({ + object: this.noteContent, + name: "callBackToApp", // html--> name.method + methodList: ["callbackhtml", "callbackScheduledSave"], + controller:this.controllerShow + }) .onPageEnd((e) => { - if (this.editContentFlag == false) { - this.controllerShow.registerJavaScriptProxy({ - object: this.noteContent, - name: "callBackToApp", // html--> name.method - methodList: ["callbackhtml", "callbackScheduledSave"], - }) - LogUtil.info(TAG, "finish register") - this.controllerShow.refresh() - this.editContentFlag = true - } LogUtil.info(TAG, "finish loadurl") this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')" @@ -403,12 +399,14 @@ export struct DeleteNoteComp { let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) predicates_note.equalTo(NoteTableColumn.Uuid, this.selectedNoteData.uuid) RdbStoreUtil.update(this.selectedNoteData.toNoteObject(), predicates_note, null) + routePage() } else { NoteUtil.removeNoteData(this.AllNoteArray, this.selectedNoteData.uuid) // delete note from db let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) predicates_note.equalTo(NoteTableColumn.Uuid, this.selectedNoteData.uuid) RdbStoreUtil.delete(predicates_note, null) + routePage() } } diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/common/component/src/main/ets/components/NoteListComp.ets index bcaae8cac6c3decf2b781f2b27a6664cff750fd0..ab7612796aa59fb60da71aaa0dbc21c330e6c109 100644 --- a/common/component/src/main/ets/components/NoteListComp.ets +++ b/common/component/src/main/ets/components/NoteListComp.ets @@ -691,7 +691,7 @@ export struct SearchComp { .padding({ left:6, top:1 }) .padding({left:6}) .onEditChange((isEditing: boolean) => { - this.search = isEditing +// this.search = isEditing }) .onChange((value: string) => { if (!this.longpress) {