优化标准老化界面

alielie

2026-06-15 f08871fe7d148d667f2f11f80f64de71a0d9504c

 HMI.MenuManage/UserManage.xaml

@@ -9,20 +9,10 @@
xmlns:pw="https://opensource.panuon.com/wpf"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
             mc:Ignorable="d" 
             Background="{StaticResource WorkspaceBackground}"
             Background="{DynamicResource WorkspaceBackground}"
             Padding="10"
             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>
@@ -32,15 +22,21 @@
        <Border Style="{StaticResource CardBoarder}" Margin="0,0,2,0">
            <StackPanel>
                <DockPanel Margin="0,0,0,10">
                    <Button DockPanel.Dock="Right" pu:ButtonHelper.Icon="&#xe60f;" 
                            Style="{StaticResource DangerButton}"
                            x:Name="deleteBatchBtn" Click="Button_Click">删除</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 ExportBtn}" 
Margin="0,0,10,0" x:Name="exportBtn" Click="Button_Click"/>

                    <Button DockPanel.Dock="Right" Style="{StaticResource ImportBtn}" 
        Margin="0,0,10,0" x:Name="importBtn" 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.User.Title}"/>
                </DockPanel>

                <DataGrid Grid.Column="1" x:Name="table" Style="{StaticResource DefaultDataGrid}" 
@@ -62,35 +58,37 @@
                                </DataTemplate>
                            </DataGridTemplateColumn.CellTemplate>
                        </DataGridTemplateColumn>
                        <DataGridTextColumn Width="*"  Binding="{Binding Username}" Header="账号" />
                        <DataGridTextColumn Width="*" Binding="{Binding Name}" Header="用户名称" />
                        <DataGridTextColumn Width="*"  Binding="{Binding Code}">
                            <DataGridTextColumn.Header>
                                <TextBlock Text="{DynamicResource HMI.User.Code}"/>
                            </DataGridTextColumn.Header>
                        </DataGridTextColumn>
                        <DataGridTextColumn Width="*"  Binding="{Binding Username}">
                            <DataGridTextColumn.Header>
                                <TextBlock Text="{DynamicResource HMI.User.Account}"/>
                            </DataGridTextColumn.Header>
                        </DataGridTextColumn>
                        <DataGridTextColumn Width="*" Binding="{Binding Name}">
                            <DataGridTextColumn.Header>
                                <TextBlock Text="{DynamicResource HMI.User.RealName}"/>
                            </DataGridTextColumn.Header>
                        </DataGridTextColumn>
                        <!--<DataGridTextColumn Width="*" Binding="{Binding RoleCode}" Header="角色编号" />
    <DataGridTextColumn Width="*" Binding="{Binding RoleName}" Header="角色名称" />-->
                        <DataGridTemplateColumn Header="操作" Width="100" IsReadOnly="True" CanUserResize="False">
                        <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}" Margin="0,0,10,0"
                                        <Button x:Name="editBtn" Style="{StaticResource EditLink}" Margin="0,0,10,0"
                        DataContext="{Binding }"
                        Click="Button_Click">编辑</Button>
                                        <Button x:Name="delBtn" Style="{StaticResource DangerLinkButton}"
                        Click="Button_Click"/>
                                        <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>
@@ -102,16 +100,19 @@
        <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="saveRoleBtn" Click="Button_Click" pu:ButtonHelper.Icon="&#xe60d;" Content="保存"/>
                    <Button DockPanel.Dock="Right" Style="{StaticResource SaveBtn}"
                            x:Name="saveRoleBtn" Click="Button_Click"/>
                    <TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}" 
                           VerticalAlignment="Center" HorizontalAlignment="Left" Text="用户角色"/>
                           VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource HMI.User.Role}"/>
                </DockPanel>

                <DataGrid x:Name="roleTable" Style="{StaticResource DefaultDataGrid}" SelectionMode="Single" 
                          ItemsSource="{Binding Roles}">
                    <DataGrid.Columns>
                        <DataGridTemplateColumn Header="授予" Width="Auto" CanUserResize="False">
                        <DataGridTemplateColumn Width="Auto" CanUserResize="False">
                            <DataGridTemplateColumn.Header>
                                <TextBlock Text="{DynamicResource App.Granted}"/>
                            </DataGridTemplateColumn.Header>
                            <DataGridTemplateColumn.CellTemplate>
                                <DataTemplate>
                                    <CheckBox VerticalAlignment="Center" 
@@ -123,8 +124,16 @@
                        <DataGridTextColumn Header="#" Binding="{Binding Converter={StaticResource rowNumber},
          RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
                  CanUserResize="False"/>
                        <DataGridTextColumn Width="*" Binding="{Binding RoleCode}" Header="角色编号" />
                        <DataGridTextColumn Width="*" Binding="{Binding RoleName}" Header="角色名称" />
                        <DataGridTextColumn Width="*" Binding="{Binding RoleCode}">
                            <DataGridTextColumn.Header>
                                <TextBlock Text="{DynamicResource HMI.Role.Code}"/>
                            </DataGridTextColumn.Header>
                        </DataGridTextColumn>
                        <DataGridTextColumn Width="*" Binding="{Binding RoleName}">
                            <DataGridTextColumn.Header>
                                <TextBlock Text="{DynamicResource HMI.Role.Name}"/>
                            </DataGridTextColumn.Header>
                        </DataGridTextColumn>
                    </DataGrid.Columns>
                </DataGrid>