diff --git a/TIAM.Database/DbContexts/TiamDbContextBase.cs b/TIAM.Database/DbContexts/TiamDbContextBase.cs index 9057ee70..60f5d34e 100644 --- a/TIAM.Database/DbContexts/TiamDbContextBase.cs +++ b/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"; - optionsBuilder.UseSqlServer(connString); + //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); } } } diff --git a/TIAMSharedUI/Shared/AcComponents/AcDxGridBase.cs b/TIAMSharedUI/Shared/AcComponents/AcDxGridBase.cs new file mode 100644 index 00000000..d2b839ef --- /dev/null +++ b/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 : DxGrid + { + } +} diff --git a/TIAMSharedUI/Shared/User/TIAMGrid.cs b/TIAMSharedUI/Shared/Components/TIAMGrid.cs similarity index 89% rename from TIAMSharedUI/Shared/User/TIAMGrid.cs rename to TIAMSharedUI/Shared/Components/TIAMGrid.cs index cbffae56..0272b4d0 100644 --- a/TIAMSharedUI/Shared/User/TIAMGrid.cs +++ b/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 TiamGrid : ComponentBase + public class TiamDxGridBase : AcDxGridBase { [Parameter] public IEnumerable Data { get; set; } @@ -35,5 +35,4 @@ namespace TIAMSharedUI.Shared.User builder.CloseComponent(); } } - } diff --git a/TIAMSharedUI/Shared/User/TIAMGridExample.razor b/TIAMSharedUI/Shared/Components/TIAMGridExample.razor similarity index 100% rename from TIAMSharedUI/Shared/User/TIAMGridExample.razor rename to TIAMSharedUI/Shared/Components/TIAMGridExample.razor