From 98ae53417db6e333bff195e3bc3381cb86d25998 Mon Sep 17 00:00:00 2001 From: gaoshang Date: Mon, 1 Aug 2022 13:24:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gaoshang --- common/component/src/main/ets/components/CusDialogComp.ets | 6 +++++- common/component/src/main/ets/components/NoteContent.ets | 4 ++-- .../component/src/main/ets/components/NoteContentComp.ets | 4 ++-- .../src/main/ets/components/NoteContentCompPortrait.ets | 7 ++++--- common/component/src/main/ets/components/NoteListComp.ets | 6 ++++-- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/common/component/src/main/ets/components/CusDialogComp.ets b/common/component/src/main/ets/components/CusDialogComp.ets index 5054fda..29fe988 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 35563b7..35f404c 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 aade261..58f953e 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 3f93f5e..3e25552 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 bfa8143..a462659 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 }); -- Gitee From f877bf4ade40383f7c3f4b57a83d992e8fd2c655 Mon Sep 17 00:00:00 2001 From: nobbo Date: Mon, 1 Aug 2022 13:29:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- AppScope/resources/base/element/string.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppScope/resources/base/element/string.json b/AppScope/resources/base/element/string.json index ff36e7c..53a8367 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": "备忘录" } ] } -- Gitee