From a3209be38d975c7f577497490e0be508e1b37dcd Mon Sep 17 00:00:00 2001 From: wangzhiyusss Date: Wed, 8 Feb 2023 15:44:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=87=E6=8D=A2API10=E5=85=BC=E5=AE=B9AP?= =?UTF-8?q?I9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangzhiyusss --- build-profile.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-profile.json5 b/build-profile.json5 index 71f35fa..e0e91d4 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -16,7 +16,7 @@ { "app": { - "compileSdkVersion": 9, + "compileSdkVersion": 10, "compatibleSdkVersion": 9, "products": [ { -- Gitee From 7e7beb94775f68d65379a91ba50b37e6f4fbd6d5 Mon Sep 17 00:00:00 2001 From: wangzhiyusss Date: Thu, 9 Feb 2023 10:28:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E4=B8=8B=E7=A7=BB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangzhiyusss --- features/src/main/ets/components/NoteContentComp.ets | 2 +- features/src/main/ets/components/NoteContentCompPortrait.ets | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/features/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets index 54b200c..9d597be 100644 --- a/features/src/main/ets/components/NoteContentComp.ets +++ b/features/src/main/ets/components/NoteContentComp.ets @@ -676,7 +676,7 @@ export struct ToolBarComp { let imageUri = "" if (param != null && param != undefined) { let uri = param['select-item-list']; - imageUri = uri; + imageUri = uri[0]; } // 拷贝 if (imageUri != null && imageUri != "") { diff --git a/features/src/main/ets/components/NoteContentCompPortrait.ets b/features/src/main/ets/components/NoteContentCompPortrait.ets index b2a257b..2000c1e 100644 --- a/features/src/main/ets/components/NoteContentCompPortrait.ets +++ b/features/src/main/ets/components/NoteContentCompPortrait.ets @@ -247,10 +247,11 @@ export struct NoteContentCompPortrait { alignItems: ItemAlign.Start, alignContent: FlexAlign.SpaceAround }) { Column() { ToolBarComp({ controllerShow: this.controllerShow }) + NoteContentOverViewComp() + .enabled(this.selectedNoteData && this.selectedNoteData.is_deleted == Delete.Yes ? false : true) } Column() { - NoteContentOverViewComp() Web({ src: $rawfile('editor.html'), controller: this.controllerShow }) .javaScriptAccess(true) .javaScriptProxy({ -- Gitee