From c3bfb9b7343afa3814e4e4971946dcc2663166fe Mon Sep 17 00:00:00 2001 From: fengjiayi <12821976+ning_xi@user.noreply.gitee.com> Date: Sun, 27 Jul 2025 23:46:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E5=B0=8F=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Library/Utils/JsonHelper.cs | 2 +- .../NewtonsoftJsonExtend.cs | 18 ++++++++++++++++++ SereinFlow.sln | 6 ------ Workbench/Serein.WorkBench.csproj | 1 + Workbench/ServiceCollectionExtensions.cs | 2 ++ Workbench/ViewModels/MainMenuBarViewModel.cs | 11 ++++------- Workbench/Views/MainMenuBarView.xaml | 3 ++- 7 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 Serein.Extend.NewtonsoftJson/NewtonsoftJsonExtend.cs diff --git a/Library/Utils/JsonHelper.cs b/Library/Utils/JsonHelper.cs index 00a73b6..0b6d06d 100644 --- a/Library/Utils/JsonHelper.cs +++ b/Library/Utils/JsonHelper.cs @@ -18,7 +18,7 @@ namespace Serein.Library.Utils /// 使用第三方包进行解析 /// /// - public static void UseJsonLibrary(IJsonProvider jsonPortal) + public static void UseJsonProvider(IJsonProvider jsonPortal) { JsonHelper.provider = jsonPortal; } diff --git a/Serein.Extend.NewtonsoftJson/NewtonsoftJsonExtend.cs b/Serein.Extend.NewtonsoftJson/NewtonsoftJsonExtend.cs new file mode 100644 index 0000000..6cb955f --- /dev/null +++ b/Serein.Extend.NewtonsoftJson/NewtonsoftJsonExtend.cs @@ -0,0 +1,18 @@ +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Serein.Library.Utils; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Serein.Extend.NewtonsoftJson +{ + public static class NewtonsoftJsonExtend + { + public static string ToJsonText(this object data) + { + return JsonHelper.Serialize(data); + } + } +} diff --git a/SereinFlow.sln b/SereinFlow.sln index 3687c74..62f0496 100644 --- a/SereinFlow.sln +++ b/SereinFlow.sln @@ -14,8 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serein.Library", "Library\Serein.Library.csproj", "{5E19D0F2-913A-4D1C-A6F8-1E1227BAA0E3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net462DllTest", "Net462DllTest\Net462DllTest.csproj", "{E40EE629-1A38-4011-88E3-9AD036869987}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serein.FlowStartTool", "FlowStartTool\Serein.FlowStartTool.csproj", "{38D0FA92-5139-4616-A41E-8186AA4C1532}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serein.Library.NodeGenerator", "Serein.Library.MyGenerator\Serein.Library.NodeGenerator.csproj", "{5F7DE0B2-A5D3-492D-AC6C-F0C39EBEF365}" @@ -52,10 +50,6 @@ Global {5E19D0F2-913A-4D1C-A6F8-1E1227BAA0E3}.Debug|Any CPU.Build.0 = Debug|Any CPU {5E19D0F2-913A-4D1C-A6F8-1E1227BAA0E3}.Release|Any CPU.ActiveCfg = Release|Any CPU {5E19D0F2-913A-4D1C-A6F8-1E1227BAA0E3}.Release|Any CPU.Build.0 = Release|Any CPU - {E40EE629-1A38-4011-88E3-9AD036869987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E40EE629-1A38-4011-88E3-9AD036869987}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E40EE629-1A38-4011-88E3-9AD036869987}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E40EE629-1A38-4011-88E3-9AD036869987}.Release|Any CPU.Build.0 = Release|Any CPU {38D0FA92-5139-4616-A41E-8186AA4C1532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {38D0FA92-5139-4616-A41E-8186AA4C1532}.Debug|Any CPU.Build.0 = Debug|Any CPU {38D0FA92-5139-4616-A41E-8186AA4C1532}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/Workbench/Serein.WorkBench.csproj b/Workbench/Serein.WorkBench.csproj index 75c0752..a597d11 100644 --- a/Workbench/Serein.WorkBench.csproj +++ b/Workbench/Serein.WorkBench.csproj @@ -63,6 +63,7 @@ + diff --git a/Workbench/ServiceCollectionExtensions.cs b/Workbench/ServiceCollectionExtensions.cs index 3c6e873..0436dec 100644 --- a/Workbench/ServiceCollectionExtensions.cs +++ b/Workbench/ServiceCollectionExtensions.cs @@ -1,4 +1,5 @@ using Microsoft.Extensions.DependencyInjection; +using Serein.Extend.NewtonsoftJson; using Serein.Library.Api; using Serein.Library.Utils; using Serein.NodeFlow.Env; @@ -54,6 +55,7 @@ namespace Serein.Workbench public static void AddFlowServices(this IServiceCollection collection) { #region 创建实例 + JsonHelper.UseJsonProvider(new NewtonsoftJsonProvider()); Func? getSyncContext = null; Dispatcher.CurrentDispatcher.Invoke(() => { diff --git a/Workbench/ViewModels/MainMenuBarViewModel.cs b/Workbench/ViewModels/MainMenuBarViewModel.cs index cf3a065..e519854 100644 --- a/Workbench/ViewModels/MainMenuBarViewModel.cs +++ b/Workbench/ViewModels/MainMenuBarViewModel.cs @@ -66,7 +66,7 @@ namespace Serein.Workbench.ViewModels /// /// 开启远程服务 /// - public ICommand OpenRemoteServerCommand { get; private set; } + public ICommand ConvertCodeCommand { get; private set; } @@ -91,7 +91,7 @@ namespace Serein.Workbench.ViewModels OpenEnvOutWindowCommand = new RelayCommand(OpenEnvOutWindow); // 打开运行输出窗口 OpenDynamicCompilerCommand = new RelayCommand(OpenDynamicCompiler); // 打开动态编译窗口 - OpenRemoteServerCommand = new RelayCommand(OpenRemoteServer); // 打开动态编译窗口 + ConvertCodeCommand = new RelayCommand(ConvertCode); // 流程图转c#代码 this.flowProjectService = flowProjectService; } @@ -130,15 +130,13 @@ namespace Serein.Workbench.ViewModels private void OpenDynamicCompiler() { } private void OpenEnvOutWindow() => LogWindow.Instance?.Show(); - private void OpenRemoteServer() + private void ConvertCode() { try { - - var env = App.GetService(); var service = env.IOC.Get(); - var text = service.ToCsharpCoreFile(); ; + var text = service.ToCsharpCoreFile(); Debug.WriteLine(text); } @@ -146,7 +144,6 @@ namespace Serein.Workbench.ViewModels { Debug.WriteLine(ex.Message); } - //flowEnvironment.StartRemoteServerAsync(); } } diff --git a/Workbench/Views/MainMenuBarView.xaml b/Workbench/Views/MainMenuBarView.xaml index b1686e5..62e9c15 100644 --- a/Workbench/Views/MainMenuBarView.xaml +++ b/Workbench/Views/MainMenuBarView.xaml @@ -35,7 +35,8 @@ - + +