From 1abeefcc66caf31a0db43f36e0d4b9ee3f6855fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=89=BE=E7=AB=B9?= <akwkevin@126.com>
Date: Fri, 2 Dec 2022 08:44:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controls/ComboBox.xaml                     |  1 -
 .../Controls/MultiSelectComboBox.xaml.cs       | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/AIStudio.Wpf.DiagramHelper/Controls/ComboBox.xaml b/AIStudio.Wpf.DiagramHelper/Controls/ComboBox.xaml
index d49e87b..c3904e2 100644
--- a/AIStudio.Wpf.DiagramHelper/Controls/ComboBox.xaml
+++ b/AIStudio.Wpf.DiagramHelper/Controls/ComboBox.xaml
@@ -9,7 +9,6 @@
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
         <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
-        <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ComboBox">
diff --git a/AIStudio.Wpf.DiagramHelper/Controls/MultiSelectComboBox.xaml.cs b/AIStudio.Wpf.DiagramHelper/Controls/MultiSelectComboBox.xaml.cs
index 25e2288..bebcd52 100644
--- a/AIStudio.Wpf.DiagramHelper/Controls/MultiSelectComboBox.xaml.cs
+++ b/AIStudio.Wpf.DiagramHelper/Controls/MultiSelectComboBox.xaml.cs
@@ -100,6 +100,8 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
         {
             MultiSelectComboBox control = (MultiSelectComboBox)d;
             control.DisplayInControl();
+            control.SelectNodes();
+            control.SetText();
         }
 
         private static void OnSelectedItemsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -238,13 +240,15 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
             StringBuilder displayText = new StringBuilder();
             foreach (Node s in _nodeList)
             {
-                if (s.IsSelected == true && s.Object.ToString() == "All")
-                {
-                    displayText = new StringBuilder();
-                    displayText.Append("All");
-                    break;
-                }
-                else if (s.IsSelected == true && s.Object.ToString() != "All")
+                //不使用ALl来显示
+                //if (s.IsSelected == true && s.Object.ToString() == "All")
+                //{
+                //    displayText = new StringBuilder();
+                //    displayText.Append("All");
+                //    break;
+                //}
+                //else 
+                if (s.IsSelected == true && s.Object.ToString() != "All")
                 {
                     displayText.Append(s.Object);
                     displayText.Append(',');