From 7bf89fd93bc487e8445d6d85bb527251b7371a04 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 12 五月 2025 13:14:11 +0800
Subject: [PATCH] 优化项目；
---
HMI.MenuManage/Modal/UserModal.xaml | 64 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/HMI.MenuManage/Modal/UserModal.xaml b/HMI.MenuManage/Modal/UserModal.xaml
index eec9385..26a30f7 100644
--- a/HMI.MenuManage/Modal/UserModal.xaml
+++ b/HMI.MenuManage/Modal/UserModal.xaml
@@ -7,58 +7,44 @@
xmlns:pw="https://opensource.panuon.com/wpf"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
+ xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
mc:Ignorable="d"
Title="Form"
SizeToContent="Height"
Width="600"
WindowStartupLocation="CenterOwner"
- BorderBrush="#3E3E45"
- BorderThickness="1"
- Foreground="Black"
- pu:WindowXCaption.Background="{StaticResource PrimaryColor}"
- pu:WindowXModalDialog.ButtonStyle="{StaticResource ModalButton}"
- pu:WindowXCaption.Foreground="#FFF"
- pu:WindowXCaption.Buttons="Close"
- pu:WindowXModalDialog.Buttons="OKCancel"
- pu:WindowXModalDialog.CancelButtonContent="鍙栨秷"
- pu:WindowXModalDialog.OKButtonContent="淇濆瓨"
- pu:WindowXModalDialog.ButtonPanelMargin="0,30,10,10">
- <Window.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 Source="/HMI.UI;component/Style/Colors.xaml"/>
- </ResourceDictionary.MergedDictionaries>
- <uic:PathImageConverter x:Key="path2Image"/>
- <uic:DataGridRowNumberConverter x:Key="rowNumber"/>
- </ResourceDictionary>
- </Window.Resources>
-
+ Style="{StaticResource ModalWindow}">
<Grid Margin="10">
- <StackPanel>
- <pu:FormGroup x:Name="FgName" Style="{StaticResource RequiredInputFormGroupStyle}"
- Header="鐢ㄦ埛鍚嶇О" GroupName="MyFormGroup">
+ <StackPanel x:Name="formPanel">
+ <pu:FormGroup x:Name="FgName" Style="{StaticResource InputFormGroupStyle}"
+ Header="{DynamicResource HMI.User.RealName}"
+ dp:FormGroupHelper.IsRequired="True" GroupName="MyFormGroup">
<TextBox x:Name="TbName" Style="{StaticResource EditorTextBoxStyle}" />
</pu:FormGroup>
- <pu:FormGroup x:Name="FgUsername" Style="{StaticResource RequiredInputFormGroupStyle}"
- Header="璐﹀彿" GroupName="MyFormGroup">
+ <pu:FormGroup x:Name="FgUsername" Style="{StaticResource InputFormGroupStyle}"
+ dp:FormGroupHelper.ValidateMethod="ValidateUsername"
+ Header="{DynamicResource HMI.User.Account}"
+ dp:FormGroupHelper.IsRequired="True" GroupName="MyFormGroup">
<TextBox x:Name="TbUsername" Style="{StaticResource EditorTextBoxStyle}" />
</pu:FormGroup>
- <pu:FormGroup x:Name="FgPassword" Style="{StaticResource RequiredInputFormGroupStyle}"
- Header="瀵嗙爜" GroupName="MyFormGroup">
+ <pu:FormGroup x:Name="FgPassword" Style="{StaticResource InputFormGroupStyle}"
+ Header="{DynamicResource HMI.User.Password}"
+ dp:FormGroupHelper.IsRequired="True" GroupName="MyFormGroup">
<TextBox x:Name="TbPassword" Style="{StaticResource EditorTextBoxStyle}" />
</pu:FormGroup>
<pu:FormGroup x:Name="FgRoleCode" Orientation="Vertical"
- Style="{StaticResource RequiredInputFormGroupStyle}" Header="瑙掕壊" GroupName="MyFormGroup">
+ Style="{StaticResource InputFormGroupStyle}"
+ Header="{DynamicResource HMI.Role}" GroupName="MyFormGroup">
<DataGrid x:Name="table" 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"
@@ -71,8 +57,16 @@
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>
</pu:FormGroup>
--
Gitblit v1.9.1