From a061384ba628a09bf4df91f50321ab22c03129aa Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 18 三月 2025 20:58:36 +0800
Subject: [PATCH] Winform支持遮罩层；

---
 HMI.AlermInfoManage/AlarmSettingList.xaml |   63 +++++++++++++++----------------
 1 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/HMI.AlermInfoManage/AlarmSettingList.xaml b/HMI.AlermInfoManage/AlarmSettingList.xaml
index fcc2bf0..75fc864 100644
--- a/HMI.AlermInfoManage/AlarmSettingList.xaml
+++ b/HMI.AlermInfoManage/AlarmSettingList.xaml
@@ -11,29 +11,11 @@
             mc:Ignorable="d"
             Title="{Binding SelectedValue,Mode=OneWay}"
             SizeToContent="Height"
+            pu:WindowXModalDialog.Buttons="OK"
+            pu:WindowXModalDialog.OKButtonContent="{DynamicResource App.Close}"
             Width="800"
             Height="600"
-            BorderBrush="#3E3E45"
-            BorderThickness="1"
-            Foreground="Black"
-            pu:WindowXCaption.Background="{StaticResource PrimaryColor}"
-            pu:WindowXModalDialog.ButtonStyle="{StaticResource ModalButton}"
-            pu:WindowXCaption.Foreground="#FFF"
-            pu:WindowXModalDialog.Buttons="OK"
-            pu:WindowXModalDialog.OKButtonContent="鍏抽棴"
-            Loaded="WindowX_Loaded"
-            WindowStartupLocation="CenterScreen"
-            pu:WindowXModalDialog.ButtonPanelMargin="0,30,10,10">
-    <Window.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <pu:StyleDictionary Includes="TabControl"/>
-                <ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
-                <ResourceDictionary Source="/HMI.UI;component/Style/Colors.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Window.Resources>
-
+            Style="{StaticResource ModalWindow}">
     <Grid Margin="10">
         <Border BorderThickness="1" BorderBrush="Gray">
             <Grid>
@@ -43,7 +25,7 @@
                     <RowDefinition />
                 </Grid.RowDefinitions>
 
-                <ListBox ItemsSource="{Binding Items}" SelectedValue="{Binding SelectedValue}" BorderThickness="0">
+                <ListBox ItemsSource="{Binding Items}" SelectedIndex="{Binding ItemIndex}" BorderThickness="0">
                     <ListBox.ItemsPanel>
                         <ItemsPanelTemplate>
                             <StackPanel Orientation="Horizontal"/>
@@ -81,9 +63,9 @@
                 <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" 
                             Margin="0,0,0,10"
                                     dp:StackPanelHelper.ChildSpace="10">
-                    <Button Style="{StaticResource PrimaryButton}" pu:ButtonHelper.Icon="&#xe631;" x:Name="refreshBtn" Click="Button_Click">鍒锋柊</Button>
-                    <Button Style="{StaticResource PrimaryButton}" pu:ButtonHelper.Icon="&#xe631;" x:Name="addBtn" Click="Button_Click">鏂板</Button>
-                    <Button Style="{StaticResource DangerButton}" pu:ButtonHelper.Icon="&#xe631;" x:Name="delBatchBtn" Click="Button_Click">鍒犻櫎</Button>
+                    <Button Style="{StaticResource AddBtn}" x:Name="addBtn" Click="Button_Click"/>
+                    <Button Style="{StaticResource RfhBtn}" x:Name="refreshBtn" Click="Button_Click"/>
+                    <Button Style="{StaticResource DelBtn}" x:Name="delBatchBtn" Click="Button_Click"/>
                 </StackPanel>
 
                 <DataGrid x:Name="table" Grid.Row="2"
@@ -105,22 +87,37 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTextColumn Width="*" Binding="{Binding DBAddress}" Header="DB鍦板潃" />
-                        <DataGridTextColumn Width="*" Binding="{Binding StartAddress}" Header="璧峰鍦板潃" />
-                        <DataGridTextColumn Width="*" Binding="{Binding Length}" Header="DB闀垮害" />
-                        <DataGridTemplateColumn Header="鎿嶄綔" Width="100" IsReadOnly="True" CanUserResize="False">
+                        <DataGridTextColumn Width="*" Binding="{Binding DBAddress}">
+                            <DataGridTextColumn.Header>
+                                <TextBlock Text="{DynamicResource Alm.DbAddress}"/>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Width="*" Binding="{Binding StartAddress}">
+                            <DataGridTextColumn.Header>
+                                <TextBlock Text="{DynamicResource Alm.StartAddress}"/>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Width="*" Binding="{Binding Length}">
+                            <DataGridTextColumn.Header>
+                                <TextBlock Text="{DynamicResource Alm.DbLength}"/>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTemplateColumn Width="100" IsReadOnly="True" CanUserResize="False">
+                            <DataGridTemplateColumn.Header>
+                                <TextBlock Text="{DynamicResource App.Opt}"/>
+                            </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
                                         <Button x:Name="editBtn" Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}" 
-                                                Style="{StaticResource RowLink}" 
+                                                Style="{StaticResource EditLink}" 
         Margin="0,0,10,0" 
         Click="Button_Click"
-        DataContext="{Binding }">缂栬緫</Button>
+        DataContext="{Binding }"/>
                                         <Button x:Name="delBtn" Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}" 
-                                                Style="{StaticResource DangerLinkButton}" 
+                                                Style="{StaticResource DeleteLink}" 
         DataContext="{Binding }"
-        Click="Button_Click">鍒犻櫎</Button>
+        Click="Button_Click"/>
                                     </StackPanel>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>

--
Gitblit v1.9.1