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 @@ - 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(',');