From 0940f31b7eba1cf6b6a8c1fca72d97cf686e79f2 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 04 七月 2025 10:43:00 +0800
Subject: [PATCH] 优化插件，完善TreeListView

---
 WPFProject/PanuonWindow.xaml |   71 ++++++++++++++++++++++++++++++++---
 1 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/WPFProject/PanuonWindow.xaml b/WPFProject/PanuonWindow.xaml
index f2d416d..867d337 100644
--- a/WPFProject/PanuonWindow.xaml
+++ b/WPFProject/PanuonWindow.xaml
@@ -12,15 +12,32 @@
             WindowState="Maximized"
             x:Name="window"
             BorderBrush="Transparent"
-            Loaded="window_Loaded"
+            pu:WindowXCaption.Buttons="None"
             xmlns:sys="clr-namespace:System;assembly=mscorlib"
             xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
             xmlns:hc="clr-namespace:HMI.Core;assembly=HMI.Core"
+            Closed="window_Closed"
+            Topmost="False"
+            Title="TestPlatform"
             pu:WindowXCaption.Background="Transparent"
             pu:WindowXCaption.Height="80"
-            pu:WindowXCaption.Foreground="#FFF" >
+            IsOverlayerVisible="True"
+            pu:WindowXCaption.Foreground="#FFF">
     <Window.Resources>
         <hc:LangConverter x:Key="lc"/>
+        <Style x:Key="UserMenu" TargetType="Menu" BasedOn="{StaticResource {x:Static pu:StyleKeys.MenuStyle}}">
+            <Setter Property="Background" Value="{StaticResource PrimaryColor}"/>
+            <Setter Property="Foreground" Value="#FFF"/>
+            <Setter Property="pu:IconHelper.FontFamily" Value="{StaticResource iconfont}"/>
+            <Setter Property="pu:IconHelper.Margin" Value="0,0,10,0"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Cursor" Value="Hand"/>
+            <Setter Property="pu:MenuHelper.SubmenuItemsForeground" Value="#3a3a3a"/>
+            <Setter Property="pu:MenuHelper.SubmenuItemsBackground" Value="White"/>
+            <Setter Property="pu:MenuHelper.TopLevelItemsHoverBackground" Value="{x:Null}"/>
+            <Setter Property="pu:MenuHelper.TopLevelDropDownPlacement" Value="BottomLeft"/>
+        </Style>
+
     </Window.Resources>
     <Window.Background>
         <ImageBrush Stretch="Uniform" AlignmentX="Left" AlignmentY="Top"  
@@ -49,14 +66,33 @@
 
     <pu:WindowXCaption.ExtendControl>
         <StackPanel Orientation="Horizontal">
+            <Menu Margin="0" Padding="0" VerticalAlignment="Top"
+                  VerticalContentAlignment="Center" Style="{StaticResource UserMenu}"
+                  
+                  Background="Transparent">
+                <MenuItem x:Name="userMenu" FontSize="16">
+                    <MenuItem 
+                        Icon="&#xe61d;"
+                        Cursor="Hand" FontSize="14" Header="閫�鍑虹櫥褰�"
+                              x:Name="MiLogout"
+                              Click="MenuItem_Click"/>
+                    <MenuItem Cursor="Hand" FontSize="14" 
+                        Icon="&#xe867;"
+                              Header="閲嶆柊鍚姩"
+                              x:Name="MiRestart"
+                              Click="MenuItem_Click"/>
+                </MenuItem>
+            </Menu>
+
             <Button x:Name="BtnSwitchTheme"
                 FontSize="18"
                 FontFamily="/HMI.UI;component/Resources/Font/#iconfont"
                 Content="&#xe60e;"
                 RenderTransformOrigin="0.5,0.5"
-                Click="Button_Click_2">
+                Click="Button_Click">
                 <Button.Style>
                     <Style TargetType="Button" BasedOn="{StaticResource {x:Static pu:WindowXCaption.MinimizeButtonStyleKey}}">
+                        <Setter Property="Focusable" Value="False"/>
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding ShowMenu}" Value="True">
                                 <Setter Property="Button.RenderTransform">
@@ -68,7 +104,30 @@
                         </Style.Triggers>
                     </Style>
                 </Button.Style>
-                
+            </Button>
+
+            <Button FontSize="18" Click="Button_Click" x:Name="minBtn">
+                <Button.Style>
+                    <Style TargetType="Button" BasedOn="{StaticResource {x:Static pu:WindowXCaption.MinimizeButtonStyleKey}}">
+                        <Setter Property="Focusable" Value="False"/>
+                    </Style>
+                </Button.Style>
+            </Button>
+
+            <Button FontSize="18" Click="Button_Click" x:Name="maxBtn">
+                <Button.Style>
+                    <Style TargetType="Button" BasedOn="{StaticResource {x:Static pu:WindowXCaption.MaximizeButtonStyleKey}}">
+                        <Setter Property="Focusable" Value="False"/>
+                    </Style>
+                </Button.Style>
+            </Button>
+
+            <Button FontSize="18" Click="Button_Click" x:Name="closeBtn">
+                <Button.Style>
+                    <Style TargetType="Button" BasedOn="{StaticResource {x:Static pu:WindowXCaption.CloseButtonStyleKey}}">
+                        <Setter Property="Focusable" Value="False"/>
+                    </Style>
+                </Button.Style>
             </Button>
         </StackPanel>
     </pu:WindowXCaption.ExtendControl>
@@ -76,7 +135,7 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition/>
-            <RowDefinition Height="30"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
         <ctl:MainTabControl Grid.Row="0" x:Name="menuTab">
@@ -86,6 +145,6 @@
         <!--<ctl:MenuTabControl Grid.Row="1" x:Name="menuTab" OnTabChange="menuTab_OnTabChange"> </ctl:MenuTabControl>-->
 
 
-        <StatusBar Grid.Row="1" Background="{StaticResource HoriBar}"></StatusBar>
+        <!--<StatusBar Grid.Row="1" Background="{StaticResource HoriBar}"></StatusBar>-->
     </Grid>
 </pu:WindowX>

--
Gitblit v1.9.1