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

1. Workben项目中，优化了Node的入参类型与返回类型包含泛型成员的类型显示。

Browse Source
This commit is contained in:
fengjiayi
2025-07-31 09:54:30 +08:00
parent 152077e9b5
commit 85d04029dc
23 changed files with 583 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@
xmlns:themes="clr-namespace:Serein.Workbench.Themes"
d:DataContext="{d:DesignInstance vm:ActionNodeControlViewModel}"
mc:Ignorable="d"
MaxWidth="300">
MaxWidth="500">
<UserControl.Resources>
<!--<BooleanToVisibilityConverter x:Key="BoolToVisConverter" />-->
@@ -86,7 +86,7 @@
<TextBlock Text="result ->" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border>
<Border Grid.Column="1" BorderThickness="1">
<TextBlock Text="{Binding NodeModel.MethodDetails.ReturnType.FullName, Mode=OneTime}" TextTrimming="CharacterEllipsis" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<TextBlock Text="{Binding NodeModel.MethodDetails.ReturnType, Converter={StaticResource TypeNameDisplaynConverter}}" TextTrimming="CharacterEllipsis" HorizontalAlignment="Left" VerticalAlignment="Center"/>
</Border>
<Border Grid.Column="2" BorderThickness="1">

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

@@ -8,7 +8,7 @@
xmlns:themes="clr-namespace:Serein.Workbench.Themes"
d:DataContext="{d:DesignInstance vm:ConditionNodeControlViewModel}"
mc:Ignorable="d"
MaxWidth="300">
MaxWidth="500">
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="BoolToVis" />

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

@@ -7,7 +7,7 @@
xmlns:vm="clr-namespace:Serein.Workbench.Node.ViewModel"
d:DataContext="{d:DesignInstance vm:ExpOpNodeControlViewModel}"
mc:Ignorable="d"
MaxWidth="300">
MaxWidth="500">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"/>

4
Workbench/Node/View/FlipflopNodeControl.xaml
View File

@@ -9,7 +9,7 @@
xmlns:themes="clr-namespace:Serein.Workbench.Themes"
d:DataContext="{d:DesignInstance vm:FlipflopNodeControlViewModel}"
mc:Ignorable="d"
MaxWidth="300">
MaxWidth="500">
<UserControl.Resources>
<vm:TypeToStringConverter x:Key="TypeToStringConverter"/>
@@ -70,7 +70,7 @@
<TextBlock Text="result ->" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border>
<Border Grid.Column="1" BorderThickness="1">
<TextBlock Text="{Binding NodeModel.MethodDetails.ReturnType.FullName, Mode=OneTime}" TextTrimming="CharacterEllipsis" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<TextBlock Text="{Binding NodeModel.MethodDetails.ReturnType, Converter={StaticResource TypeNameDisplaynConverter}}" TextTrimming="CharacterEllipsis" HorizontalAlignment="Left" VerticalAlignment="Center"/>
</Border>
<Border Grid.Column="2" BorderThickness="1">

1
Workbench/Node/View/FlowCallNodeControl.xaml
View File

@@ -9,7 +9,6 @@
xmlns:themes="clr-namespace:Serein.Workbench.Themes"
mc:Ignorable="d"
MaxWidth="300"
d:DataContext="{d:DesignInstance vm:FlowCallNodeControlViewModel}">
<UserControl.Resources>

14
Workbench/Node/View/FlowCallNodeControl.xaml.cs
View File

@@ -38,14 +38,20 @@ namespace Serein.Workbench.Node.View
ViewModel = viewModel;
viewModel.NodeModel.DisplayName = "[流程接口]";
InitializeComponent();
ViewModel.UploadMethodDetailsControl = UploadMethodDetailsControl;
ViewModel.UploadNode = UploadMethodDetailsControl;
}
private void UploadMethodDetailsControl(MethodDetails methodDetails)
private void UploadMethodDetailsControl(IFlowNode? flowNode)
{
//MethodDetailsControl.MethodDetails = methodDetails;
if(flowNode is null)
{
this.MaxWidth = 300;
}
else
{
this.MaxWidth = 300;
}
}
/// <summary>

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

@@ -4,10 +4,10 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Serein.Workbench.Node.View"
xmlns:vm="clr-namespace:Serein.Workbench.Node.ViewModel"
d:DataContext="{d:DesignInstance vm:GlobalDataNodeControlViewModel}"
mc:Ignorable="d"
MaxWidth="300">
xmlns:vm="clr-namespace:Serein.Workbench.Node.ViewModel"
d:DataContext="{d:DesignInstance vm:GlobalDataNodeControlViewModel}"
mc:Ignorable="d"
MaxWidth="500">
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="BoolToVis" />
</UserControl.Resources>

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

@@ -10,7 +10,7 @@
d:DataContext="{d:DesignInstance vm:NetScriptNodeControlViewModel}"
mc:Ignorable="d"
MinWidth="50">
MaxWidth="500">
<Grid Background="#FEFAF4">
<Grid.RowDefinitions>

4
Workbench/Node/View/ScriptNodeControl.xaml
View File

@@ -9,7 +9,7 @@
xmlns:avalonEdit="http://icsharpcode.net/sharpdevelop/avalonedit"
d:DataContext="{d:DesignInstance vm:ScriptNodeControlViewModel}"
mc:Ignorable="d"
MinWidth="50">
MaxWidth="500">
<Grid Background="#FEFAF4">
@@ -79,7 +79,7 @@
<TextBlock Text="result ->" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border>
<Border Grid.Column="1" BorderThickness="1">
<TextBlock Text="{Binding NodeModel.MethodDetails.ReturnType}" TextTrimming="CharacterEllipsis" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<TextBlock Text="{Binding NodeModel.MethodDetails.ReturnType, Converter={StaticResource TypeNameDisplaynConverter}}" TextTrimming="CharacterEllipsis" HorizontalAlignment="Left" VerticalAlignment="Center"/>
</Border>
<Border Grid.Column="2" BorderThickness="1">