fix: close #1367

HandyOrg · Mar 18, 2023 · 4564e7e · 4564e7e
1 parent e932327
commit 4564e7e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
@@ -66,7 +66,7 @@
                         <hc:SimplePanel Background="#FFE8E03F"/>
                     </hc:TabItem>
                 </hc:TabControl>
-                <hc:TabControl Grid.Row="2" IsAnimationEnabled="True" Margin="0,32,0,0" ShowCloseButton="True" IsDraggable="True" ItemsSource="{Binding DataList}" MaxWidth="800" Height="300">
+                <hc:TabControl Grid.Row="2" IsAnimationEnabled="True" Margin="0,32,0,0" ShowCloseButton="True" IsDraggable="True" ItemsSource="{Binding DataList}" MaxWidth="800" Height="300" OverflowMenuDisplayMemberPath="Header">
                     <TabControl.ItemTemplate>
                         <DataTemplate>
                             <TextBlock Text="{Binding Header}"/>

diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
@@ -219,6 +219,15 @@ public bool ShowScrollButton
         set => SetValue(ShowScrollButtonProperty, ValueBoxes.BooleanBox(value));
     }
 
+    public static readonly DependencyProperty OverflowMenuDisplayMemberPathProperty = DependencyProperty.Register(
+        nameof(OverflowMenuDisplayMemberPath), typeof(string), typeof(TabControl), new PropertyMetadata(default(string)));
+
+    public string OverflowMenuDisplayMemberPath
+    {
+        get => (string) GetValue(OverflowMenuDisplayMemberPathProperty);
+        set => SetValue(OverflowMenuDisplayMemberPathProperty, value);
+    }
+
     /// <summary>
     ///     可见的标签数量
     /// </summary>
@@ -346,10 +355,20 @@ private void ButtonOverflow_Click(object sender, RoutedEventArgs e)
 
                 if (item.DataContext is not null)
                 {
-                    menuItem.SetBinding(HeaderedItemsControl.HeaderProperty, new Binding(DisplayMemberPath)
+                    if (ItemTemplate is null)
                     {
-                        Source = item.DataContext
-                    });
+                        menuItem.SetBinding(HeaderedItemsControl.HeaderProperty, new Binding(DisplayMemberPath)
+                        {
+                            Source = item.DataContext
+                        });
+                    }
+                    else
+                    {
+                        menuItem.SetBinding(HeaderedItemsControl.HeaderProperty, new Binding(OverflowMenuDisplayMemberPath)
+                        {
+                            Source = item.DataContext
+                        });
+                    }
                 }
                 else
                 {