From 535c898d3dafcc905d4d4fecbaf11b0394c604b1 Mon Sep 17 00:00:00 2001
From: nobbo <gaoshang22@huawei.com>
Date: Wed, 21 Sep 2022 10:11:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=94=B9=E5=8F=98=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E5=87=A0=E6=AC=A1?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E5=8F=8D=E5=BA=94=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>
---
 .../src/main/ets/components/CusDialogComp.ets        |  2 ++
 .../src/main/ets/components/NoteContentComp.ets      | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/common/component/src/main/ets/components/CusDialogComp.ets b/common/component/src/main/ets/components/CusDialogComp.ets
index 29fe988..3a052a0 100644
--- a/common/component/src/main/ets/components/CusDialogComp.ets
+++ b/common/component/src/main/ets/components/CusDialogComp.ets
@@ -390,6 +390,7 @@ export struct EditContentDialog {
   @Consume('SelectedNoteData') selectedNoteData: NoteData
   private circleColor: string
   private fontSize: number
+  @StorageLink('CloseEditContentDialog') CloseEditContentDialog: boolean = AppStorage.Link('CloseEditContentDialog')
 
   aboutToAppear() {
     this.confirm("javascript:RICH_EDITOR.getFontSizes()")
@@ -577,6 +578,7 @@ export struct EditContentDialog {
             .fillColor('#99182431')
             .onClick(() => {
               this.editContentDialogCtl.close()
+              this.CloseEditContentDialog = true
             })
         }
         .height(36)
diff --git a/common/component/src/main/ets/components/NoteContentComp.ets b/common/component/src/main/ets/components/NoteContentComp.ets
index d0ab475..cc2df3a 100644
--- a/common/component/src/main/ets/components/NoteContentComp.ets
+++ b/common/component/src/main/ets/components/NoteContentComp.ets
@@ -49,6 +49,7 @@ export struct NoteContentComp {
   @Consume('LastSectionStatus') lastSectionStatus: number
   @Consume('Issave') issave: number
   @Consume('Search') search: boolean
+  @StorageLink('CloseEditContentDialog') CloseEditContentDialog: boolean = AppStorage.Link('CloseEditContentDialog')
   controllerShow: WebController
   private editContentFlag = false
   @State uri1: string = ""
@@ -170,7 +171,10 @@ export struct NoteContentComp {
               clearInterval(timeId)
             }
             timeId = setInterval(() => {
-              this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" })
+//              this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" })
+              if(this.CloseEditContentDialog){
+                this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" })
+              }
             }, 3000)
             LogUtil.info(TAG, "setInterval timeId : " + timeId)
             // save continue data
@@ -345,6 +349,7 @@ export struct ToolBarComp {
   @Consume('Issave') issave: number
   controllerShow: WebController
   private context = getContext(this)
+  @StorageLink('CloseEditContentDialog') CloseEditContentDialog: boolean = AppStorage.Link('CloseEditContentDialog')
   noteDataDeleteDialogCtl: CustomDialogController = new CustomDialogController({
     builder: DeleteDialog({ onConfirm: this.onDeleteConfirm.bind(this) }),
     alignment: DialogAlignment.Center,
@@ -384,6 +389,10 @@ export struct ToolBarComp {
     customStyle: true,
   })
 
+  exisApp() {
+    this.CloseEditContentDialog = true
+  }
+
   confirm(excuteJs: string) {
     this.controllerShow.runJavaScript({ script: excuteJs })
   }
@@ -494,6 +503,7 @@ export struct ToolBarComp {
                 .onClick(() => {
                   // 退出键盘
                   inputMethod.getInputMethodController().stopInput();
+                  this.CloseEditContentDialog = false
                   this.editContentDialogCtl.open()
                 })
             }.width(42)