diff --git a/common.props b/common.props index db0cf08..7169c68 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 5.3.0-preview.2 + 5.3.0-preview.3 $(NoWarn);CS1591 true EasyAbp Team diff --git a/src/EasyAbp.FileManagement.Application.Contracts/EasyAbp/FileManagement/Files/Dtos/FileInfoDto.cs b/src/EasyAbp.FileManagement.Application.Contracts/EasyAbp/FileManagement/Files/Dtos/FileInfoDto.cs index a3cfc04..66d1049 100644 --- a/src/EasyAbp.FileManagement.Application.Contracts/EasyAbp/FileManagement/Files/Dtos/FileInfoDto.cs +++ b/src/EasyAbp.FileManagement.Application.Contracts/EasyAbp/FileManagement/Files/Dtos/FileInfoDto.cs @@ -20,6 +20,8 @@ public class FileInfoDto : ExtensibleFullAuditedEntityDto public int SubFilesQuantity { get; set; } + public bool HasSubdirectories { get; set; } + public long ByteSize { get; set; } public string Hash { get; set; } diff --git a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Files/FileEto.cs b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Files/FileEto.cs index 6cbf900..ef71694 100644 --- a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Files/FileEto.cs +++ b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Files/FileEto.cs @@ -6,11 +6,11 @@ namespace EasyAbp.FileManagement.Files; public class FileEto : IFile, IMultiTenant { public Guid Id { get; set; } - + public Guid? TenantId { get; set; } public Guid? ParentId { get; set; } - + public string FileContainerName { get; set; } public string FileName { get; set; } @@ -18,16 +18,18 @@ public class FileEto : IFile, IMultiTenant public string MimeType { get; set; } public FileType FileType { get; set; } - + public int SubFilesQuantity { get; set; } + public bool HasSubdirectories { get; set; } + public long ByteSize { get; set; } public string Hash { get; set; } public string BlobName { get; set; } - + public Guid? OwnerUserId { get; set; } - + public string Flag { get; set; } } \ No newline at end of file diff --git a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Files/IFile.cs b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Files/IFile.cs index 759bd3b..020ea9e 100644 --- a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Files/IFile.cs +++ b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Files/IFile.cs @@ -22,6 +22,8 @@ public interface IFile int SubFilesQuantity { get; } + bool HasSubdirectories { get; } + long ByteSize { get; } [CanBeNull] diff --git a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/en.json b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/en.json index 098e4a7..22745ff 100644 --- a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/en.json +++ b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/en.json @@ -12,7 +12,8 @@ "FileFileContainerName": "File container name", "FileMimeType": "Mime type", "FileFileType": "File type", - "FileSubFilesQuantity": "Sub files quantity", + "FileSubFilesQuantity": "Files count", + "FileHasSubdirectories": "Has subdirectories", "FileByteSize": "Size", "FileHash": "Hash", "FileParentId": "Parent ID", diff --git a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/zh-Hans.json b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/zh-Hans.json index 5aaa5a8..6f8c5b7 100644 --- a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/zh-Hans.json +++ b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/zh-Hans.json @@ -17,6 +17,7 @@ "FileMimeType": "Mime 类型", "FileFileType": "文件类型", "FileSubFilesQuantity": "子文件数量", + "FileHasSubdirectories": "包含子文件夹", "FileByteSize": "大小", "FileHash": "哈希值", "FileParentId": "父目录 ID", diff --git a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/zh-Hant.json b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/zh-Hant.json index a5c517c..c9596de 100644 --- a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/zh-Hant.json +++ b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/zh-Hant.json @@ -13,6 +13,7 @@ "FileMimeType": "Mime 類型", "FileFileType": "文件類型", "FileSubFilesQuantity": "子文件數量", + "FileHasSubdirectories": "包含子資料夾", "FileByteSize": "大小", "FileHash": "哈希值", "FileParentId": "父目錄 ID",