refactor: 精简代码

Author: ArgoZhang

src/BootstrapBlazor.Server/Components/Samples/DockViews/BaseDockView.cs

@@ -147,10 +147,10 @@ public class TreeFoo : Foo
             ParentId = parentId,
             Name = localizer["Foo.Name", $"{id + i:d4}"],
             DateTime = System.DateTime.Now.AddDays(i - 1),
-            Address = localizer["Foo.Address", $"{Random.Next(1000, 2000)}"],
-            Count = Random.Next(1, 100),
-            Complete = Random.Next(1, 100) > 50,
-            Education = Random.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle
+            Address = localizer["Foo.Address", $"{Random.Shared.Next(1000, 2000)}"],
+            Count = Random.Shared.Next(1, 100),
+            Complete = Random.Shared.Next(1, 100) > 50,
+            Education = Random.Shared.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle
         }).ToList();
     }
 }

src/BootstrapBlazor.Server/Components/Samples/DockViews2/BaseDockView.cs

@@ -141,10 +141,10 @@ public class TreeFoo : Foo
             ParentId = parentId,
             Name = localizer["Foo.Name", $"{id + i:d4}"],
             DateTime = System.DateTime.Now.AddDays(i - 1),
-            Address = localizer["Foo.Address", $"{Random.Next(1000, 2000)}"],
-            Count = Random.Next(1, 100),
-            Complete = Random.Next(1, 100) > 50,
-            Education = Random.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle
+            Address = localizer["Foo.Address", $"{Random.Shared.Next(1000, 2000)}"],
+            Count = Random.Shared.Next(1, 100),
+            Complete = Random.Shared.Next(1, 100) > 50,
+            Education = Random.Shared.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle
         }).ToList();
     }
 }

src/BootstrapBlazor.Server/Components/Samples/Table/TablesTree.razor.cs

@@ -125,10 +125,10 @@ private class TreeFoo : Foo
             ParentId = parentId,
             Name = localizer["Foo.Name", $"{id + i:d4}"],
             DateTime = System.DateTime.Now.AddDays(i - 1),
-            Address = localizer["Foo.Address", $"{Random.Next(1000, 2000)}"],
-            Count = Random.Next(1, 100),
-            Complete = Random.Next(1, 100) > 50,
-            Education = Random.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle
+            Address = localizer["Foo.Address", $"{Random.Shared.Next(1000, 2000)}"],
+            Count = Random.Shared.Next(1, 100),
+            Complete = Random.Shared.Next(1, 100) > 50,
+            Education = Random.Shared.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle
         }).ToList();
     }
 }

src/BootstrapBlazor.Server/Data/Foo.cs

@@ -87,11 +87,6 @@ public class Foo
     public int ReadonlyColumn { get; init; }
 
     #region Static methods
-    /// <summary>
-    /// 随机数 Random 实例
-    /// </summary>
-    protected static readonly Random Random = new();
-
     /// <summary>
     /// 生成Foo类,随机数据
     /// Generate Foo class, random data
@@ -103,10 +98,10 @@ public class Foo
         Id = 1,
         Name = localizer["Foo.Name", "1000"],
         DateTime = System.DateTime.Now,
-        Address = localizer["Foo.Address", $"{Random.Next(1000, 2000)}"],
-        Count = Random.Next(1, 100),
-        Complete = Random.Next(1, 100) > 50,
-        Education = Random.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle
+        Address = localizer["Foo.Address", $"{Random.Shared.Next(1000, 2000)}"],
+        Count = Random.Shared.Next(1, 100),
+        Complete = Random.Shared.Next(1, 100) > 50,
+        Education = Random.Shared.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle
     };
 
     /// <summary>
@@ -119,11 +114,11 @@ public class Foo
         Id = i,
         Name = localizer["Foo.Name", $"{i:d4}"],
         DateTime = System.DateTime.Now.AddDays(i - 1),
-        Address = localizer["Foo.Address", $"{Random.Next(1000, 2000)}"],
-        Count = Random.Next(1, 100),
-        Complete = Random.Next(1, 100) > 50,
-        Education = Random.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle,
-        ReadonlyColumn = Random.Next(10, 50)
+        Address = localizer["Foo.Address", $"{Random.Shared.Next(1000, 2000)}"],
+        Count = Random.Shared.Next(1, 100),
+        Complete = Random.Shared.Next(1, 100) > 50,
+        Education = Random.Shared.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle,
+        ReadonlyColumn = Random.Shared.Next(10, 50)
     }).ToList();
 
     /// <summary>
@@ -162,7 +157,7 @@ public static List<SelectedItem> GetCompleteItems(IStringLocalizer<Foo> localize
     /// 通过 Id 获取 Title
     /// </summary>
     /// <returns></returns>
-    private static string GetTitle() => Random.Next(1, 80) switch
+    private static string GetTitle() => Random.Shared.Next(1, 80) switch
     {
         >= 1 and < 10 => "Clerk",
         >= 10 and < 50 => "Engineer",

test/UnitTest/Components/TableTest.cs

@@ -8669,10 +8669,10 @@ private class FooTree : Foo
             ParentId = parentId,
             Name = localizer["Foo.Name", $"{seed:d2}{(i + seed):d2}"],
             DateTime = System.DateTime.Now.AddDays(i - 1),
-            Address = localizer["Foo.Address", $"{Random.Next(1000, 2000)}"],
-            Count = Random.Next(1, 100),
-            Complete = Random.Next(1, 100) > 50,
-            Education = Random.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle
+            Address = localizer["Foo.Address", $"{Random.Shared.Next(1000, 2000)}"],
+            Count = Random.Shared.Next(1, 100),
+            Complete = Random.Shared.Next(1, 100) > 50,
+            Education = Random.Shared.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle
         }).ToList();
     }
 
@@ -8687,10 +8687,10 @@ private class FooNoKeyTree : FooTree
             Id = i + seed,
             Name = localizer["Foo.Name", $"{seed:d2}{(i + seed):d2}"],
             DateTime = System.DateTime.Now.AddDays(i - 1),
-            Address = localizer["Foo.Address", $"{Random.Next(1000, 2000)}"],
-            Count = Random.Next(1, 100),
-            Complete = Random.Next(1, 100) > 50,
-            Education = Random.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle
+            Address = localizer["Foo.Address", $"{Random.Shared.Next(1000, 2000)}"],
+            Count = Random.Shared.Next(1, 100),
+            Complete = Random.Shared.Next(1, 100) > 50,
+            Education = Random.Shared.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle
         }).ToList();
     }