Adam
/
AyCode.Blazor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MgGridBase improvements, fixes

This commit is contained in:
Loretta 2025-11-08 06:34:18 +01:00
parent 935b6abf9a
commit 650066becf
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AyCode.Blazor.Components/AyCode.Blazor.Components.csproj
View File

@ -10,8 +10,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="DevExpress.Blazor" Version="25.1.3" />
<PackageReference Include="DevExpress.Data" Version="25.1.3" /> <PackageReference Include="DevExpress.Data" Version="25.1.3" />
<PackageReference Include="DevExpress.Blazor" Version="24.2.3" />
<PackageReference Include="MessagePack" Version="3.1.4" /> <PackageReference Include="MessagePack" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.10" /> <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.10" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.10" /> <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.10" />

20
AyCode.Blazor.Components/Components/Grids/MgGridBase.cs
View File

@ -17,9 +17,10 @@ public interface IMgGridBase
} }
public abstract class MgGridBase<TSignalRDataSource, TDataItem, TId, TLoggerClient> : DxGrid, IMgGridBase public class MgGridBase<TSignalRDataSource, TDataItem, TId, TLoggerClient> : DxGrid, IMgGridBase
where TSignalRDataSource : AcSignalRDataSource<TDataItem, TId, IList<TDataItem>> where TSignalRDataSource : AcSignalRDataSource<TDataItem, TId, IList<TDataItem>>
where TDataItem : class, IId<TId> where TId : struct where TDataItem : class, IId<TId>
where TId : struct
where TLoggerClient : AcLoggerBase where TLoggerClient : AcLoggerBase
{ {
private readonly EqualityComparer<TId> _equalityComparer = EqualityComparer<TId>.Default; private readonly EqualityComparer<TId> _equalityComparer = EqualityComparer<TId>.Default;
@ -167,17 +168,21 @@ public abstract class MgGridBase<TSignalRDataSource, TDataItem, TId, TLoggerClie
await base.OnAfterRenderAsync(firstRender); await base.OnAfterRenderAsync(firstRender);
} }
private static void SetNewId(TDataItem dataItem)
{
//TODO: int !!! - J.
if (dataItem.Id is Guid) TypeDescriptor.GetConverter(Guid.NewGuid()).ConvertTo(dataItem.Id, typeof(TId));
}
public Task AddDataItem(TDataItem dataItem) public Task AddDataItem(TDataItem dataItem)
{ {
//TODO: !!! - J. if (!HasIdValue(dataItem)) SetNewId(dataItem);
//if (!HasIdValue(dataItem)) dataItem.Id = Guid.NewGuid();
return _dataSource.Add(dataItem, true); return _dataSource.Add(dataItem, true);
} }
public Task AddDataItemAsync(TDataItem dataItem) public Task AddDataItemAsync(TDataItem dataItem)
{ {
//TODO: !!! - J. if (!HasIdValue(dataItem)) SetNewId(dataItem);
//if (!HasIdValue(dataItem)) dataItem.Id = Guid.NewGuid();
_dataSource.Add(dataItem); _dataSource.Add(dataItem);
return SaveChangesToServerAsync(); return SaveChangesToServerAsync();
@ -187,8 +192,7 @@ public abstract class MgGridBase<TSignalRDataSource, TDataItem, TId, TLoggerClie
{ {
var dataItem = (e.EditModel as TDataItem)!; var dataItem = (e.EditModel as TDataItem)!;
//TODO: !!! - J. if (e.IsNew && !HasIdValue(dataItem)) SetNewId(dataItem);
//if (e.IsNew && !HasIdValue(dataItem)) dataItem.Id = Guid.NewGuid();
var logText = e.IsNew ? "add" : "update"; var logText = e.IsNew ? "add" : "update";
Logger.Debug($"{_gridLogName} OnItemSaving {logText}; Id: {dataItem.Id}"); Logger.Debug($"{_gridLogName} OnItemSaving {logText}; Id: {dataItem.Id}");