From 83ff2dca7bf2bcbc6ec99eaa4ba310141a1f679d Mon Sep 17 00:00:00 2001 From: ylh Date: Thu, 28 Apr 2022 15:48:49 +0800 Subject: [PATCH 1/2] Highlight Signed-off-by: ylh --- .../components/NoteContentCompPortrait.ets | 38 ++++++++----------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index c102b13..75b7c62 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -78,15 +78,16 @@ export struct NoteContentCompPortrait { } build() { - Column() { + Stack({ alignContent: Alignment.Bottom }) { Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap, alignItems: ItemAlign.Start, alignContent: FlexAlign.SpaceAround }) { Column() { ToolBarComp({ controllerShow: this.controllerShow }) - NoteContentOverViewComp() } Column() { + NoteContentOverViewComp() + Web({ src: $rawfile('editor.html'), controller: this.controllerShow }) .javaScriptAccess(true) .onPageEnd((e) => { @@ -109,7 +110,6 @@ export struct NoteContentCompPortrait { .height('70%') .width('100%') } - .flexShrink(1) .onClick(() => { // 添加定时器：3s自动保存 time_id = setInterval(() => { @@ -121,7 +121,7 @@ export struct NoteContentCompPortrait { .margin({ top: 16 }) .width(StyleConstants.PERCENTAGE_100) } - .flexShrink(1) + .height(StyleConstants.PERCENTAGE_100) .margin({ left: 24, right: 24 }) EditNoteCompForPortrait({ controllerShow: this.controllerShow }) @@ -169,7 +169,7 @@ export struct NoteContentOverViewComp { List() { ForEach(this.AllFolderArray, (item) => { ListItem() { - NoteDataMoveItemComp({ folderItem: item }) + NoteDataMoveItemCompMenu({ folderItem: item, uuid: this.selectedNoteData.folder_uuid }) } .onClick(() => { this.selectedNoteData.folder_uuid = item.uuid @@ -219,12 +219,13 @@ export struct NoteContentOverViewComp { .margin({ left: 8 }) .borderRadius(16) .backgroundColor(NoteUtil.getNoteBgColor(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid, SysDefFolderUuid.AllNotes, false)) - .bindMenu(this.MenuBuilder) + // 传递当前显示的分类uuid + .bindMenu(this.MenuBuilder()) }.alignItems(VerticalAlign.Top).height(40).width(StyleConstants.PERCENTAGE_100) } .opacity(this.selectedNoteData.is_deleted == Delete.Yes ? 0.4 : 1) .width(StyleConstants.PERCENTAGE_100) - .height(82) + .height(80) } } @@ -317,7 +318,7 @@ export struct ToolBarComp { } } .width(StyleConstants.PERCENTAGE_100) - .height(40) + .height(80) } } @@ -418,9 +419,9 @@ export struct EditNoteCompForPortrait { } build() { - Row() { + Flex({ direction: FlexDirection.Row, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.SpaceBetween }) { Column() { - Image($r('app.media.circle_tick1')) + Image($r('app.media.circle_tick')) .width(24) .height(24) .responseRegion({ x: -15.0, y: -15.0, width: 54, height: 54 }) @@ -433,9 +434,6 @@ export struct EditNoteCompForPortrait { .fontColor($r('app.color.list_font_color')) .padding({ top: 5 }) } - .height("100%") - .width(120) - .justifyContent(FlexAlign.Center) .alignItems(HorizontalAlign.Center) Column() { @@ -451,9 +449,6 @@ export struct EditNoteCompForPortrait { .fontColor($r('app.color.style_font_color')) .padding({ top: 5 }) } - .height("100%") - .width(120) - .justifyContent(FlexAlign.Center) .alignItems(HorizontalAlign.Center) Column() { @@ -476,7 +471,6 @@ export struct EditNoteCompForPortrait { let uri = param['select-item-list']; imageUri = uri; } - LogUtil.info(TAG, "image url" + imageUri) // 拷贝 if (imageUri != null && imageUri != "") { OperationUtils.copy(imageUri).then((uriPath) => { @@ -494,9 +488,6 @@ export struct EditNoteCompForPortrait { .fontColor($r('app.color.photo_font_color')) .padding({ top: 5 }) } - .height("100%") - .width(120) - .justifyContent(FlexAlign.Center) .alignItems(HorizontalAlign.Center) } .width(360) @@ -507,10 +498,11 @@ export struct EditNoteCompForPortrait { } @Component -struct NoteDataMoveItemComp { +struct NoteDataMoveItemCompMenu { @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = [] - private folderItem: FolderData + folderItem: FolderData + uuid: String build() { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.Center }) { @@ -527,7 +519,7 @@ struct NoteDataMoveItemComp { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.SpaceBetween }) { Text(FolderUtil.getFolderText(this.folderItem)) .fontSize(16) - .fontColor(FolderUtil.getFolderIconColor(this.AllFolderArray, this.folderItem.uuid, false)) + .fontColor(FolderUtil.getFolderIconColor(this.AllFolderArray, this.folderItem.uuid == this.uuid ? this.folderItem.uuid : '', false)) .textAlign(TextAlign.Center) .maxLines(1) .textOverflow({ overflow: TextOverflow.Ellipsis }) -- Gitee From a24fb3cd2f2809cb4ca28b46d2feb257fa17fda3 Mon Sep 17 00:00:00 2001 From: ylh Date: Thu, 28 Apr 2022 16:28:10 +0800 Subject: [PATCH 2/2] newHighlight Signed-off-by: ylh --- .../components/NoteContentCompPortrait.ets | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index 75b7c62..bdaafbb 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -78,16 +78,15 @@ export struct NoteContentCompPortrait { } build() { - Stack({ alignContent: Alignment.Bottom }) { + Column() { Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap, alignItems: ItemAlign.Start, alignContent: FlexAlign.SpaceAround }) { Column() { ToolBarComp({ controllerShow: this.controllerShow }) + NoteContentOverViewComp() } Column() { - NoteContentOverViewComp() - Web({ src: $rawfile('editor.html'), controller: this.controllerShow }) .javaScriptAccess(true) .onPageEnd((e) => { @@ -110,6 +109,7 @@ export struct NoteContentCompPortrait { .height('70%') .width('100%') } + .flexShrink(1) .onClick(() => { // 添加定时器：3s自动保存 time_id = setInterval(() => { @@ -121,7 +121,7 @@ export struct NoteContentCompPortrait { .margin({ top: 16 }) .width(StyleConstants.PERCENTAGE_100) } - .height(StyleConstants.PERCENTAGE_100) + .flexShrink(1) .margin({ left: 24, right: 24 }) EditNoteCompForPortrait({ controllerShow: this.controllerShow }) @@ -219,13 +219,12 @@ export struct NoteContentOverViewComp { .margin({ left: 8 }) .borderRadius(16) .backgroundColor(NoteUtil.getNoteBgColor(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid, SysDefFolderUuid.AllNotes, false)) - // 传递当前显示的分类uuid - .bindMenu(this.MenuBuilder()) + .bindMenu(this.MenuBuilder) }.alignItems(VerticalAlign.Top).height(40).width(StyleConstants.PERCENTAGE_100) } .opacity(this.selectedNoteData.is_deleted == Delete.Yes ? 0.4 : 1) .width(StyleConstants.PERCENTAGE_100) - .height(80) + .height(82) } } @@ -318,7 +317,7 @@ export struct ToolBarComp { } } .width(StyleConstants.PERCENTAGE_100) - .height(80) + .height(40) } } @@ -419,9 +418,9 @@ export struct EditNoteCompForPortrait { } build() { - Flex({ direction: FlexDirection.Row, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.SpaceBetween }) { + Row() { Column() { - Image($r('app.media.circle_tick')) + Image($r('app.media.circle_tick1')) .width(24) .height(24) .responseRegion({ x: -15.0, y: -15.0, width: 54, height: 54 }) @@ -434,6 +433,9 @@ export struct EditNoteCompForPortrait { .fontColor($r('app.color.list_font_color')) .padding({ top: 5 }) } + .height("100%") + .width(120) + .justifyContent(FlexAlign.Center) .alignItems(HorizontalAlign.Center) Column() { @@ -449,6 +451,9 @@ export struct EditNoteCompForPortrait { .fontColor($r('app.color.style_font_color')) .padding({ top: 5 }) } + .height("100%") + .width(120) + .justifyContent(FlexAlign.Center) .alignItems(HorizontalAlign.Center) Column() { @@ -471,6 +476,7 @@ export struct EditNoteCompForPortrait { let uri = param['select-item-list']; imageUri = uri; } + LogUtil.info(TAG, "image url" + imageUri) // 拷贝 if (imageUri != null && imageUri != "") { OperationUtils.copy(imageUri).then((uriPath) => { @@ -488,6 +494,9 @@ export struct EditNoteCompForPortrait { .fontColor($r('app.color.photo_font_color')) .padding({ top: 5 }) } + .height("100%") + .width(120) + .justifyContent(FlexAlign.Center) .alignItems(HorizontalAlign.Center) } .width(360) -- Gitee