Browse Source

Enable nullable annotations for Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo

pull/17094/head
liangshiwei 3 years ago
parent
commit
4ea4fa90ba
  1. 4
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/DropDownDemoDemoModel.cs
  2. 20
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoModel.cs
  3. 14
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoModel.cs
  4. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PaginatorDemo/PaginatorDemoViewComponent.cs
  5. 6
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs
  6. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj

4
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/DropDownDemoDemoModel.cs

@ -6,11 +6,11 @@ public class DropDownDemoDemoModel
{ {
[Required] [Required]
[EmailAddress] [EmailAddress]
public string EmailAddress { get; set; } public string EmailAddress { get; set; } = default!;
[Required] [Required]
[DataType(DataType.Password)] [DataType(DataType.Password)]
public string Password { get; set; } public string Password { get; set; } = default!;
public bool RememberMe { get; set; } public bool RememberMe { get; set; }
} }

20
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoModel.cs

@ -40,7 +40,7 @@ public class DynamicFormsDemoModel
[Required] [Required]
[DataType(DataType.Password)] [DataType(DataType.Password)]
[Display(Name = "Password")] [Display(Name = "Password")]
public string Password { get; set; } public string Password { get; set; } = default!;
[Display(Name = "Is Active")] [Display(Name = "Is Active")]
public bool IsActive { get; set; } public bool IsActive { get; set; }
@ -87,34 +87,34 @@ public class DynamicFormsDemoModel
public class OrderExampleModel public class OrderExampleModel
{ {
[DisplayOrder(10005)] [DisplayOrder(10005)]
public string Surname { get; set; } public string? Surname { get; set; }
//Default 10000 //Default 10000
public string EmailAddress { get; set; } public string? EmailAddress { get; set; }
[DisplayOrder(10003)] [DisplayOrder(10003)]
public string Name { get; set; } public string? Name { get; set; }
[DisplayOrder(9999)] [DisplayOrder(9999)]
public string City { get; set; } public string? City { get; set; }
} }
public class AttributeExamplesModel public class AttributeExamplesModel
{ {
[HiddenInput] [HiddenInput]
public string HiddenInput { get; set; } public string? HiddenInput { get; set; }
[DisabledInput] [DisabledInput]
public string DisabledInput { get; set; } public string? DisabledInput { get; set; }
[ReadOnlyInput] [ReadOnlyInput]
public string ReadonlyInput { get; set; } public string? ReadonlyInput { get; set; }
[FormControlSize(AbpFormControlSize.Large)] [FormControlSize(AbpFormControlSize.Large)]
public string LargeInput { get; set; } public string? LargeInput { get; set; }
[FormControlSize(AbpFormControlSize.Small)] [FormControlSize(AbpFormControlSize.Small)]
public string SmallInput { get; set; } public string? SmallInput { get; set; }
} }
public DetailedModel MyDetailedModel { get; set; } public DetailedModel MyDetailedModel { get; set; }

14
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoModel.cs

@ -26,11 +26,11 @@ public class FormElementsDemoModel
public class InformMeModel public class InformMeModel
{ {
[Required] [Required]
public string Name { get; set; } public string Name { get; set; } = default!;
[Required] [Required]
[DataType(DataType.Password)] [DataType(DataType.Password)]
public string Password { get; set; } public string Password { get; set; } = default!;
public bool CheckMeOut { get; set; } public bool CheckMeOut { get; set; }
} }
@ -38,14 +38,14 @@ public class FormElementsDemoModel
public class DetailsModel public class DetailsModel
{ {
[Required] [Required]
public string EmailAddress { get; set; } public string EmailAddress { get; set; } = default!;
public string City { get; set; } public string? City { get; set; }
public List<string> Cities { get; set; } public List<string>? Cities { get; set; }
[TextArea] [TextArea]
public string Description { get; set; } public string? Description { get; set; }
} }
public class CheckboxModel public class CheckboxModel
@ -58,7 +58,7 @@ public class FormElementsDemoModel
public class CityRadioModel public class CityRadioModel
{ {
[Display(Name = "City")] [Display(Name = "City")]
public string CityRadio { get; set; } public string? CityRadio { get; set; }
} }
public class EnumModel public class EnumModel

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PaginatorDemo/PaginatorDemoViewComponent.cs

@ -13,7 +13,7 @@ public class PaginatorDemoViewComponent : AbpViewComponent
{ {
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/PaginatorDemo/Default.cshtml"; public const string ViewPath = "/Views/Components/Themes/Shared/Demos/PaginatorDemo/Default.cshtml";
public PagerModel PagerModel { get; set; } public PagerModel PagerModel { get; set; } = default!;
public IViewComponentResult Invoke(PagerModel pagerModel) public IViewComponentResult Invoke(PagerModel pagerModel)
{ {

6
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs

@ -14,8 +14,8 @@ public class AbpComponentDemoSectionTagHelper : AbpTagHelper
private const string DemoSectionOpeningTag = "<abp-component-demo-section"; private const string DemoSectionOpeningTag = "<abp-component-demo-section";
private const string DemoSectionClosingTag = "</abp-component-demo-section"; private const string DemoSectionClosingTag = "</abp-component-demo-section";
public string ViewPath { get; set; } public string ViewPath { get; set; } = default!;
public string Title { get; set; } public string? Title { get; set; }
private readonly IVirtualFileProvider _virtualFileProvider; private readonly IVirtualFileProvider _virtualFileProvider;
private readonly IGuidGenerator _guidGenerator; private readonly IGuidGenerator _guidGenerator;
@ -101,7 +101,7 @@ public class AbpComponentDemoSectionTagHelper : AbpTagHelper
private string GetRawDemoSource() private string GetRawDemoSource()
{ {
StringBuilder sourceBuilder = null; StringBuilder? sourceBuilder = null;
var lines = GetFileContent().SplitToLines(); var lines = GetFileContent().SplitToLines();

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj

@ -5,6 +5,8 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo</PackageId>

Loading…
Cancel
Save