Merge branch 'master' of http://git2.aycode.com/Adam/TourIAm

TIAM.Database/DbContexts/TiamDbContextBase.cs

@@ -28,8 +28,8 @@ namespace TIAM.Database.DbContexts
         {
             base.OnConfiguring(optionsBuilder);
 
-            var connString = "Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true";
+            //var connString = "Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true";
-            optionsBuilder.UseSqlServer(connString);
+            //optionsBuilder.UseSqlServer(connString);
         }
     }
 }

TIAMSharedUI/Shared/AcComponents/AcDxGridBase.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DevExpress.Blazor;
+
+namespace TIAMSharedUI.Shared.AcComponents
+{
+    public class AcDxGridBase<T> : DxGrid
+    {
+    }
+}

TIAMSharedUI/Shared/Components/TIAMGrid.cs

@@ -6,11 +6,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using TIAMSharedUI.Shared.AcComponents;
 
-namespace TIAMSharedUI.Shared.User
+namespace TIAMSharedUI.Shared.Components
 {
-
+    public class TiamDxGridBase<T> : AcDxGridBase<T>
-    public class TiamGrid<T> : ComponentBase
     {
         [Parameter]
         public IEnumerable<T> Data { get; set; }
@@ -35,5 +35,4 @@ namespace TIAMSharedUI.Shared.User
             builder.CloseComponent();
         }
     }
-
 }