From d7149a570d0b4fc4fa73247ac9a8252625f270ed Mon Sep 17 00:00:00 2001 From: zengwenjie <1663900244@qq.com> Date: Wed, 17 Sep 2025 09:01:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86private=E8=AE=BF=E9=97=AE=E6=80=A7?= =?UTF-8?q?=E6=94=B9=E4=B8=BAprotected=20internal=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DeedyDesigner/Deedy.Activity/ActionViewer.cs | 24 ++++++------------- .../Contract/Interface/IContainerElement.cs | 2 +- DeedyDesigner/Deedy.Activity/Helper.cs | 17 +++++++++++++ 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/DeedyDesigner/Deedy.Activity/ActionViewer.cs b/DeedyDesigner/Deedy.Activity/ActionViewer.cs index 1d02b69..59b87ac 100644 --- a/DeedyDesigner/Deedy.Activity/ActionViewer.cs +++ b/DeedyDesigner/Deedy.Activity/ActionViewer.cs @@ -580,18 +580,7 @@ namespace Deedy.Activity this.ShowRightExitline = Visibility.Visible; } - if (exitlinemanageable.ExitlinePosition == ExitlinePosition.LeftLower || exitlinemanageable.ExitlinePosition == ExitlinePosition.Rightlower) - { - //TODO:根据退出线方向是否相同的设置项调整子节点的退出线位置 - if (exitlinemanageable.IsExitlineAtSamePosition == true) - { - //TODO:同向退出线控制 - } - if (exitlinemanageable.IsExitlineAtSamePosition == false) - { - //TODO:对向退出线控制 - } - } + this.ActionElement.AdjustExitlinePosition(); } if (newValue is ILogicController logicController) { @@ -629,6 +618,7 @@ namespace Deedy.Activity this.InstantInfo = this.ActionElement.InstantInfo; break; case nameof(IExitlineManageable): + this.ActionElement.AdjustExitlinePosition(); break; default: break; } @@ -713,9 +703,9 @@ namespace Deedy.Activity base.OnDragLeave(e); } - private bool _CanDropInParent = false; - private bool _CanDropChild = false; - private DropPlacement _DropPlacement = DropPlacement.Uncertain; + protected internal bool _CanDropInParent = false; + protected internal bool _CanDropChild = false; + protected internal DropPlacement _DropPlacement = DropPlacement.Uncertain; protected override void OnDragOver(DragEventArgs e) { if (this.IsEventNeedToHandle(e.OriginalSource)) @@ -818,8 +808,8 @@ namespace Deedy.Activity ToolTipService.SetVerticalOffset(this, position.Y + 16); } } - private readonly object _DragLock = new(); - private Point? _DragStartPoint = null; + protected internal readonly object _DragLock = new(); + protected internal Point? _DragStartPoint = null; protected override void OnPreviewMouseMove(MouseEventArgs e) { diff --git a/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs b/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs index d4b9eaa..cc9c180 100644 --- a/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs +++ b/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs @@ -20,7 +20,7 @@ namespace Deedy.Activity /// /// 如果类型上没有组装规则,则认为不允许组装,否则按照组装规则处理 /// - /// 要进行组装检查的单元实例 + /// 要进行组装检查的单元实例 /// 是否允许组装 public bool CombineChecking(IElement element, out DragDropEffects effects) { diff --git a/DeedyDesigner/Deedy.Activity/Helper.cs b/DeedyDesigner/Deedy.Activity/Helper.cs index 47d8ff3..ae2b399 100644 --- a/DeedyDesigner/Deedy.Activity/Helper.cs +++ b/DeedyDesigner/Deedy.Activity/Helper.cs @@ -212,5 +212,22 @@ namespace Deedy.Activity return default; } + public static void AdjustExitlinePosition(this IActionElement element) + { + if (element is IExitlineManageable exitlineManageable + && (exitlineManageable.ExitlinePosition == ExitlinePosition.LeftLower + || exitlineManageable.ExitlinePosition == ExitlinePosition.Rightlower)) + { + //TODO:根据退出线方向是否相同的设置项调整子节点的退出线位置 + if (exitlineManageable.IsExitlineAtSamePosition == true) + { + //TODO:同向退出线控制 + } + if (exitlineManageable.IsExitlineAtSamePosition == false) + { + //TODO:对向退出线控制 + } + } + } } }