修复流程图连线对齐

This commit is contained in:
zhengxuan.zhang
2026-05-07 11:45:17 +08:00
parent 964284d4b1
commit aa39f8ca95
@@ -148,7 +148,7 @@
<DataTemplate> <DataTemplate>
<Border <Border
x:Name="NodeContainer" x:Name="NodeContainer"
Margin="2" Margin="2,0"
Padding="2" Padding="2"
Tag="{Binding DataContext, ElementName=RootControl}" Tag="{Binding DataContext, ElementName=RootControl}"
Background="Transparent" Background="Transparent"
@@ -170,26 +170,14 @@
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Line <!-- 贯穿整行的竖线,Margin负值延伸到ListBoxItem边界外,确保节点间无断点 -->
x:Name="TopLine" <Rectangle
x:Name="ConnectLine"
Width="2"
Margin="0,-4"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Top" VerticalAlignment="Stretch"
Stroke="#5B9BD5" Fill="#5B9BD5" />
StrokeThickness="2"
X1="0"
X2="0"
Y1="0"
Y2="10" />
<Line
x:Name="BottomLine"
HorizontalAlignment="Center"
VerticalAlignment="Bottom"
Stroke="#5B9BD5"
StrokeThickness="2"
X1="0"
X2="0"
Y1="0"
Y2="14" />
<Border <Border
x:Name="IconBorder" x:Name="IconBorder"
@@ -226,14 +214,10 @@
</Grid> </Grid>
</Border> </Border>
<DataTemplate.Triggers> <DataTemplate.Triggers>
<DataTrigger Binding="{Binding Order}" Value="0">
<Setter TargetName="TopLine" Property="Visibility" Value="Collapsed" />
</DataTrigger>
<DataTrigger Binding="{Binding IsEnabled}" Value="False"> <DataTrigger Binding="{Binding IsEnabled}" Value="False">
<Setter TargetName="NodeContainer" Property="Background" Value="{StaticResource DisabledNodeBg}" /> <Setter TargetName="NodeContainer" Property="Background" Value="{StaticResource DisabledNodeBg}" />
<Setter TargetName="NodeContainer" Property="Opacity" Value="0.78" /> <Setter TargetName="NodeContainer" Property="Opacity" Value="0.78" />
<Setter TargetName="TopLine" Property="Stroke" Value="{StaticResource DisabledNodeLine}" /> <Setter TargetName="ConnectLine" Property="Fill" Value="{StaticResource DisabledNodeLine}" />
<Setter TargetName="BottomLine" Property="Stroke" Value="{StaticResource DisabledNodeLine}" />
<Setter TargetName="IconBorder" Property="BorderBrush" Value="{StaticResource DisabledNodeLine}" /> <Setter TargetName="IconBorder" Property="BorderBrush" Value="{StaticResource DisabledNodeLine}" />
<Setter TargetName="IconBorder" Property="Background" Value="#ECECEC" /> <Setter TargetName="IconBorder" Property="Background" Value="#ECECEC" />
<Setter TargetName="NodeTitle" Property="Foreground" Value="{StaticResource DisabledNodeText}" /> <Setter TargetName="NodeTitle" Property="Foreground" Value="{StaticResource DisabledNodeText}" />
@@ -249,8 +233,7 @@
<DataTrigger Binding="{Binding IsSkippedByExecutionRange}" Value="True"> <DataTrigger Binding="{Binding IsSkippedByExecutionRange}" Value="True">
<Setter TargetName="NodeContainer" Property="Background" Value="#FAFAFA" /> <Setter TargetName="NodeContainer" Property="Background" Value="#FAFAFA" />
<Setter TargetName="NodeContainer" Property="Opacity" Value="0.72" /> <Setter TargetName="NodeContainer" Property="Opacity" Value="0.72" />
<Setter TargetName="TopLine" Property="Stroke" Value="#D0D0D0" /> <Setter TargetName="ConnectLine" Property="Fill" Value="#D0D0D0" />
<Setter TargetName="BottomLine" Property="Stroke" Value="#D0D0D0" />
<Setter TargetName="IconBorder" Property="BorderBrush" Value="#C8C8C8" /> <Setter TargetName="IconBorder" Property="BorderBrush" Value="#C8C8C8" />
<Setter TargetName="IconBorder" Property="Background" Value="#F4F4F4" /> <Setter TargetName="IconBorder" Property="Background" Value="#F4F4F4" />
<Setter TargetName="NodeTitle" Property="Foreground" Value="#909090" /> <Setter TargetName="NodeTitle" Property="Foreground" Value="#909090" />
@@ -362,8 +345,27 @@
FontSize="11" FontSize="11"
Text="{Binding SliderValue, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" /> Text="{Binding SliderValue, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" />
<Grid Grid.Column="1">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<TextBlock
HorizontalAlignment="Left"
FontFamily="{StaticResource UiFont}"
FontSize="9"
Foreground="#999999"
Text="{Binding SliderMinimum}" />
<TextBlock
HorizontalAlignment="Right"
FontFamily="{StaticResource UiFont}"
FontSize="9"
Foreground="#999999"
Text="{Binding SliderMaximum}" />
</Grid>
<Slider <Slider
Grid.Column="1" Grid.Row="1"
VerticalAlignment="Center" VerticalAlignment="Center"
IsSnapToTickEnabled="{Binding IsIntegerSlider}" IsSnapToTickEnabled="{Binding IsIntegerSlider}"
LargeChange="{Binding SliderTickFrequency}" LargeChange="{Binding SliderTickFrequency}"
@@ -373,6 +375,7 @@
TickFrequency="{Binding SliderTickFrequency}" TickFrequency="{Binding SliderTickFrequency}"
Value="{Binding SliderValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" /> Value="{Binding SliderValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
</Grid> </Grid>
</Grid>
<TextBox <TextBox
Grid.Column="1" Grid.Column="1"
@@ -402,6 +405,7 @@
Grid.Column="1" Grid.Column="1"
MinHeight="24" MinHeight="24"
Padding="4,1" Padding="4,1"
HorizontalContentAlignment="Center"
BorderBrush="#CDCBCB" BorderBrush="#CDCBCB"
BorderThickness="1" BorderThickness="1"
FontFamily="{StaticResource UiFont}" FontFamily="{StaticResource UiFont}"