From 59c7be9fde14d7b11712871ab800e787fb263348 Mon Sep 17 00:00:00 2001 From: Argo-AsicoTech Date: Wed, 13 Nov 2024 11:30:53 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=20Value=20?= =?UTF-8?q?=E4=B8=BA=E5=8F=AF=E4=B8=BA=E7=A9=BA=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Checkbox/CheckboxList.razor.cs | 2 +- .../DateTimePicker/DateTimePicker.razor.cs | 2 +- .../Components/Display/DisplayBase.cs | 6 +++--- .../Components/Input/BootstrapInputBase.cs | 4 ++-- .../InputNumber/BootstrapInputNumber.razor.cs | 14 +++++++------- .../Components/Radio/RadioList.razor.cs | 2 +- .../Components/Select/MultiSelect.razor.cs | 2 +- .../Components/Transfer/Transfer.razor.cs | 2 +- .../Components/Validate/ValidateBase.cs | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/BootstrapBlazor/Components/Checkbox/CheckboxList.razor.cs b/src/BootstrapBlazor/Components/Checkbox/CheckboxList.razor.cs index 4e405d72bf4..2433edd362e 100644 --- a/src/BootstrapBlazor/Components/Checkbox/CheckboxList.razor.cs +++ b/src/BootstrapBlazor/Components/Checkbox/CheckboxList.razor.cs @@ -188,7 +188,7 @@ private async Task OnBeforeStateChanged(CheckboxState state) /// /// /// - protected override string? FormatValueAsString(TValue value) + protected override string? FormatValueAsString(TValue? value) { string? ret = null; if (ValueType == typeof(string)) diff --git a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs index 05afb3ef97b..caf7cf7d335 100644 --- a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs +++ b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs @@ -355,7 +355,7 @@ protected override async Task OnParametersSetAsync() /// /// 格式化数值方法 /// - protected override string FormatValueAsString(TValue value) + protected override string FormatValueAsString(TValue? value) { var ret = ""; DateTime? d = value switch diff --git a/src/BootstrapBlazor/Components/Display/DisplayBase.cs b/src/BootstrapBlazor/Components/Display/DisplayBase.cs index 5dcc2d05a90..51346c6f2b7 100644 --- a/src/BootstrapBlazor/Components/Display/DisplayBase.cs +++ b/src/BootstrapBlazor/Components/Display/DisplayBase.cs @@ -48,13 +48,13 @@ public abstract class DisplayBase : BootstrapModuleComponentBase /// Gets or sets a callback that updates the bound value. /// [Parameter] - public EventCallback ValueChanged { get; set; } + public EventCallback ValueChanged { get; set; } /// /// Gets or sets an expression that identifies the bound value. /// [Parameter] - public Expression>? ValueExpression { get; set; } + public Expression>? ValueExpression { get; set; } /// /// 获得/设置 是否显示前置标签 默认值为 null 为空时默认不显示标签 @@ -164,7 +164,7 @@ protected override void OnParametersSet() /// /// The value to format. /// A string representation of the value. - protected virtual string? FormatValueAsString(TValue value) + protected virtual string? FormatValueAsString(TValue? value) { string? ret; if (value is SelectedItem item) diff --git a/src/BootstrapBlazor/Components/Input/BootstrapInputBase.cs b/src/BootstrapBlazor/Components/Input/BootstrapInputBase.cs index 123e5a14820..7ee33031957 100644 --- a/src/BootstrapBlazor/Components/Input/BootstrapInputBase.cs +++ b/src/BootstrapBlazor/Components/Input/BootstrapInputBase.cs @@ -52,7 +52,7 @@ public abstract class BootstrapInputBase : ValidateBase /// 获得/设置 格式化字符串 /// [Parameter] - public Func? Formatter { get; set; } + public Func? Formatter { get; set; } /// /// 获得/设置 格式化字符串 如时间类型设置 yyyy-MM-dd @@ -182,7 +182,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender) /// /// /// - protected override string? FormatValueAsString(TValue value) => Formatter != null + protected override string? FormatValueAsString(TValue? value) => Formatter != null ? Formatter.Invoke(value) : (!string.IsNullOrEmpty(FormatString) && value != null ? Utility.Format(value, FormatString) diff --git a/src/BootstrapBlazor/Components/InputNumber/BootstrapInputNumber.razor.cs b/src/BootstrapBlazor/Components/InputNumber/BootstrapInputNumber.razor.cs index 78095ad545d..51c58f1c28b 100644 --- a/src/BootstrapBlazor/Components/InputNumber/BootstrapInputNumber.razor.cs +++ b/src/BootstrapBlazor/Components/InputNumber/BootstrapInputNumber.razor.cs @@ -39,13 +39,13 @@ public partial class BootstrapInputNumber /// 获得/设置 数值增加时回调委托 /// [Parameter] - public Func? OnIncrement { get; set; } + public Func? OnIncrement { get; set; } /// /// 获得/设置 数值减少时回调委托 /// [Parameter] - public Func? OnDecrement { get; set; } + public Func? OnDecrement { get; set; } /// /// 获得/设置 最小值 @@ -161,9 +161,9 @@ protected override void OnAfterRender(bool firstRender) /// /// The value to format. /// A string representation of the value. - protected override string? FormatValueAsString(TValue value) => UseInputEvent ? _lastInputValueString : GetFormatString(value); + protected override string? FormatValueAsString(TValue? value) => UseInputEvent ? _lastInputValueString : GetFormatString(value); - private string? GetFormatString(TValue value) => Formatter != null + private string? GetFormatString(TValue? value) => Formatter != null ? Formatter.Invoke(value) : (!string.IsNullOrEmpty(FormatString) && value != null ? Utility.Format(value, FormatString) @@ -175,7 +175,7 @@ protected override void OnAfterRender(bool firstRender) /// /// /// - protected virtual string? InternalFormat(TValue value) => value switch + protected virtual string? InternalFormat(TValue? value) => value switch { null => null, int @int => BindConverter.FormatValue(@int, CultureInfo.InvariantCulture), @@ -288,7 +288,7 @@ protected override async Task OnBlur() } } - private TValue SetMin(TValue val) + private TValue? SetMin(TValue? val) { if (!string.IsNullOrEmpty(Min)) { @@ -317,7 +317,7 @@ private TValue SetMin(TValue val) return val; } - private TValue SetMax(TValue val) + private TValue? SetMax(TValue? val) { if (!string.IsNullOrEmpty(Max)) { diff --git a/src/BootstrapBlazor/Components/Radio/RadioList.razor.cs b/src/BootstrapBlazor/Components/Radio/RadioList.razor.cs index 77937b52d7a..be73a4ba107 100644 --- a/src/BootstrapBlazor/Components/Radio/RadioList.razor.cs +++ b/src/BootstrapBlazor/Components/Radio/RadioList.razor.cs @@ -81,7 +81,7 @@ protected override void OnParametersSet() /// /// /// - protected override string? FormatValueAsString(TValue value) => value is SelectedItem v ? v.Value : value?.ToString(); + protected override string? FormatValueAsString(TValue? value) => value is SelectedItem v ? v.Value : value?.ToString(); /// /// diff --git a/src/BootstrapBlazor/Components/Select/MultiSelect.razor.cs b/src/BootstrapBlazor/Components/Select/MultiSelect.razor.cs index d230e497935..3198a1ef19c 100644 --- a/src/BootstrapBlazor/Components/Select/MultiSelect.razor.cs +++ b/src/BootstrapBlazor/Components/Select/MultiSelect.razor.cs @@ -211,7 +211,7 @@ protected override void OnAfterRender(bool firstRender) /// /// /// - protected override string? FormatValueAsString(TValue value) => value == null + protected override string? FormatValueAsString(TValue? value) => value == null ? null : Utility.ConvertValueToString(value); diff --git a/src/BootstrapBlazor/Components/Transfer/Transfer.razor.cs b/src/BootstrapBlazor/Components/Transfer/Transfer.razor.cs index a569730d3e1..7aec311479a 100644 --- a/src/BootstrapBlazor/Components/Transfer/Transfer.razor.cs +++ b/src/BootstrapBlazor/Components/Transfer/Transfer.razor.cs @@ -364,7 +364,7 @@ protected override bool TryParseValueFromString(string value, out TValue result, /// /// /// - protected override string? FormatValueAsString(TValue value) => value == null + protected override string? FormatValueAsString(TValue? value) => value == null ? null : Utility.ConvertValueToString(value); diff --git a/src/BootstrapBlazor/Components/Validate/ValidateBase.cs b/src/BootstrapBlazor/Components/Validate/ValidateBase.cs index 556fe36477f..31be97dd489 100644 --- a/src/BootstrapBlazor/Components/Validate/ValidateBase.cs +++ b/src/BootstrapBlazor/Components/Validate/ValidateBase.cs @@ -61,7 +61,7 @@ public abstract class ValidateBase : DisplayBase, IValidateCompo /// /// Gets or sets the current value of the input. /// - protected TValue CurrentValue + protected TValue? CurrentValue { get => Value; set @@ -150,7 +150,7 @@ protected string CurrentValueAsString /// 获得/设置 Value 改变时回调方法 /// [Parameter] - public Func? OnValueChanged { get; set; } + public Func? OnValueChanged { get; set; } /// /// 获得/设置 类型转化失败格式化字符串 默认为 null