Merge remote-tracking branch 'origin/master'

Views/Configuration/LevelConfigPage.xaml

@@ -170,7 +170,7 @@
             <!--     </DataGrid.RowStyle> -->
             <!-- </DataGrid> -->
             <DataGrid Style="{StaticResource CustomDataGridStyle}"
-                      ItemsSource="{Binding StandardList}" x:Name="DataGrid1">
+                      ItemsSource="{Binding StandardList}" x:Name="DataGrid1" CanUserSortColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False">
                 <!-- 自定义列示例（AutoGenerateColumns=false 时需要手动定义） -->
                 <!-- <DataGrid.Columns> -->
                 <!--     <DataGridTextColumn Header="列一" Binding="{Binding Prop1}" /> -->

Views/Grading/DiamondSelect.xaml

@@ -84,7 +84,7 @@
                                                                 <GradientStop Color="#3c9ce6" Offset="1"/>
                                                             </LinearGradientBrush>
                                                         </Border.Background>
-                                                        <TextBlock Text="开始检测"  Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" FontWeight="Bold" Foreground="#FFFFFF"/>
+                                                        <TextBlock Text="{DynamicResource StartTest}"  Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" FontWeight="Bold" Foreground="#FFFFFF"/>
                                                     </Border>
                                                 </Grid>
                                                 <ControlTemplate.Triggers>