修复重复搜索没有生效的问题 (#216)

* 修复重复搜索没有生效的问题 * 在搜索时终止之前的建议查询
Richasy · Jan 7, 2024 · 6497681 · 6497681
1 parent b169418
commit 6497681
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/App/Forms/MainWindow.xaml.cs b/src/App/Forms/MainWindow.xaml.cs
@@ -199,6 +199,12 @@ private void OnRequestSearch(object sender, string e)
             vm.InitializeCommand.Execute(default);
             _ = OverlayFrame.Navigate(typeof(SearchPage), vm);
         }
+        else
+        {
+            var page = OverlayFrame.Content as SearchPage;
+            page.ViewModel.SetKeyword(e);
+            page.ViewModel.InitializeCommand.Execute(default);
+        }
     }
 
     private void OnRequestShowMyMessages(object sender, EventArgs e)

diff --git a/src/ViewModels/Components/SearchBoxViewModel/SearchBoxViewModel.cs b/src/ViewModels/Components/SearchBoxViewModel/SearchBoxViewModel.cs
@@ -55,19 +55,22 @@ private void SearchBySuggest(SearchSuggest suggest)
     [RelayCommand]
     private void SearchByText(string text)
     {
+        CancelSuggestion();
+        TryClear(AutoSuggestCollection);
         QueryText = text;
         AppViewModel.Instance.SearchContentCommand.Execute(text);
     }
 
-    private void InitializeSuggestionCancellationTokenSource()
+    private void CancelSuggestion()
     {
-        if (_suggestionCancellationTokenSource != null
-            && !_suggestionCancellationTokenSource.IsCancellationRequested)
-        {
-            _suggestionCancellationTokenSource.Cancel();
-            _suggestionCancellationTokenSource = null;
-        }
+        _suggestionCancellationTokenSource?.Cancel();
+        _suggestionCancellationTokenSource?.Dispose();
+        _suggestionCancellationTokenSource = null;
+    }
 
+    private void InitializeSuggestionCancellationTokenSource()
+    {
+        CancelSuggestion();
         _suggestionCancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(1));
     }