From 5697c7f7ceb68f3236aca6df067c35a4a04c9daa Mon Sep 17 00:00:00 2001 From: ZhaoGang <15196688790@163.com> Date: Fri, 15 Nov 2024 15:48:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=AE=A1=E9=81=93=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=B8=B2=E6=9F=93=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=BD=93direction=3D=3D0=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E8=93=9D=E8=89=B2=E8=83=BD=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserControls/Control/PipeLine/PipeLineBL.xaml | 1 + .../UserControls/Control/PipeLine/PipeLineBL.xaml.cs | 2 +- .../UserControls/Control/PipeLine/PipeLineBR.xaml | 1 + .../UserControls/Control/PipeLine/PipeLineBR.xaml.cs | 2 +- .../UserControls/Control/PipeLine/PipeLineH.xaml | 1 + .../UserControls/Control/PipeLine/PipeLineH.xaml.cs | 2 +- .../UserControls/Control/PipeLine/PipeLineTL.xaml | 1 + .../UserControls/Control/PipeLine/PipeLineTL.xaml.cs | 2 +- .../UserControls/Control/PipeLine/PipeLineTR.xaml | 1 + .../UserControls/Control/PipeLine/PipeLineTR.xaml.cs | 2 +- .../UserControls/Control/PipeLine/PipeLineV.xaml | 1 + .../UserControls/Control/PipeLine/PipeLineV.xaml.cs | 2 +- 12 files changed, 12 insertions(+), 6 deletions(-) diff --git a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBL.xaml b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBL.xaml index 817a53c6..5b2ca4fb 100644 --- a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBL.xaml +++ b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBL.xaml @@ -39,6 +39,7 @@ HorizontalAlignment="Center" VerticalAlignment="Top" Opacity="0.8" + Visibility="Collapsed" Stroke="{Binding LineBrush, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}}" StrokeDashArray="2 4" StrokeDashCap="Round" diff --git a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBL.xaml.cs b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBL.xaml.cs index ced3cd71..3aab8660 100644 --- a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBL.xaml.cs +++ b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBL.xaml.cs @@ -58,7 +58,7 @@ namespace BPASmartClient.CustomResource.UserControls Storyboard.SetTarget(da, mp);//绑定动画 Storyboard.SetTargetProperty(da, new PropertyPath("StrokeDashOffset")); sb.Children.Add(da);//添加动画 - this.mp.Visibility = Visibility.Visible; + if (Direction != 0) this.mp.Visibility = Visibility.Visible; sb.Begin();//播放动画 } diff --git a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBR.xaml b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBR.xaml index ff472944..1be60177 100644 --- a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBR.xaml +++ b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBR.xaml @@ -35,6 +35,7 @@ Canvas.Top="21" Width="150" Height="150" + Visibility="Collapsed" Opacity="0.8" Stroke="{Binding LineBrush, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}}" StrokeDashArray="2 4" diff --git a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBR.xaml.cs b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBR.xaml.cs index 04b15b00..965bd61a 100644 --- a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBR.xaml.cs +++ b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineBR.xaml.cs @@ -58,7 +58,7 @@ namespace BPASmartClient.CustomResource.UserControls Storyboard.SetTarget(da, mp);//绑定动画 Storyboard.SetTargetProperty(da, new PropertyPath("StrokeDashOffset")); sb.Children.Add(da);//添加动画 - this.mp.Visibility = Visibility.Visible; + if (Direction != 0) this.mp.Visibility = Visibility.Visible; sb.Begin();//播放动画 } diff --git a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineH.xaml b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineH.xaml index ed3cf71c..8b5f5363 100644 --- a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineH.xaml +++ b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineH.xaml @@ -31,6 +31,7 @@ Stroke="{Binding LineBrush, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}}" StrokeDashArray="2 4" StrokeDashCap="Round" + Visibility="Collapsed" StrokeEndLineCap="Round" StrokeStartLineCap="Round" StrokeThickness="4" /> diff --git a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineH.xaml.cs b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineH.xaml.cs index 6ca5a3aa..4fd287cf 100644 --- a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineH.xaml.cs +++ b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineH.xaml.cs @@ -72,7 +72,7 @@ namespace BPASmartClient.CustomResource.UserControls Storyboard.SetTarget(da, mp);//绑定动画 Storyboard.SetTargetProperty(da, new PropertyPath("StrokeDashOffset")); sb.Children.Add(da);//添加动画 - this.mp.Visibility = Visibility.Visible; + if(Direction!=0) this.mp.Visibility = Visibility.Visible; sb.Begin();//播放动画 } diff --git a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTL.xaml b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTL.xaml index f5d59369..10175219 100644 --- a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTL.xaml +++ b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTL.xaml @@ -36,6 +36,7 @@ Canvas.Bottom="21" Width="150" Height="150" + Visibility="Collapsed" Opacity="0.8" Stroke="{Binding LineBrush, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}}" StrokeDashArray="2 4" diff --git a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTL.xaml.cs b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTL.xaml.cs index f2105402..9f9a6102 100644 --- a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTL.xaml.cs +++ b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTL.xaml.cs @@ -58,7 +58,7 @@ namespace BPASmartClient.CustomResource.UserControls Storyboard.SetTarget(da, mp);//绑定动画 Storyboard.SetTargetProperty(da, new PropertyPath("StrokeDashOffset")); sb.Children.Add(da);//添加动画 - this.mp.Visibility = Visibility.Visible; + if (Direction != 0) this.mp.Visibility = Visibility.Visible; sb.Begin();//播放动画 } diff --git a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTR.xaml b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTR.xaml index 82b97a04..0b34d9e9 100644 --- a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTR.xaml +++ b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTR.xaml @@ -43,6 +43,7 @@ StrokeDashArray="2 4" StrokeDashCap="Round" StrokeEndLineCap="Round" + Visibility="Collapsed" StrokeStartLineCap="Round" StrokeThickness="4" /> diff --git a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTR.xaml.cs b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTR.xaml.cs index a75e9abe..3dc19f25 100644 --- a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTR.xaml.cs +++ b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineTR.xaml.cs @@ -58,7 +58,7 @@ namespace BPASmartClient.CustomResource.UserControls Storyboard.SetTarget(da, mp);//绑定动画 Storyboard.SetTargetProperty(da, new PropertyPath("StrokeDashOffset")); sb.Children.Add(da);//添加动画 - this.mp.Visibility = Visibility.Visible; + if (Direction != 0) this.mp.Visibility = Visibility.Visible; sb.Begin();//播放动画 } diff --git a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineV.xaml b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineV.xaml index 6d8da16e..1b26578a 100644 --- a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineV.xaml +++ b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineV.xaml @@ -31,6 +31,7 @@ Stroke="{Binding LineBrush, RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}}" StrokeDashArray="2 4" StrokeDashCap="Round" + Visibility="Collapsed" StrokeEndLineCap="Round" StrokeStartLineCap="Round" StrokeThickness="4" /> diff --git a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineV.xaml.cs b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineV.xaml.cs index f91552bc..7b8b50c8 100644 --- a/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineV.xaml.cs +++ b/BPASmartClient.CustomResource/UserControls/Control/PipeLine/PipeLineV.xaml.cs @@ -71,7 +71,7 @@ namespace BPASmartClient.CustomResource.UserControls Storyboard.SetTarget(da, mp);//绑定动画 Storyboard.SetTargetProperty(da, new PropertyPath("StrokeDashOffset")); sb.Children.Add(da);//添加动画 - this.mp.Visibility = Visibility.Visible; + if (Direction != 0) this.mp.Visibility = Visibility.Visible; sb.Begin();//播放动画 }