Mind 出发

Signed-off-by: 艾竹 <akwkevin@126.com>

.editorconfig

@@ -0,0 +1,135 @@
+# Rules in this file were initially inferred by Visual Studio IntelliCode from the F:\AIStudio.Wpf.Controls codebase based on best match to current usage at 2022/1/23
+# You can modify the rules from these initially generated values to suit your own policies
+# You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
+[*.cs]
+
+
+#Core editorconfig formatting - indentation
+
+#use soft tabs (spaces) for indentation
+indent_style = space
+
+#Formatting - indentation options
+
+#indent switch case contents.
+csharp_indent_case_contents = true
+#csharp_indent_case_contents_when_block
+csharp_indent_case_contents_when_block = true
+#indent switch labels
+csharp_indent_switch_labels = true
+
+#Formatting - new line options
+
+#place catch statements on a new line
+csharp_new_line_before_catch = true
+#place else statements on a new line
+csharp_new_line_before_else = true
+#require finally statements to be on a new line after the closing brace
+csharp_new_line_before_finally = true
+#require members of object intializers to be on separate lines
+csharp_new_line_before_members_in_object_initializers = true
+#require braces to be on a new line for types, control_blocks, methods, properties, object_collection_array_initializers, and accessors (also known as "Allman" style)
+csharp_new_line_before_open_brace = types, control_blocks, methods, properties, object_collection_array_initializers, accessors
+
+#Formatting - organize using options
+
+#sort System.* using directives alphabetically, and place them before other usings
+dotnet_sort_system_directives_first = true
+
+#Formatting - spacing options
+
+#require NO space between a cast and the value
+csharp_space_after_cast = false
+#require a space before the colon for bases or interfaces in a type declaration
+csharp_space_after_colon_in_inheritance_clause = true
+#require a space after a keyword in a control flow statement such as a for loop
+csharp_space_after_keywords_in_control_flow_statements = true
+#require a space before the colon for bases or interfaces in a type declaration
+csharp_space_before_colon_in_inheritance_clause = true
+#remove space within empty argument list parentheses
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+#remove space between method call name and opening parenthesis
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+#do not place space characters after the opening parenthesis and before the closing parenthesis of a method call
+csharp_space_between_method_call_parameter_list_parentheses = false
+#remove space within empty parameter list parentheses for a method declaration
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+#place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+#Formatting - wrapping options
+
+#leave code block on separate lines
+csharp_preserve_single_line_blocks = false
+#leave statements and member declarations on the same line
+csharp_preserve_single_line_statements = true
+
+#Style - Code block preferences
+
+#prefer curly braces even for one line of code
+csharp_prefer_braces = true:suggestion
+
+#Style - expression bodied member options
+
+#prefer block bodies for accessors
+csharp_style_expression_bodied_accessors = false:suggestion
+#prefer block bodies for constructors
+csharp_style_expression_bodied_constructors = false:suggestion
+#prefer block bodies for methods
+csharp_style_expression_bodied_methods = false:suggestion
+#prefer block bodies for properties
+csharp_style_expression_bodied_properties = false:suggestion
+
+#Style - expression level options
+
+#prefer out variables to be declared inline in the argument list of a method call when possible
+csharp_style_inlined_variable_declaration = true:suggestion
+#prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+#Style - Expression-level  preferences
+
+#prefer default(T) over default
+csharp_prefer_simple_default_expression = false:suggestion
+#prefer objects to be initialized using object initializers when possible
+dotnet_style_object_initializer = true:suggestion
+
+#Style - implicit and explicit types
+
+#prefer explicit type over var in all cases, unless overridden by another code style rule
+csharp_style_var_elsewhere = false:suggestion
+#prefer explicit type over var to declare variables with built-in system types such as int
+csharp_style_var_for_built_in_types = false:suggestion
+#prefer explicit type over var when the type is already mentioned on the right-hand side of a declaration
+csharp_style_var_when_type_is_apparent = false:suggestion
+
+#Style - language keyword and framework type options
+
+#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+
+#Style - modifier options
+
+#prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods.
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
+
+#Style - Modifier preferences
+
+#when this rule is set to a list of modifiers, prefer the specified ordering.
+csharp_preferred_modifier_order = public,private,protected,internal,static,readonly,override,virtual,new,async:suggestion
+
+#Style - Pattern matching
+
+#prefer is expression with type casts instead of pattern matching
+csharp_style_pattern_matching_over_as_with_null_check = false:suggestion
+
+#Style - qualification options
+
+#prefer events to be prefaced with this. in C# or Me. in Visual Basic
+dotnet_style_qualification_for_event = true:suggestion
+#prefer fields not to be prefaced with this. or Me. in Visual Basic
+dotnet_style_qualification_for_field = false:suggestion
+#prefer methods not to be prefaced with this. or Me. in Visual Basic
+dotnet_style_qualification_for_method = false:suggestion
+#prefer properties not to be prefaced with this. or Me. in Visual Basic
+dotnet_style_qualification_for_property = false:suggestion

AIStudio.Wpf.ADiagram/DesignItems/Customs/1.json

@@ -1,102 +0,0 @@
-{
-  "Title": null,
-  "DiagramType": 0,
-  "DiagramItems": [
-    {
-      "Name": null,
-      "DiagramType": 0,
-      "DesignerItems": [
-      ],
-      "PersistDesignerItems": [
-      ],
-      "SettingsDesignerItems": [
-      ],
-      "PathDesignerItems": [
-        {
-          "Left": 132.80000000000007,
-          "Top": 101.26000022888184,
-          "ScaleX": 1,
-          "ScaleY": 1,
-          "Margin": 0.0,
-          "ItemWidth": 65.0,
-          "ItemHeight": 65.0,
-          "Icon": "M 0,0 H 60 V 40 C 30,30 30,50 0,40 Z",
-          "ItemTypeName": "AIStudio.Wpf.BaseDiagram.Extensions.ViewModels.PathItemViewModel",
-          "Id": "da395032-ad9e-4dab-a035-f59bed5cb4c4",
-          "ZIndex": 0,
-          "IsGroup": false,
-          "ParentId": "00000000-0000-0000-0000-000000000000",
-          "Text": "欢迎来到AIStudio画板",
-          "ColorItem": {
-            "LineColor": {
-              "BrushType": 1,
-              "Color": "#FF808080",
-              "GradientStop": null,
-              "Offset": null,
-              "Image": null,
-              "SubType": 0,
-              "StartPoint": "0,0",
-              "EndPoint": "0,0",
-              "Opacity": 1.0,
-              "LinearOrientation": 0,
-              "RadialOrientation": 0,
-              "Angle": 0
-            },
-            "FillColor": {
-              "BrushType": 1,
-              "Color": "#FFFFA500",
-              "GradientStop": null,
-              "Offset": null,
-              "Image": null,
-              "SubType": 0,
-              "StartPoint": "0,0",
-              "EndPoint": "0,0",
-              "Opacity": 1.0,
-              "LinearOrientation": 0,
-              "RadialOrientation": 0,
-              "Angle": 0
-            },
-            "ShadowColor": "#00FFFFFF",
-            "LineWidth": 1.0,
-            "LeftArrowPathStyle": 0,
-            "RightArrowPathStyle": 1,
-            "LeftArrowSizeStyle": 10,
-            "RightArrowSizeStyle": 10
-          },
-          "FontItem": {
-            "FontWeight": "Normal",
-            "FontStyle": "Normal",
-            "FontStretch": "Normal",
-            "Underline": false,
-            "Strikethrough": false,
-            "OverLine": false,
-            "FontColor": "#FF000000",
-            "FontFamily": "Arial",
-            "FontSize": 11.0,
-            "FontObject": "Arial, 11pt",
-            "TextEffectColor": "#00FFFFFF",
-            "HighlightColor": "#00FFFFFF",
-            "FontCase": 0,
-            "HorizontalAlignment": 1,
-            "VerticalAlignment": 1,
-            "LineHeight": 0.0
-          }
-        }
-      ],
-      "MediaDesignerItems": [
-      ],
-      "ImageDesignerItems": [
-      ],
-      "TextDesignerItems": [
-      ],
-      "LogicalGateItems": [
-      ],
-      "FlowNodeDesignerItems": [
-      ],
-      "ConnectionIds": [
-      ],
-      "Connections": [
-      ]
-    }
-  ]
-}

AIStudio.Wpf.ADiagram/Models/DiagramItem.cs

@@ -1,294 +0,0 @@
-using Util.DiagramDesigner;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
-using System.Xml.Serialization;
-using AIStudio.Wpf.Flowchart;
-using AIStudio.Wpf.BaseDiagram.Extensions.ViewModels;
-using AIStudio.Wpf.BaseDiagram.Extensions.Models;
-using Newtonsoft.Json;
-using AIStudio.Wpf.Flowchart.Models;
-using AIStudio.Wpf.Flowchart.ViewModels;
-using AIStudio.Wpf.SFC.Models;
-using AIStudio.Wpf.SFC.ViewModels;
-using System.Windows;
-using System.Windows.Media;
-
-namespace AIStudio.Wpf.ADiagram.Models
-{
-    [Serializable]
-    public class DiagramItem
-    {
-        public DiagramItem()
-        {
-            this.ConnectionIds = new List<Guid>();
-            this.Connections = new List<ConnectionItem>();
-        }
-
-        [XmlAttribute]
-        public string Name { get; set; }
-
-        [XmlAttribute]
-        public DiagramType DiagramType { get; set; }
-
-        [XmlAttribute]
-        public bool ShowGrid { get; set; }
-
-        [XmlIgnore]
-        public Size GridCellSize { get; set; }
-
-        [JsonIgnore]
-        [XmlAttribute("GridCellSize")]
-        public string XmlGridCellSize
-        {
-            get
-            {
-                return SerializeHelper.SerializeSize(GridCellSize);
-            }
-            set
-            {
-                GridCellSize = SerializeHelper.DeserializeSize(value);
-            }
-        }
-
-        [XmlAttribute]
-        public CellHorizontalAlignment CellHorizontalAlignment { get; set; }
-
-        [XmlAttribute]
-        public CellVerticalAlignment CellVerticalAlignment { get; set; }
-
-        [XmlAttribute]
-        public PageSizeOrientation PageSizeOrientation { get; set; }
-
-        [XmlIgnore]
-        public Size PageSize { get; set; }
-
-        [JsonIgnore]
-        [XmlAttribute("PageSize")]
-        public string XmlPageSize
-        {
-            get
-            {
-                return SerializeHelper.SerializeSize(PageSize);
-            }
-            set
-            {
-                PageSize = SerializeHelper.DeserializeSize(value);
-            }
-        }
-
-        [XmlAttribute]
-        public PageSizeType PageSizeType { get; set; }
-
-        [XmlAttribute]
-        public double GridMargin { get; set; }
-
-        [XmlIgnore]
-        public Color GridColor { get; set; }
-
-        [JsonIgnore]
-        [XmlAttribute("GridColor")]
-        public string XmlGridColor
-        {
-            get
-            {
-                return SerializeHelper.SerializeColor(GridColor);
-            }
-            set
-            {
-                GridColor = SerializeHelper.DeserializeColor(value);
-            }
-        }
-
-        [XmlArray]
-        public List<DesignerItemBase> DesignerItems { get; set; } = new List<DesignerItemBase>();
-
-        [XmlArray]
-        public List<PersistDesignerItem> PersistDesignerItems { get; set; } = new List<PersistDesignerItem>();
-
-        [XmlArray]
-        public List<SettingsDesignerItem> SettingsDesignerItems { get; set; } = new List<SettingsDesignerItem>();
-
-        [XmlArray]
-        public List<PathDesignerItem> PathDesignerItems { get; set; } = new List<PathDesignerItem>();
-
-        [XmlArray]
-        public List<MediaDesignerItem> MediaDesignerItems { get; set; } = new List<MediaDesignerItem>();
-
-        [XmlArray]
-        public List<ImageDesignerItem> ImageDesignerItems { get; set; } = new List<ImageDesignerItem>();
-
-        [XmlArray]
-        public List<TextDesignerItem> TextDesignerItems { get; set; } = new List<TextDesignerItem>();
-
-        [XmlArray]
-        public List<LogicalGateDesignerItemBase> LogicalGateItems { get; set; } = new List<LogicalGateDesignerItemBase>();
-
-        [XmlArray]
-        public List<FlowNodeDesignerItem> FlowNodeDesignerItems { get; set; } = new List<FlowNodeDesignerItem>();
-
-        [XmlArray]
-        public List<SFCNodeDesignerItem> SFCNodeDesignerItems { get; set; } = new List<SFCNodeDesignerItem>();
-
-        [JsonIgnore]
-        [XmlIgnore]
-        public List<DesignerItemBase> AllDesignerItems
-        {
-            get
-            {
-                return
-DesignerItems.OfType<DesignerItemBase>()
-.Union(TextDesignerItems.OfType<DesignerItemBase>())
-.Union(LogicalGateItems.OfType<DesignerItemBase>())
-.Union(MediaDesignerItems.OfType<DesignerItemBase>())
-.Union(ImageDesignerItems.OfType<DesignerItemBase>())
-.Union(PathDesignerItems.OfType<DesignerItemBase>())
-.Union(PersistDesignerItems.OfType<DesignerItemBase>())
-.Union(SettingsDesignerItems.OfType<DesignerItemBase>())
-.Union(FlowNodeDesignerItems.OfType<DesignerItemBase>())
-.Union(SFCNodeDesignerItems.OfType<DesignerItemBase>())
-.ToList();
-            }
-        }
-
-        [XmlArray]
-        public List<Guid> ConnectionIds { get; set; }
-
-        [XmlArray]
-        public List<ConnectionItem> Connections { get; set; }
-
-        public void AddItems(IEnumerable<SelectableDesignerItemViewModelBase> selectedDesignerItems)
-        {
-            foreach (var item in selectedDesignerItems.OfType<DesignerItemViewModelBase>())
-            {
-                if (item is PersistDesignerItemViewModel)
-                {
-                    PersistDesignerItems.Add(new PersistDesignerItem(item as PersistDesignerItemViewModel));
-                }
-                else if (item is SettingsDesignerItemViewModel)
-                {
-                    SettingsDesignerItems.Add(new SettingsDesignerItem(item as SettingsDesignerItemViewModel));
-                }
-                else if (item is PathItemViewModel)
-                {
-                    PathDesignerItems.Add(new PathDesignerItem(item));
-                }
-                else if (item is GifImageItemViewModel)
-                {
-                    MediaDesignerItems.Add(new MediaDesignerItem(item as GifImageItemViewModel));
-                }
-                else if (item is MediaItemViewModel)
-                {
-                    MediaDesignerItems.Add(new MediaDesignerItem(item as MediaItemViewModel));
-                }
-                else if (item is ImageItemViewModel)
-                {
-                    ImageDesignerItems.Add(new ImageDesignerItem(item as ImageItemViewModel));
-                }
-                else if (item is TextDesignerItemViewModel)
-                {
-                    TextDesignerItems.Add(new TextDesignerItem(item as TextDesignerItemViewModel));
-                }
-                else if (item is LogicalGateItemViewModelBase)
-                {
-                    LogicalGateItems.Add(new LogicalGateDesignerItemBase(item as LogicalGateItemViewModelBase));
-                }
-                else if (item is FlowNode)
-                {
-                    FlowNodeDesignerItems.Add(new FlowNodeDesignerItem(item as FlowNode));
-                }
-                else if (item is SFCNode)
-                {
-                    SFCNodeDesignerItems.Add(new SFCNodeDesignerItem(item as SFCNode));
-                }
-                else if (item is BarcodeDesignerItemViewModel)
-                {
-                    DesignerItems.Add(new DesignerItemBase(item, (item as BarcodeDesignerItemViewModel).Format.ToString()));
-                }
-                else
-                {
-                    DesignerItems.Add(new DesignerItemBase(item));
-                }
-            }
-        }
-
-        public static DesignerItemBase ToXmlObject(SelectableDesignerItemViewModelBase item)
-        {
-            if (item is PersistDesignerItemViewModel)
-            {
-                return new PersistDesignerItem(item as PersistDesignerItemViewModel);
-            }
-            else if (item is SettingsDesignerItemViewModel)
-            {
-                return new SettingsDesignerItem(item as SettingsDesignerItemViewModel);
-            }
-            else if (item is PathItemViewModel)
-            {
-                return new PathDesignerItem(item as PathItemViewModel);
-            }
-            else if (item is GifImageItemViewModel)
-            {
-                return new MediaDesignerItem(item as GifImageItemViewModel);
-            }
-            else if (item is MediaItemViewModel)
-            {
-                return new MediaDesignerItem(item as MediaItemViewModel);
-            }
-            else if (item is ImageItemViewModel)
-            {
-                return new ImageDesignerItem(item as ImageItemViewModel);
-            }
-            else if (item is TextDesignerItemViewModel)
-            {
-                return new TextDesignerItem(item as TextDesignerItemViewModel);
-            }
-            else if (item is LogicalGateItemViewModelBase)
-            {
-                return new LogicalGateDesignerItemBase(item as LogicalGateItemViewModelBase);
-            }
-            else if (item is FlowNode)
-            {
-                return new FlowNodeDesignerItem(item as FlowNode);
-            }
-            else if (item is SFCNode)
-            {
-                return new SFCNodeDesignerItem(item as SFCNode);
-            }
-            else
-            {
-                return new DesignerItemBase(item as DesignerItemViewModelBase);
-            }
-        }
-
-        public static Type GetTypeOfDiagramItem(DesignerItemViewModelBase vmType)
-        {
-            if (vmType is PersistDesignerItemViewModel)
-                return typeof(PersistDesignerItem);
-            if (vmType is SettingsDesignerItemViewModel)
-                return typeof(SettingsDesignerItem);
-            if (vmType is PathItemViewModel)
-                return typeof(PathToolBoxData);
-            if (vmType is GifImageItemViewModel)
-                return typeof(MediaDesignerItem);
-            if (vmType is MediaItemViewModel)
-                return typeof(MediaDesignerItem);
-            if (vmType is ImageItemViewModel)
-                return typeof(ImageDesignerItem);
-            if (vmType is LogicalGateItemViewModelBase)
-                return typeof(LogicalGateDesignerItemBase);
-            if (vmType is FlowNode)
-                return typeof(FlowNodeDesignerItem);
-            if (vmType is SFCNode)
-                return typeof(SFCNodeDesignerItem);
-            throw new InvalidOperationException(string.Format("Unknown diagram type. Currently only {0} and {1} are supported",
-                typeof(PersistDesignerItem).AssemblyQualifiedName,
-                typeof(SettingsDesignerItemViewModel).AssemblyQualifiedName
-                ));
-
-        }
-    }
-}

AIStudio.Wpf.ADiagram/Models/PathToolBoxData.cs

@@ -1,96 +0,0 @@
-using AIStudio.Wpf.Flowchart;
-using AIStudio.Wpf.SFC;
-using System;
-using System.Windows.Media;
-using Util.DiagramDesigner;
-using Util.DiagramDesigner.Helpers;
-
-namespace AIStudio.Wpf.ADiagram.Models
-{
-    public class PathToolBoxData : ToolBoxData
-    {
-        public PathToolBoxData(string icon, Type type, double width = 32, double height = 32) : base(null, icon, type, width, height)
-        {
-            ColorViewModel.FillColor.Color = Colors.Orange;
-        }
-
-    }
-
-    public class TextToolBoxData : ToolBoxData
-    {
-        public TextToolBoxData(string text, Type type, double width = 32, double height = 32) : base(text, null, type, width, height)
-        {
-            ColorViewModel.FillColor.Color = Colors.Orange;
-        }
-
-    }
-
-    public class EllipseTextToolBoxData : ToolBoxData
-    {
-        public EllipseTextToolBoxData(string text, Type type, double width = 32, double height = 32) : base(text, null, type, width, height)
-        {
-            ColorViewModel.FillColor.Color = Colors.Orange;
-        }
-
-    }
-
-    public class ImageToolBoxData : ToolBoxData
-    {
-        public ImageToolBoxData(string icon, Type type, double width = 32, double height = 32) : base(null, icon, type, width, height)
-        {
-
-        }
-    }
-
-    public class FlowchartToolBoxData : ToolBoxData
-    {
-        public NodeKinds Kind { get; set; }
-        public FlowchartToolBoxData(NodeKinds kind, Type type, double width = 32, double height = 32) : base(kind.GetDescription(), null, type, width, height)
-        {
-            Kind = kind;
-            ColorViewModel.LineColor.Color = Colors.Black;
-        }
-
-    }
-
-    public class SFCToolBoxData : ToolBoxData
-    {
-        public SFCNodeKinds Kind { get; set; }
-        public SFCToolBoxData(SFCNodeKinds kind, Type type, double width = 32, double height = 32) : base(null, null, type, width, height)
-        {
-            Kind = kind;
-            ColorViewModel.LineColor.Color = Colors.Black;
-            ColorViewModel.FillColor.Color = Colors.Blue;
-
-        }
-    }
-
-    public class DesignerItemToolBoxData : ToolBoxData
-    {
-        public string FileName { get; set; }
-        public DesignerItemViewModelBase DesignerItemViewModel { get; set; }
-        public DesignerItemToolBoxData(DesignerItemBase designerItemBase, string filename, Type type,  double width = 32, double height = 32) : base(null, null, type, width, height)
-        {
-            Addition = designerItemBase;
-            DesignerItemViewModel = (DesignerItemViewModelBase)Activator.CreateInstance(type, null, designerItemBase);
-            FileName = filename;
-            
-        }
-    }
-
-    public class SvgToolBoxData : ToolBoxData
-    {
-        public SvgToolBoxData(string filename, Type type, double width = 32, double height = 32) : base(null, filename, type, width, height)
-        {
-            ColorViewModel.FillColor.Color = Colors.Blue;
-        }
-    }
-
-    public class MediaToolBoxData : ToolBoxData
-    {
-        public MediaToolBoxData(string icon, Type type, double width = 32, double height = 32) : base(icon, null, type, width, height)
-        {
-
-        }
-    }
-}

AIStudio.Wpf.ADiagram/Themes/Generic.xaml

@@ -1,28 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <ResourceDictionary.MergedDictionaries>      
-        <ResourceDictionary Source="pack://application:,,,/Util.DiagramDesigner;component/Resources/Styles/ScrollBar.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Util.DiagramDesigner;component/Resources/Styles/Expander.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Util.DiagramDesigner;component/Resources/Styles/GroupBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Util.DiagramDesigner;component/Resources/Styles/ToolTip.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Util.DiagramDesigner;component/Resources/Styles/ScrollViewer.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Util.DiagramDesigner;component/Resources/Styles/ZoomBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Util.DiagramDesigner;component/Resources/Styles/DesignerItems.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Themes/Styles/Fluent.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Themes/Styles/Expander.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Themes/Styles/ListBox.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Themes/Styles/Slider.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Themes/Styles/TabControl.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Themes/Styles/ToggleButton.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Extensions/ViewModels/PathItemViewModel.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Extensions/ViewModels/PersistDesignerItemViewModel.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Extensions/ViewModels/SettingsDesignerItemViewModel.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Extensions/ViewModels/SvgDesignerItemViewModel.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-
-    
-</ResourceDictionary>

AIStudio.Wpf.ADiagram/ViewModels/FlowchartViewModel.cs

@@ -1,118 +0,0 @@
-using AIStudio.Wpf.ADiagram.Models;
-using AIStudio.Wpf.ADiagram.ViewModels;
-using AIStudio.Wpf.Flowchart.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Media;
-using Util.DiagramDesigner;
-
-namespace AIStudio.Wpf.Flowchart
-{
-    public class FlowchartViewModel : DiagramsViewModel
-    {
-        public FlowchartViewModel(string title, string status, DiagramType diagramType) : base(title, status, diagramType)
-        {
-
-        }
-        public FlowchartViewModel(string filename, DiagramDocument diagramDocument) : base(filename, diagramDocument)
-        {
-            if (DiagramViewModel != null)
-            {
-                FlowchartService.InitData(DiagramViewModel.Items.OfType<FlowNode>().ToList(), DiagramViewModel.Items.OfType<ConnectorViewModel>().ToList(), DiagramViewModel);
-            }
-        }
-
-        protected override void InitDiagramViewModel()
-        {
-            base.InitDiagramViewModel();
-
-            DiagramViewModel.ShowGrid = true;
-            DiagramViewModel.GridCellSize = new Size(100, 100);
-            DiagramViewModel.CellHorizontalAlignment = CellHorizontalAlignment.Center;
-            DiagramViewModel.CellVerticalAlignment = CellVerticalAlignment.Center;
-        }
-
-        protected override void Init()
-        {
-            base.Init();
-
-            DesignerItemViewModelBase start = new StartFlowNode() { Left = 100, Top = 0, Color = Colors.Yellow.ToString() };
-            DiagramViewModel.DirectAddItemCommand.Execute(start);
-
-            DesignerItemViewModelBase middle1 = new MiddleFlowNode() { Left = 100, Top = 100, Color = Colors.Yellow.ToString(), Text = "主管审批", UserIds= new List<string> { "操作员1", "操作员2" }, ActType = "or" };
-            DiagramViewModel.DirectAddItemCommand.Execute(middle1);
-
-            DesignerItemViewModelBase decide = new DecideFlowNode() { Left = 100, Top = 200, Color = Colors.Yellow.ToString(), Text = "5" };
-            DiagramViewModel.DirectAddItemCommand.Execute(decide);
-
-            DesignerItemViewModelBase middle2 = new MiddleFlowNode() { Left = 200, Top = 300, Color = Colors.Yellow.ToString(), Text = "分管领导", UserIds = new List<string> { "操作员1", "操作员2" }, ActType = "and" };
-            DiagramViewModel.DirectAddItemCommand.Execute(middle2);
-
-            DesignerItemViewModelBase cobegin = new COBeginFlowNode() { Left = 100, Top = 400, Color = Colors.Yellow.ToString() };
-            DiagramViewModel.DirectAddItemCommand.Execute(cobegin);
-
-            DesignerItemViewModelBase middle3 = new MiddleFlowNode() { Left = 100, Top = 500, Color = Colors.Yellow.ToString(), Text = "财务审批", UserIds = new List<string> { "Admin" }, ActType = "or" };
-            DiagramViewModel.DirectAddItemCommand.Execute(middle3);
-
-            DesignerItemViewModelBase middle4 = new MiddleFlowNode() { Left = 200, Top = 500, Color = Colors.Yellow.ToString(), Text = "人力审批", RoleIds = new List<string> { "操作员", "管理员" }, ActType = "or" };
-            DiagramViewModel.DirectAddItemCommand.Execute(middle4);
-
-            DesignerItemViewModelBase coend = new COEndFlowNode() { Left = 100, Top = 600, Color = Colors.Yellow.ToString() };
-            DiagramViewModel.DirectAddItemCommand.Execute(coend);
-
-            DesignerItemViewModelBase end = new EndFlowNode() { Left = 100, Top = 700, Color = Colors.Yellow.ToString() };
-            DiagramViewModel.DirectAddItemCommand.Execute(end);
-
-            ConnectorViewModel connector1 = new ConnectorViewModel(start.BottomConnector, middle1.TopConnector);     
-            DiagramViewModel.DirectAddItemCommand.Execute(connector1);
-
-            ConnectorViewModel connector2 = new ConnectorViewModel(middle1.BottomConnector, decide.TopConnector);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector2);
-
-            ConnectorViewModel connector3 = new ConnectorViewModel(decide.RightConnector, middle2.TopConnector);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector3);
-            connector3.AddText(">=3");
-
-            ConnectorViewModel connector4 = new ConnectorViewModel(middle2.BottomConnector, cobegin.TopConnector);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector4);
-
-            ConnectorViewModel connector5 = new ConnectorViewModel(decide.BottomConnector, cobegin.TopConnector);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector5);
-            connector5.AddText("<3");
-
-            ConnectorViewModel connector6 = new ConnectorViewModel(cobegin.BottomConnector, middle3.TopConnector);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector6);
-
-            ConnectorViewModel connector7 = new ConnectorViewModel(cobegin.BottomConnector, middle4.TopConnector);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector7);
-
-            ConnectorViewModel connector8 = new ConnectorViewModel(middle3.BottomConnector, coend.TopConnector);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector8);
-
-            ConnectorViewModel connector9 = new ConnectorViewModel(middle4.BottomConnector, coend.TopConnector);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector9);
-
-            ConnectorViewModel connector10 = new ConnectorViewModel(coend.BottomConnector, end.TopConnector);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector10);
-
-            DiagramViewModel.ClearSelectedItems();
-
-            FlowchartService.InitData(DiagramViewModel.Items.OfType<FlowNode>().ToList(), DiagramViewModel.Items.OfType<ConnectorViewModel>().ToList(), DiagramViewModel);
-        }
-
-        public override void Dispose()
-        {
-            base.Dispose();
-
-            foreach (var viewModel in DiagramViewModels)
-            {
-                FlowchartService.DisposeData(viewModel);
-            }
-        }
-    }
-}

AIStudio.Wpf.BaseDiagram/AIStudio.Wpf.BaseDiagram.csproj

@@ -1,71 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <UseWPF>true</UseWPF>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Fluent.Ribbon" Version="8.0.3" />
-    <PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Util.Svg2XamlTestExtension" Version="1.2.5" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Util.DiagramDesigner\Util.DiagramDesigner.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Page Update="Controls\Barcode.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
-    <Page Update="Controls\GradientStopControl.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
-    <Page Update="Controls\MultiSelectComboBox.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Controls\PopupWindow.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
-    <Page Update="Controls\PropertiesView.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
-    <Page Update="Controls\SliderRotation.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Extensions\ViewModels\BarcodeDesignerItemViewModel.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Extensions\ViewModels\OutLineTextDesignerItemViewModel.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Extensions\ViewModels\PathItemViewModel.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
-    <Page Update="Extensions\ViewModels\PersistDesignerItemViewModel.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Extensions\ViewModels\SettingsDesignerItemViewModel.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Extensions\ViewModels\SvgDesignerItemViewModel.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="zxing.core">
-      <HintPath>..\AIStudio.Wpf.ADiagram\zxing.core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-</Project>

AIStudio.Wpf.BaseDiagram/Controls/PropertiesView.xaml.cs

@@ -1,228 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.ComponentModel;
-using System.Reflection;
-
-namespace AIStudio.Wpf.BaseDiagram.Controls
-{
-	/// <summary>
-	/// Interaction logic for PropertiesView.xaml
-	/// </summary>
-	public partial class PropertiesView : UserControl
-	{
-        #region SelectedObject
-
-        public static readonly DependencyProperty SelectedObjectProperty = DependencyProperty.Register("SelectedObject", typeof(object), typeof(PropertiesView), new UIPropertyMetadata(null, OnSelectedObjectChanged));
-        public object SelectedObject
-        {
-            get
-            {
-                return (object)GetValue(SelectedObjectProperty);
-            }
-            set
-            {
-                SetValue(SelectedObjectProperty, value);
-            }
-        }
-
-        private static void OnSelectedObjectChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            PropertiesView propertyInspector = o as PropertiesView;
-            if (propertyInspector != null)
-                propertyInspector.OnSelectedObjectChanged((object)e.OldValue, (object)e.NewValue);
-        }
-
-        protected virtual void OnSelectedObjectChanged(object oldValue, object newValue)
-        {
-            // We do not want to process the change now if the grid is initializing (ie. BeginInit/EndInit).
-            var obj = oldValue as INotifyPropertyChanged;
-            if (obj != null)
-                obj.PropertyChanged -= PropertyChanged;
-            DisplayProperties();
-            obj = newValue as INotifyPropertyChanged;
-            if (obj != null)
-                obj.PropertyChanged += PropertyChanged;
-        }
-
-        #endregion //SelectedObject
-
-        public static readonly DependencyProperty NeedBrowsableProperty = DependencyProperty.Register("NeedBrowsable", typeof(bool), typeof(PropertiesView), new UIPropertyMetadata(true));
-        public bool NeedBrowsable
-        {
-            get
-            {
-                return (bool)GetValue(NeedBrowsableProperty);
-            }
-            set
-            {
-                SetValue(NeedBrowsableProperty, value);
-            }
-        }
-
-        public PropertiesView()
-		{
-			InitializeComponent();
-            this.Loaded += PropertiesView_Loaded;			
-		}
-
-        private void PropertiesView_Loaded(object sender, RoutedEventArgs e)
-        {
-			DisplayProperties();
-		}
-
-        void PropertyChanged(object sender, PropertyChangedEventArgs e)
-		{
-			DisplayProperties();
-		}
-
-		private void DisplayProperties()
-		{
-			_panel.Children.Clear();
-			ClearGrid();
-			if (SelectedObject != null)
-			{
-				int row = 0;
-				foreach (var prop in SelectedObject.GetType().GetProperties())
-				{
-					var attr = prop.GetCustomAttributes(typeof(BrowsableAttribute), true);
-					if (NeedBrowsable == false && (attr.Length == 0 || (attr[0] as BrowsableAttribute).Browsable))
-					{
-						DisplayProperty(prop, row);
-						row++;
-					}
-                    else if(NeedBrowsable == true && (attr.Length > 0 && (attr[0] as BrowsableAttribute).Browsable))
-                    {
-                        DisplayProperty(prop, row);
-                        row++;
-                    }
-                }
-				_panel.Children.Add(_gridContainer);
-			}
-			else
-			{
-				_panel.Children.Add(_label);
-			}
-		}
-
-		private void ClearGrid()
-		{
-			_grid.RowDefinitions.Clear();
-			for (int i = _grid.Children.Count - 1; i >= 0; i--)
-			{
-				if (_grid.Children[i] != _vLine && _grid.Children[i] != _splitter)
-					_grid.Children.RemoveAt(i);
-			}
-		}
-
-		private void DisplayProperty(PropertyInfo prop, int row)
-		{
-			var rowDef = new RowDefinition();
-			rowDef.Height = new GridLength(Math.Max(20, this.FontSize * 2));
-			_grid.RowDefinitions.Add(rowDef);
-
-            var tb = new TextBlock() { Text = prop.Name };
-            var displayAttr = prop.GetCustomAttributes(typeof(DisplayNameAttribute), true);
-            if (displayAttr.Length > 0 )
-            {
-                tb.Text = (displayAttr[0] as DisplayNameAttribute).DisplayName;
-            }
-            tb.Margin = new Thickness(4);
-			tb.VerticalAlignment = VerticalAlignment.Center;
-			Grid.SetColumn(tb, 0);
-			Grid.SetRow(tb, _grid.RowDefinitions.Count - 1);
-			_grid.Children.Add(tb);
-
-			var line = new Line();
-			line.Style = (Style)border.Resources["gridHorizontalLineStyle"];
-			Grid.SetRow(line, row);
-			_grid.Children.Add(line);
-
-			Style style = null;
-			var styleNameAttr = prop.GetCustomAttributes(typeof(StyleNameAttribute), true);
-			if (styleNameAttr.Length > 0)
-			{
-			    style = this.FindResource((styleNameAttr[0] as StyleNameAttribute).Name) as Style;
-				if (style != null)
-				{
-					ContentControl content = new ContentControl();
-					content.Style = style;
-					content.DataContext = SelectedObject;
-
-					Grid.SetColumn(content, 1);
-					Grid.SetRow(content, _grid.RowDefinitions.Count - 1);
-
-					_grid.Children.Add(content);
-				}
-			}
-			
-			if (style == null)
-			{
-				var ed = new TextBox();
-				ed.PreviewKeyDown += new KeyEventHandler(ed_KeyDown);
-				ed.Margin = new Thickness(0);
-				ed.VerticalAlignment = VerticalAlignment.Center;
-				ed.BorderThickness = new Thickness(0);
-				Grid.SetColumn(ed, 1);
-				Grid.SetRow(ed, _grid.RowDefinitions.Count - 1);
-
-				var binding = new Binding(prop.Name);
-				binding.Source = SelectedObject;
-				binding.ValidatesOnExceptions = true;
-				binding.Mode = BindingMode.OneWay;
-				if (prop.CanWrite)
-				{
-					var mi = prop.GetSetMethod();
-					if (mi != null && mi.IsPublic)
-						binding.Mode = BindingMode.TwoWay;
-				}
-				ed.SetBinding(TextBox.TextProperty, binding);
-
-				var template = (ControlTemplate)border.Resources["validationErrorTemplate"];
-				Validation.SetErrorTemplate(ed, template);
-
-				_grid.Children.Add(ed);
-			}	
-		}
-
-		void ed_KeyDown(object sender, KeyEventArgs e)
-		{
-			var ed = sender as TextBox;
-			if (ed != null)
-			{
-				if (e.Key == Key.Enter)
-				{
-					ed.GetBindingExpression(TextBox.TextProperty).UpdateSource();
-					e.Handled = true;
-				}
-				else if (e.Key == Key.Escape)
-					ed.GetBindingExpression(TextBox.TextProperty).UpdateTarget();
-			}
-		}
-	}
-
-	[AttributeUsage(AttributeTargets.Property)]
-	public class StyleNameAttribute : Attribute
-	{
-		private string _name;
-		public StyleNameAttribute(string name)
-		{
-			_name = name;
-		}
-
-		public string Name
-		{
-			get { return _name; }
-		}
-	}
-}

AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PathItemViewModel.cs

@@ -1,24 +0,0 @@
-using Util.DiagramDesigner;
-
-namespace AIStudio.Wpf.BaseDiagram.Extensions.ViewModels
-{
-    public class PathItemViewModel : DesignerItemViewModelBase
-    {
-        public PathItemViewModel() : base()
-        {
-
-        }
-
-        public PathItemViewModel(IDiagramViewModel parent, DesignerItemBase designer) : base(parent, designer)
-        {
-           
-        }
-
-        protected override void Init()
-        {
-            base.Init();
-
-            this.ShowConnectors = false;
-        }
-    }
-}

AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PersistDesignerItemViewModel.cs

@@ -1,52 +0,0 @@
-using AIStudio.Wpf.BaseDiagram.Services;
-using Util.DiagramDesigner;
-using AIStudio.Wpf.BaseDiagram.Extensions.Models;
-
-namespace AIStudio.Wpf.BaseDiagram.Extensions.ViewModels
-{
-    public class PersistDesignerItemViewModel : DesignerItemViewModelBase
-    {
-        private IUIVisualizerService visualiserService;
-
-        public PersistDesignerItemViewModel(IDiagramViewModel parent, PersistDesignerItem designer) : base(parent, designer)
-        {
-
-        }
-
-        public PersistDesignerItemViewModel() : base()
-        {
-
-        }
-
-        protected override void Init()
-        {
-            base.Init();
-
-            visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
-            this.ShowConnectors = false;
-        }
-
-        protected override void LoadDesignerItemViewModel(IDiagramViewModel parent, SelectableDesignerItemBase designerbase)
-        {
-            base.LoadDesignerItemViewModel(parent, designerbase);
-
-            PersistDesignerItem designer = designerbase as PersistDesignerItem;
-            this.HostUrl = designer.HostUrl;
-        }
-
-
-        public string HostUrl { get; set; }
-
-        protected override void ExecuteEditCommand(object parameter)
-        {
-            PersistDesignerItemData data = new PersistDesignerItemData(HostUrl);
-            if (visualiserService.ShowDialog(data) == true)
-            {
-                this.HostUrl = data.HostUrl;
-            }
-        }
-
-
-
-    }
-}

AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SettingsDesignerItemViewModel.cs

@@ -1,51 +0,0 @@
-using AIStudio.Wpf.BaseDiagram.Services;
-using System;
-using Util.DiagramDesigner;
-using AIStudio.Wpf.BaseDiagram.Extensions.Models;
-
-namespace AIStudio.Wpf.BaseDiagram.Extensions.ViewModels
-{
-    public class SettingsDesignerItemViewModel : DesignerItemViewModelBase
-    {
-        private IUIVisualizerService visualiserService;
-
-        public SettingsDesignerItemViewModel(IDiagramViewModel parent, SettingsDesignerItem designer) : base(parent, designer)
-        {
-           
-        }
-
-        public SettingsDesignerItemViewModel() : base()
-        {
-
-        }
-
-        protected override void Init()
-        {
-            base.Init();
-
-            visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
-            this.ShowConnectors = false;
-        }
-
-       protected override void LoadDesignerItemViewModel(IDiagramViewModel parent, SelectableDesignerItemBase designerbase)
-        {
-            base.LoadDesignerItemViewModel(parent, designerbase);
-
-            SettingsDesignerItem designer = designerbase as SettingsDesignerItem;
-            this.Setting = designer.Setting;
-        }
-
-        public String Setting{ get; set; }
-
-        protected override void ExecuteEditCommand(object parameter)
-        {
-            SettingsDesignerItemData data = new SettingsDesignerItemData(Setting);
-            if (visualiserService.ShowDialog(data) == true)
-            {
-                this.Setting = data.Setting1;
-            }
-        }
-
-
-    }
-}

AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SvgDesignerItemViewModel.cs

@@ -1,18 +0,0 @@
-using Util.DiagramDesigner;
-
-namespace AIStudio.Wpf.BaseDiagram.Extensions.ViewModels
-{
-    public class SvgDesignerItemViewModel: MediaItemViewModel
-    {
-        protected override string Filter { get; set; } = "Svg|*.svg";
-
-        public SvgDesignerItemViewModel() : base()
-        {
-        }
-
-        public SvgDesignerItemViewModel(IDiagramViewModel parent, MediaDesignerItem designer) : base(parent, designer)
-        {
-
-        }
-    }
-}

AIStudio.Wpf.Diagram.sln

@@ -1,21 +1,33 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.29509.3
+VisualStudioVersion = 16.0.31727.386
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Util.DiagramDesigner", "Util.DiagramDesigner\Util.DiagramDesigner.csproj", "{3FC9F09D-83EA-4914-8980-A6B4C3352836}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.ADiagram", "AIStudio.Wpf.ADiagram\AIStudio.Wpf.ADiagram.csproj", "{9D2DCA7D-9E0C-4E6E-ACD9-2CD18C75FE34}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.BaseDiagram", "AIStudio.Wpf.BaseDiagram\AIStudio.Wpf.BaseDiagram.csproj", "{FC7CFBB7-29AE-4660-A94B-B80CF317D3C3}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Flowchart", "AIStudio.Wpf.Flowchart\AIStudio.Wpf.Flowchart.csproj", "{86ED5B40-D185-4AFA-B5BD-BC8E78DB8758}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Logical", "AIStudio.Wpf.Logical\AIStudio.Wpf.Logical.csproj", "{CC68D39D-7935-4079-9CEB-FC2FD498D511}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{4959F170-02FB-4B7F-8F53-93DAF22713F9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIStudio.Wpf.SFC", "AIStudio.Wpf.SFC\AIStudio.Wpf.SFC.csproj", "{2AB69067-277E-4EE0-9949-8326A145EEE4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.SFC", "AIStudio.Wpf.SFC\AIStudio.Wpf.SFC.csproj", "{2AB69067-277E-4EE0-9949-8326A145EEE4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramApp", "AIStudio.Wpf.DiagramApp\AIStudio.Wpf.DiagramApp.csproj", "{4408F718-9C14-4404-A63B-9B785F9D4F35}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramDesigner", "AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj", "{EA1D893D-2F50-47AA-80A6-EA297F651CCC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{425E7DBD-25B9-4019-9C84-C37273A7F5C3}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		Directory.Build.Props = Directory.Build.Props
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramDesigner.Demo", "AIStudio.Wpf.DiagramDesigner.Demo\AIStudio.Wpf.DiagramDesigner.Demo.csproj", "{D0467F47-D782-4A84-9AAE-E4A014913AA6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2BE1891E-16C9-4191-998A-45AEEEEA1F0D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramDesigner.Additionals", "AIStudio.Wpf.DiagramDesigner.Additionals\AIStudio.Wpf.DiagramDesigner.Additionals.csproj", "{186F34AC-4BC5-40E1-911B-DD3E96AECE6E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIStudio.Wpf.Mind", "AIStudio.Wpf.Mind\AIStudio.Wpf.Mind.csproj", "{85C437B9-16D2-4076-ABCD-52029AC232FC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,18 +35,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3FC9F09D-83EA-4914-8980-A6B4C3352836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FC9F09D-83EA-4914-8980-A6B4C3352836}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3FC9F09D-83EA-4914-8980-A6B4C3352836}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3FC9F09D-83EA-4914-8980-A6B4C3352836}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D2DCA7D-9E0C-4E6E-ACD9-2CD18C75FE34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D2DCA7D-9E0C-4E6E-ACD9-2CD18C75FE34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D2DCA7D-9E0C-4E6E-ACD9-2CD18C75FE34}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D2DCA7D-9E0C-4E6E-ACD9-2CD18C75FE34}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC7CFBB7-29AE-4660-A94B-B80CF317D3C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC7CFBB7-29AE-4660-A94B-B80CF317D3C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC7CFBB7-29AE-4660-A94B-B80CF317D3C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FC7CFBB7-29AE-4660-A94B-B80CF317D3C3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{86ED5B40-D185-4AFA-B5BD-BC8E78DB8758}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{86ED5B40-D185-4AFA-B5BD-BC8E78DB8758}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{86ED5B40-D185-4AFA-B5BD-BC8E78DB8758}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -47,6 +47,26 @@ Global
 		{2AB69067-277E-4EE0-9949-8326A145EEE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2AB69067-277E-4EE0-9949-8326A145EEE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2AB69067-277E-4EE0-9949-8326A145EEE4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4408F718-9C14-4404-A63B-9B785F9D4F35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4408F718-9C14-4404-A63B-9B785F9D4F35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4408F718-9C14-4404-A63B-9B785F9D4F35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4408F718-9C14-4404-A63B-9B785F9D4F35}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA1D893D-2F50-47AA-80A6-EA297F651CCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA1D893D-2F50-47AA-80A6-EA297F651CCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA1D893D-2F50-47AA-80A6-EA297F651CCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA1D893D-2F50-47AA-80A6-EA297F651CCC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0467F47-D782-4A84-9AAE-E4A014913AA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0467F47-D782-4A84-9AAE-E4A014913AA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0467F47-D782-4A84-9AAE-E4A014913AA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0467F47-D782-4A84-9AAE-E4A014913AA6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{186F34AC-4BC5-40E1-911B-DD3E96AECE6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{186F34AC-4BC5-40E1-911B-DD3E96AECE6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{186F34AC-4BC5-40E1-911B-DD3E96AECE6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{186F34AC-4BC5-40E1-911B-DD3E96AECE6E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85C437B9-16D2-4076-ABCD-52029AC232FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85C437B9-16D2-4076-ABCD-52029AC232FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85C437B9-16D2-4076-ABCD-52029AC232FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85C437B9-16D2-4076-ABCD-52029AC232FC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -55,6 +75,7 @@ Global
 		{86ED5B40-D185-4AFA-B5BD-BC8E78DB8758} = {4959F170-02FB-4B7F-8F53-93DAF22713F9}
 		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D30FC641-F06C-4E35-AEA5-48A9B6E59CE0}

AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj

@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <Compile Remove="DesignItems\Custom\**" />
     <EmbeddedResource Remove="DesignItems\Custom\**" />
@@ -120,17 +120,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AIStudio.Wpf.BaseDiagram\AIStudio.Wpf.BaseDiagram.csproj" />
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner.Additionals\AIStudio.Wpf.DiagramDesigner.Additionals.csproj" />
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
     <ProjectReference Include="..\AIStudio.Wpf.Flowchart\AIStudio.Wpf.Flowchart.csproj" />
     <ProjectReference Include="..\AIStudio.Wpf.Logical\AIStudio.Wpf.Logical.csproj" />
+    <ProjectReference Include="..\AIStudio.Wpf.Mind\AIStudio.Wpf.Mind.csproj" />
     <ProjectReference Include="..\AIStudio.Wpf.SFC\AIStudio.Wpf.SFC.csproj" />
-    <ProjectReference Include="..\Util.DiagramDesigner\Util.DiagramDesigner.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="zxing.core">
-      <HintPath>zxing.core.dll</HintPath>
-    </Reference>
   </ItemGroup>
 
   <ItemGroup>
@@ -237,9 +232,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="DesignItems\Customs\1.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="Images\Svgs\account-book.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

AIStudio.Wpf.DiagramApp/App.xaml

@@ -1,17 +1,18 @@
-<Application x:Class="AIStudio.Wpf.ADiagram.App"
+<Application x:Class="AIStudio.Wpf.DiagramApp.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:AIStudio.Wpf.ADiagram"
+             xmlns:local="clr-namespace:AIStudio.Wpf.DiagramApp"
              StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/Fluent;component/Themes/Generic.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Dragablz;component/Themes/Generic.xaml" />
-                <ResourceDictionary Source="/AIStudio.Wpf.ADiagram;component/Themes/Generic.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Flowchart;component/ViewModels/FlowNode.xaml"/>
-                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Logical;component/ViewModels/LogicalGateItemViewModel.xaml"/>
-                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.SFC;component/ViewModels/SFCNode.xaml"/>
+                <ResourceDictionary Source="/AIStudio.Wpf.DiagramApp;component/Themes/Generic.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Flowchart;component/Themes/FlowNode.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Logical;component/Themes/LogicalGateItemViewModel.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.SFC;component/Themes/SFCNode.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Mind;component/Themes/MindNode.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

AIStudio.Wpf.DiagramApp/App.xaml.cs

@@ -10,7 +10,7 @@ using System.Windows;
 //如果是WinForm（假定程序为MyDemo.exe，则需要一个MyDemo.exe.config文件）
 //如果是WebForm，则从web.config中读取相关信息
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
-namespace AIStudio.Wpf.ADiagram
+namespace AIStudio.Wpf.DiagramApp
 {
     /// <summary>
     /// Interaction logic for App.xaml

AIStudio.Wpf.DiagramApp/DesignItems/Customs/1.json

@@ -0,0 +1 @@
+{"Title":null,"DiagramType":0,"DiagramItems":[{"Name":null,"DiagramType":0,"ShowGrid":false,"PhysicalGridCellSize":"0,0","CellHorizontalAlignment":0,"CellVerticalAlignment":0,"PageSizeOrientation":0,"PhysicalPageSize":"0,0","PageSizeType":0,"PhysicalGridMarginSize":"0,0","GridColor":"#00000000","DesignerItems":[{"ModelType":null,"ModelTypeName":"AIStudio.Wpf.DiagramDesigner.DefaultDesignerItemViewModel","SerializableType":null,"SerializableTypeName":"AIStudio.Wpf.DiagramDesigner.DesignerItemBase","SerializableString":"{\"PhysicalLeft\":55.071354166666666,\"PhysicalTop\":10.13635421792666,\"Angle\":0.0,\"ScaleX\":1.0,\"ScaleY\":1.0,\"Margin\":0.0,\"ItemWidth\":14.557291666666666,\"ItemHeight\":14.557291666666666,\"Icon\":null,\"Reserve\":null,\"ItemTypeName\":\"AIStudio.Wpf.DiagramDesigner.DefaultDesignerItemViewModel\",\"ParentId\":\"00000000-0000-0000-0000-000000000000\",\"Id\":\"e400c493-a6e9-4ac6-88b0-387bb35a83bc\",\"ZIndex\":0,\"IsGroup\":false,\"Text\":\"AIStudio\",\"ColorItem\":{\"LineColor\":{\"BrushType\":1,\"Color\":\"#FF808080\",\"GradientStop\":null,\"Offset\":null,\"Image\":null,\"SubType\":0,\"StartPoint\":\"0,0\",\"EndPoint\":\"0,0\",\"Opacity\":1.0,\"LinearOrientation\":0,\"RadialOrientation\":0,\"Angle\":0},\"FillColor\":{\"BrushType\":1,\"Color\":\"#FFFFA500\",\"GradientStop\":null,\"Offset\":null,\"Image\":null,\"SubType\":0,\"StartPoint\":\"0,0\",\"EndPoint\":\"0,0\",\"Opacity\":1.0,\"LinearOrientation\":0,\"RadialOrientation\":0,\"Angle\":0},\"ShadowColor\":\"#00FFFFFF\",\"LineWidth\":1.0,\"LineDashStyle\":0,\"LineAnimation\":0,\"LineAnimationDuration\":1.0},\"FontItem\":{\"FontWeight\":\"Normal\",\"FontStyle\":\"Normal\",\"FontStretch\":\"Normal\",\"Underline\":false,\"Strikethrough\":false,\"OverLine\":false,\"FontColor\":\"#FF000000\",\"FontFamily\":\"Arial\",\"FontSize\":12.0,\"FontObject\":\"Arial, 12pt\",\"TextEffectColor\":\"#00FFFFFF\",\"HighlightColor\":\"#00FFFFFF\",\"FontCase\":0,\"HorizontalAlignment\":1,\"VerticalAlignment\":1,\"LineHeight\":0.0},\"SharpItem\":{\"SourceMarker\":{\"Path\":\"\",\"Width\":10.0,\"Height\":10.0,\"PathStyle\":0,\"SizeStyle\":10},\"SinkMarker\":{\"Path\":\"M 0 -5 10 0 0 5 z\",\"Width\":10.0,\"Height\":10.0,\"PathStyle\":1,\"SizeStyle\":10}}}"}],"Connections":[]}]}