Ver Fonte

改datagrid样式

ltwork há 1 ano atrás
pai
commit
623aec35e0

+ 33 - 9
BlankApp1/BlankApp1/Controls/Resources/DatagridStyle.xaml

@@ -15,23 +15,19 @@
     </Style>
     <Style x:Key="RowHeaderStyle" TargetType="DataGridRowHeader">
         <Setter Property="HorizontalAlignment" Value="Center"/>
-
-
     </Style>
 
     <Style x:Key="MyDataGridCellStyle" TargetType="DataGridCell">
         <!--千万不要写HorizontalAlignment 否则行只会在点击 有字体选择的时候才能选择-->
         <!--<Setter Property="HorizontalAlignment" Value="Center"/>-->
-        <Setter Property="Width" Value="auto"/>
-        <Setter Property="Height" Value="20"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
+
         <Setter Property="Foreground" Value="Black"/>
         <Setter Property="Background" Value="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DataGridRow}}}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="DataGridCell">
-                    <TextBlock TextAlignment="Center" VerticalAlignment="Center" Padding="2">
-                        <ContentPresenter/>
+                    <TextBlock TextAlignment="Center" VerticalAlignment="Center">
+                        <ContentPresenter  />
                     </TextBlock>
                 </ControlTemplate>
             </Setter.Value>
@@ -49,20 +45,48 @@
 
     <Style x:Key="DataGridRowtyle" TargetType="DataGridRow">
         <Setter Property="Height" Value="30"/>
+        <Setter Property="Background" Value="White"/>
         <Style.Triggers>
             <Trigger Property="IsSelected" Value="true">
                 <Setter Property="Background" Value="White"/>
                 <Setter Property="BorderThickness" Value="2"/>
                 <Setter Property="BorderBrush" Value="#409EFF"/>
             </Trigger>
-            <!--隔行换色-->
+            <!--隔行换色--><!--
             <Trigger Property="AlternationIndex" Value="0" >
                 <Setter Property="Background" Value="White" />
             </Trigger>
             <Trigger Property="AlternationIndex" Value="1" >
                 <Setter Property="Background" Value="#dce1f5" />
-            </Trigger>
+            </Trigger>-->
         </Style.Triggers>
     </Style>
+    <Style  x:Key="MyDataGridSyle" TargetType="DataGrid">
+        <Setter Property="ColumnWidth" Value="*"/>
+        <Setter Property="AutoGenerateColumns" Value="False"/>
+        <Setter Property="HeadersVisibility" Value="All"/>
+        <Setter Property="CanUserAddRows" Value="False"/>
+        <Setter Property="SelectionUnit" Value="FullRow"/>
+        <Setter Property="SelectionMode" Value="Single"/>
+        <Setter Property="RowHeaderWidth" Value="0"/>
+        <Setter Property="AlternationCount" Value="2"/>
+        <Setter Property="IsReadOnly" Value="True"/>
+        <Setter Property="HorizontalScrollBarVisibility" Value="Hidden"/>
+        <Setter Property="Padding" Value="0"/>
+        <!--网格线颜色-->
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="HorizontalGridLinesBrush">
+            <Setter.Value>
+                <SolidColorBrush Color="#CBCBCB"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="VerticalGridLinesBrush">
+            <Setter.Value>
+                <SolidColorBrush Color="#CBCBCB"/>
+            </Setter.Value>
+        </Setter>
 
+    </Style>
 </ResourceDictionary>

+ 6 - 6
BlankApp1/BlankApp1/Views/BasicConfigView/AddItemDetailView.xaml

@@ -148,9 +148,9 @@
                                         <TextBlock Text="前置项明细:"   Style="{StaticResource textBlockStyle}" />
                                         <Button  Content="新增" Height="22" Width="60"  Margin="5,0"  Command="{Binding AddDetailCommand}" CommandParameter="Before" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right"  />
                                     </DockPanel>
-                                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
+                                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-    ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" Padding="0" >
+    ItemsSource="{Binding BeforeConList}"  >
                                         <DataGrid.Columns >
                                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -232,9 +232,9 @@ Command="{Binding DataContext.DeleteBeforeCommand, RelativeSource={RelativeSourc
                                         <TextBlock Text="输入项明细:"   Style="{StaticResource textBlockStyle}" />
                                         <Button  Content="新增" Height="22" Width="60"  Margin="5,0"  Command="{Binding AddDetailCommand}" CommandParameter="In" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right"  />
                                     </DockPanel>
-                                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
+                                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-    ItemsSource="{Binding InConList}"  IsReadOnly="True" Padding="0" >
+    ItemsSource="{Binding InConList}"   >
                                         <DataGrid.Columns >
                                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -320,9 +320,9 @@ Command="{Binding DataContext.DeleteInCommand, RelativeSource={RelativeSource Mo
                                         <TextBlock Text="结果项明细:"   Style="{StaticResource textBlockStyle}" />
                                         <Button  Content="新增" Height="22" Width="60"  Margin="5,0"  Command="{Binding AddDetailCommand}" CommandParameter="Out" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right"  />
                                     </DockPanel>
-                                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
+                                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-    ItemsSource="{Binding OutConList}"  IsReadOnly="True" Padding="0" >
+    ItemsSource="{Binding OutConList}"  >
                                         <DataGrid.Columns >
                                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />

+ 9 - 9
BlankApp1/BlankApp1/Views/BasicConfigView/AddSchView.xaml

@@ -150,9 +150,9 @@
                                         <TextBlock Text="前置项明细:"   Style="{StaticResource textBlockStyle}" />
                                         <Button  Content="新增" Height="22" Width="60"  Margin="5,0"  Command="{Binding AddDetailCommand}" CommandParameter="Before" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right"  />
                                     </DockPanel>
-                                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
+                                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-    ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" Padding="0" >
+    ItemsSource="{Binding BeforeConList}" >
                                         <DataGrid.Columns >
                                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -234,9 +234,9 @@ Command="{Binding DataContext.DeleteBeforeCommand, RelativeSource={RelativeSourc
                                         <TextBlock Text="输入项明细:"   Style="{StaticResource textBlockStyle}" />
                                         <Button  Content="新增" Height="22" Width="60"  Margin="5,0"  Command="{Binding AddDetailCommand}" CommandParameter="In" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right"  />
                                     </DockPanel>
-                                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
-  ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-    ItemsSource="{Binding InConList}"  IsReadOnly="True" Padding="0" >
+                                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
+                                    ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
+                                    ItemsSource="{Binding InConList}"  >
                                         <DataGrid.Columns >
                                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -322,9 +322,9 @@ Command="{Binding DataContext.DeleteInCommand, RelativeSource={RelativeSource Mo
                                         <TextBlock Text="结果项明细:"   Style="{StaticResource textBlockStyle}" />
                                         <Button  Content="新增" Height="22" Width="60"  Margin="5,0"  Command="{Binding AddDetailCommand}" CommandParameter="Out" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right"  />
                                     </DockPanel>
-                                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
+                                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-    ItemsSource="{Binding OutConList}"  IsReadOnly="True" Padding="0" >
+    ItemsSource="{Binding OutConList}"   >
                                         <DataGrid.Columns >
                                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -377,9 +377,9 @@ Command="{Binding DataContext.DeleteOutCommand, RelativeSource={RelativeSource M
                             <TextBlock Text="▊"  TextAlignment="Center" VerticalAlignment="Center" Foreground="#409EFF" Margin="5,0,5,0"/>
                             <TextBlock Text="已添加测试项列表"  Style="{StaticResource NormalTextBlockStyle}" Margin="0,0,5,0"/>
                         </StackPanel>
-                        <DataGrid    ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
+                        <DataGrid    Style="{StaticResource MyDataGridSyle}"
  ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2" 
-ItemsSource="{Binding SchProjectList}" IsReadOnly="True" Margin="5" Padding="0" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible" >
+ItemsSource="{Binding SchProjectList}" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible" >
                             <b:Interaction.Triggers>
                                 <b:EventTrigger EventName="SelectionChanged">
                                     <b:InvokeCommandAction Command="{Binding DgSelectChangeCommand}" 

+ 2 - 2
BlankApp1/BlankApp1/Views/BasicConfigView/BaseConfigView.xaml

@@ -66,9 +66,9 @@
                 <!--<Button Content="导出Excel" Width="80"  Margin="5,0"  Command="{Binding ExportCommand}" Style="{StaticResource NormalButtonStyle}" />-->
             </StackPanel>
         </Grid>
-        <DataGrid  Grid.Row="2"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
+        <DataGrid  Grid.Row="2"  Style="{StaticResource MyDataGridSyle}"
                   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-                 ItemsSource="{Binding BaseConfigList}" IsReadOnly="True" Padding="0" HorizontalScrollBarVisibility="Disabled"  >
+                 ItemsSource="{Binding BaseConfigList}"    >
             <DataGrid.Columns >
                 <DataGridTextColumn Header="序号" Width="50" Binding="{Binding SchemeId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="测试方案名称" Binding="{Binding SchemeName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

+ 2 - 2
BlankApp1/BlankApp1/Views/BasicConfigView/CopySchView.xaml

@@ -22,9 +22,9 @@
             <Button  Content="确认" Width="80"  Margin="5,0"  Command="{Binding SureCommand}" Style="{StaticResource NormalButtonStyle}" />
         </StackPanel>
         <Grid Grid.Row="1">
-            <DataGrid  Grid.Row="2"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
+            <DataGrid  Grid.Row="2"  Style="{StaticResource MyDataGridSyle}"
              ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-            ItemsSource="{Binding SchProjectList}" IsReadOnly="True" Margin="5" Padding="0"  >
+            ItemsSource="{Binding SchProjectList}"  >
                
                 <DataGrid.Columns >
                     <DataGridTemplateColumn CanUserResize="False" Width="50">

+ 2 - 2
BlankApp1/BlankApp1/Views/BasicConfigView/DeviceKindView.xaml

@@ -63,9 +63,9 @@
                 <!--<Button Content="导出Excel" Width="80"  Margin="5,0"  Command="{Binding ExportCommand}" Style="{StaticResource NormalButtonStyle}" />-->
             </StackPanel>
         </Grid>
-        <DataGrid  Grid.Row="2"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
+        <DataGrid  Grid.Row="2"  Style="{StaticResource MyDataGridSyle}"
                   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-                 ItemsSource="{Binding DeviceKindItemList}" IsReadOnly="True" Padding="0"  >
+                 ItemsSource="{Binding DeviceKindItemList}" >
             <DataGrid.Columns >
                 <DataGridTextColumn Header="序号" Width="50" Binding="{Binding DeviceKindId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="设备类型编号" Binding="{Binding DeviceKindNo}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

+ 2 - 2
BlankApp1/BlankApp1/Views/BasicConfigView/DeviceView.xaml

@@ -68,9 +68,9 @@
                 <!--<Button Content="导出Excel" Width="80"  Margin="5,0"  Command="{Binding ExportCommand}" Style="{StaticResource NormalButtonStyle}" />-->
             </StackPanel>
         </Grid>
-        <DataGrid  Grid.Row="2"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
+        <DataGrid  Grid.Row="2"  Style="{StaticResource MyDataGridSyle}"
                   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-                 ItemsSource="{Binding DeviceItemList}" IsReadOnly="True" Padding="0"  >
+                 ItemsSource="{Binding DeviceItemList}"  >
             <DataGrid.Columns >
                 <DataGridTextColumn Header="序号" Width="50" Binding="{Binding DeviceId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="设备编号" Binding="{Binding DeviceNo}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

+ 8 - 8
BlankApp1/BlankApp1/Views/BasicConfigView/EditItemDetailView.xaml

@@ -148,9 +148,9 @@
                                         <TextBlock Text="前置项明细:"   Style="{StaticResource textBlockStyle}" />
                                         <Button  Content="新增" Height="22" Width="60"  Margin="5,0"  Command="{Binding AddDetailCommand}" CommandParameter="Before" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right"  />
                                     </DockPanel>
-                                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
+                                <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-    ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" Padding="0" >
+    ItemsSource="{Binding BeforeConList}"   >
                                         <DataGrid.Columns >
                                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -232,9 +232,9 @@ Command="{Binding DataContext.DeleteBeforeCommand, RelativeSource={RelativeSourc
                                         <TextBlock Text="输入项明细:"   Style="{StaticResource textBlockStyle}" />
                                         <Button  Content="新增" Height="22" Width="60"  Margin="5,0"  Command="{Binding AddDetailCommand}" CommandParameter="In" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right"  />
                                     </DockPanel>
-                                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
-  ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-    ItemsSource="{Binding InConList}"  IsReadOnly="True" Padding="0" >
+                                <DataGrid Grid.Row="1" Style="{StaticResource MyDataGridSyle}"
+                                ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
+                                ItemsSource="{Binding InConList}"  >
                                         <DataGrid.Columns >
                                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -320,9 +320,9 @@ Command="{Binding DataContext.DeleteInCommand, RelativeSource={RelativeSource Mo
                                         <TextBlock Text="结果项明细:"   Style="{StaticResource textBlockStyle}" />
                                         <Button  Content="新增" Height="22" Width="60"  Margin="5,0"  Command="{Binding AddDetailCommand}" CommandParameter="Out" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right"  />
                                     </DockPanel>
-                                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
-  ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-    ItemsSource="{Binding OutConList}"  IsReadOnly="True" Padding="0" >
+                                <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
+                                 ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
+                                ItemsSource="{Binding OutConList}"   >
                                         <DataGrid.Columns >
                                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />

+ 2 - 2
BlankApp1/BlankApp1/Views/BasicConfigView/EditSchView.xaml

@@ -107,9 +107,9 @@
                        
                       
                     </DockPanel>
-                    <DataGrid    ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
+                    <DataGrid    Style="{StaticResource MyDataGridSyle}"
  ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2" 
-ItemsSource="{Binding SchProjectList}" IsReadOnly="True" Margin="5" Padding="0" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled">
+ItemsSource="{Binding SchProjectList}" VerticalScrollBarVisibility="Visible" >
                             <b:Interaction.Triggers>
                                 <b:EventTrigger EventName="SelectionChanged">
                                     <b:InvokeCommandAction Command="{Binding DgSelectChangeCommand}" 

+ 3 - 3
BlankApp1/BlankApp1/Views/BasicConfigView/PLCConfigView.xaml

@@ -43,9 +43,9 @@
 
         </UniformGrid>
 
-        <DataGrid Grid.Row="1"   ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
- ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-ItemsSource="{Binding PLCItemList}" IsReadOnly="True"  Padding="0">
+        <DataGrid Grid.Row="1"   Style="{StaticResource MyDataGridSyle}"
+        ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
+        ItemsSource="{Binding PLCItemList}" >
             <DataGrid.Columns >
                 <DataGridTextColumn Header="序号" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="PLC变量编码" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

+ 2 - 2
BlankApp1/BlankApp1/Views/BasicConfigView/ProjectView.xaml

@@ -73,9 +73,9 @@
                 <!--<Button Content="导出Excel" Width="80"  Margin="5,0"  Command="{Binding ExportCommand}" Style="{StaticResource NormalButtonStyle}" />-->
             </StackPanel>
         </Grid>
-        <DataGrid  Grid.Row="2"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
+        <DataGrid  Grid.Row="2" Style="{StaticResource MyDataGridSyle}"
                   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-                 ItemsSource="{Binding ProjectItemList}" IsReadOnly="True" Padding="0"  >
+                 ItemsSource="{Binding ProjectItemList}"   >
             <DataGrid.Columns >
                 <DataGridTextColumn Header="序号" Width="50" Binding="{Binding ProjectId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="项目编号" Binding="{Binding ProjectNo}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

+ 8 - 8
BlankApp1/BlankApp1/Views/BasicConfigView/ReadSchView.xaml

@@ -129,9 +129,9 @@
                         <TextBlock Text="前置项明细:"   Style="{StaticResource textBlockStyle}" />
 
                     </DockPanel>
-                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
+                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
             ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-              ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" Padding="0" >
+              ItemsSource="{Binding BeforeConList}" >
                         <DataGrid.Columns >
                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -195,9 +195,9 @@
                         <TextBlock Text="输入项明细:"   Style="{StaticResource textBlockStyle}" />
 
                     </DockPanel>
-                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
- ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-   ItemsSource="{Binding InConList}"  IsReadOnly="True" Padding="0">
+                    <DataGrid Grid.Row="1" Style="{StaticResource MyDataGridSyle}"
+                    ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
+                    ItemsSource="{Binding InConList}"  >
                         <DataGrid.Columns >
                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -261,9 +261,9 @@
                     <DockPanel LastChildFill="False">
                         <TextBlock Text="输出项明细:"   Style="{StaticResource textBlockStyle}" />
                     </DockPanel>
-                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
- ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-   ItemsSource="{Binding OutConList}"  IsReadOnly="True" Padding="0">
+                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
+                    ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
+                    ItemsSource="{Binding OutConList}"  >
                         <DataGrid.Columns >
 
                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />

+ 9 - 9
BlankApp1/BlankApp1/Views/BusinessManageView/AutoTestView.xaml

@@ -123,9 +123,9 @@
                         <TextBlock Text="前置项明细:"   Style="{StaticResource textBlockStyle}" />
 
                     </DockPanel>
-                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
-           ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-             ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" Padding="0">
+                    <DataGrid Grid.Row="1" Style="{StaticResource MyDataGridSyle}"
+           ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  
+             ItemsSource="{Binding BeforeConList}"  >
                         <DataGrid.Columns >
                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -191,9 +191,9 @@
                         <TextBlock Text="输入项明细:"   Style="{StaticResource textBlockStyle}" />
 
                     </DockPanel>
-                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
-ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-  ItemsSource="{Binding InConList}"  IsReadOnly="True"  Padding="0">
+                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
+ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  
+  ItemsSource="{Binding InConList}"  >
                         <DataGrid.Columns >
                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -259,9 +259,9 @@ ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticRe
                     <DockPanel LastChildFill="False">
                         <TextBlock Text="结果项明细:"   Style="{StaticResource textBlockStyle}" />
                     </DockPanel>
-                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
-ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-  ItemsSource="{Binding OutConList}"  IsReadOnly="True" Padding="0">
+                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
+                    ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  
+                    ItemsSource="{Binding OutConList}" >
                         <DataGrid.Columns >
                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />

+ 5 - 5
BlankApp1/BlankApp1/Views/BusinessManageView/DeviceTestView.xaml

@@ -79,9 +79,9 @@
 
             </StackPanel>
         </Grid>
-        <DataGrid  Grid.Row="3"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
-                  ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-                 ItemsSource="{Binding DeviceItemList}" IsReadOnly="True" Padding="0" HorizontalScrollBarVisibility="Disabled" >
+        <DataGrid  Grid.Row="3"  Style="{StaticResource MyDataGridSyle}"
+                  ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}" 
+                 ItemsSource="{Binding DeviceItemList}"  >
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
                     <b:InvokeCommandAction  Command="{Binding DataContext.DgSelectChangeCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid}}" 
@@ -121,9 +121,9 @@
                 <TextBlock Text="测试方案列表"  Style="{StaticResource NormalTextBlockStyle}" Margin="0,0,5,0"/>
             </StackPanel>
         </StackPanel>
-        <DataGrid  Grid.Row="6"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
+        <DataGrid  Grid.Row="6" Style="{StaticResource MyDataGridSyle}"
            ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-          ItemsSource="{Binding SchItemList}" IsReadOnly="True" Padding="0"  HorizontalScrollBarVisibility="Disabled">
+          ItemsSource="{Binding SchItemList}" >
             <DataGrid.Columns >
                 <DataGridTextColumn Header="序号" Width="50" Binding="{Binding DeviceId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
               

+ 9 - 9
BlankApp1/BlankApp1/Views/BusinessManageView/ManualTestView.xaml

@@ -130,9 +130,9 @@
                         <TextBlock Text="前置项明细:"   Style="{StaticResource textBlockStyle}" />
 
                     </DockPanel>
-                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
-            ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-              ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" Padding="0" >
+                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
+            ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  
+              ItemsSource="{Binding BeforeConList}"   >
                         <DataGrid.Columns >
                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -199,9 +199,9 @@
                         <TextBlock Text="输入项明细:"   Style="{StaticResource textBlockStyle}" />
 
                     </DockPanel>
-                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
- ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-   ItemsSource="{Binding InConList}"  IsReadOnly="True" Padding="0">
+                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
+                    ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
+                     ItemsSource="{Binding InConList}"  >
                         <DataGrid.Columns >
                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -268,9 +268,9 @@
                     <DockPanel LastChildFill="False">
                         <TextBlock Text="输出项明细:"   Style="{StaticResource textBlockStyle}" />
                     </DockPanel>
-                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
- ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-   ItemsSource="{Binding OutConList}"  IsReadOnly="True" Padding="0">
+                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
+                    ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
+                    ItemsSource="{Binding OutConList}"  >
                         <DataGrid.Columns >
 
                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />

+ 6 - 6
BlankApp1/BlankApp1/Views/BusinessManageView/ResultQueryView.xaml

@@ -79,9 +79,9 @@
                 
             </StackPanel>
         </Grid>
-        <DataGrid  Grid.Row="3"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
-       ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-      ItemsSource="{Binding DeviceResultItemList}" IsReadOnly="True" Padding="0" HorizontalScrollBarVisibility="Disabled" >
+        <DataGrid  Grid.Row="3"  Style="{StaticResource MyDataGridSyle}"
+       ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  
+      ItemsSource="{Binding DeviceResultItemList}" >
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
                     <b:InvokeCommandAction  Command="{Binding DataContext.DgSelectChangeCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid}}" 
@@ -121,9 +121,9 @@
             </StackPanel>
         </StackPanel>
         <Grid Grid.Row="6">
-            <DataGrid  Grid.Row="2"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
- ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-ItemsSource="{Binding SchItemResultList}" IsReadOnly="True" Padding="0"  HorizontalScrollBarVisibility="Disabled">
+            <DataGrid  Grid.Row="2"  Style="{StaticResource MyDataGridSyle}"
+            ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
+            ItemsSource="{Binding SchItemResultList}" >
                 <DataGrid.Columns >
                     <DataGridTextColumn Header="设备编号" Binding="{Binding DeviceNo}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                     <DataGridTextColumn Header="设备名称" Binding="{Binding DeviceName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

+ 9 - 9
BlankApp1/BlankApp1/Views/BusinessManageView/RetryTestView.xaml

@@ -130,9 +130,9 @@
                         <TextBlock Text="前置项明细:"   Style="{StaticResource textBlockStyle}" />
 
                     </DockPanel>
-                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
-            ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-              ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" Padding="0" >
+                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
+                ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
+              ItemsSource="{Binding BeforeConList}"   >
                         <DataGrid.Columns >
                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -199,9 +199,9 @@
                         <TextBlock Text="输入项明细:"   Style="{StaticResource textBlockStyle}" />
 
                     </DockPanel>
-                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
- ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-   ItemsSource="{Binding InConList}"  IsReadOnly="True" Padding="0">
+                    <DataGrid Grid.Row="1"  Style="{StaticResource MyDataGridSyle}"
+                    ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
+                    ItemsSource="{Binding InConList}"  >
                         <DataGrid.Columns >
                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                             <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -268,9 +268,9 @@
                     <DockPanel LastChildFill="False">
                         <TextBlock Text="输出项明细:"   Style="{StaticResource textBlockStyle}" />
                     </DockPanel>
-                    <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
- ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-   ItemsSource="{Binding OutConList}"  IsReadOnly="True" Padding="0">
+                    <DataGrid Grid.Row="1" Style="{StaticResource MyDataGridSyle}"
+                    ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  
+                     ItemsSource="{Binding OutConList}" >
                         <DataGrid.Columns >
 
                             <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />

+ 3 - 3
BlankApp1/BlankApp1/Views/MonitorManageView/PLCReadView.xaml

@@ -13,9 +13,9 @@
                 <b:InvokeCommandAction Command="{Binding OnLoadCommand}"/>
             </b:EventTrigger>
         </b:Interaction.Triggers>
-        <DataGrid   ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
-        ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-       ItemsSource="{Binding PLCItemList}" IsReadOnly="True"  Padding="0">
+        <DataGrid   Style="{StaticResource MyDataGridSyle}"
+        ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  
+        ItemsSource="{Binding PLCItemList}" >
             <DataGrid.Columns >
                 <DataGridTextColumn Header="序号" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="PLC变量编码" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

+ 3 - 3
BlankApp1/BlankApp1/Views/MonitorManageView/PLCWriteView.xaml

@@ -13,9 +13,9 @@
                 <b:InvokeCommandAction Command="{Binding OnLoadCommand}"/>
             </b:EventTrigger>
         </b:Interaction.Triggers>
-        <DataGrid   ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
-   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-  ItemsSource="{Binding PLCItemList}" IsReadOnly="True"  HorizontalScrollBarVisibility="Hidden" Padding="0" >
+        <DataGrid  Style="{StaticResource MyDataGridSyle}" 
+    ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
+    ItemsSource="{Binding PLCItemList}"    >
             <DataGrid.Columns >
                 <DataGridTextColumn Header="序号" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="PLC变量编码" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

+ 2 - 3
BlankApp1/BlankApp1/Views/StatisticsView.xaml

@@ -68,9 +68,8 @@
             </UniformGrid>
         </Grid>
         <Grid Grid.Row="1" Margin="5">
-            <DataGrid   ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
-            ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-            ItemsSource="{Binding DeviceResultItemList}" IsReadOnly="True" Padding="0"  >
+            <DataGrid    Style="{StaticResource MyDataGridSyle}" ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  
+                ItemsSource="{Binding DeviceResultItemList}"    >
                 <DataGrid.Columns >
                    
                     <DataGridTextColumn Header="设备编号" Binding="{Binding DeviceNo}" CellStyle="{StaticResource MyDataGridCellStyle}"/>