diff --git a/AIStudio.Wpf.Diagram.sln b/AIStudio.Wpf.Diagram.sln index e6357d6..3aefa6f 100644 --- a/AIStudio.Wpf.Diagram.sln +++ b/AIStudio.Wpf.Diagram.sln @@ -31,8 +31,6 @@ 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.Script", "Extensions\AIStudio.Wpf.Script\AIStudio.Wpf.Script.csproj", "{63C1101D-7F7C-41B0-AE78-F30DC5CEA810}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -75,10 +73,6 @@ 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 - {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 +82,6 @@ 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} - {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 33ef3a0..e7062d0 100644 --- a/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj +++ b/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj @@ -131,7 +131,6 @@ - diff --git a/AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/DragAndDropViewModel.cs b/AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/DragAndDropViewModel.cs index d4ffa07..2d9963f 100644 --- a/AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/DragAndDropViewModel.cs +++ b/AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/DragAndDropViewModel.cs @@ -15,7 +15,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Demo.ViewModels Title = "Drag & Drop"; Info = "A very simple drag & drop of flowchart demo."; - ToolBoxViewModel = new ToolBoxViewModel(); + ToolBoxViewModel = new FlowchartToolBoxViewModel(); DiagramViewModel = new DiagramViewModel(); DiagramViewModel.ShowGrid = true; DiagramViewModel.GridCellSize = new Size(100, 100); @@ -28,7 +28,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Demo.ViewModels DiagramViewModel.PropertyChanged += DiagramViewModel_PropertyChanged; } - public ToolBoxViewModel ToolBoxViewModel + public FlowchartToolBoxViewModel ToolBoxViewModel { get; private set; } diff --git a/AIStudio.Wpf.DiagramDesigner.Demo/Views/DragAndDropView.xaml b/AIStudio.Wpf.DiagramDesigner.Demo/Views/DragAndDropView.xaml index 95744d1..92dc991 100644 --- a/AIStudio.Wpf.DiagramDesigner.Demo/Views/DragAndDropView.xaml +++ b/AIStudio.Wpf.DiagramDesigner.Demo/Views/DragAndDropView.xaml @@ -14,7 +14,7 @@ - + A.png - 1.0.7 + 1.0.8 一个Wpf的Diagram控件基础库 diff --git a/Extensions/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml b/Extensions/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml index cc9500b..790e9fc 100644 --- a/Extensions/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml +++ b/Extensions/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml @@ -36,7 +36,7 @@ - + diff --git a/Extensions/AIStudio.Wpf.Flowchart/Controls/ToolBoxControl.xaml b/Extensions/AIStudio.Wpf.Flowchart/Controls/FlowchartToolBoxControl.xaml similarity index 98% rename from Extensions/AIStudio.Wpf.Flowchart/Controls/ToolBoxControl.xaml rename to Extensions/AIStudio.Wpf.Flowchart/Controls/FlowchartToolBoxControl.xaml index 087d98c..a3b2cab 100644 --- a/Extensions/AIStudio.Wpf.Flowchart/Controls/ToolBoxControl.xaml +++ b/Extensions/AIStudio.Wpf.Flowchart/Controls/FlowchartToolBoxControl.xaml @@ -1,4 +1,4 @@ - - /// Interaction logic for ToolBoxControl.xaml + /// Interaction logic for FlowchartToolBoxControl.xaml /// - public partial class ToolBoxControl : UserControl + public partial class FlowchartToolBoxControl : UserControl { - public ToolBoxControl() + public FlowchartToolBoxControl() { InitializeComponent(); - this.DataContext = new ToolBoxViewModel(); + this.DataContext = new FlowchartToolBoxViewModel(); } } } diff --git a/Extensions/AIStudio.Wpf.Flowchart/ViewModels/ToolBoxViewModel.cs b/Extensions/AIStudio.Wpf.Flowchart/ViewModels/FlowchartToolBoxViewModel.cs similarity index 94% rename from Extensions/AIStudio.Wpf.Flowchart/ViewModels/ToolBoxViewModel.cs rename to Extensions/AIStudio.Wpf.Flowchart/ViewModels/FlowchartToolBoxViewModel.cs index 5bea5b6..31e5c83 100644 --- a/Extensions/AIStudio.Wpf.Flowchart/ViewModels/ToolBoxViewModel.cs +++ b/Extensions/AIStudio.Wpf.Flowchart/ViewModels/FlowchartToolBoxViewModel.cs @@ -11,11 +11,11 @@ using AIStudio.Wpf.Flowchart.ViewModels; namespace AIStudio.Wpf.Flowchart.ViewModels { - public class ToolBoxViewModel + public class FlowchartToolBoxViewModel { private List toolBoxItems = new List(); - public ToolBoxViewModel() + public FlowchartToolBoxViewModel() { var screenScale = ScreenHelper.ResetScreenScale(); toolBoxItems.Add(new FlowchartToolBoxData(NodeKinds.Start, typeof(StartFlowNode), 80, 60, new Size(100 / screenScale, 80/ screenScale))); diff --git a/Extensions/AIStudio.Wpf.Mind/Controls/MindEditor.xaml b/Extensions/AIStudio.Wpf.Mind/Controls/MindEditor.xaml index ac863f3..fec5c72 100644 --- a/Extensions/AIStudio.Wpf.Mind/Controls/MindEditor.xaml +++ b/Extensions/AIStudio.Wpf.Mind/Controls/MindEditor.xaml @@ -176,7 +176,7 @@ - + diff --git a/Extensions/AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml b/Extensions/AIStudio.Wpf.Mind/Controls/MindToolBoxControl.xaml similarity index 99% rename from Extensions/AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml rename to Extensions/AIStudio.Wpf.Mind/Controls/MindToolBoxControl.xaml index c9106d7..3916f11 100644 --- a/Extensions/AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml +++ b/Extensions/AIStudio.Wpf.Mind/Controls/MindToolBoxControl.xaml @@ -1,4 +1,4 @@ - - /// ToolBoxControl.xaml 的交互逻辑 + /// MindToolBoxControl.xaml 的交互逻辑 /// - public partial class ToolBoxControl : UserControl + public partial class MindToolBoxControl : UserControl { - public ToolBoxControl() + public MindToolBoxControl() { InitializeComponent(); } diff --git a/Extensions/AIStudio.Wpf.SFC/.filenesting.json b/Extensions/AIStudio.Wpf.SFC/.filenesting.json new file mode 100644 index 0000000..0b71966 --- /dev/null +++ b/Extensions/AIStudio.Wpf.SFC/.filenesting.json @@ -0,0 +1,3 @@ +{ + "help":"https://go.microsoft.com/fwlink/?linkid=866610" +} \ No newline at end of file diff --git a/Extensions/AIStudio.Wpf.Script/AIStudio.Wpf.Script.csproj b/Extensions/AIStudio.Wpf.Script/AIStudio.Wpf.Script.csproj deleted file mode 100644 index 86d4b80..0000000 --- a/Extensions/AIStudio.Wpf.Script/AIStudio.Wpf.Script.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - true - - - - - - - - - - - - - 6.2.0.78 - - - - - - 6.2.0.78 - - - - diff --git a/Extensions/AIStudio.Wpf.Script/Themes/RoslynScriptViewModel.xaml b/Extensions/AIStudio.Wpf.Script/Themes/RoslynScriptViewModel.xaml deleted file mode 100644 index db7e876..0000000 --- a/Extensions/AIStudio.Wpf.Script/Themes/RoslynScriptViewModel.xaml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Extensions/AIStudio.Wpf.Script/ViewModels/RoslynScriptViewModel.cs b/Extensions/AIStudio.Wpf.Script/ViewModels/RoslynScriptViewModel.cs deleted file mode 100644 index 60cb522..0000000 --- a/Extensions/AIStudio.Wpf.Script/ViewModels/RoslynScriptViewModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AIStudio.Wpf.DiagramDesigner; - -namespace AIStudio.Wpf.CSharpScript.ViewModels -{ - public class CSharpScriptViewModel : LogicalGateItemViewModelBase - { - public CSharpScriptViewModel(LogicalType logicalType) : base(logicalType) - { - } - } -}