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

修改了无法保存项目文件的bug

Browse Source
This commit is contained in:
fengjiayi
2024-09-17 14:20:27 +08:00
parent e20855a076
commit afadbc5a95
36 changed files with 3023 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
WorkBench/App.xaml.cs
View File

@@ -120,7 +120,7 @@ namespace Serein.WorkBench
/// <summary>
/// 成功加载的工程文件
/// </summary>
public static SereinOutputFileData? FData { get; set; }
public static SereinProjectData? FData { get; set; }
public static string FileDataPath = "";
private void Application_Startup(object sender, StartupEventArgs e)
{
@@ -141,7 +141,7 @@ namespace Serein.WorkBench
{
// 读取文件内容
string content = System.IO.File.ReadAllText(filePath); // 读取整个文件内容
FData = JsonConvert.DeserializeObject<SereinOutputFileData>(content);
FData = JsonConvert.DeserializeObject<SereinProjectData>(content);
FileDataPath = System.IO.Path.GetDirectoryName(filePath) ?? "";
}
catch (Exception ex)
@@ -150,13 +150,13 @@ namespace Serein.WorkBench
Shutdown(); // 关闭应用程序
}
}
else if (1 == 11)
else if (1 == 1)
{
string filePath = @"F:\临时\project\U9 project.dnf";
string filePath = @"F:\临时\project\new project.dnf";
//string filePath = @"D:\Project\C#\DynamicControl\SereinFlow\.Output\Debug\net8.0-windows7.0\U9 project.dnf";
string content = System.IO.File.ReadAllText(filePath); // 读取整个文件内容
FData = JsonConvert.DeserializeObject<SereinOutputFileData>(content);
App.FileDataPath = System.IO.Path.GetDirectoryName(filePath);
App.FData = JsonConvert.DeserializeObject<SereinProjectData>(content);
App.FileDataPath = filePath;//System.IO.Path.GetDirectoryName(filePath)!;
}
}

1
WorkBench/LogWindow.xaml
View File

@@ -5,6 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Serein.WorkBench"
mc:Ignorable="d"
Topmost="False"
Title="LogWindow" Height="600" Width="400"
Closing="Window_Closing">
<Grid>

5
WorkBench/MainWindow.xaml
View File

@@ -6,6 +6,7 @@
Title="Dynamic Node Flow" Height="700" Width="1200"
AllowDrop="True" Drop="Window_Drop" DragOver="Window_DragOver"
Loaded="Window_Loaded"
ContentRendered="Window_ContentRendered"
Closing="Window_Closing">
<Window.Resources>
@@ -82,7 +83,7 @@
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Background="#F5F5F5" Orientation="Horizontal" >
<Button x:Name="ButtonDebugRun" Content="运行" Width="100" Margin="10" Click="ButtonDebugRun_Click"></Button>
<Button x:Name="ButtonDebugFlipflopNode" Content="停止" Width="100" Margin="10" Click="ButtonDebugFlipflopNode_Click"></Button>
<Button x:Name="ButtonDebugFlipflopNode" Content="结束" Width="100" Margin="10" Click="ButtonDebugFlipflopNode_Click"></Button>
</StackPanel>
<StackPanel Grid.Row="1"
@@ -136,7 +137,7 @@
<!-- Bottom-Right Thumb -->
<Thumb x:Name="BottomRightThumb"
Width="10" Height="10"
Width="40" Height="40"
DragDelta="Thumb_DragDelta_BottomRight"
Cursor="SizeNWSE"
Canvas.Left="{Binding ActualWidth, ElementName=FlowChartCanvas, Mode=OneWay, Converter={StaticResource RightThumbPositionConverter}}"

845
WorkBench/MainWindow.xaml.cs
View File

File diff suppressed because it is too large Load Diff

6
WorkBench/Node/ViewModel/ConditionNodeControlViewModel.cs
View File

@@ -35,9 +35,9 @@ namespace Serein.WorkBench.Node.ViewModel
public ConditionNodeControlViewModel(SingleConditionNode node) : base(node)
{
this.singleConditionNode = node;
IsCustomData = false;
CustomData = "";
Expression = "PASS";
//IsCustomData = false;
//CustomData = "";
//Expression = "PASS";
}
}