Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>10.4.0-beta01</Version>
<Version>10.4.0-beta02</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 1 addition & 5 deletions src/BootstrapBlazor/Components/Upload/AvatarUpload.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,6 @@ public partial class AvatarUpload<TValue>
.AddClass("disabled", IsDisabled)
.Build();

/// <summary>
/// <para lang="zh">获得 预览框样式字符串</para>
/// <para lang="en">Gets the preview item style string</para>
/// </summary>
private string? ItemStyleString => CssBuilder.Default()
.AddClass($"width: {Width}px;", Width > 0)
.AddClass($"height: {Height}px;", Height > 0 && !IsCircle)
Expand Down Expand Up @@ -164,7 +160,7 @@ protected override async Task TriggerOnChanged(UploadFile file)

/// <summary>
/// <para lang="zh">预览当前头像方法</para>
/// <para lang="en">预览当前头像方法</para>
/// <para lang="en">Previews the current avatar</para>
/// </summary>
public async Task Preview()
{
Expand Down
41 changes: 17 additions & 24 deletions src/BootstrapBlazor/Components/Upload/UploadBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ public abstract class UploadBase<TValue> : ValidateBase<TValue>, IUpload
public bool IsDirectory { get; set; }

/// <summary>
/// <para lang="zh">获得/设置 是否允许多文件上传,默认 false</para>
/// <para lang="en">Gets or sets whether to allow multiple file uploads. Default is false</para>
/// <para lang="zh">获得/设置 是否允许多文件上传,默认 true</para>
/// <para lang="en">Gets or sets whether to allow multiple file uploads. Default is true</para>
/// </summary>
[Parameter]
public bool IsMultiple { get; set; }
public bool IsMultiple { get; set; } = true;

/// <summary>
/// <para lang="zh">获得/设置 点击删除按钮时回调此方法,默认 null</para>
Expand All @@ -103,13 +103,13 @@ public abstract class UploadBase<TValue> : ValidateBase<TValue>, IUpload
public Func<UploadFile, Task>? OnChange { get; set; }

/// <summary>
/// <para lang="zh">获得/设置 已上传文件集合,此集合中数据是用户上传文件集合</para>
/// <para lang="en">Gets or sets the uploaded file collection. This collection contains the files uploaded by the user</para>
/// <para lang="zh">获得 已上传文件集合,此集合中数据是用户上传文件集合</para>
/// <para lang="en">Gets the uploaded file collection. This collection contains the files uploaded by the user</para>
/// </summary>
public List<UploadFile> UploadFiles { get; } = [];

/// <summary>
/// <para lang="zh">获得 the 集合 of files to be uploaded</para>
/// <para lang="zh">获得待上传文件集合</para>
/// <para lang="en">Gets the collection of files to be uploaded</para>
/// </summary>
protected List<UploadFile> Files => GetUploadFiles();
Expand Down Expand Up @@ -296,11 +296,10 @@ protected void Update(UploadFile file)
}

private List<UploadFile>? _filesCache;

/// <summary>
/// <para lang="zh">获得当前文件集合 <para>Get the files collection</para>
///</para>
/// <para lang="en">Gets当前文件collection <para>Get the files collection</para>
///</para>
/// <para lang="zh">获得当前文件集合</para>
/// <para lang="en">Gets the current files collection</para>
/// </summary>
protected List<UploadFile> GetUploadFiles()
{
Expand All @@ -323,32 +322,28 @@ protected List<UploadFile> GetUploadFiles()
}

/// <summary>
/// <para lang="zh">检查是否可以继续上传文件 <para>Check whether can upload file</para>
///</para>
/// <para lang="en">检查whether可以继续上传文件 <para>Check whether can upload file</para>
///</para>
/// <para lang="zh">检查是否可以继续上传文件</para>
/// <para lang="en">Checks whether more files can be uploaded</para>
/// </summary>
protected bool CanUpload()
{
// 允许多上传
if (IsMultiple)
{
return !MaxFileCount.HasValue || Files.Count < MaxFileCount;
}

// 只允许单个上传
return Files.Count == 0;
}

/// <summary>
/// <para lang="zh">检查上传按钮是否可用方法 不可用时返回 true</para>
/// <para lang="en">检查上传buttonwhether可用方法 不可用时返回 true</para>
/// <para lang="en">Checks whether the upload button is disabled. Returns true when disabled</para>
/// </summary>
protected bool CheckStatus() => IsDisabled || !CanUpload();

/// <summary>
/// <para lang="zh">判断是否显示新建按钮</para>
/// <para lang="en">判断whetherdisplay新建button</para>
/// <para lang="en">Determines whether to show the add button</para>
/// </summary>
protected bool ShowAddButton()
{
Expand All @@ -361,10 +356,8 @@ protected bool ShowAddButton()
}

/// <summary>
/// <para lang="zh">清空上传列表方法 <para>Clear the upload files collection</para>
///</para>
/// <para lang="en">清空上传列表方法 <para>Clear the upload files collection</para>
///</para>
/// <para lang="zh">清空上传列表方法</para>
/// <para lang="en">Clears the upload files collection</para>
/// </summary>
public virtual void Reset()
{
Expand All @@ -376,8 +369,8 @@ public virtual void Reset()
}

/// <summary>
/// <para lang="zh">append html attribute method</para>
/// <para lang="en">append html attribute method</para>
/// <para lang="zh">获得上传组件附加 HTML 属性集合</para>
/// <para lang="en">Gets the additional HTML attributes for the upload component</para>
/// </summary>
protected IDictionary<string, object> GetUploadAdditionalAttributes()
{
Expand Down