Sic-Software/SIC-12
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改Routine

Browse Source 
修改PC9相关仿真
This commit is contained in:
hanqiangqiang 2026-06-10 13:11:53 +08:00
parent 9f9c717299
commit 9588fe0121
19 changed files with 219 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
App/Modules/SicModules/PMs/PMModuleDevice.cs
View File

@ -522,7 +522,7 @@ namespace SicModules.PMs
"Mfc31", "Mfc33", "Mfc34", "Mfc35", "Mfc36", "Mfc37", "Mfc38","Mfc31",
"Mfc40", "Mfc41", "Mfc42", "Mfc43", "Mfc44", "Mfc45"};
private List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
public List<IoMFC> _mfcList
{
@ -1247,7 +1247,7 @@ namespace SicModules.PMs
}
else if (mGroupName == MfcGroupName.All)
{
lst = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 33, 35, 36, 37, 38, 40, 41, 42, 43, 44, 45 };
lst = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 33, 35, 36, 37, 38, 40, 41, 42, 43, 44, 45 };
}
return lst;

4
App/Modules/SicModules/PMs/Routines/PMCleanRoutine.cs
View File

@ -180,10 +180,6 @@ namespace SicModules.PMs.Routines
private IoThrottleValve2 _IoThrottle;
private IoInterLock _pmIoInterLock;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout = 20; //旋转停止超时
private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间

3
App/Modules/SicModules/PMs/Routines/PMLeakCheckRoutine.cs
View File

@ -198,9 +198,6 @@ namespace SicModules.PMs.Routines
private IoThrottleValve2 _IoThrottle;
private IoInterLock _pmIoInterLock;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout; //旋转停止超时
private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间

2
App/Modules/SicModules/PMs/Routines/PMProcessAbortRoutine.cs
View File

@ -47,8 +47,6 @@ namespace SicModules.PMs.Routines
private int _mfc1to16RampTime = 30;
private int _mfc2to45RampTime = 30;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _IoValueOpenCloseTimeout = 10;
private int _routineTimeOut = 10;

2
App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs
View File

@ -106,8 +106,6 @@ namespace SicModules.PMs.Routines
private IoThrottleValve2 _IoThrottle;
private IoInterLock _pmIoInterLock;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout; //旋转停止超时
private int _IoValueOpenCloseTimeout = 10; //开关超时时间

2
App/Modules/SicModules/PMs/Routines/PMPurgeRoutine.cs
View File

@ -202,8 +202,6 @@ namespace SicModules.PMs.Routines
private IoInterLock _pmIoInterLock;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout; //旋转停止超时
private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间

2
App/Modules/SicModules/PMs/Routines/PMToAtmIdleRoutine.cs
View File

@ -110,8 +110,6 @@ namespace SicModules.PMs.Routines
private IoThrottleValve2 _IoThrottle;
private IoInterLock _pmIoInterLock;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout; //旋转停止超时

2
App/Modules/SicModules/PMs/Routines/PMToIsolationRoutine.cs
View File

@ -91,8 +91,6 @@ namespace SicModules.PMs.Routines
private PMModule _pm1Module;
private IoThrottleValve2 _IoThrottle;
private List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCloseTimeout = 20; //旋转停止超时
private int _IoValueOpenCloseTimeout = 10; //开关超时时间
private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间

1
App/Modules/SicModules/PMs/Routines/PMToProcessIdleRoutine.cs
View File

@ -165,7 +165,6 @@ namespace SicModules.PMs.Routines
private IoThrottleValve2 _IoThrottle;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout; //旋转停止超时

2
App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs
View File

@ -108,8 +108,6 @@ namespace SicModules.PMs.Routines
private IoThrottleValve2 _IoThrottle;
private IoInterLock _pmIoInterLock;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout; //旋转停止超时
private int _IoValueOpenCloseTimeout = 10; //开关超时时间

2
App/Modules/SicModules/PMs/Routines/PMVentRoutine.cs
View File

@ -110,7 +110,7 @@ namespace SicModules.PMs.Routines
private IoThrottleValve2 _IoThrottle;
private IoInterLock _pmIoInterLock;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout; //旋转停止超时

2
App/SicRT/Properties/AssemblyInfo.cs
View File

@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
[assembly: AssemblyVersion("1.1.6.60606")]
[assembly: AssemblyVersion("1.1.7.60610")]
[assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")]

2
App/SicSimulator/Instances/SimulatorSystem.cs
View File

@ -445,6 +445,8 @@ namespace SicSimulator.Instances
new Tuple<string, string>("AI_PressCtrl5","AO_PressCtrl5"),
new Tuple<string, string>("AI_PressCtrl6","AO_PressCtrl6"),
new Tuple<string, string>("AI_PressCtrl7","AO_PressCtrl7"),
new Tuple<string, string>("AI_PressCtrl8","AO_PressCtrl8"),
new Tuple<string, string>("AI_PressCtrl9","AO_PressCtrl9"),

2
App/SicUI/Properties/AssemblyInfo.cs
View File

@ -55,6 +55,6 @@ using System.Windows;
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.1.6.60606")]
[assembly: AssemblyVersion("1.1.7.60610")]
[assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")]

297
Framework/MECF.Framework.UI.Client/CenterViews/DataLogs/Event/EventView.xaml
View File

@ -2,30 +2,29 @@
x:Class="MECF.Framework.UI.Client.CenterViews.DataLogs.Event.EventView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
xmlns:lex="http://wpflocalizeextension.codeplex.com"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:micro="clr-namespace:Caliburn.Micro"
xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:userControls1="clr-namespace:Sicentury.Core.UserControls;assembly=Sicentury.Core"
xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core"
xmlns:lex="http://wpflocalizeextension.codeplex.com"
Name="uc"
d:DesignHeight="800"
d:DesignWidth="1400"
mc:Ignorable="d"
lex:LocalizeDictionary.DesignCulture="en"
lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization"
lex:ResxLocalizationProvider.DefaultDictionary="lang_common">
lex:ResxLocalizationProvider.DefaultDictionary="lang_common"
mc:Ignorable="d">
<UserControl.Resources>
<cv:BoolReverseConverter x:Key="boolReverseConverter" />
<cv:BoolVisibilityConverter x:Key="BoolVisibilityConverter" />
<Style x:Key="{x:Type userControls1:CirclePointRingLoading}"
TargetType="{x:Type userControls1:CirclePointRingLoading}">
<Style x:Key="{x:Type userControls1:CirclePointRingLoading}" TargetType="{x:Type userControls1:CirclePointRingLoading}">
<Setter Property="Foreground" Value="#FFFFFFFF" />
<Setter Property="UIElement.IsHitTestVisible" Value="False" />
<Setter Property="HorizontalAlignment" Value="Center" />
@ -444,9 +443,7 @@
<!-- Query Condition Card -->
<GroupBox BorderThickness="1">
<GroupBox.Header>
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Text="{lex:Loc ID_TXT_QueryCondition}" />
<TextBlock lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews" Text="{lex:Loc ID_TXT_QueryCondition}" />
</GroupBox.Header>
<StackPanel Margin="0,5">
<StackPanel.Resources>
@ -507,9 +504,7 @@
<!-- Query Condition Card -->
<GroupBox>
<GroupBox.Header>
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Text="{lex:Loc ID_TXT_QueryOption}" />
<TextBlock lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews" Text="{lex:Loc ID_TXT_QueryOption}" />
</GroupBox.Header>
<UniformGrid Margin="0,5" Columns="2">
<CheckBox
@ -531,9 +526,7 @@
<!-- Extra Condition -->
<GroupBox>
<GroupBox.Header>
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Text="{lex:Loc ID_TXT_ExtraCondition}" />
<TextBlock lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews" Text="{lex:Loc ID_TXT_ExtraCondition}" />
</GroupBox.Header>
<StackPanel Margin="0,5" Orientation="Horizontal">
<TextBlock
@ -590,8 +583,8 @@
Grid.Column="1"
Margin="10,0,0,0">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
FontSize="9"
Text="{lex:Loc ID_TXT_Loading}"
Visibility="{Binding IsLoading, Converter={StaticResource BoolVisibilityConverter}}" />
@ -606,12 +599,12 @@
</Grid>
<Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Grid.Row="1"
Grid.Column="0"
Width="100"
Height="30"
Margin="0,10,0,0"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Content="{lex:Loc ID_BTN_Export_Content}"
FontFamily="Arial">
<i:Interaction.Triggers>
@ -646,9 +639,7 @@
<!-- Filter Condition Card -->
<GroupBox>
<GroupBox.Header>
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Text="{lex:Loc ID_TXT_FilterCondition}" />
<TextBlock lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews" Text="{lex:Loc ID_TXT_FilterCondition}" />
</GroupBox.Header>
<StackPanel Margin="0,5">
<StackPanel Orientation="Horizontal">
@ -675,8 +666,7 @@
ToolTip="{Binding ElementName=tbLoadPort1, Path=SelectedValue}">
<i:Interaction.Triggers>
<i:EventTrigger EventName="ItemSelectionChanged">
<i:InvokeCommandAction Command="{Binding tbLoadPort1SelectionChangedCommand}"
CommandParameter="{Binding ElementName=uc, Path=tbLoadPort1ToolTipValueData}" />
<i:InvokeCommandAction Command="{Binding tbLoadPort1SelectionChangedCommand}" CommandParameter="{Binding ElementName=uc, Path=tbLoadPort1ToolTipValueData}" />
</i:EventTrigger>
</i:Interaction.Triggers>
</toolkit:CheckComboBox>
@ -720,7 +710,7 @@
</StackPanel>
</GroupBox>
</StackPanel>
<Grid Grid.Column="1" Margin="10,0,0,0" >
<Grid Grid.Column="1" Margin="10,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="40" />
<RowDefinition Height="*" />
@ -729,142 +719,143 @@
<StackPanel Grid.Row="0" Orientation="Horizontal">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
VerticalAlignment="Center"
FontSize="16"
Text="{lex:Loc ID_TXT_Show}" />
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
FontSize="16"
Text="{lex:Loc ID_TXT_Show}" />
<ComboBox
Width="100"
Height="23"
Margin="5,0,0,0"
FontSize="13"
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}"
ItemsSource="{Binding PaginationCapacity}"
SelectedItem="{Binding SelectedPaginationCapacity}" />
Width="100"
Height="23"
Margin="5,0,0,0"
FontSize="13"
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}"
ItemsSource="{Binding PaginationCapacity}"
SelectedItem="{Binding SelectedPaginationCapacity}" />
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Margin="5,0,0,0"
VerticalAlignment="Center"
FontSize="16"
Text="{lex:Loc ID_TXT_ItemsPerPage}" />
Margin="5,0,0,0"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
FontSize="16"
Text="{lex:Loc ID_TXT_ItemsPerPage}" />
<Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Height="29"
Margin="10,0,0,0"
Command="{Binding NavigateCommand}"
CommandParameter="first"
Content="{lex:Loc ID_BTN_First_Content}"
FontFamily="Arial,SimSun"
FontSize="15"
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}" />
Height="29"
Margin="10,0,0,0"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Command="{Binding NavigateCommand}"
CommandParameter="first"
Content="{lex:Loc ID_BTN_First_Content}"
FontFamily="Arial,SimSun"
FontSize="15"
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}" />
<Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Height="29"
Margin="10,0,0,0"
Command="{Binding NavigateCommand}"
CommandParameter="previous"
Content="{lex:Loc ID_BTN_Previous_Content}"
FontFamily="Arial,SimSun"
FontSize="15"
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}" />
Height="29"
Margin="10,0,0,0"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Command="{Binding NavigateCommand}"
CommandParameter="previous"
Content="{lex:Loc ID_BTN_Previous_Content}"
FontFamily="Arial,SimSun"
FontSize="15"
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}" />
<TextBlock
Width="100"
Margin="10,0,0,0"
VerticalAlignment="Center"
FontSize="16"
Text="{Binding PageInfo}"
TextAlignment="Center" />
Width="100"
Margin="10,0,0,0"
VerticalAlignment="Center"
FontSize="16"
Text="{Binding PageInfo}"
TextAlignment="Center" />
<Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Height="29"
Margin="10,0,0,0"
Command="{Binding NavigateCommand}"
CommandParameter="next"
Content="{lex:Loc ID_BTN_Next_Content}"
FontFamily="Arial,SimSun"
FontSize="15"
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}" />
Height="29"
Margin="10,0,0,0"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Command="{Binding NavigateCommand}"
CommandParameter="next"
Content="{lex:Loc ID_BTN_Next_Content}"
FontFamily="Arial,SimSun"
FontSize="15"
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}" />
<Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Height="29"
Margin="10,0,0,0"
Command="{Binding NavigateCommand}"
CommandParameter="last"
Content="{lex:Loc ID_BTN_Last_Content}"
FontFamily="Arial,SimSun"
FontSize="15"
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}" />
Height="29"
Margin="10,0,0,0"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Command="{Binding NavigateCommand}"
CommandParameter="last"
Content="{lex:Loc ID_BTN_Last_Content}"
FontFamily="Arial,SimSun"
FontSize="15"
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}" />
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Margin="20,0,0,0"
VerticalAlignment="Center"
FontSize="16"
Text="{lex:Loc ID_TXT_QuickGoTo}" />
Margin="20,0,0,0"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
FontSize="16"
Text="{lex:Loc ID_TXT_QuickGoTo}" />
<ComboBox
Width="100"
Height="25"
Margin="5,0,0,0"
FontSize="13"
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}"
ItemsSource="{Binding Path=PaginationSource, Mode=OneWay}"
SelectedValue="{Binding Path=SelectedPage, Mode=TwoWay, Delay=10}" />
Width="100"
Height="25"
Margin="5,0,0,0"
FontSize="13"
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}"
ItemsSource="{Binding Path=PaginationSource, Mode=OneWay}"
SelectedValue="{Binding Path=SelectedPage, Mode=TwoWay, Delay=10}" />
</StackPanel>
<DataGrid Grid.Row="1"
AutoGenerateColumns="False"
CanUserAddRows="False"
CanUserReorderColumns="False"
CanUserSortColumns="False"
FontSize="13"
IsReadOnly="True"
ItemsSource="{Binding SearchedResult, Mode=OneWay}"
SelectionMode="Single"
SelectionUnit="FullRow"
ScrollViewer.CanContentScroll="True"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
ScrollViewer.VerticalScrollBarVisibility="Auto"
VirtualizingPanel.IsVirtualizing="True"
VirtualizingPanel.VirtualizationMode="Recycling">
<DataGrid
Grid.Row="1"
AutoGenerateColumns="False"
CanUserAddRows="False"
CanUserReorderColumns="False"
CanUserSortColumns="False"
FontSize="13"
IsReadOnly="True"
ItemsSource="{Binding SearchedResult, Mode=OneWay}"
ScrollViewer.CanContentScroll="True"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
ScrollViewer.VerticalScrollBarVisibility="Auto"
SelectionMode="Single"
SelectionUnit="FullRow"
VirtualizingPanel.IsVirtualizing="True"
VirtualizingPanel.VirtualizationMode="Recycling">
<DataGrid.Columns>
<DataGridTemplateColumn
Width="40"
CanUserSort="True"
SortMemberPath="Icon">
Width="40"
CanUserSort="True"
SortMemberPath="Icon">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Image
Width="20"
Height="20"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Source="{Binding Icon}"
Stretch="Fill" />
Width="20"
Height="20"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Source="{Binding Icon}"
Stretch="Fill" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn
Width="70"
Binding="{Binding LogType, Mode=OneWay}"
CanUserReorder="False"
CanUserResize="False"
CanUserSort="True"
IsReadOnly="True">
Width="70"
Binding="{Binding LogType, Mode=OneWay}"
CanUserReorder="False"
CanUserResize="False"
CanUserSort="True"
IsReadOnly="True">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock
VerticalAlignment="Center"
Text="{lex:Loc ID_TXT_Type}"
TextAlignment="Center" />
VerticalAlignment="Center"
Text="{lex:Loc ID_TXT_Type}"
TextAlignment="Center" />
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.ElementStyle>
@ -876,19 +867,19 @@
</DataGridTextColumn>
<DataGridTextColumn
Width="200"
Binding="{Binding Time, Mode=OneWay}"
CanUserReorder="True"
CanUserResize="False"
CanUserSort="True"
IsReadOnly="True">
Width="200"
Binding="{Binding Time, Mode=OneWay}"
CanUserReorder="True"
CanUserResize="False"
CanUserSort="True"
IsReadOnly="True">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock
VerticalAlignment="Center"
Text="{lex:Loc ID_TXT_Date}"
TextAlignment="Left" />
VerticalAlignment="Center"
Text="{lex:Loc ID_TXT_Date}"
TextAlignment="Left" />
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
@ -901,19 +892,19 @@
</DataGridTextColumn>
<DataGridTextColumn
Width="100"
Binding="{Binding TargetChamber, Mode=OneWay}"
CanUserReorder="False"
CanUserResize="False"
CanUserSort="True"
IsReadOnly="True">
Width="100"
Binding="{Binding TargetChamber, Mode=OneWay}"
CanUserReorder="False"
CanUserResize="False"
CanUserSort="True"
IsReadOnly="True">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock
VerticalAlignment="Center"
Text="{lex:Loc ID_TXT_System}"
TextAlignment="Center" />
VerticalAlignment="Center"
Text="{lex:Loc ID_TXT_System}"
TextAlignment="Center" />
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.ElementStyle>
@ -926,12 +917,12 @@
<DataGridTemplateColumn
Width="*"
CanUserReorder="False"
CanUserResize="False"
CanUserSort="True"
Header="Description"
IsReadOnly="True">
Width="*"
CanUserReorder="False"
CanUserResize="False"
CanUserSort="True"
Header="Description"
IsReadOnly="True">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{lex:Loc ID_TXT_Description}" />
@ -940,9 +931,9 @@
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock
VerticalAlignment="Center"
Text="{Binding Detail}"
TextWrapping="Wrap" />
VerticalAlignment="Center"
Text="{Binding Detail}"
TextWrapping="Wrap" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>

8
Framework/MECF.Framework.UI.Client/Themes/SeaBlue/ComboBox.xaml
View File

@ -1,5 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:deviceControl="clr-namespace:MECF.Framework.UI.Core.DeviceControl;assembly=MECF.Framework.UI.Core">
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:deviceControl="clr-namespace:MECF.Framework.UI.Core.DeviceControl;assembly=MECF.Framework.UI.Core">
<Style x:Key="ComboBoxFocusVisual">
<Setter Property="Control.Template">
@ -773,7 +775,7 @@
<TextBlock
Grid.Column="3"
Margin="8,0,0,0"
Text="{Binding Description}"/>
Text="{Binding Description}" />
</Grid>
</ContentControl>
</DataTemplate>

43
Framework/MECF.Framework.UI.Client/Themes/SeaBlue/DataGrid.xaml
View File

@ -19,10 +19,10 @@
<SolidColorBrush x:Key="DataGrid_BG_Highlight" Color="#262C3D6D" />
<SolidColorBrush x:Key="DataGrid_Header_FG" Color="White" />
<!-- 当前Cell值和前序Cell值不相等时，当前Cell的背景色 -->
<SolidColorBrush x:Key="DataGrid_BG_CellValueChangedWithoutSave" Color="#FFC0F18D"/>
<SolidColorBrush x:Key="DataGrid_FG_CellValueNotValid" Color="Red"/>
<SolidColorBrush x:Key="DataGrid_FG_CellValueNotEquFront" Color="Green"/>
<!-- 当前Cell值和前序Cell值不相等时，当前Cell的背景色 -->
<SolidColorBrush x:Key="DataGrid_BG_CellValueChangedWithoutSave" Color="#FFC0F18D" />
<SolidColorBrush x:Key="DataGrid_FG_CellValueNotValid" Color="Red" />
<SolidColorBrush x:Key="DataGrid_FG_CellValueNotEquFront" Color="Green" />
<Style TargetType="{x:Type DataGrid}">
<Setter Property="Background" Value="{x:Null}" />
@ -266,23 +266,26 @@
<SolidColorBrush x:Key="{x:Static DataGrid.FocusBorderBrushKey}" Color="#FF000000" />
<Style TargetType="DataGridRow">
<Setter Property="Cursor" Value="Hand"/>
<Setter Property="Template" >
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="DataGridRow">
<Grid>
<Border x:Name="border" Margin="0" Background="{TemplateBinding Background}" BorderThickness="0" BorderBrush="Transparent">
<DataGridCellsPresenter
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
<Border
x:Name="border"
Margin="0"
Background="{TemplateBinding Background}"
BorderBrush="Transparent"
BorderThickness="0">
<DataGridCellsPresenter HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
</Border>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" TargetName="border" Value="#FF91B0CD"/>
<Setter TargetName="border" Property="Background" Value="#FF91B0CD" />
</Trigger>
<Trigger Property="IsSelected" Value="true">
<Setter Property="BorderBrush" TargetName="border" Value="#FF91B0CD"/>
<Setter TargetName="border" Property="BorderBrush" Value="#FF91B0CD" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
@ -299,24 +302,22 @@
</Style>
<Style TargetType="DataGridCell">
<Setter Property="Background" Value="Transparent"/>
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
<Setter Property="Background" Value="Transparent" />
<Setter Property="VerticalContentAlignment" Value="Stretch" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="DataGridCell">
<Border
Padding="2"
BorderThickness="0"
Background="{TemplateBinding Background}">
<ContentPresenter
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
Background="{TemplateBinding Background}"
BorderThickness="0">
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="true">
<Setter Property="Foreground" Value="Black" />
<Setter Property="FontWeight" Value="Bold"/>
<Setter Property="FontWeight" Value="Bold" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>

67
Framework/MECF.Framework.UI.Client/Themes/SeaBlue/Listview.xaml
View File

@ -151,9 +151,9 @@
<Setter Property="CanContentScroll" Value="True" />
<Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
<Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>
<Setter Property="VirtualizingPanel.ScrollUnit" Value="Pixel"/>
<Setter Property="VirtualizingPanel.IsContainerVirtualizable" Value="True"/>
<Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
<Setter Property="VirtualizingPanel.ScrollUnit" Value="Pixel" />
<Setter Property="VirtualizingPanel.IsContainerVirtualizable" Value="True" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ScrollViewer}">
@ -167,34 +167,35 @@
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Border
x:Name="TopBG"
MinHeight="24"
Background="{DynamicResource Listview_Header_BG}"
BorderBrush="{DynamicResource Listview_Header_BD}"
BorderThickness="1" >
<GridViewHeaderRowPresenter
AllowsColumnReorder="{Binding TemplatedParent.View.AllowsColumnReorder, RelativeSource={RelativeSource TemplatedParent}}"
ColumnHeaderContainerStyle="{Binding TemplatedParent.View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource TemplatedParent}}"
ColumnHeaderContextMenu="{Binding TemplatedParent.View.ColumnHeaderContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
ColumnHeaderTemplate="{Binding TemplatedParent.View.ColumnHeaderTemplate, RelativeSource={RelativeSource TemplatedParent}}"
ColumnHeaderToolTip="{Binding TemplatedParent.View.ColumnHeaderToolTip, RelativeSource={RelativeSource TemplatedParent}}"
Columns="{Binding TemplatedParent.View.Columns, RelativeSource={RelativeSource TemplatedParent}}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
<Border Grid.Row="1"
Background="{DynamicResource Listview_BG_First}"
BorderBrush="{DynamicResource Listview_Content_BD}"
BorderThickness="1,0,1,1">
<ScrollContentPresenter
Name="PART_ScrollContentPresenter"
CanContentScroll="{TemplateBinding CanContentScroll}"
CanHorizontallyScroll="False"
CanVerticallyScroll="False"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
KeyboardNavigation.DirectionalNavigation="Local" />
</Border>
<Border
x:Name="TopBG"
MinHeight="24"
Background="{DynamicResource Listview_Header_BG}"
BorderBrush="{DynamicResource Listview_Header_BD}"
BorderThickness="1">
<GridViewHeaderRowPresenter
AllowsColumnReorder="{Binding TemplatedParent.View.AllowsColumnReorder, RelativeSource={RelativeSource TemplatedParent}}"
ColumnHeaderContainerStyle="{Binding TemplatedParent.View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource TemplatedParent}}"
ColumnHeaderContextMenu="{Binding TemplatedParent.View.ColumnHeaderContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
ColumnHeaderTemplate="{Binding TemplatedParent.View.ColumnHeaderTemplate, RelativeSource={RelativeSource TemplatedParent}}"
ColumnHeaderToolTip="{Binding TemplatedParent.View.ColumnHeaderToolTip, RelativeSource={RelativeSource TemplatedParent}}"
Columns="{Binding TemplatedParent.View.Columns, RelativeSource={RelativeSource TemplatedParent}}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
<Border
Grid.Row="1"
Background="{DynamicResource Listview_BG_First}"
BorderBrush="{DynamicResource Listview_Content_BD}"
BorderThickness="1,0,1,1">
<ScrollContentPresenter
Name="PART_ScrollContentPresenter"
CanContentScroll="{TemplateBinding CanContentScroll}"
CanHorizontallyScroll="False"
CanVerticallyScroll="False"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
KeyboardNavigation.DirectionalNavigation="Local" />
</Border>
<ScrollBar
x:Name="PART_HorizontalScrollBar"
Grid.Row="2"
@ -247,7 +248,7 @@
<VirtualizingStackPanel
VirtualizingPanel.IsVirtualizing="True"
VirtualizingPanel.ScrollUnit="Pixel"
VirtualizingPanel.VirtualizationMode="Recycling"/>
VirtualizingPanel.VirtualizationMode="Recycling" />
</ItemsPanelTemplate>
</Setter.Value>
</Setter>
@ -256,7 +257,7 @@
<ControlTemplate TargetType="{x:Type ListView}">
<ScrollViewer Style="{DynamicResource ListView-ScrollViewer}">
<!--<VirtualizingStackPanel IsItemsHost="True" ScrollUnit="Pixel"/>-->
<ItemsPresenter/>
<ItemsPresenter />
</ScrollViewer>
</ControlTemplate>
</Setter.Value>

2
Framework/MECF.Framework.UI.Client/Themes/SeaBlue/TreeView.xaml
View File

@ -177,7 +177,7 @@
Padding="4"
CanContentScroll="False"
Focusable="False">
<ItemsPresenter/>
<ItemsPresenter />
</ScrollViewer>
</Border>
</ControlTemplate>