diff --git a/AppScope/resources/base/element/string.json b/AppScope/resources/base/element/string.json
index ff36e7cd65870eb0cb3a54c2656ffd5bbaa35cd7..53a8367c5f1be45bd1172259704ebceff71b62ba 100644
--- a/AppScope/resources/base/element/string.json
+++ b/AppScope/resources/base/element/string.json
@@ -2,7 +2,7 @@
   "string": [
     {
       "name": "app_name",
-      "value": "ohos_note"
+      "value": "备忘录"
     }
   ]
 }
diff --git a/common/component/src/main/ets/components/CusDialogComp.ets b/common/component/src/main/ets/components/CusDialogComp.ets
index 5054fda88594dded3ab6f351d03070fc788dc73f..29fe9885033fc4b7ae549beb0858514ea7275bd4 100644
--- a/common/component/src/main/ets/components/CusDialogComp.ets
+++ b/common/component/src/main/ets/components/CusDialogComp.ets
@@ -162,7 +162,11 @@ struct ColorCircleComp {
         .fill($r("app.color.color_ffffff"))
         .visibility(this.circleColor == this.selectedColor ? Visibility.Visible : Visibility.None)
     }.onClick(() => {
-      this.selectedColor = this.circleColor
+      try {
+        this.selectedColor = this.circleColor
+      } catch (error) {
+        console.log("selectedColor error: ", error.toString());
+      }
     })
   }
 }
diff --git a/common/component/src/main/ets/components/NoteContent.ets b/common/component/src/main/ets/components/NoteContent.ets
index 35563b742a5305056545309e655eacfe53d211a4..35f404c8f10c41d4111e8ae57a838e0ae60ba5c0 100644
--- a/common/component/src/main/ets/components/NoteContent.ets
+++ b/common/component/src/main/ets/components/NoteContent.ets
@@ -372,7 +372,7 @@ export struct NoteContentOverViewComp {
   }
 
   build() {
-    if (this.selectedNoteData && this.selectedNoteData.is_deleted) {
+//    if (this.selectedNoteData && this.selectedNoteData.is_deleted) {
       Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap,
         justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
         Row() {
@@ -413,7 +413,7 @@ export struct NoteContentOverViewComp {
       .opacity(this.selectedNoteData.is_deleted == Delete.Yes ? 0.4 : 1)
       .width(StyleConstants.PERCENTAGE_100)
       .height(80)
-    }
+//    }
   }
 }
 
diff --git a/common/component/src/main/ets/components/NoteContentComp.ets b/common/component/src/main/ets/components/NoteContentComp.ets
index aade2619caaa34877770a17dc1fc7f2dfdc34ec7..58f953e23edf46573ab9ed38adf0715f1e1afa68 100644
--- a/common/component/src/main/ets/components/NoteContentComp.ets
+++ b/common/component/src/main/ets/components/NoteContentComp.ets
@@ -282,7 +282,7 @@ export struct NoteContentOverViewComp {
   }
 
   build() {
-    if (this.selectedNoteData && this.selectedNoteData.is_deleted) {
+//    if (this.selectedNoteData && this.selectedNoteData.is_deleted) {
       Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap,
         justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
         Row() {
@@ -329,7 +329,7 @@ export struct NoteContentOverViewComp {
       .opacity(this.selectedNoteData.is_deleted == Delete.Yes ? 0.4 : 1)
       .width(StyleConstants.PERCENTAGE_100)
       .height(80)
-    }
+//    }
   }
 }
 
diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets
index 3f93f5e72cb16ff56b991c4e2d03fad4c34952d1..3e25552062af0d1c5248019c1f1b2ad1a4fe4407 100644
--- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets
+++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets
@@ -216,7 +216,7 @@ export struct NoteContentOverViewComp {
   }
 
   build() {
-    if (this.selectedNoteData && this.selectedNoteData.is_deleted) {
+//    if (this.selectedNoteData && this.selectedNoteData.is_deleted) {
       Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap,
         justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
         Row() {
@@ -254,7 +254,7 @@ export struct NoteContentOverViewComp {
       .opacity(this.selectedNoteData.is_deleted == Delete.Yes ? 0.4 : 1)
       .width(StyleConstants.PERCENTAGE_100)
       .height(82)
-    }
+//    }
   }
 }
 
@@ -440,7 +440,8 @@ export struct DeleteNoteComp {
           .onClick(() => {
             this.selectedNoteData.is_deleted = Delete.No
             this.selectedNoteData.deleted_time = 0
-            rs.getResourceManager().then((manager) => {
+            let context: any = getContext(this)
+            context.resourceManager.getResourceManager().then((manager) => {
               manager.getString($r('app.string.restore').id)
                 .then((strVal) => {
                   prompt.showToast({ message: strVal, duration: 2000 });
diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/common/component/src/main/ets/components/NoteListComp.ets
index bfa8143fa22057b649ef48e38f95eb164495245a..a462659413db8778bd6bd300ac3f8a10820661f6 100644
--- a/common/component/src/main/ets/components/NoteListComp.ets
+++ b/common/component/src/main/ets/components/NoteListComp.ets
@@ -570,7 +570,8 @@ export struct OperateNoteComp {
           this.CheckedNoteArray.forEach((noteItem) => {
             noteItem.is_deleted = Delete.No
             noteItem.deleted_time = 0
-            rs.getResourceManager().then((manager) => {
+            let context: any = getContext(this)
+            context.resourceManager.getResourceManager().then((manager) => {
               manager.getString($r('app.string.restore').id)
                 .then((strVal)=>{
                   prompt.showToast({ message: strVal, duration: 2000 });
@@ -884,7 +885,8 @@ export struct OperateNoteCompForPortrait {
               this.CheckedNoteArray.forEach((noteItem) => {
                 noteItem.is_deleted = Delete.No
                 noteItem.deleted_time = 0
-                rs.getResourceManager().then((manager) => {
+                let context: any = getContext(this)
+                context.resourceManager.getResourceManager().then((manager) => {
                   manager.getString($r('app.string.restore').id)
                     .then((strVal)=>{
                       prompt.showToast({ message: strVal, duration: 2000 });