Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 fix(TextField): support nullable numeric types #2294

Merged
merged 2 commits into from
Dec 23, 2024
Merged

🐛 fix(TextField): support nullable numeric types #2294

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a15956
🐛 fix(TextField): support nullable numeric types
capdiem Dec 23, 2024
447a741
add tests
capdiem Dec 23, 2024
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
11 changes: 10 additions & 1 deletion src/Masa.Blazor/Components/TextField/MTextField.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,13 +575,22 @@ private bool IsNumeric(TValue? value, out IConvertible numeric)
{
var newValue = Math.Round(decimalValue, Props.Precision.Value);
_ = SetValueByJsInterop(newValue.ToString(Props.PrecisionFormat, CultureInfo.InvariantCulture));
return (TValue)Convert.ChangeType(newValue, typeof(TValue), CultureInfo.InvariantCulture);
var isNullable = IsNullable<TValue>();
return (TValue)Convert.ChangeType(
newValue,
isNullable ? Nullable.GetUnderlyingType(typeof(TValue))! : typeof(TValue),
CultureInfo.InvariantCulture);
}
}

return base.ConvertAndSetValueByJSInterop(val);
}

private static bool IsNullable<T>()
{
return Nullable.GetUnderlyingType(typeof(T)) != null || !typeof(T).IsValueType;
}

private static bool TryConvertTo<T>(string? value, out T? result)
{
var succeeded = BindConverter.TryConvertTo<T>(value, CultureInfo.InvariantCulture, out var val);
Expand Down
Loading