TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改已知问题

Browse Source
This commit is contained in:
Tyrone CT
2025-05-27 08:56:01 +08:00
parent b6c10f5b6b
commit a5f6a79a34
6 changed files with 174 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
CapMachine.Wpf/Views/DialogExpInfoView.xaml
View File

@@ -105,10 +105,34 @@
Binding="{Binding Name}"
Header="名称"
IsReadOnly="{Binding Source={StaticResource Proxy}, Path=Data.IsComplete}" />
<DataGridTextColumn
<DataGridTemplateColumn Header="实验工况" IsReadOnly="{Binding Source={StaticResource Proxy}, Path=Data.IsComplete}">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<ComboBox
DisplayMemberPath="Text"
ItemsSource="{Binding Source={StaticResource Proxy}, Path=Data.WorkCondCbxItems}"
SelectedValue="{Binding WorkCond, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
SelectedValuePath="Key">
<ComboBox.Style>
<Style BasedOn="{StaticResource MaterialDesignComboBox}" TargetType="ComboBox">
<Style.Triggers>
<DataTrigger Binding="{Binding Source={StaticResource Proxy}, Path=Data.IsComplete}" Value="True">
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
</Style.Triggers>
</Style>
</ComboBox.Style>
</ComboBox>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--<DataGridTextColumn
Binding="{Binding WorkCond}"
Header="实验工况"
IsReadOnly="{Binding Source={StaticResource Proxy}, Path=Data.IsComplete}" />
IsReadOnly="{Binding Source={StaticResource Proxy}, Path=Data.IsComplete}" />-->
<DataGridTextColumn
Binding="{Binding ExpNo}"
Header="实验编号"

30
CapMachine.Wpf/Views/ProConfigView.xaml
View File

@@ -379,6 +379,36 @@
Text="{Binding SelectedProgramSeg.ProRepeat}"
TextAlignment="Center" />
</Border>
<TextBlock
Margin="5,0,0,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="22"
Foreground="Black"
Text="&#xe6f2;" />
<TextBlock
Margin="2,0"
VerticalAlignment="Center"
FontSize="20"
Text="总时间:" />
<Border
Margin="2"
Background="LightSlateGray"
BorderThickness="1"
CornerRadius="3">
<TextBox
Width="200"
Margin="2"
VerticalAlignment="Center"
BorderThickness="0"
FontSize="18"
Foreground="White"
IsReadOnly="True"
Text="{Binding ProSegTime}"
TextAlignment="Center" />
</Border>
</StackPanel>
</Border>

2
CapMachine.Wpf/Views/ProConfigView.xaml.cs
View File

@@ -52,5 +52,7 @@ namespace CapMachine.Wpf.Views
//}
}
}
}