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

优化了Workbench上的操作。

Browse Source
This commit is contained in:
fengjiayi
2025-05-30 23:31:31 +08:00
parent f0eb11c914
commit a19733eff5
35 changed files with 807 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Workbench/Node/View/ActionNodeControl.xaml
View File

@@ -64,7 +64,7 @@
<local:ExecuteJunctionControl Grid.Column="0" MyNode="{Binding NodeModel}" x:Name="ExecuteJunctionControl" HorizontalAlignment="Left" Grid.RowSpan="2"/>
<StackPanel Grid.Column="1" Grid.RowSpan="2" >
<TextBlock Text="{Binding NodeModel.DisplayName, Mode=TwoWay}" HorizontalAlignment="Center"/>
<TextBlock Text="{Binding NodeModel.DisplayName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center"/>
</StackPanel>
<local:NextStepJunctionControl Grid.Column="2" MyNode="{Binding NodeModel}" x:Name="NextStepJunctionControl" HorizontalAlignment="Right" Grid.RowSpan="2"/>

2
Workbench/Node/View/ConditionNodeControl.xaml
View File

@@ -39,7 +39,7 @@
<local:ExecuteJunctionControl Grid.Column="0" MyNode="{Binding NodeModel}" x:Name="ExecuteJunctionControl" HorizontalAlignment="Left" Grid.RowSpan="2"/>
<Border Grid.Column="1" BorderThickness="1" HorizontalAlignment="Stretch">
<TextBlock Text="条件节点" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding NodeModel.DisplayName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center"/>
</Border>
<local:NextStepJunctionControl Grid.Column="2" MyNode="{Binding NodeModel}" x:Name="NextStepJunctionControl" HorizontalAlignment="Right" Grid.RowSpan="2"/>

3
Workbench/Node/View/ConditionNodeControl.xaml.cs
View File

@@ -17,13 +17,14 @@ namespace Serein.Workbench.Node.View
base.ViewModel = new ConditionNodeControlViewModel (new SingleConditionNode(env));
base.ViewModel.IsEnabledOnView = false;
DataContext = ViewModel;
base.ViewModel.NodeModel.DisplayName = "[条件节点]";
InitializeComponent();
}
public ConditionNodeControl(ConditionNodeControlViewModel viewModel):base(viewModel)
{
DataContext = viewModel;
viewModel.NodeModel.DisplayName = "[条件节点]";
InitializeComponent();
}

2
Workbench/Node/View/ExpOpNodeControl.xaml
View File

@@ -27,7 +27,7 @@
<local:ExecuteJunctionControl Grid.Column="0" MyNode="{Binding NodeModel}" x:Name="ExecuteJunctionControl" HorizontalAlignment="Left" Grid.RowSpan="2"/>
<Border Grid.Column="1" BorderThickness="1" HorizontalAlignment="Stretch">
<TextBlock Text="表达式" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding NodeModel.DisplayName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center"/>
</Border>
<local:NextStepJunctionControl Grid.Column="2" MyNode="{Binding NodeModel}" x:Name="NextStepJunctionControl" HorizontalAlignment="Right" Grid.RowSpan="2"/>

2
Workbench/Node/View/ExpOpNodeControl.xaml.cs
View File

@@ -15,12 +15,14 @@ namespace Serein.Workbench.Node.View
var env = App.GetService<IFlowEnvironment>();
ViewModel = new ExpOpNodeControlViewModel(new SingleExpOpNode(env));
base.ViewModel.IsEnabledOnView = false;
base.ViewModel.NodeModel.DisplayName = "[表达式]";
DataContext = ViewModel;
InitializeComponent();
}
public ExpOpNodeControl(ExpOpNodeControlViewModel viewModel) :base(viewModel)
{
DataContext = viewModel;
viewModel.NodeModel.DisplayName = "[表达式]";
InitializeComponent();
}

2
Workbench/Node/View/GlobalDataControl.xaml
View File

@@ -37,7 +37,7 @@
<local:ExecuteJunctionControl Grid.Column="0" MyNode="{Binding NodeModel}" x:Name="ExecuteJunctionControl" HorizontalAlignment="Left" Grid.RowSpan="2"/>
<Border Grid.Column="1" BorderThickness="1" HorizontalAlignment="Stretch">
<TextBlock Text="全局数据节点" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding NodeModel.DisplayName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center"/>
</Border>
<local:NextStepJunctionControl Grid.Column="2" MyNode="{Binding NodeModel}" x:Name="NextStepJunctionControl" HorizontalAlignment="Right" Grid.RowSpan="2"/>

2
Workbench/Node/View/GlobalDataControl.xaml.cs
View File

@@ -16,6 +16,7 @@ namespace Serein.Workbench.Node.View
var env = App.GetService<IFlowEnvironment>();
base.ViewModel = new GlobalDataNodeControlViewModel(new SingleGlobalDataNode(env));
base.ViewModel.IsEnabledOnView = false;
base.ViewModel.NodeModel.DisplayName = "[全局数据]";
DataContext = ViewModel;
InitializeComponent();
}
@@ -23,6 +24,7 @@ namespace Serein.Workbench.Node.View
public GlobalDataControl(GlobalDataNodeControlViewModel viewModel) : base(viewModel)
{
DataContext = viewModel;
viewModel.NodeModel.DisplayName = "[全局数据]";
InitializeComponent();
}

3
Workbench/Node/View/ScriptNodeControl.xaml.cs
View File

@@ -73,7 +73,8 @@ namespace Serein.Workbench.Node.View
// 获取 MethodDetailsControl 实例
var methodDetailsControl = this.MethodDetailsControl;
var itemsControl = FindVisualChild<ItemsControl>(methodDetailsControl); // 查找 ItemsControl
if (itemsControl != null)
if (itemsControl != null && base.ViewModel.NodeModel.MethodDetails != null)
{
var argDataJunction = new JunctionControlBase[base.ViewModel.NodeModel.MethodDetails.ParameterDetailss.Length];
var controls = new List<JunctionControlBase>();

5
Workbench/Node/View/UINodeControl.xaml
View File

@@ -27,13 +27,14 @@
</Grid.ColumnDefinitions>
<local:ExecuteJunctionControl Grid.Column="0" MyNode="{Binding NodeModel}" x:Name="ExecuteJunctionControl" HorizontalAlignment="Left" Grid.RowSpan="2"/>
<Border Grid.Column="1" BorderThickness="1" HorizontalAlignment="Stretch">
<TextBlock Text="UI控件" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="{Binding NodeModel.DisplayName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center"/>
</Border>
</Grid>
<!--显示UI-->
<Border x:Name="EmbedContainer" Width="200" Height="200" Grid.Row="1" BorderBrush="Black" BorderThickness="1">
<!--<ContentControl />-->
</Border>

2
Workbench/Node/View/UINodeControl.xaml.cs
View File

@@ -26,6 +26,7 @@ namespace Serein.Workbench.Node.View
public UINodeControl()
{
base.ViewModel.IsEnabledOnView = true;
base.ViewModel.NodeModel.DisplayName = "[流程UI]";
InitializeComponent();
}
@@ -33,6 +34,7 @@ namespace Serein.Workbench.Node.View
{
ViewModel = viewModel;
DataContext = viewModel;
ViewModel.NodeModel.DisplayName = "[流程UI]";
InitializeComponent();