diff --git a/build-profile.json5 b/build-profile.json5 index 71f35fa3a49b4a08a75351af255c8f8335f32584..e0e91d41f78cc6c7c175cc72721553a9a52d803e 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -16,7 +16,7 @@ { "app": { - "compileSdkVersion": 9, + "compileSdkVersion": 10, "compatibleSdkVersion": 9, "products": [ { diff --git a/features/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets index 54b200c299d2ab7b7a2c29187a9d3ee82d53b5fb..9d597bef78fe643db6a4dee9ea4a550296b83eb5 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 b2a257bd3f20ca0ffeb42b321a9b99206b9f2e81..2000c1e7bf28aa28ec15fb835f7392c1e52134cf 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({