diff --git a/Projects/DLL/SystemX.Core.DB.dll b/Projects/DLL/SystemX.Core.DB.dll index 942993d..45ce1d1 100644 Binary files a/Projects/DLL/SystemX.Core.DB.dll and b/Projects/DLL/SystemX.Core.DB.dll differ diff --git a/Projects/DLL/SystemX.Core.dll b/Projects/DLL/SystemX.Core.dll index 045260d..582c331 100644 Binary files a/Projects/DLL/SystemX.Core.dll and b/Projects/DLL/SystemX.Core.dll differ diff --git a/Projects/SystemX.Core/SystemX.Core/Services/DBContextProvider.cs b/Projects/SystemX.Core/SystemX.Core/Services/DBContextProvider.cs index c15cada..2c9cff9 100644 --- a/Projects/SystemX.Core/SystemX.Core/Services/DBContextProvider.cs +++ b/Projects/SystemX.Core/SystemX.Core/Services/DBContextProvider.cs @@ -12,7 +12,7 @@ namespace SystemX.Core.Services { public class DbContextProvider { - public Dictionary DBDictionary { get; private set; } = new Dictionary(); + public Dictionary DBDictionary { get; private set; } = new Dictionary(); public void SetDBList(IList? DBList) { @@ -20,18 +20,18 @@ namespace SystemX.Core.Services { foreach (var db in DBList) { - if (DBDictionary.ContainsKey($"{db.DBName}") == false) - DBDictionary.Add($"{db.DBName}", db); + if (DBDictionary.ContainsKey(db.DBID) == false) + DBDictionary.Add(db.DBID, db); else - LogXnet.WriteLine($"Exist key DB Dictionary {db.DBName}", LogXLabel.Error); + LogXnet.WriteLine($"Exist key DB Dictionary {db.DBID}", LogXLabel.Error); } } } // 또는 context 직접 반환 (주의: caller가 Dispose 해야 함) - public TContext? GetDBContext(string dbName) where TContext : DbContext + public TContext? GetDBContext(int dbID) where TContext : DbContext { - if(DBDictionary.TryGetValue(dbName, out var db) == true) + if(DBDictionary.TryGetValue(dbID, out var db) == true) { var optionsBuilder = new DbContextOptionsBuilder(); optionsBuilder.UseSqlServer(db.ConvertToConnectionString()); diff --git a/Projects/WebClient/Web.Tra/Components/Dialog/Loading.razor b/Projects/WebClient/Web.Tra/Components/Dialog/Loading.razor new file mode 100644 index 0000000..5669ad8 --- /dev/null +++ b/Projects/WebClient/Web.Tra/Components/Dialog/Loading.razor @@ -0,0 +1,22 @@ +@page "/loading/{Message?}" + +
+
+
+
+
+
+
+
+ @Message +
+
+@code { + [Parameter] + public string? Message { get; set; } + + protected override void OnParametersSet() + { + + } +} diff --git a/Projects/WebClient/Web.Tra/Components/Dialog/Loading.razor.css b/Projects/WebClient/Web.Tra/Components/Dialog/Loading.razor.css new file mode 100644 index 0000000..8b45671 --- /dev/null +++ b/Projects/WebClient/Web.Tra/Components/Dialog/Loading.razor.css @@ -0,0 +1,58 @@ +.message { + /* change color here */ + color: #f8b26a; + text-align: center; + font-size: 1.5rem; +} + +.lds-ring { + /* change color here */ + color: #f8b26a; +} + + .lds-ring, + .lds-ring div { + box-sizing: border-box; + } + +.lds-ring { + display: inline-block; + position: relative; + width: 80px; + height: 80px; +} + + .lds-ring div { + box-sizing: border-box; + display: block; + position: absolute; + width: 64px; + height: 64px; + margin: 8px; + border: 8px solid currentColor; + border-radius: 50%; + animation: lds-ring 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite; + border-color: currentColor transparent transparent transparent; + } + + .lds-ring div:nth-child(1) { + animation-delay: -0.45s; + } + + .lds-ring div:nth-child(2) { + animation-delay: -0.3s; + } + + .lds-ring div:nth-child(3) { + animation-delay: -0.15s; + } + +@keyframes lds-ring { + 0% { + transform: rotate(0deg); + } + + 100% { + transform: rotate(360deg); + } +} diff --git a/Projects/WebClient/Web.Tra/Components/Layout/MainLayout.razor b/Projects/WebClient/Web.Tra/Components/Layout/MainLayout.razor index 78dd570..f3c2d4b 100644 --- a/Projects/WebClient/Web.Tra/Components/Layout/MainLayout.razor +++ b/Projects/WebClient/Web.Tra/Components/Layout/MainLayout.razor @@ -5,7 +5,6 @@ @inject ConfigService configService @inject NavigationManager NavigationManager - @@ -17,10 +16,11 @@ - + @Body + @code { bool sidebarExpanded = true; diff --git a/Projects/WebClient/Web.Tra/Components/Module/TraGrid.razor b/Projects/WebClient/Web.Tra/Components/Module/TraGrid.razor index b57b030..f64e79d 100644 --- a/Projects/WebClient/Web.Tra/Components/Module/TraGrid.razor +++ b/Projects/WebClient/Web.Tra/Components/Module/TraGrid.razor @@ -2,7 +2,7 @@ @inject ContextMenuService ContextMenuService - @@ -25,8 +25,10 @@ if (col.Name.ToLower().Equals("testdate")) { -