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

修复了条件表达式".xxx<bool> = true/false"执行了错误分支，优化了流程的运行。

Browse Source
This commit is contained in:
fengjiayi
2024-12-16 00:58:45 +08:00
parent 8d0258ebea
commit 0372e1fc23
8 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
WorkBench/App.xaml.cs
View File

@@ -2,11 +2,19 @@
using Serein.Library;
using System.Diagnostics;
using System.IO;
using System.Linq.Expressions;
using System.Windows;
using System.Windows.Threading;
namespace Serein.Workbench
{
//public class A
//{
// public object Data { get; set; }
//}
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
@@ -18,14 +26,20 @@ namespace Serein.Workbench
#if DEBUG
if (1 == 1)
{
//var A = new A();
//A.Data = true;
//var expression = ".Data<bool> == True";
//var pass = Serein.Library.Utils.SereinExpression.SereinConditionParser.To(A, expression);
// 这里是我自己的测试代码，你可以删除
string filePath;
filePath = @"F:\临时\project\linux\project.dnf";
filePath = @"F:\临时\project\linux\http\project.dnf";
filePath = @"F:\临时\project\yolo flow\project.dnf";
filePath = @"F:\临时\project\data\project.dnf";
filePath = @"C:\Users\Az\source\repos\CLBanyunqiState\CLBanyunqiState\bin\Release\net8.0\project.dnf";
filePath = @"C:\Users\Az\source\repos\CLBanyunqiState\CLBanyunqiState\bin\Release\net8.0\PLCproject.dnf";
filePath = @"C:\Users\Az\source\repos\CLBanyunqiState\CLBanyunqiState\bin\Release\banyunqi\project.dnf";
string content = System.IO.File.ReadAllText(filePath); // 读取整个文件内容
App.FlowProjectData = JsonConvert.DeserializeObject<SereinProjectData>(content);
App.FileDataPath = System.IO.Path.GetDirectoryName(filePath)!; // filePath;//

6
WorkBench/MainWindow.xaml.cs
View File

@@ -2757,6 +2757,10 @@ namespace Serein.Workbench
// 遍历当前已选节点
foreach (var node in dictSelection.Values.ToArray())
{
if(node.ChildNodeGuids is null)
{
continue;
}
// 遍历这些节点的子节点，获得完整的已选节点信息
foreach (var childNodeGuid in node.ChildNodeGuids)
{
@@ -2780,7 +2784,7 @@ namespace Serein.Workbench
{
//Clipboard.SetDataObject(result, true); // 持久性设置
Clipboard.SetDataObject(jsonText, true); // 持久性设置
SereinEnv.WriteLine(InfoType.INFO, $"复制已选节点（{dictSelection.Count}个）");
SereinEnv.WriteLine(InfoType.INFO, $"复制已选节点（{dictSelection.Count}个）");
}
catch (Exception ex)
{