fix: close #901

VShawn · VShawn · commit 3a7dadadb279 · 2025-04-04T12:06:23.000+08:00
diff --git a/Ui/Model/Protocol/RDP.cs b/Ui/Model/Protocol/RDP.cs
@@ -11,7 +11,6 @@
 using _1RM.Utils;
 using Shawn.Utils.Wpf;
 using MSTSCLib;
-using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 using AxMSTSCLib;
 using _1RM.View.Host.ProtocolHosts;
diff --git a/Ui/Service/ConfigurationService.cs b/Ui/Service/ConfigurationService.cs
@@ -11,12 +11,10 @@
 using _1RM.Service.DataSource;
 using _1RM.Service.DataSource.Model;
 using _1RM.Utils;
-using Microsoft.WindowsAPICodePack.Shell.PropertySystem;
 using Shawn.Utils;
 using Shawn.Utils.Wpf;
 using VariableKeywordMatcher.Provider.DirectMatch;
 using SetSelfStartingHelper = _1RM.Utils.SetSelfStartingHelper;
-using Google.Protobuf.WellKnownTypes;
 using System.Windows.Media;
 
 namespace _1RM.Service
diff --git a/Ui/Service/DataSource/DataSourceService.cs b/Ui/Service/DataSource/DataSourceService.cs
@@ -12,7 +12,6 @@
 using _1RM.Service.DataSource.Model;
 using _1RM.Utils;
 using _1RM.View;
-using Microsoft.WindowsAPICodePack.Shell.PropertySystem;
 using Newtonsoft.Json;
 using Shawn.Utils;
 using Shawn.Utils.Wpf.FileSystem;
diff --git a/Ui/Utils/Tracing/MsAppCenterHelper.cs b/Ui/Utils/Tracing/MsAppCenterHelper.cs
@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using System.Linq;
 using _1RM.Utils.WindowsApi;
-using Google.Protobuf.WellKnownTypes;
 using Microsoft.AppCenter;
 using Microsoft.AppCenter.Analytics;
 using Microsoft.AppCenter.Crashes;
diff --git a/Ui/Utils/WindowsSdk/PasswordVaultManager/PasswordVaultManagerFileSystem.cs b/Ui/Utils/WindowsSdk/PasswordVaultManager/PasswordVaultManagerFileSystem.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
-using Microsoft.WindowsAPICodePack.Shell.PropertySystem;
 
 namespace _1RM.Utils.WindowsSdk.PasswordVaultManager
 {
diff --git a/Ui/View/Editor/Forms/AlternativeCredential/AlternativeCredentialEditViewModel.cs b/Ui/View/Editor/Forms/AlternativeCredential/AlternativeCredentialEditViewModel.cs
@@ -5,7 +5,6 @@
 using System.IO;
 using System.Linq;
 using System.Windows;
-using System.Xml.Linq;
 using _1RM.Model.Protocol;
 using _1RM.Model.Protocol.Base;
 using _1RM.Service;
diff --git a/Ui/View/Host/ProtocolHosts/HostBase.cs b/Ui/View/Host/ProtocolHosts/HostBase.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Controls.Ribbon;
 using System.Windows.Data;
 using System.Windows.Interop;
 using _1RM.Model;
diff --git a/Ui/View/MainWindowViewModel.cs b/Ui/View/MainWindowViewModel.cs
@@ -14,9 +14,7 @@
 using Stylet;
 using _1RM.View.Settings.General;
 using SetSelfStartingHelper = _1RM.Utils.SetSelfStartingHelper;
-using _1RM.Service.DataSource.DAO.Dapper;
 using Shawn.Utils;
-using Shawn.Utils.Wpf.Image;
 
 namespace _1RM.View
 {
diff --git a/Ui/View/ServerList/ServerListPageViewModel.cs b/Ui/View/ServerList/ServerListPageViewModel.cs
@@ -491,7 +491,7 @@ public void RefreshCollectionViewSource(bool force = false)
 
                     var tmp = TagAndKeywordEncodeHelper.DecodeKeyword(filter);
                     TagFilters = tmp.TagFilterList;
-                    var matchResults = TagAndKeywordEncodeHelper.MatchKeywords(servers.Select(x => x.Server).ToList(), tmp, false);
+                    var matchResults = TagAndKeywordEncodeHelper.MatchKeywords(servers.Select(x => x.Server).ToList(), tmp, true);
                     for (int i = 0; i < servers.Count; i++)
                     {
                         var vm = servers[i];
@@ -519,8 +519,8 @@ public void RefreshCollectionViewSource(bool force = false)
             Execute.OnUIThread(() =>
             {
                 // MainFilterString changed -> refresh view source -> calc visible in `ServerListItemSource_OnFilter`
-                if ((this.View as ServerListPageView)?.LvServerCards.ItemsSource != null)
-                    CollectionViewSource.GetDefaultView((this.View as ServerListPageView)!.LvServerCards.ItemsSource).Refresh();
+                if (this.View is ServerListPageView view && view.LvServerCards.ItemsSource != null)
+                    CollectionViewSource.GetDefaultView(view.LvServerCards.ItemsSource).Refresh();
                 // invoke ServerListPageView.cs => ServerListItemSource_OnFilter
             });
         }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using System.IO;`
`3`	`3`	`using System.Security.Cryptography;`
`4`	`4`	`using System.Threading.Tasks;`
`5`		`-using Microsoft.WindowsAPICodePack.Shell.PropertySystem;`
`6`	`5`
`7`	`6`	`namespace _1RM.Utils.WindowsSdk.PasswordVaultManager`
`8`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,7 @@`
`14`	`14`	`using Stylet;`
`15`	`15`	`using _1RM.View.Settings.General;`
`16`	`16`	`using SetSelfStartingHelper = _1RM.Utils.SetSelfStartingHelper;`
`17`		`-using _1RM.Service.DataSource.DAO.Dapper;`
`18`	`17`	`using Shawn.Utils;`
`19`		`-using Shawn.Utils.Wpf.Image;`
`20`	`18`
`21`	`19`	`namespace _1RM.View`
`22`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,7 @@ public void RefreshCollectionViewSource(bool force = false)`
`491`	`491`
`492`	`492`	`var tmp = TagAndKeywordEncodeHelper.DecodeKeyword(filter);`
`493`	`493`	`TagFilters = tmp.TagFilterList;`
`494`		`- var matchResults = TagAndKeywordEncodeHelper.MatchKeywords(servers.Select(x => x.Server).ToList(), tmp, false);`
	`494`	`+ var matchResults = TagAndKeywordEncodeHelper.MatchKeywords(servers.Select(x => x.Server).ToList(), tmp, true);`
`495`	`495`	`for (int i = 0; i < servers.Count; i++)`
`496`	`496`	`{`
`497`	`497`	`var vm = servers[i];`
`@@ -519,8 +519,8 @@ public void RefreshCollectionViewSource(bool force = false)`
`519`	`519`	`Execute.OnUIThread(() =>`
`520`	`520`	`{`
`521`	`521`	// MainFilterString changed -> refresh view source -> calc visible in `ServerListItemSource_OnFilter`
`522`		`- if ((this.View as ServerListPageView)?.LvServerCards.ItemsSource != null)`
`523`		`- CollectionViewSource.GetDefaultView((this.View as ServerListPageView)!.LvServerCards.ItemsSource).Refresh();`
	`522`	`+ if (this.View is ServerListPageView view && view.LvServerCards.ItemsSource != null)`
	`523`	`+ CollectionViewSource.GetDefaultView(view.LvServerCards.ItemsSource).Refresh();`
`524`	`524`	`// invoke ServerListPageView.cs => ServerListItemSource_OnFilter`
`525`	`525`	`});`
`526`	`526`	`}`