重构拼音搜索底层算法

优化搜索被匹配关键词显示
MakesYT · Oct 26, 2024 · 5d970c2 · 5d970c2
1 parent 148276f
commit 5d970c2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/Core/ViewModel/SearchWindowViewModel.cs b/Core/ViewModel/SearchWindowViewModel.cs
@@ -513,6 +513,7 @@ partial void OnSearchChanged(string? value)
                     }
 
                     Items.Add(searchViewItem); // 添加元素
+                    searchViewItem.Notify();
                     count++; // 计数器加一
                 }
             }

diff --git a/KitopiaAvalonia/Converter/SearchWindow/ItemNameMatchCtr.cs b/KitopiaAvalonia/Converter/SearchWindow/ItemNameMatchCtr.cs
@@ -20,10 +20,10 @@ public class ItemNameMatchCtr : IValueConverter
             return new InlineCollection();
         }
 
-        InlineCollection list = new();
-        if (str.PinyinItem == null || str.PinyinItem.CharMatchResults == null || str.PinyinItem.SplitWords == null ||
-            str.PinyinItem.CharMatchResults.Length - str.PinyinItem.ZhongWenCount != str.PinyinItem.SplitWords.Length ||
-            str.PinyinItem.CharMatchResults.Length == 0)
+        InlineCollection list = new(); if (str.PinyinItem == null || str.PinyinItem.CharMatchResults == null || str.PinyinItem.SplitWords == null ||
+                                           str.PinyinItem.CharMatchResults.Length == 0||
+                                           str.PinyinItem.CharMatchResults.Length /2 != str.PinyinItem.SplitWords.Length 
+                                          )
         {
             list.Add(new Run(str.ItemDisplayName));
             return list;
@@ -33,7 +33,7 @@ public class ItemNameMatchCtr : IValueConverter
         for (int i = 0; i < str.PinyinItem.SplitWords.Length; i++)
         {
             var inline = new Run(str.PinyinItem.SplitWords[i]);
-            if (str.PinyinItem.CharMatchResults[i + str.PinyinItem.ZhongWenCount])
+            if (str.PinyinItem.CharMatchResults[i + str.PinyinItem.SplitWords.Length])
             {
                 inline.Foreground = Brushes.OrangeRed;
             }

diff --git a/KitopiaAvalonia/Windows/SearchWindow.axaml b/KitopiaAvalonia/Windows/SearchWindow.axaml
@@ -154,7 +154,7 @@
                                                     HorizontalAlignment="Stretch">
                                             <TextBlock VerticalAlignment="Center" Margin="0" Focusable="False"
                                                        FontFamily="HarmonyOS Sans"
-                                                       Inlines="{Binding Path=., 
+                                                       Inlines="{Binding Path=PinyinItem, 
                                                                     Converter={StaticResource ItemNameMatchCtr},
                                                                     ConverterParameter={ReflectionBinding #Item}}"
                                                        Background="{x:Null}"

diff --git a/KitopiaAvalonia/Windows/SearchWindow.axaml.cs b/KitopiaAvalonia/Windows/SearchWindow.axaml.cs
@@ -25,6 +25,9 @@ public SearchWindow()
         InitializeComponent();
         WeakReferenceMessenger.Default.Register<string, string>(this, "SearchWindowClose",
             (_, _) => { Dispatcher.UIThread.InvokeAsync(() => { IsVisible = false; }); });
+        #if DEBUG
+        this.Topmost = false;
+        #endif
     }
 
     public override void Show()

diff --git a/PinyinM.NET b/PinyinM.NET
diff --git a/PluginCore b/PluginCore