From 033bebb6bcbb965703bf5d3f51e3c28a01690e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=89=BE=E7=AB=B9?= Date: Sun, 16 Apr 2023 23:32:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=88=B06.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AIStudio.Wpf.Diagram.sln | 12 +++---- .../AIStudio.Wpf.DiagramApp.csproj | 2 +- .../ViewModels/MainWindowViewModel.cs | 8 +++++ .../ViewModels/ScriptViewModel.cs | 35 +++++++++++++++++++ AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml | 10 ++++-- .../Enums/DiagramType.cs | 3 +- Directory.Build.Props | 2 +- .../AIStudio.Wpf.Logical.csproj | 2 +- .../AIStudio.Wpf.Script.csproj} | 12 +++++++ .../Themes/RoslynScriptViewModel.xaml | 0 .../ViewModels/RoslynScriptViewModel.cs | 0 11 files changed, 74 insertions(+), 12 deletions(-) create mode 100644 AIStudio.Wpf.DiagramApp/ViewModels/ScriptViewModel.cs rename Extensions/{AIStudio.Wpf.RoslynScript/AIStudio.Wpf.RoslynScript.csproj => AIStudio.Wpf.Script/AIStudio.Wpf.Script.csproj} (50%) rename Extensions/{AIStudio.Wpf.RoslynScript => AIStudio.Wpf.Script}/Themes/RoslynScriptViewModel.xaml (100%) rename Extensions/{AIStudio.Wpf.RoslynScript => AIStudio.Wpf.Script}/ViewModels/RoslynScriptViewModel.cs (100%) diff --git a/AIStudio.Wpf.Diagram.sln b/AIStudio.Wpf.Diagram.sln index d875a17..e6357d6 100644 --- a/AIStudio.Wpf.Diagram.sln +++ b/AIStudio.Wpf.Diagram.sln @@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Mind", "Extens EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramDesigner.Serializable", "AIStudio.Wpf.DiagramDesigner.Serializable\AIStudio.Wpf.DiagramDesigner.Serializable.csproj", "{439D0631-D9C2-4D36-BFCE-80DFCCABE9E7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.RoslynScript", "Extensions\AIStudio.Wpf.RoslynScript\AIStudio.Wpf.RoslynScript.csproj", "{E986D954-C2C5-47B9-9653-62943AE9AD85}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Script", "Extensions\AIStudio.Wpf.Script\AIStudio.Wpf.Script.csproj", "{63C1101D-7F7C-41B0-AE78-F30DC5CEA810}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -75,10 +75,10 @@ Global {439D0631-D9C2-4D36-BFCE-80DFCCABE9E7}.Debug|Any CPU.Build.0 = Debug|Any CPU {439D0631-D9C2-4D36-BFCE-80DFCCABE9E7}.Release|Any CPU.ActiveCfg = Release|Any CPU {439D0631-D9C2-4D36-BFCE-80DFCCABE9E7}.Release|Any CPU.Build.0 = Release|Any CPU - {E986D954-C2C5-47B9-9653-62943AE9AD85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E986D954-C2C5-47B9-9653-62943AE9AD85}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E986D954-C2C5-47B9-9653-62943AE9AD85}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E986D954-C2C5-47B9-9653-62943AE9AD85}.Release|Any CPU.Build.0 = Release|Any CPU + {63C1101D-7F7C-41B0-AE78-F30DC5CEA810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {63C1101D-7F7C-41B0-AE78-F30DC5CEA810}.Debug|Any CPU.Build.0 = Debug|Any CPU + {63C1101D-7F7C-41B0-AE78-F30DC5CEA810}.Release|Any CPU.ActiveCfg = Release|Any CPU + {63C1101D-7F7C-41B0-AE78-F30DC5CEA810}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -88,7 +88,7 @@ Global {CC68D39D-7935-4079-9CEB-FC2FD498D511} = {4959F170-02FB-4B7F-8F53-93DAF22713F9} {2AB69067-277E-4EE0-9949-8326A145EEE4} = {4959F170-02FB-4B7F-8F53-93DAF22713F9} {85C437B9-16D2-4076-ABCD-52029AC232FC} = {4959F170-02FB-4B7F-8F53-93DAF22713F9} - {E986D954-C2C5-47B9-9653-62943AE9AD85} = {4959F170-02FB-4B7F-8F53-93DAF22713F9} + {63C1101D-7F7C-41B0-AE78-F30DC5CEA810} = {4959F170-02FB-4B7F-8F53-93DAF22713F9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D30FC641-F06C-4E35-AEA5-48A9B6E59CE0} diff --git a/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj b/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj index 9009917..33ef3a0 100644 --- a/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj +++ b/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj @@ -131,7 +131,7 @@ - + diff --git a/AIStudio.Wpf.DiagramApp/ViewModels/MainWindowViewModel.cs b/AIStudio.Wpf.DiagramApp/ViewModels/MainWindowViewModel.cs index 092b17f..7c865a6 100644 --- a/AIStudio.Wpf.DiagramApp/ViewModels/MainWindowViewModel.cs +++ b/AIStudio.Wpf.DiagramApp/ViewModels/MainWindowViewModel.cs @@ -516,6 +516,10 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels { flow = new MindViewModel(filename, diagram); } + else if (diagram.DiagramType == DiagramType.Script) + { + flow = new ScriptViewModel(filename, diagram); + } else { flow = new PageViewModel(filename, diagram); @@ -631,6 +635,10 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels { PageViewModel = new SFCViewModel(NewNameHelper.GetNewName(DiagramsViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type)); } + else if (type == DiagramType.Script.ToString()) + { + PageViewModel = new ScriptViewModel(NewNameHelper.GetNewName(DiagramsViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type)); + } else { PageViewModel = new PageViewModel(NewNameHelper.GetNewName(DiagramsViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type)); diff --git a/AIStudio.Wpf.DiagramApp/ViewModels/ScriptViewModel.cs b/AIStudio.Wpf.DiagramApp/ViewModels/ScriptViewModel.cs new file mode 100644 index 0000000..1f26f7e --- /dev/null +++ b/AIStudio.Wpf.DiagramApp/ViewModels/ScriptViewModel.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using AIStudio.Wpf.DiagramApp.Models; +using AIStudio.Wpf.DiagramDesigner; + +namespace AIStudio.Wpf.DiagramApp.ViewModels +{ + public class ScriptViewModel : PageViewModel + { + public ScriptViewModel(string title, string status, DiagramType diagramType) : base(title, status, diagramType) + { + Init(true); + } + + public ScriptViewModel(string filename, DiagramDocument diagramDocument) : base(filename, diagramDocument) + { + if (DiagramViewModel != null) + { + + } + + + } + + protected override void InitDiagramViewModel() + { + base.InitDiagramViewModel(); + + + } + } +} diff --git a/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml b/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml index 1406b73..49c85f6 100644 --- a/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml +++ b/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml @@ -97,6 +97,13 @@ + + + + + @@ -116,8 +123,7 @@ - - + - net461;netcoreapp3.1;net5.0-windows + net461;netcoreapp3.1;net5.0-windows;net6.0-windows diff --git a/Extensions/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj b/Extensions/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj index bd351e7..4c73c51 100644 --- a/Extensions/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj +++ b/Extensions/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj @@ -5,7 +5,7 @@ - + diff --git a/Extensions/AIStudio.Wpf.RoslynScript/AIStudio.Wpf.RoslynScript.csproj b/Extensions/AIStudio.Wpf.Script/AIStudio.Wpf.Script.csproj similarity index 50% rename from Extensions/AIStudio.Wpf.RoslynScript/AIStudio.Wpf.RoslynScript.csproj rename to Extensions/AIStudio.Wpf.Script/AIStudio.Wpf.Script.csproj index 8697693..86d4b80 100644 --- a/Extensions/AIStudio.Wpf.RoslynScript/AIStudio.Wpf.RoslynScript.csproj +++ b/Extensions/AIStudio.Wpf.Script/AIStudio.Wpf.Script.csproj @@ -12,4 +12,16 @@ + + + 6.2.0.78 + + + + + + 6.2.0.78 + + + diff --git a/Extensions/AIStudio.Wpf.RoslynScript/Themes/RoslynScriptViewModel.xaml b/Extensions/AIStudio.Wpf.Script/Themes/RoslynScriptViewModel.xaml similarity index 100% rename from Extensions/AIStudio.Wpf.RoslynScript/Themes/RoslynScriptViewModel.xaml rename to Extensions/AIStudio.Wpf.Script/Themes/RoslynScriptViewModel.xaml diff --git a/Extensions/AIStudio.Wpf.RoslynScript/ViewModels/RoslynScriptViewModel.cs b/Extensions/AIStudio.Wpf.Script/ViewModels/RoslynScriptViewModel.cs similarity index 100% rename from Extensions/AIStudio.Wpf.RoslynScript/ViewModels/RoslynScriptViewModel.cs rename to Extensions/AIStudio.Wpf.Script/ViewModels/RoslynScriptViewModel.cs