improvements

This commit is contained in:
Loretta 2025-11-21 07:20:26 +01:00
parent dc4321c1d6
commit 44103b9613
1 changed files with 8 additions and 6 deletions

View File

@ -30,8 +30,8 @@ public abstract class MgGridBase<TSignalRDataSource, TDataItem, TId, TLoggerClie
protected bool IsFirstInitializeParameters; protected bool IsFirstInitializeParameters;
protected bool IsFirstInitializeParameterCore; protected bool IsFirstInitializeParameterCore;
private TSignalRDataSource _dataSource = null!; private TSignalRDataSource? _dataSource = null!;
private List<TDataItem> _dataSourceParam = []; private List<TDataItem>? _dataSourceParam = [];
private string _gridLogName; private string _gridLogName;
public MgGridBase() : base() public MgGridBase() : base()
@ -61,7 +61,7 @@ public abstract class MgGridBase<TSignalRDataSource, TDataItem, TId, TLoggerClie
{ {
_filterText = value; _filterText = value;
if (_dataSource != null! && _dataSource.FilterText != value) if (_dataSource != null && _dataSource.FilterText != value)
{ {
_dataSource.FilterText = value; _dataSource.FilterText = value;
ReloadDataSourceAsync().Forget(); ReloadDataSourceAsync().Forget();
@ -117,7 +117,7 @@ public abstract class MgGridBase<TSignalRDataSource, TDataItem, TId, TLoggerClie
{ {
_dataSourceParam = value as List<TDataItem>; _dataSourceParam = value as List<TDataItem>;
if (_dataSource != null!) // && _dataSourceParam is List<TDataItem> workingReferenceList) if (_dataSource != null) // && _dataSourceParam is List<TDataItem> workingReferenceList)
_dataSource.SetWorkingReferenceList(_dataSourceParam); _dataSource.SetWorkingReferenceList(_dataSourceParam);
} }
} }
@ -166,7 +166,7 @@ public abstract class MgGridBase<TSignalRDataSource, TDataItem, TId, TLoggerClie
private Task OnDataSourceLoaded() private Task OnDataSourceLoaded()
{ {
Logger.Debug($"{_gridLogName} OnDataSourceLoaded; Count: {_dataSource.Count}"); Logger.Debug($"{_gridLogName} OnDataSourceLoaded; Count: {_dataSource?.Count}");
Reload(); Reload();
//_dataSource.LoadItem(_dataSource.First().Id).Forget(); //_dataSource.LoadItem(_dataSource.First().Id).Forget();
@ -177,7 +177,9 @@ public abstract class MgGridBase<TSignalRDataSource, TDataItem, TId, TLoggerClie
{ {
if (firstRender) if (firstRender)
{ {
if (_dataSourceParam != null!) await _dataSource.LoadDataSource(_dataSourceParam, true, true); if (_dataSource == null) return;
if (_dataSourceParam != null) await _dataSource.LoadDataSource(_dataSourceParam, true, true);
else _dataSource.LoadDataSourceAsync(true).Forget(); else _dataSource.LoadDataSourceAsync(true).Forget();
} }