diff --git a/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets b/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets index 966f41411364fd383660a156abbcb0b01167266b..22b8596ef6e9037398c2e8802094fad207d183f8 100644 --- a/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets @@ -121,10 +121,10 @@ export class FolderUtil { } if (folderData!.uuid === undefined || folderData!.uuid === null) { LogUtil.info(TAG, "isFolderMoveIn folderData uuid undefined") - folderData.uuid = 'sys_def_unClassified_uuid'; + folderData!.uuid = 'sys_def_unClassified_uuid'; } - LogUtil.info(TAG, "isFolderMoveIn folderDataUuid " + folderData.uuid) - return (folderData.uuid == SysDefFolderUuid.UnClassified || folderData.folder_type == FolderType.CusDef) + LogUtil.info(TAG, "isFolderMoveIn folderDataUuid " + folderData!.uuid); + return (folderData!.uuid == SysDefFolderUuid.UnClassified || folderData!.folder_type == FolderType.CusDef); } /** diff --git a/features/src/main/ets/components/CusDialogComp.ets b/features/src/main/ets/components/CusDialogComp.ets index 2d8372c431620f135660687387f8205c3dc9cca6..0fc5e371e7ba8981fb9a065fbd79b7f179e428ac 100644 --- a/features/src/main/ets/components/CusDialogComp.ets +++ b/features/src/main/ets/components/CusDialogComp.ets @@ -280,18 +280,18 @@ struct NoteDataMoveItemComp { build() { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap }) { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap }) { - Image(FolderUtil.getFolderIcon(this.folderItem.uuid)) + Image(FolderUtil.getFolderIcon(this.folderItem!.uuid)) .objectFit(ImageFit.Fill) .width(24) .height(24) .flexShrink(0) - .fillColor(FolderUtil.getFolderIconColor(this.AllFolderArray, this.folderItem.uuid, false)) + .fillColor(FolderUtil.getFolderIconColor(this.AllFolderArray, this.folderItem!.uuid, false)) } .width(24) Column() { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.SpaceBetween }) { - Text(FolderUtil.getFolderText(this.folderItem)) + Text(FolderUtil.getFolderText(this.folderItem!)) .fontSize(16) .textAlign(TextAlign.Center) .maxLines(1) @@ -299,7 +299,7 @@ struct NoteDataMoveItemComp { .flexShrink(1) .fontWeight(FontWeight.Medium) Image((FolderUtil.getCommonFolder(this.AllFolderArray, this.CheckedNoteArray) == null - || FolderUtil.getCommonFolder(this.AllFolderArray, this.CheckedNoteArray) != this.folderItem) ? $r("app.media.foldMove_unselect") : $r("app.media.foldMove_select")) + || FolderUtil.getCommonFolder(this.AllFolderArray, this.CheckedNoteArray) != this.folderItem!) ? $r("app.media.foldMove_unselect") : $r("app.media.foldMove_select")) .objectFit(ImageFit.Fill) .width(24) .height(24)