优化老化；

alielie

2026-06-04 771a0e7b6b1276087515bbe94de28358cb92963b

 HMI.MenuManage/RoleManage.xaml

@@ -14,18 +14,7 @@
             Background="#f0f2f5"
             d:DesignHeight="450" d:DesignWidth="800">
    <UserControl.Resources>
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
                <pu:StyleDictionary Includes="TreeView" />
                <ResourceDictionary Source="/HMI.UI;component/Style/PanuonResource.xaml"/>
                <ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
            </ResourceDictionary.MergedDictionaries>

            <uic:PathImageConverter x:Key="path2Image"/>
            <uic:DataGridRowNumberConverter x:Key="rowNumber"/>
        </ResourceDictionary>
    </UserControl.Resources>

    <Grid>
        <Grid.ColumnDefinitions>
            <ColumnDefinition Width="6*"/>
@@ -35,13 +24,14 @@
        <Border Style="{StaticResource CardBoarder}" Margin="0,0,2,0">
            <StackPanel>
                <DockPanel Margin="0,0,0,10">
                    <Button DockPanel.Dock="Right" pu:ButtonHelper.Icon="&#xe61a;" Style="{StaticResource DangerButton}">删除</Button>
                    <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}"
pu:ButtonHelper.Icon="&#xe631;" Margin="0,0,10,0" x:Name="refreshBtn" Click="Button_Click">刷新</Button>
                    <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}"
            pu:ButtonHelper.Icon="&#xe61a;" Margin="0,0,10,0" x:Name="addBtn" Click="Button_Click">新增</Button>
                    <Button DockPanel.Dock="Right" Style="{StaticResource DelBtn}"
                            x:Name="deleteBatchBtn" Click="Button_Click"/>
                    <Button DockPanel.Dock="Right" Style="{StaticResource RfhBtn}"
                            Margin="0,0,10,0" x:Name="refreshBtn" Click="Button_Click"/>
                    <Button DockPanel.Dock="Right" Style="{StaticResource AddBtn}"
                            Margin="0,0,10,0" x:Name="addBtn" Click="Button_Click"/>
                    <TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}" 
                           VerticalAlignment="Center" HorizontalAlignment="Left" Text="角色列表"/>
                           VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource HMI.Role.Title}"/>
                </DockPanel>

                <DataGrid x:Name="table" Style="{StaticResource DefaultDataGrid}"
@@ -61,34 +51,31 @@
                            Binding="{Binding Converter={StaticResource rowNumber},
                                    RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
                                            CanUserResize="False"/>
                        <DataGridTextColumn Width="*" Binding="{Binding Code}" Header="角色编号" />
                        <DataGridTextColumn Width="*" Binding="{Binding Name}" Header="角色名称" />
                        <DataGridTemplateColumn Header="操作" Width="100" IsReadOnly="True" CanUserResize="False">
                        <DataGridTextColumn Width="*" Binding="{Binding Code}">
                            <DataGridTextColumn.Header>
                                <TextBlock Text="{DynamicResource HMI.Role.Code}"/>
                            </DataGridTextColumn.Header>
                        </DataGridTextColumn>
                        <DataGridTextColumn Width="*" Binding="{Binding Name}">
                            <DataGridTextColumn.Header>
                                <TextBlock Text="{DynamicResource HMI.Role.Name}"/>
                            </DataGridTextColumn.Header>
                        </DataGridTextColumn>
                        <DataGridTemplateColumn Width="110" IsReadOnly="True" CanUserResize="False">
                            <DataGridTemplateColumn.Header>
                                <TextBlock Text="{DynamicResource App.Opt}"/>
                            </DataGridTemplateColumn.Header>
                            <DataGridTemplateColumn.CellTemplate>
                                <DataTemplate>
                                    <StackPanel Orientation="Horizontal">
                                        <Button x:Name="editBtn" Style="{StaticResource LinkButton}" 
                                        <Button x:Name="editBtn" Style="{StaticResource EditLink}" 
                                            Margin="0,0,10,0"
                                            Click="Button_Click"
                                            DataContext="{Binding }">编辑</Button>
                                        <Button x:Name="delBtn" Style="{StaticResource DangerLinkButton}" 
                                            DataContext="{Binding }"/>
                                        <Button x:Name="delBtn" Style="{StaticResource DeleteLink}" 
                                            DataContext="{Binding }"
                                            Click="Button_Click">删除</Button>
                                            Click="Button_Click"/>
                                    </StackPanel>

                                    <DataTemplate.Triggers>
                                        <DataTrigger Binding="{Binding Path=IsMouseOver,
                                        RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}" 
                                                 Value="True">
                                            <Setter TargetName="editBtn" Property="Foreground" Value="#FFF"/>
                                        </DataTrigger>
                                        <DataTrigger Binding="{Binding Path=IsSelected,
                                        RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}" 
                                                 Value="True">
                                            <Setter TargetName="editBtn" Property="Foreground" Value="#FFF"/>
                                        </DataTrigger>
                                    </DataTemplate.Triggers>

                                </DataTemplate>
                            </DataGridTemplateColumn.CellTemplate>
                        </DataGridTemplateColumn>
@@ -100,10 +87,10 @@
        <Border Grid.Column="1" Style="{StaticResource CardBoarder}" Margin="2,0,0,0">
            <StackPanel>
                <DockPanel Margin="0,0,0,10" >
                    <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}" x:Name="saveMenuBtn" Click="Button_Click" 
                            pu:ButtonHelper.Icon="&#xe60d;" Content="保存"/>
                    <Button DockPanel.Dock="Right" Style="{StaticResource SaveBtn}" 
                            x:Name="saveMenuBtn" Click="Button_Click"/>
                    <TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}" 
                           VerticalAlignment="Center" HorizontalAlignment="Left" Text="菜单授权"/>
                           VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource HMI.Role.Permission}"/>
                </DockPanel>
                <TreeView x:Name="treeViewer" Grid.Column="1" 
                          Style="{StaticResource DefaultTreeView}" ItemsSource="{Binding TreeDataSource}">
@@ -114,8 +101,8 @@
Command="{Binding CheckCommand}"
CommandParameter="{Binding Path=IsChecked,RelativeSource={RelativeSource Mode=Self}}"
/>
                                <Image Width="{StaticResource ContentFontSize}" 
                                       Height="{StaticResource ContentFontSize}" Margin="5" Source="{Binding MenuIcon,Converter={StaticResource path2Image},Mode=OneWay}"/>
                                <!--<Image Width="{StaticResource ContentFontSize}" 
                                       Height="{StaticResource ContentFontSize}" Margin="5" Source="{Binding MenuIcon,Converter={StaticResource path2Image},Mode=OneWay}"/>-->
                                <TextBlock VerticalAlignment="Center" Text="{Binding MenuName}"/>
                            </StackPanel>
                        </HierarchicalDataTemplate>