完善框架，新增两个close方法；

alielie

2025-03-17 c401a2f2fd1a509cdeb33e850bb5c2827074af48

 WPFProject/PanuonWindow.xaml

@@ -13,14 +13,29 @@
            x:Name="window"
            BorderBrush="Transparent"
            Loaded="window_Loaded"
            pu:WindowXCaption.Buttons="All"
            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"
            pu:WindowXCaption.Background="Transparent"
            pu:WindowXCaption.Height="80"
            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,6 +64,24 @@

    <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"