Răsfoiți Sursa

fix like search

Dalibor Votruba 2 ani în urmă
părinte
comite
70325d7986

+ 2 - 2
Workbench/QMonitor/qmonlib.ui/ViewModels/Navigator/NavSearchViewModel.cs

@@ -8,6 +8,7 @@ using System.Reactive.Linq;
 using qmonlib.ui.Models.General;
 using Quadarax.Foundation.Core.QMonitor;
 using Quadarax.Foundation.Core.Value;
+using Quadarax.Foundation.Core.Value.Extensions;
 using ReactiveUI;
 
 namespace qmonlib.ui.ViewModels.Navigator
@@ -18,7 +19,6 @@ namespace qmonlib.ui.ViewModels.Navigator
         #region *** Private Fields ***
         private readonly ObservableCollection<MonGeneral> _allData;
         private readonly ConcurrentDictionary<string,CheckBoxListItem> _instancesCache = new ConcurrentDictionary<string, CheckBoxListItem>();
-        private readonly IEqualityComparer<string> _eq = new StringPatternComparer();
         private string? _searchText;
         #endregion
 
@@ -45,7 +45,7 @@ namespace qmonlib.ui.ViewModels.Navigator
                         y.IsChecked));
                 Debug.WriteLine($"*DataFiltered.dataInstances cnt = {dataInstances.Count()}");
                 var result = new ObservableCollection<MonItemGeneral>(
-                    dataInstances.SelectMany(x => x.Items).Where(x => _eq.Equals(x.Name, SearchText))
+                    dataInstances.SelectMany(x => x.Items).Where(x => x.Name.Like(SearchText))
                 );
                 Debug.WriteLine($"*DataFiltered cnt = {result.Count}");
                 return result;

+ 1 - 1
Workbench/QMonitor/qmonlib/MonItemGeneral.cs

@@ -9,7 +9,7 @@ namespace Quadarax.Foundation.Core.QMonitor
     public class MonItemGeneral
     {
         [JsonPropertyName("nam")]
-        public string? Name { get; set; }
+        public string Name { get; set; }
         [JsonPropertyName("cpt")]
         public string Caption { get; set; }
         [JsonPropertyName("dsc")]