@foreach (var item in UploadFiles)
diff --git a/src/BootstrapBlazor/Components/Upload/AvatarUpload.razor.cs b/src/BootstrapBlazor/Components/Upload/AvatarUpload.razor.cs
index b87d972a807a9714dababb224dfe81e669cd7839..2f1280d0583c10dda345416466d280770d8a1460 100644
--- a/src/BootstrapBlazor/Components/Upload/AvatarUpload.razor.cs
+++ b/src/BootstrapBlazor/Components/Upload/AvatarUpload.razor.cs
@@ -11,7 +11,7 @@ namespace BootstrapBlazor.Components
///
///
///
- public sealed partial class AvatarUpload
+ public sealed partial class AvatarUpload
{
///
///
@@ -60,7 +60,7 @@ namespace BootstrapBlazor.Components
///
protected override async Task OnFileChange(InputFileChangeEventArgs args)
{
- CurrentValue = args.File;
+ //CurrentValue = args.File;
var file = new UploadFile()
{
diff --git a/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor b/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor
index ecae4665d9bff1bae51d014d3e5d491c8bb7bfe3..81315c8423f3c55a1a0fef45de7f314c27be5e2c 100644
--- a/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor
+++ b/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor
@@ -1,6 +1,11 @@
@namespace BootstrapBlazor.Components
-@inherits ButtonUploadBase
+@typeparam TValue
+@inherits ButtonUploadBase
+@if (IsShowLabel)
+{
+
+}
diff --git a/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor.cs b/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor.cs
index 1c4c2d7afa69effc4d419fa6663931a2e0e2acb5..c15429bee36a8bd3ad3f310b6d3353fbb3ff7996 100644
--- a/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor.cs
+++ b/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor.cs
@@ -12,7 +12,7 @@ namespace BootstrapBlazor.Components
///
///
///
- public sealed partial class ButtonUpload
+ public sealed partial class ButtonUpload
{
private bool IsUploadButtonDisabled => IsSingle && UploadFiles.Any();
@@ -41,7 +41,7 @@ namespace BootstrapBlazor.Components
[Inject]
[NotNull]
- private IStringLocalizer? Localizer { get; set; }
+ private IStringLocalizer>? Localizer { get; set; }
///
/// OnInitialized 方法
diff --git a/src/BootstrapBlazor/Components/Upload/ButtonUploadBase.cs b/src/BootstrapBlazor/Components/Upload/ButtonUploadBase.cs
index 505b11fe486f631257edd0be06dca8781ded8068..e7396f075de6f84b43597756f70145eb795804e7 100644
--- a/src/BootstrapBlazor/Components/Upload/ButtonUploadBase.cs
+++ b/src/BootstrapBlazor/Components/Upload/ButtonUploadBase.cs
@@ -15,7 +15,7 @@ namespace BootstrapBlazor.Components
///
///
///
- public abstract class ButtonUploadBase : MultipleUploadBase
+ public abstract class ButtonUploadBase : MultipleUploadBase
{
///
/// 获得/设置 是否仅上传一次 默认 false
@@ -49,7 +49,10 @@ namespace BootstrapBlazor.Components
base.OnInitialized();
// 上传文件夹时 开启 Multiple 属性
- if (IsDirectory) IsMultiple = true;
+ if (IsDirectory)
+ {
+ IsMultiple = true;
+ }
}
///
@@ -116,7 +119,7 @@ namespace BootstrapBlazor.Components
{
var builder = CssBuilder.Default("fa");
var fileExtension = Path.GetExtension(item.OriginFileName ?? item.FileName)?.ToLowerInvariant() ?? "";
- string icon = OnGetFileFormat?.Invoke(fileExtension) ?? fileExtension switch
+ var icon = OnGetFileFormat?.Invoke(fileExtension) ?? fileExtension switch
{
".csv" or ".xls" or ".xlsx" => "fa-file-excel-o",
".doc" or ".docx" or ".dot" or ".dotx" => "fa-file-word-o",
@@ -145,8 +148,16 @@ namespace BootstrapBlazor.Components
{ "hidden", "hidden" }
};
- if (!string.IsNullOrEmpty(Accept)) ret.Add("accept", Accept);
- if (IsMultiple) ret.Add("multiple", "multiple");
+ if (!string.IsNullOrEmpty(Accept))
+ {
+ ret.Add("accept", Accept);
+ }
+
+ if (IsMultiple)
+ {
+ ret.Add("multiple", "multiple");
+ }
+
if (IsDirectory)
{
ret.Add("directory", "dicrectory");
diff --git a/src/BootstrapBlazor/Components/Upload/CardUpload.razor b/src/BootstrapBlazor/Components/Upload/CardUpload.razor
index 821b1891a17c7e880e3780a5d53d7fb259b82c97..df12a2580046d3136b99e88835a8fa6f4c95439a 100644
--- a/src/BootstrapBlazor/Components/Upload/CardUpload.razor
+++ b/src/BootstrapBlazor/Components/Upload/CardUpload.razor
@@ -1,6 +1,11 @@
@namespace BootstrapBlazor.Components
-@inherits ButtonUploadBase
+@typeparam TValue
+@inherits ButtonUploadBase
+@if (IsShowLabel)
+{
+
+}
@foreach (var item in UploadFiles)
diff --git a/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs b/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs
index 3a7c15c87b622229ade9060fd59db9d4dac35a92..c9b36e70b76ecc43c28fc54ab041363f227b3596 100644
--- a/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs
+++ b/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs
@@ -10,7 +10,7 @@ namespace BootstrapBlazor.Components
///
///
///
- public sealed partial class CardUpload
+ public sealed partial class CardUpload
{
private static string? GetDiabledString(UploadFile item) => (item.Uploaded && item.Code == 0) ? null : "disabled";
diff --git a/src/BootstrapBlazor/Components/Upload/InputUpload.razor b/src/BootstrapBlazor/Components/Upload/InputUpload.razor
index e0665a2bd7a71f7e91a9884428558ff5f4286422..83eb1df6abe1a350dbae1c527d0b25033808981a 100644
--- a/src/BootstrapBlazor/Components/Upload/InputUpload.razor
+++ b/src/BootstrapBlazor/Components/Upload/InputUpload.razor
@@ -1,5 +1,6 @@
@namespace BootstrapBlazor.Components
-@inherits UploadBase
+@typeparam TValue
+@inherits UploadBase
@if (IsShowLabel)
{
diff --git a/src/BootstrapBlazor/Components/Upload/InputUpload.razor.cs b/src/BootstrapBlazor/Components/Upload/InputUpload.razor.cs
index 0b84e62fabc178b85b4103250f2ad6fc803b9691..13d208d6ef6942685a5f9723b0fbe50f74e94ee2 100644
--- a/src/BootstrapBlazor/Components/Upload/InputUpload.razor.cs
+++ b/src/BootstrapBlazor/Components/Upload/InputUpload.razor.cs
@@ -13,7 +13,7 @@ namespace BootstrapBlazor.Components
///
///
///
- public sealed partial class InputUpload
+ public sealed partial class InputUpload
{
private string? InputValueClassString => CssBuilder.Default("form-control")
.AddClass(CssClass).AddClass(ValidCss)
@@ -83,7 +83,7 @@ namespace BootstrapBlazor.Components
[Inject]
[NotNull]
- private IStringLocalizer? Localizer { get; set; }
+ private IStringLocalizer>? Localizer { get; set; }
///
/// OnInitialized 方法
@@ -103,7 +103,7 @@ namespace BootstrapBlazor.Components
///
protected override async Task OnFileChange(InputFileChangeEventArgs args)
{
- CurrentValue = args.File;
+ //CurrentValue = args.File;
CurrentFile = new UploadFile()
{
@@ -128,7 +128,7 @@ namespace BootstrapBlazor.Components
if (ret)
{
CurrentFile = null;
- CurrentValue = null!;
+ CurrentValue = default;
}
}
}
diff --git a/src/BootstrapBlazor/Components/Upload/MultipleUploadBase.cs b/src/BootstrapBlazor/Components/Upload/MultipleUploadBase.cs
index 1083e6c363de4120498c5c3bcc45990126562ec3..582073c5345eef758a0669e3fea0d80261e1cb8d 100644
--- a/src/BootstrapBlazor/Components/Upload/MultipleUploadBase.cs
+++ b/src/BootstrapBlazor/Components/Upload/MultipleUploadBase.cs
@@ -12,7 +12,7 @@ namespace BootstrapBlazor.Components
///
///
///
- public abstract class MultipleUploadBase : UploadBase
+ public abstract class MultipleUploadBase : UploadBase
{
///
///
@@ -51,7 +51,7 @@ namespace BootstrapBlazor.Components
public bool ShowProgress { get; set; }
///
- ///
+ /// OnInitialized 方法
///
protected override void OnInitialized()
{
@@ -66,7 +66,7 @@ namespace BootstrapBlazor.Components
}
///
- ///
+ /// OnFileDelete 回调委托
///
///
///
@@ -83,7 +83,7 @@ namespace BootstrapBlazor.Components
}
///
- ///
+ /// 是否显示进度条方法
///
///
///
diff --git a/src/BootstrapBlazor/Components/Upload/Upload.razor b/src/BootstrapBlazor/Components/Upload/Upload.razor
index 71189308c38e9cfd265d04579afc4caa9ea8fe75..43a4ce85ebed50cb147f2f126856f3285bb77c83 100644
--- a/src/BootstrapBlazor/Components/Upload/Upload.razor
+++ b/src/BootstrapBlazor/Components/Upload/Upload.razor
@@ -1,19 +1,20 @@
@namespace BootstrapBlazor.Components
-@inherits ButtonUploadBase
+@typeparam TValue
+@inherits ButtonUploadBase
@if (Style == UploadStyle.Avatar)
{
-
+
}
else if (Style == UploadStyle.ClickToUpload)
{
-
+
}
else if (Style == UploadStyle.Card)
{
-
+
}
else
{
-
+
}
diff --git a/src/BootstrapBlazor/Components/Upload/Upload.razor.cs b/src/BootstrapBlazor/Components/Upload/Upload.razor.cs
index 2c4c7419c6143c47eebe4eabff925ea929666751..f9c8ffd170e8babf5dfd185239dbc175c0399b18 100644
--- a/src/BootstrapBlazor/Components/Upload/Upload.razor.cs
+++ b/src/BootstrapBlazor/Components/Upload/Upload.razor.cs
@@ -9,7 +9,7 @@ namespace BootstrapBlazor.Components
///
///
///
- public sealed partial class Upload
+ public sealed partial class Upload
{
///
/// 获得/设置 上传组件模式 默认为 Normal 正常模式多用于表单中
diff --git a/src/BootstrapBlazor/Components/Upload/UploadBase.cs b/src/BootstrapBlazor/Components/Upload/UploadBase.cs
index 8ef149c115a5b84dc9dfb3332edd3eafa84cd02b..f29cedb07429f405835edd0a6a7f89bbe57f2df5 100644
--- a/src/BootstrapBlazor/Components/Upload/UploadBase.cs
+++ b/src/BootstrapBlazor/Components/Upload/UploadBase.cs
@@ -13,7 +13,7 @@ namespace BootstrapBlazor.Components
///
/// Upload 组件基类
///
- public abstract class UploadBase : ValidateBase
+ public abstract class UploadBase : ValidateBase
{
///
/// 获得 组件样式