diff --git a/common/resources/src/main/resources/rawfile/editor_style.css b/common/resources/src/main/resources/rawfile/editor_style.css index 61864b47805e007d2b20a8073d049294def805fc..a1cc7408229c461c7c1d1911c16adf06e6277c28 100644 --- a/common/resources/src/main/resources/rawfile/editor_style.css +++ b/common/resources/src/main/resources/rawfile/editor_style.css @@ -76,8 +76,6 @@ body { -webkit-user-select: none; border-radius: 50%; font-size: 0.8rem; - margin-left: 0px; - margin-top: 0px; margin-right: 10px; margin-bottom: 6px; outline: none; diff --git a/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets b/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets index a92343ca24bd7376ab6e280ecebfe7d04f28a208..1b27cd28f7f9821f32a9425896da3df9b890116d 100644 --- a/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets @@ -124,6 +124,7 @@ export class FolderUtil { LogUtil.info(TAG, "folderData.uuid " + folderData.uuid + " folderData.folder_type " + folderData.folder_type) return folderData.folder_type == FolderType.CusDef ? folderData.name : folderTextMap[folderData.uuid] } else { + folderData.uuid = ''; LogUtil.info(TAG, "folderData undefined") } } diff --git a/features/src/main/ets/components/FolderListComp.ets b/features/src/main/ets/components/FolderListComp.ets index 2a629572c9016e669a0c4a3b8b543e36792a0f5a..71ac9cd2c2259519c85b6bd59a7c3ddfddcd5c82 100644 --- a/features/src/main/ets/components/FolderListComp.ets +++ b/features/src/main/ets/components/FolderListComp.ets @@ -374,7 +374,7 @@ struct FolderItemComp { build() { Flex() { - if (this.folderItem.folder_type == FolderType.CusDef) { + if (this.folderItem?.folder_type == FolderType.CusDef) { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.SpaceBetween }) { Row() { Image(FolderUtil.getFolderIcon(this.folderItem.uuid))