mirror of
https://gitee.com/langsisi_admin/serein-flow
synced 2026-03-03 00:00:49 +08:00
重写了节点主动中断功能,修改了运行环境持久化注册已有实例的逻辑。
This commit is contained in:
@@ -1,36 +1,30 @@
|
||||
using Newtonsoft.Json;
|
||||
using Serein.Library;
|
||||
using Serein.Library.Utils;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Windows;
|
||||
|
||||
namespace Serein.Workbench
|
||||
{
|
||||
#if DEBUG
|
||||
public class People
|
||||
{
|
||||
public string Name { get; set; }
|
||||
public int Id { get; set; }
|
||||
public int Age { get; set; }
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Interaction logic for App.xaml
|
||||
/// </summary>
|
||||
public partial class App : Application
|
||||
{
|
||||
void LoadLocalProject()
|
||||
private async Task LoadLocalProjectAsync()
|
||||
{
|
||||
|
||||
#if DEBUG
|
||||
if (1 == 1)
|
||||
{
|
||||
// 这里是我自己的测试代码,你可以删除
|
||||
// 这里是测试代码,可以删除
|
||||
string filePath;
|
||||
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";
|
||||
filePath = @"C:\Users\Az\source\repos\CLBanyunqiState\CLBanyunqiState\bin\debug\net8.0\project.dnf";
|
||||
//filePath = @"C:\Users\Az\source\repos\CLBanyunqiState\CLBanyunqiState\bin\debug\net8.0\test.dnf";
|
||||
string content = System.IO.File.ReadAllText(filePath); // 读取整个文件内容
|
||||
App.FlowProjectData = JsonConvert.DeserializeObject<SereinProjectData>(content);
|
||||
App.FileDataPath = System.IO.Path.GetDirectoryName(filePath)!; // filePath;//
|
||||
@@ -42,7 +36,7 @@ namespace Serein.Workbench
|
||||
public static SereinProjectData? FlowProjectData { get; set; }
|
||||
public static string FileDataPath { get; set; } = "";
|
||||
|
||||
private void Application_Startup(object sender, StartupEventArgs e)
|
||||
private async void Application_Startup(object sender, StartupEventArgs e)
|
||||
{
|
||||
// 检查是否传入了参数
|
||||
if (e.Args.Length == 1)
|
||||
@@ -71,7 +65,7 @@ namespace Serein.Workbench
|
||||
}
|
||||
|
||||
}
|
||||
this.LoadLocalProject();
|
||||
await this.LoadLocalProjectAsync();
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -2904,11 +2904,7 @@ namespace Serein.Workbench
|
||||
//var t = guids.Select(kvp => (kvp.Key, kvp.Value)).ToArray();
|
||||
//var result = flashText.ReplaceWords(jsonText, t);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
StringBuilder sb = new StringBuilder(jsonText);
|
||||
StringBuilder sb = new StringBuilder(jsonText);
|
||||
foreach (var kv in guids)
|
||||
{
|
||||
sb.Replace(kv.Key, kv.Value);
|
||||
|
||||
Reference in New Issue
Block a user