Explorar o código

fix bug :禅道489

jiangjy hai 1 mes
pai
achega
b792f5a7eb

+ 3 - 2
Furnace/FurnaceUI/Views/Scheduled/ScheduledMaintenanceMonitorView.xaml

@@ -19,7 +19,6 @@
     <UserControl.Resources>
         <converterTime:SecondsToHourMinConverter x:Key="SecondsToHourMinConverter" />
         <converter:IsCheckShowStringConverter x:Key="isCheckShowStringConverter" />
-        <Style BasedOn="{StaticResource ExOnlyVerticalScrollBar}" TargetType="ScrollBar" />
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -522,7 +521,9 @@ Text="{Binding DataContext.EditModel.StartValue, Mode=TwoWay, RelativeSource={Re
 Grid.Column="1"
 Height="40"
 Margin="5,0"
-FontSize="20" ItemsSource="{Binding MaintenanceProcessingList}"  SelectedItem="{Binding EditModel.MaintenanceProcessing, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+FontSize="20" ItemsSource="{Binding MaintenanceProcessingList}"  SelectedItem="{Binding EditModel.MaintenanceProcessing, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" >
+                
+                </ComboBox>
                 <Button Grid.Row="1" Grid.Column="2" Visibility="{Binding JobAutoStartCommandVisibility,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource bool2VisibilityConverter}}"   Grid.ColumnSpan="2" Width="auto" Content="{Binding EditModel.AssociationProcessRecipeName,UpdateSourceTrigger=PropertyChanged}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Click">

+ 5 - 4
Furnace/FurnaceUI/Views/Scheduled/ScheduledMaitView.xaml

@@ -251,10 +251,11 @@
                         <GridViewColumn Width="100">
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
-                                    <Button
-                                        Width="88"
-                                        Height="50"
-                                        Content="{Binding Unit, Mode=TwoWay}" />
+                                    <TextBlock
+    Width="140"
+    HorizontalAlignment="Center"
+    Text="{Binding Unit, Mode=TwoWay}"
+    TextBlock.TextAlignment="Center" />
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
                             <GridViewColumn.Header>