hanqiangqiang
parent
99b66c36d8
commit
ff6b96f58a
|
|
@ -34,7 +34,6 @@ namespace MECF.Framework.UI.Client.CenterViews.Editors.Recipe
|
|||
private EditMode _editMode;
|
||||
private readonly RecipeProvider _recipeProvider;
|
||||
|
||||
|
||||
public ObservableCollection<string> Chambers { get; set; }
|
||||
|
||||
private RecipeData _currentRecipe;
|
||||
|
|
@ -320,7 +319,7 @@ namespace MECF.Framework.UI.Client.CenterViews.Editors.Recipe
|
|||
|
||||
|
||||
var recipeData2 = new RecipeData(CurrentProcessType);
|
||||
//recipeData2.BuildFormat($"{CurrentChamberType}\\{CurrentProcessType}", SelectedChamber, BaseApp.Instance.UserContext.RoleName);
|
||||
recipeData2.BuildFormat($"{CurrentChamberType}\\{CurrentProcessType}", SelectedChamber, BaseApp.Instance.UserContext.RoleName);
|
||||
|
||||
//得到当前登录的RoleItem
|
||||
var role2 = _roleManager.GetRoleByName(BaseApp.Instance.UserContext.RoleName);
|
||||
|
|
|
|||
|
|
@ -180,6 +180,7 @@
|
|||
Grid.Column="1"
|
||||
AllowDragToFill="False"
|
||||
FrozenColumnCount="6"
|
||||
ComperHeadersVisibility="Row"
|
||||
IsEnabled="{Binding IsPermission}"
|
||||
Recipe="{Binding CurrentRecipe2, Mode=OneWay}" />
|
||||
</Grid>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -450,6 +450,6 @@
|
|||
</Setter>
|
||||
</Style>
|
||||
|
||||
|
||||
|
||||
|
||||
</ResourceDictionary>
|
||||
|
|
|
|||
|
|
@ -1,32 +1,34 @@
|
|||
<UserControl x:Class="MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.DataGridRecipe"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:MECF.Framework.UI.Client.RecipeEditorLib.DGExtension"
|
||||
xmlns:controls="clr-namespace:ExtendedGrid.Microsoft.Windows.Controls"
|
||||
xmlns:cv="clr-namespace:MECF.Framework.UI.Client.RecipeEditorLib.Converters"
|
||||
xmlns:controls1="clr-namespace:OpenSEMI.Ctrlib.Controls"
|
||||
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
||||
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
|
||||
xmlns:micro="clr-namespace:Caliburn.Micro"
|
||||
xmlns:converters="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="800">
|
||||
<UserControl
|
||||
x:Class="MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.DataGridRecipe"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:controls="clr-namespace:ExtendedGrid.Microsoft.Windows.Controls"
|
||||
xmlns:controls1="clr-namespace:OpenSEMI.Ctrlib.Controls"
|
||||
xmlns:converters="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core"
|
||||
xmlns:cv="clr-namespace:MECF.Framework.UI.Client.RecipeEditorLib.Converters"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
|
||||
xmlns:local="clr-namespace:MECF.Framework.UI.Client.RecipeEditorLib.DGExtension"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:micro="clr-namespace:Caliburn.Micro"
|
||||
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
||||
d:DesignHeight="450"
|
||||
d:DesignWidth="800"
|
||||
mc:Ignorable="d">
|
||||
<UserControl.Resources>
|
||||
|
||||
<!-- #region Converters -->
|
||||
|
||||
<converters:BoolCollapsedConverter x:Key="BoolCollapsedConverter"/>
|
||||
<cv:ParamToCellTooltipConverter x:Key="CellTooltipConverter"/>
|
||||
<cv:IsHighlightedToBorderThickness x:Key="IsHighlightedToBorderThickness"/>
|
||||
<cv:IsHighlightedToBorderBrush x:Key="IsHighlightedToBorderBrush"/>
|
||||
<cv:ParamValueDisplayConverter x:Key="ParamValueDisplayConverter"/>
|
||||
<cv:PermissionToIsEnabledConverter x:Key="PermissionToIsEnabledConverter"/>
|
||||
|
||||
<!-- #endregion -->
|
||||
<!--#region Converters-->
|
||||
|
||||
<!-- #region Column Header Template -->
|
||||
<converters:BoolCollapsedConverter x:Key="BoolCollapsedConverter" />
|
||||
<cv:ParamToCellTooltipConverter x:Key="CellTooltipConverter" />
|
||||
<cv:IsHighlightedToBorderThickness x:Key="IsHighlightedToBorderThickness" />
|
||||
<cv:IsHighlightedToBorderBrush x:Key="IsHighlightedToBorderBrush" />
|
||||
<cv:ParamValueDisplayConverter x:Key="ParamValueDisplayConverter" />
|
||||
<cv:PermissionToIsEnabledConverter x:Key="PermissionToIsEnabledConverter" />
|
||||
|
||||
<!--#endregion-->
|
||||
|
||||
<!--#region Column Header Template-->
|
||||
<DataTemplate x:Key="ColumnHeaderTemplateCommon">
|
||||
<Grid Width="320" Margin="0,5">
|
||||
<Grid.ColumnDefinitions>
|
||||
|
|
@ -96,12 +98,11 @@
|
|||
VerticalAlignment="Stretch"
|
||||
HorizontalContentAlignment="Left"
|
||||
VerticalContentAlignment="Stretch"
|
||||
Collapsed="Expander_OnCollapsed"
|
||||
Expanded="Expander_OnExpanded"
|
||||
FontSize="14"
|
||||
Header="{Binding DisplayName}"
|
||||
IsExpanded="{Binding IsExpanded}"
|
||||
Expanded="Expander_OnExpanded"
|
||||
Collapsed="Expander_OnCollapsed">
|
||||
</Expander>
|
||||
IsExpanded="{Binding IsExpanded}" />
|
||||
<Border.LayoutTransform>
|
||||
<TransformGroup>
|
||||
<RotateTransform Angle="-90" />
|
||||
|
|
@ -111,51 +112,51 @@
|
|||
</Border>
|
||||
</DataTemplate>
|
||||
|
||||
<!-- #endregion -->
|
||||
<!--#endregion-->
|
||||
|
||||
<Style x:Key="DoubleUpDownStyle1" TargetType="{x:Type xctk:DoubleUpDown}">
|
||||
<Setter Property="BorderThickness" Value="0"/>
|
||||
<Setter Property="TextAlignment" Value="Center"/>
|
||||
<Setter Property="BorderThickness" Value="0" />
|
||||
<Setter Property="TextAlignment" Value="Center" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type xctk:DoubleUpDown}">
|
||||
<xctk:WatermarkTextBox
|
||||
<xctk:WatermarkTextBox
|
||||
x:Name="PART_TextBox"
|
||||
Style="{StaticResource GenericTextBoxStyle}"
|
||||
AcceptsReturn="false"
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderThickness="0"
|
||||
ContextMenu="{TemplateBinding ContextMenu}"
|
||||
FontStretch="{TemplateBinding FontStretch}"
|
||||
Foreground="{TemplateBinding Foreground}"
|
||||
FontStyle="{TemplateBinding FontStyle}"
|
||||
FontFamily="{TemplateBinding FontFamily}"
|
||||
FontWeight="{TemplateBinding FontWeight}"
|
||||
FontSize="{TemplateBinding FontSize}"
|
||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||
IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
MinWidth="20"
|
||||
MinWidth="20"
|
||||
Padding="{TemplateBinding Padding}"
|
||||
SelectAllOnGotFocus="{Binding SelectAllOnGotFocus, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
TextAlignment="{Binding TextAlignment, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
TabIndex="{TemplateBinding TabIndex}"
|
||||
TextWrapping="NoWrap"
|
||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||
AcceptsReturn="false"
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderThickness="0"
|
||||
ContextMenu="{TemplateBinding ContextMenu}"
|
||||
FontFamily="{TemplateBinding FontFamily}"
|
||||
FontSize="{TemplateBinding FontSize}"
|
||||
FontStretch="{TemplateBinding FontStretch}"
|
||||
FontStyle="{TemplateBinding FontStyle}"
|
||||
FontWeight="{TemplateBinding FontWeight}"
|
||||
Foreground="{TemplateBinding Foreground}"
|
||||
IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
SelectAllOnGotFocus="{Binding SelectAllOnGotFocus, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
Style="{StaticResource GenericTextBoxStyle}"
|
||||
TabIndex="{TemplateBinding TabIndex}"
|
||||
TextAlignment="{Binding TextAlignment, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
TextWrapping="NoWrap"
|
||||
Watermark="{Binding Watermark, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
WatermarkTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}}"/>
|
||||
WatermarkTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}}" />
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!--#region Cell Templates -->
|
||||
<!--#region Cell Templates-->
|
||||
|
||||
<DataTemplate x:Key="CellTemplateDisplay">
|
||||
<Border
|
||||
BorderThickness="{Binding IsHighlighted, Mode=OneWay, Converter={StaticResource IsHighlightedToBorderThickness}}"
|
||||
BorderBrush="{Binding IsHighlighted, Mode=OneWay, Converter={StaticResource IsHighlightedToBorderBrush}}"
|
||||
ToolTip="{Binding Converter={StaticResource CellTooltipConverter}}"
|
||||
PreviewMouseDown="DataGridCell_OnPreviewMouseDown">
|
||||
BorderBrush="{Binding IsHighlighted, Mode=OneWay, Converter={StaticResource IsHighlightedToBorderBrush}}"
|
||||
BorderThickness="{Binding IsHighlighted, Mode=OneWay, Converter={StaticResource IsHighlightedToBorderThickness}}"
|
||||
PreviewMouseDown="DataGridCell_OnPreviewMouseDown"
|
||||
ToolTip="{Binding Converter={StaticResource CellTooltipConverter}}">
|
||||
<Border.LayoutTransform>
|
||||
<TransformGroup>
|
||||
<RotateTransform Angle="-90" />
|
||||
|
|
@ -164,10 +165,10 @@
|
|||
</Border.LayoutTransform>
|
||||
<Border.Style>
|
||||
<Style TargetType="Border">
|
||||
<Setter Property="Background" Value="#00FFFFFF"/>
|
||||
<Setter Property="Background" Value="#00FFFFFF" />
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding IsSaved}" Value="False">
|
||||
<Setter Property="Background" Value="{StaticResource DataGrid_BG_CellValueChangedWithoutSave}"/>
|
||||
<Setter Property="Background" Value="{StaticResource DataGrid_BG_CellValueChangedWithoutSave}" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
|
|
@ -178,33 +179,33 @@
|
|||
VerticalAlignment="Center"
|
||||
TextTrimming="CharacterEllipsis">
|
||||
<TextBlock.Text>
|
||||
<!-- 是否隐藏单元格内容 -->
|
||||
<!-- 是否隐藏单元格内容 -->
|
||||
<MultiBinding Converter="{StaticResource ParamValueDisplayConverter}">
|
||||
<Binding Path="Value"/>
|
||||
<Binding Path="Permission"/>
|
||||
<Binding Path="Value" />
|
||||
<Binding Path="Permission" />
|
||||
</MultiBinding>
|
||||
</TextBlock.Text>
|
||||
<TextBlock.Style>
|
||||
<Style TargetType="TextBlock">
|
||||
<Style.Triggers>
|
||||
<MultiDataTrigger >
|
||||
<MultiDataTrigger>
|
||||
<MultiDataTrigger.Conditions>
|
||||
<Condition Binding="{Binding IsEqualsToPrevious}" Value="False"/>
|
||||
<Condition Binding="{Binding IsValid}" Value="False"/>
|
||||
<Condition Binding="{Binding IsEqualsToPrevious}" Value="False" />
|
||||
<Condition Binding="{Binding IsValid}" Value="False" />
|
||||
</MultiDataTrigger.Conditions>
|
||||
<Setter Property="Foreground" Value="{StaticResource DataGrid_FG_CellValueNotValid}" />
|
||||
</MultiDataTrigger>
|
||||
<MultiDataTrigger >
|
||||
<MultiDataTrigger>
|
||||
<MultiDataTrigger.Conditions>
|
||||
<Condition Binding="{Binding IsEqualsToPrevious}" Value="True"/>
|
||||
<Condition Binding="{Binding IsValid}" Value="False"/>
|
||||
<Condition Binding="{Binding IsEqualsToPrevious}" Value="True" />
|
||||
<Condition Binding="{Binding IsValid}" Value="False" />
|
||||
</MultiDataTrigger.Conditions>
|
||||
<Setter Property="Foreground" Value="{StaticResource DataGrid_FG_CellValueNotValid}" />
|
||||
</MultiDataTrigger>
|
||||
<MultiDataTrigger >
|
||||
<MultiDataTrigger>
|
||||
<MultiDataTrigger.Conditions>
|
||||
<Condition Binding="{Binding IsEqualsToPrevious}" Value="False"/>
|
||||
<Condition Binding="{Binding IsValid}" Value="True"/>
|
||||
<Condition Binding="{Binding IsEqualsToPrevious}" Value="False" />
|
||||
<Condition Binding="{Binding IsValid}" Value="True" />
|
||||
</MultiDataTrigger.Conditions>
|
||||
<Setter Property="Foreground" Value="{StaticResource DataGrid_FG_CellValueNotEquFront}" />
|
||||
</MultiDataTrigger>
|
||||
|
|
@ -233,8 +234,8 @@
|
|||
Orientation="Horizontal">
|
||||
<CheckBox
|
||||
Margin="4"
|
||||
IsHitTestVisible="True"
|
||||
IsChecked="{Binding IsChecked}"
|
||||
IsHitTestVisible="True"
|
||||
Visibility="{Binding StepCheckVisibility}" />
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
|
|
@ -251,7 +252,7 @@
|
|||
<Setter Property="Visibility" Value="Collapsed" />
|
||||
</DataTrigger>
|
||||
<DataTrigger Binding="{Binding IsSaved}" Value="False">
|
||||
<Setter Property="Background" Value="{StaticResource DataGrid_BG_CellValueChangedWithoutSave}"/>
|
||||
<Setter Property="Background" Value="{StaticResource DataGrid_BG_CellValueChangedWithoutSave}" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
|
|
@ -325,17 +326,17 @@
|
|||
<ScaleTransform ScaleX="1" ScaleY="-1" />
|
||||
</TransformGroup>
|
||||
</Border.LayoutTransform>
|
||||
<TextBox
|
||||
<TextBox
|
||||
HorizontalContentAlignment="Center"
|
||||
VerticalContentAlignment="Center"
|
||||
IsEnabled="{Binding IsEnabled}"
|
||||
Text="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
|
||||
<TextBox.Style>
|
||||
<Style TargetType="TextBox" BasedOn="{StaticResource GenericTextBoxStyle}">
|
||||
<Style BasedOn="{StaticResource GenericTextBoxStyle}" TargetType="TextBox">
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding IsValid}" Value="False">
|
||||
<Setter Property="Foreground" Value="#9c0006"/>
|
||||
<Setter Property="Background" Value="#ffc7ce"/>
|
||||
<Setter Property="Foreground" Value="#9c0006" />
|
||||
<Setter Property="Background" Value="#ffc7ce" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
|
|
@ -352,17 +353,16 @@
|
|||
<ScaleTransform ScaleX="1" ScaleY="-1" />
|
||||
</TransformGroup>
|
||||
</Border.LayoutTransform>
|
||||
<xctk:DoubleUpDown
|
||||
Value="{Binding Value,
|
||||
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, FallbackValue=0}"
|
||||
<xctk:DoubleUpDown
|
||||
SelectAllOnGotFocus="True"
|
||||
ShowButtonSpinner="False">
|
||||
ShowButtonSpinner="False"
|
||||
Value="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, FallbackValue=0}">
|
||||
<xctk:DoubleUpDown.Style>
|
||||
<Style TargetType="xctk:DoubleUpDown" BasedOn="{StaticResource DoubleUpDownStyle1}">
|
||||
<Style BasedOn="{StaticResource DoubleUpDownStyle1}" TargetType="xctk:DoubleUpDown">
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding IsValid}" Value="False">
|
||||
<Setter Property="Foreground" Value="#9c0006"/>
|
||||
<Setter Property="Background" Value="#ffc7ce"/>
|
||||
<Setter Property="Foreground" Value="#9c0006" />
|
||||
<Setter Property="Background" Value="#ffc7ce" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
|
|
@ -389,7 +389,7 @@
|
|||
IsEnabled="{Binding IsEnabled}"
|
||||
MaxValue="{Binding Maximun}"
|
||||
MinValue="{Binding Minimun}"
|
||||
Text="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
Text="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
||||
<Border.Style>
|
||||
<Style TargetType="Border">
|
||||
<Style.Triggers>
|
||||
|
|
@ -425,7 +425,7 @@
|
|||
IsEnabled="{Binding IsEnabled}"
|
||||
IsLoopItem="{Binding IsLoopItem}"
|
||||
ItemsSource="{Binding Options}"
|
||||
Text="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
Text="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
||||
<Border.Style>
|
||||
<Style TargetType="Border">
|
||||
<Style.Triggers>
|
||||
|
|
@ -454,13 +454,13 @@
|
|||
<ScaleTransform ScaleX="1" ScaleY="-1" />
|
||||
</TransformGroup>
|
||||
</Border.LayoutTransform>
|
||||
<ComboBox
|
||||
<ComboBox
|
||||
HorizontalContentAlignment="Center"
|
||||
VerticalContentAlignment="Center"
|
||||
DisplayMemberPath="DisplayName"
|
||||
IsEditable="{Binding IsEditable}"
|
||||
ItemsSource="{Binding Options}"
|
||||
Text="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Delay=10}"/>
|
||||
Text="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Delay=10}" />
|
||||
</Border>
|
||||
</DataTemplate>
|
||||
|
||||
|
|
@ -530,32 +530,35 @@
|
|||
</Border>
|
||||
</DataTemplate>
|
||||
|
||||
<!--#endregion -->
|
||||
|
||||
<!--#endregion-->
|
||||
|
||||
<!--<Style TargetType="controls:DataGridCell" BasedOn="{x:Null}">
|
||||
<Setter
|
||||
Property="IsEnabled"
|
||||
<Setter
|
||||
Property="IsEnabled"
|
||||
Value="{Binding Permission,
|
||||
Converter={StaticResource PermissionToIsEnabledConverter}}"/>
|
||||
</Style>-->
|
||||
|
||||
<Style x:Key="RecipeEditorDataGrid" TargetType="local:XDataGrid" BasedOn="{x:Null}">
|
||||
<Setter Property="AutoGenerateColumns" Value="False"/>
|
||||
<Setter Property="Background" Value="Transparent"/>
|
||||
<Setter Property="CanUserAddRows" Value="False"/>
|
||||
<Setter Property="CanUserDeleteRows" Value="False"/>
|
||||
<Setter Property="CanUserReorderColumns" Value="False"/>
|
||||
<Setter Property="CanUserResizeColumns" Value="False"/>
|
||||
<Setter Property="CanUserResizeRows" Value="False"/>
|
||||
<Setter Property="FrozenColumnCount" Value="4"/>
|
||||
<Setter Property="GridLinesVisibility" Value="None"/>
|
||||
<Setter Property="HeadersVisibility" Value="Column"/>
|
||||
<Setter Property="SelectionUnit" Value="Cell"/>
|
||||
<Setter Property="SelectionMode" Value="Single"/>
|
||||
<Setter Property="UseHorizontalScrolling" Value="True"/>
|
||||
<Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
|
||||
<Setter Property="CellStyle" Value="{x:Null}"/>
|
||||
<Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
|
||||
<Style
|
||||
x:Key="RecipeEditorDataGrid"
|
||||
BasedOn="{x:Null}"
|
||||
TargetType="local:XDataGrid">
|
||||
<Setter Property="AutoGenerateColumns" Value="False" />
|
||||
<Setter Property="Background" Value="Transparent" />
|
||||
<Setter Property="CanUserAddRows" Value="False" />
|
||||
<Setter Property="CanUserDeleteRows" Value="False" />
|
||||
<Setter Property="CanUserReorderColumns" Value="False" />
|
||||
<Setter Property="CanUserResizeColumns" Value="False" />
|
||||
<Setter Property="CanUserResizeRows" Value="False" />
|
||||
<Setter Property="FrozenColumnCount" Value="4" />
|
||||
<Setter Property="GridLinesVisibility" Value="None" />
|
||||
<Setter Property="HeadersVisibility" Value="Column" />
|
||||
<Setter Property="SelectionUnit" Value="Cell" />
|
||||
<Setter Property="SelectionMode" Value="Single" />
|
||||
<Setter Property="UseHorizontalScrolling" Value="True" />
|
||||
<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
|
||||
<Setter Property="CellStyle" Value="{x:Null}" />
|
||||
<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
|
||||
<Setter Property="LayoutTransform">
|
||||
<Setter.Value>
|
||||
<TransformGroup>
|
||||
|
|
@ -567,53 +570,51 @@
|
|||
<Setter Property="RowStyle">
|
||||
<Setter.Value>
|
||||
<Style TargetType="controls:DataGridRow">
|
||||
<Setter
|
||||
Property="Visibility"
|
||||
Value="{Binding IsVisible,
|
||||
Converter={StaticResource BoolCollapsedConverter}}"/>
|
||||
<Setter Property="Visibility" Value="{Binding IsVisible, Converter={StaticResource BoolCollapsedConverter}}" />
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding IsSelected}" Value="True">
|
||||
<Setter Property="Background" Value="{StaticResource DataGrid_BG_Selected}"/>
|
||||
<Setter Property="Background" Value="{StaticResource DataGrid_BG_Selected}" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!-- #region Drag-to-Fill Style-->
|
||||
|
||||
<SolidColorBrush x:Key="DragToFillFrameColor" Color="ForestGreen"/>
|
||||
|
||||
<Style x:Key="DragToFillThumbStyle" TargetType="Thumb" BasedOn="{x:Null}">
|
||||
<Setter Property="Height" Value="10"/>
|
||||
<Setter Property="Width" Value="10"/>
|
||||
<Setter Property="Background" Value="{StaticResource DragToFillFrameColor}"/>
|
||||
|
||||
<!--#region Drag-to-Fill Style-->
|
||||
|
||||
<SolidColorBrush x:Key="DragToFillFrameColor" Color="ForestGreen" />
|
||||
|
||||
<Style
|
||||
x:Key="DragToFillThumbStyle"
|
||||
BasedOn="{x:Null}"
|
||||
TargetType="Thumb">
|
||||
<Setter Property="Height" Value="10" />
|
||||
<Setter Property="Width" Value="10" />
|
||||
<Setter Property="Background" Value="{StaticResource DragToFillFrameColor}" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type Thumb}">
|
||||
<Rectangle
|
||||
StrokeThickness="0"
|
||||
Fill="{TemplateBinding Background}"/>
|
||||
<Rectangle Fill="{TemplateBinding Background}" StrokeThickness="0" />
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!-- #endregion -->
|
||||
|
||||
|
||||
<!--#endregion-->
|
||||
|
||||
</UserControl.Resources>
|
||||
<local:XDataGrid
|
||||
x:Name="dgCustom"
|
||||
Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
|
||||
Height="{Binding Path=ActualWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
|
||||
AllowDragToFill="{Binding AllowDragToFill, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
|
||||
BeginningEdit="DgCustom_OnBeginningEdit"
|
||||
CellEditEnding="DgCustom_OnCellEditEnding"
|
||||
DragToFillAdornerColorBrush="{StaticResource DragToFillFrameColor}"
|
||||
DragToFillAdornerThumbStyle="{StaticResource DragToFillThumbStyle}"
|
||||
Style="{StaticResource RecipeEditorDataGrid}"
|
||||
Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
|
||||
Height="{Binding Path=ActualWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
|
||||
HeadersVisibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UserControl},Path=ComperHeadersVisibility}"
|
||||
LoadingRow="DgCustom_OnLoadingRow"
|
||||
UnloadingRow="DgCustom_OnUnloadingRow"
|
||||
BeginningEdit="DgCustom_OnBeginningEdit"
|
||||
CellEditEnding="DgCustom_OnCellEditEnding">
|
||||
</local:XDataGrid>
|
||||
Style="{StaticResource RecipeEditorDataGrid}"
|
||||
UnloadingRow="DgCustom_OnUnloadingRow" />
|
||||
</UserControl>
|
||||
|
|
|
|||
|
|
@ -51,6 +51,17 @@ namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension
|
|||
public static readonly DependencyProperty RecipeProperty = DependencyProperty.Register(
|
||||
nameof(Recipe), typeof(RecipeData), typeof(DataGridRecipe), new PropertyMetadata(default(RecipeData), RecipePropertyChangedCallback));
|
||||
|
||||
public ExtendedGrid.Microsoft.Windows.Controls.DataGridHeadersVisibility ComperHeadersVisibility
|
||||
{
|
||||
get { return (ExtendedGrid.Microsoft.Windows.Controls.DataGridHeadersVisibility)GetValue(ComperHeadersVisibilityProperty); }
|
||||
set { SetValue(ComperHeadersVisibilityProperty, value); }
|
||||
}
|
||||
|
||||
// Using a DependencyProperty as the backing store for ComperHeadersVisibility. This enables animation, styling, binding, etc...
|
||||
public static readonly DependencyProperty ComperHeadersVisibilityProperty =
|
||||
DependencyProperty.Register("ComperHeadersVisibility", typeof(ExtendedGrid.Microsoft.Windows.Controls.DataGridHeadersVisibility), typeof(DataGridRecipe), new PropertyMetadata(ExtendedGrid.Microsoft.Windows.Controls.DataGridHeadersVisibility.Column));
|
||||
|
||||
|
||||
private static void RecipePropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
if (d is DataGridRecipe dg)
|
||||
|
|
|
|||
|
|
@ -466,8 +466,8 @@
|
|||
FontSize="10"
|
||||
Foreground="{DynamicResource FG_Black}"
|
||||
Text="{Binding Path=SourceName, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
TextWrapping="WrapWithOverflow"
|
||||
TextTrimming="CharacterEllipsis"/>
|
||||
TextTrimming="CharacterEllipsis"
|
||||
TextWrapping="WrapWithOverflow" />
|
||||
<TextBlock
|
||||
x:Name="Border_question"
|
||||
HorizontalAlignment="Center"
|
||||
|
|
@ -1090,27 +1090,31 @@
|
|||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
|
||||
|
||||
<Button
|
||||
Width="35"
|
||||
Height="22"
|
||||
Margin="0 0 5 0"
|
||||
Margin="0,0,5,0"
|
||||
Command="{x:Static SystemCommands.ShowSystemMenuCommand}"
|
||||
IsTabStop="False"
|
||||
Style="{DynamicResource SysBtnStyle}"
|
||||
WindowChrome.IsHitTestVisibleInChrome="True">
|
||||
<Button.Content>
|
||||
<Path Fill="Black" Width="10" Height="10" Stretch="Uniform">
|
||||
<Path
|
||||
Width="10"
|
||||
Height="10"
|
||||
Fill="Black"
|
||||
Stretch="Uniform">
|
||||
<Path.Data>
|
||||
<GeometryGroup>
|
||||
<PathGeometry Figures="m30 4.6871c-13.97 0-25.313 11.343-25.313 25.313 0.0001 13.97 11.343 25.313 25.313 25.313s25.313-11.343 25.313-25.313-11.343-25.313-25.313-25.313z"/>
|
||||
<PathGeometry Figures="m30.014 10.198c1.228 0 2.255 0.432 3.125 1.302s1.302 1.91 1.302 3.153c0 1.29-0.432 2.386-1.302 3.24-0.87 0.855-1.897 1.273-3.125 1.273-1.211 0-2.254-0.432-3.124-1.302s-1.331-1.952-1.331-3.211c0-1.212 0.461-2.238 1.331-3.124s1.913-1.331 3.124-1.331zm0 13.394c1.104 0 1.978 0.383 2.662 1.128 0.699 0.731 1.041 1.646 1.041 2.749v18.427c0 1.104-0.342 2.016-1.041 2.778-0.684 0.745-1.558 1.128-2.662 1.128-1.087 0-1.991-0.383-2.69-1.128-0.684-0.762-1.041-1.674-1.041-2.778v-18.427c0-1.103 0.357-2.018 1.041-2.749 0.699-0.745 1.603-1.128 2.69-1.128z"/>
|
||||
<PathGeometry Figures="m30 4.6871c-13.97 0-25.313 11.343-25.313 25.313 0.0001 13.97 11.343 25.313 25.313 25.313s25.313-11.343 25.313-25.313-11.343-25.313-25.313-25.313z" />
|
||||
<PathGeometry Figures="m30.014 10.198c1.228 0 2.255 0.432 3.125 1.302s1.302 1.91 1.302 3.153c0 1.29-0.432 2.386-1.302 3.24-0.87 0.855-1.897 1.273-3.125 1.273-1.211 0-2.254-0.432-3.124-1.302s-1.331-1.952-1.331-3.211c0-1.212 0.461-2.238 1.331-3.124s1.913-1.331 3.124-1.331zm0 13.394c1.104 0 1.978 0.383 2.662 1.128 0.699 0.731 1.041 1.646 1.041 2.749v18.427c0 1.104-0.342 2.016-1.041 2.778-0.684 0.745-1.558 1.128-2.662 1.128-1.087 0-1.991-0.383-2.69-1.128-0.684-0.762-1.041-1.674-1.041-2.778v-18.427c0-1.103 0.357-2.018 1.041-2.749 0.699-0.745 1.603-1.128 2.69-1.128z" />
|
||||
</GeometryGroup>
|
||||
</Path.Data>
|
||||
</Path>
|
||||
</Button.Content>
|
||||
</Button>
|
||||
|
||||
|
||||
<Button
|
||||
Width="35"
|
||||
Height="22"
|
||||
|
|
|
|||
Loading…
Reference in New Issue