diff --git a/common/component/src/main/ets/components/CusDialogComp.ets b/common/component/src/main/ets/components/CusDialogComp.ets
index 3a052a0d4b5c4e665696a7d1970ad4505cfca17b..b43a83f56176bf214de72468296aab09fb25f02d 100644
--- a/common/component/src/main/ets/components/CusDialogComp.ets
+++ b/common/component/src/main/ets/components/CusDialogComp.ets
@@ -390,7 +390,7 @@ export struct EditContentDialog {
   @Consume('SelectedNoteData') selectedNoteData: NoteData
   private circleColor: string
   private fontSize: number
-  @StorageLink('CloseEditContentDialog') CloseEditContentDialog: boolean = AppStorage.Link('CloseEditContentDialog')
+  @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog')
 
   aboutToAppear() {
     this.confirm("javascript:RICH_EDITOR.getFontSizes()")
@@ -578,7 +578,7 @@ export struct EditContentDialog {
             .fillColor('#99182431')
             .onClick(() => {
               this.editContentDialogCtl.close()
-              this.CloseEditContentDialog = true
+              this.closeEditContentDialog = true
             })
         }
         .height(36)
@@ -728,6 +728,7 @@ export struct EditContentDialogPortrait {
   confirm: (excuteJs: string) => void
   @State selectFontColor: string = fontColorArray[0]
   @Consume('SelectedNoteData') selectedNoteData: NoteData
+  @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog')
   private circleColor: string
   private fontSize: number
 
@@ -745,6 +746,7 @@ export struct EditContentDialogPortrait {
           .fillColor($r("app.color.font_stylecolor_AD182431"))
           .onClick(() => {
             this.editContentDialogCtl.close()
+            this.closeEditContentDialog = true
           })
       }
       .height(48)
diff --git a/common/component/src/main/ets/components/NoteContent.ets b/common/component/src/main/ets/components/NoteContent.ets
index fbf03c2a9c93eb14cd48c072797ddb56abf22f89..2dfceca051ecbd56f2bea6636366d05e145fa972 100644
--- a/common/component/src/main/ets/components/NoteContent.ets
+++ b/common/component/src/main/ets/components/NoteContent.ets
@@ -39,6 +39,7 @@ var timeID: number
 
 @Component
 export struct NoteContent {
+  @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog')
   @Provide('SelectedNoteData') selectedNoteData: NoteData = AppStorage.Get('NewNote')
   @StorageLink('AllNoteArray') AllNoteArray: NoteData[]  = AppStorage.Link('AllNoteArray')
   @Provide('Issave') issave: number = 0
@@ -155,7 +156,9 @@ export struct NoteContent {
             clearInterval(timeID)
           }
           timeID = setInterval(() => {
-            this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" })
+            if(this.closeEditContentDialog){
+              this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" })
+            }
           }, 3000)
           LogUtil.info(TAG, "setInterval timeID : " + timeID)
           this.issave = 0
@@ -180,6 +183,7 @@ export struct NoteContent {
 
 @Component
 export struct ToolBarComp {
+  @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog')
   @Consume('SelectedNoteData') selectedNoteData: NoteData
   @StorageLink('AllNoteArray') AllNoteArray: NoteData[]  = AppStorage.Link('AllNoteArray')
   @Consume('Issave') issave: number
@@ -190,8 +194,13 @@ export struct ToolBarComp {
     alignment: DialogAlignment.Bottom,
     autoCancel: true,
     customStyle: true,
+    cancel: this.existApp
   })
 
+  existApp() {
+    this.closeEditContentDialog = true
+  }
+
   confirm(excuteJs: string) {
     this.controllerShow.runJavaScript({ script: excuteJs })
   }
@@ -256,6 +265,7 @@ export struct ToolBarComp {
                 // 退出键盘
                 inputMethod.getInputMethodController().stopInput();
                 LogUtil.info(TAG, 'editContentDialogCtl start')
+                this.closeEditContentDialog = false
                 this.editContentDialogCtl.open()
               })
           }.width(42)
diff --git a/common/component/src/main/ets/components/NoteContentComp.ets b/common/component/src/main/ets/components/NoteContentComp.ets
index 3135707621a92029f890af3a25715424f604a655..9c72c66bbea1f5041620ed00eeab53be0a8f989a 100644
--- a/common/component/src/main/ets/components/NoteContentComp.ets
+++ b/common/component/src/main/ets/components/NoteContentComp.ets
@@ -49,7 +49,7 @@ export struct NoteContentComp {
   @Consume('LastSectionStatus') lastSectionStatus: number
   @Consume('Issave') issave: number
   @Consume('Search') search: boolean
-  @StorageLink('CloseEditContentDialog') CloseEditContentDialog: boolean = AppStorage.Link('CloseEditContentDialog')
+  @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog')
   controllerShow: WebController
   private editContentFlag = false
   @State uri1: string = ""
@@ -207,7 +207,7 @@ export struct NoteContentComp {
               clearInterval(timeId)
             }
             timeId = setInterval(() => {
-              if(this.CloseEditContentDialog){
+              if(this.closeEditContentDialog){
                 this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" })
               }
             }, 3000)
@@ -384,7 +384,7 @@ export struct ToolBarComp {
   @Consume('Issave') issave: number
   controllerShow: WebController
   private context = getContext(this)
-  @StorageLink('CloseEditContentDialog') CloseEditContentDialog: boolean = AppStorage.Link('CloseEditContentDialog')
+  @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog')
   noteDataDeleteDialogCtl: CustomDialogController = new CustomDialogController({
     builder: DeleteDialog({ onConfirm: this.onDeleteConfirm.bind(this) }),
     alignment: DialogAlignment.Center,
@@ -422,10 +422,11 @@ export struct ToolBarComp {
     alignment: DialogAlignment.Bottom,
     autoCancel: true,
     customStyle: true,
+    cancel: this.exisApp
   })
 
   exisApp() {
-    this.CloseEditContentDialog = true
+    this.closeEditContentDialog = true
   }
 
   confirm(excuteJs: string) {
@@ -538,7 +539,7 @@ export struct ToolBarComp {
                 .onClick(() => {
                   // 退出键盘
                   inputMethod.getInputMethodController().stopInput();
-                  this.CloseEditContentDialog = false
+                  this.closeEditContentDialog = false
                   this.editContentDialogCtl.open()
                 })
             }.width(42)
diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets
index 58b9bbbeeaeb1534178430f34e0680b86c711189..8a45875642e25d4093f1b919ebc4b83692518b03 100644
--- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets
+++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets
@@ -52,6 +52,7 @@ export struct NoteContentCompPortrait {
   @Provide('SelectedFolderData') selectedFolderData: FolderData = AppStorage.Get("NewFolder")
   @StorageLink('AllNoteArray') AllNoteArray: NoteData[]  = AppStorage.Link('AllNoteArray')
   @Provide('EditModel') editModel: boolean = false
+  @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog')
   controllerShow: WebController
   private editContentFlag = false
   noteContent = {
@@ -157,7 +158,9 @@ export struct NoteContentCompPortrait {
           }
           // 添加定时器：3s自动保存
           time_id = setInterval(() => {
-            this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" })
+            if(this.closeEditContentDialog){
+              this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" })
+            }
           }, 3000)
           LogUtil.info(TAG, "setInterval time_id : " + time_id)
           this.editModel = true
@@ -516,14 +519,20 @@ export struct EditNoteCompForPortrait {
   @Consume('SelectedFolderData') selectedFolderData: FolderData
   @Consume('SelectedNoteData') selectedNoteData: NoteData;
   @Consume('EditModel') editModel: boolean
+  @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog')
   controllerShow: WebController
   editContentDialogCtl: CustomDialogController = new CustomDialogController({
     builder: EditContentDialogPortrait({ confirm: this.confirm.bind(this) }),
     alignment: DialogAlignment.Bottom,
     autoCancel: true,
     customStyle: true,
+    cancel: this.exissApp
   })
 
+  exissApp() {
+    this.closeEditContentDialog = true
+  }
+
   confirm(excuteJs: string) {
     this.controllerShow.runJavaScript({ script: excuteJs })
   }
@@ -555,6 +564,7 @@ export struct EditNoteCompForPortrait {
           .height(24)
           .responseRegion({ x: -15.0, y: -15.0, width: 54, height: 54 })
           .onClick(() => {
+            this.closeEditContentDialog = false
             this.editContentDialogCtl.open()
           })
         Text($r("app.string.style"))
diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/common/component/src/main/ets/components/NoteListComp.ets
index 5ba65d8a661273cdc382a7accecb847834d6ce21..25f9d7e1ddfcec71a9eb1899d525ddc230b00b24 100644
--- a/common/component/src/main/ets/components/NoteListComp.ets
+++ b/common/component/src/main/ets/components/NoteListComp.ets
@@ -362,7 +362,7 @@ export struct NoteItemListComp {
   }
 
   build() {
-    Flex({ direction: FlexDirection.Column }) {
+    Column() {
       Text(this.refreshFlag.toString()).visibility(Visibility.None)
       Flex() {
         SearchComp()
@@ -414,6 +414,7 @@ export struct NoteItemListComp {
                 }
               }, noteItem => noteItem.uuid.toString())
             }
+            .margin((FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0) ? { bottom: 0 } : { bottom: 130 })
             .layoutWeight(1)
             .listDirection(Axis.Vertical)
             .edgeEffect(EdgeEffect.Spring)
@@ -434,9 +435,7 @@ export struct NoteItemListComp {
         .opacity(0.1)
         .visibility(this.search ? Visibility.Visible : Visibility.Hidden)
       }
-      .flexShrink(1)
     }
-    .flexShrink(1)
     .onClick(() => {
       this.search = false
     })
@@ -670,6 +669,7 @@ export struct SearchComp {
   @Consume('Search') search: boolean
   @Consume('InputKeyword') inputKeyword: string
   @Consume('Longpress') longpress: boolean
+  @State text: string = ''
 
   build() {
     Row() {
@@ -685,7 +685,7 @@ export struct SearchComp {
 
       Flex({ justifyContent: FlexAlign.Start }) {
         Image($r('app.media.search')).width(20).height(20)
-        TextInput({ placeholder: $r('app.string.searchNote') })
+        TextInput({ placeholder: $r('app.string.searchNote'), text: this.text })
           .backgroundColor(this.longpress ? $r("app.color.search_longpress_bgcolor_f7f8f9") : $r("app.color.color_ffffff"))
           .caretColor($r("app.color.search_note_caret_color"))
           .enabled(this.longpress ? false : true)
@@ -697,6 +697,7 @@ export struct SearchComp {
           .onChange((value: string) => {
             if (!this.longpress) {
               LogUtil.info(TAG, "Search value: " + value)
+              this.text = value
               this.inputKeyword = value
             }
           })
diff --git a/product/tablet/src/main/ets/MainAbility/MainAbility.ts b/product/tablet/src/main/ets/MainAbility/MainAbility.ts
index 8d621a7210296228fe1dea4843d9c384c5acd6cc..ab7ebf1e96b070ab9f644f8b22694794ecdf961d 100644
--- a/product/tablet/src/main/ets/MainAbility/MainAbility.ts
+++ b/product/tablet/src/main/ets/MainAbility/MainAbility.ts
@@ -25,7 +25,7 @@ export default class MainAbility extends Ability {
     private Tag = "MainAbility_Tablet"
 
     onCreate(want, launchParam) {
-        AppStorage.SetOrCreate<boolean>('CloseEditContentDialog', true)
+        AppStorage.SetOrCreate<boolean>('closeEditContentDialog', true)
         LogUtil.info(this.Tag, " onCreate, launchReason is " + launchParam.launchReason)
         LogUtil.info(this.Tag, " onCreate, deviceType" + deviceInfo.deviceType)
         if (deviceInfo.deviceType === 'phone' || deviceInfo.deviceType === 'default') {