Bladeren bron

类型区分 弹窗调整为单位区分

git-svn-id: http://10.4.3.168:50001/svn/Furnace@136 dbcde07d-dcf5-c148-8a84-ac3097b7778e
Jiangjinyuan 1 maand geleden
bovenliggende
commit
e48db374b6

+ 44 - 145
Furnace/FurnaceUI/Views/Scheduled/ScheduledMaintenanceMonitorView.xaml

@@ -252,33 +252,6 @@
                     HorizontalAlignment="Right"
                     VerticalAlignment="Center"
                     Text="Current Value" />
-                <!--<TextBox
-                    Grid.Column="1"
-                    Margin="5,0"
-                    FontSize="20"
-                    IsEnabled="{Binding IsEnable}"
-                      Tag="None"
-
-                    >
-                    <TextBox.Style>
-                        <Style TargetType="TextBox">
-                            <Setter Property="Text" Value="{Binding EditModel.CurrentValue}"/>
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding EditModel.Path}" Value="Reactor.StepRunTime">
-                                    <Setter Property="Text" Value="{Binding EditModel.CurrentValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged,Converter={StaticResource SecondsToHourMinConverter}}"/>
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </TextBox.Style>
-                    <i:Interaction.Triggers>
-                        <i:EventTrigger EventName="PreviewMouseUp">
-                            <cal:ActionMessage MethodName="SetCurrentValue">
-                                <cal:Parameter Value="{Binding}"/>
-                                <cal:Parameter Value="$eventargs"/>
-                            </cal:ActionMessage>
-                        </i:EventTrigger>
-                    </i:Interaction.Triggers>
-                </TextBox>-->
                 <StackPanel   Grid.Column="1" Margin="5,0"  IsEnabled="{Binding IsEnable}">
                     <ContentControl>
                         <ContentControl.Resources>
@@ -288,29 +261,9 @@
 Text="{Binding DataContext.EditModel.CurrentValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"  IsEnabled="{Binding IsEnable}" Tag="Number" >
                                 </TextBox>
                             </DataTemplate>
-                            <DataTemplate x:Key="ReactorGroupDataTemplate">
-                                <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-Text="{Binding DataContext.EditModel.CurrentValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"  IsEnabled="{Binding IsEnable}" Tag="Number" >
-                                </TextBox>
-                            </DataTemplate>
-                            <DataTemplate x:Key="ReactorRecipeDataTemplate">
-                                <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-Text="{Binding DataContext.EditModel.CurrentValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"  IsEnabled="{Binding IsEnable}" Tag="Number" >
-                                </TextBox>
-                            </DataTemplate>
-                            <DataTemplate x:Key="ReactorStepRunDataTemplate">
+                            <DataTemplate x:Key="TimeDataTemplate">
                                 <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-Text="{Binding DataContext.EditModel.CurrentValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"  IsEnabled="{Binding IsEnable}" Tag="Number" >
-                                </TextBox>
-                            </DataTemplate>
-                            <DataTemplate x:Key="ReactorStepThicknessDataTemplate">
-                                <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-Text="{Binding DataContext.EditModel.CurrentValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"  IsEnabled="{Binding IsEnable}" Tag="Number" >
-                                </TextBox>
-                            </DataTemplate>
-                            <DataTemplate x:Key="ReactorStepRunTimeDataTemplate">
-                                <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-     Text="{Binding DataContext.EditModel.CurrentValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged,Converter={StaticResource SecondsToHourMinConverter}}"  IsEnabled="{Binding IsEnable}" Tag="None" >
+Text="{Binding DataContext.EditModel.CurrentValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged,Converter={StaticResource SecondsToHourMinConverter}}"  IsEnabled="{Binding IsEnable}" Tag="None" >
                                     <i:Interaction.Triggers>
                                         <i:EventTrigger EventName="PreviewMouseUp">
                                             <cal:ActionMessage MethodName="TimeSelect">
@@ -319,51 +272,47 @@ Text="{Binding DataContext.EditModel.CurrentValue, Mode=TwoWay, RelativeSource={
                                             </cal:ActionMessage>
                                         </i:EventTrigger>
                                     </i:Interaction.Triggers>
-                                </TextBox>
+                                </TextBox>
                             </DataTemplate>
                         </ContentControl.Resources>
                         <ContentControl.Style>
                             <Style TargetType="ContentControl">
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.CarrierWafer}">
-                                        <Setter Property="ContentTemplate" Value="{StaticResource CommonDataTemplate}" />
-                                    </DataTrigger>
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.Reactor}" />
-                                            <Condition Binding="{Binding EditModel.ReactorsType}" Value="{x:Static enumData:ReactorsEnum.Recipe}" />
+                                            <Condition Binding="{Binding EditModel.Unit}" Value="h:m:s" />
                                         </MultiDataTrigger.Conditions>
                                         <MultiDataTrigger.Setters>
-                                            <Setter Property="ContentTemplate" Value="{StaticResource ReactorRecipeDataTemplate}" />
+                                            <Setter Property="ContentTemplate" Value="{StaticResource TimeDataTemplate}" />
                                         </MultiDataTrigger.Setters>
                                     </MultiDataTrigger>
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.Reactor}" />
-                                            <Condition Binding="{Binding EditModel.ReactorsType}" Value="{x:Static enumData:ReactorsEnum.StepRunTime}" />
+                                            <Condition Binding="{Binding EditModel.Unit}" Value="Å" />
                                         </MultiDataTrigger.Conditions>
                                         <MultiDataTrigger.Setters>
-                                            <Setter Property="ContentTemplate" Value="{StaticResource ReactorStepRunTimeDataTemplate}" />
+                                            <Setter Property="ContentTemplate" Value="{StaticResource CommonDataTemplate}" />
                                         </MultiDataTrigger.Setters>
                                     </MultiDataTrigger>
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.Reactor}" />
-                                            <Condition Binding="{Binding EditModel.ReactorsType}" Value="{x:Static enumData:ReactorsEnum.StepRunFreq}" />
+                                            <Condition Binding="{Binding EditModel.Unit}" Value="Sheets" />
                                         </MultiDataTrigger.Conditions>
                                         <MultiDataTrigger.Setters>
-                                            <Setter Property="ContentTemplate" Value="{StaticResource ReactorStepRunDataTemplate}" />
+                                            <Setter Property="ContentTemplate" Value="{StaticResource CommonDataTemplate}" />
                                         </MultiDataTrigger.Setters>
                                     </MultiDataTrigger>
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.Reactor}" />
-                                            <Condition Binding="{Binding EditModel.ReactorsType}" Value="{x:Static enumData:ReactorsEnum.StepThickness}" />
+                                            <Condition Binding="{Binding EditModel.Unit}" Value="Times" />
                                         </MultiDataTrigger.Conditions>
                                         <MultiDataTrigger.Setters>
-                                            <Setter Property="ContentTemplate" Value="{StaticResource ReactorStepThicknessDataTemplate}" />
+                                            <Setter Property="ContentTemplate" Value="{StaticResource CommonDataTemplate}" />
                                         </MultiDataTrigger.Setters>
                                     </MultiDataTrigger>
+
+
+
                                 </Style.Triggers>
                             </Style>
                         </ContentControl.Style>
@@ -511,83 +460,58 @@ Text="{Binding DataContext.EditModel.CurrentValue, Mode=TwoWay, RelativeSource={
 Text="{Binding DataContext.EditModel.StartValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"  IsEnabled="{Binding IsEnable}" Tag="Number" >
                                 </TextBox>
                             </DataTemplate>
-                            <DataTemplate x:Key="ReactorGroupDataTemplate">
-                                <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-Text="{Binding DataContext.EditModel.StartValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"   Tag="Number" >
-                                </TextBox>
-                            </DataTemplate>
-                            <DataTemplate x:Key="ReactorRecipeDataTemplate">
-                                <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-Text="{Binding DataContext.EditModel.StartValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"  Tag="Number" >
-                                </TextBox>
-                            </DataTemplate>
-                            <DataTemplate x:Key="ReactorStepRunDataTemplate">
-                                <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-Text="{Binding DataContext.EditModel.StartValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"   Tag="Number" >
-                                </TextBox>
-                            </DataTemplate>
-                            <DataTemplate x:Key="ReactorStepThicknessDataTemplate">
+                            <DataTemplate x:Key="TimeDataTemplate">
                                 <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-Text="{Binding DataContext.EditModel.StartValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"  Tag="Number" >
-                                </TextBox>
-                            </DataTemplate>
-                            <DataTemplate x:Key="ReactorStepRunTimeDataTemplate">
-                                <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-     Text="{Binding DataContext.EditModel.StartValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged,Converter={StaticResource SecondsToHourMinConverter}}"   Tag="None" >
+Text="{Binding DataContext.EditModel.StartValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged,Converter={StaticResource SecondsToHourMinConverter}}"  IsEnabled="{Binding IsEnable}" Tag="None" >
                                     <i:Interaction.Triggers>
                                         <i:EventTrigger EventName="PreviewMouseUp">
                                             <cal:ActionMessage MethodName="TimeSelect">
                                                 <cal:Parameter Value="StepTime"></cal:Parameter>
-                                                <cal:Parameter Value="StartValue"></cal:Parameter>
+                                                <cal:Parameter Value="CurrentValue"></cal:Parameter>
                                             </cal:ActionMessage>
                                         </i:EventTrigger>
                                     </i:Interaction.Triggers>
-                                </TextBox>
+                                </TextBox>
                             </DataTemplate>
                         </ContentControl.Resources>
                         <ContentControl.Style>
                             <Style TargetType="ContentControl">
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.CarrierWafer}">
-                                        <Setter Property="ContentTemplate" Value="{StaticResource CommonDataTemplate}" />
-                                    </DataTrigger>
-
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.Reactor}" />
-                                            <Condition Binding="{Binding EditModel.ReactorsType}" Value="{x:Static enumData:ReactorsEnum.Recipe}" />
+                                            <Condition Binding="{Binding EditModel.Unit}" Value="h:m:s" />
                                         </MultiDataTrigger.Conditions>
                                         <MultiDataTrigger.Setters>
-                                            <Setter Property="ContentTemplate" Value="{StaticResource ReactorRecipeDataTemplate}" />
+                                            <Setter Property="ContentTemplate" Value="{StaticResource TimeDataTemplate}" />
                                         </MultiDataTrigger.Setters>
                                     </MultiDataTrigger>
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.Reactor}" />
-                                            <Condition Binding="{Binding EditModel.ReactorsType}" Value="{x:Static enumData:ReactorsEnum.StepRunTime}" />
+                                            <Condition Binding="{Binding EditModel.Unit}" Value="Å" />
                                         </MultiDataTrigger.Conditions>
                                         <MultiDataTrigger.Setters>
-                                            <Setter Property="ContentTemplate" Value="{StaticResource ReactorStepRunTimeDataTemplate}" />
+                                            <Setter Property="ContentTemplate" Value="{StaticResource CommonDataTemplate}" />
                                         </MultiDataTrigger.Setters>
                                     </MultiDataTrigger>
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.Reactor}" />
-                                            <Condition Binding="{Binding EditModel.ReactorsType}" Value="{x:Static enumData:ReactorsEnum.StepRunFreq}" />
+                                            <Condition Binding="{Binding EditModel.Unit}" Value="Sheets" />
                                         </MultiDataTrigger.Conditions>
                                         <MultiDataTrigger.Setters>
-                                            <Setter Property="ContentTemplate" Value="{StaticResource ReactorStepRunDataTemplate}" />
+                                            <Setter Property="ContentTemplate" Value="{StaticResource CommonDataTemplate}" />
                                         </MultiDataTrigger.Setters>
                                     </MultiDataTrigger>
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.Reactor}" />
-                                            <Condition Binding="{Binding EditModel.ReactorsType}" Value="{x:Static enumData:ReactorsEnum.StepThickness}" />
+                                            <Condition Binding="{Binding EditModel.Unit}" Value="Times" />
                                         </MultiDataTrigger.Conditions>
                                         <MultiDataTrigger.Setters>
-                                            <Setter Property="ContentTemplate" Value="{StaticResource ReactorStepThicknessDataTemplate}" />
+                                            <Setter Property="ContentTemplate" Value="{StaticResource CommonDataTemplate}" />
                                         </MultiDataTrigger.Setters>
                                     </MultiDataTrigger>
+
+
+
                                 </Style.Triggers>
                             </Style>
                         </ContentControl.Style>
@@ -665,83 +589,58 @@ FontSize="20" ItemsSource="{Binding MaintenanceProcessingList}"  SelectedItem="{
 Text="{Binding DataContext.EditModel.LimitValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"  IsEnabled="{Binding IsEnable}" Tag="Number" >
                                 </TextBox>
                             </DataTemplate>
-                            <DataTemplate x:Key="ReactorGroupDataTemplate">
-                                <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-Text="{Binding DataContext.EditModel.LimitValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"   Tag="Number" >
-                                </TextBox>
-                            </DataTemplate>
-                            <DataTemplate x:Key="ReactorRecipeDataTemplate">
-                                <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-Text="{Binding DataContext.EditModel.LimitValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"  Tag="Number" >
-                                </TextBox>
-                            </DataTemplate>
-                            <DataTemplate x:Key="ReactorStepRunDataTemplate">
+                            <DataTemplate x:Key="TimeDataTemplate">
                                 <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-Text="{Binding DataContext.EditModel.LimitValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"   Tag="Number" >
-                                </TextBox>
-                            </DataTemplate>
-                            <DataTemplate x:Key="ReactorStepThicknessDataTemplate">
-                                <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-Text="{Binding DataContext.EditModel.LimitValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"  Tag="Number" >
-                                </TextBox>
-                            </DataTemplate>
-                            <DataTemplate x:Key="ReactorStepRunTimeDataTemplate">
-                                <TextBox Grid.Column="1"  Margin="5,0" FontSize="20"  Height="40"
-     Text="{Binding DataContext.EditModel.LimitValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged,Converter={StaticResource SecondsToHourMinConverter}}"   Tag="None" >
+Text="{Binding DataContext.EditModel.LimitValue, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged,Converter={StaticResource SecondsToHourMinConverter}}"  IsEnabled="{Binding IsEnable}" Tag="None" >
                                     <i:Interaction.Triggers>
                                         <i:EventTrigger EventName="PreviewMouseUp">
                                             <cal:ActionMessage MethodName="TimeSelect">
                                                 <cal:Parameter Value="StepTime"></cal:Parameter>
-                                                <cal:Parameter Value="LimitValue"></cal:Parameter>
+                                                <cal:Parameter Value="CurrentValue"></cal:Parameter>
                                             </cal:ActionMessage>
                                         </i:EventTrigger>
                                     </i:Interaction.Triggers>
-                                </TextBox>
+                                </TextBox>
                             </DataTemplate>
                         </ContentControl.Resources>
                         <ContentControl.Style>
                             <Style TargetType="ContentControl">
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.CarrierWafer}">
-                                        <Setter Property="ContentTemplate" Value="{StaticResource CommonDataTemplate}" />
-                                    </DataTrigger>
-
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.Reactor}" />
-                                            <Condition Binding="{Binding EditModel.ReactorsType}" Value="{x:Static enumData:ReactorsEnum.Recipe}" />
+                                            <Condition Binding="{Binding EditModel.Unit}" Value="h:m:s" />
                                         </MultiDataTrigger.Conditions>
                                         <MultiDataTrigger.Setters>
-                                            <Setter Property="ContentTemplate" Value="{StaticResource ReactorRecipeDataTemplate}" />
+                                            <Setter Property="ContentTemplate" Value="{StaticResource TimeDataTemplate}" />
                                         </MultiDataTrigger.Setters>
                                     </MultiDataTrigger>
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.Reactor}" />
-                                            <Condition Binding="{Binding EditModel.ReactorsType}" Value="{x:Static enumData:ReactorsEnum.StepRunTime}" />
+                                            <Condition Binding="{Binding EditModel.Unit}" Value="Å" />
                                         </MultiDataTrigger.Conditions>
                                         <MultiDataTrigger.Setters>
-                                            <Setter Property="ContentTemplate" Value="{StaticResource ReactorStepRunTimeDataTemplate}" />
+                                            <Setter Property="ContentTemplate" Value="{StaticResource CommonDataTemplate}" />
                                         </MultiDataTrigger.Setters>
                                     </MultiDataTrigger>
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.Reactor}" />
-                                            <Condition Binding="{Binding EditModel.ReactorsType}" Value="{x:Static enumData:ReactorsEnum.StepRunFreq}" />
+                                            <Condition Binding="{Binding EditModel.Unit}" Value="Sheets" />
                                         </MultiDataTrigger.Conditions>
                                         <MultiDataTrigger.Setters>
-                                            <Setter Property="ContentTemplate" Value="{StaticResource ReactorStepRunDataTemplate}" />
+                                            <Setter Property="ContentTemplate" Value="{StaticResource CommonDataTemplate}" />
                                         </MultiDataTrigger.Setters>
                                     </MultiDataTrigger>
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding EditModel.DataItemType}" Value="{x:Static enumData:DataItemEnum.Reactor}" />
-                                            <Condition Binding="{Binding EditModel.ReactorsType}" Value="{x:Static enumData:ReactorsEnum.StepThickness}" />
+                                            <Condition Binding="{Binding EditModel.Unit}" Value="Times" />
                                         </MultiDataTrigger.Conditions>
                                         <MultiDataTrigger.Setters>
-                                            <Setter Property="ContentTemplate" Value="{StaticResource ReactorStepThicknessDataTemplate}" />
+                                            <Setter Property="ContentTemplate" Value="{StaticResource CommonDataTemplate}" />
                                         </MultiDataTrigger.Setters>
                                     </MultiDataTrigger>
+
+
+
                                 </Style.Triggers>
                             </Style>
                         </ContentControl.Style>

+ 18 - 19
Furnace/FurnaceUI/Views/Scheduled/ScheduledMaitView.xaml

@@ -171,22 +171,20 @@
                         <GridViewColumn Width="100">
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
-                                    <StackPanel>
-                                        <TextBlock  Width="132"   Margin="4"   HorizontalAlignment="Center"   TextBlock.TextAlignment="Center" >
-                                            <TextBlock.Style>
-                                                <Style TargetType="TextBlock">
-                                                    <Setter Property="Text" Value="{Binding CurrentValue,StringFormat={}{0:000.000}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding Path}" Value="Reactor.StepRunTime">
-                                                            <Setter Property="Text" Value="{Binding CurrentValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged,Converter={StaticResource SecondsToHourMinConverter}}"/>
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </TextBlock.Style>
-
-                                        </TextBlock>
-                                    </StackPanel>
+                                
+                                    <TextBlock  Width="132"   Margin="4"   HorizontalAlignment="Center"   TextBlock.TextAlignment="Center" >
+                                        <TextBlock.Style>
+                                            <Style TargetType="TextBlock">
+                                                <Setter Property="Text" Value="{Binding CurrentValue , Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding Unit}" Value="h:m:s">
+                                                        <Setter Property="Text" Value="{Binding CurrentValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged,Converter={StaticResource SecondsToHourMinConverter}}"/>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </TextBlock.Style>
 
+                                    </TextBlock>
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
                             <GridViewColumn.Header>
@@ -199,12 +197,13 @@
                                  
 
                                     <StackPanel>
+                                    
                                         <TextBlock  Width="132"   Margin="4"   HorizontalAlignment="Center"   TextBlock.TextAlignment="Center" >
                                             <TextBlock.Style>
                                                 <Style TargetType="TextBlock">
-                                                    <Setter Property="Text" Value="{Binding StartValue,StringFormat={}{0:000.000}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                                    <Setter Property="Text" Value="{Binding StartValue , Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                                                     <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding Path}" Value="Reactor.StepRunTime">
+                                                        <DataTrigger Binding="{Binding Unit}" Value="h:m:s">
                                                             <Setter Property="Text" Value="{Binding StartValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged,Converter={StaticResource SecondsToHourMinConverter}}"/>
                                                         </DataTrigger>
                                                     </Style.Triggers>
@@ -229,9 +228,9 @@
                                         <TextBlock  Width="132"   Margin="4"   HorizontalAlignment="Center"   TextBlock.TextAlignment="Center" >
                                             <TextBlock.Style>
                                                 <Style TargetType="TextBlock">
-                                                    <Setter Property="Text" Value="{Binding LimitValue,StringFormat={}{0:000.000}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                                    <Setter Property="Text" Value="{Binding LimitValue , Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                                                     <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding Path}" Value="Reactor.StepRunTime">
+                                                        <DataTrigger Binding="{Binding Unit}" Value="h:m:s">
                                                             <Setter Property="Text" Value="{Binding LimitValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged,Converter={StaticResource SecondsToHourMinConverter}}"/>
                                                         </DataTrigger>
                                                     </Style.Triggers>