zhusenlin/serein-flow
1
0
Fork 0
mirror of https://gitee.com/langsisi_admin/serein-flow synced 2026-04-18 05:46:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

更改了节点控件的布局

Browse Source
This commit is contained in:
fengjiayi
2024-12-12 21:09:29 +08:00
parent 589c0490bf
commit c1ef7eb8e4
7 changed files with 62 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Library/FlowNode/MethodDetails.cs
View File

@@ -31,7 +31,7 @@ namespace Serein.Library
/// <summary> /// <summary>
/// 是否保护参数（目前仅视觉效果参数，不影响运行实现，后续将设置作用在运行逻辑中） /// 是否保护参数
/// </summary> /// </summary>
[PropertyInfo(IsNotification = true)] [PropertyInfo(IsNotification = true)]
private bool _isProtectionParameter; private bool _isProtectionParameter;

7
Library/FlowNode/NodeModelBaseFunc.cs
View File

@@ -106,6 +106,9 @@ namespace Serein.Library
ParameterData = parameterData.ToArray(), ParameterData = parameterData.ToArray(),
ErrorNodes = errorNodes.ToArray(), ErrorNodes = errorNodes.ToArray(),
Position = Position, Position = Position,
IsProtectionParameter = this.MethodDetails.IsProtectionParameter,
IsInterrupt = this.DebugSetting.IsInterrupt,
IsEnable = this.DebugSetting.IsEnable,
}; };
nodeInfo = SaveCustomData(nodeInfo); nodeInfo = SaveCustomData(nodeInfo);
return nodeInfo; return nodeInfo;
@@ -130,6 +133,10 @@ namespace Serein.Library
this.Guid = nodeInfo.Guid; this.Guid = nodeInfo.Guid;
this.Position = nodeInfo.Position ?? new PositionOfUI(0, 0);// 加载位置信息 this.Position = nodeInfo.Position ?? new PositionOfUI(0, 0);// 加载位置信息
var md = this.MethodDetails; // 当前节点的方法说明 var md = this.MethodDetails; // 当前节点的方法说明
this.MethodDetails.IsProtectionParameter = nodeInfo.IsProtectionParameter; // 保护参数
this.DebugSetting.IsInterrupt = nodeInfo.IsInterrupt; // 是否中断
this.DebugSetting.IsEnable = nodeInfo.IsEnable; // 是否使能
if (md != null) if (md != null)
{ {
if(md.ParameterDetailss == null) if(md.ParameterDetailss == null)

17
Library/FlowNode/SereinProjectData.cs
View File

@@ -241,10 +241,23 @@ namespace Serein.Library
public PositionOfUI Position { get; set; } public PositionOfUI Position { get; set; }
/// <summary> /// <summary>
/// 是否选中（暂时无效） /// 是否中断
/// </summary> /// </summary>
public bool IsSelect { get; set; } public bool IsInterrupt { get; set; }
/// <summary>
/// 是否使能
/// </summary>
public bool IsEnable { get; set; }
/// <summary>
/// 是否保护参数
/// </summary>
public bool IsProtectionParameter { get; set; }
/// <summary> /// <summary>
/// 自定义数据 /// 自定义数据

2
WorkBench/App.xaml.cs
View File

@@ -16,7 +16,7 @@ namespace Serein.Workbench
{ {
#if DEBUG #if DEBUG
if (1 == 11) if (1 == 1)
{ {
// 这里是我自己的测试代码，你可以删除 // 这里是我自己的测试代码，你可以删除
string filePath; string filePath;

35
WorkBench/Node/View/ActionNodeControl.xaml
View File

@@ -109,23 +109,24 @@
</Border> </Border>
</Grid> </Grid>
<Grid Grid.Row="4" Background="Azure" > <StackPanel Grid.Row="4" Background="Azure" Orientation="Horizontal" Margin="3">
<Grid.RowDefinitions> <StackPanel Orientation="Horizontal" Margin="2,1,2,1">
<RowDefinition Height="*"/> <CheckBox IsChecked="{Binding NodeModel.DebugSetting.IsEnable, Mode=TwoWay}"/>
<RowDefinition Height="*"/> <TextBlock Text="是否使能" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<RowDefinition Height="*"/> </StackPanel>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/> <StackPanel Orientation="Horizontal" Margin="2,1,2,1">
<ColumnDefinition Width="*"/> <CheckBox IsChecked="{Binding NodeModel.MethodDetails.IsProtectionParameter, Mode=TwoWay}"/>
</Grid.ColumnDefinitions> <TextBlock Text="参数保护" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<CheckBox Grid.Row="0" Grid.Column="0" IsChecked="{Binding NodeModel.DebugSetting.IsEnable, Mode=TwoWay}"/> </StackPanel>
<TextBlock Grid.Row="0" Grid.Column="1" Text="是否使能" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<CheckBox Grid.Row="1" Grid.Column="0" IsChecked="{Binding NodeModel.MethodDetails.IsProtectionParameter, Mode=TwoWay}"/> <StackPanel Orientation="Horizontal" Margin="2,1,2,1">
<TextBlock Grid.Row="1" Grid.Column="1" Text="参数保护" HorizontalAlignment="Left" VerticalAlignment="Center"/> <CheckBox IsChecked="{Binding NodeModel.DebugSetting.IsInterrupt, Mode=TwoWay}"/>
<CheckBox Grid.Row="2" Grid.Column="0" IsChecked="{Binding NodeModel.DebugSetting.IsInterrupt, Mode=TwoWay}"/> <TextBlock Text="中断节点" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<TextBlock Grid.Row="2" Grid.Column="1" Text="中断节点" HorizontalAlignment="Left" VerticalAlignment="Center"/> </StackPanel>
</Grid>
</StackPanel>
</Grid> </Grid>

35
WorkBench/Node/View/FlipflopNodeControl.xaml
View File

@@ -86,23 +86,24 @@
</Border> </Border>
</Grid> </Grid>
<Grid Grid.Row="4" Background="Azure" > <StackPanel Grid.Row="4" Background="Azure" Orientation="Horizontal" Margin="3">
<Grid.RowDefinitions> <StackPanel Orientation="Horizontal" Margin="2,1,2,1">
<RowDefinition Height="*"/> <CheckBox IsChecked="{Binding NodeModel.DebugSetting.IsEnable, Mode=TwoWay}"/>
<RowDefinition Height="*"/> <TextBlock Text="是否使能" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<RowDefinition Height="*"/> </StackPanel>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/> <StackPanel Orientation="Horizontal" Margin="2,1,2,1">
<ColumnDefinition Width="*"/> <CheckBox IsChecked="{Binding NodeModel.MethodDetails.IsProtectionParameter, Mode=TwoWay}"/>
</Grid.ColumnDefinitions> <TextBlock Text="参数保护" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<CheckBox Grid.Row="0" Grid.Column="0" IsChecked="{Binding NodeModel.DebugSetting.IsEnable, Mode=TwoWay}"/> </StackPanel>
<TextBlock Grid.Row="0" Grid.Column="1" Text="是否使能" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<CheckBox Grid.Row="1" Grid.Column="0" IsChecked="{Binding NodeModel.MethodDetails.IsProtectionParameter, Mode=TwoWay}"/> <StackPanel Orientation="Horizontal" Margin="2,1,2,1">
<TextBlock Grid.Row="1" Grid.Column="1" Text="参数保护" HorizontalAlignment="Left" VerticalAlignment="Center"/> <CheckBox IsChecked="{Binding NodeModel.DebugSetting.IsInterrupt, Mode=TwoWay}"/>
<CheckBox Grid.Row="2" Grid.Column="0" IsChecked="{Binding NodeModel.DebugSetting.IsInterrupt, Mode=TwoWay}"/> <TextBlock Text="中断节点" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<TextBlock Grid.Row="2" Grid.Column="1" Text="中断节点" HorizontalAlignment="Left" VerticalAlignment="Center"/> </StackPanel>
</Grid>
</StackPanel>
<!--<themes:ConditionControl Grid.Row="2" ></themes:ConditionControl>--> <!--<themes:ConditionControl Grid.Row="2" ></themes:ConditionControl>-->
</Grid> </Grid>
</Border> </Border>

4
WorkBench/Serein.WorkBench.csproj
View File

@@ -56,9 +56,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<!--<PackageReference Include="MySqlConnector" Version="2.4.0" /> <PackageReference Include="MySqlConnector" Version="2.4.0" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.170" /> <PackageReference Include="SqlSugarCore" Version="5.1.4.170" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.171" />--> <PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.171" />
<!--<PackageReference Include="LivetCask2" Version="4.0.2" />--> <!--<PackageReference Include="LivetCask2" Version="4.0.2" />-->
<!--<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />--> <!--<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />-->