180临时更新

FryPot_DosingSystem/View/UserManageView.xaml

@@ -15,7 +15,9 @@
         <Style x:Key="dgCell" TargetType="TextBlock">
             <Setter Property="HorizontalAlignment" Value="Center"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="Background" Value="Transparent"/>
         </Style>
+        
         <Style x:Key="btnStyle" TargetType="Button">
             <Setter Property="Width" Value="auto"/>
             <Setter Property="FontSize" Value="16"/>
@@ -23,6 +25,20 @@
             <Setter Property="Background" Value="Transparent"/>
             <Setter Property="BorderBrush" Value="SkyBlue"/>
         </Style>
+        <Style x:Key="textboxStyle" TargetType="TextBox">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Foreground" Value="SkyBlue"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="FontSize" Value="16"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="CaretBrush" Value="LightBlue"/>
+            <Style.Triggers>
+                <Trigger Property="IsFocused" Value="True">
+                    <Setter Property="Cursor" Value="Arrow"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
         <Style TargetType="DataGrid" x:Key="dataGrid">
             <!--网格线颜色-->
             <Setter Property="CanUserResizeColumns" Value="false"/>
@@ -80,6 +96,7 @@
                     <Setter Property="Foreground"
  Value="SkyBlue"/>
                 </Trigger>
+               
             </Style.Triggers>
         </Style>
 
@@ -306,25 +323,52 @@
                       IsReadOnly="False" Style="{StaticResource dataGrid }"
                       ColumnHeaderStyle="{StaticResource columsHeader}" RowStyle="{StaticResource rowStyle}" CellStyle="{StaticResource cellStyle}">
                 <DataGrid.Columns>
+                    <DataGridTemplateColumn Width="0.2*">
 
-                    <DataGridTextColumn FontSize="16" IsReadOnly="false" Width="0.2*"  Binding="{Binding UserName}" ElementStyle="{StaticResource dgCell}">
+                        <DataGridTemplateColumn.Header>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" >
+                                <TextBlock FontFamily="../Resources/fonts/#iconfont" Foreground="Orange" Text="&#xe6a0;" FontSize="24" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                                <TextBlock Text="Account" />
+                            </StackPanel>
+                        </DataGridTemplateColumn.Header>
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBox Text="{Binding UserName}"  Style="{StaticResource textboxStyle}"></TextBox>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <!--<DataGridTextColumn FontSize="16" IsReadOnly="false" Width="0.2*"  Binding="{Binding UserName}" ElementStyle="{StaticResource dgCell}">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                 <TextBlock FontFamily="../Resources/fonts/#iconfont" Foreground="Orange" Text="&#xe6a0;" FontSize="24" VerticalAlignment="Center" Margin="0,0,8,0"/>
                                 <TextBlock Text="Account" />
                             </StackPanel>
                         </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn  FontSize="16" IsReadOnly="False" Width="0.2*" Binding="{Binding Password}" ElementStyle="{StaticResource dgCell}" >
+                       
+                    </DataGridTextColumn>-->
+                    <DataGridTemplateColumn Width="0.2*">
+
+                        <DataGridTemplateColumn.Header>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" >
+                                <TextBlock FontFamily="../Resources/fonts/#iconfont" Foreground="Orange" Text="&#xe62b;" FontSize="24" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                                <TextBlock Text="Account" />
+                            </StackPanel>
+                        </DataGridTemplateColumn.Header>
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBox Text="{Binding Password}"  Style="{StaticResource textboxStyle}"></TextBox>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <!--<DataGridTextColumn  FontSize="16" IsReadOnly="False" Width="0.2*" Binding="{Binding Password}" ElementStyle="{StaticResource dgCell}" >
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                 <TextBlock FontFamily="../Resources/fonts/#iconfont" Foreground="Orange" Text="&#xe62b;" VerticalAlignment="Center" Margin="0,0,8,0"/>
                                 <TextBlock Text="Password"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
+                    </DataGridTextColumn>-->
                     <DataGridTemplateColumn Width="0.2*">
-
                         <DataGridTemplateColumn.Header>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                 <TextBlock FontFamily="../Resources/fonts/#iconfont" Foreground="Orange" Text="&#xe62c;" VerticalAlignment="Center" Margin="0,0,8,0"/>