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

新增了脚本节点对于集合对象[]下标/key取值的语法支持。修复了加载项目文件时无法加载脚本节点变量名称的问题

Browse Source
This commit is contained in:
fengjiayi
2025-03-15 14:02:12 +08:00
parent 1e09675ef1
commit d8f4a5a2c2
6 changed files with 147 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
NodeFlow/Model/SingleScriptNode.cs
View File

@@ -143,14 +143,14 @@ namespace Serein.NodeFlow.Model
varNames.Add(pd.Name);
}
//StringBuilder sb = new StringBuilder();
//foreach (var pd in MethodDetails.ParameterDetailss)
//{
// sb.AppendLine($"let {pd.Name};"); // 提前声明这些变量
//}
//sb.Append(Script);
//var p = new SereinScriptParser(sb.ToString());
var p = new SereinScriptParser(Script);
StringBuilder sb = new StringBuilder();
foreach (var pd in MethodDetails.ParameterDetailss)
{
sb.AppendLine($"let {pd.Name};"); // 提前声明这些变量
}
sb.Append(Script);
var p = new SereinScriptParser(sb.ToString());
//var p = new SereinScriptParser(Script);
mainNode = p.Parse(); // 开始解析
}
catch (Exception ex)
@@ -168,6 +168,7 @@ namespace Serein.NodeFlow.Model
public override async Task<object?> ExecutingAsync(IDynamicContext context)
{
var @params = await GetParametersAsync(context);
//context.AddOrUpdate($"{context.Guid}_{this.Guid}_Params", @params[0]); // 后面再改
ReloadScript();// 每次都重新解析
@@ -183,9 +184,17 @@ namespace Serein.NodeFlow.Model
scriptContext.SetVarValue(argName, argData);
}
}
FlowRunCompleteHandler onFlowStop = (e) =>
{
scriptContext.OnExit();
};
var envEvent = (IFlowEnvironmentEvent)context.Env;
envEvent.OnFlowRunComplete += onFlowStop; // 防止运行后台流程
var result = await ScriptInterpreter.InterpretAsync(scriptContext, mainNode); // 从入口节点执行
envEvent.OnFlowRunComplete -= onFlowStop;
//SereinEnv.WriteLine(InfoType.INFO, "FlowContext Guid : " + context.Guid);
return result;
}
@@ -237,7 +246,6 @@ namespace Serein.NodeFlow.Model
}
else if (value is TimeSpan timeSpan)
{
Console.WriteLine($"等待{timeSpan}");
await Task.Delay(timeSpan);
}