From f5351103846e337030f0d337ecbbd2d329fe20c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E6=99=BA=E7=BA=AF?= <于智纯@LODESTAR> Date: Tue, 16 Sep 2025 23:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=80=E5=87=BA=E7=BA=BF?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DeedyDesigner/Deedy.Activity/ActionViewer.cs | 24 ++++++++++++++++++- .../Collection/LogInfoCollection.cs | 1 + .../Contract/Interface/IExitlineManageable.cs | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/DeedyDesigner/Deedy.Activity/ActionViewer.cs b/DeedyDesigner/Deedy.Activity/ActionViewer.cs index 592659e..14bea25 100644 --- a/DeedyDesigner/Deedy.Activity/ActionViewer.cs +++ b/DeedyDesigner/Deedy.Activity/ActionViewer.cs @@ -46,6 +46,7 @@ namespace Deedy.Activity { ToolTipService.SetInitialShowDelay(this, 0); ToolTipService.SetBetweenShowDelay(this, 0); + this.LogInfos = new LogInfoCollection(); } public override void OnApplyTemplate() { @@ -244,6 +245,7 @@ namespace Deedy.Activity { this.ToolTip = logInfo.ToString(); //TODO:更新消息显示图标 + this.LogInfos.Add(logInfo); } } @@ -570,8 +572,26 @@ namespace Deedy.Activity { if ((exitlinemanageable.ExitlinePosition & ExitlinePosition.LeftLower) == ExitlinePosition.LeftLower) this.ShowLeftExitline = Visibility.Visible; - if ((exitlinemanageable.ExitlinePosition & ExitlinePosition.Rightlower) == ExitlinePosition.Rightlower) + else if ((exitlinemanageable.ExitlinePosition & ExitlinePosition.Rightlower) == ExitlinePosition.Rightlower) this.ShowRightExitline = Visibility.Visible; + else if ((exitlinemanageable.ExitlinePosition & ExitlinePosition.Underline) == ExitlinePosition.Underline) + { + this.ShowLeftExitline = Visibility.Visible; + this.ShowRightExitline = Visibility.Visible; + } + + if (exitlinemanageable.ExitlinePosition == ExitlinePosition.LeftLower || exitlinemanageable.ExitlinePosition == ExitlinePosition.Rightlower) + { + //TODO:根据退出线方向是否相同的设置项调整子节点的退出线位置 + if (exitlinemanageable.IsExitlineAtSamePosition == true) + { + + } + if (exitlinemanageable.IsExitlineAtSamePosition == false) + { + + } + } } if (newValue is ILogicController logicController) { @@ -608,6 +628,8 @@ namespace Deedy.Activity case nameof(IActionElement.InstantInfo): this.InstantInfo = this.ActionElement.InstantInfo; break; + case nameof(IExitlineManageable): + break; default: break; } } diff --git a/DeedyDesigner/Deedy.Activity/Collection/LogInfoCollection.cs b/DeedyDesigner/Deedy.Activity/Collection/LogInfoCollection.cs index 600da22..25c8e21 100644 --- a/DeedyDesigner/Deedy.Activity/Collection/LogInfoCollection.cs +++ b/DeedyDesigner/Deedy.Activity/Collection/LogInfoCollection.cs @@ -9,5 +9,6 @@ namespace Deedy.Activity { public class LogInfoCollection : ObservableCollection { + public LogInfoCollection(int limt = 50) { } } } diff --git a/DeedyDesigner/Deedy.Activity/Contract/Interface/IExitlineManageable.cs b/DeedyDesigner/Deedy.Activity/Contract/Interface/IExitlineManageable.cs index 2c43099..57ae6ce 100644 --- a/DeedyDesigner/Deedy.Activity/Contract/Interface/IExitlineManageable.cs +++ b/DeedyDesigner/Deedy.Activity/Contract/Interface/IExitlineManageable.cs @@ -9,5 +9,6 @@ namespace Deedy.Activity public interface IExitlineManageable { ExitlinePosition ExitlinePosition { get; set; } + bool? IsExitlineAtSamePosition { get; set; } } }