From c32264c87f3c4a879280e4247e13f73c0d8a7d3e Mon Sep 17 00:00:00 2001 From: yanjuntao Date: Fri, 6 May 2022 18:05:11 +0800 Subject: [PATCH 1/3] update Signed-off-by: yanjuntao --- common/component/src/main/ets/components/CusDialogComp.ets | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/component/src/main/ets/components/CusDialogComp.ets b/common/component/src/main/ets/components/CusDialogComp.ets index 5fccc14..7a0bed0 100644 --- a/common/component/src/main/ets/components/CusDialogComp.ets +++ b/common/component/src/main/ets/components/CusDialogComp.ets @@ -34,6 +34,7 @@ export struct NewOrEditFolderDialog { @State isExisted: boolean = false @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') @Consume('SelectedColor') selectedColor: string + @Consume('ExpandStatus') expandStatus: boolean // 笔记本折叠展开状态 build() { Column() { @@ -110,6 +111,8 @@ export struct NewOrEditFolderDialog { .onClick(() => { this.newOrEditFolderDialogCtl.close() this.confirm(this.selectedColor, this.inputName) + this.expandStatus = !this.expandStatus + this.expandStatus = !this.expandStatus }) }.width('100%') .margin({ top: 21, bottom: 25 }) @@ -165,6 +168,7 @@ export struct DeleteDialog { @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') @Consume('SelectedNoteData') selectedNoteData: NoteData @Consume('SelectedFolderData') selectedFolderData: FolderData + @Consume('ExpandStatus') expandStatus: boolean // 笔记本折叠展开状态 private multiSelect: boolean = false private deleteFileType = DeleteFileType.NoteData noteDataDeleteDialogCtl: CustomDialogController @@ -235,6 +239,8 @@ export struct DeleteDialog { .onClick(() => { this.noteDataDeleteDialogCtl.close() this.onConfirm() + this.expandStatus = !this.expandStatus + this.expandStatus = !this.expandStatus }) } .width('100%') -- Gitee From 49da9e4838eb1503df8eadae96ea2297aafecc52 Mon Sep 17 00:00:00 2001 From: yanjuntao Date: Sat, 7 May 2022 16:39:26 +0800 Subject: [PATCH 2/3] icon Signed-off-by: yanjuntao --- common/component/src/main/ets/components/CusDialogComp.ets | 2 +- .../src/main/ets/components/NoteContentCompPortrait.ets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/component/src/main/ets/components/CusDialogComp.ets b/common/component/src/main/ets/components/CusDialogComp.ets index 7a0bed0..49997a8 100644 --- a/common/component/src/main/ets/components/CusDialogComp.ets +++ b/common/component/src/main/ets/components/CusDialogComp.ets @@ -266,7 +266,7 @@ struct NoteDataMoveItemComp { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap }) { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap }) { Image(FolderUtil.getFolderIcon(this.folderItem.uuid)) - .objectFit(ImageFit.ScaleDown) + .objectFit(ImageFit.Fill) .width(24) .height(24) .fillColor(FolderUtil.getFolderIconColor(this.AllFolderArray, this.folderItem.uuid, false)) diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index 6b84233..2518d25 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -531,7 +531,7 @@ struct NoteDataMoveItemCompMenu { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.Center }) { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap }) { Image(FolderUtil.getFolderIcon(this.folderItem.uuid)) - .objectFit(ImageFit.ScaleDown) + .objectFit(ImageFit.Fill) .width(24) .height(24) .fillColor(FolderUtil.getFolderIconColor(this.AllFolderArray, this.folderItem.uuid, this.folderItem.uuid == this.uuid)) -- Gitee From e0a0333a9b70f00aa3aa4dfd4e271bfc312ead9f Mon Sep 17 00:00:00 2001 From: yanjuntao Date: Sat, 7 May 2022 17:22:35 +0800 Subject: [PATCH 3/3] delete page spacing Signed-off-by: yanjuntao --- .../src/main/ets/components/NoteContentCompPortrait.ets | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index 2518d25..4ea8360 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -381,6 +381,9 @@ export struct DeleteNoteComp { .fontColor($r('app.color.delete_font_color')) .padding({ top: 5 }) } + .height("100%") + .width(180) + .justifyContent(FlexAlign.Center) .alignItems(HorizontalAlign.Center) Column() { @@ -403,6 +406,9 @@ export struct DeleteNoteComp { .fontColor($r('app.color.recover_font_color')) .padding({ top: 5 }) } + .height("100%") + .width(180) + .justifyContent(FlexAlign.Center) .alignItems(HorizontalAlign.Center) } .width(360) -- Gitee