From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序； Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject
---
HMI.MenuManage/Modal/RoleModal.xaml | 41 ++++++++++++-----------------------------
1 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/HMI.MenuManage/Modal/RoleModal.xaml b/HMI.MenuManage/Modal/RoleModal.xaml
index 734f03e..4238048 100644
--- a/HMI.MenuManage/Modal/RoleModal.xaml
+++ b/HMI.MenuManage/Modal/RoleModal.xaml
@@ -6,48 +6,31 @@
xmlns:local="clr-namespace:HMI.MenuManage"
xmlns:pw="https://opensource.panuon.com/wpf"
xmlns:pu="https://opensource.panuon.com/wpf-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 MainBorder}"
- pu:WindowXCaption.Foreground="#FFF"
- pu:WindowXCaption.Buttons="Close"
- pu:WindowXModalDialog.Buttons="OKCancel"
- pu:WindowXModalDialog.CancelButtonContent="鍙栨秷"
- pu:WindowXModalDialog.OKButtonContent="淇濆瓨"
- pu:WindowXModalDialog.ButtonStyle="{StaticResource ModalButton}"
- pu:WindowXModalDialog.ButtonPanelMargin="0,30,10,10">
- <Window.Resources>
- <ResourceDictionary>
- <ResourceDictionary.MergedDictionaries>
- <pu:StyleDictionary Includes="TextBox,ComboBox,Button" />
- <ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
- <ResourceDictionary Source="/HMI.UI;component/Style/Colors.xaml"/>
- <ResourceDictionary Source="/HMI.UI;component/Style/FormStyle.xaml"/>
- <ResourceDictionary Source="/HMI.UI;component/Style/PanuonResource.xaml"/>
- </ResourceDictionary.MergedDictionaries>
- </ResourceDictionary>
- </Window.Resources>
-
+ Style="{StaticResource ModalWindow}">
<Grid Margin="10">
- <StackPanel>
- <pu:FormGroup x:Name="FgCode" Style="{StaticResource RequiredInputFormGroupStyle}"
- Header="瑙掕壊缂栧彿" GroupName="MyFormGroup">
+ <StackPanel x:Name="formPanel">
+ <pu:FormGroup x:Name="FgCode" Style="{StaticResource InputFormGroupStyle}"
+ Header="{DynamicResource HMI.Role.Code}"
+ dp:FormGroupHelper.IsRequired="True"
+ dp:FormGroupHelper.ValidateMethod="ValidateCode"
+ GroupName="MyFormGroup">
<TextBox x:Name="TbCode" Style="{StaticResource EditorTextBoxStyle}" />
</pu:FormGroup>
- <pu:FormGroup x:Name="FgName" Style="{StaticResource RequiredInputFormGroupStyle}"
- Header="瑙掕壊鍚嶇О" GroupName="MyFormGroup">
+ <pu:FormGroup x:Name="FgName" Style="{StaticResource InputFormGroupStyle}"
+ Header="{DynamicResource HMI.Role.Name}"
+ dp:FormGroupHelper.IsRequired="True" GroupName="MyFormGroup">
<TextBox x:Name="TbName" Style="{StaticResource EditorTextBoxStyle}" />
</pu:FormGroup>
<pu:FormGroup x:Name="FgMenu" Orientation="Vertical" Style="{StaticResource RequiredInputFormGroupStyle}"
- Header="鏉冮檺" GroupName="MyFormGroup">
+ Header="{DynamicResource HMI.Role.Permission}" GroupName="MyFormGroup">
<TreeView x:Name="menuTree" Grid.Column="1" Style="{StaticResource DefaultTreeView}"
ItemsSource="{Binding TreeDataSource}">
<TreeView.ItemTemplate>
--
Gitblit v1.9.1