优化；

alielie

2026-04-16 1afe548ac40cc7f975917ef9bf2e156595cf81f3

 WPFProject/PanuonWindow.xaml

@@ -22,7 +22,7 @@
            pu:WindowXCaption.HeaderAlignment="Stretch"
            Title="TestPlatform"
            pu:WindowXCaption.Background="Transparent"
            pu:WindowXCaption.Height="80"
            pu:WindowXCaption.Height="60"
            IsOverlayerVisible="True"
            pu:WindowXCaption.Foreground="#FFF">
    <Window.Resources>
@@ -40,7 +40,6 @@
            <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,9 +48,10 @@

    <pu:WindowXCaption.HeaderTemplate>
        <DataTemplate>
            <DockPanel DataContext="{Binding ElementName=window}" WindowChrome.IsHitTestVisibleInChrome="True" VerticalAlignment="Center" Height="100">
            <DockPanel DataContext="{Binding ElementName=window}" WindowChrome.IsHitTestVisibleInChrome="True" 
                       VerticalAlignment="Center" Height="80">
                <StackPanel Orientation="Horizontal">
                    <Image DockPanel.Dock="Left" Source="{Binding WindowLogo}" Margin="5,0,20,0" Height="60" VerticalAlignment="Center" Stretch="Fill"
                    <Image DockPanel.Dock="Left" Source="{Binding WindowLogo}" Margin="5,0,20,0" Height="40" VerticalAlignment="Center" Stretch="Fill"
  RenderOptions.BitmapScalingMode="HighQuality" />
                    <TextBlock FontSize="30" VerticalAlignment="Center" Text="{Binding WindowTitle}">
                        <TextBlock.Effect>
@@ -71,9 +71,7 @@
                    </Grid.RowDefinitions>
                    <StackPanel Grid.Row="0" VerticalAlignment="Top" Margin="10,10,0,0" Orientation="Horizontal">
                        <Menu Margin="0" Padding="0" VerticalAlignment="Top"
  VerticalContentAlignment="Center" Style="{StaticResource UserMenu}"
  
  Background="Transparent">
  VerticalContentAlignment="Center" Style="{StaticResource UserMenu}" Background="Transparent">
                            <MenuItem x:Name="userMenu" Header="{Binding WelcomeTitle}" FontSize="16">
                                <MenuItem Icon="&#xe61d;" Cursor="Hand" FontSize="14" Header="退出登录" 
                                      x:Name="MiLogout" Click="MenuItem_Click"/>
@@ -131,11 +129,14 @@
                            </Button.Style>
                        </Button>
                    </StackPanel>
                    <Button Grid.Row="1" Margin="20,0,0,20" Foreground="#FFF" 
                    <DockPanel Margin="20,0,0,20" Grid.Row="1" LastChildFill="False">
                        <Button DockPanel.Dock="Left" Foreground="#FFF"  
                            Visibility="{Binding Alarms.Count,Converter={StaticResource cv}}"
                            HorizontalContentAlignment="Left" Style="{StaticResource LinkButton}"
                            Click="Clear_AllAlarm_Click"
                            Content="清除全部报警"/>
                        <!--<local:ResourceUI x:Name="resourceUI" Loaded="resourceUI_Loaded" DockPanel.Dock="Right"/>--> 
                    </DockPanel>
                </Grid>

                <ListBox x:Name="list"
@@ -234,7 +235,7 @@
                            <Setter Property="Padding" Value="0"/>
                            <Setter Property="VerticalContentAlignment" Value="Center"/>
                            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
                            <Setter Property="Height" Value="70"/>
                            <Setter Property="Height" Value="50"/>
                            <Setter Property="Margin" Value="0,0,0,1"/>
                            <Setter Property="BorderThickness" Value="0"/>
                        </Style>
@@ -254,13 +255,27 @@
            <RowDefinition Height="Auto"/>
        </Grid.RowDefinitions>

        <ctl:MainTabControl Grid.Row="0" x:Name="menuTab">
        <ctl:MainTabControl Grid.Row="0" x:Name="menuTab" TabChanged="menuTab_TabChanged">

        </ctl:MainTabControl>

        <!--<ctl:MenuTabControl Grid.Row="1" x:Name="menuTab" OnTabChange="menuTab_OnTabChange"> </ctl:MenuTabControl>-->


        <!--<StatusBar Grid.Row="1" Background="{StaticResource HoriBar}"></StatusBar>-->
        <DockPanel Grid.Row="1" Height="20" Background="{StaticResource PrimaryColor}" LastChildFill="False">

            <TextBlock Margin="20,0,0,0" FontSize="14" VerticalAlignment="Center" Foreground="#FFF">
<Run Text="{DynamicResource App.Version}"/> 
<Run Text="{Binding SoftwareVersion}"/>
            </TextBlock>

            <TextBlock Margin="20,0,0,0" FontSize="14" VerticalAlignment="Center" Foreground="#FFF">
<Run Text="{DynamicResource App.PluginVersion}"/> 
<Run Text="{Binding PluginVersion}"/>
            </TextBlock>

            <local:ResourceUI FontSize="14" Margin="0,1,20,1" DockPanel.Dock="Right" x:Name="resourceUI"/>

        </DockPanel>
    </Grid>
</pu:WindowX>