diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index 3e25552062af0d1c5248019c1f1b2ad1a4fe4407..6a7bc46570fc93d48e3fd703044ae6a7d55b0fdd 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -441,11 +441,17 @@ export struct DeleteNoteComp { this.selectedNoteData.is_deleted = Delete.No this.selectedNoteData.deleted_time = 0 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 }); - }); + let resource = { + bundleName: "com.ohos.note", + moduleName: "phone", + id: $r('app.string.restore').id + }; + context.resourceManager.getString(resource, (error, value) => { + if (error != null) { + console.log("error is " + error); + } else { + prompt.showToast({ message: value, duration: 2000 }); + } }); this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0) // update note to db diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/common/component/src/main/ets/components/NoteListComp.ets index a462659413db8778bd6bd300ac3f8a10820661f6..de5dcceb5764c2ca856094dfc3e4236805313ab1 100644 --- a/common/component/src/main/ets/components/NoteListComp.ets +++ b/common/component/src/main/ets/components/NoteListComp.ets @@ -571,11 +571,17 @@ export struct OperateNoteComp { noteItem.is_deleted = Delete.No noteItem.deleted_time = 0 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 }); - }); + let resource = { + bundleName: "com.ohos.note", + moduleName: "tablet", + id: $r('app.string.restore').id + }; + context.resourceManager.getString(resource, (error, value) => { + if (error != null) { + console.log("error is " + error); + } else { + prompt.showToast({ message: value, duration: 2000 }); + } }); // update note to db let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) @@ -886,11 +892,17 @@ export struct OperateNoteCompForPortrait { noteItem.is_deleted = Delete.No noteItem.deleted_time = 0 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 }); - }); + let resource = { + bundleName: "com.ohos.note", + moduleName: "phone", + id: $r('app.string.restore').id + }; + context.resourceManager.getString(resource, (error, value) => { + if (error != null) { + console.log("error is " + error); + } else { + prompt.showToast({ message: value, duration: 2000 }); + } }); // update note to db let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) @@ -939,6 +951,7 @@ export struct OperateNoteCompForPortrait { .alignItems(HorizontalAlign.Center) .justifyContent(FlexAlign.Center) } + .justifyContent(FlexAlign.Center) .width("100%") .height(56) .visibility(this.longpress && this.portraitModel == true ? Visibility.Visible : Visibility.None)