From 962ba4cbe3d23f8e93e29b6d979a95222f1ed043 Mon Sep 17 00:00:00 2001
From: zwx1126739 <zhanghong121@huawei.com>
Date: Mon, 9 Sep 2024 16:57:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=87=E5=BF=98=E5=BD=95js?=
 =?UTF-8?q?crash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zwx1126739 <zhanghong121@huawei.com>
---
 .../main/ets/components/FolderListComp.ets    | 24 ++++++++++++++-----
 .../src/main/ets/components/NoteContent.ets   | 19 ++++++++++++---
 .../main/ets/components/NoteContentComp.ets   |  8 ++++++-
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/features/src/main/ets/components/FolderListComp.ets b/features/src/main/ets/components/FolderListComp.ets
index 5b25660..64264d9 100644
--- a/features/src/main/ets/components/FolderListComp.ets
+++ b/features/src/main/ets/components/FolderListComp.ets
@@ -442,9 +442,15 @@ struct FolderItemComp {
             }
             // 刷新web界面
             if (this.portraitModel == false) {
-              this.controllerShow.runJavaScript(
-                "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')"
-              )
+              try {
+                this.controllerShow.runJavaScript(
+                  "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')"
+                );
+                LogUtil.info(this.TAG, `onClick runJavaScript setHtml success.`);
+              } catch (error) {
+                LogUtil.error(this.TAG, `onClick runJavaScript setHtml failed,code:${JSON.stringify(error.code)},
+                  message:${JSON.stringify(error.message)}.`);
+              }
             }
             // save continue data
             let continueNote: string = JSON.stringify(this.selectedNoteData.toNoteObject())
@@ -501,9 +507,15 @@ struct FolderItemComp {
             }
             // 刷新web界面
             if (this.portraitModel == false) {
-              this.controllerShow.runJavaScript(
-                "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')"
-              )
+              try {
+                this.controllerShow.runJavaScript(
+                  "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')"
+                );
+                LogUtil.info(this.TAG, `else runJavaScript setHtml success.`);
+              } catch (error) {
+                LogUtil.info(this.TAG, `else runJavaScript setHtml failed.code:${JSON.stringify(error.code)},
+                  message:${JSON.stringify(error.message)}`);
+              }
             }
             // save continue data
             let continueNote: string = JSON.stringify(this.selectedNoteData.toNoteObject())
diff --git a/features/src/main/ets/components/NoteContent.ets b/features/src/main/ets/components/NoteContent.ets
index c368925..b05cd2e 100644
--- a/features/src/main/ets/components/NoteContent.ets
+++ b/features/src/main/ets/components/NoteContent.ets
@@ -232,7 +232,13 @@ export struct NoteContent {
                 clearInterval(timeID)
               }
               timeID = setInterval(() => {
-                this.controllerShow.runJavaScript("scheduledSaveContent()")
+                try {
+                  this.controllerShow.runJavaScript("scheduledSaveContent()");
+                  LogUtil.info(TAG, `runJavaScript scheduledSaveContent success.`);
+                } catch (error) {
+                  LogUtil.info(TAG, `runJavaScript scheduledSaveContent failed.code:${JSON.stringify(error.code)},
+                    message:${JSON.stringify(error.message)}`);
+                }
               }, 3000)
               LogUtil.info(TAG, "setInterval timeID : " + timeID)
               this.issave = 0
@@ -288,8 +294,15 @@ export struct ToolBarComp {
         .height(24)
         .width(24)
         .onClick(() => {
-          this.controllerShow.runJavaScript("RICH_EDITOR.setInputEnabled(false)")
-          this.controllerShow.runJavaScript("getHtmlContent()")
+          try {
+            this.controllerShow.runJavaScript("RICH_EDITOR.setInputEnabled(false)");
+            this.controllerShow.runJavaScript("getHtmlContent()");
+            LogUtil.info(TAG, `runJavaScript setInputEnabled and getHtmlContent success.`);
+          } catch (error) {
+            LogUtil.info(TAG, `runJavaScript setInputEnabled and getHtmlContent fail.code:${JSON.stringify(error.code)},
+              message:${JSON.stringify(error.message)}`);
+          }
+
           // 清除定时器
           if (timeID != undefined) {
             LogUtil.info(TAG, "zoom, clearInterval timeID : " + timeID)
diff --git a/features/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets
index c2ce852..2731c25 100644
--- a/features/src/main/ets/components/NoteContentComp.ets
+++ b/features/src/main/ets/components/NoteContentComp.ets
@@ -69,7 +69,13 @@ export struct NoteContentComp {
     if (!this.refreshCurrentNote) {
       return
     }
-    this.controllerShow.runJavaScript("RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')")
+    try {
+      this.controllerShow.runJavaScript("RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')");
+      LogUtil.info(TAG, `runJavaScript setHtml success.`);
+    } catch (error) {
+      LogUtil.error(TAG, `runJavaScript setHtml failed.code:${JSON.stringify(error.code)},
+        message:${JSON.stringify(error.message)}`);
+    }
     this.refreshCurrentNote = false
   }
 
-- 
Gitee