From 959b6f6895ea94d587c5a151f05a66d06acfbfb7 Mon Sep 17 00:00:00 2001
From: nobbo <gaoshang22@huawei.com>
Date: Fri, 26 Aug 2022 19:20:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E5=BF=98=E5=BD=95?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nobbo <gaoshang22@huawei.com>
---
 .../component/src/main/ets/components/FolderListComp.ets  | 8 +++++---
 .../src/main/ets/components/NoteContentCompPortrait.ets   | 2 ++
 common/component/src/main/ets/components/NoteListComp.ets | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/common/component/src/main/ets/components/FolderListComp.ets b/common/component/src/main/ets/components/FolderListComp.ets
index 7defca3..3309946 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<string>('ContinueNote', continueNote)
diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets
index e33c9fa..f060b8a 100644
--- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets
+++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets
@@ -403,12 +403,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 bcaae8c..ab76127 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) {