Merge branch 'master' of https://gitee.com/akwkevin/aistudio.-wpf.-diagram

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

AIStudio.Wpf.Diagram.sln

@@ -1,29 +1,37 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31727.386
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33205.214
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Flowchart", "AIStudio.Wpf.Flowchart\AIStudio.Wpf.Flowchart.csproj", "{86ED5B40-D185-4AFA-B5BD-BC8E78DB8758}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Flowchart", "Extensions\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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Logical", "Extensions\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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.SFC", "AIStudio.Wpf.SFC\AIStudio.Wpf.SFC.csproj", "{2AB69067-277E-4EE0-9949-8326A145EEE4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.SFC", "Extensions\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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramHelper", "AIStudio.Wpf.DiagramHelper\AIStudio.Wpf.DiagramHelper.csproj", "{1E77B64D-B457-4467-A5DB-BB7BA01806D9}"
-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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIStudio.Wpf.DiagramDesigner.Test", "AIStudio.Wpf.DiagramDesigner.Test\AIStudio.Wpf.DiagramDesigner.Test.csproj", "{559BBB2C-03DE-4C95-B38F-538F0A275793}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Mind", "Extensions\AIStudio.Wpf.Mind\AIStudio.Wpf.Mind.csproj", "{85C437B9-16D2-4076-ABCD-52029AC232FC}"
+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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{62DC8608-D98F-47BB-9F19-ABB0C60B72FF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramDesigner.Demo", "Demos\AIStudio.Wpf.DiagramDesigner.Demo\AIStudio.Wpf.DiagramDesigner.Demo.csproj", "{FCFC5ABF-8459-4B45-ABA0-9B820C7ED5C6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,14 +59,22 @@ Global
 		{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
-		{1E77B64D-B457-4467-A5DB-BB7BA01806D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1E77B64D-B457-4467-A5DB-BB7BA01806D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1E77B64D-B457-4467-A5DB-BB7BA01806D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1E77B64D-B457-4467-A5DB-BB7BA01806D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{559BBB2C-03DE-4C95-B38F-538F0A275793}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{559BBB2C-03DE-4C95-B38F-538F0A275793}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{559BBB2C-03DE-4C95-B38F-538F0A275793}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{559BBB2C-03DE-4C95-B38F-538F0A275793}.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
+		{439D0631-D9C2-4D36-BFCE-80DFCCABE9E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{FCFC5ABF-8459-4B45-ABA0-9B820C7ED5C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FCFC5ABF-8459-4B45-ABA0-9B820C7ED5C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FCFC5ABF-8459-4B45-ABA0-9B820C7ED5C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FCFC5ABF-8459-4B45-ABA0-9B820C7ED5C6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -67,6 +83,8 @@ 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}
+		{FCFC5ABF-8459-4B45-ABA0-9B820C7ED5C6} = {62DC8608-D98F-47BB-9F19-ABB0C60B72FF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D30FC641-F06C-4E35-AEA5-48A9B6E59CE0}

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

@@ -3,8 +3,9 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <Compile Remove="DesignItems\Custom\**" />
     <EmbeddedResource Remove="DesignItems\Custom\**" />
@@ -108,6 +109,12 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="AIStudio.Wpf.ColorPicker" Version="1.1.2" />
+    <PackageReference Include="AIStudio.Wpf.ComeCapture" Version="1.1.0" />
+    <PackageReference Include="Costura.Fody" Version="5.7.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Dragablz" Version="0.0.3.223" />
     <PackageReference Include="Fluent.Ribbon" Version="8.0.3" />
     <PackageReference Include="gong-wpf-dragdrop" Version="2.3.2" />
@@ -119,18 +126,14 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner.Additionals\AIStudio.Wpf.DiagramDesigner.Additionals.csproj" />
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner.Serializable\AIStudio.Wpf.DiagramDesigner.Serializable.csproj" />
     <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
-    <ProjectReference Include="..\AIStudio.Wpf.DiagramHelper\AIStudio.Wpf.DiagramHelper.csproj" />
-    <ProjectReference Include="..\AIStudio.Wpf.Flowchart\AIStudio.Wpf.Flowchart.csproj" />
-    <ProjectReference Include="..\AIStudio.Wpf.Logical\AIStudio.Wpf.Logical.csproj" />
-    <ProjectReference Include="..\AIStudio.Wpf.SFC\AIStudio.Wpf.SFC.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="zxing.core">
-      <HintPath>..\AIStudio.Wpf.DiagramHelper\DLL\zxing.core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+    <ProjectReference Include="..\Extensions\AIStudio.Wpf.Flowchart\AIStudio.Wpf.Flowchart.csproj" />
+    <ProjectReference Include="..\Extensions\AIStudio.Wpf.Logical\AIStudio.Wpf.Logical.csproj" />
+    <ProjectReference Include="..\Extensions\AIStudio.Wpf.Mind\AIStudio.Wpf.Mind.csproj" />
+    <ProjectReference Include="..\Extensions\AIStudio.Wpf.SFC\AIStudio.Wpf.SFC.csproj" />
+  </ItemGroup> 
 
   <ItemGroup>
     <Resource Include="Icons\App.ico" />
@@ -236,7 +239,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="DesignItems\Customs\1.json">
+    <None Update="Images\Gifs\car_chase.gif">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="Images\Svgs\account-book.svg">

AIStudio.Wpf.DiagramApp/App.xaml

@@ -8,10 +8,12 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/Fluent;component/Themes/Generic.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Dragablz;component/Themes/Generic.xaml" />
-                <ResourceDictionary Source="/AIStudio.Wpf.DiagramApp;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="pack://application:,,,/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 Source="pack://application:,,,/AIStudio.Wpf.Mind;component/Themes/Generic.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

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

@@ -1,102 +1 @@
-{
-  "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.DiagramHelper.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": [
-      ]
-    }
-  ]
-}
+{"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":[]}]}

AIStudio.Wpf.DiagramApp/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Costura />
+</Weavers>

AIStudio.Wpf.DiagramApp/FodyWeavers.xsd

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="Costura" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:all>
+              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="IncludeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>The order of preloaded assemblies, delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+            </xs:all>
+            <xs:attribute name="CreateTemporaryAssemblies" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeDebugSymbols" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="DisableCompression" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="DisableCleanup" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="LoadAtModuleInit" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IgnoreSatelliteAssemblies" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ExcludeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Unmanaged64Assemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="PreloadOrder" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>The order of preloaded assemblies, delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

AIStudio.Wpf.DiagramApp/Models/CustomToolBoxData.cs

@@ -0,0 +1,129 @@
+using AIStudio.Wpf.Flowchart;
+using AIStudio.Wpf.SFC;
+using System;
+using System.Windows.Media;
+using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner.Helpers;
+using System.Windows;
+using System.Collections.Generic;
+using AIStudio.Wpf.DiagramDesigner.Models;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+
+namespace AIStudio.Wpf.DiagramApp.Models
+{
+    public class PathToolBoxData : ToolBoxData
+    {
+        public PathToolBoxData(string icon, Type type, double width = 32, double height = 32, Size? desiredSize = null, Size? desiredMinSize = null, string description = null) : base(null, icon, type, width, height, desiredSize, desiredMinSize, description)
+        {
+            ColorViewModel.FillColor.Color = Colors.Orange;
+        }
+
+    }
+
+    public class TextToolBoxData : ToolBoxData
+    {
+        public TextToolBoxData(string text, Type type, double width = 32, double height = 32, Size? desiredSize = null, Size? desiredMinSize = null, string description = null) : base(text, null, type, width, height, desiredSize, desiredMinSize, description)
+        {
+            ColorViewModel.FillColor.Color = Colors.Orange;
+        }
+
+    }
+
+    public class EllipseTextToolBoxData : ToolBoxData
+    {
+        public EllipseTextToolBoxData(string text, Type type, double width = 32, double height = 32, Size? desiredSize = null, Size? desiredMinSize = null, string description = null) : base(text, null, type, width, height, desiredSize, desiredMinSize, description)
+        {
+            ColorViewModel.FillColor.Color = Colors.Orange;
+        }
+
+    }
+
+    public class ImageToolBoxData : ToolBoxData
+    {
+        public ImageToolBoxData(string icon, Type type, double width = 32, double height = 32, Size? desiredSize = null, Size? desiredMinSize = null, string description = null) : base(null, icon, type, width, height, desiredSize, desiredMinSize, description)
+        {
+
+        }
+    }
+
+    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, Size? desiredSize = null, Size? desiredMinSize = null, string description = null) : base(null, null, type, width, height, desiredSize, desiredMinSize, description)
+        {
+            Addition = designerItemBase;
+            DesignerItemViewModel = Activator.CreateInstance(type, null, designerItemBase) as DesignerItemViewModelBase;
+            FileName = filename;
+
+        }
+    }
+
+    public class MultipleDesignerItemToolBoxData : ToolBoxData
+    {
+        public string FileName
+        {
+            get; set;
+        }
+        public List<SelectableDesignerItemViewModelBase> SelectableDesignerItemViewModels
+        {
+            get; set;
+        }
+        public double CanvasWidth
+        {
+            get; set;
+        }
+        public double CanvasHeight
+        {
+            get; set;
+        }
+        public MultipleDesignerItemToolBoxData(SerializableObject designerItemBase, string filename, double width = 32, double height = 32, Size? desiredSize = null, Size? desiredMinSize = null, string description = null) : base(null, null, typeof(List<SelectableDesignerItemViewModelBase>), width, height, desiredSize, desiredMinSize, description)
+        {
+            SelectableDesignerItemViewModels = designerItemBase.ToObject();
+
+            var minleft = SelectableDesignerItemViewModels.OfType<DesignerItemViewModelBase>().Min(p => p.Left);
+            var mintop = SelectableDesignerItemViewModels.OfType<DesignerItemViewModelBase>().Min(p => p.Top);
+            var maxright = SelectableDesignerItemViewModels.OfType<DesignerItemViewModelBase>().Max(p => p.Left + p.ItemWidth);
+            var maxbottom = SelectableDesignerItemViewModels.OfType<DesignerItemViewModelBase>().Max(p => p.Top + p.ItemHeight);
+
+            foreach (var item in SelectableDesignerItemViewModels.OfType<DesignerItemViewModelBase>())
+            {
+                item.Left -= minleft;
+                item.Top -= mintop;
+            }
+            CanvasWidth = maxright - minleft;
+            CanvasHeight = maxbottom - mintop;
+
+            designerItemBase.DesignerItems = SelectableDesignerItemViewModels.OfType<DesignerItemViewModelBase>().Select(p => p.ToSerializableItem(".json")).Where(p => p != null).ToList();
+            designerItemBase.Connections = SelectableDesignerItemViewModels.OfType<ConnectionViewModel>().Select(p => p.ToSerializableItem(".json")).Where(p => p != null).ToList();
+
+            Addition = designerItemBase;
+            FileName = filename;
+        }
+    }
+
+    public class SvgToolBoxData : ToolBoxData
+    {
+        public SvgToolBoxData(string filename, Type type, double width = 32, double height = 32, Size? desiredSize = null, Size? desiredMinSize = null, string description = null) : base(null, filename, type, width, height, desiredSize, desiredMinSize, description)
+        {
+            ColorViewModel.FillColor.Color = Colors.Blue;
+        }
+    }
+
+    public class MediaToolBoxData : ToolBoxData
+    {
+        public MediaToolBoxData(string icon, Type type, double width = 32, double height = 32, Size? desiredSize = null, Size? desiredMinSize = null, string description = null) : base(icon, null, type, width, height, desiredSize, desiredMinSize, description)
+        {
+
+        }
+    }
+
+
+}

AIStudio.Wpf.DiagramApp/Models/DiagramDocument.cs

@@ -22,7 +22,7 @@ namespace AIStudio.Wpf.DiagramApp.Models
         [XmlArray]
         public List<DiagramItem> DiagramItems { get; set; }
 
-        public const string XMLNS = "http://AIStudio.Wpf.DiagramApp/DesignLayout";
+        public const string XMLNS = "https://gitee.com/akwkevin/aistudio.-wpf.-diagram";
         private readonly object saveLock = new Object();
 
         public void Save(FileInfo designFile)

AIStudio.Wpf.DiagramApp/Models/DiagramItem.cs

@@ -1,294 +0,0 @@
-using AIStudio.Wpf.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.DiagramHelper.Extensions.ViewModels;
-using AIStudio.Wpf.DiagramHelper.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.DiagramApp.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.DiagramApp/Models/PathToolBoxData.cs

@@ -1,73 +0,0 @@
-using AIStudio.Wpf.Flowchart;
-using AIStudio.Wpf.SFC;
-using System;
-using System.Windows.Media;
-using AIStudio.Wpf.DiagramDesigner;
-using AIStudio.Wpf.DiagramDesigner.Helpers;
-
-namespace AIStudio.Wpf.DiagramApp.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 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.DiagramApp/Styles/Expander.xaml

@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters;assembly=AIStudio.Wpf.DiagramHelper">
+                    xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Converters;assembly=AIStudio.Wpf.DiagramDesigner.Additionals">
     <converter:ThicknessBindingConverter x:Key="ThicknessBindingConverter"/>
 
     <Style x:Key="DefaultExpanderBaseHeaderStyle" TargetType="{x:Type ToggleButton}">
@@ -283,7 +283,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultAnimationExpander"
+    <Style x:Key="AIStudio.DiagramApp.Styles.Expander"
            TargetType="{x:Type Expander}">
         <Setter Property="Padding"
                 Value="5" />
@@ -538,7 +538,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="DefaultAutoHideExpander" TargetType="{x:Type Expander}">
+    <Style x:Key="AIStudio.DiagramApp.Styles.Expander.AutoHide" TargetType="{x:Type Expander}">
         <Setter Property="Padding"
                 Value="0" />
         <Setter Property="SnapsToDevicePixels"

AIStudio.Wpf.DiagramApp/Styles/ListBox.xaml

@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     
-    <Style x:Key="DefaultListBoxItem" TargetType="{x:Type ListBoxItem}">
+    <Style x:Key="AIStudio.DiagramApp.Styles.ListBoxItem" TargetType="{x:Type ListBoxItem}">
         <Setter Property="Foreground" Value="{DynamicResource Fluent.Ribbon.Brushes.LabelTextBrush}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
@@ -35,11 +35,11 @@
         </Setter>
     </Style>
     
-    <Style x:Key="DefaultListBox" TargetType="{x:Type ListBox}">
+    <Style x:Key="AIStudio.DiagramApp.Styles.ListBox" TargetType="{x:Type ListBox}">
         <Setter Property="BorderBrush" Value="{DynamicResource Fluent.Ribbon.Brushes.Control.BorderBrush}" />
         <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ItemContainerStyle" Value="{StaticResource DefaultListBoxItem}"></Setter>
+        <Setter Property="ItemContainerStyle" Value="{StaticResource AIStudio.DiagramApp.Styles.ListBoxItem}"></Setter>
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="False"></Setter>
         <Setter Property="Template">

AIStudio.Wpf.DiagramApp/Styles/Slider.xaml

@@ -464,7 +464,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="DefaultSlider" TargetType="{x:Type Slider}">
+    <Style x:Key="AIStudio.DiagramApp.Styles.Slider" TargetType="{x:Type Slider}">
         <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
         <Setter Property="Background" Value="{x:Null}"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
@@ -480,7 +480,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="DiscreteSlider" TargetType="{x:Type Slider}">
+    <Style x:Key="AIStudio.DiagramApp.Styles.Slider.Discrete" TargetType="{x:Type Slider}">
         <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
         <Setter Property="Background" Value="{x:Null}"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
@@ -542,7 +542,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="TransparentSlider" BasedOn="{StaticResource DefaultSlider}" TargetType="{x:Type Slider}">
+    <Style x:Key="AIStudio.DiagramApp.Styles.Slider.Transparent" BasedOn="{StaticResource AIStudio.DiagramApp.Styles.Slider}" TargetType="{x:Type Slider}">
         <Setter Property="IsSelectionRangeEnabled" Value="False"/>
         <Setter Property="Template" Value="{StaticResource TransparentSliderHorizontal}"/>
     </Style>

AIStudio.Wpf.DiagramApp/Styles/TabControl.xaml

@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style x:Key="TabControlStyle" TargetType="{x:Type TabControl}">
-        <Setter Property="ItemContainerStyle" Value="{DynamicResource TabItemStyle}"/>
+    <Style x:Key="AIStudio.DiagramApp.Styles.TabControl" TargetType="{x:Type TabControl}">
+        <Setter Property="ItemContainerStyle" Value="{DynamicResource AIStudio.DiagramApp.Styles.TabItem}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabControl}">
@@ -23,11 +23,11 @@
 
                 </ControlTemplate>
             </Setter.Value>
-        </Setter>
+        </Setter> 
     </Style>
 
     <!--TabControl-->
-    <Style x:Key="TabItemStyle" TargetType="TabItem">    
+    <Style x:Key="AIStudio.DiagramApp.Styles.TabItem" TargetType="TabItem">    
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="TabItem">
@@ -66,7 +66,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="UniformTabControlStyle" TargetType="{x:Type TabControl}">
+    <Style x:Key="AIStudio.DiagramApp.Styles.TabControl.Uniform" TargetType="{x:Type TabControl}">
         <Setter Property="Padding" Value="2"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
@@ -74,7 +74,7 @@
         <Setter Property="BorderBrush" Value="#FFACACAC"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-        <Setter Property="ItemContainerStyle" Value="{DynamicResource UniformTabItemStyle}"/>
+        <Setter Property="ItemContainerStyle" Value="{DynamicResource AIStudio.DiagramApp.Styles.TabItem.Uniform}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabControl}">
@@ -132,7 +132,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="UniformTabItemStyle" TargetType="{x:Type TabItem}">
+    <Style x:Key="AIStudio.DiagramApp.Styles.TabItem.Uniform" TargetType="{x:Type TabItem}">
         <Setter Property="Foreground" Value="{DynamicResource Fluent.Ribbon.Brushes.LabelTextBrush}"/>
         <Setter Property="Background" Value="{DynamicResource GrayBrush8}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource Fluent.Ribbon.Brushes.Control.BorderBrush}"/>
@@ -143,7 +143,13 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
                     <Border x:Name="templateRoot"  SnapsToDevicePixels="True" Background="{TemplateBinding Background}">
-                        <TextBlock x:Name="txt" Visibility="Visible" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{TemplateBinding Header}" ToolTip="{TemplateBinding Header}" Foreground="{TemplateBinding Foreground}" TextTrimming="CharacterEllipsis" />
+                        <ContentPresenter x:Name="contentPresenter" 
+                                          ContentSource="Header" 
+                                          TextElement.Foreground="{TemplateBinding Foreground}" 
+                                          HorizontalAlignment="Center" 
+                                          VerticalAlignment="Center"                                          
+                                          Focusable="False" 
+                                          RecognizesAccessKey="True"/>
                     </Border>
                     <ControlTemplate.Triggers>
                         <MultiDataTrigger>
@@ -196,7 +202,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="TabControlWithUnderLineStyle" TargetType="{x:Type TabControl}">
+    <Style x:Key="AIStudio.DiagramApp.Styles.TabControl.UnderLine" TargetType="{x:Type TabControl}">
         <Setter Property="Padding" Value="2"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
@@ -204,7 +210,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource Fluent.Ribbon.Brushes.Control.BorderBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-        <Setter Property="ItemContainerStyle" Value="{DynamicResource TabItemExWithUnderLineStyle}"/>
+        <Setter Property="ItemContainerStyle" Value="{DynamicResource AIStudio.DiagramApp.Styles.TabItem.UnderLine}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabControl}">
@@ -259,7 +265,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="TabItemExWithUnderLineStyle"  TargetType="{x:Type TabItem}">
+    <Style x:Key="AIStudio.DiagramApp.Styles.TabItem.UnderLine"  TargetType="{x:Type TabItem}">
         <Setter Property="Foreground" Value="{DynamicResource WhiteBrush}"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderBrush" Value="{DynamicResource Fluent.Ribbon.Brushes.Control.BorderBrush}"/>

AIStudio.Wpf.DiagramApp/Styles/ToggleButton.xaml

@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     
-    <Style TargetType="{x:Type ToggleButton}" x:Key="DefaultToggleButton">
+    <Style TargetType="{x:Type ToggleButton}" x:Key="AIStudio.DiagramApp.Styles.ToggleButton">
         <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -30,14 +30,14 @@
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type ToggleButton}" x:Key="ExpanderToggleButton">
+    <Style TargetType="{x:Type ToggleButton}" x:Key="AIStudio.DiagramApp.Styles.ToggleButton.Expander">
         <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
                     <Grid x:Name="Grid" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Background}">
-                        <Path x:Name="Path" Fill="{TemplateBinding Foreground}" Stretch="Fill" Width="18" Height="18" Margin="8" Data="M18.41,7.41L17,6L11,12L17,18L18.41,16.59L13.83,12L18.41,7.41M12.41,7.41L11,6L5,12L11,18L12.41,16.59L7.83,12L12.41,7.41Z"/>
+                        <Path x:Name="Path" Fill="{TemplateBinding Foreground}" Stretch="Fill" Width="16" Height="16" Margin="10,3" Data="M18.41,7.41L17,6L11,12L17,18L18.41,16.59L13.83,12L18.41,7.41M12.41,7.41L11,6L5,12L11,18L12.41,16.59L7.83,12L12.41,7.41Z"/>
                     </Grid>
                     <!--z触发器-->
                     <ControlTemplate.Triggers>

AIStudio.Wpf.DiagramApp/Themes/Generic.xaml

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

AIStudio.Wpf.DiagramApp/ViewModels/DrawingViewModel.cs

@@ -0,0 +1,192 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Windows;
+using AIStudio.Wpf.DiagramApp.Models;
+using AIStudio.Wpf.DiagramDesigner;
+
+namespace AIStudio.Wpf.DiagramApp.ViewModels
+{
+    public class DrawingViewModel : PageViewModel
+    {
+        public DrawingViewModel(string title, string status, DiagramType diagramType) : base(title, status, diagramType)
+        {
+
+        }
+        public DrawingViewModel(string filename, DiagramDocument diagramDocument) : base(filename, diagramDocument)
+        {
+            foreach (var vm in DiagramViewModels)
+            {
+                vm.Init(false);
+            }
+        }
+
+        protected override void InitDiagramViewModel()
+        {
+            base.InitDiagramViewModel();
+
+            DiagramViewModel.DiagramOption.LayoutOption.GridCellSize = new Size(100, 100);
+            DiagramViewModel.DiagramOption.LayoutOption.ShowGrid = true;
+            DiagramViewModel.DiagramOption.LayoutOption.AllowDrop = true;
+            _service.DrawModeViewModel.DrawingDrawModeSelected = true;
+            _service.DrawModeViewModel.DrawingDrawMode = DrawMode.Select;
+        }
+
+
+        protected override void Init(bool initNew)
+        {
+            base.Init(initNew);
+
+            DesignerItemViewModelBase line = new LineDrawingDesignerItemViewModel(DiagramViewModel, new List<Point> { new Point(38, 38), new Point(118, 118) }, null, true);
+            DiagramViewModel.Add(line);
+
+            DesignerItemViewModelBase rectangle = new RectangleDrawingDesignerItemViewModel(DiagramViewModel, new List<Point> { new Point(138, 38), new Point(218, 118) }, null, true);
+            DiagramViewModel.Add(rectangle);
+
+            DesignerItemViewModelBase ellipse = new EllipseDrawingDesignerItemViewModel(DiagramViewModel, new List<Point> { new Point(238, 38), new Point(318, 118) }, null, true);
+            DiagramViewModel.Add(ellipse);
+
+            DesignerItemViewModelBase text = new TextDrawingDesignerItemViewModel(DiagramViewModel, new Point(338, 38), "以下图形使用路线", null, true);
+            DiagramViewModel.Add(text);
+
+            DesignerItemViewModelBase triangle = new SharpDrawingDesignerItemViewModel(DiagramViewModel, DrawMode.ErasableTriangle, new List<Point> { new Point(438, 38), new Point(518, 118) }, null, true);
+            DiagramViewModel.Add(triangle);
+
+            DesignerItemViewModelBase rhombus = new SharpDrawingDesignerItemViewModel(DiagramViewModel, DrawMode.ErasableRhombus, new List<Point> { new Point(538, 38), new Point(618, 118) }, null, true);
+            DiagramViewModel.Add(rhombus);
+
+            DesignerItemViewModelBase hexagon = new SharpDrawingDesignerItemViewModel(DiagramViewModel, DrawMode.ErasableHexagon, new List<Point> { new Point(638, 38), new Point(718, 118) }, null, true);
+            DiagramViewModel.Add(hexagon);
+
+            DesignerItemViewModelBase pentagram = new SharpDrawingDesignerItemViewModel(DiagramViewModel, DrawMode.ErasablePentagram, new List<Point> { new Point(738, 38), new Point(818, 118) }, null, true);
+            DiagramViewModel.Add(pentagram);
+
+            DesignerItemViewModelBase starFour = new SharpDrawingDesignerItemViewModel(DiagramViewModel, DrawMode.ErasableStarFour, new List<Point> { new Point(38, 138), new Point(118, 218) }, null, true);
+            DiagramViewModel.Add(starFour);
+
+            DesignerItemViewModelBase starThree = new SharpDrawingDesignerItemViewModel(DiagramViewModel, DrawMode.ErasableStarThree, new List<Point> { new Point(138, 138), new Point(218, 218) }, null, true);
+            DiagramViewModel.Add(starThree);
+
+            DesignerItemViewModelBase chat = new SharpDrawingDesignerItemViewModel(DiagramViewModel, DrawMode.ErasableChat, new List<Point> { new Point(238, 138), new Point(318, 218) }, null, true);
+            DiagramViewModel.Add(chat);
+
+            DesignerItemViewModelBase comment = new SharpDrawingDesignerItemViewModel(DiagramViewModel, DrawMode.ErasableComment, new List<Point> { new Point(338, 138), new Point(418, 218) }, null, true);
+            DiagramViewModel.Add(comment);
+
+            DesignerItemViewModelBase cloud = new SharpDrawingDesignerItemViewModel(DiagramViewModel, DrawMode.ErasableCloud, new List<Point> { new Point(438, 138), new Point(518, 218) }, null, true);
+            DiagramViewModel.Add(cloud);
+
+            DesignerItemViewModelBase arrowRight = new SharpDrawingDesignerItemViewModel(DiagramViewModel, DrawMode.ErasableArrowRight, new List<Point> { new Point(538, 138), new Point(618, 218) }, null, true);
+            DiagramViewModel.Add(arrowRight);
+
+            DesignerItemViewModelBase arrowLeft = new SharpDrawingDesignerItemViewModel(DiagramViewModel, DrawMode.ErasableArrowLeft, new List<Point> { new Point(638, 138), new Point(718, 218) }, null, true);
+            DiagramViewModel.Add(arrowLeft);
+
+            DesignerItemViewModelBase check = new SharpDrawingDesignerItemViewModel(DiagramViewModel, DrawMode.ErasableCheck, new List<Point> { new Point(738, 138), new Point(818, 218) }, null, true);
+            DiagramViewModel.Add(check);
+
+            DesignerItemViewModelBase close = new SharpDrawingDesignerItemViewModel(DiagramViewModel, DrawMode.ErasableClose, new List<Point> { new Point(38, 238), new Point(118, 318) }, null, true);
+            DiagramViewModel.Add(close);
+
+            DesignerItemViewModelBase heart = new SharpDrawingDesignerItemViewModel(DiagramViewModel, DrawMode.ErasableHeart, new List<Point> { new Point(138, 238), new Point(218, 318) }, null, true);
+            DiagramViewModel.Add(heart);
+
+            DesignerItemViewModelBase polyline = new PolylineDrawingDesignerItemViewModel(DiagramViewModel, new List<Point> { new Point(238, 238), new Point(298, 258), new Point(258, 298), new Point(318, 318) }, null, true);
+            DiagramViewModel.Add(polyline);
+
+            DesignerItemViewModelBase polygon = new PolygonDrawingDesignerItemViewModel(DiagramViewModel, new List<Point> { new Point(338, 238), new Point(398, 258), new Point(358, 298), new Point(418, 318) }, null, true);
+            DiagramViewModel.Add(polygon);
+
+            DesignerItemViewModelBase text2 = new TextDrawingDesignerItemViewModel(DiagramViewModel, new Point(438, 238), "以下图形使用画线", null, true);
+            DiagramViewModel.Add(text2);
+
+            //画正方形
+            var drawingPoint1 = DrawingHelper.GetPoints(new Point(38, 518), 0, Enumerable.Repeat(new System.Tuple<double, double>(160, -90), 4).ToList());
+            DesignerItemViewModelBase directLine1 = new DirectLineDrawingDesignerItemViewModel(DiagramViewModel, drawingPoint1, null, true);
+            DiagramViewModel.Add(directLine1);
+
+            //画三角形
+            var drawingPoint2 = DrawingHelper.GetPoints(new Point(238, 518), 0, Enumerable.Repeat(new System.Tuple<double, double>(160, -120), 3).ToList());
+            DesignerItemViewModelBase directLine2 = new DirectLineDrawingDesignerItemViewModel(DiagramViewModel, drawingPoint2, null, true);
+            DiagramViewModel.Add(directLine2);
+
+            //画五边形
+            var drawingPoint3 = DrawingHelper.GetPoints(new Point(478, 518), 0, Enumerable.Repeat(new System.Tuple<double, double>(100, -72), 5).ToList());
+            DesignerItemViewModelBase directLine3 = new DirectLineDrawingDesignerItemViewModel(DiagramViewModel, drawingPoint3, null, true);
+            DiagramViewModel.Add(directLine3);
+
+            //画六角形
+            List<System.Tuple<double, double>> tuple4 = new List<System.Tuple<double, double>>();
+            for (int i = 0; i < 5; i++)
+            {
+                tuple4.Add(new System.Tuple<double, double>(70, 144));
+                tuple4.Add(new System.Tuple<double, double>(70, -72));
+            }
+            var drawingPoint4 = DrawingHelper.GetPoints(new Point(750, 408), 0, tuple4);
+            DesignerItemViewModelBase directLine4 = new DirectLineDrawingDesignerItemViewModel(DiagramViewModel, drawingPoint4, null, true);
+            DiagramViewModel.Add(directLine4);
+
+            //画八边形
+            List<System.Tuple<double, double>> tuple5 = new List<System.Tuple<double, double>>();
+            for (int i = 0; i < 8; i++)
+            {
+                tuple5.Add(new System.Tuple<double, double>(36, -90));
+                tuple5.Add(new System.Tuple<double, double>(36, 45));
+            }
+            var drawingPoint5 = DrawingHelper.GetPoints(new Point(153, 689), 0, tuple5);
+            DesignerItemViewModelBase directLine5 = new DirectLineDrawingDesignerItemViewModel(DiagramViewModel, drawingPoint5, null, true);
+            DiagramViewModel.Add(directLine5);
+
+            //画6个正三角形
+            List<System.Tuple<double, double>> tuple6 = new List<System.Tuple<double, double>>();
+            for (int i = 0; i < 6; i++)
+            {
+                for (int j = 0; j < 3; j++)
+                {
+                    tuple6.Add(new System.Tuple<double, double>(80, -120));
+                }
+                tuple6.Add(new System.Tuple<double, double>(0, -60));
+            }
+            var drawingPoint6 = DrawingHelper.GetPoints(new Point(328, 628), 0, tuple6);
+            DesignerItemViewModelBase directLine6 = new DirectLineDrawingDesignerItemViewModel(DiagramViewModel, drawingPoint6, null, true);
+            DiagramViewModel.Add(directLine6);
+
+            //画6个正六边形
+            List<System.Tuple<double, double>> tuple7 = new List<System.Tuple<double, double>>();
+            for (int i = 0; i < 6; i++)
+            {
+                for (int j = 0; j < 6; j++)
+                {
+                    tuple7.Add(new System.Tuple<double, double>(42, -60));
+                }
+                tuple7.Add(new System.Tuple<double, double>(0, -60));
+            }
+            var drawingPoint7 = DrawingHelper.GetPoints(new Point(528, 628), 0, tuple7);
+            DesignerItemViewModelBase directLine7 = new DirectLineDrawingDesignerItemViewModel(DiagramViewModel, drawingPoint7, null, true);
+            DiagramViewModel.Add(directLine7);
+
+            //画8个八角星
+            List<System.Tuple<double, double>> tuple8 = new List<System.Tuple<double, double>>();
+            for (int i = 0; i < 8; i++)
+            {
+                for (int j = 0; j < 8; j++)
+                {
+                    tuple8.Add(new System.Tuple<double, double>(20, -90));
+                    tuple8.Add(new System.Tuple<double, double>(20, 45));
+                }
+                tuple8.Add(new System.Tuple<double, double>(0, -45));
+            }
+            var drawingPoint8 = DrawingHelper.GetPoints(new Point(728, 628), 0, tuple8);
+            DesignerItemViewModelBase directLine8 = new DirectLineDrawingDesignerItemViewModel(DiagramViewModel, drawingPoint8, null, true);
+            DiagramViewModel.Add(directLine8);
+
+            DesignerItemViewModelBase text3 = new TextDrawingDesignerItemViewModel(DiagramViewModel, new Point(38, 738), "示例完毕，欢迎大家来到AIStudio画笔画板", null, true);
+            DiagramViewModel.Add(text3);
+        }
+
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+    }
+}

AIStudio.Wpf.DiagramApp/ViewModels/FlowchartViewModel.cs

@@ -1,111 +1,126 @@
-using AIStudio.Wpf.DiagramApp.Models;
-using AIStudio.Wpf.DiagramApp.ViewModels;
-using AIStudio.Wpf.Flowchart.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
+using AIStudio.Wpf.DiagramApp.Models;
 using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.Flowchart;
+using AIStudio.Wpf.Flowchart.ViewModels;
 
-namespace AIStudio.Wpf.Flowchart
+namespace AIStudio.Wpf.DiagramApp.ViewModels
 {
-    public class FlowchartViewModel : DiagramsViewModel
+    public class FlowchartViewModel : PageViewModel
     {
         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);
+                FlowchartService.InitData(DiagramViewModel.Items.OfType<FlowNode>().ToList(), DiagramViewModel.Items.OfType<ConnectionViewModel>().ToList(), DiagramViewModel, false);
             }
-            _service.DrawModeViewModel.VectorLineDrawMode = DrawMode.BoundaryConnectingLine;
+            _service.DrawModeViewModel.LineDrawMode = DrawMode.ConnectingLineSmooth;
         }
 
         protected override void InitDiagramViewModel()
         {
             base.InitDiagramViewModel();
 
-            DiagramViewModel.ShowGrid = true;
-            DiagramViewModel.GridCellSize = new Size(100, 100);
-            DiagramViewModel.CellHorizontalAlignment = CellHorizontalAlignment.Center;
-            DiagramViewModel.CellVerticalAlignment = CellVerticalAlignment.Center;
-            _service.DrawModeViewModel.VectorLineDrawMode = DrawMode.BoundaryConnectingLine;
+            DiagramViewModel.DiagramOption.LayoutOption.ShowGrid = true;
+            DiagramViewModel.DiagramOption.LayoutOption.GridCellSize = new Size(100, 100);
+            DiagramViewModel.DiagramOption.LayoutOption.CellHorizontalAlignment = CellHorizontalAlignment.Center;
+            DiagramViewModel.DiagramOption.LayoutOption.CellVerticalAlignment = CellVerticalAlignment.Center;
+            _service.DrawModeViewModel.LineDrawMode = DrawMode.ConnectingLineSmooth;
         }
 
-        protected override void Init()
+        protected override void Init(bool initNew)
         {
-            base.Init();
+            base.Init(initNew);
 
-            DesignerItemViewModelBase start = new StartFlowNode() { Left = 100, Top = 0, Color = Colors.Yellow.ToString() };
-            DiagramViewModel.DirectAddItemCommand.Execute(start);
+            DesignerItemViewModelBase start = new StartFlowNode() { Left = 100, Top = 0, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString() };
+            DiagramViewModel.Add(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 middle1 = new MiddleFlowNode() { Left = 100, Top = 100, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString(), Text = "主管审批（两人或）", UserIds= new List<string> { "操作员1", "操作员2" }, ActType = "or", SimulateApprove = true };
+            DiagramViewModel.Add(middle1);
 
-            DesignerItemViewModelBase decide = new DecideFlowNode() { Left = 100, Top = 200, Color = Colors.Yellow.ToString(), Text = "5" };
-            DiagramViewModel.DirectAddItemCommand.Execute(decide);
+            DesignerItemViewModelBase decide = new DecideFlowNode() { Left = 100, Top = 200, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString(), Text = "5" };
+            DiagramViewModel.Add(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 middle2 = new MiddleFlowNode() { Left = 200, Top = 300, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString(), Text = "分管领导（两人与）", UserIds = new List<string> { "操作员1", "操作员2" }, ActType = "and", SimulateApprove = true };
+            DiagramViewModel.Add(middle2);
 
-            DesignerItemViewModelBase cobegin = new COBeginFlowNode() { Left = 100, Top = 400, Color = Colors.Yellow.ToString() };
-            DiagramViewModel.DirectAddItemCommand.Execute(cobegin);
+            DesignerItemViewModelBase cobegin = new COBeginFlowNode() { Left = 100, Top = 400, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString() };
+            DiagramViewModel.Add(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 middle3 = new MiddleFlowNode() { Left = 100, Top = 500, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString(), Text = "财务审批", UserIds = new List<string> { "Admin" }, ActType = "or", SimulateApprove = true };
+            DiagramViewModel.Add(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 middle4 = new MiddleFlowNode() { Left = 200, Top = 500, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString(), Text = "人力审批", RoleIds = new List<string> { "操作员", "管理员" }, ActType = "or", SimulateApprove = true };
+            DiagramViewModel.Add(middle4);
 
-            DesignerItemViewModelBase coend = new COEndFlowNode() { Left = 100, Top = 600, Color = Colors.Yellow.ToString() };
-            DiagramViewModel.DirectAddItemCommand.Execute(coend);
+            DesignerItemViewModelBase coend = new COEndFlowNode() { Left = 100, Top = 600, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString() };
+            DiagramViewModel.Add(coend);
 
-            DesignerItemViewModelBase end = new EndFlowNode() { Left = 100, Top = 700, Color = Colors.Yellow.ToString() };
-            DiagramViewModel.DirectAddItemCommand.Execute(end);
+            DesignerItemViewModelBase end = new EndFlowNode() { Left = 100, Top = 700, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString() };
+            DiagramViewModel.Add(end);
 
-            ConnectorViewModel connector1 = new ConnectorViewModel(start.BottomConnector, middle1.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode);     
-            DiagramViewModel.DirectAddItemCommand.Execute(connector1);
+            ConnectionViewModel connector1 = new ConnectionViewModel(start.BottomConnector, middle1.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);     
+            DiagramViewModel.Add(connector1);
 
-            ConnectorViewModel connector2 = new ConnectorViewModel(middle1.BottomConnector, decide.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector2);
+            ConnectionViewModel connector2 = new ConnectionViewModel(middle1.BottomConnector, decide.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            DiagramViewModel.Add(connector2);
 
-            ConnectorViewModel connector3 = new ConnectorViewModel(decide.RightConnector, middle2.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector3);
-            connector3.AddText(">=3");
+            ConnectionViewModel connector3 = new ConnectionViewModel(decide.RightConnector, middle2.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            DiagramViewModel.Add(connector3);
+            connector3.AddLabel(">=3");
 
-            ConnectorViewModel connector4 = new ConnectorViewModel(middle2.BottomConnector, cobegin.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector4);
+            ConnectionViewModel connector4 = new ConnectionViewModel(middle2.BottomConnector, cobegin.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            DiagramViewModel.Add(connector4);
 
-            ConnectorViewModel connector5 = new ConnectorViewModel(decide.BottomConnector, cobegin.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector5);
-            connector5.AddText("<3");
+            ConnectionViewModel connector5 = new ConnectionViewModel(decide.BottomConnector, cobegin.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            DiagramViewModel.Add(connector5);
+            connector5.AddLabel("<3");
 
-            ConnectorViewModel connector6 = new ConnectorViewModel(cobegin.BottomConnector, middle3.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector6);
+            ConnectionViewModel connector6 = new ConnectionViewModel(cobegin.BottomConnector, middle3.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            DiagramViewModel.Add(connector6);
 
-            ConnectorViewModel connector7 = new ConnectorViewModel(cobegin.BottomConnector, middle4.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector7);
+            ConnectionViewModel connector7 = new ConnectionViewModel(cobegin.BottomConnector, middle4.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            DiagramViewModel.Add(connector7);
 
-            ConnectorViewModel connector8 = new ConnectorViewModel(middle3.BottomConnector, coend.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector8);
+            ConnectionViewModel connector8 = new ConnectionViewModel(middle3.BottomConnector, coend.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            DiagramViewModel.Add(connector8);
 
-            ConnectorViewModel connector9 = new ConnectorViewModel(middle4.BottomConnector, coend.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector9);
+            ConnectionViewModel connector9 = new ConnectionViewModel(middle4.BottomConnector, coend.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            DiagramViewModel.Add(connector9);
 
-            ConnectorViewModel connector10 = new ConnectorViewModel(coend.BottomConnector, end.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector10);
+            ConnectionViewModel connector10 = new ConnectionViewModel(coend.BottomConnector, end.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            DiagramViewModel.Add(connector10);
 
-            DiagramViewModel.ClearSelectedItems();
+            TextDesignerItemViewModel despcription = new TextDesignerItemViewModel()
+            {
+                Name = nameof(despcription),
+                Left = 360,
+                Top = 60,
+                ItemWidth = 300,
+                ItemHeight = 150,
+                Text = @"
+      一个简易的OA审批流程
+      1.主管审批为or审批，任意一个审批即可；
+      2.分管领导为and审批，需要审批两次；
+      3.财务审批为or审批，任意一个审批即可；
+      4.人力审批为or审批，任意一个审批即可；
+注意：为了模拟审批，双击节点可以进行审批；请双击主管审批、分管领导、财务审批、人力审批、进行效果查看。"
+            };
+            despcription.FontViewModel.HorizontalAlignment = HorizontalAlignment.Left;
+            despcription.FontViewModel.VerticalAlignment = VerticalAlignment.Top;
+            despcription.FontViewModel.FontColor = Colors.Blue;
+            DiagramViewModel.Add(despcription);
 
-            FlowchartService.InitData(DiagramViewModel.Items.OfType<FlowNode>().ToList(), DiagramViewModel.Items.OfType<ConnectorViewModel>().ToList(), DiagramViewModel);
+            FlowchartService.InitData(DiagramViewModel.Items.OfType<FlowNode>().ToList(), DiagramViewModel.Items.OfType<ConnectionViewModel>().ToList(), DiagramViewModel, true);
         }
+  
 
         public override void Dispose()
         {
@@ -113,7 +128,7 @@ namespace AIStudio.Wpf.Flowchart
 
             foreach (var viewModel in DiagramViewModels)
             {
-                FlowchartService.DisposeData(viewModel);
+                FlowchartService.Dispose(viewModel);
             }
         }
     }

AIStudio.Wpf.DiagramApp/ViewModels/LogicalViewModel.cs

@@ -1,102 +1,118 @@
-using AIStudio.Wpf.DiagramApp.Models;
-using AIStudio.Wpf.DiagramApp.ViewModels;
-using AIStudio.Wpf.Logical.ViewModels;
-using System;
+using System;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
+using AIStudio.Wpf.DiagramApp.Models;
 using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.Logical;
+using AIStudio.Wpf.Logical.ViewModels;
 
-namespace AIStudio.Wpf.Logical
+namespace AIStudio.Wpf.DiagramApp.ViewModels
 {
-    public class LogicalViewModel : DiagramsViewModel
+    public class LogicalViewModel : PageViewModel
     {
         public LogicalViewModel(string title, string status, DiagramType diagramType) : base(title, status, diagramType)
         {
-            
+
         }
         public LogicalViewModel(string filename, DiagramDocument diagramDocument) : base(filename, diagramDocument)
         {
-            _service.DrawModeViewModel.VectorLineDrawMode = DrawMode.CornerConnectingLine;
+            _service.DrawModeViewModel.LineDrawMode = DrawMode.ConnectingLineSmooth;
         }
 
         protected override void InitDiagramViewModel()
         {
             base.InitDiagramViewModel();
 
-            DiagramViewModel.ShowGrid = true;
-            DiagramViewModel.GridCellSize = new Size(150, 100);
-            DiagramViewModel.PageSizeOrientation = PageSizeOrientation.Horizontal;
-            DiagramViewModel.CellHorizontalAlignment = CellHorizontalAlignment.Left;
-            DiagramViewModel.CellVerticalAlignment = CellVerticalAlignment.None;
+            DiagramViewModel.DiagramOption.LayoutOption.ShowGrid = true;
+            DiagramViewModel.DiagramOption.LayoutOption.GridCellSize = new Size(150, 100);
+            DiagramViewModel.DiagramOption.LayoutOption.PageSizeOrientation = PageSizeOrientation.Horizontal;
+            DiagramViewModel.DiagramOption.LayoutOption.CellHorizontalAlignment = CellHorizontalAlignment.Left;
+            DiagramViewModel.DiagramOption.LayoutOption.CellVerticalAlignment = CellVerticalAlignment.None;
 
             DiagramViewModel.Items.CollectionChanged += Items_CollectionChanged;
-            _service.DrawModeViewModel.VectorLineDrawMode = DrawMode.CornerConnectingLine;
+            _service.DrawModeViewModel.LineDrawMode = DrawMode.ConnectingLineSmooth;
         }
 
-        protected override void Init()
+        protected override void Init(bool initNew)
         {
-            base.Init();
+            base.Init(initNew);
 
-            TimerDesignerItemViewModel timer = new TimerDesignerItemViewModel() { Left = 0, Top = 10 };
-            timer.Value = 0.5;
-            DiagramViewModel.DirectAddItemCommand.Execute(timer);
+            TimerDesignerItemViewModel timer = new TimerDesignerItemViewModel() { Left = 28, Top = 28 };
+            timer.Value = 1;
+            DiagramViewModel.Add(timer);
 
-            InputItemViewModel in1 = new InputItemViewModel() { Left = 0, Top = 50 };
+            InputItemViewModel in1 = new InputItemViewModel() { Left = 28, Top = 110 };
             in1.LinkPoint = LogicalService.LinkPoint[0];
-            DiagramViewModel.DirectAddItemCommand.Execute(in1);
+            DiagramViewModel.Add(in1);
 
-            InputItemViewModel in2 = new InputItemViewModel() { Left = 0, Top = 80 };
+            InputItemViewModel in2 = new InputItemViewModel() { Left = 28, Top = 300 };
             in2.LinkPoint = LogicalService.LinkPoint[1];
-            DiagramViewModel.DirectAddItemCommand.Execute(in2);
+            DiagramViewModel.Add(in2);
 
-            AddGateItemViewModel item1 = new AddGateItemViewModel() { Left = 150, Top = 50 };
-            DiagramViewModel.DirectAddItemCommand.Execute(item1);
+            AddGateItemViewModel item1 = new AddGateItemViewModel() { Left = 178, Top = 160 };
+            DiagramViewModel.Add(item1);
 
-            ConstantDesignerItemViewModel constant = new ConstantDesignerItemViewModel() { Left = 150, Top = 118 };
-            DiagramViewModel.DirectAddItemCommand.Execute(constant);
+            ConstantDesignerItemViewModel constant = new ConstantDesignerItemViewModel() { Left = 178, Top = 300, Value = 10 };
+            DiagramViewModel.Add(constant);
 
-            GTGateItemViewModel gTGate = new GTGateItemViewModel() { Left = 300, Top = 50 };
-            DiagramViewModel.DirectAddItemCommand.Execute(gTGate);
+            GTGateItemViewModel gTGate = new GTGateItemViewModel() { Left = 328, Top = 110 };
+            DiagramViewModel.Add(gTGate);
 
-            InputItemViewModel in3 = new InputItemViewModel() { Left = 300, Top = 118 };
+            InputItemViewModel in3 = new InputItemViewModel() { Left = 328, Top = 210 };
             in3.LinkPoint = LogicalService.LinkPoint[2];
-            DiagramViewModel.DirectAddItemCommand.Execute(in3);
+            DiagramViewModel.Add(in3);
 
-            InputItemViewModel in4 = new InputItemViewModel() { Left = 300, Top = 148 };
+            InputItemViewModel in4 = new InputItemViewModel() { Left = 328, Top = 300 };
             in4.LinkPoint = LogicalService.LinkPoint[3];
-            DiagramViewModel.DirectAddItemCommand.Execute(in4);
+            DiagramViewModel.Add(in4);
 
-            SELGateItemViewModel sELGate = new SELGateItemViewModel() { Left = 450, Top = 50 };
-            DiagramViewModel.DirectAddItemCommand.Execute(sELGate);
+            SELGateItemViewModel sELGate = new SELGateItemViewModel() { Left = 478, Top = 160 };
+            DiagramViewModel.Add(sELGate);
 
-            OutputItemViewModel out1 = new OutputItemViewModel() { Left = 600, Top = 50 };
+            OutputItemViewModel out1 = new OutputItemViewModel() { Left = 628, Top = 110 };
             out1.LinkPoint = LogicalService.LinkPoint[4];
-            DiagramViewModel.DirectAddItemCommand.Execute(out1);
+            DiagramViewModel.Add(out1);
 
-            ConnectorViewModel connector1 = new ConnectorViewModel(in1.Output[0], item1.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector1);
+            ConnectionViewModel connector1 = new ConnectionViewModel(in1.Output[0], item1.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            connector1.ColorViewModel.FillColor.Color = Colors.Green;
+            connector1.AnimationViewModel.Animation = LineAnimation.PathAnimation;
+            DiagramViewModel.Add(connector1);
 
-            ConnectorViewModel connector2 = new ConnectorViewModel(in2.Output[0], item1.Input[1], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector2);
+            ConnectionViewModel connector2 = new ConnectionViewModel(in2.Output[0], item1.Input[1], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            connector2.ColorViewModel.FillColor.Color = Colors.Green;
+            connector2.AnimationViewModel.Animation = LineAnimation.PathAnimation;
+            DiagramViewModel.Add(connector2);
 
-            ConnectorViewModel connector3 = new ConnectorViewModel(item1.Output[0], gTGate.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector3);
+            ConnectionViewModel connector3 = new ConnectionViewModel(item1.Output[0], gTGate.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            connector3.ColorViewModel.FillColor.Color = Colors.Green;
+            connector3.AnimationViewModel.Animation = LineAnimation.PathAnimation;
+            DiagramViewModel.Add(connector3);
 
-            ConnectorViewModel connector4 = new ConnectorViewModel(constant.Output[0], gTGate.Input[1], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector4);
+            ConnectionViewModel connector4 = new ConnectionViewModel(constant.Output[0], gTGate.Input[1], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            connector4.ColorViewModel.FillColor.Color = Colors.Green;
+            connector4.AnimationViewModel.Animation = LineAnimation.PathAnimation;
+            DiagramViewModel.Add(connector4);
 
-            ConnectorViewModel connector5 = new ConnectorViewModel(gTGate.Output[0], sELGate.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector5);
+            ConnectionViewModel connector5 = new ConnectionViewModel(gTGate.Output[0], sELGate.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            connector5.ColorViewModel.FillColor.Color = Colors.Green;
+            connector5.AnimationViewModel.Animation = LineAnimation.PathAnimation;
+            DiagramViewModel.Add(connector5);
 
-            ConnectorViewModel connector6 = new ConnectorViewModel(in3.Output[0], sELGate.Input[1], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector6);
+            ConnectionViewModel connector6 = new ConnectionViewModel(in3.Output[0], sELGate.Input[1], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            connector6.ColorViewModel.FillColor.Color = Colors.Green;
+            connector6.AnimationViewModel.Animation = LineAnimation.PathAnimation;
+            DiagramViewModel.Add(connector6);
 
-            ConnectorViewModel connector7 = new ConnectorViewModel(in4.Output[0], sELGate.Input[2], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector7);
+            ConnectionViewModel connector7 = new ConnectionViewModel(in4.Output[0], sELGate.Input[2], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            connector7.ColorViewModel.FillColor.Color = Colors.Green;
+            connector7.AnimationViewModel.Animation = LineAnimation.PathAnimation;
+            DiagramViewModel.Add(connector7);
 
-            ConnectorViewModel connector8 = new ConnectorViewModel(sELGate.Output[0], out1.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector8);
+            ConnectionViewModel connector8 = new ConnectionViewModel(sELGate.Output[0], out1.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
+            connector8.ColorViewModel.FillColor.Color = Colors.Green;
+            connector8.AnimationViewModel.Animation = LineAnimation.PathAnimation;
+            DiagramViewModel.Add(connector8);
         }
 
         private void Items_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
@@ -124,11 +140,11 @@ namespace AIStudio.Wpf.Logical
             if (base.AddVerify(arg) == false)
                 return false;
 
-            if (arg is ConnectorViewModel connector)
+            if (arg is ConnectionViewModel connector)
             {
-                if (connector.SinkConnectorInfo is FullyCreatedConnectorInfo fully)
+                if (connector.IsFullConnection)
                 {
-                    if (DiagramViewModel.Items.OfType<ConnectorViewModel>().Any(p => p.SinkConnectorInfo == fully))
+                    if (DiagramViewModel.Items.OfType<ConnectionViewModel>().Any(p => p.SinkConnectorInfo == connector.SinkConnectorInfoFully))
                     {
                         return false;
                     }
@@ -148,276 +164,16 @@ namespace AIStudio.Wpf.Logical
 
         private void Do()
         {
-            foreach (var item in DiagramViewModel.Items.OfType<ConstantDesignerItemViewModel>())
+            Random rd = new Random();
+            foreach (var link in LogicalService.LinkPoint)
             {
-                foreach (var output in item.Output)
-                {
-                    output.Value.ConnectorValue = item.Value;
-                    output.Value.ColorViewModel.FillColor.Color = Colors.Green;
-                }
-            }
-
-            foreach (var item in DiagramViewModel.Items.OfType<InputItemViewModel>())
-            {
-                if (item.LinkPoint != null)
-                {
-                    foreach (var output in item.Output)
-                    {
-                        output.Value.ConnectorValue = item.LinkPoint.Value;
-                        output.Value.ColorViewModel.FillColor.Color = Colors.Green;
-                    }
-                }
+                link.Value = rd.NextDouble() * 10;
             }
 
             foreach (var item in DiagramViewModel.Items.OfType<LogicalGateItemViewModelBase>().OrderBy(p => p.OrderNumber))
             {
-                if (item.LogicalType != LogicalType.None)
-                {
-                    foreach (var input in item.Input)
-                    {
-                        var connector = GetSourceItem(input.Value);
-                        if (connector == null)
-                        {
-                            continue;
-                        }
-
-                        if (connector.SourceConnectorInfo.DataItem is LogicalGateItemViewModelBase)
-                        {
-                            input.Value.ConnectorValue = connector.SourceConnectorInfo.ConnectorValue;
-
-                            input.Value.ColorViewModel.FillColor.Color = connector.SourceConnectorInfo.ColorViewModel.FillColor.Color;
-                            connector.ColorViewModel.LineColor.Color = connector.SourceConnectorInfo.ColorViewModel.FillColor.Color;
-
-                            if (item.LogicalType == LogicalType.Output)
-                            {
-                                input.Value.ValueTypePoint = connector.SourceConnectorInfo.ValueTypePoint;
-                            }
-                            else if (item.LogicalType == LogicalType.NOT)
-                            {
-                                input.Value.ValueTypePoint = (connector.SourceConnectorInfo.ValueTypePoint == ValueTypePoint.Bool) ? ValueTypePoint.Bool : ValueTypePoint.Int;
-                            }
-                        }
-                    }
-
-                    foreach (var output in item.Output)
-                    {
-                        if (item.LogicalType == LogicalType.Output)
-                        {
-                            var first = item.Input.Values.FirstOrDefault();
-                            output.Value.ConnectorValue = first.ConnectorValue;
-                            output.Value.ValueTypePoint = first.ValueTypePoint;
-                            (item as OutputItemViewModel).Value = first.ConnectorValue;
-                            (item as OutputItemViewModel).LinkPoint.Value = first.ConnectorValue;
-                        }
-                        else if (item.LogicalType == LogicalType.ADD)
-                        {
-                            output.Value.ConnectorValue = item.Input.Values.Select(p => p.ConnectorValue).Sum();
-                        }
-                        else if (item.LogicalType == LogicalType.SUB)
-                        {
-                            var first = item.Input.Values.Select(p => p.ConnectorValue).FirstOrDefault();
-                            var second = item.Input.Values.Where((value, index) => index != 0).Select(p => p.ConnectorValue).Sum();
-                            output.Value.ConnectorValue = first - second;
-                        }
-                        else if (item.LogicalType == LogicalType.MUL)
-                        {
-                            double result = 0;
-                            foreach (var input in item.Input.Values)
-                            {
-                                if (result == 0)
-                                {
-                                    result = 1;
-                                }
-                                result *= input.ConnectorValue;
-                            }
-                            output.Value.ConnectorValue = result;
-                        }
-                        else if (item.LogicalType == LogicalType.DIV)
-                        {
-                            double result = item.Input.Values.Select(p => p.ConnectorValue).FirstOrDefault();
-                            foreach (var input in item.Input.Values.Where((value, index) => index != 0))
-                            {
-                                result /= input.ConnectorValue;
-                            }
-                            output.Value.ConnectorValue = result;
-                        }
-                        else if (item.LogicalType == LogicalType.AVE)
-                        {
-                            output.Value.ConnectorValue = item.Input.Values.Select(p => p.ConnectorValue).Average();
-                        }
-                        else if (item.LogicalType == LogicalType.MOD)
-                        {
-                            output.Value.ConnectorValue = item.Input[0].ConnectorValue % item.Input[1].ConnectorValue;
-                        }
-                        else if (item.LogicalType == LogicalType.AND)
-                        {
-                            output.Value.ConnectorValue = Convert.ToInt32(item.Input[0].ConnectorValue) & Convert.ToInt32(item.Input[1].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.OR)
-                        {
-                            output.Value.ConnectorValue = Convert.ToInt32(item.Input[0].ConnectorValue) | Convert.ToInt32(item.Input[1].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.XOR)
-                        {
-                            output.Value.ConnectorValue = Convert.ToInt32(Convert.ToInt32(item.Input[0].ConnectorValue) ^ Convert.ToInt32(item.Input[1].ConnectorValue));
-                        }
-                        else if (item.LogicalType == LogicalType.NOT)
-                        {
-                            if (item.Input[0].ValueTypePoint == ValueTypePoint.Bool)
-                            {
-                                output.Value.ConnectorValue = Convert.ToInt32(!Convert.ToBoolean(item.Input[0].ConnectorValue));
-                                output.Value.ValueTypePoint = ValueTypePoint.Bool;
-                            }
-                            else
-                            {
-                                output.Value.ConnectorValue = ~Convert.ToInt32(item.Input[0].ConnectorValue);
-                                output.Value.ValueTypePoint = ValueTypePoint.Int;
-                            }
-
-                        }
-                        else if (item.LogicalType == LogicalType.SHL)
-                        {
-                            output.Value.ConnectorValue = Convert.ToInt32(item.Input[0].ConnectorValue) << Convert.ToInt32(item.Input[1].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.SHR)
-                        {
-                            output.Value.ConnectorValue = Convert.ToInt32(item.Input[0].ConnectorValue) >> Convert.ToInt32(item.Input[1].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.ROL)
-                        {
-                            output.Value.ConnectorValue = (Convert.ToInt32(item.Input[0].ConnectorValue) << Convert.ToInt32(item.Input[1].ConnectorValue)) | (Convert.ToInt32(item.Input[0].ConnectorValue) >> 32 - Convert.ToInt32(item.Input[1].ConnectorValue));
-                        }
-                        else if (item.LogicalType == LogicalType.ROR)
-                        {
-                            output.Value.ConnectorValue = (Convert.ToInt32(item.Input[0].ConnectorValue) >> Convert.ToInt32(item.Input[1].ConnectorValue)) | (Convert.ToInt32(item.Input[0].ConnectorValue) << 32 - Convert.ToInt32(item.Input[1].ConnectorValue));
-                        }
-                        else if (item.LogicalType == LogicalType.SEL)
-                        {
-                            output.Value.ConnectorValue = (item.Input[0].ConnectorValue == output.Key) ? item.Input[1].ConnectorValue : item.Input[2].ConnectorValue;
-                        }
-                        else if (item.LogicalType == LogicalType.MAX)
-                        {
-                            output.Value.ConnectorValue = item.Input.Values.Select(p => p.ConnectorValue).Max();
-                        }
-                        else if (item.LogicalType == LogicalType.MIN)
-                        {
-                            output.Value.ConnectorValue = item.Input.Values.Select(p => p.ConnectorValue).Min();
-                        }
-                        else if (item.LogicalType == LogicalType.LIMIT)
-                        {
-                            output.Value.ConnectorValue = (item.Input[0].ConnectorValue > item.Input[1].ConnectorValue) ? item.Input[1].ConnectorValue : item.Input[0].ConnectorValue;
-                        }
-                        else if (item.LogicalType == LogicalType.GT)
-                        {
-                            output.Value.ConnectorValue = (item.Input[0].ConnectorValue > item.Input[1].ConnectorValue) ? 1 : 0;
-                        }
-                        else if (item.LogicalType == LogicalType.LT)
-                        {
-                            output.Value.ConnectorValue = (item.Input[0].ConnectorValue < item.Input[1].ConnectorValue) ? 1 : 0;
-                        }
-                        else if (item.LogicalType == LogicalType.GE)
-                        {
-                            output.Value.ConnectorValue = (item.Input[0].ConnectorValue >= item.Input[1].ConnectorValue) ? 1 : 0;
-                        }
-                        else if (item.LogicalType == LogicalType.LE)
-                        {
-                            output.Value.ConnectorValue = (item.Input[0].ConnectorValue <= item.Input[1].ConnectorValue) ? 1 : 0;
-                        }
-                        else if (item.LogicalType == LogicalType.EQ)
-                        {
-                            output.Value.ConnectorValue = (item.Input[0].ConnectorValue == item.Input[1].ConnectorValue) ? 1 : 0;
-                        }
-                        else if (item.LogicalType == LogicalType.NE)
-                        {
-                            output.Value.ConnectorValue = (item.Input[0].ConnectorValue != item.Input[1].ConnectorValue) ? 1 : 0;
-                        }
-                        else if (item.LogicalType == LogicalType.ABS)
-                        {
-                            output.Value.ConnectorValue = Math.Abs(item.Input[0].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.SQRT)
-                        {
-                            output.Value.ConnectorValue = Math.Sqrt(item.Input[0].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.LN)
-                        {
-                            output.Value.ConnectorValue = Math.Log10(item.Input[0].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.LOG)
-                        {
-                            output.Value.ConnectorValue = Math.Log(item.Input[0].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.EXP)
-                        {
-                            output.Value.ConnectorValue = Math.Exp(item.Input[0].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.SIN)
-                        {
-                            output.Value.ConnectorValue = Math.Sin(item.Input[0].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.COS)
-                        {
-                            output.Value.ConnectorValue = Math.Cos(item.Input[0].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.TAN)
-                        {
-                            output.Value.ConnectorValue = Math.Tan(item.Input[0].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.ASIN)
-                        {
-                            output.Value.ConnectorValue = Math.Asin(item.Input[0].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.ACOS)
-                        {
-                            output.Value.ConnectorValue = Math.Acos(item.Input[0].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.ATAN)
-                        {
-                            output.Value.ConnectorValue = Math.Atan(item.Input[0].ConnectorValue);
-                        }
-                        else if (item.LogicalType == LogicalType.EXPT)
-                        {
-                            output.Value.ConnectorValue = Math.Exp(item.Input[0].ConnectorValue);
-                        }
-
-                        if (output.Value.ValueTypePoint == ValueTypePoint.Bool)
-                        {
-                            if (output.Value.ConnectorValue == 0)
-                            {
-                                output.Value.ColorViewModel.FillColor.Color = Colors.Red;
-                                if (item.LogicalType == LogicalType.Output)
-                                {
-                                    item.ColorViewModel.FillColor.Color = Colors.Red;
-                                }
-                            }
-                            else
-                            {
-                                output.Value.ColorViewModel.FillColor.Color = Colors.Green;
-                                if (item.LogicalType == LogicalType.Output)
-                                {
-                                    item.ColorViewModel.FillColor.Color = Colors.Green;
-                                }
-                            }
-                        }
-                        else
-                        {
-                            output.Value.ColorViewModel.FillColor.Color = Colors.Green;
-                        }
-                    }
-                }
+                item.Execute();
             }
         }
-
-        private ConnectorViewModel GetSourceItem(FullyCreatedConnectorInfo sinkConnector)
-        {
-            foreach (var connector in DiagramViewModel.Items.OfType<ConnectorViewModel>())
-            {
-                if (connector.SinkConnectorInfo == sinkConnector)
-                {
-                    return connector;
-                }
-            }
-            return null;
-        }
     }
 }

AIStudio.Wpf.DiagramApp/ViewModels/MindViewModel.cs

@@ -0,0 +1,130 @@
+using AIStudio.Wpf.DiagramApp.Models;
+using AIStudio.Wpf.DiagramApp.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 AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.Mind.ViewModels;
+using AIStudio.Wpf.Mind;
+using AIStudio.Wpf.DiagramDesigner.Additionals;
+using AIStudio.Wpf.Mind.Helpers;
+using AIStudio.Wpf.Mind.Models;
+
+namespace AIStudio.Wpf.DiagramApp.ViewModels
+{
+    public class MindViewModel : PageViewModel
+    {
+        public MindViewModel(string title, string status, DiagramType diagramType, MindType mindType) : base(title, status, diagramType, mindType.ToString())
+        {
+
+        }
+        public MindViewModel(string filename, DiagramDocument diagramDocument) : base(filename, diagramDocument)
+        {
+
+        }
+
+        protected override void OpenFile(DiagramDocument diagramDocument, string ext)
+        {
+            base.OpenFile(diagramDocument, ext);
+            foreach (var vm in DiagramViewModels)
+            {
+                vm.Init(false);
+            }
+            if (MindDiagramViewModel != null)
+            {
+                SubType = MindDiagramViewModel.MindType.ToString();
+                MindTheme = MindDiagramViewModel.MindTheme;
+            }
+        }
+
+        protected override void InitDiagramViewModel()
+        {
+            base.InitDiagramViewModel();
+
+            DiagramViewModel.DiagramOption.LayoutOption.GridCellSize = new Size(100, 100);
+            DiagramViewModel.DiagramOption.LayoutOption.ShowGrid = false;
+            DiagramViewModel.DiagramOption.LayoutOption.AllowDrop = false;
+        }
+
+        public IMindDiagramViewModel MindDiagramViewModel
+        {
+            get
+            {
+                return DiagramViewModel as IMindDiagramViewModel;
+            }
+        }
+
+        public MindType MindType
+        {
+            get
+            {
+                if (SubType == null)
+                {
+                    return MindType.Mind;
+                }
+                else
+                {
+                    return SubType.ToEnum<MindType>();
+                }
+            }
+        }
+
+        public MindTheme MindTheme
+        {
+            get;set;
+        }
+
+        protected override void Init(bool initNew)
+        {
+            DiagramViewModels = new ObservableCollection<IDiagramViewModel>()
+            {
+                GetDiagramViewModel("页-1", DiagramType, initNew),
+            };
+            DiagramViewModel = DiagramViewModels.FirstOrDefault();
+
+            InitDiagramViewModel();
+            var level1node = MindDiagramViewModel.RootItems.FirstOrDefault();
+
+            MindNode level2node1_1 = new MindNode(DiagramViewModel) { Text = "分支主题1" };
+            level2node1_1.AddTo(level1node, 0, false);
+
+            MindNode level2node1_1_1 = new MindNode(DiagramViewModel) { Text = "分支主题1_1" };
+            level2node1_1_1.AddTo(level2node1_1, 0, false);
+
+            MindNode level2node1_1_2 = new MindNode(DiagramViewModel) { Text = "分支主题1_2" };
+            level2node1_1_2.AddTo(level2node1_1, 0, false);
+
+            MindNode level2node1_1_3 = new MindNode(DiagramViewModel) { Text = "分支主题1_3" };
+            level2node1_1_3.AddTo(level2node1_1, 0, false);
+
+            MindNode level2node1_2 = new MindNode(DiagramViewModel) { Text = "分支主题2" };
+            level2node1_2.AddTo(level1node, 0, false);
+
+            MindNode level2node1_3 = new MindNode(DiagramViewModel) { Text = "分支主题3" };
+            level2node1_3.AddTo(level1node, 0, false);
+
+            DiagramViewModel.Init(initNew);
+        }
+
+        protected override DiagramViewModel GetDiagramViewModel(string name, DiagramType diagramType, bool initNew)
+        {
+            var viewmodel = new MindDiagramViewModel() { Name = name ?? NewNameHelper.GetNewName(DiagramViewModels.Select(p => p.Name), "页-"), DiagramType = diagramType, MindType = MindType, MindTheme = MindTheme, GenerateThumbnail = true };
+            viewmodel.Init(initNew);
+
+            return viewmodel;
+        }
+
+        public override void Dispose()
+        {
+            base.Dispose();
+
+
+        }
+    }
+}

AIStudio.Wpf.DiagramApp/ViewModels/PageViewModel.cs

@@ -0,0 +1,615 @@
+using AIStudio.Wpf.DiagramDesigner.Additionals.Commands;
+using AIStudio.Wpf.Flowchart;
+using AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels;
+using AIStudio.Wpf.DiagramDesigner.Additionals;
+using AIStudio.Wpf.DiagramApp.Models;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Xml.Serialization;
+using AIStudio.Wpf.DiagramDesigner;
+using ZXing;
+using AIStudio.Wpf.DiagramDesigner.Helpers;
+using AIStudio.Wpf.DiagramDesigner.ViewModels;
+using AIStudio.Wpf.DiagramDesigner.ViewModels.BaseViewModel;
+using System.Threading.Tasks;
+
+namespace AIStudio.Wpf.DiagramApp.ViewModels
+{
+    public partial class PageViewModel : BindableBase
+    {
+        #region 初始化
+        protected IDiagramServiceProvider _service
+        {
+            get
+            {
+                return DiagramServicesProvider.Instance.Provider;
+            }
+        }
+
+
+        public PageViewModel(string title, string status, DiagramType diagramType, string subType = null)
+        {
+            Title = title;
+            Status = status;
+            DiagramType = diagramType;
+            SubType = subType;
+
+        }
+        public PageViewModel(string filename)
+        {
+            FileName = filename;
+            string ext = Path.GetExtension(filename);
+            DiagramDocument = OpenFile(filename, ext);
+        }
+
+        public PageViewModel(string filename, DiagramDocument diagramDocument)
+        {
+            FileName = filename;
+            DiagramDocument = diagramDocument;
+        }
+
+        DiagramDocument DiagramDocument;
+        public virtual void View_Loaded(object sender, EventArgs e)
+        {
+            //await Task.Run(() => {
+                //Application.Current.Dispatcher.Invoke(() => {
+                    if (string.IsNullOrEmpty(FileName))
+                    {
+                        Init(true);
+                    }
+                    else
+                    {
+                        string ext = Path.GetExtension(FileName);
+                        OpenFile(DiagramDocument, ext);
+                    }
+                //});
+            //});
+
+        }
+
+
+        protected virtual void InitDiagramViewModel()
+        {
+
+        }
+
+        protected virtual void Init(bool initNew)
+        {
+            DiagramViewModels = new ObservableCollection<IDiagramViewModel>()
+            {
+                GetDiagramViewModel("页-1", DiagramType,initNew),
+            };
+            DiagramViewModel = DiagramViewModels.FirstOrDefault();
+
+            InitDiagramViewModel();
+        }
+        #endregion
+
+        #region 属性
+        public string FileName
+        {
+            get; set;
+        }
+
+        private string _title;
+        public string Title
+        {
+            get
+            {
+                return _title;
+            }
+            set
+            {
+                SetProperty(ref _title, value);
+            }
+        }
+
+        private string _status;
+        public string Status
+        {
+            get
+            {
+                return _status;
+            }
+            set
+            {
+                SetProperty(ref _status, value);
+            }
+        }
+
+        //private bool _showGrid;
+        //public bool ShowGrid
+        //{
+        //    get
+        //    {
+        //        return _showGrid;
+        //    }
+        //    set
+        //    {
+        //        if (SetProperty(ref _showGrid, value))
+        //        {
+        //            foreach (var item in DiagramViewModels)
+        //            {
+        //                item.DiagramOption.LayoutOption.ShowGrid = _showGrid;
+        //            }
+        //        }
+        //    }
+        //}
+
+        public DiagramType DiagramType
+        {
+            get; set;
+        }
+
+        public string SubType
+        {
+            get; set;
+        }
+
+        private ObservableCollection<IDiagramViewModel> _diagramViewModels;
+        public ObservableCollection<IDiagramViewModel> DiagramViewModels
+        {
+            get
+            {
+                return _diagramViewModels;
+            }
+            set
+            {
+                SetProperty(ref _diagramViewModels, value);
+            }
+        }
+
+        private IDiagramViewModel _diagramViewModel;
+        public IDiagramViewModel DiagramViewModel
+        {
+            get
+            {
+                return _diagramViewModel;
+            }
+            set
+            {
+                if (_diagramViewModel != value)
+                {
+                    if (_diagramViewModel != null)
+                    {
+                        _diagramViewModel.PropertyChanged -= DiagramViewModel_PropertyChanged;
+                        _diagramViewModel.SaveThumbnail();
+                    }
+                    SetProperty(ref _diagramViewModel, value);
+                    if (_diagramViewModel != null)
+                    {
+                        _diagramViewModel.PropertyChanged += DiagramViewModel_PropertyChanged;
+
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region 命令
+        private ICommand _addPageCommand;
+        public ICommand AddPageCommand
+        {
+            get
+            {
+                return this._addPageCommand ?? (this._addPageCommand = new DelegateCommand<object>(para => this.AddPageExecuted(para)));
+            }
+        }
+
+
+        private ICommand _addCopyPageCommand;
+        public ICommand AddCopyPageCommand
+        {
+            get
+            {
+                return this._addCopyPageCommand ?? (this._addCopyPageCommand = new DelegateCommand<object>(para => this.AddCopyPageExecuted(para)));
+            }
+        }
+
+        private ICommand _renamePageCommand;
+        public ICommand RenamePageCommand
+        {
+            get
+            {
+                return this._renamePageCommand ?? (this._renamePageCommand = new DelegateCommand<object>(para => this.RenamePageExecuted(para)));
+            }
+        }
+
+        private ICommand _endRenamePageCommand;
+        public ICommand EndRenamePageCommand
+        {
+            get
+            {
+                return this._endRenamePageCommand ?? (this._endRenamePageCommand = new DelegateCommand<object>(para => this.EndRenamePageExecuted(para)));
+            }
+        }
+
+        private ICommand _deletePageCommand;
+        public ICommand DeletePageCommand
+        {
+            get
+            {
+                return this._deletePageCommand ?? (this._deletePageCommand = new DelegateCommand<object>(para => this.DeletePageExecuted(para)));
+            }
+        }
+
+        private ICommand _addImageCommand;
+        public ICommand AddImageCommand
+        {
+            get
+            {
+                return this._addImageCommand ?? (this._addImageCommand = new DelegateCommand<object>(para => this.AddImageExecuted(para)));
+            }
+        }
+
+        private ICommand _editImageCommand;
+        public ICommand EditImageCommand
+        {
+            get
+            {
+                return this._editImageCommand ?? (this._editImageCommand = new DelegateCommand<object>(para => this.EditImageExecuted(para)));
+            }
+        }
+
+        private ICommand _resizeImageCommand;
+        public ICommand ResizeImageCommand
+        {
+            get
+            {
+                return this._resizeImageCommand ?? (this._resizeImageCommand = new DelegateCommand<object>(para => this.ResizeImageExecuted(para)));
+            }
+        }
+
+        private ICommand _resetImageCommand;
+        public ICommand ResetImageCommand
+        {
+            get
+            {
+                return this._resetImageCommand ?? (this._resetImageCommand = new DelegateCommand<object>(para => this.ResetImageExecuted(para)));
+            }
+        }
+
+        private ICommand _addVideoCommand;
+        public ICommand AddVideoCommand
+        {
+            get
+            {
+                return this._addVideoCommand ?? (this._addVideoCommand = new DelegateCommand<object>(para => this.AddVideoExectued(para)));
+            }
+        }
+
+
+        private ICommand _addOutLineTextCommand;
+        public ICommand AddOutLineTextCommand
+        {
+            get
+            {
+                return this._addOutLineTextCommand ?? (this._addOutLineTextCommand = new DelegateCommand<object>(para => this.AddOutLineTextExecuted(para)));
+            }
+        }
+
+        private ICommand _addBarcodeCommand;
+        public ICommand AddBarcodeCommand
+        {
+            get
+            {
+                return this._addBarcodeCommand ?? (this._addBarcodeCommand = new DelegateCommand<object>(para => this.AddBarcodeExecuted(para)));
+            }
+        }
+        #endregion
+
+        #region 属性改变
+        private void DiagramViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "IsSelected")
+            {
+                _service.SelectedItemViewModel = CopyHelper.Mapper(DiagramViewModel?.SelectedItem);
+                return;
+            }
+
+            var property = sender.GetType().GetProperty(e.PropertyName);
+            var attr = property.GetCustomAttributes(typeof(BrowsableAttribute), true);
+            if (attr != null && attr.OfType<BrowsableAttribute>().FirstOrDefault()?.Browsable != true)
+            {
+                return;
+            }
+
+            Status = "*";
+        }
+
+        #endregion
+
+        #region 方法
+        protected virtual bool AddVerify(SelectableDesignerItemViewModelBase arg)
+        {
+            return true;
+        }
+
+        public static DiagramDocument OpenFile(string filename, string ext)
+        {
+            try
+            {
+                DiagramDocument diagramDocument = null;
+
+                if (ext == ".xml")
+                {
+                    XmlSerializer serializer = new XmlSerializer(typeof(DiagramDocument));
+                    FileInfo fileInfo = new FileInfo(filename);
+
+                    using (TextReader reader = fileInfo.OpenText())
+                    {
+                        diagramDocument = (DiagramDocument)serializer.Deserialize(reader);
+                    }
+                }
+                else
+                {
+                    diagramDocument = JsonConvert.DeserializeObject<DiagramDocument>(File.ReadAllText(filename));
+                }
+
+                return diagramDocument;
+            }
+            catch (System.IO.FileNotFoundException fnfe)
+            {
+                throw new FileNotFoundException("The system document could not be found ", fnfe);
+            }
+            catch (System.IO.DirectoryNotFoundException dnfe)
+            {
+                throw new DirectoryNotFoundException("A required directory was nt found", dnfe);
+            }
+            catch (System.IO.IOException ioe)
+            {
+                throw new IOException("A file system error occurred", ioe);
+            }
+            catch (System.UnauthorizedAccessException uae)
+            {
+                throw new UnauthorizedAccessException("The requested file system access wasnot granted", uae);
+            }
+            catch (System.Security.SecurityException se)
+            {
+                throw new System.Security.SecurityException("The security policy prevents access to a file system resource", se);
+            }
+            catch (System.Exception e)
+            {
+                throw new System.Exception(
+                    string.Format("The database format vc  invalid \r\n Exception:{0} \r\n InnerException:{1}", e.Message, e.InnerException.Message));
+            }
+        }
+
+        protected virtual void OpenFile(DiagramDocument diagramDocument, string ext)
+        {
+            Title = diagramDocument.Title;
+            DiagramType = diagramDocument.DiagramType;
+
+            List<DiagramViewModel> viewModels = new List<DiagramViewModel>();
+            foreach (var diagramItem in diagramDocument.DiagramItems)
+            {
+                var viewModel = GetDiagramViewModel(diagramItem, ext);
+                viewModels.Add(viewModel);
+            }
+            DiagramViewModels = new ObservableCollection<IDiagramViewModel>(viewModels);
+            foreach (var vm in DiagramViewModels)
+            {
+                vm.Init(false);
+            }
+            DiagramViewModel = DiagramViewModels.FirstOrDefault();
+        }
+
+        public bool SaveFile(bool isSaveAs = false)
+        {
+            string filter = "Files (*.xml)|*.xml|Files (*.json)|*.json|All Files (*.*)|*.*";
+
+            if (string.IsNullOrEmpty(FileName) || isSaveAs == true)
+            {
+                Microsoft.Win32.SaveFileDialog saveFile = new Microsoft.Win32.SaveFileDialog();
+                saveFile.Filter = filter;
+                if (saveFile.ShowDialog() == true)
+                {
+                    FileName = saveFile.FileName;
+                    Title = Path.GetFileNameWithoutExtension(FileName);
+                }
+                else
+                {
+                    return false;
+                }
+            }
+
+            var ext = Path.GetExtension(FileName);
+
+            DiagramDocument diagramDocument = new DiagramDocument();
+            diagramDocument.DiagramItems = new List<DiagramItem>();
+            diagramDocument.Title = Title;
+            diagramDocument.DiagramType = DiagramType;
+
+            foreach (var viewModel in DiagramViewModels)
+            {
+                DiagramItem diagramItem = new DiagramItem(viewModel, ext);        
+                diagramDocument.DiagramItems.Add(diagramItem);
+            }
+
+            if (ext == ".xml")
+            {
+                FileInfo file = new FileInfo(FileName);
+                diagramDocument.Save(file);
+            }
+            else
+            {
+                File.WriteAllText(FileName, JsonConvert.SerializeObject(diagramDocument));
+            }
+            Status = "";
+
+            return true;
+        }
+
+        public virtual void AddPageExecuted(object para)
+        {
+            int index = 0;
+            if (para is DiagramViewModel oldpage)
+            {
+                index = DiagramViewModels.IndexOf(oldpage) + 1;
+            }
+            else
+            {
+                index = DiagramViewModels.Count;
+            }
+            var page = GetDiagramViewModel(null, DiagramType, true);
+            DiagramViewModels.Insert(index, page);
+            DiagramViewModel = page;
+            InitDiagramViewModel();
+        }
+
+        protected virtual DiagramViewModel GetDiagramViewModel(DiagramItem diagramItem, string ext)
+        {
+            return new BlockDiagramViewModel(diagramItem, ext) { GenerateThumbnail  = true};
+        }
+
+        protected virtual DiagramViewModel GetDiagramViewModel(string name, DiagramType diagramType, bool initNew)
+        {
+            return new BlockDiagramViewModel() { Name = name ?? NewNameHelper.GetNewName(DiagramViewModels.Select(p => p.Name), "页-"), DiagramType = diagramType,GenerateThumbnail = true };
+        }
+
+        public void AddCopyPageExecuted(object para)
+        {
+            if (DiagramViewModel != null)
+            {
+                var viewModel = DiagramViewModel;
+                DiagramItem diagramItem = new DiagramItem(viewModel);
+                diagramItem.Name = NewNameHelper.GetNewName(DiagramViewModels.Select(p => p.Name), "页-");
+
+                viewModel = GetDiagramViewModel(diagramItem, ".json");  
+
+                DiagramViewModels.Add(viewModel);
+                DiagramViewModel = viewModel;
+                InitDiagramViewModel();
+            }
+        }
+
+        public void DeletePageExecuted(object para)
+        {
+            if (para is DiagramViewModel oldpage)
+            {
+                int index = DiagramViewModels.IndexOf(oldpage) - 1;
+                DiagramViewModels.Remove(oldpage);
+                if (index > 0)
+                {
+                    DiagramViewModel = DiagramViewModels[index];
+                }
+                else
+                {
+                    DiagramViewModel = DiagramViewModels.FirstOrDefault();
+                }
+            }
+
+        }
+
+        public void RenamePageExecuted(object para)
+        {
+            if (para is DiagramViewModel oldpage)
+            {
+                oldpage.IsEditName = true;
+            }
+        }
+
+        public void EndRenamePageExecuted(object para)
+        {
+            if (para is DiagramViewModel oldpage)
+            {
+                oldpage.IsEditName = false;
+            }
+        }
+
+        public void AddImageExecuted(object para)
+        {
+            ImageItemViewModel itemBase = new ImageItemViewModel();
+            DiagramViewModel?.AddCommand.Execute(itemBase);
+            if (itemBase.Root != null)
+            {
+                _service.DrawModeViewModel.CursorMode = CursorMode.Move;
+            }
+        }
+
+        public void EditImageExecuted(object para)
+        {
+            if (para == null)
+            {
+                para = DiagramViewModel.SelectedItem;
+            }
+
+            ImageItemViewModel itemBase = para as ImageItemViewModel;
+            if (itemBase != null)
+            {
+                itemBase.EditData();
+            }
+        }
+
+        public void ResizeImageExecuted(object para)
+        {
+            if (para == null)
+            {
+                para = DiagramViewModel.SelectedItem;
+            }
+
+            ImageItemViewModel itemBase = para as ImageItemViewModel;
+            if (itemBase != null)
+            {
+                itemBase.StartResize();
+            }
+        }
+
+        public void ResetImageExecuted(object para)
+        {
+            if (para == null)
+            {
+                para = DiagramViewModel.SelectedItem;
+            }
+            ImageItemViewModel itemBase = para as ImageItemViewModel;
+            if (itemBase != null)
+            {
+                itemBase.Reset();
+            }
+        }
+
+        public void AddVideoExectued(object para)
+        {
+            VideoItemViewModel itemBase = new VideoItemViewModel();
+            DiagramViewModel?.AddCommand.Execute(itemBase);
+            if (itemBase.Root != null)
+            {
+                _service.DrawModeViewModel.CursorMode = CursorMode.Move;
+            }
+        }
+
+        public void AddOutLineTextExecuted(object para)
+        {
+            OutLineTextDesignerItemViewModel itemBase = new OutLineTextDesignerItemViewModel();
+            DiagramViewModel?.AddCommand.Execute(itemBase);
+            if (itemBase.Root != null)
+            {
+                _service.DrawModeViewModel.CursorMode = CursorMode.Move;
+            }
+        }
+
+        public void AddBarcodeExecuted(object para)
+        {
+            BarcodeDesignerItemViewModel itemBase = new BarcodeDesignerItemViewModel() { Format = (BarcodeFormat)Enum.Parse(typeof(BarcodeFormat), para.ToString()), Text = "AIStudio.Wpf.DiagramApp" };
+            DiagramViewModel?.AddCommand.Execute(itemBase);
+            if (itemBase.Root != null)
+            {
+                _service.DrawModeViewModel.CursorMode = CursorMode.Move;
+            }
+        }
+        #endregion       
+
+        public virtual void Dispose()
+        {
+        }
+    }
+}

AIStudio.Wpf.DiagramApp/ViewModels/SFCViewModel.cs

@@ -1,203 +1,198 @@
-using AIStudio.Wpf.DiagramApp.Models;
-using AIStudio.Wpf.DiagramApp.ViewModels;
-using AIStudio.Wpf.Flowchart.ViewModels;
-using AIStudio.Wpf.SFC;
-using AIStudio.Wpf.SFC.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Timers;
 using System.Windows;
-using System.Windows.Media;
+using AIStudio.Wpf.DiagramApp.Models;
 using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.SFC;
+using AIStudio.Wpf.SFC.ViewModels;
 
-namespace AIStudio.Wpf.Flowchart
+namespace AIStudio.Wpf.DiagramApp.ViewModels
 {
-    public class SFCViewModel : DiagramsViewModel
+    public class SFCViewModel : PageViewModel
     {
         public SFCViewModel(string title, string status, DiagramType diagramType) : base(title, status, diagramType)
         {
-           
+            
         }
+
         public SFCViewModel(string filename, DiagramDocument diagramDocument) : base(filename, diagramDocument)
         {
             if (DiagramViewModel != null)
             {
-                SFCService.InitData(DiagramViewModel.Items.OfType<SFCNode>().ToList(), DiagramViewModel.Items.OfType<ConnectorViewModel>().ToList(), DiagramViewModel);
+                SFCService.InitData(DiagramViewModel.Items.OfType<SFCNode>().ToList(), DiagramViewModel.Items.OfType<ConnectionViewModel>().ToList(), DiagramViewModel);
             }
             readDataTimer.Elapsed += timeCycle;
             readDataTimer.Interval = 1000;
             readDataTimer.AutoReset = false;
             readDataTimer.Start();
-            _service.DrawModeViewModel.VectorLineDrawMode = DrawMode.BoundaryConnectingLine;
+            _service.DrawModeViewModel.LineDrawMode = DrawMode.ConnectingLineBoundary;
         }
 
         protected override void InitDiagramViewModel()
         {
             base.InitDiagramViewModel();
 
-            DiagramViewModel.ShowGrid = true;
-            DiagramViewModel.GridCellSize = new Size(100, 60);
-            DiagramViewModel.CellHorizontalAlignment = CellHorizontalAlignment.Center;
-            DiagramViewModel.CellVerticalAlignment = CellVerticalAlignment.Center;
-            _service.DrawModeViewModel.VectorLineDrawMode = DrawMode.BoundaryConnectingLine;
+            DiagramViewModel.DiagramOption.LayoutOption.ShowGrid = true;
+            DiagramViewModel.DiagramOption.LayoutOption.GridCellSize = new Size(100, 60);
+            DiagramViewModel.DiagramOption.LayoutOption.CellHorizontalAlignment = CellHorizontalAlignment.Center;
+            DiagramViewModel.DiagramOption.LayoutOption.CellVerticalAlignment = CellVerticalAlignment.Center;
+            _service.DrawModeViewModel.LineDrawMode = DrawMode.ConnectingLineBoundary;
         }
 
         private System.Timers.Timer readDataTimer = new System.Timers.Timer();
-        protected override void Init()
+        protected override void Init(bool initNew)
         {
-            base.Init();
+            base.Init(initNew);
 
-            SFCStartNode start = new SFCStartNode() { Left = 0, Top = 60, Text = "S0" };
-            DiagramViewModel.DirectAddItemCommand.Execute(start);
+            SFCStartNode start = new SFCStartNode() { Name = nameof(start), Left = 0, Top = 60, Text = "S0" };
+            DiagramViewModel.Add(start);
 
-            SFCConditionNode condition1_1 = new SFCConditionNode() { Left = 0, Top = 120, Text = "X01", Expression = "p0==1&p1<20", LinkPoint = new ObservableCollection<LinkPoint> { SFCService.LinkPoint.FirstOrDefault(p => p.Name == "S0"), SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T2") } };
-            DiagramViewModel.DirectAddItemCommand.Execute(condition1_1);
+            SFCConditionNode condition1_1 = new SFCConditionNode() { Name = nameof(condition1_1), Left = 0, Top = 120, Text = "X01", Expression = "p0==1&p1<20", LinkPoint = new ObservableCollection<LinkPoint> { SFCService.LinkPoint.FirstOrDefault(p => p.Name == "S0"), SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T2") } };
+            DiagramViewModel.Add(condition1_1);
 
-            SFCConditionNode condition1_2 = new SFCConditionNode() { Left = 100, Top = 120, Text = "X02", Expression = "p0==1&p1<30", LinkPoint = new ObservableCollection<LinkPoint> { SFCService.LinkPoint.FirstOrDefault(p => p.Name == "S0"), SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T2") } };
-            DiagramViewModel.DirectAddItemCommand.Execute(condition1_2);
+            SFCConditionNode condition1_2 = new SFCConditionNode() { Name = nameof(condition1_2), Left = 100, Top = 120, Text = "X02", Expression = "p0==1&p1<30", LinkPoint = new ObservableCollection<LinkPoint> { SFCService.LinkPoint.FirstOrDefault(p => p.Name == "S0"), SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T2") } };
+            DiagramViewModel.Add(condition1_2);
 
-            SFCNodeNode step1 = new SFCNodeNode() { Left = 0, Top = 180, Text = "S1" };
-            DiagramViewModel.DirectAddItemCommand.Execute(step1);
+            SFCNodeNode step1 = new SFCNodeNode() { Name = nameof(step1), Left = 0, Top = 180, Text = "S1" };
+            DiagramViewModel.Add(step1);
 
-            SFCActionNode action11 = new SFCActionNode() { Left = 100, Top = 180, Text = "SET_V1", Expression = "1", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K1_DI") };
-            DiagramViewModel.DirectAddItemCommand.Execute(action11);
+            SFCActionNode action11 = new SFCActionNode() { Name = nameof(action11), Left = 100, Top = 180, Text = "SET_V1", Expression = "1", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K1_DI") };
+            DiagramViewModel.Add(action11);
 
-            SFCActionNode action12 = new SFCActionNode() { Left = 200, Top = 180, Text = "SET_V2", Expression = "1", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K2_DI") };
-            DiagramViewModel.DirectAddItemCommand.Execute(action12);
+            SFCActionNode action12 = new SFCActionNode() {Name = nameof(action12), Left = 200, Top = 180, Text = "SET_V2", Expression = "1", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K2_DI") };
+            DiagramViewModel.Add(action12);
 
-            SFCActionNode action13 = new SFCActionNode() { Left = 300, Top = 180, Text = "SET_V3", Expression = "1", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K3_DI") };
-            DiagramViewModel.DirectAddItemCommand.Execute(action13);
+            SFCActionNode action13 = new SFCActionNode() {Name = nameof(action13), Left = 300, Top = 180, Text = "SET_V3", Expression = "1", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K3_DI") };
+            DiagramViewModel.Add(action13);
 
-            SFCActionNode action14 = new SFCActionNode() { Left = 400, Top = 180, Text = "RES_V4", Expression = "0", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K4_DI") };
-            DiagramViewModel.DirectAddItemCommand.Execute(action14);
+            SFCActionNode action14 = new SFCActionNode() {Name = nameof(action14), Left = 400, Top = 180, Text = "RES_V4", Expression = "0", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K4_DI") };
+            DiagramViewModel.Add(action14);
 
-            SFCConditionNode condition2 = new SFCConditionNode() { Left = 0, Top = 240, Text = "X1", Expression = "p0>50", LinkPoint = new ObservableCollection<LinkPoint> { SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T2") } };
-            DiagramViewModel.DirectAddItemCommand.Execute(condition2);
+            SFCConditionNode condition2 = new SFCConditionNode() {Name = nameof(condition2), Left = 0, Top = 240, Text = "X1", Expression = "p0>50", LinkPoint = new ObservableCollection<LinkPoint> { SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T2") } };
+            DiagramViewModel.Add(condition2);
 
-            SFCNodeNode step2 = new SFCNodeNode() { Left = 0, Top = 300, Text = "S2" };
-            DiagramViewModel.DirectAddItemCommand.Execute(step2);
+            SFCNodeNode step2 = new SFCNodeNode() {Name = nameof(step2), Left = 0, Top = 300, Text = "S2" };
+            DiagramViewModel.Add(step2);
 
-            SFCActionNode action2 = new SFCActionNode() { Left = 100, Top = 300, Text = "SET_V4", Expression = "1", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K4_DI") };
-            DiagramViewModel.DirectAddItemCommand.Execute(action2);
+            SFCActionNode action2 = new SFCActionNode() {Name = nameof(action2), Left = 100, Top = 300, Text = "SET_V4", Expression = "1", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K4_DI") };
+            DiagramViewModel.Add(action2);
 
-            SFCConditionNode condition3 = new SFCConditionNode() { Left = 0, Top = 360, Text = "X2", Expression = "p0>70", LinkPoint = new ObservableCollection<LinkPoint> { SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T2") } };
-            DiagramViewModel.DirectAddItemCommand.Execute(condition3);
+            SFCConditionNode condition3 = new SFCConditionNode() {Name = nameof(condition3), Left = 0, Top = 360, Text = "X2", Expression = "p0>70", LinkPoint = new ObservableCollection<LinkPoint> { SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T2") } };
+            DiagramViewModel.Add(condition3);
 
-            SFCNodeNode step3 = new SFCNodeNode() { Left = 0, Top = 420, Text = "S3" };
-            DiagramViewModel.DirectAddItemCommand.Execute(step3);
+            SFCNodeNode step3 = new SFCNodeNode() { Name = nameof(step3), Left = 0, Top = 420, Text = "S3" };
+            DiagramViewModel.Add(step3);
 
-            SFCActionNode action3 = new SFCActionNode() { Left = 100, Top = 420, Text = "RES_V1", Expression = "0", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K1_DI") };
-            DiagramViewModel.DirectAddItemCommand.Execute(action3);
+            SFCActionNode action3 = new SFCActionNode() {Name = nameof(action3), Left = 100, Top = 420, Text = "RES_V1", Expression = "0", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K1_DI") };
+            DiagramViewModel.Add(action3);
 
-            SFCConditionNode condition4 = new SFCConditionNode() { Left = 0, Top = 480, Text = "X3", Expression = "p0>80", LinkPoint = new ObservableCollection<LinkPoint> { SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T2") } };
-            DiagramViewModel.DirectAddItemCommand.Execute(condition4);
+            SFCConditionNode condition4 = new SFCConditionNode() {Name = nameof(condition4), Left = 0, Top = 480, Text = "X3", Expression = "p0>80", LinkPoint = new ObservableCollection<LinkPoint> { SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T2") } };
+            DiagramViewModel.Add(condition4);
 
-            SFCCOBeginNode cobegin = new SFCCOBeginNode() { Left = 38, Top = 540, Text = "" };
-            DiagramViewModel.DirectAddItemCommand.Execute(cobegin);
+            SFCCOBeginNode cobegin = new SFCCOBeginNode() {Name = nameof(cobegin), Left = 38, Top = 540, Text = "" };
+            DiagramViewModel.Add(cobegin);
 
-            SFCNodeNode step4 = new SFCNodeNode() { Left = 0, Top = 600, Text = "S4" };
-            DiagramViewModel.DirectAddItemCommand.Execute(step4);
+            SFCNodeNode step4 = new SFCNodeNode() {Name = nameof(step4), Left = 0, Top = 600, Text = "S4" };
+            DiagramViewModel.Add(step4);
 
-            SFCActionNode action4 = new SFCActionNode() { Left = 100, Top = 600, Text = "RES_V2", Expression = "0", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K2_DI") };
-            DiagramViewModel.DirectAddItemCommand.Execute(action4);
+            SFCActionNode action4 = new SFCActionNode() {Name = nameof(action4), Left = 100, Top = 600, Text = "RES_V2", Expression = "0", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K2_DI") };
+            DiagramViewModel.Add(action4);
 
-            SFCConditionNode condition5 = new SFCConditionNode() { Left = 0, Top = 660, Text = "X4", Expression = "p0==0", LinkPoint = new ObservableCollection<LinkPoint> { SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K2_DO") } };
-            DiagramViewModel.DirectAddItemCommand.Execute(condition5);
+            SFCConditionNode condition5 = new SFCConditionNode() {Name = nameof(condition5), Left = 0, Top = 660, Text = "X4", Expression = "p0==0", LinkPoint = new ObservableCollection<LinkPoint> { SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K2_DO") } };
+            DiagramViewModel.Add(condition5);
 
-            SFCNodeNode step5 = new SFCNodeNode() { Left = 200, Top = 600, Text = "S5" };
-            DiagramViewModel.DirectAddItemCommand.Execute(step5);
+            SFCNodeNode step5 = new SFCNodeNode() {Name = nameof(step5), Left = 200, Top = 600, Text = "S5" };
+            DiagramViewModel.Add(step5);
 
-            SFCActionNode action5 = new SFCActionNode() { Left = 300, Top = 600, Text = "RES_V3", Expression = "0", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K3_DI") };
-            DiagramViewModel.DirectAddItemCommand.Execute(action5);
+            SFCActionNode action5 = new SFCActionNode() {Name = nameof(action5), Left = 300, Top = 600, Text = "RES_V3", Expression = "0", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K3_DI") };
+            DiagramViewModel.Add(action5);
 
-            SFCConditionNode condition6 = new SFCConditionNode() { Left = 200, Top = 660, Text = "X5", Expression = "p0==0", LinkPoint = new ObservableCollection<LinkPoint> { SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K3_DO") } };
-            DiagramViewModel.DirectAddItemCommand.Execute(condition6);
+            SFCConditionNode condition6 = new SFCConditionNode() {Name = nameof(condition6), Left = 200, Top = 660, Text = "X5", Expression = "p0==0", LinkPoint = new ObservableCollection<LinkPoint> { SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K3_DO") } };
+            DiagramViewModel.Add(condition6);
 
-            SFCCOEndNode coend = new SFCCOEndNode() { Left = 38, Top = 720, Text = "" };
-            DiagramViewModel.DirectAddItemCommand.Execute(coend);
+            SFCCOEndNode coend = new SFCCOEndNode() {Name = nameof(coend), Left = 38, Top = 720, Text = "" };
+            DiagramViewModel.Add(coend);
 
-            ConnectorViewModel connector1_1 = new ConnectorViewModel(start.Output[0], condition1_1.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector1_1);
+            ConnectionViewModel connector1_1 = new ConnectionViewModel(DiagramViewModel, start.Output[0], condition1_1.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector1_1), };
+            DiagramViewModel.Add(connector1_1);
 
-            ConnectorViewModel connector2_1 = new ConnectorViewModel(condition1_1.Output[0], step1.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector2_1);
+            ConnectionViewModel connector2_1 = new ConnectionViewModel(DiagramViewModel, condition1_1.Output[0], step1.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector2_1), };
+            DiagramViewModel.Add(connector2_1);
 
-            ConnectorViewModel connector1_2 = new ConnectorViewModel(start.Output[0], condition1_2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector1_2);
+            ConnectionViewModel connector1_2 = new ConnectionViewModel(DiagramViewModel, start.Output[0], condition1_2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector1_2) };
+            DiagramViewModel.Add(connector1_2);
 
-            ConnectorViewModel connector2_2 = new ConnectorViewModel(condition1_2.Output[0], step1.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector2_2);
+            ConnectionViewModel connector2_2 = new ConnectionViewModel(DiagramViewModel, condition1_2.Output[0], step1.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector2_2) };
+            DiagramViewModel.Add(connector2_2);
 
-            ConnectorViewModel connector31 = new ConnectorViewModel(step1.Action[0], action11.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector31);
+            ConnectionViewModel connector31 = new ConnectionViewModel(DiagramViewModel, step1.Action[0], action11.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector31), };
+            DiagramViewModel.Add(connector31);
 
-            ConnectorViewModel connector32 = new ConnectorViewModel(step1.Action[0], action12.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector32);
+            ConnectionViewModel connector32 = new ConnectionViewModel(DiagramViewModel, step1.Action[0], action12.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector32) };
+            DiagramViewModel.Add(connector32);
 
-            ConnectorViewModel connector33 = new ConnectorViewModel(step1.Action[0], action13.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector33);
+            ConnectionViewModel connector33 = new ConnectionViewModel(DiagramViewModel, step1.Action[0], action13.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector33) };
+            DiagramViewModel.Add(connector33);
 
-            ConnectorViewModel connector34 = new ConnectorViewModel(step1.Action[0], action14.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector34);
+            ConnectionViewModel connector34 = new ConnectionViewModel(DiagramViewModel, step1.Action[0], action14.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector34) };
+            DiagramViewModel.Add(connector34);
 
-            ConnectorViewModel connector4 = new ConnectorViewModel(step1.Output[0], condition2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector4);
+            ConnectionViewModel connector4 = new ConnectionViewModel(DiagramViewModel, step1.Output[0], condition2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector4) };
+            DiagramViewModel.Add(connector4);
 
-            ConnectorViewModel connector5 = new ConnectorViewModel(condition2.Output[0], step2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector5);
+            ConnectionViewModel connector5 = new ConnectionViewModel(DiagramViewModel, condition2.Output[0], step2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector5) };
+            DiagramViewModel.Add(connector5);
 
-            ConnectorViewModel connector6 = new ConnectorViewModel(step2.Action[0], action2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector6);
+            ConnectionViewModel connector6 = new ConnectionViewModel(DiagramViewModel, step2.Action[0], action2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector6) };
+            DiagramViewModel.Add(connector6);
 
-            ConnectorViewModel connector7 = new ConnectorViewModel(step2.Output[0], condition3.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector7);
+            ConnectionViewModel connector7 = new ConnectionViewModel(DiagramViewModel, step2.Output[0], condition3.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector7) };
+            DiagramViewModel.Add(connector7);
 
-            ConnectorViewModel connector8 = new ConnectorViewModel(condition3.Output[0], step3.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector8);
+            ConnectionViewModel connector8 = new ConnectionViewModel(DiagramViewModel, condition3.Output[0], step3.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector8) };
+            DiagramViewModel.Add(connector8);
 
-            ConnectorViewModel connector9 = new ConnectorViewModel(step3.Action[0], action3.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector9);
+            ConnectionViewModel connector9 = new ConnectionViewModel(DiagramViewModel, step3.Action[0], action3.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector9) };
+            DiagramViewModel.Add(connector9);
 
-            ConnectorViewModel connector10 = new ConnectorViewModel(step3.Output[0], condition4.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector10);
+            ConnectionViewModel connector10 = new ConnectionViewModel(DiagramViewModel, step3.Output[0], condition4.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector10) };
+            DiagramViewModel.Add(connector10);
 
-            ConnectorViewModel connector11 = new ConnectorViewModel(condition4.Output[0], cobegin.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector11);
+            ConnectionViewModel connector11 = new ConnectionViewModel(DiagramViewModel, condition4.Output[0], cobegin.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector11) };
+            DiagramViewModel.Add(connector11);
 
-            ConnectorViewModel connector12 = new ConnectorViewModel(cobegin.Output[0], step4.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector12);
+            ConnectionViewModel connector12 = new ConnectionViewModel(DiagramViewModel, cobegin.Output[0], step4.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector12) };
+            DiagramViewModel.Add(connector12);
 
-            ConnectorViewModel connector13 = new ConnectorViewModel(step4.Action[0], action4.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector13);
+            ConnectionViewModel connector13 = new ConnectionViewModel(DiagramViewModel, step4.Action[0], action4.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector13) };
+            DiagramViewModel.Add(connector13);
 
-            ConnectorViewModel connector14 = new ConnectorViewModel(step4.Output[0], condition5.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector14);
+            ConnectionViewModel connector14 = new ConnectionViewModel(DiagramViewModel, step4.Output[0], condition5.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector14) };
+            DiagramViewModel.Add(connector14);
 
-            ConnectorViewModel connector15 = new ConnectorViewModel(cobegin.Output[1], step5.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector15);
+            ConnectionViewModel connector15 = new ConnectionViewModel(DiagramViewModel, cobegin.Output[1], step5.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector15), };
+            DiagramViewModel.Add(connector15);
 
-            ConnectorViewModel connector16 = new ConnectorViewModel(step5.Action[0], action5.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector16);
+            ConnectionViewModel connector16 = new ConnectionViewModel(DiagramViewModel, step5.Action[0], action5.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector16), };
+            DiagramViewModel.Add(connector16);
 
-            ConnectorViewModel connector17 = new ConnectorViewModel(step5.Output[0], condition6.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector17);
+            ConnectionViewModel connector17 = new ConnectionViewModel(DiagramViewModel, step5.Output[0], condition6.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector17), };
+            DiagramViewModel.Add(connector17);
 
-            ConnectorViewModel connector18 = new ConnectorViewModel(condition5.Output[0], coend.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector18);
+            ConnectionViewModel connector18 = new ConnectionViewModel(DiagramViewModel, condition5.Output[0], coend.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector18), };
+            DiagramViewModel.Add(connector18);
 
-            ConnectorViewModel connector19 = new ConnectorViewModel(condition6.Output[0], coend.Input[1], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector19);
+            ConnectionViewModel connector19 = new ConnectionViewModel(DiagramViewModel, condition6.Output[0], coend.Input[1], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector19), };
+            DiagramViewModel.Add(connector19);
 
-            ConnectorViewModel connector20 = new ConnectorViewModel(coend.Output[0], start.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(connector20);
+            ConnectionViewModel connector20 = new ConnectionViewModel(DiagramViewModel, coend.Output[0], start.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(connector20), };
+            DiagramViewModel.Add(connector20);
 
             #region 模拟部分
             TextDesignerItemViewModel despcription = new TextDesignerItemViewModel()
             {
+                Name = nameof(despcription),
                 Left = 230,
                 Top = 270,
                 ItemWidth = 300,
@@ -211,68 +206,67 @@ namespace AIStudio.Wpf.Flowchart
             };
             despcription.FontViewModel.HorizontalAlignment = HorizontalAlignment.Left;
             despcription.FontViewModel.VerticalAlignment = VerticalAlignment.Top;
-            DiagramViewModel.DirectAddItemCommand.Execute(despcription);
+            DiagramViewModel.Add(despcription);
 
             Simulate_ListViewModel list = new Simulate_ListViewModel()
             {
+                Name = nameof(list),
                 Left = 410,
                 Top = 390,
             };
-            DiagramViewModel.DirectAddItemCommand.Execute(list);
+            DiagramViewModel.Add(list);
 
-            Simulate_StartViewModel btnstart = new Simulate_StartViewModel() { Left = 0, Top = 0, LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "S0"), };
-            DiagramViewModel.DirectAddItemCommand.Execute(btnstart);
+            Simulate_StartViewModel btnstart = new Simulate_StartViewModel() { Name = nameof(btnstart), Left = 0, Top = 0, LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "S0"), };
+            DiagramViewModel.Add(btnstart);
 
-            Simulate_TankViewModel tank1 = new Simulate_TankViewModel() { Left = 100, Top = 43, ItemWidth = 48, ItemHeight = 60, Text = "T1", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T1") };
-            DiagramViewModel.DirectAddItemCommand.Execute(tank1);
+            Simulate_TankViewModel tank1 = new Simulate_TankViewModel() {Name = nameof(tank1), Left = 100, Top = 43, ItemWidth = 48, ItemHeight = 60, Text = "T1", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T1") };
+            DiagramViewModel.Add(tank1);
 
-            Simulate_SolenoidViewModel k1 = new Simulate_SolenoidViewModel() { Left = 200, Top = 0, Text = "K1", DILinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K1_DI"), DOLinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K1_DO") };
-            DiagramViewModel.DirectAddItemCommand.Execute(k1);
+            Simulate_SolenoidViewModel k1 = new Simulate_SolenoidViewModel() {Name = nameof(k1),  Left = 200, Top = 0, Text = "K1", DILinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K1_DI"), DOLinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K1_DO") };
+            DiagramViewModel.Add(k1);
 
-            Simulate_SolenoidViewModel k2 = new Simulate_SolenoidViewModel() { Left = 200, Top = 60, Text = "K2", DILinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K2_DI"), DOLinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K2_DO") };
-            DiagramViewModel.DirectAddItemCommand.Execute(k2);
+            Simulate_SolenoidViewModel k2 = new Simulate_SolenoidViewModel() {Name = nameof(k2), Left = 200, Top = 60, Text = "K2", DILinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K2_DI"), DOLinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K2_DO") };
+            DiagramViewModel.Add(k2);
 
-            Simulate_SolenoidViewModel k3 = new Simulate_SolenoidViewModel() { Left = 200, Top = 120, Text = "K3", DILinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K3_DI"), DOLinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K3_DO") };
-            DiagramViewModel.DirectAddItemCommand.Execute(k3);
+            Simulate_SolenoidViewModel k3 = new Simulate_SolenoidViewModel() {Name = nameof(k3), Left = 200, Top = 120, Text = "K3", DILinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K3_DI"), DOLinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K3_DO") };
+            DiagramViewModel.Add(k3);
 
-            Simulate_TankViewModel tank2 = new Simulate_TankViewModel() { Left = 300, Top = 28, Text = "T2", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T2") };
+            Simulate_TankViewModel tank2 = new Simulate_TankViewModel() {Name = nameof(tank2), Left = 300, Top = 28, Text = "T2", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T2") };
 
-            DiagramViewModel.DirectAddItemCommand.Execute(tank2);
+            DiagramViewModel.Add(tank2);
 
-            Simulate_SolenoidViewModel k4 = new Simulate_SolenoidViewModel() { Left = 400, Top = 60, Text = "K4", DILinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K4_DI"), DOLinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K4_DO") };
-            DiagramViewModel.DirectAddItemCommand.Execute(k4);
+            Simulate_SolenoidViewModel k4 = new Simulate_SolenoidViewModel() {Name = nameof(k4), Left = 400, Top = 60, Text = "K4", DILinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K4_DI"), DOLinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "K4_DO") };
+            DiagramViewModel.Add(k4);
 
-            Simulate_TankViewModel tank3 = new Simulate_TankViewModel() { Left = 500, Top = 103, ItemWidth = 48, ItemHeight = 60, Text = "T3", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T3") };
-            DiagramViewModel.DirectAddItemCommand.Execute(tank3);
+            Simulate_TankViewModel tank3 = new Simulate_TankViewModel() {Name = nameof(tank3), Left = 500, Top = 103, ItemWidth = 48, ItemHeight = 60, Text = "T3", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T3") };
+            DiagramViewModel.Add(tank3);
 
-            ConnectorViewModel conn1 = new ConnectorViewModel(tank1.Output[0], k1.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(conn1);
+            ConnectionViewModel conn1 = new ConnectionViewModel(DiagramViewModel, tank1.Output[0], k1.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(conn1), };
+            DiagramViewModel.Add(conn1);
 
-            ConnectorViewModel conn2 = new ConnectorViewModel(tank1.Output[0], k2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(conn2);
+            ConnectionViewModel conn2 = new ConnectionViewModel(DiagramViewModel, tank1.Output[0], k2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(conn2) };
+            DiagramViewModel.Add(conn2);
 
-            ConnectorViewModel conn3 = new ConnectorViewModel(tank1.Output[0], k3.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(conn3);
+            ConnectionViewModel conn3 = new ConnectionViewModel(DiagramViewModel, tank1.Output[0], k3.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(conn3) };
+            DiagramViewModel.Add(conn3);
 
-            ConnectorViewModel conn4 = new ConnectorViewModel(k1.Output[0], tank2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(conn4);
+            ConnectionViewModel conn4 = new ConnectionViewModel(DiagramViewModel, k1.Output[0], tank2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(conn4) };
+            DiagramViewModel.Add(conn4);
 
-            ConnectorViewModel conn5 = new ConnectorViewModel(k2.Output[0], tank2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(conn5);
+            ConnectionViewModel conn5 = new ConnectionViewModel(DiagramViewModel, k2.Output[0], tank2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(conn5) };
+            DiagramViewModel.Add(conn5);
 
-            ConnectorViewModel conn6 = new ConnectorViewModel(k3.Output[0], tank2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(conn6);
+            ConnectionViewModel conn6 = new ConnectionViewModel(DiagramViewModel, k3.Output[0], tank2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(conn6) };
+            DiagramViewModel.Add(conn6);
 
-            ConnectorViewModel conn7 = new ConnectorViewModel(tank2.Output[1], k4.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(conn7);
+            ConnectionViewModel conn7 = new ConnectionViewModel(DiagramViewModel, tank2.Output[1], k4.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(conn7), };
+            DiagramViewModel.Add(conn7);
 
-            ConnectorViewModel conn8 = new ConnectorViewModel(k4.Output[0], tank3.Input[0], _service.DrawModeViewModel.VectorLineDrawMode);
-            DiagramViewModel.DirectAddItemCommand.Execute(conn8);
+            ConnectionViewModel conn8 = new ConnectionViewModel(DiagramViewModel, k4.Output[0], tank3.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode) { Name = nameof(conn8) };
+            DiagramViewModel.Add(conn8);
             #endregion
 
-            DiagramViewModel.ClearSelectedItems();
-
-            SFCService.InitData(DiagramViewModel.Items.OfType<SFCNode>().ToList(), DiagramViewModel.Items.OfType<ConnectorViewModel>().ToList(), DiagramViewModel);
+            SFCService.InitData(DiagramViewModel.Items.OfType<SFCNode>().ToList(), DiagramViewModel.Items.OfType<ConnectionViewModel>().ToList(), DiagramViewModel);
 
             readDataTimer.Elapsed += timeCycle;
             readDataTimer.Interval = 1000;
@@ -298,7 +292,7 @@ namespace AIStudio.Wpf.Flowchart
 
             foreach (var viewModel in DiagramViewModels)
             {
-                SFCService.DisposeData(viewModel);
+                SFCService.Dispose(viewModel);
             }
         }
     }

AIStudio.Wpf.DiagramApp/ViewModels/ToolBoxViewModel.cs

@@ -1,6 +1,6 @@
-using AIStudio.Wpf.DiagramHelper.Commands;
-using AIStudio.Wpf.DiagramHelper.Extensions.ViewModels;
-using AIStudio.Wpf.DiagramHelper.Helpers;
+using AIStudio.Wpf.DiagramDesigner.Additionals.Commands;
+using AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels;
+using AIStudio.Wpf.DiagramDesigner.Additionals;
 using AIStudio.Wpf.DiagramApp.Models;
 using AIStudio.Wpf.Flowchart;
 using AIStudio.Wpf.Flowchart.ViewModels;
@@ -18,14 +18,21 @@ using AIStudio.Wpf.SFC.ViewModels;
 using System.Windows.Media;
 using AIStudio.Wpf.Flowchart.Models;
 using AIStudio.Wpf.SFC.Models;
+using System.Windows;
+using System;
+using AIStudio.Wpf.DiagramDesigner.Models;
+using AIStudio.Wpf.DiagramDesigner.ViewModels;
+using AIStudio.Wpf.DiagramDesigner.ViewModels.BaseViewModel;
 
 namespace AIStudio.Wpf.DiagramApp.ViewModels
 {
     public class ToolBoxViewModel : BindableBase
     {
-        private IDiagramServiceProvider _service { get { return DiagramServicesProvider.Instance.Provider; } }
-        public ToolBoxViewModel()
+        private MainWindowViewModel _mainWindowViewModel;
+
+        public ToolBoxViewModel(MainWindowViewModel mainWindowViewModel)
         {
+            _mainWindowViewModel = mainWindowViewModel;
             Init();
         }
 
@@ -42,11 +49,21 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             }
         }
 
-        public ObservableCollection<ToolBoxCategory> TotalToolBoxCategory { get; set; }
+        public ToolBoxCategory MyToolBoxCategory
+        {
+            get
+            {
+                return ToolBoxCategory?.FirstOrDefault();
+            }
+        }
 
-        public ToolBoxCategory MyToolBoxCategory { get { return ToolBoxCategory[0]; } }
-
-        public ToolBoxCategory SvgToolBoxCategory { get { return ToolBoxCategory[2]; } }
+        public ToolBoxCategory SvgToolBoxCategory
+        {
+            get
+            {
+                return ToolBoxCategory?.FirstOrDefault(p => p.Header == "Svg");
+            }
+        }
 
         private ICommand _deleteCommand;
         public ICommand DeleteCommand
@@ -58,7 +75,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
         }
 
         private ICommand _addItemCommand;
-        public ICommand AddItemCommand
+        public ICommand AddCommand
         {
             get
             {
@@ -89,11 +106,26 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             ToolBoxCategory.Add(new MineToolBoxCategory() { Header = "我的形状", ToolBoxItems = new ObservableCollection<ToolBoxData>(), IsExpanded = true });
 
             List<ToolBoxData> toolBoxItems = new List<ToolBoxData>();
-            toolBoxItems.Add(new ImageToolBoxData("../Images/Setting.png", typeof(SettingsDesignerItemViewModel)));
-            toolBoxItems.Add(new ImageToolBoxData("../Images/Persist.png", typeof(PersistDesignerItemViewModel)));
+            toolBoxItems.Add(new ImageToolBoxData("../Images/Setting.png", typeof(SettingsDesignerItemViewModel), description: "致谢WPF-Diagram-Designer的开源作者，保留开源作品中的两个设计"));
+            toolBoxItems.Add(new ImageToolBoxData("../Images/Persist.png", typeof(PersistDesignerItemViewModel), description: "致谢WPF-Diagram-Designer的开源作者，保留开源作品中的两个设计"));
 
             ToolBoxCategory.Add(new ToolBoxCategory() { Header = "WPF-Diagram-Designer", ToolBoxItems = new ObservableCollection<ToolBoxData>(toolBoxItems), IsExpanded = true });
 
+
+            List<ToolBoxData> defaultToolBoxItems = new List<ToolBoxData>();
+            defaultToolBoxItems.Add(new TextToolBoxData("", typeof(DefaultDesignerItemViewModel)));
+            var blockitem = new TextToolBoxData("Block", typeof(BlockDesignerItemViewModel), 64, 32, desiredMinSize: new Size(130, 65));       
+            blockitem.ColorViewModel.FillColor.Color = Color.FromRgb(0x00, 0x2F, 0xA7);
+            defaultToolBoxItems.Add(blockitem);
+            var blockitem2 = new TextToolBoxData("Contain", typeof(BlockContainDesignerItemViewModel), 64, 32, desiredMinSize: new Size(130, 65));
+            blockitem2.ColorViewModel.FillColor.Color = Color.FromRgb(0x00, 0x2F, 0xA7);
+            defaultToolBoxItems.Add(blockitem2);
+            var blockitem3 = new TextToolBoxData("ContainList", typeof(BlockContainListDesignerItemViewModel), 64, 32, desiredMinSize: new Size(130, 65));
+            blockitem3.ColorViewModel.FillColor.Color = Color.FromRgb(0x00, 0x2F, 0xA7);
+            defaultToolBoxItems.Add(blockitem3);
+
+            ToolBoxCategory.Add(new ToolBoxCategory() { Header = "Default", ToolBoxItems = new ObservableCollection<ToolBoxData>(defaultToolBoxItems), IsExpanded = true });
+
             ToolBoxCategory.Add(new ToolBoxCategory() { Header = "Svg", ToolBoxItems = new ObservableCollection<ToolBoxData>() });
 
             List<PathToolBoxData> pathToolBoxItems = new List<PathToolBoxData>();
@@ -114,7 +146,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             pathToolBoxItems.Add(new PathToolBoxData("M 0,20 A 40,40 0 0 1 15,0 H 55 A 60,60 0 0 1 55,40 H 15 A 40,40, 0 0 1 0,20 Z", typeof(PathItemViewModel)));
             pathToolBoxItems.Add(new PathToolBoxData("M 0 10 L 10,0 H 50 L 60,10 V 40 H 0 Z", typeof(PathItemViewModel)));
             pathToolBoxItems.Add(new PathToolBoxData("M 0,20 L 10,0  H 50 L 60,20 L 50,40 H10 Z", typeof(PathItemViewModel)));
-            pathToolBoxItems.Add(new PathToolBoxData("M 0 0 H 60 L 50 40 H 10 Z", typeof(PathItemViewModel)));
+            pathToolBoxItems.Add(new PathToolBoxData("M10 3.22l-.61-.6a5.5 5.5 0 0 0-7.78 7.77L10 18.78l8.39-8.4a5.5 5.5 0 0 0-7.78-7.77l-.61.61z", typeof(PathItemViewModel)));
             pathToolBoxItems.Add(new PathToolBoxData("M 0 0 H 60 V 20 L 30, 40 L 0, 20 Z", typeof(PathItemViewModel)));
             pathToolBoxItems.Add(new PathToolBoxData("M 9,2 11,7 17,7 12,10 14,15 9,12 4,15 6,10 1,7 7,7 Z", typeof(PathItemViewModel)));
             ToolBoxCategory.Add(new ToolBoxCategory() { Header = "Path", ToolBoxItems = new ObservableCollection<ToolBoxData>(pathToolBoxItems) });
@@ -168,12 +200,12 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             ToolBoxCategory.Add(new ToolBoxCategory() { Header = "逻辑图", ToolBoxItems = new ObservableCollection<ToolBoxData>(logicalChartToolBoxItems) });
 
             List<ToolBoxData> flowchartToolBoxItems = new List<ToolBoxData>();
-            flowchartToolBoxItems.Add(new FlowchartToolBoxData(NodeKinds.Start, typeof(StartFlowNode)));
-            flowchartToolBoxItems.Add(new FlowchartToolBoxData(NodeKinds.End, typeof(EndFlowNode)));
-            flowchartToolBoxItems.Add(new FlowchartToolBoxData(NodeKinds.Middle, typeof(MiddleFlowNode)));
-            flowchartToolBoxItems.Add(new FlowchartToolBoxData(NodeKinds.Decide, typeof(DecideFlowNode)));
-            flowchartToolBoxItems.Add(new FlowchartToolBoxData(NodeKinds.COBegin, typeof(COBeginFlowNode)));
-            flowchartToolBoxItems.Add(new FlowchartToolBoxData(NodeKinds.COEnd, typeof(COEndFlowNode)));
+            flowchartToolBoxItems.Add(new FlowchartToolBoxData(NodeKinds.Start, typeof(StartFlowNode), 32, 32, new Size(80, 40)));
+            flowchartToolBoxItems.Add(new FlowchartToolBoxData(NodeKinds.End, typeof(EndFlowNode), 32, 32, new Size(80, 40)));
+            flowchartToolBoxItems.Add(new FlowchartToolBoxData(NodeKinds.Middle, typeof(MiddleFlowNode), 32, 32, new Size(80, 40)));
+            flowchartToolBoxItems.Add(new FlowchartToolBoxData(NodeKinds.Decide, typeof(DecideFlowNode), 32, 32, new Size(80, 40)));
+            flowchartToolBoxItems.Add(new FlowchartToolBoxData(NodeKinds.COBegin, typeof(COBeginFlowNode), 32, 32, new Size(80, 40))); ;
+            flowchartToolBoxItems.Add(new FlowchartToolBoxData(NodeKinds.COEnd, typeof(COEndFlowNode), 32, 32, new Size(80, 40)));
             ToolBoxCategory.Add(new ToolBoxCategory() { Header = "流程图", ToolBoxItems = new ObservableCollection<ToolBoxData>(flowchartToolBoxItems) });
 
             List<ToolBoxData> mediaToolBoxItems = new List<ToolBoxData>();
@@ -220,28 +252,41 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
 
         private void LoadMyItems()
         {
+            if (!Directory.Exists(_custom))
+            {
+                Directory.CreateDirectory(_custom);
+            }
+
             if (Directory.Exists(_custom))
             {
                 var files = Directory.GetFiles(_custom);
                 foreach (var filename in files.Where(p => p.ToLower().EndsWith(".json")))
                 {
-                    var itemBase = ReadMyItem(filename);
-                    if (itemBase != null)
-                    {
-                        MyToolBoxCategory.ToolBoxItems.Add(new DesignerItemToolBoxData(itemBase, filename, TypeHelper.GetType(itemBase.ItemTypeName)));
-                    }
+                    AddMyItem(filename);
                 }
             }
         }
 
-        private DesignerItemBase ReadMyItem(string filename)
+        private object ReadMyItem(string filename)
         {
             try
             {
                 var xmlobject = JsonConvert.DeserializeObject<DiagramDocument>(File.ReadAllText(filename));
-                var diagramItemData = xmlobject.DiagramItems[0].AllDesignerItems[0];
 
-                return diagramItemData;
+                if (xmlobject.DiagramItems[0].DesignerItems.Count > 1)
+                {
+                    var itemBase = new MultipleDesignerItemToolBoxData(new SerializableObject() { DesignerItems = xmlobject.DiagramItems[0].DesignerItems, Connections = xmlobject.DiagramItems[0].Connections }, filename);
+
+                    return itemBase;
+                }
+                else
+                {
+                    Type type = TypeHelper.GetType(xmlobject.DiagramItems[0].DesignerItems[0].SerializableTypeName);
+
+                    var itemBase = JsonConvert.DeserializeObject(xmlobject.DiagramItems[0].DesignerItems[0].SerializableString, type) as DesignerItemBase;
+
+                    return itemBase;
+                }
             }
             catch
             {
@@ -253,22 +298,44 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
 
         private void AddMyItem()
         {
-            if (_service.SelectedItem is DesignerItemViewModelBase designer)
+            if (_mainWindowViewModel?.PageViewModel?.DiagramViewModel != null)
             {
                 DiagramDocument diagramDocument = new DiagramDocument();
                 diagramDocument.DiagramItems = new List<DiagramItem>();
                 DiagramItem diagramItem = new DiagramItem();
-                diagramItem.AddItems(new List<DesignerItemViewModelBase> { designer });
+
+                var selectedDesignerItems = _mainWindowViewModel?.PageViewModel?.DiagramViewModel.SelectedItems.OfType<DesignerItemViewModelBase>();
+                var selectedConnections = _mainWindowViewModel?.PageViewModel?.DiagramViewModel.SelectedItems.OfType<ConnectionViewModel>();
+
+                diagramItem.DesignerItems = selectedDesignerItems.Select(p => p.ToSerializableItem(".json")).Where(p => p != null).ToList();
+                diagramItem.Connections = selectedConnections.Select(p => p.ToSerializableItem(".json")).Where(p => p != null).ToList();
+
                 diagramDocument.DiagramItems.Add(diagramItem);
                 string newname = NewNameHelper.GetNewName(MyToolBoxCategory.ToolBoxItems.OfType<DesignerItemToolBoxData>().Select(p => Path.GetFileNameWithoutExtension(p.FileName)), "");
                 var filename = $"{_custom}\\{newname}.json";
                 File.WriteAllText(filename, JsonConvert.SerializeObject(diagramDocument));
 
+                AddMyItem(filename);
+            }
+        }
+
+        private void AddMyItem(string filename)
+        {
+            try
+            {
                 var itemBase = ReadMyItem(filename);
-                if (itemBase != null)
+                if (itemBase is DesignerItemBase designer)
                 {
-                    MyToolBoxCategory.ToolBoxItems.Add(new DesignerItemToolBoxData(itemBase, filename, TypeHelper.GetType(itemBase.ItemTypeName)));
+                    MyToolBoxCategory.ToolBoxItems.Add(new DesignerItemToolBoxData(designer, filename, TypeHelper.GetType(designer.ItemTypeName)));
                 }
+                else if (itemBase is MultipleDesignerItemToolBoxData multiple)
+                {
+                    MyToolBoxCategory.ToolBoxItems.Add(multiple);
+                }
+            }
+            catch
+            {
+
             }
         }
 
@@ -287,50 +354,6 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
         }
     }
 
-    public class ToolBoxCategory : BindableBase
-    {
-        public string Header { get; set; }
-
-        private bool _isExpanded;
-        public bool IsExpanded
-        {
-            get
-            {
-                return _isExpanded;
-            }
-            set
-            {
-                SetProperty(ref _isExpanded, value);
-            }
-        }
-
-        private bool _isChecked = true;
-        public bool IsChecked
-        {
-            get
-            {
-                return _isChecked;
-            }
-            set
-            {
-                SetProperty(ref _isChecked, value);
-            }
-        }
-
-        private ObservableCollection<ToolBoxData> _toolBoxItems;
-        public ObservableCollection<ToolBoxData> ToolBoxItems
-        {
-            get
-            {
-                return _toolBoxItems;
-            }
-            set
-            {
-                SetProperty(ref _toolBoxItems, value);
-            }
-        }
-    }
-
     public class MineToolBoxCategory : ToolBoxCategory
     {
 

AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml.cs

@@ -31,8 +31,6 @@ namespace AIStudio.Wpf.DiagramApp
         {
             InitializeComponent();
 
-            this.HookEvents();
-
             MainWindowViewModel = new MainWindowViewModel();
             this.DataContext = MainWindowViewModel;
             this.Closing += MainWindow_Closing;
@@ -40,13 +38,8 @@ namespace AIStudio.Wpf.DiagramApp
 
         protected override void OnPreviewKeyDown(KeyEventArgs e)
         {
-            e.Handled = MainWindowViewModel.KeyExecuted(e.KeyboardDevice.Modifiers == ModifierKeys.None ? e.Key.ToString() : e.KeyboardDevice.Modifiers.ToString() + "+" + e.Key.ToString());
-        }
-
-        private void HookEvents()
-        {
-
-            this.PreviewMouseWheel += this.OnPreviewMouseWheel;
+            base.OnPreviewKeyDown(e);
+            e.Handled = MainWindowViewModel.KeyExecuted(e);
         }
 
         private void ZoomSlider_OnValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
@@ -55,21 +48,6 @@ namespace AIStudio.Wpf.DiagramApp
             TextOptions.SetTextFormattingMode(this, textFormattingMode);
         }
 
-        private void OnPreviewMouseWheel(object sender, MouseWheelEventArgs e)
-        {
-            if (Keyboard.IsKeyDown(Key.LeftCtrl) == false
-                && Keyboard.IsKeyDown(Key.RightCtrl) == false)
-            {
-                return;
-            }
-
-            var newZoomValue = this.zoomSlider.Value + (e.Delta > 0 ? 0.1 : -0.1);
-
-            this.zoomSlider.Value = Math.Max(Math.Min(newZoomValue, this.zoomSlider.Maximum), this.zoomSlider.Minimum);
-
-            e.Handled = true;
-        }
-
         private void btnPrint_Click(object sender, RoutedEventArgs e)
         {
             PrintDialog printDialog = new PrintDialog();

AIStudio.Wpf.DiagramApp/Views/PropertyControl.xaml

@@ -4,10 +4,10 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:Fluent="urn:fluent-ribbon"
-             xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls;assembly=AIStudio.Wpf.DiagramHelper"
+             xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Controls;assembly=AIStudio.Wpf.DiagramDesigner.Additionals"
              xmlns:views="clr-namespace:AIStudio.Wpf.DiagramApp.Views"
-             xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters;assembly=AIStudio.Wpf.DiagramHelper"
-             xmlns:helper="clr-namespace:AIStudio.Wpf.DiagramHelper.Helpers;assembly=AIStudio.Wpf.DiagramHelper"
+             xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Converters;assembly=AIStudio.Wpf.DiagramDesigner.Additionals"
+             xmlns:helper="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals;assembly=AIStudio.Wpf.DiagramDesigner.Additionals"
              xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              xmlns:flowchart="clr-namespace:AIStudio.Wpf.Flowchart;assembly=AIStudio.Wpf.Flowchart"
@@ -20,20 +20,20 @@
         <dd:EnumDescriptionConverter x:Key="EnumDescriptionConverter"/>
 
         <ControlTemplate TargetType="Control" x:Key="FillTemplate">
-            <TabControl Style="{StaticResource UniformTabControlStyle}" >
-                <TabItem Header="填充" Height="34">
+            <TabControl Style="{StaticResource AIStudio.DiagramApp.Styles.TabControl.Uniform}" >
+                <TabItem Header="填充" Height="25">
                     <StackPanel 
-                        DataContext="{Binding SelectedItem.ColorViewModel.FillColor}"
+                        DataContext="{Binding SelectedItemViewModel.ColorViewModel.FillColor}"
                         Visibility="{Binding .,Converter={StaticResource NullableToVisibilityConverter}}">
                         <StackPanel>
-                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={converter:ConverterValueMapToBool Parameter='None'}, ConverterParameter='None'}" Content="无填充" />
-                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={converter:ConverterValueMapToBool Parameter='SolidColorBrush'}, ConverterParameter='SolidColorBrush'}" Content="单色填充"/>
-                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={converter:ConverterValueMapToBool Parameter='LinearGradientBrush'}, ConverterParameter='LinearGradientBrush'}" Content="线性渐变填充"/>
-                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={converter:ConverterValueMapToBool Parameter='RadialGradientBrush'}, ConverterParameter='RadialGradientBrush'}" Content="径向渐变填充"/>
-                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={converter:ConverterValueMapToBool Parameter='DrawingBrush'}, ConverterParameter='DrawingBrush'}" Content="图案填充"/>
-                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={converter:ConverterValueMapToBool Parameter='ImageBrush'}, ConverterParameter='ImageBrush'}" Content="图片或纹理填充"/>
+                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={dd:ConverterValueMapToBool Parameter='None'}, ConverterParameter='None'}" Content="无填充" />
+                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={dd:ConverterValueMapToBool Parameter='SolidColorBrush'}, ConverterParameter='SolidColorBrush'}" Content="单色填充"/>
+                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={dd:ConverterValueMapToBool Parameter='LinearGradientBrush'}, ConverterParameter='LinearGradientBrush'}" Content="线性渐变填充"/>
+                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={dd:ConverterValueMapToBool Parameter='RadialGradientBrush'}, ConverterParameter='RadialGradientBrush'}" Content="径向渐变填充"/>
+                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={dd:ConverterValueMapToBool Parameter='DrawingBrush'}, ConverterParameter='DrawingBrush'}" Content="图案填充"/>
+                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={dd:ConverterValueMapToBool Parameter='ImageBrush'}, ConverterParameter='ImageBrush'}" Content="图片或纹理填充"/>
                         </StackPanel>
-                        <DockPanel Visibility="{Binding BrushType,Converter={converter:ConverterValueMapSetToVisibility},ConverterParameter='SolidColorBrush'}">
+                        <DockPanel Visibility="{Binding BrushType,Converter={dd:ConverterValueMapSetToVisibility},ConverterParameter='SolidColorBrush'}">
                             <!-- The following code shows theme colors mode for color gallery -->
                             <Fluent:DropDownButton DockPanel.Dock="Right" Margin="5" Height="24" Width="60" 
                                             Template="{StaticResource RibbonDropDownButtonControlTemplate1}"
@@ -56,9 +56,9 @@
                             </Fluent:DropDownButton>
                             <TextBlock Margin="5" VerticalAlignment="Center" Text="颜色"/>
                         </DockPanel>
-                        <StackPanel Visibility="{Binding BrushType,Converter={converter:ConverterValueMapSetToVisibility},ConverterParameter='LinearGradientBrush^RadialGradientBrush'}">
-                            <DockPanel Visibility="{Binding BrushType,Converter={converter:ConverterValueMapSetToVisibility},ConverterParameter='LinearGradientBrush'}">
-                                <Fluent:ComboBox DockPanel.Dock="Right" Margin="5" Size="Small" Width="140" IsEditable="False" helper:EnumHelper.Enum="{x:Type dd:LinearOrientation}" SelectedItem="{Binding LinearOrientation}">
+                        <StackPanel Visibility="{Binding BrushType,Converter={dd:ConverterValueMapSetToVisibility},ConverterParameter='LinearGradientBrush^RadialGradientBrush'}">
+                            <DockPanel Visibility="{Binding BrushType,Converter={dd:ConverterValueMapSetToVisibility},ConverterParameter='LinearGradientBrush'}">
+                                <Fluent:ComboBox DockPanel.Dock="Right" Margin="5" Size="Small" Width="140" IsEditable="False" dd:EnumHelper.Enum="{x:Type dd:LinearOrientation}" SelectedItem="{Binding LinearOrientation}">
                                     <Fluent:ComboBox.ItemTemplate>
                                         <DataTemplate>
                                             <TextBlock Text="{Binding .,Converter={StaticResource EnumDescriptionConverter}}" />
@@ -67,8 +67,8 @@
                                 </Fluent:ComboBox>
                                 <TextBlock Text="方向" VerticalAlignment="Center" Margin="5"/>
                             </DockPanel>
-                            <DockPanel Visibility="{Binding BrushType,Converter={converter:ConverterValueMapSetToVisibility},ConverterParameter='RadialGradientBrush'}">
-                                <Fluent:ComboBox DockPanel.Dock="Right" Margin="5" Size="Small" Width="140" IsEditable="False" helper:EnumHelper.Enum="{x:Type dd:RadialOrientation}" SelectedItem="{Binding RadialOrientation}">
+                            <DockPanel Visibility="{Binding BrushType,Converter={dd:ConverterValueMapSetToVisibility},ConverterParameter='RadialGradientBrush'}">
+                                <Fluent:ComboBox DockPanel.Dock="Right" Margin="5" Size="Small" Width="140" IsEditable="False" dd:EnumHelper.Enum="{x:Type dd:RadialOrientation}" SelectedItem="{Binding RadialOrientation}">
                                     <Fluent:ComboBox.ItemTemplate>
                                         <DataTemplate>
                                             <TextBlock Text="{Binding .,Converter={StaticResource EnumDescriptionConverter}}" />
@@ -84,36 +84,36 @@
                             </DockPanel>
                             <controls:GradientStopControl />
                         </StackPanel>
-                        <StackPanel Visibility="{Binding BrushType,Converter={converter:ConverterValueSetToOppositeVisibility},ConverterParameter='None'}">
+                        <StackPanel Visibility="{Binding BrushType,Converter={dd:ConverterValueSetToOppositeVisibility},ConverterParameter='None'}">
                             <TextBlock Text="亮度" VerticalAlignment="Center" Margin="5"/>
                             <DockPanel>
                                 <Fluent:Spinner DockPanel.Dock="Right" Margin="5" Width="60" Size="Small" Value="{Binding Light}" Maximum="1" Minimum="-1"
                                     Format="0 %" />
-                                <Slider  Margin="5" Maximum="1" Minimum="-1" Value="{Binding Light}" Style="{StaticResource DefaultSlider}"/>
+                                <Slider  Margin="5" Maximum="1" Minimum="-1" Value="{Binding Light}" Style="{StaticResource AIStudio.DiagramApp.Styles.Slider}"/>
                             </DockPanel>
                         </StackPanel>
-                        <StackPanel Visibility="{Binding BrushType,Converter={converter:ConverterValueSetToOppositeVisibility},ConverterParameter='None'}">
+                        <StackPanel Visibility="{Binding BrushType,Converter={dd:ConverterValueSetToOppositeVisibility},ConverterParameter='None'}">
                             <TextBlock Text="透明度" VerticalAlignment="Center" Margin="5"/>
                             <DockPanel>
                                 <Fluent:Spinner DockPanel.Dock="Right" Margin="5" Width="60" Size="Small" Value="{Binding Opacity}" Maximum="1" Minimum="0"
                                     Format="0 %" />
-                                <Slider Margin="5" Maximum="1" Minimum="0" Value="{Binding Opacity}" Style="{StaticResource DefaultSlider}"/>
+                                <Slider Margin="5" Maximum="1" Minimum="0" Value="{Binding Opacity}" Style="{StaticResource AIStudio.DiagramApp.Styles.Slider}"/>
                             </DockPanel>
                         </StackPanel>
                     </StackPanel>
                 </TabItem>
-                <TabItem Header="线条" Height="34">
+                <TabItem Header="线条" Height="25">
                     <StackPanel 
-                        DataContext="{Binding SelectedItem.ColorViewModel.LineColor}"
+                        DataContext="{Binding SelectedItemViewModel.ColorViewModel.LineColor}"
                         Visibility="{Binding .,Converter={StaticResource NullableToVisibilityConverter}}">
                         <StackPanel>
-                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={converter:ConverterValueMapToBool Parameter='None'}, ConverterParameter='None'}" Content="无线条" />
-                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={converter:ConverterValueMapToBool Parameter='SolidColorBrush'}, ConverterParameter='SolidColorBrush'}" Content="实线"/>
-                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={converter:ConverterValueMapToBool Parameter='LinearGradientBrush'}, ConverterParameter='LinearGradientBrush'}" Content="线性渐变填充"/>
-                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={converter:ConverterValueMapToBool Parameter='RadialGradientBrush'}, ConverterParameter='RadialGradientBrush'}" Content="径向渐变填充"/>
+                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={dd:ConverterValueMapToBool Parameter='None'}, ConverterParameter='None'}" Content="无线条" />
+                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={dd:ConverterValueMapToBool Parameter='SolidColorBrush'}, ConverterParameter='SolidColorBrush'}" Content="实线"/>
+                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={dd:ConverterValueMapToBool Parameter='LinearGradientBrush'}, ConverterParameter='LinearGradientBrush'}" Content="线性渐变填充"/>
+                            <RadioButton Margin="5" IsChecked="{Binding BrushType,Converter={dd:ConverterValueMapToBool Parameter='RadialGradientBrush'}, ConverterParameter='RadialGradientBrush'}" Content="径向渐变填充"/>
                         </StackPanel>
 
-                        <DockPanel Visibility="{Binding BrushType,Converter={converter:ConverterValueMapSetToVisibility},ConverterParameter='SolidColorBrush'}">
+                        <DockPanel Visibility="{Binding BrushType,Converter={dd:ConverterValueMapSetToVisibility},ConverterParameter='SolidColorBrush'}">
                             <!-- The following code shows theme colors mode for color gallery -->
                             <Fluent:DropDownButton DockPanel.Dock="Right" Margin="5" Height="24" Width="60" 
                                                 Template="{StaticResource RibbonDropDownButtonControlTemplate1}"
@@ -136,9 +136,9 @@
                             </Fluent:DropDownButton>
                             <TextBlock Margin="5" VerticalAlignment="Center" Text="颜色"/>
                         </DockPanel>
-                        <StackPanel Visibility="{Binding BrushType,Converter={converter:ConverterValueMapSetToVisibility},ConverterParameter='LinearGradientBrush^RadialGradientBrush'}">
-                            <DockPanel Visibility="{Binding BrushType,Converter={converter:ConverterValueMapSetToVisibility},ConverterParameter='LinearGradientBrush'}">
-                                <Fluent:ComboBox DockPanel.Dock="Right" Margin="5" Size="Small" Width="140" IsEditable="False" helper:EnumHelper.Enum="{x:Type dd:LinearOrientation}" SelectedItem="{Binding LinearOrientation}">
+                        <StackPanel Visibility="{Binding BrushType,Converter={dd:ConverterValueMapSetToVisibility},ConverterParameter='LinearGradientBrush^RadialGradientBrush'}">
+                            <DockPanel Visibility="{Binding BrushType,Converter={dd:ConverterValueMapSetToVisibility},ConverterParameter='LinearGradientBrush'}">
+                                <Fluent:ComboBox DockPanel.Dock="Right" Margin="5" Size="Small" Width="140" IsEditable="False" dd:EnumHelper.Enum="{x:Type dd:LinearOrientation}" SelectedItem="{Binding LinearOrientation}">
                                     <Fluent:ComboBox.ItemTemplate>
                                         <DataTemplate>
                                             <TextBlock Text="{Binding .,Converter={StaticResource EnumDescriptionConverter}}" />
@@ -147,8 +147,8 @@
                                 </Fluent:ComboBox>
                                 <TextBlock Text="方向" VerticalAlignment="Center" Margin="5"/>
                             </DockPanel>
-                            <DockPanel Visibility="{Binding BrushType,Converter={converter:ConverterValueMapSetToVisibility},ConverterParameter='RadialGradientBrush'}">
-                                <Fluent:ComboBox DockPanel.Dock="Right" Margin="5" Size="Small" Width="140" IsEditable="False" helper:EnumHelper.Enum="{x:Type dd:RadialOrientation}" SelectedItem="{Binding RadialOrientation}">
+                            <DockPanel Visibility="{Binding BrushType,Converter={dd:ConverterValueMapSetToVisibility},ConverterParameter='RadialGradientBrush'}">
+                                <Fluent:ComboBox DockPanel.Dock="Right" Margin="5" Size="Small" Width="140" IsEditable="False" dd:EnumHelper.Enum="{x:Type dd:RadialOrientation}" SelectedItem="{Binding RadialOrientation}">
                                     <Fluent:ComboBox.ItemTemplate>
                                         <DataTemplate>
                                             <TextBlock Text="{Binding .,Converter={StaticResource EnumDescriptionConverter}}" />
@@ -164,25 +164,25 @@
                             </DockPanel>
                             <controls:GradientStopControl />
                         </StackPanel>
-                        <StackPanel Visibility="{Binding BrushType,Converter={converter:ConverterValueSetToOppositeVisibility},ConverterParameter='None'}">
+                        <StackPanel Visibility="{Binding BrushType,Converter={dd:ConverterValueSetToOppositeVisibility},ConverterParameter='None'}">
                             <TextBlock Text="亮度" VerticalAlignment="Center" Margin="5"/>
                             <DockPanel>
                                 <Fluent:Spinner DockPanel.Dock="Right" Margin="5" Width="60" Size="Small" Value="{Binding Light}" Maximum="1" Minimum="-1"
                                     Format="0 %" />
-                                <Slider  Margin="5" Maximum="1" Minimum="-1" Value="{Binding Light}" Style="{StaticResource DefaultSlider}"/>
+                                <Slider  Margin="5" Maximum="1" Minimum="-1" Value="{Binding Light}" Style="{StaticResource AIStudio.DiagramApp.Styles.Slider}"/>
                             </DockPanel>
                         </StackPanel>
-                        <StackPanel Visibility="{Binding BrushType,Converter={converter:ConverterValueSetToOppositeVisibility},ConverterParameter='None'}">
+                        <StackPanel Visibility="{Binding BrushType,Converter={dd:ConverterValueSetToOppositeVisibility},ConverterParameter='None'}">
                             <TextBlock Text="透明度" VerticalAlignment="Center" Margin="5"/>
                             <DockPanel>
                                 <Fluent:Spinner DockPanel.Dock="Right" Margin="5" Width="60" Size="Small" Value="{Binding Opacity}" Maximum="1" Minimum="0"
                                     Format="0 %" />
-                                <Slider Margin="5" Maximum="1" Minimum="0" Value="{Binding Opacity}" Style="{StaticResource DefaultSlider}"/>
+                                <Slider Margin="5" Maximum="1" Minimum="0" Value="{Binding Opacity}" Style="{StaticResource AIStudio.DiagramApp.Styles.Slider}"/>
                             </DockPanel>
                         </StackPanel>
                     </StackPanel>
                 </TabItem>
-                <TabItem Header="阴影" Height="34">
+                <TabItem Header="阴影" Height="25">
 
                 </TabItem>
             </TabControl>
@@ -195,24 +195,24 @@
         </ControlTemplate>
 
         <ControlTemplate TargetType="Control" x:Key="PictureTemplate">
-            <TabControl Style="{StaticResource UniformTabControlStyle}">
+            <TabControl Style="{StaticResource AIStudio.DiagramApp.Styles.TabControl.Uniform}">
                 <TabItem Header="图片" Height="34">
                     <UniformGrid Columns="2" VerticalAlignment="Top">
-                        <Fluent:Button Header="插入图片" VerticalAlignment="Top" Command="{Binding AddImageCommand}">
+                        <Fluent:Button Header="插入图片" VerticalAlignment="Top" Command="{Binding PageViewModel.AddImageCommand}">
                             <Fluent:Button.LargeIcon>
                                 <iconPacks:PackIconMaterial Kind="Image" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                             </Fluent:Button.LargeIcon>
                         </Fluent:Button>
-                        <Fluent:Button Header="改变图片"  VerticalAlignment="Top" Command="{Binding EditImageCommand}">
+                        <Fluent:Button Header="改变图片"  VerticalAlignment="Top" Command="{Binding PageViewModel.EditImageCommand}">
                             <Fluent:Button.LargeIcon>
                                 <iconPacks:PackIconMaterial Kind="ImageEdit" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                             </Fluent:Button.LargeIcon>
                         </Fluent:Button>
-                        <Fluent:SplitButton Header="图片裁剪" VerticalAlignment="Top" HorizontalAlignment="Stretch" Command="{Binding ResizeImageCommand}">
+                        <Fluent:SplitButton Header="图片裁剪" VerticalAlignment="Top" HorizontalAlignment="Stretch" Command="{Binding PageViewModel.ResizeImageCommand}">
                             <Fluent:SplitButton.LargeIcon>
                                 <iconPacks:PackIconMaterial Kind="ImagePlus" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                             </Fluent:SplitButton.LargeIcon>
-                            <ListBox helper:EnumHelper.Enum="{x:Type dd:ClipMode}" SelectedItem="{Binding SelectedItem.ClipMode}"  BorderThickness="0">
+                            <ListBox dd:EnumHelper.Enum="{x:Type dd:ClipMode}" SelectedItem="{Binding SelectedItemViewModel.ClipMode}"  BorderThickness="0">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <TextBlock Text="{Binding .,Converter={StaticResource EnumDescriptionConverter}}"  />
@@ -220,7 +220,7 @@
                                 </ListBox.ItemTemplate>
                             </ListBox>
                         </Fluent:SplitButton>
-                        <Fluent:Button Header="原始图" VerticalAlignment="Top" Command="{Binding ResetImageCommand}">
+                        <Fluent:Button Header="原始图" VerticalAlignment="Top" Command="{Binding PageViewModel.ResetImageCommand}">
                             <Fluent:Button.LargeIcon>
                                 <iconPacks:PackIconMaterial Kind="ImageRemove" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                             </Fluent:Button.LargeIcon>
@@ -229,7 +229,7 @@
                 </TabItem>
                 <TabItem Header="视频" Height="34">
                     <UniformGrid Columns="2" VerticalAlignment="Top">
-                        <Fluent:Button Header="插入视频" VerticalAlignment="Top" Command="{Binding AddVideoCommand}">
+                        <Fluent:Button Header="插入视频" VerticalAlignment="Top" Command="{Binding PageViewModel.AddVideoCommand}">
                             <Fluent:Button.LargeIcon>
                                 <iconPacks:PackIconMaterial Kind="Video" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                             </Fluent:Button.LargeIcon>
@@ -238,12 +238,12 @@
                 </TabItem>
                 <TabItem Header="二维码" Height="34">
                     <UniformGrid Columns="2" VerticalAlignment="Top">
-                        <Fluent:Button Header="插入二维码" VerticalAlignment="Top" Command="{Binding AddBarcodeCommand}" CommandParameter="QR_CODE">
+                        <Fluent:Button Header="插入二维码" VerticalAlignment="Top" Command="{Binding PageViewModel.AddBarcodeCommand}" CommandParameter="QR_CODE">
                             <Fluent:Button.LargeIcon>
                                 <iconPacks:PackIconMaterial Kind="Qrcode" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                             </Fluent:Button.LargeIcon>
                         </Fluent:Button>
-                        <Fluent:Button Header="插入条形码" VerticalAlignment="Top" Command="{Binding AddBarcodeCommand}" CommandParameter="CODE_39">
+                        <Fluent:Button Header="插入条形码" VerticalAlignment="Top" Command="{Binding PageViewModel.AddBarcodeCommand}" CommandParameter="CODE_39">
                             <Fluent:Button.LargeIcon>
                                 <iconPacks:PackIconMaterial Kind="Barcode" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                             </Fluent:Button.LargeIcon>
@@ -254,8 +254,8 @@
         </ControlTemplate>
 
         <ControlTemplate TargetType="Control" x:Key="PropertyTemplate">
-            <controls:PropertiesView SelectedObject="{Binding SelectedItem}">
-                <controls:PropertiesView.Resources>
+            <dd:PropertiesView SelectedObject="{Binding SelectedItemViewModel}">
+                <dd:PropertiesView.Resources>
                     <Style x:Key="ActTypeStyle" TargetType="{x:Type ContentControl}">
                         <Setter Property="ContentTemplate">
                             <Setter.Value>
@@ -277,9 +277,9 @@
                             <Setter.Value>
                                 <DataTemplate>
                                     <Grid DataContext="{Binding Path=DataContext,RelativeSource={RelativeSource AncestorType={x:Type ContentControl}}}">
-                                        <controls:MultiSelectComboBox BorderThickness="0" DisplayMemberPath="text" SelectedValuePath="value"
+                                        <dd:MultiSelectComboBox BorderThickness="0" DisplayMemberPath="text" SelectedValuePath="value"
                                                             SelectedValues="{Binding UserIds}"
-                                                            ItemsSource="{x:Static flowchart:FlowchartService.Users}"  ></controls:MultiSelectComboBox>
+                                                            ItemsSource="{x:Static flowchart:FlowchartService.Users}"  ></dd:MultiSelectComboBox>
                                     </Grid>
                                 </DataTemplate>
                             </Setter.Value>
@@ -290,16 +290,16 @@
                             <Setter.Value>
                                 <DataTemplate>
                                     <Grid DataContext="{Binding Path=DataContext,RelativeSource={RelativeSource AncestorType={x:Type ContentControl}}}">
-                                        <controls:MultiSelectComboBox BorderThickness="0" DisplayMemberPath="text" SelectedValuePath="value"
+                                        <dd:MultiSelectComboBox BorderThickness="0" DisplayMemberPath="text" SelectedValuePath="value"
                                                             SelectedValues="{Binding RoleIds}"
-                                                            ItemsSource="{x:Static flowchart:FlowchartService.Roles}"></controls:MultiSelectComboBox>
+                                                            ItemsSource="{x:Static flowchart:FlowchartService.Roles}"></dd:MultiSelectComboBox>
                                     </Grid>
                                 </DataTemplate>
                             </Setter.Value>
                         </Setter>
-                    </Style>
-                </controls:PropertiesView.Resources>
-            </controls:PropertiesView>
+                    </Style>                     
+                </dd:PropertiesView.Resources>
+            </dd:PropertiesView>
         </ControlTemplate>  
     </UserControl.Resources>
     <Grid >
@@ -308,8 +308,8 @@
             <ColumnDefinition Width="Auto"/>
         </Grid.ColumnDefinitions>        
         <StackPanel Margin="1,0,0,0">
-            <ToggleButton IsChecked="{Binding ElementName=expanderRight,Path=IsExpanded}" Background="{DynamicResource WhiteBrush}" Style="{StaticResource ExpanderToggleButton}"/>
-            <ListBox x:Name="listBox" SelectedIndex="0" Padding="0,0,0,10" BorderThickness="0" Style="{StaticResource DefaultListBox}">
+            <ToggleButton Height="25" IsChecked="{Binding ElementName=expanderRight,Path=IsExpanded}" Background="{DynamicResource WhiteBrush}" Style="{StaticResource AIStudio.DiagramApp.Styles.ToggleButton.Expander}"/>
+            <ListBox x:Name="listBox" SelectedIndex="0" Padding="0,0,0,10" BorderThickness="0" Style="{StaticResource AIStudio.DiagramApp.Styles.ListBox}">
                 <iconPacks:PackIconMaterial Kind="FormatColorFill" Width="18" Height="18" Margin="8"/>
                 <iconPacks:PackIconMaterial Kind="ViewGridOutline" Width="18" Height="18" Margin="8" />
                 <iconPacks:PackIconMaterial Kind="Image" Width="18" Height="18" Margin="8"/>
@@ -317,7 +317,7 @@
             </ListBox>
         </StackPanel>
         <dd:BorderResizeThumb Width="1" Margin="0,0,-3,0" ResizeElement="{Binding ElementName=control}" Cursor="SizeWE" VerticalAlignment="Stretch" HorizontalAlignment="Left" Visibility="{Binding ElementName=expanderRight,Path=IsExpanded,Converter={StaticResource BooleanToVisibilityConverter}}"/>
-        <Expander x:Name="expanderRight" Grid.Column="1" IsExpanded="True" ExpandDirection="Right" Style="{StaticResource DefaultAutoHideExpander}" Padding="0">
+        <Expander x:Name="expanderRight" Grid.Column="1" IsExpanded="True" ExpandDirection="Right" Style="{StaticResource AIStudio.DiagramApp.Styles.Expander.AutoHide}" Padding="0">
             <Control x:Name="control" Width="200" MinWidth="100" MaxWidth="500">
                 <Control.Style>
                     <Style TargetType="Control">

AIStudio.Wpf.DiagramApp/Views/SearchControl.xaml

@@ -0,0 +1,150 @@
+<UserControl x:Class="AIStudio.Wpf.DiagramApp.Views.SearchControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:AIStudio.Wpf.DiagramApp.Views"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    
+    <Border BorderBrush="Gray" Background="{DynamicResource WindowBackgroundBrush}" BorderThickness="1" >
+        <Grid Grid.IsSharedSizeScope="True">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Grid Height="24">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Column1"/>
+                    <ColumnDefinition Width="*" SharedSizeGroup="Column2"/>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Column3"/>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Column4"/>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Column5"/>
+                </Grid.ColumnDefinitions>
+                <ToggleButton x:Name="replaceToggle" Width="20" Height="20" Padding="5,0" ToolTip="查找与替换切换">
+                    <ToggleButton.Style>
+                        <Style BasedOn="{StaticResource AIStudio.Mind.Styles.Button.Flat}" TargetType="{x:Type ToggleButton}">
+                            <Setter Property="Content">
+                                <Setter.Value>
+                                    <Path Stretch="Uniform" Fill="Black" Data="M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z"></Path>
+                                </Setter.Value>
+                            </Setter>
+                            <Style.Triggers>
+                                <Trigger Property="IsChecked" Value="True">
+                                    <Trigger.Setters>
+                                        <Setter Property="Content">
+                                            <Setter.Value>
+                                                <Path Stretch="Uniform" Fill="Black" Data="M7.41,15.41L12,10.83L16.59,15.41L18,14L12,8L6,14L7.41,15.41Z"></Path>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Trigger.Setters>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </ToggleButton.Style>
+                </ToggleButton>
+                <TextBox Grid.Column="1" Width="200" x:Name="txtsearch" Text="{Binding PageViewModel.DiagramViewModel.SearchText,Mode=OneWayToSource}" VerticalContentAlignment="Center" BorderThickness="0" Background="Transparent">
+                    <TextBox.InputBindings>
+                        <KeyBinding Key="Enter" Command="{Binding PageViewModel.DiagramViewModel.SearchDownCommand}" CommandParameter="{Binding ElementName=txtsearch,Path=Text}"/>
+                    </TextBox.InputBindings>
+                    <i:Interaction.Triggers>
+                        <i:EventTrigger EventName="LostFocus">
+                            <i:InvokeCommandAction Command="{Binding PageViewModel.DiagramViewModel.SearchDownCommand}" CommandParameter="{Binding ElementName=txtsearch,Path=Text}"/>
+                        </i:EventTrigger>
+                    </i:Interaction.Triggers>
+                </TextBox>
+                <Line Grid.Column="1" X1="0" Y1="0" X2="0" Y2="100" Stroke="Gray"  StrokeThickness="0.5" HorizontalAlignment="Right"></Line>
+                <Button Grid.Column="2" Width="20" Height="20" Padding="5,0" ToolTip="查找上一个" Style="{StaticResource AIStudio.Mind.Styles.Button.Flat}" Command="{Binding PageViewModel.DiagramViewModel.SearchUpCommand}" CommandParameter="{Binding ElementName=txtsearch,Path=Text}">
+                    <Path Stretch="Uniform" Fill="Black" Data="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z"></Path>
+                </Button>
+                <Button Grid.Column="3" Width="20" Height="20" Padding="5,0" ToolTip="查找下一个" Style="{StaticResource AIStudio.Mind.Styles.Button.Flat}" Command="{Binding PageViewModel.DiagramViewModel.SearchDownCommand}" CommandParameter="{Binding ElementName=txtsearch,Path=Text}">
+                    <Path Stretch="Uniform" Fill="Black" Data="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z"></Path>
+                </Button>
+                <Button Grid.Column="4" Width="20" Height="20" Padding="5,0" ToolTip="关闭" Style="{StaticResource AIStudio.Mind.Styles.Button.Flat}" Command="{Binding PageViewModel.DiagramViewModel.CloseSearchCommand}">
+                    <Path Stretch="Uniform" Fill="Black" Data="M500 455.8125L727.875 227.8749999999999L772.1250000000001 272.0625L544.1875 500L772.1250000000001 727.875L727.9375 772.125L500 544.1875L272.125 772.125L227.9375000000001 727.875L455.8125 500L227.9375000000001 272.125L272.125 227.8749999999999L500 455.8125z"></Path>
+                </Button>
+                <Line Grid.ColumnSpan="5" X1="0" Y1="0" X2="300" Y2="0" Stroke="Gray"  StrokeThickness="0.5" VerticalAlignment="Bottom"></Line>
+            </Grid>
+            <Grid Grid.Row="1" Height="24" Visibility="{Binding ElementName=replaceToggle,Path=IsChecked,Converter={StaticResource BooleanToVisibilityConverter}}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Column1"/>
+                    <ColumnDefinition Width="*" SharedSizeGroup="Column2"/>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Column3"/>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Column4"/>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Column5"/>
+                </Grid.ColumnDefinitions>
+                <TextBox Grid.Column="1"  x:Name="txtreplace" Text="{Binding PageViewModel.DiagramViewModel.ReplaceText,Mode=OneWayToSource}" VerticalContentAlignment="Center" BorderThickness="0" Background="Transparent">
+                </TextBox>
+                <Line Grid.Column="1" X1="0" Y1="0" X2="0" Y2="100" Stroke="Gray"  StrokeThickness="0.5" HorizontalAlignment="Right"></Line>
+                <Button Grid.Column="2" Width="20" Height="20" Padding="5,0" ToolTip="替换" Style="{StaticResource AIStudio.Mind.Styles.Button.Flat}" Command="{Binding PageViewModel.DiagramViewModel.ReplaceCommand}">
+                    <Button.CommandParameter>
+                        <MultiBinding Converter="{StaticResource ObjectConverter}">
+                            <MultiBinding.Bindings>
+                                <Binding ElementName="txtsearch" Path="Text"/>
+                                <Binding ElementName="txtreplace" Path="Text"/>
+                            </MultiBinding.Bindings>
+                        </MultiBinding>
+                    </Button.CommandParameter>
+                    <Path Stretch="Uniform" Fill="Black" Data="M940.3 761.5c-8.5-13.3-19.3-24.8-31.9-34.1 13.3-19.5 20.7-43.7 20.7-69.2 0-61.5-43-111.5-95.9-111.5H671.8c-29.3 0-53.1 23.8-53.1 53.1v304c0 29.3 23.8 53.1 53.1 53.1h160.4c34.3 0 66.6-13.5 90.9-37.9 24.1-24.2 37.3-56 37.1-89.7 0-24.2-6.9-47.6-19.9-67.8z m-67.6 107.7c-10.6 10.6-24.7 16.5-39.5 16.5H689.8V773.6h143.3c14.8 0 28.9 5.9 39.5 16.5 10.6 10.6 16.5 24.7 16.5 39.5s-5.8 29-16.4 39.6z m-25.3-178.9c-2.1 2.5-7.7 8.4-14.3 8.4H689.8v-80.9h143.3c6.6 0 12.2 5.9 14.3 8.4 6.6 8 10.6 20 10.6 32.1 0 12-3.9 24-10.6 32zM456 406.6l-128-320C322.5 73 309.3 64 294.5 64h-64c-14.7 0-28 9-33.4 22.6l-128 320c-7.4 18.5 1.6 39.4 20.1 46.8 18.5 7.4 39.4-1.6 46.8-20.1L178.1 328H347l42.1 105.4c5.6 14.1 19.1 22.6 33.4 22.6 4.5 0 9-0.8 13.4-2.6 18.5-7.4 27.5-28.3 20.1-46.8zM206.9 256l48-120h15.3l48 120H206.9z m345.8 582.3l-113.5 67c-5.7 3.4-12 5-18.3 5-12.3 0-24.3-6.3-31-17.7-10.1-17.1-4.4-39.2 12.7-49.3l38.9-23c-47.1-14.5-88.6-35.2-124.1-62-40.2-30.3-72.5-68.1-96-112.5-39.9-75.3-40.6-143.8-40.6-146.7v-0.1c0-19.9 16.1-36 36-36s35.9 16.1 36 35.9v-0.2c0 0.6 1 56.1 33.6 116 18.7 34.4 44.3 63.8 75.9 87.2 29 21.5 63.4 38.3 102.6 50.1l-23-44.1c-9.2-17.6-2.4-39.4 15.3-48.6 17.6-9.2 39.4-2.4 48.6 15.3l60.5 115.9c8.9 17.1 2.9 38.1-13.6 47.8z"></Path>
+                </Button>
+                <Button Grid.Column="3" Width="20" Height="20" Padding="5,0" ToolTip="全部替换" Style="{StaticResource AIStudio.Mind.Styles.Button.Flat}" Command="{Binding PageViewModel.DiagramViewModel.ReplaceAllCommand}">
+                    <Button.CommandParameter>
+                        <MultiBinding Converter="{StaticResource ObjectConverter}">
+                            <MultiBinding.Bindings>
+                                <Binding ElementName="txtsearch" Path="Text"/>
+                                <Binding ElementName="txtreplace" Path="Text"/>
+                            </MultiBinding.Bindings>
+                        </MultiBinding>
+                    </Button.CommandParameter>
+                    <Path Stretch="Uniform" Fill="Black" Data="M618.368 905.813333a88.32 88.32 0 0 1-87.082667-87.082666v-209.408a88.362667 88.362667 0 0 1 87.082667-87.082667h209.408a88.234667 88.234667 0 0 1 87.082667 87.082667v209.408a88.192 88.192 0 0 1-87.082667 87.082666z m-22.912-296.490666v209.408a24.448 24.448 0 0 0 22.912 22.997333h209.408a24.704 24.704 0 0 0 23.168-22.997333v-209.408a24.661333 24.661333 0 0 0-23.168-22.912h-209.408a24.448 24.448 0 0 0-23.04 22.912zM224.853333 826.666667a260.010667 260.010667 0 0 1-69.077333-169.514667h-33.237333l66.090666-110.250667 66.346667 110.250667H219.733333a196.266667 196.266667 0 0 0 51.2 125.354667 213.333333 213.333333 0 0 0 148.992 59.264 32.042667 32.042667 0 1 1 0 64 277.034667 277.034667 0 0 1-195.029333-79.274667z m-28.842666-324.821334a88.405333 88.405333 0 0 1-87.082667-87.082666v-209.066667a88.448 88.448 0 0 1 87.082667-87.338667h209.408a88.405333 88.405333 0 0 1 87.082666 87.338667v209.066667a86.144 86.144 0 0 1-87.082666 87.082666z m-23.168-296.32v209.066667a24.917333 24.917333 0 0 0 23.168 23.168h209.408a22.272 22.272 0 0 0 23.168-23.168v-209.066667a24.704 24.704 0 0 0-23.168-23.168H196.010667a24.704 24.704 0 0 0-23.082667 23.125334z m596.181333 165.077334h35.328a196.693333 196.693333 0 0 0-51.2-128.853334 213.333333 213.333333 0 0 0-149.333333-59.434666 32.085333 32.085333 0 0 1 0-64 277.333333 277.333333 0 0 1 195.157333 79.232 261.205333 261.205333 0 0 1 69.504 173.184h32.853333l-62.421333 110.250666z"></Path>
+                </Button>
+                <Line Grid.ColumnSpan="5" X1="0" Y1="0" X2="300" Y2="0" Stroke="Gray"  StrokeThickness="0.5" VerticalAlignment="Bottom"></Line>
+            </Grid>
+            <Grid Grid.Row="2" Height="24">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Column1"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                    <ToggleButton Width="20" Height="20" Padding="2,0" ToolTip="区分大小写" IsChecked="{Binding PageViewModel.DiagramViewModel.SearchCaseMatch}">
+                        <Path Stretch="Uniform" Fill="Black" Data="M20.06,18C20,17.83 19.91,17.54 19.86,17.11C19.19,17.81 18.38,18.16 17.45,18.16C16.62,18.16 15.93,17.92 15.4,17.45C14.87,17 14.6,16.39 14.6,15.66C14.6,14.78 14.93,14.1 15.6,13.61C16.27,13.12 17.21,12.88 18.43,12.88H19.83V12.24C19.83,11.75 19.68,11.36 19.38,11.07C19.08,10.78 18.63,10.64 18.05,10.64C17.53,10.64 17.1,10.76 16.75,11C16.4,11.25 16.23,11.54 16.23,11.89H14.77C14.77,11.46 14.92,11.05 15.22,10.65C15.5,10.25 15.93,9.94 16.44,9.71C16.95,9.5 17.5,9.36 18.13,9.36C19.11,9.36 19.87,9.6 20.42,10.09C20.97,10.58 21.26,11.25 21.28,12.11V16C21.28,16.8 21.38,17.42 21.58,17.88V18H20.06M17.66,16.88C18.11,16.88 18.54,16.77 18.95,16.56C19.35,16.35 19.65,16.07 19.83,15.73V14.16H18.7C16.93,14.16 16.04,14.63 16.04,15.57C16.04,16 16.19,16.3 16.5,16.53C16.8,16.76 17.18,16.88 17.66,16.88M5.46,13.71H9.53L7.5,8.29L5.46,13.71M6.64,6H8.36L13.07,18H11.14L10.17,15.43H4.82L3.86,18H1.93L6.64,6Z"></Path>
+                        <ToggleButton.Style>
+                            <Style BasedOn="{StaticResource AIStudio.Mind.Styles.Button.Flat}" TargetType="{x:Type ToggleButton}">
+                                <Setter Property="Background" Value="Transparent"/>
+                                <Style.Triggers>
+                                    <Trigger Property="IsChecked" Value="True">
+                                        <Trigger.Setters>
+                                            <Setter Property="Background" Value="#cce4f7" />
+                                        </Trigger.Setters>
+                                    </Trigger>
+                                </Style.Triggers>
+                            </Style>
+                        </ToggleButton.Style>
+                    </ToggleButton>
+                    <ToggleButton Width="20" Height="20" Padding="2,0" ToolTip="全字匹配" IsChecked="{Binding PageViewModel.DiagramViewModel.SearchWholeWordMatch}">
+                        <Path Stretch="Uniform" Fill="Black" RenderTransformOrigin="0.5,0.5" Data="M62.5 875H937.5V812.5H62.5V875zM875 750H812.5V250H875V750zM704.5 475.8125A147.06250000000003 147.06250000000003 0 0 1 682 524.9375A109.125 109.125 0 0 1 643.9375 558.0625A114.5 114.5 0 0 1 589.8125000000001 570.125C577.4375 570.125 566.0625 568.625 555.625 565.5624999999999A109.99999999999999 109.99999999999999 0 0 1 527.3125000000001 552.7499999999999A107.75 107.75 0 0 1 504.5000000000001 532.875L493.3125000000001 516.75V713.875H437.5V250H493.3125V285.9375L501.1875 274.9999999999999C506.625 268.6249999999999 513 263.1249999999999 520.1875 258.1874999999999C527.5000000000001 253.3124999999999 535.7500000000001 249.4374999999999 545.0625 246.5624999999999C554.375 243.6875 564.6875 242.3124999999999 576.1875 242.3124999999999C598.25 242.3124999999999 617.8125 246.7499999999999 634.7499999999999 255.5624999999999C651.7499999999999 264.5 665.9375 276.6874999999999 677.375 292.1874999999999C688.8124999999999 307.8124999999999 697.4374999999999 326.1249999999999 703.2499999999999 347.1249999999999C709.0624999999999 368.2499999999999 712 391.0624999999999 712 415.6874999999999A234.74999999999997 234.74999999999997 0 0 1 704.5 475.8124999999999zM612.0625 513.75C621.4999999999999 509.3125 629.6875 502.75 636.4375 494.1250000000001C643.25 485.375 648.5625 474.5625 652.375 461.8125000000001C655.5625 450.9375000000001 657.5000000000001 438.625 657.9375000000001 425.1250000000001L657.5000000000001 417.3125000000001C657.5000000000001 396.8750000000001 655.4375000000001 378.5625000000001 651.2500000000001 363.0000000000001A117.87500000000001 117.87500000000001 0 0 0 633.8750000000001 324.625C626.5625 314.5 617.6250000000001 306.8125 607.5625000000001 301.7500000000001C587.4375000000001 291.625 560.0625000000001 291.375 540.7500000000001 300.8125A79 79 0 0 0 516.1875 319.3125A79.5625 79.5625 0 0 0 502.5625 342.25S491.375 370.1874999999999 491.375 401.4374999999999C491.375 432.6874999999999 502.5625 464.0624999999999 502.5625 464.0624999999999C506.4375 475.1249999999999 511.0625 483.9374999999999 516.5625 490.9374999999999C523.6875000000001 499.8749999999999 532.5625 507.1249999999999 543.0625 512.4999999999999C553.5625 517.875 565.875 520.5625 579.75 520.5625C591.625 520.5625 602.5 518.25 612.0625 513.75zM937.5 187.5H62.5V125H937.5V187.5zM175.8125 375L130.3125 248.0625H62.5L64.0625 252.5624999999999L216.625 695.4375H275.4375L430.75 248.0624999999999H363.125L314.5 375H175.8125zM245.875 598.625H244.5000000000001L187.9375 426.5625H303.0000000000001L245.8750000000001 598.625z">
+                            <Path.RenderTransform>
+                                <ScaleTransform ScaleY="-1"/>
+                            </Path.RenderTransform>
+                        </Path>
+                        <ToggleButton.Style>
+                            <Style BasedOn="{StaticResource AIStudio.Mind.Styles.Button.Flat}" TargetType="{x:Type ToggleButton}">
+                                <Setter Property="Background" Value="Transparent"/>
+                                <Style.Triggers>
+                                    <Trigger Property="IsChecked" Value="True">
+                                        <Trigger.Setters>
+                                            <Setter Property="Background" Value="#cce4f7" />
+                                        </Trigger.Setters>
+                                    </Trigger>
+                                </Style.Triggers>
+                            </Style>
+                        </ToggleButton.Style>
+                    </ToggleButton>
+                    <TextBlock Grid.Column="1" Margin="2,0,0,0" VerticalAlignment="Center" Text="{Binding PageViewModel.DiagramViewModel.SearchInfo}"/>
+                </StackPanel>
+            </Grid>
+        </Grid>
+    </Border>
+</UserControl>

AIStudio.Wpf.DiagramApp/Views/SearchControl.xaml.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -12,14 +13,14 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace AIStudio.Wpf.DiagramDesigner.Test
+namespace AIStudio.Wpf.DiagramApp.Views
 {
     /// <summary>
-    /// Interaction logic for ToolBoxControl.xaml
+    /// SearchControl.xaml 的交互逻辑
     /// </summary>
-    public partial class ToolBoxControl : UserControl
+    public partial class SearchControl : UserControl
     {
-        public ToolBoxControl()
+        public SearchControl()
         {
             InitializeComponent();
         }

AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml

@@ -9,331 +9,473 @@
              xmlns:flowchartmodel="clr-namespace:AIStudio.Wpf.Flowchart.Models;assembly=AIStudio.Wpf.Flowchart"
              xmlns:sfcmodel="clr-namespace:AIStudio.Wpf.SFC.Models;assembly=AIStudio.Wpf.SFC"
              xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram" 
-             xmlns:conventer="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters;assembly=AIStudio.Wpf.DiagramHelper"
-             xmlns:command="clr-namespace:AIStudio.Wpf.DiagramHelper.Commands;assembly=AIStudio.Wpf.DiagramHelper"
-             xmlns:svg="clr-namespace:Svg2XamlTestExtension;assembly=Svg2XamlTestExtension"
+             xmlns:drop="urn:gong-wpf-dragdrop"   
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:conventer="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Converters;assembly=AIStudio.Wpf.DiagramDesigner.Additionals"
+             xmlns:command="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Commands;assembly=AIStudio.Wpf.DiagramDesigner.Additionals"
+             xmlns:svg="https://gitee.com/akwkevin/aistudio.-wpf.-test/tree/master/Controls/AIStudio.Wpf.Svg2XamlExtension"
+             xmlns:binding="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Commands;assembly=AIStudio.Wpf.DiagramDesigner.Additionals"
+             xmlns:Fluent="urn:fluent-ribbon"
+             xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <UserControl.Resources>
         <ResourceDictionary>
-            <conventer:StringPathConverter x:Key="stringPathConverter"/>
-            <conventer:IntVisibilityConverter x:Key="IntVisibilityConverter"/>
-            <dd:EnumDescriptionConverter x:Key="EnumDescriptionConverter"/>
-            <command:CommandReference x:Key="DeleteItemCommandReference" Command="{Binding DeleteItemCommand}"/>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <conventer:StringPathConverter x:Key="stringPathConverter"/>
+                    <conventer:IntVisibilityConverter x:Key="IntVisibilityConverter"/>
+                    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+                    <dd:EnumDescriptionConverter x:Key="EnumDescriptionConverter"/>
+                    <command:CommandReference x:Key="DeleteItemCommandReference" Command="{Binding ToolBoxViewModel.DeleteItemCommand}"/>
+                    <dd:MathConverter x:Key="MathAddConverter" Operation="Add" />
+      
 
-
-            <DataTemplate DataType="{x:Type model:ImageToolBoxData}">
-                <Grid Width="{Binding Width}" Height="{Binding Height}">
-                    <Rectangle Name="Border"
-                                   StrokeThickness="1"
-                                   StrokeDashArray="2"
-                                   Fill="Transparent"
-                                   SnapsToDevicePixels="true"/>
-                    <Image IsHitTestVisible="True"
-                                       Stretch="Fill"
-                                       Margin="2"
-                                       Source="{Binding Icon, Converter={x:Static dd:ImageUrlConverter.Instance}}" />
-                </Grid>
-                <DataTemplate.Triggers>
-                    <Trigger Property="IsMouseOver" Value="true">
-                        <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
-                    </Trigger>
-                </DataTemplate.Triggers>
-            </DataTemplate>
-            <DataTemplate DataType="{x:Type model:MediaToolBoxData}">
-                <Grid Width="{Binding Width}" Height="{Binding Height}">
-                    <Rectangle Name="Border"
-                                   StrokeThickness="1"
-                                   StrokeDashArray="2"
-                                   Fill="Transparent"
-                                   SnapsToDevicePixels="true"/>
-                    <Image IsHitTestVisible="True"
-                                       Stretch="Fill"
-                                       Margin="2"
-                                       Source="{Binding Text, Converter={x:Static dd:ImageUrlConverter.Instance}}" />
-                </Grid>
-                <DataTemplate.Triggers>
-                    <Trigger Property="IsMouseOver" Value="true">
-                        <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
-                    </Trigger>
-                </DataTemplate.Triggers>
-            </DataTemplate>
-            <DataTemplate DataType="{x:Type model:TextToolBoxData}">
-                <Grid Width="{Binding Width}" Height="{Binding Height}">
-                    <Rectangle Name="Border"
-                                   StrokeThickness="1"
-                                   StrokeDashArray="2"
-                                   Fill="Transparent"
-                                   SnapsToDevicePixels="true"/>
-                    <Rectangle Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}" Margin="2"/>
-                    <TextBlock Text="{Binding Text}" FontSize="11" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                </Grid>
-                <DataTemplate.Triggers>
-                    <Trigger Property="IsMouseOver" Value="true">
-                        <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
-                    </Trigger>
-                </DataTemplate.Triggers>
-            </DataTemplate>
-            <DataTemplate DataType="{x:Type model:EllipseTextToolBoxData}">
-                <Grid Width="{Binding Width}" Height="{Binding Height}">
-                    <Ellipse Name="Border"
-                                   StrokeThickness="1"
-                                   StrokeDashArray="2"
-                                   Fill="Transparent"
-                                   SnapsToDevicePixels="true"/>
-                    <Ellipse Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}" Margin="2"/>
-                    <TextBlock Text="{Binding Text}" FontSize="11" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                </Grid>
-                <DataTemplate.Triggers>
-                    <Trigger Property="IsMouseOver" Value="true">
-                        <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
-                    </Trigger>
-                </DataTemplate.Triggers>
-            </DataTemplate>
-            <DataTemplate DataType="{x:Type model:PathToolBoxData}">
-                <Grid Width="{Binding Width}" Height="{Binding Height}">
-                    <Rectangle Name="Border"
-                                   StrokeThickness="1"
-                                   StrokeDashArray="2"
-                                   Fill="Transparent"
-                                   SnapsToDevicePixels="true"/>
-                    <Path Style="{StaticResource PathItemStyle}" ToolTip="Document" Margin="2"/>
-                </Grid>
-                <DataTemplate.Triggers>
-                    <Trigger Property="IsMouseOver" Value="true">
-                        <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
-                    </Trigger>
-                </DataTemplate.Triggers>
-            </DataTemplate>
-            <DataTemplate DataType="{x:Type model:SvgToolBoxData}">
-                <Grid Width="{Binding Width}" Height="{Binding Height}">
-                    <Rectangle Name="Border"
-                                   StrokeThickness="1"
-                                   StrokeDashArray="2"
-                                   Fill="Transparent"
-                                   SnapsToDevicePixels="true"/>
-                    <svg:PackSvg Width="Auto" Height="Auto" Path="{Binding Icon}" Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"/>
-                </Grid>
-                <DataTemplate.Triggers>
-                    <Trigger Property="IsMouseOver" Value="true">
-                        <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
-                    </Trigger>
-                </DataTemplate.Triggers>
-            </DataTemplate>
-            <DataTemplate DataType="{x:Type model:DesignerItemToolBoxData}">
-                <Grid Width="{Binding Width}" Height="{Binding Height}">
-                    <Grid.ContextMenu>
-                        <ContextMenu>
-                            <MenuItem Header="删除" Command="{StaticResource DeleteItemCommandReference}" CommandParameter="{Binding .}"/>
-                        </ContextMenu>
-                    </Grid.ContextMenu>
-                    <Rectangle Name="Border"
-                                   StrokeThickness="1"
-                                   StrokeDashArray="2"
-                                   Fill="Transparent"
-                                   SnapsToDevicePixels="true"/>
-                    <Viewbox Stretch="Uniform" DataContext="{Binding DesignerItemViewModel}">
-                        <Grid  Width="{Binding ItemWidth}" Height="{Binding ItemHeight}" IsHitTestVisible="False">
-                            <ContentControl Content="{Binding .}" Margin="2"/>
-                            <TextBox Text="{Binding Text}" 
-                                       IsReadOnly="True"
-                                       TextWrapping="Wrap"
-                                       Background ="Transparent"
-                                       BorderThickness="0"
-                                       Margin="5" 
-                                       Foreground="{Binding FontViewModel.FontColor,Converter={StaticResource ColorBrushConverter}}"
-                                       FontSize="{Binding FontViewModel.FontSize}" 
-                                       FontFamily="{Binding FontViewModel.FontFamily}"  
-                                       FontWeight="{Binding FontViewModel.FontWeight}"
-                                       FontStyle="{Binding FontViewModel.FontStyle}"                         
-                                       FontStretch="{Binding FontViewModel.FontStretch}"
-                                       TextDecorations="{Binding FontViewModel.TextDecorations}"
-                                       HorizontalContentAlignment="{Binding FontViewModel.HorizontalAlignment}"
-                                       VerticalContentAlignment="{Binding FontViewModel.VerticalAlignment}"
-                                       TextBlock.LineHeight="{Binding FontViewModel.LineHeight}"/>
+                    <DataTemplate DataType="{x:Type model:ImageToolBoxData}">
+                        <Grid Width="{Binding Width}" Height="{Binding Height}" ToolTip="{Binding Description}">
+                            <Rectangle Name="Border"
+                            StrokeThickness="1"
+                            StrokeDashArray="2"
+                            Fill="Transparent"
+                            SnapsToDevicePixels="true"/>
+                            <Image IsHitTestVisible="True"
+                                Stretch="Fill"
+                                Margin="2"
+                                Source="{Binding Icon, Converter={x:Static dd:ImageUrlConverter.Instance}}" />
                         </Grid>
-                    </Viewbox>
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
+                            </Trigger>
+                        </DataTemplate.Triggers>
+                    </DataTemplate>
+                    <DataTemplate DataType="{x:Type model:MediaToolBoxData}">
+                        <Grid Width="{Binding Width}" Height="{Binding Height}" ToolTip="{Binding Description}">
+                            <Rectangle Name="Border"
+                            StrokeThickness="1"
+                            StrokeDashArray="2"
+                            Fill="Transparent"
+                            SnapsToDevicePixels="true"/>
+                            <Image IsHitTestVisible="True"
+                                Stretch="Fill"
+                                Margin="2"
+                                Source="{Binding Text, Converter={x:Static dd:ImageUrlConverter.Instance}}" />
+                        </Grid>
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
+                            </Trigger>
+                        </DataTemplate.Triggers>
+                    </DataTemplate>
+                    <DataTemplate DataType="{x:Type model:TextToolBoxData}">
+                        <Grid Width="{Binding Width}" Height="{Binding Height}" ToolTip="{Binding Description}">
+                            <Rectangle Name="Border"
+                            StrokeThickness="1"
+                            StrokeDashArray="2"
+                            Fill="Transparent"
+                            SnapsToDevicePixels="true"/>
+                            <Rectangle Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}" Margin="2"/>
+                            <TextBlock Text="{Binding Text}" FontSize="11" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Grid>
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
+                            </Trigger>
+                        </DataTemplate.Triggers>
+                    </DataTemplate>
+                    <DataTemplate DataType="{x:Type model:EllipseTextToolBoxData}">
+                        <Grid Width="{Binding Width}" Height="{Binding Height}" ToolTip="{Binding Description}">
+                            <Ellipse Name="Border"
+                            StrokeThickness="1"
+                            StrokeDashArray="2"
+                            Fill="Transparent"
+                            SnapsToDevicePixels="true"/>
+                            <Ellipse Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}" Margin="2"/>
+                            <TextBlock Text="{Binding Text}" FontSize="11" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Grid>
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
+                            </Trigger>
+                        </DataTemplate.Triggers>
+                    </DataTemplate>
+                    <DataTemplate DataType="{x:Type model:PathToolBoxData}">
+                        <Grid Width="{Binding Width}" Height="{Binding Height}" ToolTip="{Binding Description}">
+                            <Rectangle Name="Border"
+                            StrokeThickness="1"
+                            StrokeDashArray="2"
+                            Fill="Transparent"
+                            SnapsToDevicePixels="true"/>
+                            <Path Style="{StaticResource PathItemStyle}" ToolTip="Document" Margin="2"/>
+                        </Grid>
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
+                            </Trigger>
+                        </DataTemplate.Triggers>
+                    </DataTemplate>
+                    <DataTemplate DataType="{x:Type model:SvgToolBoxData}">
+                        <Grid Width="{Binding Width}" Height="{Binding Height}" ToolTip="{Binding Description}">
+                            <Rectangle Name="Border"
+                            StrokeThickness="1"
+                            StrokeDashArray="2"
+                            Fill="Transparent"
+                            SnapsToDevicePixels="true"/>
+                            <svg:PackSvg Width="Auto" Height="Auto" Path="{Binding Icon}" Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"/>
+                        </Grid>
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
+                            </Trigger>
+                        </DataTemplate.Triggers>
+                    </DataTemplate>
+                    <DataTemplate DataType="{x:Type model:DesignerItemToolBoxData}">
+                        <Grid Width="{Binding Width}" Height="{Binding Height}" ToolTip="{Binding Description}">
+                            <Grid.ContextMenu>
+                                <ContextMenu>
+                                    <MenuItem Header="删除" Command="{StaticResource DeleteItemCommandReference}" CommandParameter="{Binding .}"/>
+                                </ContextMenu>
+                            </Grid.ContextMenu>
+                            <Rectangle Name="Border"
+                            StrokeThickness="1"
+                            StrokeDashArray="2"
+                            Fill="Transparent"
+                            SnapsToDevicePixels="true"/>
+                            <Viewbox Stretch="Uniform" DataContext="{Binding DesignerItemViewModel}" Margin="2">
+                                <Grid  Width="{Binding ItemWidth}" Height="{Binding ItemHeight}" IsHitTestVisible="False">
+                                    <ContentControl Content="{Binding .}" />
+                                    <TextBox Text="{Binding Text}" 
+                                IsReadOnly="True"
+                                TextWrapping="Wrap"
+                                Background ="Transparent"
+                                BorderThickness="0"
+                                Margin="5" 
+                                Foreground="{Binding FontViewModel.FontColor,Converter={StaticResource ColorBrushConverter}}"
+                                FontSize="{Binding FontViewModel.FontSize}" 
+                                FontFamily="{Binding FontViewModel.FontFamily}"  
+                                FontWeight="{Binding FontViewModel.FontWeight}"
+                                FontStyle="{Binding FontViewModel.FontStyle}"                         
+                                FontStretch="{Binding FontViewModel.FontStretch}"
+                                TextDecorations="{Binding FontViewModel.TextDecorations}"
+                                HorizontalContentAlignment="{Binding FontViewModel.HorizontalAlignment}"
+                                VerticalContentAlignment="{Binding FontViewModel.VerticalAlignment}"
+                                TextBlock.LineHeight="{Binding FontViewModel.LineHeight}"/>
+                                </Grid>
+                            </Viewbox>
 
-                </Grid>
-                <DataTemplate.Triggers>
-                    <Trigger Property="IsMouseOver" Value="true">
-                        <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
-                    </Trigger>
-                </DataTemplate.Triggers>
-            </DataTemplate>
-            <DataTemplate DataType="{x:Type flowchartmodel:FlowchartToolBoxData}">
-                <Grid Width="{Binding Width}" Height="{Binding Height}">
-                    <Rectangle Name="Border"
-                                   StrokeThickness="1"
-                                   StrokeDashArray="2"
-                                   Fill="Transparent"
-                                   SnapsToDevicePixels="true"/>
-                    <Grid IsHitTestVisible="False">
-                        <ContentControl Style="{StaticResource CustomFlowNodeStyle}" Margin="2"/>
-                        <TextBlock Text="{Binding Text}" Margin="5" TextWrapping="WrapWithOverflow" FontSize="9" Foreground="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                    </Grid>
-                </Grid>
-                <DataTemplate.Triggers>
-                    <Trigger Property="IsMouseOver" Value="true">
-                        <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
-                    </Trigger>
-                </DataTemplate.Triggers>
-            </DataTemplate>
-            <DataTemplate DataType="{x:Type sfcmodel:SFCToolBoxData}">
-                <Grid Width="{Binding Width}" Height="{Binding Height}" ToolTip="{Binding Kind,Converter={StaticResource EnumDescriptionConverter}}">
-                    <Rectangle Name="Border"
-                                   StrokeThickness="1"
-                                   StrokeDashArray="2"
-                                   Fill="Transparent"
-                                   SnapsToDevicePixels="true"/>
-                    <Grid IsHitTestVisible="False">
-                        <ContentControl Style="{StaticResource CustomSFCNodeStyle}" Margin="2" />
-                    </Grid>
-                </Grid>
-                <DataTemplate.Triggers>
-                    <Trigger Property="IsMouseOver" Value="true">
-                        <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
-                    </Trigger>
-                </DataTemplate.Triggers>
-            </DataTemplate>
-            <DataTemplate DataType="{x:Type viewmodels:ToolBoxCategory}">
-                <Grid Visibility="{Binding IsChecked,Converter={StaticResource boolToVisibilityConverter}}">
-                    <Expander Header="{Binding Header}" 
-                                                  IsExpanded="{Binding IsExpanded}" 
-                                                  BorderThickness="0" 
-                                                  Background="Transparent" 
-                                                  Foreground="{DynamicResource Fluent.Ribbon.Brushes.LabelTextBrush}" 
-                                                  Style="{StaticResource DefaultAnimationExpander}">
-                        <ItemsControl  ItemsSource="{Binding ToolBoxItems}">
-                            <ItemsControl.Template>
-                                <ControlTemplate TargetType="{x:Type ItemsControl}">
-                                    <Border BorderThickness="{TemplateBinding Border.BorderThickness}"
-                                                    Padding="{TemplateBinding Control.Padding}"
-                                                    BorderBrush="{TemplateBinding Border.BorderBrush}"
-                                                    Background="{TemplateBinding Panel.Background}"
-                                                    SnapsToDevicePixels="True">
-                                        <ScrollViewer VerticalScrollBarVisibility="Auto">
-                                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
-                                        </ScrollViewer>
+                        </Grid>
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
+                            </Trigger>
+                        </DataTemplate.Triggers>
+                    </DataTemplate>
+                    <DataTemplate DataType="{x:Type model:MultipleDesignerItemToolBoxData}">
+                        <Grid Width="{Binding Width}" Height="{Binding Height}" ToolTip="{Binding Description}">
+                            <Grid.ContextMenu>
+                                <ContextMenu>
+                                    <MenuItem Header="删除" Command="{StaticResource DeleteItemCommandReference}" CommandParameter="{Binding .}"/>
+                                </ContextMenu>
+                            </Grid.ContextMenu>
+                            <Rectangle Name="Border"
+                            StrokeThickness="1"
+                            StrokeDashArray="2"
+                            Fill="Transparent"
+                            SnapsToDevicePixels="true"/>
+                            <Viewbox Stretch="Uniform" Margin="2">
+                                <ItemsControl ItemsSource="{Binding SelectableDesignerItemViewModels}" 
+              Width="{Binding CanvasWidth}"
+              Height="{Binding CanvasHeight}">
+                                    <ItemsControl.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <Canvas x:Name="rootCanvas"/>
+                                        </ItemsPanelTemplate>
+                                    </ItemsControl.ItemsPanel>
+                                    <ItemsControl.Template>
+                                        <ControlTemplate TargetType="{x:Type ItemsControl}">
+                                            <Grid>
+                                                <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                                                    <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                                </Border>
+                                            </Grid>
+                                        </ControlTemplate>
+                                    </ItemsControl.Template>
+                                    <ItemsControl.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid  Width="{Binding ItemWidth}" Height="{Binding ItemHeight}" IsHitTestVisible="False">
+                                                <ContentControl Content="{Binding .}" Margin="2"/>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                    <ItemsControl.ItemContainerStyle>
+                                        <Style>
+                                            <Setter Property="Canvas.Left" Value="{Binding Left}" />
+                                            <Setter Property="Canvas.Top" Value="{Binding Top}" />
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding IsConnection}" Value="True">
+                                                    <Setter Property="Canvas.Left" Value="{Binding Area.Left}" />
+                                                    <Setter Property="Canvas.Top" Value="{Binding Area.Top}" />
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </ItemsControl.ItemContainerStyle>
+                                    <ItemsControl.Resources>
+                                        <DataTemplate DataType="{x:Type dd:ConnectionViewModel}">
+                                            <Grid>
+                                                <dd:LineControl x:Name="line"/>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ItemsControl.Resources>
+                                </ItemsControl>
+                            </Viewbox>
+
+                        </Grid>
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
+                            </Trigger>
+                        </DataTemplate.Triggers>
+                    </DataTemplate>
+                    <DataTemplate DataType="{x:Type flowchartmodel:FlowchartToolBoxData}">
+                        <Grid Width="{Binding Width}" Height="{Binding Height}" ToolTip="{Binding Description}">
+                            <Rectangle Name="Border"
+                            StrokeThickness="1"
+                            StrokeDashArray="2"
+                            Fill="Transparent"
+                            SnapsToDevicePixels="true"/>
+                            <Grid IsHitTestVisible="False">
+                                <ContentControl Style="{StaticResource CustomFlowNodeStyle}" Margin="2"/>
+                                <TextBlock Text="{Binding Text}" Margin="5" TextWrapping="WrapWithOverflow" FontSize="9" Foreground="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Grid>
+                        </Grid>
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
+                            </Trigger>
+                        </DataTemplate.Triggers>
+                    </DataTemplate>
+                    <DataTemplate DataType="{x:Type sfcmodel:SFCToolBoxData}">
+                        <Grid Width="{Binding Width}" Height="{Binding Height}" ToolTip="{Binding Kind,Converter={StaticResource EnumDescriptionConverter}}">
+                            <Rectangle Name="Border"
+                            StrokeThickness="1"
+                            StrokeDashArray="2"
+                            Fill="Transparent"
+                            SnapsToDevicePixels="true"/>
+                            <Grid IsHitTestVisible="False">
+                                <ContentControl Style="{StaticResource CustomSFCNodeStyle}" Margin="2" />
+                            </Grid>
+                        </Grid>
+                        <DataTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="Border" Property="Stroke" Value="Gray"/>
+                            </Trigger>
+                        </DataTemplate.Triggers>
+                    </DataTemplate>
+                    <DataTemplate DataType="{x:Type dd:ToolBoxCategory}">
+                        <Grid Visibility="{Binding IsChecked,Converter={StaticResource boolToVisibilityConverter}}">
+                            <Expander Header="{Binding Header}" 
+                                           IsExpanded="{Binding IsExpanded}" 
+                                           BorderThickness="0" 
+                                           Background="Transparent" 
+                                           Foreground="{DynamicResource Fluent.Ribbon.Brushes.LabelTextBrush}" 
+                                           Style="{StaticResource AIStudio.DiagramApp.Styles.Expander}">
+                                <ItemsControl  ItemsSource="{Binding ToolBoxItems}">
+                                    <ItemsControl.Template>
+                                        <ControlTemplate TargetType="{x:Type ItemsControl}">
+                                            <Border BorderThickness="{TemplateBinding Border.BorderThickness}"
+                                             Padding="{TemplateBinding Control.Padding}"
+                                             BorderBrush="{TemplateBinding Border.BorderBrush}"
+                                             Background="{TemplateBinding Panel.Background}"
+                                             SnapsToDevicePixels="True">
+                                                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                                                    <ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
+                                                </ScrollViewer>
+                                            </Border>
+                                        </ControlTemplate>
+                                    </ItemsControl.Template>
+                                    <ItemsControl.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <WrapPanel Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ItemsControl}}, Path=ActualWidth}"/>
+                                        </ItemsPanelTemplate>
+                                    </ItemsControl.ItemsPanel>
+                                    <ItemsControl.ItemContainerStyle>
+                                        <Style TargetType="{x:Type ContentPresenter}">
+                                            <Setter Property="Control.Padding"
+                             Value="10" />
+                                            <Setter Property="ContentControl.HorizontalContentAlignment"
+                             Value="Stretch" />
+                                            <Setter Property="ContentControl.VerticalContentAlignment"
+                             Value="Stretch" />
+                                            <Setter Property="ToolTip"
+                             Value="{Binding ToolTip}" />
+                                            <Setter Property="dd:DragAndDropProps.EnabledForDrag"
+                             Value="True" />
+                                        </Style>
+                                    </ItemsControl.ItemContainerStyle>
+                                </ItemsControl>
+                            </Expander>
+                            <Button Margin="5" ToolTip="移除" Command="{Binding DataContext.ToolBoxViewModel.DeleteCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding .}" Width="16" Height="16" HorizontalAlignment="Right" VerticalAlignment="Top" Foreground="{DynamicResource BlackBrush}" Background="{DynamicResource WhiteBrush}" BorderBrush="Transparent">
+                                <Path Stretch="Fill" Margin="2" Fill="Red" Data="M0.7,0 L5,4.3 L9.3,0 L10,0.7 L5.7,5 L10,9.3 L9.3,10 L5,5.7 L0.7,10 L0,9.3 L4.3,5 L0,0.7 z" ></Path>
+                            </Button>
+                        </Grid>
+                    </DataTemplate>
+
+                    <DataTemplate DataType="{x:Type viewmodels:MineToolBoxCategory}">
+                        <Grid Visibility="{Binding IsChecked,Converter={StaticResource boolToVisibilityConverter}}">
+                            <Expander Header="{Binding Header}" 
+                                           IsExpanded="{Binding IsExpanded}" 
+                                           BorderThickness="0" 
+                                           Background="Transparent" 
+                                           Foreground="{DynamicResource Fluent.Ribbon.Brushes.LabelTextBrush}" 
+                                           Style="{StaticResource AIStudio.DiagramApp.Styles.Expander}">
+                                <Grid>
+                                    <Border BorderThickness="1" CornerRadius="5" Margin="5" Padding="10" Visibility="{Binding ToolBoxItems.Count, Converter={StaticResource IntVisibilityConverter}, ConverterParameter='0'}">
+                                        <Border.BorderBrush>
+                                            <LinearGradientBrush SpreadMethod="Repeat" StartPoint="0,5" EndPoint="5,0" MappingMode="Absolute">
+                                                <LinearGradientBrush.GradientStops>
+                                                    <GradientStop Color="{DynamicResource Fluent.Ribbon.Colors.AccentBaseColor}" Offset="0"/>
+                                                    <GradientStop Color="{DynamicResource Fluent.Ribbon.Colors.AccentBaseColor}" Offset="0.2"/>
+                                                    <GradientStop Color="Transparent" Offset="0.4"/>
+                                                    <GradientStop Color="Transparent" Offset="0.6"/>
+                                                    <GradientStop Color="{DynamicResource Fluent.Ribbon.Colors.AccentBaseColor}" Offset="0.8"/>
+                                                    <GradientStop Color="{DynamicResource Fluent.Ribbon.Colors.AccentBaseColor}" Offset="1"/>
+                                                </LinearGradientBrush.GradientStops>
+                                            </LinearGradientBrush>
+                                        </Border.BorderBrush>
+
+                                        <TextBlock Text="添加形状到我的符号" HorizontalAlignment="Center" Foreground="{DynamicResource GrayBrush2}"/>
                                     </Border>
-                                </ControlTemplate>
-                            </ItemsControl.Template>
-                            <ItemsControl.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <WrapPanel Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ItemsControl}}, Path=ActualWidth}"/>
-                                </ItemsPanelTemplate>
-                            </ItemsControl.ItemsPanel>
-                            <ItemsControl.ItemContainerStyle>
-                                <Style TargetType="{x:Type ContentPresenter}">
-                                    <Setter Property="Control.Padding"
-                                    Value="10" />
-                                    <Setter Property="ContentControl.HorizontalContentAlignment"
-                                    Value="Stretch" />
-                                    <Setter Property="ContentControl.VerticalContentAlignment"
-                                    Value="Stretch" />
-                                    <Setter Property="ToolTip"
-                                    Value="{Binding ToolTip}" />
-                                    <Setter Property="dd:DragAndDropProps.EnabledForDrag"
-                                    Value="True" />
-                                </Style>
-                            </ItemsControl.ItemContainerStyle>
-                        </ItemsControl>
-                    </Expander>
-                    <Button Margin="5" ToolTip="移除" Command="{Binding DataContext.DeleteCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding .}" Width="16" Height="16" HorizontalAlignment="Right" VerticalAlignment="Top" Foreground="{DynamicResource BlackBrush}" Background="{DynamicResource WhiteBrush}" BorderBrush="Transparent">
-                        <Path Stretch="Fill" Margin="2" Fill="Red" Data="M0.7,0 L5,4.3 L9.3,0 L10,0.7 L5.7,5 L10,9.3 L9.3,10 L5,5.7 L0.7,10 L0,9.3 L4.3,5 L0,0.7 z" ></Path>
-                    </Button>
-                </Grid>
-            </DataTemplate>
-
-            <DataTemplate DataType="{x:Type viewmodels:MineToolBoxCategory}">
-                <Grid Visibility="{Binding IsChecked,Converter={StaticResource boolToVisibilityConverter}}">
-                    <Expander Header="{Binding Header}" 
-                                                  IsExpanded="{Binding IsExpanded}" 
-                                                  BorderThickness="0" 
-                                                  Background="Transparent" 
-                                                  Foreground="{DynamicResource Fluent.Ribbon.Brushes.LabelTextBrush}" 
-                                                  Style="{StaticResource DefaultAnimationExpander}">
-                        <Grid>
-                            <Border BorderThickness="1" CornerRadius="5" Margin="5" Padding="10" Visibility="{Binding ToolBoxItems.Count, Converter={StaticResource IntVisibilityConverter}, ConverterParameter='0'}">
-                                <Border.BorderBrush>
-                                    <LinearGradientBrush SpreadMethod="Repeat" StartPoint="0,5" EndPoint="5,0" MappingMode="Absolute">
-                                        <LinearGradientBrush.GradientStops>
-                                            <GradientStop Color="{DynamicResource Fluent.Ribbon.Colors.AccentBaseColor}" Offset="0"/>
-                                            <GradientStop Color="{DynamicResource Fluent.Ribbon.Colors.AccentBaseColor}" Offset="0.2"/>
-                                            <GradientStop Color="Transparent" Offset="0.4"/>
-                                            <GradientStop Color="Transparent" Offset="0.6"/>
-                                            <GradientStop Color="{DynamicResource Fluent.Ribbon.Colors.AccentBaseColor}" Offset="0.8"/>
-                                            <GradientStop Color="{DynamicResource Fluent.Ribbon.Colors.AccentBaseColor}" Offset="1"/>
-                                        </LinearGradientBrush.GradientStops>
-                                    </LinearGradientBrush>
-                                </Border.BorderBrush>
-
-                                <TextBlock Text="添加形状到我的符号" HorizontalAlignment="Center" Foreground="{DynamicResource GrayBrush2}"/>
-                            </Border>
-                            <ItemsControl  ItemsSource="{Binding ToolBoxItems}">
-                                <ItemsControl.Template>
-                                    <ControlTemplate TargetType="{x:Type ItemsControl}">
-                                        <Border BorderThickness="{TemplateBinding Border.BorderThickness}"
-                                                    Padding="{TemplateBinding Control.Padding}"
-                                                    BorderBrush="{TemplateBinding Border.BorderBrush}"
-                                                    Background="{TemplateBinding Panel.Background}"
-                                                    SnapsToDevicePixels="True">
-                                            <ScrollViewer VerticalScrollBarVisibility="Auto">
-                                                <ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
-                                            </ScrollViewer>
-                                        </Border>
-                                    </ControlTemplate>
-                                </ItemsControl.Template>
-                                <ItemsControl.ItemsPanel>
-                                    <ItemsPanelTemplate>
-                                        <WrapPanel Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ItemsControl}}, Path=ActualWidth}"/>
-                                    </ItemsPanelTemplate>
-                                </ItemsControl.ItemsPanel>
-                                <ItemsControl.ItemContainerStyle>
-                                    <Style TargetType="{x:Type ContentPresenter}">
-                                        <Setter Property="Control.Padding"
-                                    Value="10" />
-                                        <Setter Property="ContentControl.HorizontalContentAlignment"
-                                    Value="Stretch" />
-                                        <Setter Property="ContentControl.VerticalContentAlignment"
-                                    Value="Stretch" />
-                                        <Setter Property="ToolTip"
-                                    Value="{Binding ToolTip}" />
-                                        <Setter Property="dd:DragAndDropProps.EnabledForDrag"
-                                    Value="True" />
-                                    </Style>
-                                </ItemsControl.ItemContainerStyle>
-                            </ItemsControl>
+                                    <ItemsControl  ItemsSource="{Binding ToolBoxItems}">
+                                        <ItemsControl.Template>
+                                            <ControlTemplate TargetType="{x:Type ItemsControl}">
+                                                <Border BorderThickness="{TemplateBinding Border.BorderThickness}"
+                                             Padding="{TemplateBinding Control.Padding}"
+                                             BorderBrush="{TemplateBinding Border.BorderBrush}"
+                                             Background="{TemplateBinding Panel.Background}"
+                                             SnapsToDevicePixels="True">
+                                                    <ScrollViewer VerticalScrollBarVisibility="Auto">
+                                                        <ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
+                                                    </ScrollViewer>
+                                                </Border>
+                                            </ControlTemplate>
+                                        </ItemsControl.Template>
+                                        <ItemsControl.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <WrapPanel Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ItemsControl}}, Path=ActualWidth}"/>
+                                            </ItemsPanelTemplate>
+                                        </ItemsControl.ItemsPanel>
+                                        <ItemsControl.ItemContainerStyle>
+                                            <Style TargetType="{x:Type ContentPresenter}">
+                                                <Setter Property="Control.Padding"
+                             Value="10" />
+                                                <Setter Property="ContentControl.HorizontalContentAlignment"
+                             Value="Stretch" />
+                                                <Setter Property="ContentControl.VerticalContentAlignment"
+                             Value="Stretch" />
+                                                <Setter Property="ToolTip"
+                             Value="{Binding ToolTip}" />
+                                                <Setter Property="dd:DragAndDropProps.EnabledForDrag"
+                             Value="True" />
+                                            </Style>
+                                        </ItemsControl.ItemContainerStyle>
+                                    </ItemsControl>
+                                </Grid>
+                            </Expander>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top">
+                                <Button Margin="0,5,2,5" ToolTip="导入到我的符号" Command="{Binding DataContext.ToolBoxViewModel.ImportItemCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" Width="16" Height="16"  Foreground="{DynamicResource BlackBrush}" Background="{DynamicResource WhiteBrush}" BorderBrush="Transparent">
+                                    <Path Stretch="Fill" Margin="2" Fill="{DynamicResource GrayBrush2}" Data="M14,12L10,8V11H2V13H10V16M20,18V6C20,4.89 19.1,4 18,4H6A2,2 0 0,0 4,6V9H6V6H18V18H6V15H4V18A2,2 0 0,0 6,20H18A2,2 0 0,0 20,18Z" ></Path>
+                                </Button>
+                                <Button Margin="0,5,2,5" ToolTip="添加到我的符号" Command="{Binding DataContext.ToolBoxViewModel.AddCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" Width="16" Height="16"  Foreground="{DynamicResource BlackBrush}" Background="{DynamicResource WhiteBrush}" BorderBrush="Transparent">
+                                    <Path Stretch="Fill" Margin="2" Fill="{DynamicResource GrayBrush2}" Data="M938.666667 426.666667h-341.333334V85.333333c0-46.933333-38.4-85.333333-85.333333-85.333333s-85.333333 38.4-85.333333 85.333333v341.333334H85.333333c-46.933333 0-85.333333 38.4-85.333333 85.333333s38.4 85.333333 85.333333 85.333333h341.333334v341.333334c0 46.933333 38.4 85.333333 85.333333 85.333333s85.333333-38.4 85.333333-85.333333v-341.333334h341.333334c46.933333 0 85.333333-38.4 85.333333-85.333333s-38.4-85.333333-85.333333-85.333333z" ></Path>
+                                </Button>
+                                <Button Margin="0,5,5,5" ToolTip="移除" Command="{Binding DataContext.ToolBoxViewModel.DeleteCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding .}" Width="16" Height="16"  Foreground="{DynamicResource BlackBrush}" Background="{DynamicResource WhiteBrush}" BorderBrush="Transparent">
+                                    <Path Stretch="Fill" Margin="2" Fill="Red" Data="M0.7,0 L5,4.3 L9.3,0 L10,0.7 L5.7,5 L10,9.3 L9.3,10 L5,5.7 L0.7,10 L0,9.3 L4.3,5 L0,0.7 z" ></Path>
+                                </Button>
+                            </StackPanel>
                         </Grid>
-                    </Expander>
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top">
-                        <Button Margin="0,5,2,5" ToolTip="导入到我的符号" Command="{Binding DataContext.ImportItemCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" Width="16" Height="16"  Foreground="{DynamicResource BlackBrush}" Background="{DynamicResource WhiteBrush}" BorderBrush="Transparent">
-                            <Path Stretch="Fill" Margin="2" Fill="{DynamicResource GrayBrush2}" Data="M14,12L10,8V11H2V13H10V16M20,18V6C20,4.89 19.1,4 18,4H6A2,2 0 0,0 4,6V9H6V6H18V18H6V15H4V18A2,2 0 0,0 6,20H18A2,2 0 0,0 20,18Z" ></Path>
-                        </Button>
-                        <Button Margin="0,5,2,5" ToolTip="添加到我的符号" Command="{Binding DataContext.AddItemCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" Width="16" Height="16"  Foreground="{DynamicResource BlackBrush}" Background="{DynamicResource WhiteBrush}" BorderBrush="Transparent">
-                            <Path Stretch="Fill" Margin="2" Fill="{DynamicResource GrayBrush2}" Data="M938.666667 426.666667h-341.333334V85.333333c0-46.933333-38.4-85.333333-85.333333-85.333333s-85.333333 38.4-85.333333 85.333333v341.333334H85.333333c-46.933333 0-85.333333 38.4-85.333333 85.333333s38.4 85.333333 85.333333 85.333333h341.333334v341.333334c0 46.933333 38.4 85.333333 85.333333 85.333333s85.333333-38.4 85.333333-85.333333v-341.333334h341.333334c46.933333 0 85.333333-38.4 85.333333-85.333333s-38.4-85.333333-85.333333-85.333333z" ></Path>
-                        </Button>
-                        <Button Margin="0,5,5,5" ToolTip="移除" Command="{Binding DataContext.DeleteCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding .}" Width="16" Height="16"  Foreground="{DynamicResource BlackBrush}" Background="{DynamicResource WhiteBrush}" BorderBrush="Transparent">
-                            <Path Stretch="Fill" Margin="2" Fill="Red" Data="M0.7,0 L5,4.3 L9.3,0 L10,0.7 L5.7,5 L10,9.3 L9.3,10 L5,5.7 L0.7,10 L0,9.3 L4.3,5 L0,0.7 z" ></Path>
-                        </Button>
-                    </StackPanel>
-                </Grid>
-            </DataTemplate>
+                    </DataTemplate>
 
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
+       
     </UserControl.Resources>
     <Grid>
-        <Expander x:Name="expanderLeft" ExpandDirection="Left" IsExpanded="{Binding IsExpanded, RelativeSource={RelativeSource AncestorType=views:ToolBoxControl}}" Style="{StaticResource DefaultAutoHideExpander}" Margin="0,0,1,0">
+        <Expander x:Name="expanderLeft" ExpandDirection="Left" IsExpanded="{Binding IsExpanded, RelativeSource={RelativeSource AncestorType=views:ToolBoxControl}}" Style="{StaticResource AIStudio.DiagramApp.Styles.Expander.AutoHide}" Margin="0,0,1,0">
             <Expander.Header>
                 <DockPanel Height="26">
-                    <ToggleButton DockPanel.Dock="Right" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource AncestorType=views:ToolBoxControl}}" Background="{DynamicResource Fluent.Ribbon.Brushes.AccentBaseColorBrush}" Style="{StaticResource DefaultToggleButton}">
+                    <ToggleButton DockPanel.Dock="Right" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource AncestorType=views:ToolBoxControl}}" Background="{DynamicResource Fluent.Ribbon.Brushes.AccentBaseColorBrush}" Style="{StaticResource AIStudio.DiagramApp.Styles.ToggleButton}">
                         <Path Fill="Black" Stretch="Fill" Width="16" Height="16" Margin="10,3"  Data="M18.41,7.41L17,6L11,12L17,18L18.41,16.59L13.83,12L18.41,7.41M12.41,7.41L11,6L5,12L11,18L12.41,16.59L7.83,12L12.41,7.41Z"/>
                     </ToggleButton>
-                    <TextBlock Text="符号库" DockPanel.Dock="Left" VerticalAlignment="Center"/>
+
+                    <ToggleButton x:Name="shift" HorizontalAlignment="Left" Width="130"  ToolTip="符号库与表单切换">
+                        <ToggleButton.Style>
+                            <Style BasedOn="{StaticResource AIStudio.Mind.Styles.Button.Flat}" TargetType="{x:Type ToggleButton}">
+                                <Setter Property="Content">
+                                    <Setter.Value>
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock Text="符号库" Width="50" TextAlignment="Center" VerticalAlignment="Center"/>
+                                            <Path Width="18" Height="18" Stretch="Uniform" Fill="Black" Data="M234.666667 430.933333H128l85.333333-81.066666L345.6 213.333333l51.2 51.2-81.066667 81.066667H896V426.666667H234.666667v4.266666zM793.6 554.666667H896l-85.333333 81.066666-132.266667 132.266667-51.2-51.2 81.066667-81.066667H128V554.666667h665.6z"></Path>
+                                            <TextBlock Text="页面" Width="50" TextAlignment="Center" VerticalAlignment="Center"/>
+                                        </StackPanel>
+                                    </Setter.Value>
+                                </Setter>
+                                <Style.Triggers>
+                                    <Trigger Property="IsChecked" Value="True">
+                                        <Trigger.Setters>
+                                            <Setter Property="Content">
+                                                <Setter.Value>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <TextBlock Text="页面" Width="50" TextAlignment="Center" VerticalAlignment="Center"/>
+                                                        <Path Width="18" Height="18" Stretch="Uniform" Fill="Black" Data="M234.666667 430.933333H128l85.333333-81.066666L345.6 213.333333l51.2 51.2-81.066667 81.066667H896V426.666667H234.666667v4.266666zM793.6 554.666667H896l-85.333333 81.066666-132.266667 132.266667-51.2-51.2 81.066667-81.066667H128V554.666667h665.6z"></Path>
+                                                        <TextBlock Text="符号库" Width="50" TextAlignment="Center" VerticalAlignment="Center"/>
+                                                    </StackPanel>
+                                                </Setter.Value>
+                                            </Setter>
+                                        </Trigger.Setters>
+                                    </Trigger>
+                                </Style.Triggers>
+                            </Style>
+                        </ToggleButton.Style>
+                    </ToggleButton>
+
                 </DockPanel>
             </Expander.Header>
-            <Border>
-                <Grid x:Name="grid" Width="225" MinWidth="100" MaxWidth="500">
+            <Grid x:Name="grid" Width="225" MinWidth="100" MaxWidth="500">
+                <i:Interaction.Triggers>
+                    <i:DataTrigger Binding="{Binding ElementName=shift,Path=IsChecked}" Value="False">
+                        <i:GoToStateAction StateName="ShowTool" />
+                    </i:DataTrigger>
+                    <i:DataTrigger Binding="{Binding ElementName=shift,Path=IsChecked}" Value="True">
+                        <i:GoToStateAction StateName="ShowPage" />
+                    </i:DataTrigger>
+                </i:Interaction.Triggers>
+                <VisualStateManager.VisualStateGroups>
+                    <VisualStateGroup x:Name="VisualStates">
+                        <VisualState x:Name="ShowTool">
+                            <Storyboard>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="tool" Duration="0">
+                                    <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
+                                </ObjectAnimationUsingKeyFrames>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="page" Duration="0">
+                                    <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Collapsed}" />
+                                </ObjectAnimationUsingKeyFrames>
+                            </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="ShowPage">
+                            <Storyboard>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="tool" Duration="0">
+                                    <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Collapsed}" />
+                                </ObjectAnimationUsingKeyFrames>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="page" Duration="0">
+                                    <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
+                                </ObjectAnimationUsingKeyFrames>
+                            </Storyboard>
+                        </VisualState>
+                    </VisualStateGroup>
+                </VisualStateManager.VisualStateGroups>
+                
+                <Grid x:Name="tool" DataContext="{Binding ToolBoxViewModel}">
                     <Grid.ContextMenu>
                         <ContextMenu ItemsSource="{Binding ToolBoxCategory}">
                             <ContextMenu.ItemContainerStyle>
@@ -355,7 +497,77 @@
                         </ItemsControl>
                     </ScrollViewer>
                 </Grid>
-            </Border>
+
+                <Grid x:Name="page" Visibility="Collapsed">
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+                    <ListBox ItemsSource="{Binding PageViewModel.DiagramViewModels}"
+                                 SelectedItem="{Binding PageViewModel.DiagramViewModel}"
+                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled" 
+                                 BorderBrush="Transparent"
+                                 Padding="0"
+                                 Margin="0,0,3,0"
+                                 Background="Transparent"
+                                 HorizontalContentAlignment="Stretch"
+                                 drop:DragDrop.CanDragWithMouseRightButton="True"
+                                 drop:DragDrop.IsDragSource="True"
+                                 drop:DragDrop.IsDropTarget="True"
+                                 drop:DragDrop.DropTargetAdornerBrush="Coral"
+                                 drop:DragDrop.UseDefaultEffectDataTemplate="True">
+                        <ListBox.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel/>
+                            </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <Grid >
+                                    <Border Margin="3" Height="100" Background="{Binding Thumbnail}" RenderOptions.BitmapScalingMode="HighQuality" BorderThickness="1" BorderBrush="LightGray">
+                                        <Border.ContextMenu>
+                                            <ContextMenu>
+                                                <MenuItem Header="增加页" Command="{binding:ControlBinding PageViewModel.AddPageCommand}" CommandParameter="{Binding .}"/>
+                                                <MenuItem Header="复制页" Command="{binding:ControlBinding PageViewModel.AddCopyPageCommand}" CommandParameter="{Binding .}"/>
+                                                <MenuItem Header="重命名页" Command="{binding:ControlBinding PageViewModel.RenamePageCommand}" CommandParameter="{Binding .}"/>
+                                                <MenuItem Header="删除页" Command="{binding:ControlBinding PageViewModel.DeletePageCommand}" CommandParameter="{Binding .}"/>
+                                            </ContextMenu>
+                                        </Border.ContextMenu>
+                                        <Grid>                                          
+                                            <TextBlock Text="{Binding Name}" HorizontalAlignment="Center" VerticalAlignment="Center" >
+                                                <TextBlock.InputBindings>
+                                                    <MouseBinding MouseAction="LeftDoubleClick" Command="{binding:ControlBinding PageViewModel.RenamePageCommand}" CommandParameter="{Binding .}"/>
+                                                </TextBlock.InputBindings>
+                                            </TextBlock>
+                                            <TextBox x:Name="renametextbox" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Name,UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding IsEditName,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                <TextBox.InputBindings>
+                                                    <KeyBinding Key="Enter"  Command="{binding:ControlBinding PageViewModel.EndRenamePageCommand}" CommandParameter="{Binding .}"/>
+                                                </TextBox.InputBindings>
+                                                <TextBox.Style>
+                                                    <Style TargetType="TextBox">
+                                                        <Style.Triggers>
+                                                            <DataTrigger Binding="{Binding Visibility,ElementName=renametextbox}" Value="Visible">
+                                                                <Setter Property="FocusManager.FocusedElement" Value="{Binding ElementName=renametextbox}"/>
+                                                            </DataTrigger>
+                                                        </Style.Triggers>
+                                                    </Style>
+                                                </TextBox.Style>
+                                                <i:Interaction.Triggers>
+                                                    <i:EventTrigger EventName="LostFocus">
+                                                        <i:InvokeCommandAction Command="{binding:ControlBinding PageViewModel.EndRenamePageCommand}" CommandParameter="{Binding .}" />
+                                                    </i:EventTrigger>
+                                                </i:Interaction.Triggers>
+                                            </TextBox>
+                                        </Grid>
+                                    </Border>
+                                </Grid>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+                    <Fluent:Button Size="Small" Grid.Row="1" HorizontalAlignment="Center" Icon="{iconPacks:Material Kind=Plus}"  Command="{Binding PageViewModel.AddPageCommand}"/>
+                </Grid>
+
+            </Grid>
         </Expander>
         <dd:BorderResizeThumb Width="1" Margin="-3,0,0,0" ResizeElement="{Binding ElementName=grid}" Cursor="SizeWE" HorizontalAlignment="Right" VerticalAlignment="Stretch" Visibility="{Binding IsExpanded, RelativeSource={RelativeSource AncestorType=views:ToolBoxControl},Converter={StaticResource BooleanToVisibilityConverter}}"/>
     </Grid>

AIStudio.Wpf.DiagramDesigner.Additionals/AIStudio.Wpf.DiagramDesigner.Additionals.csproj

@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
+    <Company>AIStudio.Wpf.Controls</Company>
+    <Authors>akwkevin</Authors>
+    <PackageProjectUrl>https://gitee.com/akwkevin</PackageProjectUrl>
+    <PackageIcon>A.png</PackageIcon>
+    <PackageIconUrl />
+    <NeutralLanguage />
+    <Version>1.1.7</Version>
+    <Description>一个Wpf的Diagram控件帮助库</Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Images\Bold.png" />
+    <None Remove="Images\Italic.png" />
+    <None Remove="Images\Underline.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Fluent.Ribbon" Version="8.0.3" />
+    <PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" />
+    <PackageReference Include="AIStudio.Wpf.Svg2XamlExtension" Version="1.2.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="ZXing.Net" Version="0.16.9" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
+  </ItemGroup> 
+
+  <ItemGroup>
+    <None Include="A.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup> 
+
+  <ItemGroup>
+    <Resource Include="Images\Bold.png" />
+    <Resource Include="Images\Italic.png" />
+    <Resource Include="Images\Underline.png" />
+  </ItemGroup> 
+
+</Project>

AIStudio.Wpf.DiagramDesigner.Additionals/AIStudio.Wpf.DiagramDesigner.Additionals_c3dwds1m_wpftmp.csproj

@@ -0,0 +1,309 @@
+<Project>
+  <PropertyGroup>
+    <AssemblyName>AIStudio.Wpf.DiagramDesigner.Additionals</AssemblyName>
+    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+    <MSBuildProjectExtensionsPath>F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\</MSBuildProjectExtensionsPath>
+    <_TargetAssemblyProjectName>AIStudio.Wpf.DiagramDesigner.Additionals</_TargetAssemblyProjectName>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <PropertyGroup>
+    <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
+    <Company>AIStudio.Wpf.Controls</Company>
+    <Authors>akwkevin</Authors>
+    <PackageProjectUrl>https://gitee.com/akwkevin</PackageProjectUrl>
+    <PackageIcon>A.png</PackageIcon>
+    <PackageIconUrl />
+    <NeutralLanguage />
+    <Version>1.0.1</Version>
+    <Description>一个Wpf的Diagram控件帮助库</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Images\Bold.png" />
+    <None Remove="Images\Italic.png" />
+    <None Remove="Images\Underline.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Fluent.Ribbon" Version="8.0.3" />
+    <PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" />
+    <PackageReference Include="AIStudio.Wpf.Svg2XamlExtension" Version="1.2.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="ZXing.Net" Version="0.16.9" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="A.png">
+      <Pack>True</Pack>
+      <PackagePath>
+      </PackagePath>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\Accessibility.dll" />
+    <ReferencePath Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\bin\Debug\net6.0-windows\AIStudio.Wpf.DiagramDesigner.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\aistudio.wpf.svg2xamlextension\1.2.2\lib\net5.0-windows7.0\AIStudio.Wpf.Svg2XamlExtension.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\controlzex\4.4.0\lib\netcoreapp3.1\ControlzEx.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\fluent.ribbon\8.0.3\lib\netcoreapp3.0\Fluent.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.BootstrapIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.BoxIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Codicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Core.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Entypo.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.EvaIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.FeatherIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.FileIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Fontaudio.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.FontAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.ForkAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Ionicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.JamIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Material.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.MaterialDesign.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.MaterialLight.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Microns.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Modern.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Octicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.PicolIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.PixelartIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.RadixIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.RemixIcon.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.RPGAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.SimpleIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Typicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Unicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.VaadinIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.WeatherIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Zondicons.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\Microsoft.CSharp.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\Microsoft.VisualBasic.Core.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\Microsoft.VisualBasic.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\Microsoft.VisualBasic.Forms.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\Microsoft.Win32.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\Microsoft.Win32.Registry.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\Microsoft.Win32.Registry.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\Microsoft.Win32.SystemEvents.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\microsoft.xaml.behaviors.wpf\1.1.31\lib\net5.0-windows7.0\Microsoft.Xaml.Behaviors.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\mscorlib.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\netstandard.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\newtonsoft.json\13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\PresentationCore.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\PresentationFramework.Aero.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\PresentationFramework.Aero2.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\PresentationFramework.AeroLite.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\PresentationFramework.Classic.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\PresentationFramework.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\PresentationFramework.Luna.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\PresentationFramework.Royale.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\PresentationUI.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\ReachFramework.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\svgpathproperties\1.1.2\lib\netstandard2.0\SvgPathProperties.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.AppContext.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Buffers.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.codedom\7.0.0\lib\net6.0\System.CodeDom.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Collections.Concurrent.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Collections.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Collections.Immutable.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Collections.NonGeneric.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Collections.Specialized.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.ComponentModel.Annotations.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.ComponentModel.DataAnnotations.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.ComponentModel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.ComponentModel.EventBasedAsync.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.ComponentModel.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.ComponentModel.TypeConverter.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Configuration.ConfigurationManager.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Configuration.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Console.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Core.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Data.Common.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Data.DataSetExtensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Data.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Design.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Diagnostics.Contracts.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Diagnostics.Debug.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Diagnostics.DiagnosticSource.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Diagnostics.EventLog.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Diagnostics.FileVersionInfo.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Diagnostics.PerformanceCounter.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Diagnostics.Process.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Diagnostics.StackTrace.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Diagnostics.TextWriterTraceListener.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Diagnostics.Tools.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Diagnostics.TraceSource.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Diagnostics.Tracing.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.DirectoryServices.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Drawing.Common.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Drawing.Design.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Drawing.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Drawing.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Dynamic.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Formats.Asn1.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Globalization.Calendars.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Globalization.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Globalization.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.Compression.Brotli.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.Compression.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.Compression.FileSystem.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.Compression.ZipFile.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.FileSystem.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.FileSystem.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.FileSystem.DriveInfo.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.FileSystem.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.FileSystem.Watcher.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.IsolatedStorage.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.MemoryMappedFiles.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.IO.Packaging.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.Pipes.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.Pipes.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.IO.UnmanagedMemoryStream.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Linq.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Linq.Expressions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Linq.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Linq.Queryable.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.management\7.0.0\lib\net6.0\System.Management.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Memory.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.Http.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.Http.Json.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.HttpListener.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.Mail.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.NameResolution.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.NetworkInformation.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.Ping.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.Requests.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.Security.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.ServicePoint.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.Sockets.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.WebClient.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.WebHeaderCollection.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.WebProxy.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.WebSockets.Client.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Net.WebSockets.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Numerics.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Numerics.Vectors.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.ObjectModel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Printing.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.reactive\5.0.0\lib\net5.0\System.Reactive.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Reflection.DispatchProxy.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Reflection.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Reflection.Emit.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Reflection.Emit.ILGeneration.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Reflection.Emit.Lightweight.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Reflection.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Reflection.Metadata.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Reflection.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Reflection.TypeExtensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Resources.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Resources.Reader.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Resources.ResourceManager.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Resources.Writer.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.CompilerServices.Unsafe.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.CompilerServices.VisualC.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.Handles.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.InteropServices.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.InteropServices.RuntimeInformation.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.Intrinsics.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.Loader.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.Numerics.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.Serialization.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.Serialization.Formatters.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.Serialization.Json.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.Serialization.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Runtime.Serialization.Xml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Security.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Security.Claims.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Security.Cryptography.Algorithms.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Security.Cryptography.Cng.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Security.Cryptography.Csp.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Security.Cryptography.Encoding.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Security.Cryptography.OpenSsl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Security.Cryptography.Pkcs.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Security.Cryptography.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Security.Cryptography.ProtectedData.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Security.Cryptography.X509Certificates.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Security.Cryptography.Xml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Security.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Security.Permissions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Security.Principal.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Security.Principal.Windows.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Security.SecureString.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.ServiceModel.Web.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.ServiceProcess.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Text.Encoding.CodePages.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Text.Encoding.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Text.Encoding.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Text.Encodings.Web.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Text.Json.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Text.RegularExpressions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Threading.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Threading.Channels.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Threading.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Threading.Overlapped.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Threading.Tasks.Dataflow.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Threading.Tasks.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Threading.Tasks.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Threading.Tasks.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Threading.Thread.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Threading.ThreadPool.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Threading.Timer.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Transactions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Transactions.Local.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.ValueTuple.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Web.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Web.HttpUtility.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Windows.Controls.Ribbon.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Windows.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Windows.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Windows.Forms.Design.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Windows.Forms.Design.Editors.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Windows.Forms.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Windows.Forms.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Windows.Input.Manipulations.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Windows.Presentation.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\System.Xaml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Xml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Xml.Linq.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Xml.ReaderWriter.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Xml.Serialization.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Xml.XDocument.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Xml.XmlDocument.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Xml.XmlSerializer.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Xml.XPath.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\ref\net6.0\System.Xml.XPath.XDocument.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\UIAutomationClient.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\UIAutomationClientSideProviders.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\UIAutomationProvider.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\UIAutomationTypes.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\WindowsBase.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\ref\net6.0\WindowsFormsIntegration.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\wpfanimatedgif\2.0.0\lib\netcoreapp3.0\WpfAnimatedGif.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\zxing.net\0.16.9\lib\net6.0\zxing.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\net6.0-windows\Controls\Barcode.g.cs" />
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\net6.0-windows\Controls\GradientStopControl.g.cs" />
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\net6.0-windows\Controls\SliderRotation.g.cs" />
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\net6.0-windows\GeneratedInternalTypeHelper.g.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="C:\Program Files\dotnet\sdk\7.0.101\Sdks\Microsoft.NET.Sdk\targets\..\analyzers\Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll" />
+    <Analyzer Include="C:\Program Files\dotnet\sdk\7.0.101\Sdks\Microsoft.NET.Sdk\targets\..\analyzers\Microsoft.CodeAnalysis.NetAnalyzers.dll" />
+    <Analyzer Include="C:\Users\Administrator\.nuget\packages\wpfanalyzers\3.5.4\analyzers\dotnet\cs\Gu.Roslyn.Extensions.dll" />
+    <Analyzer Include="C:\Users\Administrator\.nuget\packages\wpfanalyzers\3.5.4\analyzers\dotnet\cs\WpfAnalyzers.dll" />
+    <Analyzer Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.12\analyzers/dotnet/cs/System.Text.Json.SourceGeneration.dll" />
+    <Analyzer Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\analyzers/dotnet/System.Windows.Forms.Analyzers.dll" />
+    <Analyzer Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.12\analyzers/dotnet/cs/System.Windows.Forms.Analyzers.CSharp.dll" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+</Project>

AIStudio.Wpf.DiagramDesigner.Additionals/AIStudio.Wpf.DiagramDesigner.Additionals_ihwwsf1d_wpftmp.csproj

@@ -0,0 +1,309 @@
+<Project>
+  <PropertyGroup>
+    <AssemblyName>AIStudio.Wpf.DiagramDesigner.Additionals</AssemblyName>
+    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+    <MSBuildProjectExtensionsPath>F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\</MSBuildProjectExtensionsPath>
+    <_TargetAssemblyProjectName>AIStudio.Wpf.DiagramDesigner.Additionals</_TargetAssemblyProjectName>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <PropertyGroup>
+    <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
+    <Company>AIStudio.Wpf.Controls</Company>
+    <Authors>akwkevin</Authors>
+    <PackageProjectUrl>https://gitee.com/akwkevin</PackageProjectUrl>
+    <PackageIcon>A.png</PackageIcon>
+    <PackageIconUrl />
+    <NeutralLanguage />
+    <Version>1.1.7</Version>
+    <Description>一个Wpf的Diagram控件帮助库</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Images\Bold.png" />
+    <None Remove="Images\Italic.png" />
+    <None Remove="Images\Underline.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Fluent.Ribbon" Version="8.0.3" />
+    <PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" />
+    <PackageReference Include="AIStudio.Wpf.Svg2XamlExtension" Version="1.2.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="ZXing.Net" Version="0.16.9" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="A.png">
+      <Pack>True</Pack>
+      <PackagePath>
+      </PackagePath>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\Accessibility.dll" />
+    <ReferencePath Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\bin\Debug\net6.0-windows\AIStudio.Wpf.DiagramDesigner.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\aistudio.wpf.svg2xamlextension\1.2.2\lib\net5.0-windows7.0\AIStudio.Wpf.Svg2XamlExtension.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\controlzex\4.4.0\lib\netcoreapp3.1\ControlzEx.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\fluent.ribbon\8.0.3\lib\netcoreapp3.0\Fluent.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.BootstrapIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.BoxIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Codicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Core.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Entypo.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.EvaIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.FeatherIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.FileIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Fontaudio.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.FontAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.ForkAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Ionicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.JamIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Material.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.MaterialDesign.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.MaterialLight.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Microns.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Modern.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Octicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.PicolIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.PixelartIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.RadixIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.RemixIcon.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.RPGAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.SimpleIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Typicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Unicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.VaadinIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.WeatherIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Zondicons.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\Microsoft.CSharp.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\Microsoft.VisualBasic.Core.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\Microsoft.VisualBasic.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\Microsoft.VisualBasic.Forms.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\Microsoft.Win32.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\Microsoft.Win32.Registry.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\Microsoft.Win32.Registry.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\Microsoft.Win32.SystemEvents.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\microsoft.xaml.behaviors.wpf\1.1.31\lib\net5.0-windows7.0\Microsoft.Xaml.Behaviors.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\mscorlib.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\netstandard.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\newtonsoft.json\13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\PresentationCore.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\PresentationFramework.Aero.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\PresentationFramework.Aero2.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\PresentationFramework.AeroLite.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\PresentationFramework.Classic.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\PresentationFramework.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\PresentationFramework.Luna.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\PresentationFramework.Royale.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\PresentationUI.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\ReachFramework.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\svgpathproperties\1.1.2\lib\netstandard2.0\SvgPathProperties.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.AppContext.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Buffers.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.codedom\7.0.0\lib\net6.0\System.CodeDom.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Collections.Concurrent.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Collections.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Collections.Immutable.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Collections.NonGeneric.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Collections.Specialized.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.ComponentModel.Annotations.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.ComponentModel.DataAnnotations.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.ComponentModel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.ComponentModel.EventBasedAsync.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.ComponentModel.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.ComponentModel.TypeConverter.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Configuration.ConfigurationManager.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Configuration.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Console.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Core.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Data.Common.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Data.DataSetExtensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Data.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Design.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Diagnostics.Contracts.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Diagnostics.Debug.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Diagnostics.DiagnosticSource.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Diagnostics.EventLog.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Diagnostics.FileVersionInfo.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Diagnostics.PerformanceCounter.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Diagnostics.Process.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Diagnostics.StackTrace.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Diagnostics.TextWriterTraceListener.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Diagnostics.Tools.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Diagnostics.TraceSource.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Diagnostics.Tracing.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.DirectoryServices.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Drawing.Common.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Drawing.Design.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Drawing.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Drawing.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Dynamic.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Formats.Asn1.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Globalization.Calendars.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Globalization.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Globalization.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.Compression.Brotli.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.Compression.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.Compression.FileSystem.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.Compression.ZipFile.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.FileSystem.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.FileSystem.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.FileSystem.DriveInfo.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.FileSystem.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.FileSystem.Watcher.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.IsolatedStorage.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.MemoryMappedFiles.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.IO.Packaging.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.Pipes.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.Pipes.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.IO.UnmanagedMemoryStream.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Linq.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Linq.Expressions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Linq.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Linq.Queryable.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.management\7.0.0\lib\net6.0\System.Management.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Memory.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.Http.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.Http.Json.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.HttpListener.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.Mail.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.NameResolution.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.NetworkInformation.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.Ping.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.Requests.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.Security.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.ServicePoint.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.Sockets.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.WebClient.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.WebHeaderCollection.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.WebProxy.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.WebSockets.Client.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Net.WebSockets.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Numerics.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Numerics.Vectors.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.ObjectModel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Printing.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.reactive\5.0.0\lib\net5.0\System.Reactive.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Reflection.DispatchProxy.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Reflection.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Reflection.Emit.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Reflection.Emit.ILGeneration.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Reflection.Emit.Lightweight.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Reflection.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Reflection.Metadata.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Reflection.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Reflection.TypeExtensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Resources.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Resources.Reader.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Resources.ResourceManager.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Resources.Writer.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.CompilerServices.Unsafe.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.CompilerServices.VisualC.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.Handles.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.InteropServices.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.InteropServices.RuntimeInformation.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.Intrinsics.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.Loader.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.Numerics.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.Serialization.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.Serialization.Formatters.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.Serialization.Json.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.Serialization.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Runtime.Serialization.Xml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Security.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Security.Claims.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Security.Cryptography.Algorithms.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Security.Cryptography.Cng.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Security.Cryptography.Csp.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Security.Cryptography.Encoding.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Security.Cryptography.OpenSsl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Security.Cryptography.Pkcs.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Security.Cryptography.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Security.Cryptography.ProtectedData.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Security.Cryptography.X509Certificates.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Security.Cryptography.Xml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Security.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Security.Permissions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Security.Principal.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Security.Principal.Windows.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Security.SecureString.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.ServiceModel.Web.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.ServiceProcess.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Text.Encoding.CodePages.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Text.Encoding.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Text.Encoding.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Text.Encodings.Web.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Text.Json.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Text.RegularExpressions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Threading.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Threading.Channels.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Threading.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Threading.Overlapped.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Threading.Tasks.Dataflow.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Threading.Tasks.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Threading.Tasks.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Threading.Tasks.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Threading.Thread.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Threading.ThreadPool.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Threading.Timer.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Transactions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Transactions.Local.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.ValueTuple.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Web.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Web.HttpUtility.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Windows.Controls.Ribbon.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Windows.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Windows.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Windows.Forms.Design.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Windows.Forms.Design.Editors.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Windows.Forms.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Windows.Forms.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Windows.Input.Manipulations.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Windows.Presentation.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\System.Xaml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Xml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Xml.Linq.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Xml.ReaderWriter.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Xml.Serialization.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Xml.XDocument.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Xml.XmlDocument.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Xml.XmlSerializer.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Xml.XPath.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\ref\net6.0\System.Xml.XPath.XDocument.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\UIAutomationClient.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\UIAutomationClientSideProviders.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\UIAutomationProvider.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\UIAutomationTypes.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\WindowsBase.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\ref\net6.0\WindowsFormsIntegration.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\wpfanimatedgif\2.0.0\lib\netcoreapp3.0\WpfAnimatedGif.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\zxing.net\0.16.9\lib\net6.0\zxing.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\net6.0-windows\Controls\Barcode.g.cs" />
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\net6.0-windows\Controls\GradientStopControl.g.cs" />
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\net6.0-windows\Controls\SliderRotation.g.cs" />
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\net6.0-windows\GeneratedInternalTypeHelper.g.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="C:\Program Files\dotnet\sdk\7.0.304\Sdks\Microsoft.NET.Sdk\targets\..\analyzers\Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll" />
+    <Analyzer Include="C:\Program Files\dotnet\sdk\7.0.304\Sdks\Microsoft.NET.Sdk\targets\..\analyzers\Microsoft.CodeAnalysis.NetAnalyzers.dll" />
+    <Analyzer Include="C:\Users\Administrator\.nuget\packages\wpfanalyzers\3.5.4\analyzers\dotnet\cs\Gu.Roslyn.Extensions.dll" />
+    <Analyzer Include="C:\Users\Administrator\.nuget\packages\wpfanalyzers\3.5.4\analyzers\dotnet\cs\WpfAnalyzers.dll" />
+    <Analyzer Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\6.0.18\analyzers/dotnet/cs/System.Text.Json.SourceGeneration.dll" />
+    <Analyzer Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\analyzers/dotnet/System.Windows.Forms.Analyzers.dll" />
+    <Analyzer Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.18\analyzers/dotnet/cs/System.Windows.Forms.Analyzers.CSharp.dll" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+</Project>

AIStudio.Wpf.DiagramDesigner.Additionals/AIStudio.Wpf.DiagramDesigner.Additionals_ltmcgkh5_wpftmp.csproj

@@ -0,0 +1,300 @@
+<Project>
+  <PropertyGroup>
+    <AssemblyName>AIStudio.Wpf.DiagramDesigner.Additionals</AssemblyName>
+    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+    <MSBuildProjectExtensionsPath>F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\</MSBuildProjectExtensionsPath>
+    <_TargetAssemblyProjectName>AIStudio.Wpf.DiagramDesigner.Additionals</_TargetAssemblyProjectName>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <PropertyGroup>
+    <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
+    <Company>AIStudio.Wpf.Controls</Company>
+    <Authors>akwkevin</Authors>
+    <PackageProjectUrl>https://gitee.com/akwkevin</PackageProjectUrl>
+    <PackageIcon>A.png</PackageIcon>
+    <PackageIconUrl />
+    <NeutralLanguage />
+    <Version>1.0.1</Version>
+    <Description>一个Wpf的Diagram控件帮助库</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Images\Bold.png" />
+    <None Remove="Images\Italic.png" />
+    <None Remove="Images\Underline.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Fluent.Ribbon" Version="8.0.3" />
+    <PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" />
+    <PackageReference Include="AIStudio.Wpf.Svg2XamlExtension" Version="1.2.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="ZXing.Net" Version="0.16.9" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="A.png">
+      <Pack>True</Pack>
+      <PackagePath>
+      </PackagePath>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\Accessibility.dll" />
+    <ReferencePath Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\bin\Debug\netcoreapp3.1\AIStudio.Wpf.DiagramDesigner.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\aistudio.wpf.svg2xamlextension\1.2.2\lib\netcoreapp3.1\AIStudio.Wpf.Svg2XamlExtension.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\controlzex\4.4.0\lib\netcoreapp3.1\ControlzEx.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\fluent.ribbon\8.0.3\lib\netcoreapp3.0\Fluent.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.BootstrapIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.BoxIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Codicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Core.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Entypo.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.EvaIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.FeatherIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.FileIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Fontaudio.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.FontAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.ForkAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Ionicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.JamIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Material.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.MaterialDesign.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.MaterialLight.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Microns.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Modern.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Octicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.PicolIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.PixelartIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.RadixIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.RemixIcon.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.RPGAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.SimpleIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Typicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Unicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.VaadinIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.WeatherIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\netcoreapp3.1\MahApps.Metro.IconPacks.Zondicons.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\Microsoft.CSharp.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\Microsoft.VisualBasic.Core.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\Microsoft.VisualBasic.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\Microsoft.Win32.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\Microsoft.Win32.Registry.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\Microsoft.Win32.Registry.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\Microsoft.Win32.SystemEvents.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\microsoft.xaml.behaviors.wpf\1.1.31\lib\netcoreapp3.1\Microsoft.Xaml.Behaviors.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\mscorlib.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\netstandard.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\newtonsoft.json\13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationCore.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationFramework.Aero.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationFramework.Aero2.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationFramework.AeroLite.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationFramework.Classic.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationFramework.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationFramework.Luna.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationFramework.Royale.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\PresentationUI.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\ReachFramework.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\svgpathproperties\1.1.2\lib\netstandard2.0\SvgPathProperties.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.AppContext.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Buffers.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.codedom\7.0.0\lib\netstandard2.0\System.CodeDom.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Collections.Concurrent.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Collections.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Collections.Immutable.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Collections.NonGeneric.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Collections.Specialized.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ComponentModel.Annotations.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ComponentModel.DataAnnotations.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ComponentModel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ComponentModel.EventBasedAsync.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ComponentModel.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ComponentModel.TypeConverter.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Configuration.ConfigurationManager.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Configuration.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Console.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Core.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Data.Common.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Data.DataSetExtensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Data.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Design.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.Contracts.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.Debug.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.DiagnosticSource.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.EventLog.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.FileVersionInfo.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.PerformanceCounter.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.Process.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.StackTrace.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.TextWriterTraceListener.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.Tools.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.TraceSource.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Diagnostics.Tracing.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.DirectoryServices.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.drawing.common\5.0.2\ref\netcoreapp3.0\System.Drawing.Common.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Drawing.Design.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Drawing.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Drawing.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Dynamic.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Globalization.Calendars.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Globalization.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Globalization.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.Compression.Brotli.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.Compression.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.Compression.FileSystem.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.Compression.ZipFile.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.FileSystem.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.FileSystem.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.FileSystem.DriveInfo.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.FileSystem.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.FileSystem.Watcher.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.IsolatedStorage.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.MemoryMappedFiles.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.Packaging.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.Pipes.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.Pipes.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.IO.UnmanagedMemoryStream.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Linq.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Linq.Expressions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Linq.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Linq.Queryable.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.management\7.0.0\lib\netstandard2.0\System.Management.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Memory.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Http.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.HttpListener.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Mail.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.NameResolution.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.NetworkInformation.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Ping.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Requests.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Security.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.ServicePoint.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Sockets.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.WebClient.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.WebHeaderCollection.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.WebProxy.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.WebSockets.Client.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.WebSockets.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Numerics.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Numerics.Vectors.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ObjectModel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Printing.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.reactive\5.0.0\build\netcoreapp3.1\System.Reactive.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.DispatchProxy.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.Emit.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.Emit.ILGeneration.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.Emit.Lightweight.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.Metadata.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Reflection.TypeExtensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Resources.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Resources.Reader.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Resources.ResourceManager.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Resources.Writer.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.CompilerServices.Unsafe.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.CompilerServices.VisualC.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Handles.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.InteropServices.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.InteropServices.RuntimeInformation.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.InteropServices.WindowsRuntime.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Intrinsics.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Loader.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Numerics.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Serialization.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Serialization.Formatters.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Serialization.Json.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Serialization.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Runtime.Serialization.Xml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Claims.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.Algorithms.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.Cng.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.Csp.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.Encoding.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.Pkcs.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.ProtectedData.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.X509Certificates.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Cryptography.Xml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Permissions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Principal.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.Principal.Windows.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Security.SecureString.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ServiceModel.Web.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ServiceProcess.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Text.Encoding.CodePages.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Text.Encoding.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Text.Encoding.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Text.Encodings.Web.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.text.json\4.7.2\lib\netcoreapp3.0\System.Text.Json.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Text.RegularExpressions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.AccessControl.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Channels.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Overlapped.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Tasks.Dataflow.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Tasks.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Tasks.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Tasks.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Thread.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.ThreadPool.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Threading.Timer.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Transactions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Transactions.Local.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.ValueTuple.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Web.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Web.HttpUtility.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.Controls.Ribbon.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.Forms.Design.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.Forms.Design.Editors.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.Forms.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.Input.Manipulations.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Windows.Presentation.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xaml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.Linq.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.ReaderWriter.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.Serialization.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.XDocument.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.XmlDocument.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.XmlSerializer.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.XPath.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Xml.XPath.XDocument.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\UIAutomationClient.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\UIAutomationClientSideProviders.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\UIAutomationProvider.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\UIAutomationTypes.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\WindowsBase.dll" />
+    <ReferencePath Include="C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\WindowsFormsIntegration.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\wpfanimatedgif\2.0.0\lib\netcoreapp3.0\WpfAnimatedGif.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\zxing.net\0.16.9\lib\netcoreapp3.1\zxing.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\netcoreapp3.1\Controls\Barcode.g.cs" />
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\netcoreapp3.1\Controls\GradientStopControl.g.cs" />
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\netcoreapp3.1\Controls\SliderRotation.g.cs" />
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\netcoreapp3.1\GeneratedInternalTypeHelper.g.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="C:\Users\Administrator\.nuget\packages\wpfanalyzers\3.5.4\analyzers\dotnet\cs\Gu.Roslyn.Extensions.dll" />
+    <Analyzer Include="C:\Users\Administrator\.nuget\packages\wpfanalyzers\3.5.4\analyzers\dotnet\cs\WpfAnalyzers.dll" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+</Project>

AIStudio.Wpf.DiagramDesigner.Additionals/AIStudio.Wpf.DiagramDesigner.Additionals_uoedrdjs_wpftmp.csproj

@@ -0,0 +1,235 @@
+<Project>
+  <PropertyGroup>
+    <AssemblyName>AIStudio.Wpf.DiagramDesigner.Additionals</AssemblyName>
+    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+    <MSBuildProjectExtensionsPath>F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\</MSBuildProjectExtensionsPath>
+    <_TargetAssemblyProjectName>AIStudio.Wpf.DiagramDesigner.Additionals</_TargetAssemblyProjectName>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <PropertyGroup>
+    <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
+    <Company>AIStudio.Wpf.Controls</Company>
+    <Authors>akwkevin</Authors>
+    <PackageProjectUrl>https://gitee.com/akwkevin</PackageProjectUrl>
+    <PackageIcon>A.png</PackageIcon>
+    <PackageIconUrl />
+    <NeutralLanguage />
+    <Version>1.0.1</Version>
+    <Description>一个Wpf的Diagram控件帮助库</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Images\Bold.png" />
+    <None Remove="Images\Italic.png" />
+    <None Remove="Images\Underline.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Fluent.Ribbon" Version="8.0.3" />
+    <PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" />
+    <PackageReference Include="AIStudio.Wpf.Svg2XamlExtension" Version="1.2.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="ZXing.Net" Version="0.16.9" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="A.png">
+      <Pack>True</Pack>
+      <PackagePath>
+      </PackagePath>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <ReferencePath Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\bin\Debug\net461\AIStudio.Wpf.DiagramDesigner.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\aistudio.wpf.svg2xamlextension\1.2.2\lib\net461\AIStudio.Wpf.Svg2XamlExtension.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\controlzex\4.4.0\lib\net45\ControlzEx.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\fluent.ribbon\8.0.3\lib\net452\Fluent.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.BootstrapIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.BoxIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.Codicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.Core.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.Entypo.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.EvaIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.FeatherIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.FileIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.Fontaudio.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.FontAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.ForkAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.Ionicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.JamIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.Material.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.MaterialDesign.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.MaterialLight.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.Microns.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.Modern.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.Octicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.PicolIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.PixelartIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.RadixIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.RemixIcon.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.RPGAwesome.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.SimpleIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.Typicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.Unicons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.VaadinIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.WeatherIcons.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mahapps.metro.iconpacks\4.8.0\lib\net46\MahApps.Metro.IconPacks.Zondicons.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\Microsoft.Win32.Primitives.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\microsoft.xaml.behaviors.wpf\1.1.31\lib\net45\Microsoft.Xaml.Behaviors.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\mscorlib.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\netfx.force.conflicts.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\netstandard.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\newtonsoft.json\13.0.1\lib\net45\Newtonsoft.Json.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\PresentationCore.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\PresentationFramework.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\svgpathproperties\1.1.2\lib\netstandard2.0\SvgPathProperties.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.AppContext.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.codedom\7.0.0\lib\netstandard2.0\System.CodeDom.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Collections.Concurrent.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Collections.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Collections.NonGeneric.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Collections.Specialized.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.ComponentModel.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.ComponentModel.EventBasedAsync.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.ComponentModel.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.ComponentModel.TypeConverter.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Console.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Core.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Data.Common.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Data.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.Contracts.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.Debug.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.FileVersionInfo.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.Process.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.StackTrace.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.TextWriterTraceListener.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.Tools.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.TraceSource.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Diagnostics.Tracing.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Drawing.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Drawing.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Dynamic.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Globalization.Calendars.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Globalization.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Globalization.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.Compression.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.IO.Compression.FileSystem.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.Compression.ZipFile.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.FileSystem.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.FileSystem.DriveInfo.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.FileSystem.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.FileSystem.Watcher.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.IsolatedStorage.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.MemoryMappedFiles.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.Pipes.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.IO.UnmanagedMemoryStream.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Linq.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Linq.Expressions.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Linq.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Linq.Queryable.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.management\7.0.0\lib\netstandard2.0\System.Management.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Http.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.NameResolution.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.NetworkInformation.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Ping.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Requests.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Security.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Sockets.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.WebHeaderCollection.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.WebSockets.Client.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.WebSockets.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Numerics.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.ObjectModel.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.reactive\5.0.0\lib\netstandard2.0\System.Reactive.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Reflection.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Reflection.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Reflection.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Resources.Reader.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Resources.ResourceManager.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Resources.Writer.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.runtime.compilerservices.unsafe\4.5.3\ref\net461\System.Runtime.CompilerServices.Unsafe.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.CompilerServices.VisualC.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.Handles.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.InteropServices.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.InteropServices.RuntimeInformation.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.Numerics.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Runtime.Serialization.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.Serialization.Formatters.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.Serialization.Json.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.Serialization.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.Serialization.Xml.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.Claims.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.Cryptography.Algorithms.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.Cryptography.Csp.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.Cryptography.Encoding.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.Cryptography.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.Cryptography.X509Certificates.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.Principal.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Security.SecureString.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Text.Encoding.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Text.Encoding.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Text.RegularExpressions.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Threading.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Threading.Overlapped.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Threading.Tasks.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.threading.tasks.extensions\4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Threading.Tasks.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Threading.Thread.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Threading.ThreadPool.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Threading.Timer.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.ValueTuple.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Web.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Web.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Windows.Controls.Ribbon.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Windows.Forms.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Xaml.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Xml.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Xml.Linq.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Xml.ReaderWriter.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Xml.XDocument.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Xml.XmlDocument.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Xml.XmlSerializer.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Xml.XPath.dll" />
+    <ReferencePath Include="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Xml.XPath.XDocument.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\UIAutomationClient.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\UIAutomationClientsideProviders.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\UIAutomationProvider.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\UIAutomationTypes.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\WindowsBase.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\WindowsFormsIntegration.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\wpfanimatedgif\2.0.0\lib\net40\WpfAnimatedGif.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\zxing.net\0.16.9\lib\net461\zxing.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\zxing.net\0.16.9\lib\net461\zxing.presentation.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ComponentModel.Annotations.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Emit.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Emit.ILGeneration.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Emit.Lightweight.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.InteropServices.WindowsRuntime.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Duplex.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Http.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.NetTcp.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Security.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\net461\Controls\Barcode.g.cs" />
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\net461\Controls\GradientStopControl.g.cs" />
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\net461\Controls\SliderRotation.g.cs" />
+    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner.Additionals\obj\Debug\net461\GeneratedInternalTypeHelper.g.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="C:\Users\Administrator\.nuget\packages\wpfanalyzers\3.5.4\analyzers\dotnet\cs\Gu.Roslyn.Extensions.dll" />
+    <Analyzer Include="C:\Users\Administrator\.nuget\packages\wpfanalyzers\3.5.4\analyzers\dotnet\cs\WpfAnalyzers.dll" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+</Project>

AIStudio.Wpf.DiagramDesigner.Additionals/Commands/CanExecuteDelegateCommand.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Windows.Input;
 
-namespace AIStudio.Wpf.DiagramHelper.Commands
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Commands
 {
     /// <summary>
     ///     This class allows delegating the commanding logic to methods passed as parameters,

AIStudio.Wpf.DiagramDesigner.Additionals/Commands/CommandReference.cs

@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace AIStudio.Wpf.DiagramHelper.Commands
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Commands
 {
     public class CommandReference : Freezable, ICommand
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Commands/CompositeCommand.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading;
 using System.Windows.Input;
 
-namespace AIStudio.Wpf.DiagramHelper.Commands
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Commands
 {
     /// <summary>
     /// The CompositeCommand composes one or more ICommands.

AIStudio.Wpf.DiagramDesigner.Additionals/Commands/ControlBinding.cs

@@ -8,7 +8,7 @@ using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace AIStudio.Wpf.DiagramHelper.Commands
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Commands
 {
     [MarkupExtensionReturnType(typeof(object))]
     public class ControlBinding : MarkupExtension

AIStudio.Wpf.DiagramDesigner.Additionals/Commands/ControlCommand.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Controls;
 
-namespace AIStudio.Wpf.DiagramHelper.Commands
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Commands
 {
     #region ConbrolCommand
 

AIStudio.Wpf.DiagramDesigner.Additionals/Commands/DelegateCommand(T).cs

@@ -3,7 +3,7 @@ using System.Linq.Expressions;
 using System.Reflection;
 using System.Windows.Input;
 
-namespace AIStudio.Wpf.DiagramHelper.Commands
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Commands
 {
     /// <summary>
     /// An <see cref="ICommand"/> whose delegates can be attached for <see cref="Execute(T)"/> and <see cref="CanExecute(T)"/>.

AIStudio.Wpf.DiagramDesigner.Additionals/Commands/DelegateCommand.cs

@@ -5,7 +5,7 @@ using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AIStudio.Wpf.DiagramHelper.Commands
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Commands
 {
     /// <summary>
     /// An <see cref="ICommand"/> whose delegates do not take any parameters for <see cref="Execute()"/> and <see cref="CanExecute()"/>.

AIStudio.Wpf.DiagramDesigner.Additionals/Commands/DelegateCommandBase.cs

@@ -8,7 +8,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace AIStudio.Wpf.DiagramHelper.Commands
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Commands
 {
     /// <summary>
     /// An <see cref="ICommand"/> whose delegates can be attached for <see cref="Execute"/> and <see cref="CanExecute"/>.

AIStudio.Wpf.DiagramDesigner.Additionals/Commands/IActiveAware.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AIStudio.Wpf.DiagramHelper.Commands
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Commands
 {
     /// <summary>
     /// Interface that defines if the object instance is active

AIStudio.Wpf.DiagramDesigner.Additionals/Commands/PropertyObserver.cs

@@ -4,7 +4,7 @@ using System.ComponentModel;
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace AIStudio.Wpf.DiagramHelper.Commands
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Commands
 {
     /// <summary>
     /// Provide a way to observe property changes of INotifyPropertyChanged objects and invokes a 

AIStudio.Wpf.DiagramDesigner.Additionals/Commands/PropertyObserverNode.cs

@@ -6,7 +6,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AIStudio.Wpf.DiagramHelper.Commands
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Commands
 {
     /// <summary>
     /// Represents each node of nested properties expression and takes care of 

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/AnimationHelper.cs

@@ -5,7 +5,7 @@ using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 
-namespace AIStudio.Wpf.DiagramHelper.Controls
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Controls
 {
     /// <summary>
     ///     包含一些常用的动画辅助方法

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/Barcode.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="AIStudio.Wpf.DiagramHelper.Controls.Barcode"
+<UserControl x:Class="AIStudio.Wpf.DiagramDesigner.Additionals.Controls.Barcode"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls"
+             xmlns:local="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/Barcode.xaml.cs

@@ -1,22 +1,15 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 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 WpfAnimatedGif;
 using ZXing;
+#if !NET5_0_OR_GREATER
 using ZXing.Presentation;
+#endif
 
-namespace AIStudio.Wpf.DiagramHelper.Controls
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Controls
 {
     /// <summary>
     /// Barcode.xaml 的交互逻辑
@@ -29,7 +22,7 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
         }
 
         public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-            "Text", typeof(string), typeof(Barcode), new FrameworkPropertyMetadata(
+            nameof(Text), typeof(string), typeof(Barcode), new FrameworkPropertyMetadata(
             string.Empty,
             FrameworkPropertyMetadataOptions.AffectsMeasure |
             FrameworkPropertyMetadataOptions.AffectsRender, OnFormattedTextInvalidated));
@@ -41,7 +34,7 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
         }
 
         public static readonly DependencyProperty FormatProperty = DependencyProperty.Register(
-            "Format", typeof(BarcodeFormat), typeof(Barcode), new FrameworkPropertyMetadata(
+            nameof(Format), typeof(BarcodeFormat), typeof(Barcode), new FrameworkPropertyMetadata(
             BarcodeFormat.QR_CODE,
             FrameworkPropertyMetadataOptions.AffectsMeasure |
             FrameworkPropertyMetadataOptions.AffectsRender, OnFormattedTextInvalidated));
@@ -53,7 +46,7 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
         }
 
         public static readonly DependencyProperty SizeProperty = DependencyProperty.Register(
-            "Size", typeof(double), typeof(Barcode), new FrameworkPropertyMetadata(
+            nameof(Size), typeof(double), typeof(Barcode), new FrameworkPropertyMetadata(
             512d,
             FrameworkPropertyMetadataOptions.AffectsMeasure |
             FrameworkPropertyMetadataOptions.AffectsRender, OnFormattedTextInvalidated));
@@ -65,7 +58,7 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
         }
 
         public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
-           "Icon", typeof(string), typeof(Barcode), new FrameworkPropertyMetadata(null, OnIconChanged));
+           nameof(Icon), typeof(string), typeof(Barcode), new FrameworkPropertyMetadata(null, OnIconChanged));
 
         public string Icon
         {
@@ -112,6 +105,21 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
 
         private void OnFormattedTextInvalidated()
         {
+#if NET5_0_OR_GREATER
+            var writer = new BarcodeWriter<Geometry>()
+            {
+                Format = Format,
+                Options = new ZXing.Common.EncodingOptions
+                {
+                    Height = (int)this.Size,
+                    Width = (int)this.Size,
+                    Margin = 0
+                }
+            };
+            writer.Renderer = new GeometryRenderer();
+            var image = writer.Write(Text ?? "AIStudio画板");
+            imageBarcodeEncoderGeometry.Data = image;
+#else
             var writer = new BarcodeWriterGeometry
             {
                 Format = Format,
@@ -124,6 +132,7 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
             };
             var image = writer.Write(Text ?? "AIStudio画板");
             imageBarcodeEncoderGeometry.Data = image;
+#endif
         }
     }
 }

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/Carousel.xaml

@@ -0,0 +1,100 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Controls"
+                    xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
+
+    <Geometry o:Freeze="True" x:Key="LeftGeometry">M394.24 512L683.52 248.32c10.24-10.24 10.24-25.6 0-35.84-10.24-10.24-25.6-10.24-35.84 0l-307.2 279.04c-5.12 5.12-7.68 12.8-7.68 20.48 0 7.68 2.56 15.36 7.68 20.48l307.2 279.04c10.24 10.24 25.6 10.24 35.84 0 10.24-10.24 10.24-25.6 0-35.84L394.24 512z</Geometry>
+    <Geometry o:Freeze="True" x:Key="RightGeometry">M4.1666641,0 C5.2083321,0 6.25,0.41666794 7.0833321,1.25 L57.083331,46.666664 C57.916664,47.499998 58.33333,48.749998 58.333329,49.999998 58.33333,51.249997 57.916664,52.499997 57.083331,53.333331 L7.0833321,98.749996 C5.4166641,100.41666 2.9166641,100.41666 1.2499962,98.749996 -0.41666794,97.083328 -0.41666794,94.583328 1.2499962,92.916664 L48.333331,49.999998 1.2499962,7.0833321 C-0.41666794,5.4166641 -0.41666794,2.9166641 1.2499962,1.25 2.0833282,0.41666794 3.1249962,0 4.1666641,0 z</Geometry>
+
+    <Style x:Key="CarouselListBoxItemStyle"  TargetType="ListBoxItem">
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType=ItemsControl}}"/>
+    </Style>
+
+    <ItemsPanelTemplate x:Key="CarouselListBoxItemPanelTemplate">
+        <StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" HorizontalAlignment="Left"/>
+    </ItemsPanelTemplate>
+
+    <Style x:Key="CarouselListBox" TargetType="ListBox">
+        <Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="False"/>
+        <Setter Property="ItemsPanel" Value="{StaticResource CarouselListBoxItemPanelTemplate}"/>
+        <Setter Property="ItemContainerStyle" Value="{StaticResource CarouselListBoxItemStyle}"/>
+    </Style>
+
+    <Style x:Key="CarouselPateButton" TargetType="RadioButton">
+        <Setter Property="Margin" Value="5,0"/>
+        <Setter Property="Width" Value="10"/>
+        <Setter Property="Height" Value="10"/>
+        <Setter Property="Background" Value="White"/>
+        <Setter Property="BorderBrush" Value="{Binding Path=BorderBrush, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=controls:Carousel}}"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Border CornerRadius="5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}"/>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Opacity" Value=".9"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Opacity" Value=".6"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="Background" Value="{Binding Path=BorderBrush, RelativeSource={RelativeSource Mode=Self}}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="CarouselStyle" TargetType="controls:Carousel" BasedOn="{StaticResource CarouselListBox}">
+        <Setter Property="PageButtonStyle" Value="{StaticResource CarouselPateButton}"/>
+        <Setter Property="Background" Value="White"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:Carousel">
+                    <ControlTemplate.Triggers>
+                        <EventTrigger RoutedEvent="FrameworkElement.MouseEnter">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <DoubleAnimation Storyboard.TargetName="GridTop" Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:.1"/>
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="FrameworkElement.MouseLeave">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <DoubleAnimation Storyboard.TargetName="GridTop" Storyboard.TargetProperty="Opacity" To="0" Duration="0:0:.1"/>
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                    </ControlTemplate.Triggers>
+                    <Grid ClipToBounds="True">
+                        <ItemsPresenter x:Name="PART_ItemsControl" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" HorizontalAlignment="Left"/>
+                        <Grid x:Name="GridTop" Opacity="0">
+                            <Button x:Name="Part_PreButton" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0" Style="{StaticResource AIStudio.Styles.Button.Plain}">
+                                <Border Width="50" Height="100" Background="{TemplateBinding Background}" CornerRadius="4">
+                                    <Path Margin="16" Fill="White" Data="{StaticResource LeftGeometry}" Stretch="Uniform"/>
+                                </Border>
+                            </Button>
+                            <Button x:Name="Part_NextButton" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,30,0" Style="{StaticResource AIStudio.Styles.Button.Plain}">
+                                <Border Width="50" Height="100" Background="{TemplateBinding Background}" CornerRadius="4">
+                                    <Path Margin="16" Fill="White" Data="{StaticResource RightGeometry}" Stretch="Uniform"/>
+                                </Border>
+                            </Button>
+                        </Grid>
+                        <StackPanel Name="PART_PanelPage" Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,0,0,20"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style BasedOn="{StaticResource CarouselStyle}" TargetType="{x:Type controls:Carousel}"/>
+
+</ResourceDictionary>

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/Carousel.xaml.cs

@@ -0,0 +1,336 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Markup;
+using System.Windows.Threading;
+
+
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Controls
+{
+    /// <summary>
+    ///     轮播控件
+    /// </summary>
+    [DefaultProperty("Items")]
+    [ContentProperty("Items")]
+    [TemplatePart(Name = ElementPanelPage, Type = typeof(Panel))]
+    [TemplatePart(Name = ElementItemsControl, Type = typeof(ItemsPresenter))]
+    [TemplatePart(Name = Part_PreButton, Type = typeof(Button))]
+    [TemplatePart(Name = Part_NextButton, Type = typeof(Button))]
+    public class Carousel : ListBox, IDisposable
+    {
+        #region Constants
+        private const string ElementPanelPage = "PART_PanelPage";
+        private const string ElementItemsControl = "PART_ItemsControl";
+        private const string Part_PreButton = "Part_PreButton";
+        private const string Part_NextButton = "Part_NextButton";
+        #endregion Constants
+
+        #region Data
+
+        private bool _isDisposed;
+
+        private Panel _panelPage;
+
+        private bool _appliedTemplate;
+
+        private ItemsPresenter _itemsControl;
+
+        private Button _btnPre;
+        private Button _btnNext;
+
+        private int _pageIndex = -1;
+
+        private RadioButton _selectedButton;
+
+        private DispatcherTimer _updateTimer;
+
+        private readonly List<double> _widthList = new List<double>();
+
+        #endregion Data
+
+        public override void OnApplyTemplate()
+        {
+            _appliedTemplate = false;
+
+            _panelPage?.RemoveHandler(ButtonBase.ClickEvent, new RoutedEventHandler(ButtonPages_OnClick));
+
+            base.OnApplyTemplate();
+
+            _itemsControl = GetTemplateChild(ElementItemsControl) as ItemsPresenter;
+            _panelPage = GetTemplateChild(ElementPanelPage) as Panel;
+
+            if (_btnPre != null)
+            {
+                _btnPre.Click -= ButtonPrev_OnClick;
+            }
+            if (_btnNext != null)
+            {
+                _btnNext.Click -= ButtonNext_OnClick;
+            }
+
+            _btnPre = GetTemplateChild(Part_PreButton) as Button;
+            _btnNext = GetTemplateChild(Part_NextButton) as Button;
+
+            if (_btnPre != null)
+            {
+                _btnPre.Click += ButtonPrev_OnClick;
+            }
+            if (_btnNext != null)
+            {
+                _btnNext.Click += ButtonNext_OnClick;
+            }
+
+            if (!CheckNull()) return;
+
+            _panelPage.AddHandler(ButtonBase.ClickEvent, new RoutedEventHandler(ButtonPages_OnClick));
+            _appliedTemplate = true;
+            Update();
+        }
+
+
+        private void Update()
+        {
+            TimerSwitch(AutoRun);
+            UpdatePageButtons(_pageIndex);
+        }
+
+        private bool CheckNull() => !(_itemsControl == null || _panelPage == null);
+
+        public static readonly DependencyProperty AutoRunProperty = DependencyProperty.Register(
+            "AutoRun", typeof(bool), typeof(Carousel), new PropertyMetadata(false, (o, args) => {
+                var ctl = (Carousel)o;
+                ctl.TimerSwitch((bool)args.NewValue);
+            }));
+
+        public static readonly DependencyProperty IntervalProperty = DependencyProperty.Register(
+            "Interval", typeof(TimeSpan), typeof(Carousel), new PropertyMetadata(TimeSpan.FromSeconds(2)));
+
+        public static readonly DependencyProperty ExtendWidthProperty = DependencyProperty.Register(
+            "ExtendWidth", typeof(double), typeof(Carousel), new PropertyMetadata(0d));
+
+        public double ExtendWidth
+        {
+            get => (double)GetValue(ExtendWidthProperty);
+            set => SetValue(ExtendWidthProperty, value);
+        }
+
+        public static readonly DependencyProperty IsCenterProperty = DependencyProperty.Register(
+            "IsCenter", typeof(bool), typeof(Carousel), new PropertyMetadata(false));
+
+        public bool IsCenter
+        {
+            get => (bool)GetValue(IsCenterProperty);
+            set => SetValue(IsCenterProperty, value);
+        }
+
+        public static readonly DependencyProperty PageButtonStyleProperty = DependencyProperty.Register(
+            "PageButtonStyle", typeof(Style), typeof(Carousel), new PropertyMetadata(default(Style)));
+
+        public Style PageButtonStyle
+        {
+            get => (Style)GetValue(PageButtonStyleProperty);
+            set => SetValue(PageButtonStyleProperty, value);
+        }
+
+        public Carousel()
+        {
+            Loaded += (s, e) => UpdatePageButtons();
+            IsVisibleChanged += Carousel_IsVisibleChanged;
+        }
+
+        ~Carousel() => Dispose();
+
+        public void Dispose()
+        {
+            if (_isDisposed) return;
+
+            IsVisibleChanged -= Carousel_IsVisibleChanged;
+            _updateTimer.Stop();
+            _isDisposed = true;
+
+            GC.SuppressFinalize(this);
+        }
+
+        private void Carousel_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (_updateTimer == null) return;
+
+            if (IsVisible)
+            {
+                _updateTimer.Tick += UpdateTimer_Tick;
+                _updateTimer.Start();
+            }
+            else
+            {
+                _updateTimer.Stop();
+                _updateTimer.Tick -= UpdateTimer_Tick;
+            }
+        }
+
+        protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
+        {
+            base.OnItemsChanged(e);
+
+            UpdatePageButtons();
+        }
+
+        /// <summary>
+        ///     是否自动跳转
+        /// </summary>
+        public bool AutoRun
+        {
+            get => (bool)GetValue(AutoRunProperty);
+            set => SetValue(AutoRunProperty, value);
+        }
+
+        /// <summary>
+        ///     跳转时间间隔
+        /// </summary>
+        public TimeSpan Interval
+        {
+            get => (TimeSpan)GetValue(IntervalProperty);
+            set => SetValue(IntervalProperty, value);
+        }
+
+        /// <summary>
+        ///     页码
+        /// </summary>
+        public int PageIndex
+        {
+            get => _pageIndex;
+            set
+            {
+                if (Items.Count == 0) return;
+                if (_pageIndex == value) return;
+                if (value < 0)
+                    _pageIndex = Items.Count - 1;
+                else if (value >= Items.Count)
+                    _pageIndex = 0;
+                else
+                    _pageIndex = value;
+                UpdatePageButtons(_pageIndex);
+            }
+        }
+
+        /// <summary>
+        ///     计时器开关
+        /// </summary>
+        private void TimerSwitch(bool run)
+        {
+            if (!_appliedTemplate) return;
+
+            if (_updateTimer != null)
+            {
+                _updateTimer.Tick -= UpdateTimer_Tick;
+                _updateTimer.Stop();
+                _updateTimer = null;
+            }
+
+            if (!run) return;
+            _updateTimer = new DispatcherTimer
+            {
+                Interval = Interval
+            };
+            _updateTimer.Tick += UpdateTimer_Tick;
+            _updateTimer.Start();
+        }
+
+        private void UpdateTimer_Tick(object sender, EventArgs e)
+        {
+            if (IsMouseOver) return;
+            PageIndex++;
+        }
+
+        /// <summary>
+        ///     更新页按钮
+        /// </summary>
+        public void UpdatePageButtons(int index = -1)
+        {
+            if (!CheckNull()) return;
+            if (!_appliedTemplate) return;
+
+            var count = Items.Count;
+            _widthList.Clear();
+            _widthList.Add(0);
+            var width = .0;
+            foreach (FrameworkElement item in Items)
+            {
+                item.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+                width += item.DesiredSize.Width;
+                _widthList.Add(width);
+            }
+
+            _itemsControl.Width = _widthList.Last() + ExtendWidth;
+            _panelPage.Children.Clear();
+            for (var i = 0; i < count; i++)
+            {
+                _panelPage.Children.Add(new RadioButton
+                {
+                    Style = PageButtonStyle
+                });
+            }
+
+            if (index == -1 && count > 0) index = 0;
+            if (index >= 0 && index < count)
+            {
+                if (_panelPage.Children[index] is RadioButton button)
+                {
+                    button.IsChecked = true;
+                    button.RaiseEvent(new RoutedEventArgs(ButtonBase.ClickEvent, button));
+                    UpdateItemsPosition();
+                }
+            }
+        }
+
+        /// <summary>
+        ///     更新项的位置
+        /// </summary>
+        private void UpdateItemsPosition()
+        {
+            if (!CheckNull()) return;
+            if (!_appliedTemplate) return;
+            if (Items.Count == 0) return;
+            if (!IsCenter)
+            {
+                _itemsControl.BeginAnimation(MarginProperty,
+                    AnimationHelper.CreateAnimation(new Thickness(-_widthList[PageIndex], 0, 0, 0)));
+            }
+            else
+            {
+                var ctl = (FrameworkElement)Items[PageIndex];
+                var ctlWidth = ctl.DesiredSize.Width;
+                _itemsControl.BeginAnimation(MarginProperty,
+                    AnimationHelper.CreateAnimation(
+                        new Thickness(-_widthList[PageIndex] + (ActualWidth - ctlWidth) / 2, 0, 0, 0)));
+            }
+        }
+
+        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+        {
+            base.OnRenderSizeChanged(sizeInfo);
+            UpdateItemsPosition();
+        }
+
+        private void ButtonPages_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (!CheckNull()) return;
+
+            _selectedButton = e.OriginalSource as RadioButton;
+
+            var index = _panelPage.Children.IndexOf(_selectedButton);
+            if (index != -1)
+            {
+                PageIndex = index;
+            }
+        }
+
+        private void ButtonPrev_OnClick(object sender, RoutedEventArgs e) => PageIndex--;
+
+        private void ButtonNext_OnClick(object sender, RoutedEventArgs e) => PageIndex++;
+    }
+}

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/Flipper.xaml

@@ -0,0 +1,123 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"                   
+                    xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Controls"
+                    xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Converters">
+
+    <converter:CardClipConverter x:Key="CardClipConverter" />
+    <converter:Object2VisibilityConverter x:Key="Object2VisibilityConverter"/>
+    
+    <SineEase x:Key="FlipEase" EasingMode="EaseInOut" />
+
+    <Style x:Key="FlipperStyle" TargetType="{x:Type controls:Flipper}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:Flipper}">
+                    <Border x:Name="Border">
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="FlipStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition From="Unflipped" To="Flipped">
+                                        <Storyboard FillBehavior="HoldEnd">
+                                            <DoubleAnimationUsingKeyFrames Duration="0:0:0.4" Storyboard.TargetProperty="RotationY" Storyboard.TargetName="PART_Plane3D">
+                                                <EasingDoubleKeyFrame Value="0" KeyTime="0:0:0.0" EasingFunction="{StaticResource FlipEase}" />
+                                                <EasingDoubleKeyFrame Value="-90" KeyTime="0:0:0.2" EasingFunction="{StaticResource FlipEase}" />
+                                                <EasingDoubleKeyFrame Value="90" KeyTime="0:0:0.2" EasingFunction="{StaticResource FlipEase}" />
+                                                <EasingDoubleKeyFrame Value="0" KeyTime="0:0:0.4" EasingFunction="{StaticResource FlipEase}" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames  Storyboard.TargetProperty="Visibility" Storyboard.TargetName="BackContentPresenter">
+                                                <DiscreteObjectKeyFrame Value="{x:Static Visibility.Visible}" KeyTime="0:0:0.2" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames  Storyboard.TargetProperty="Visibility" Storyboard.TargetName="FrontContentPresenter">
+                                                <DiscreteObjectKeyFrame Value="{x:Static Visibility.Collapsed}" KeyTime="0:0:0.2" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+                                    <VisualTransition From="Flipped" To="Unflipped">
+                                        <Storyboard FillBehavior="HoldEnd">
+                                            <DoubleAnimationUsingKeyFrames Duration="0:0:0.4" Storyboard.TargetProperty="RotationY" Storyboard.TargetName="PART_Plane3D">
+                                                <EasingDoubleKeyFrame Value="0" KeyTime="0:0:0.0" EasingFunction="{StaticResource FlipEase}" />
+                                                <EasingDoubleKeyFrame Value="90" KeyTime="0:0:0.2" EasingFunction="{StaticResource FlipEase}" />
+                                                <EasingDoubleKeyFrame Value="-90" KeyTime="0:0:0.2" EasingFunction="{StaticResource FlipEase}" />
+                                                <EasingDoubleKeyFrame Value="0" KeyTime="0:0:0.4" EasingFunction="{StaticResource FlipEase}" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames  Storyboard.TargetProperty="Visibility" Storyboard.TargetName="BackContentPresenter">
+                                                <DiscreteObjectKeyFrame Value="{x:Static Visibility.Collapsed}" KeyTime="0:0:0.2" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames  Storyboard.TargetProperty="Visibility" Storyboard.TargetName="FrontContentPresenter">
+                                                <DiscreteObjectKeyFrame Value="{x:Static Visibility.Visible}" KeyTime="0:0:0.2" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+                                </VisualStateGroup.Transitions>
+
+                                <VisualState x:Name="Unflipped">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames  Storyboard.TargetProperty="Visibility" Storyboard.TargetName="BackContentPresenter">
+                                            <DiscreteObjectKeyFrame Value="{x:Static Visibility.Collapsed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames  Storyboard.TargetProperty="Visibility" Storyboard.TargetName="FrontContentPresenter">
+                                            <DiscreteObjectKeyFrame Value="{x:Static Visibility.Visible}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Flipped">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames  Storyboard.TargetProperty="Visibility" Storyboard.TargetName="BackContentPresenter">
+                                            <DiscreteObjectKeyFrame Value="{x:Static Visibility.Visible}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames  Storyboard.TargetProperty="Visibility" Storyboard.TargetName="FrontContentPresenter">
+                                            <DiscreteObjectKeyFrame Value="{x:Static Visibility.Collapsed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <controls:Plane3D x:Name="PART_Plane3D" RotationY="0" ZFactor="2.055">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition/>
+                                    <RowDefinition Height="Auto"/>
+                                </Grid.RowDefinitions>
+                                <Border x:Name="Bg" Grid.RowSpan="3" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                        BorderBrush="{TemplateBinding BorderBrush}" 
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        Background="{TemplateBinding Background}" 
+                                        Padding="{TemplateBinding Padding}"/>
+
+                                <Border BorderThickness="0,0,0,1" Visibility="{TemplateBinding Header, Converter={StaticResource Object2VisibilityConverter}}" BorderBrush="{TemplateBinding BorderBrush}">
+                                    <ContentPresenter ContentSource="Header" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" ContentStringFormat="{TemplateBinding HeaderStringFormat}"/>
+                                </Border>
+
+                                <ContentPresenter Grid.Row="1" x:Name="FrontContentPresenter"                    
+                                                      Margin="{TemplateBinding Padding}"                            
+                                                      Content="{TemplateBinding FrontContent}" 
+                                                      ContentTemplate="{TemplateBinding FrontContentTemplate}" 
+                                                      ContentTemplateSelector="{TemplateBinding FrontContentTemplateSelector}" 
+                                                      ContentStringFormat="{TemplateBinding FrontContentStringFormat}"
+                                                      RenderTransformOrigin=".5,.5" />
+                                <ContentPresenter Grid.Row="1" x:Name="BackContentPresenter"                    
+                                                      Visibility="Collapsed"
+                                                      Margin="{TemplateBinding Padding}"                            
+                                                      Content="{TemplateBinding BackContent}" 
+                                                      ContentTemplate="{TemplateBinding BackContentTemplate}" 
+                                                      ContentTemplateSelector="{TemplateBinding BackContentTemplateSelector}" 
+                                                      ContentStringFormat="{TemplateBinding BackContentStringFormat}"
+                                                      RenderTransformOrigin=".5,.5" />
+
+
+                                <Border Grid.Row="2" BorderThickness="0,1,0,0"  Visibility="{TemplateBinding Footer, Converter={StaticResource Object2VisibilityConverter}}" BorderBrush="{TemplateBinding BorderBrush}">
+                                    <ContentPresenter ContentSource="Footer" ContentTemplate="{TemplateBinding FooterTemplate}" ContentTemplateSelector="{TemplateBinding FooterTemplateSelector}" ContentStringFormat="{TemplateBinding FooterStringFormat}"/>
+                                </Border>
+                            </Grid>
+                        </controls:Plane3D>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style BasedOn="{StaticResource FlipperStyle}" TargetType="{x:Type controls:Flipper}"/>
+</ResourceDictionary>

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/Flipper.xaml.cs

@@ -0,0 +1,269 @@
+using System;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Threading;
+
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Controls
+{
+    [TemplatePart(Name = Plane3DPartName, Type = typeof(Plane3D))]
+    [TemplateVisualState(GroupName = TemplateFlipGroupName, Name = TemplateFlippedStateName)]
+    [TemplateVisualState(GroupName = TemplateFlipGroupName, Name = TemplateUnflippedStateName)]
+    public class Flipper : Control
+    {
+        public static readonly RoutedCommand FlipCommand = new RoutedCommand();
+
+        public const string Plane3DPartName = "PART_Plane3D";
+        public const string TemplateFlipGroupName = "FlipStates";
+        public const string TemplateFlippedStateName = "Flipped";
+        public const string TemplateUnflippedStateName = "Unflipped";
+
+        private Plane3D _plane3D;
+
+        static Flipper()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(Flipper), new FrameworkPropertyMetadata(typeof(Flipper)));
+        }
+
+        public Flipper()
+        {
+            CommandBindings.Add(new CommandBinding(FlipCommand, FlipHandler));
+        }
+
+        public static readonly DependencyProperty FrontContentProperty = DependencyProperty.Register(
+            nameof(FrontContent), typeof(object), typeof(Flipper), new PropertyMetadata(default(object)));
+
+        public object FrontContent
+        {
+            get => GetValue(FrontContentProperty);
+            set => SetValue(FrontContentProperty, value);
+        }
+
+        public static readonly DependencyProperty FrontContentTemplateProperty = DependencyProperty.Register(
+            nameof(FrontContentTemplate), typeof(DataTemplate), typeof(Flipper), new PropertyMetadata(default(DataTemplate)));
+
+        public DataTemplate FrontContentTemplate
+        {
+            get => (DataTemplate)GetValue(FrontContentTemplateProperty);
+            set => SetValue(FrontContentTemplateProperty, value);
+        }
+
+        public static readonly DependencyProperty FrontContentTemplateSelectorProperty = DependencyProperty.Register(
+            nameof(FrontContentTemplateSelector), typeof(DataTemplateSelector), typeof(Flipper), new PropertyMetadata(default(DataTemplateSelector)));
+
+        public DataTemplateSelector FrontContentTemplateSelector
+        {
+            get => (DataTemplateSelector)GetValue(FrontContentTemplateSelectorProperty);
+            set => SetValue(FrontContentTemplateSelectorProperty, value);
+        }
+
+        public static readonly DependencyProperty FrontContentStringFormatProperty = DependencyProperty.Register(
+            nameof(FrontContentStringFormat), typeof(string), typeof(Flipper), new PropertyMetadata(default(string)));
+
+        public string FrontContentStringFormat
+        {
+            get => (string)GetValue(FrontContentStringFormatProperty);
+            set => SetValue(FrontContentStringFormatProperty, value);
+        }
+
+        public static readonly DependencyProperty BackContentProperty = DependencyProperty.Register(
+            nameof(BackContent), typeof(object), typeof(Flipper), new PropertyMetadata(default(object)));
+
+        public object BackContent
+        {
+            get => GetValue(BackContentProperty);
+            set => SetValue(BackContentProperty, value);
+        }
+
+        public static readonly DependencyProperty BackContentTemplateProperty = DependencyProperty.Register(
+            nameof(BackContentTemplate), typeof(DataTemplate), typeof(Flipper), new PropertyMetadata(default(DataTemplate)));
+
+        public DataTemplate BackContentTemplate
+        {
+            get => (DataTemplate)GetValue(BackContentTemplateProperty);
+            set => SetValue(BackContentTemplateProperty, value);
+        }
+
+        public static readonly DependencyProperty BackContentTemplateSelectorProperty = DependencyProperty.Register(
+            nameof(BackContentTemplateSelector), typeof(DataTemplateSelector), typeof(Flipper), new PropertyMetadata(default(DataTemplateSelector)));
+
+        public DataTemplateSelector BackContentTemplateSelector
+        {
+            get => (DataTemplateSelector)GetValue(BackContentTemplateSelectorProperty);
+            set => SetValue(BackContentTemplateSelectorProperty, value);
+        }
+
+        public static readonly DependencyProperty BackContentStringFormatProperty = DependencyProperty.Register(
+            nameof(BackContentStringFormat), typeof(string), typeof(Flipper), new PropertyMetadata(default(string)));
+
+        public string BackContentStringFormat
+        {
+            get => (string)GetValue(BackContentStringFormatProperty);
+            set => SetValue(BackContentStringFormatProperty, value);
+        }
+
+        public static readonly DependencyProperty IsFlippedProperty = DependencyProperty.Register(
+            nameof(IsFlipped), typeof(bool), typeof(Flipper), new PropertyMetadata(default(bool), IsFlippedPropertyChangedCallback));
+
+        private static void IsFlippedPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+        {
+            var flipper = (Flipper)dependencyObject;
+            flipper.UpdateVisualStates(true);
+            flipper.RemeasureDuringFlip();
+            OnIsFlippedChanged(flipper, dependencyPropertyChangedEventArgs);
+        }
+
+        public bool IsFlipped
+        {
+            get => (bool)GetValue(IsFlippedProperty);
+            set => SetValue(IsFlippedProperty, value);
+        }
+
+        public static readonly RoutedEvent IsFlippedChangedEvent =
+            EventManager.RegisterRoutedEvent(
+                nameof(IsFlipped),
+                RoutingStrategy.Bubble,
+                typeof(RoutedPropertyChangedEventHandler<bool>),
+                typeof(Flipper));
+
+        public event RoutedPropertyChangedEventHandler<bool> IsFlippedChanged
+        {
+            add => AddHandler(IsFlippedChangedEvent, value);
+            remove => RemoveHandler(IsFlippedChangedEvent, value);
+        }
+
+        private static void OnIsFlippedChanged(
+            DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var instance = (Flipper)d;
+            var args = new RoutedPropertyChangedEventArgs<bool>(
+                    (bool)e.OldValue,
+                    (bool)e.NewValue)
+            {
+                RoutedEvent = IsFlippedChangedEvent
+            };
+            instance.RaiseEvent(args);
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            UpdateVisualStates(false);
+
+            _plane3D = GetTemplateChild(Plane3DPartName) as Plane3D;
+        }
+
+        private void RemeasureDuringFlip()
+        {
+            //not entirely happy hardcoding this, but I have explored other options I am not happy with, and this will do for now
+            const int storyboardMs = 400;
+            const int granularity = 6;
+
+            var remeasureInterval = new TimeSpan(0, 0, 0, 0, storyboardMs / granularity);
+            var refreshCount = 0;
+            var plane3D = _plane3D;
+            if (plane3D is null) return;
+
+            DispatcherTimer dt = null;
+            dt = new DispatcherTimer(remeasureInterval, DispatcherPriority.Normal,
+                (sender, args) => {
+                    plane3D.InvalidateMeasure();
+                    if (refreshCount++ == granularity)
+                        dt?.Stop();
+                }, Dispatcher);
+            dt.Start();
+        }
+
+        private void UpdateVisualStates(bool useTransitions)
+        {
+            VisualStateManager.GoToState(this, IsFlipped ? TemplateFlippedStateName : TemplateUnflippedStateName,
+                useTransitions);
+        }
+
+        private void FlipHandler(object sender, ExecutedRoutedEventArgs executedRoutedEventArgs)
+        {
+            SetCurrentValue(IsFlippedProperty, !IsFlipped);
+        }
+
+
+        public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
+          nameof(Header), typeof(object), typeof(Flipper), new PropertyMetadata(default(object)));
+
+        public object Header
+        {
+            get => GetValue(HeaderProperty);
+            set => SetValue(HeaderProperty, value);
+        }
+
+        public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register(
+            nameof(HeaderTemplate), typeof(DataTemplate), typeof(Flipper), new PropertyMetadata(default(DataTemplate)));
+
+        [Bindable(true), Category("Content")]
+        public DataTemplate HeaderTemplate
+        {
+            get => (DataTemplate)GetValue(HeaderTemplateProperty);
+            set => SetValue(HeaderTemplateProperty, value);
+        }
+
+        public static readonly DependencyProperty HeaderTemplateSelectorProperty = DependencyProperty.Register(
+            nameof(HeaderTemplateSelector), typeof(DataTemplateSelector), typeof(Flipper), new PropertyMetadata(default(DataTemplateSelector)));
+
+        [Bindable(true), Category("Content")]
+        public DataTemplateSelector HeaderTemplateSelector
+        {
+            get => (DataTemplateSelector)GetValue(HeaderTemplateSelectorProperty);
+            set => SetValue(HeaderTemplateSelectorProperty, value);
+        }
+
+        public static readonly DependencyProperty HeaderStringFormatProperty = DependencyProperty.Register(
+            nameof(HeaderStringFormat), typeof(string), typeof(Flipper), new PropertyMetadata(default(string)));
+
+        [Bindable(true), Category("Content")]
+        public string HeaderStringFormat
+        {
+            get => (string)GetValue(HeaderStringFormatProperty);
+            set => SetValue(HeaderStringFormatProperty, value);
+        }
+
+        public static readonly DependencyProperty FooterProperty = DependencyProperty.Register(
+            nameof(Footer), typeof(object), typeof(Flipper), new PropertyMetadata(default(object)));
+
+        public object Footer
+        {
+            get => GetValue(FooterProperty);
+            set => SetValue(FooterProperty, value);
+        }
+
+        public static readonly DependencyProperty FooterTemplateProperty = DependencyProperty.Register(
+            nameof(FooterTemplate), typeof(DataTemplate), typeof(Flipper), new PropertyMetadata(default(DataTemplate)));
+
+        [Bindable(true), Category("Content")]
+        public DataTemplate FooterTemplate
+        {
+            get => (DataTemplate)GetValue(FooterTemplateProperty);
+            set => SetValue(FooterTemplateProperty, value);
+        }
+
+        public static readonly DependencyProperty FooterTemplateSelectorProperty = DependencyProperty.Register(
+            nameof(FooterTemplateSelector), typeof(DataTemplateSelector), typeof(Flipper), new PropertyMetadata(default(DataTemplateSelector)));
+
+        [Bindable(true), Category("Content")]
+        public DataTemplateSelector FooterTemplateSelector
+        {
+            get => (DataTemplateSelector)GetValue(FooterTemplateSelectorProperty);
+            set => SetValue(FooterTemplateSelectorProperty, value);
+        }
+
+        public static readonly DependencyProperty FooterStringFormatProperty = DependencyProperty.Register(
+            nameof(FooterStringFormat), typeof(string), typeof(Flipper), new PropertyMetadata(default(string)));
+
+        [Bindable(true), Category("Content")]
+        public string FooterStringFormat
+        {
+            get => (string)GetValue(FooterStringFormatProperty);
+            set => SetValue(FooterStringFormatProperty, value);
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/GeometryRenderer.cs

@@ -0,0 +1,310 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using ZXing.Common;
+using ZXing.Rendering;
+using ZXing;
+using System.Windows;
+
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Controls
+{
+    /// <summary>
+    /// Renders a barcode into a geometry
+    /// Autor: Rob Fonseca-Ensor
+    /// </summary>
+    public class GeometryRenderer : IBarcodeRenderer<Geometry>
+    {
+        /// <summary>
+        /// Renders the specified matrix.
+        /// </summary>
+        /// <param name="matrix">The matrix.</param>
+        /// <param name="format">The format.</param>
+        /// <param name="content">The content.</param>
+        /// <returns></returns>
+        public Geometry Render(BitMatrix matrix, BarcodeFormat format, string content)
+        {
+            return Render(matrix, format, content, null);
+        }
+
+        /// <summary>
+        /// Renders the specified matrix.
+        /// </summary>
+        /// <param name="matrix">The matrix.</param>
+        /// <param name="format">The format.</param>
+        /// <param name="content">The content.</param>
+        /// <param name="options">The options.</param>
+        /// <returns></returns>
+        public Geometry Render(BitMatrix matrix, BarcodeFormat format, string content, EncodingOptions options)
+        {
+            var edges = new HashSet<Edge>();
+            var edgeMap = new Dictionary<Coordinate, List<Edge>>();
+            var cols = matrix.Width;
+            var rows = matrix.Height;
+
+            for (int c = 0; c <= cols; c++)
+            {
+                for (int r = 0; r <= rows; r++)
+                {
+                    var cell = GetCell(c, r, matrix);
+                    var westCell = GetCell(c - 1, r, matrix);
+                    var northCell = GetCell(c, r - 1, matrix);
+                    if (northCell != cell)
+                    {
+                        AddEdge(new Edge(c, r, c + 1, r), edges, edgeMap);
+                    }
+
+                    if (westCell != cell)
+                    {
+                        AddEdge(new Edge(c, r, c, r + 1), edges, edgeMap);
+                    }
+                }
+            }
+
+            var cycles = new List<List<Coordinate>>();
+
+            while (edges.Count > 0)
+            {
+                var edge = edges.First();
+                RemoveEdge(edge, edges, edgeMap);
+
+                if (IsEdgeLeftHand(matrix, edge))
+                {
+                    edge = edge.Reversed();
+                }
+
+                var currentCycle = new List<Coordinate> { edge.From, edge.To };
+                while (edge.To != currentCycle[0])
+                {
+                    var moves = from direction in Turns(edge.From - edge.To)
+                                let nextCoordinate = direction + edge.To
+                                from e in EdgesFrom(edge.To, edgeMap)
+                                where e.To == nextCoordinate || e.From == nextCoordinate
+                                select e;
+
+                    var nextEdge = moves.First();
+                    RemoveEdge(nextEdge, edges, edgeMap);
+                    edge = nextEdge.To != edge.To ? nextEdge : nextEdge.Reversed();
+                    currentCycle.Add(edge.To);
+                }
+                cycles.Add(currentCycle);
+            }
+
+            return new PathGeometry(cycles.Select(x => new PathFigure(x.First().ToPoint(1), x.Skip(1).Select(y => new LineSegment(y.ToPoint(1), true)), true)));
+
+        }
+
+        private static bool IsEdgeLeftHand(BitMatrix b, Edge edge)
+        {
+            var cell = GetCell(edge.From.Col, edge.From.Row, b);
+            return (edge.From.Row < edge.To.Row && cell) || (!(edge.From.Col < edge.To.Col && cell));
+        }
+
+        private static IEnumerable<Edge> EdgesFrom(Coordinate c, Dictionary<Coordinate, List<Edge>> edgeMap)
+        {
+            return edgeMap.ContainsKey(c) ? edgeMap[c] : Enumerable.Empty<Edge>();
+        }
+
+        private static IEnumerable<Coordinate> Turns(Coordinate currentDirection)
+        {
+            int index = Array.IndexOf(Coordinate.Directions, currentDirection);
+            return Coordinate.Directions.Skip(index + 1).Concat(Coordinate.Directions.Take(index));
+        }
+
+        private static bool GetCell(int c, int r, BitMatrix matrix)
+        {
+            if (r < 0 || r >= matrix.Height)
+            {
+                return false;
+            }
+            if (c < 0 || c >= matrix.Width)
+            {
+                return false;
+            }
+            return matrix[c, r];
+        }
+
+        private static void RemoveEdge(Edge e, HashSet<Edge> edges, Dictionary<Coordinate, List<Edge>> edgeMap)
+        {
+            edges.Remove(e);
+            edgeMap[e.From].Remove(e);
+            edgeMap[e.To].Remove(e);
+        }
+
+        private static void AddEdge(Edge e, HashSet<Edge> edges, Dictionary<Coordinate, List<Edge>> edgeMap)
+        {
+            edges.Add(e);
+            AddCoordinate(e.From, e, edgeMap);
+            AddCoordinate(e.To, e, edgeMap);
+        }
+
+        private static void AddCoordinate(Coordinate c, Edge e, Dictionary<Coordinate, List<Edge>> edgeMap)
+        {
+            List<Edge> list;
+            if (!edgeMap.TryGetValue(c, out list))
+            {
+                edgeMap[c] = list = new List<Edge>();
+            }
+            list.Add(e);
+        }
+
+
+        private struct Coordinate
+        {
+            public readonly int Row, Col;
+
+            public Coordinate(int col, int row)
+            {
+                Col = col;
+                Row = row;
+            }
+
+            public bool Equals(Coordinate other)
+            {
+                return other.Row == Row && other.Col == Col;
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (ReferenceEquals(null, obj))
+                    return false;
+                if (obj.GetType() != typeof(Coordinate))
+                    return false;
+                return Equals((Coordinate)obj);
+            }
+
+            public override int GetHashCode()
+            {
+                unchecked
+                {
+                    return (Row * 397) ^ Col;
+                }
+            }
+
+            public override string ToString()
+            {
+                var s = "";
+                if (this == North)
+                    s = " n";
+                if (this == West)
+                    s = " w";
+                if (this == South)
+                    s = " s";
+                if (this == East)
+                    s = " e";
+                return String.Format("({0}, {1}{2})", Col, Row, s);
+            }
+
+            public static bool operator ==(Coordinate left, Coordinate right)
+            {
+                return left.Equals(right);
+            }
+
+            public static bool operator !=(Coordinate left, Coordinate right)
+            {
+                return !left.Equals(right);
+            }
+
+            public static Coordinate operator +(Coordinate c1, Coordinate c2)
+            {
+                return new Coordinate(c1.Col + c2.Col, c1.Row + c2.Row);
+            }
+
+            public static Coordinate operator -(Coordinate c1, Coordinate c2)
+            {
+                return new Coordinate(c1.Col - c2.Col, c1.Row - c2.Row);
+            }
+
+            public Point ToPoint(double scale)
+            {
+                return new Point(Col * scale, Row * scale);
+            }
+
+            private static readonly Coordinate West = new Coordinate(-1, 0);
+            private static readonly Coordinate South = new Coordinate(0, 1);
+            private static readonly Coordinate East = new Coordinate(1, 0);
+            private static readonly Coordinate North = new Coordinate(0, -1);
+
+            public static readonly Coordinate[] Directions = new[]
+               {
+               West,
+               South,
+               East,
+               North,
+            };
+        }
+
+        private struct Edge
+        {
+            public readonly Coordinate From, To;
+
+            public Edge(Coordinate from, Coordinate to)
+            {
+                From = from;
+                To = to;
+            }
+
+            public Edge(int fromCol, int fromRow, int toCol, int toRow)
+               : this(new Coordinate(fromCol, fromRow), new Coordinate(toCol, toRow))
+            {
+
+            }
+
+
+            public bool Equals(Edge other)
+            {
+                return other.From.Equals(From) && other.To.Equals(To);
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (ReferenceEquals(null, obj))
+                    return false;
+                if (obj.GetType() != typeof(Edge))
+                    return false;
+                return Equals((Edge)obj);
+            }
+
+            public override int GetHashCode()
+            {
+                unchecked
+                {
+                    return (From.GetHashCode() * 397) ^ To.GetHashCode();
+                }
+            }
+
+            public override string ToString()
+            {
+                char angle = ' ';
+                if (From.Col == To.Col)
+                {
+                    angle = '|';
+                }
+                if (From.Row == To.Row)
+                {
+                    angle = '-';
+                }
+
+
+                return string.Format("[{0} {2} {1}]", From, To, angle);
+            }
+
+            public static bool operator ==(Edge left, Edge right)
+            {
+                return left.Equals(right);
+            }
+
+            public static bool operator !=(Edge left, Edge right)
+            {
+                return !left.Equals(right);
+            }
+
+            public Edge Reversed()
+            {
+                return new Edge(To, From);
+            }
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/GradientStopControl.xaml

@@ -1,12 +1,12 @@
-<UserControl x:Class="AIStudio.Wpf.DiagramHelper.Controls.GradientStopControl"
+<UserControl x:Class="AIStudio.Wpf.DiagramDesigner.Additionals.Controls.GradientStopControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls"
+             xmlns:local="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Controls"
              xmlns:Fluent="urn:fluent-ribbon"
-             xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters"
-             xmlns:helper="clr-namespace:AIStudio.Wpf.DiagramHelper.Helpers"
+             xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Converters"
+             xmlns:helper="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals"
              xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram" 
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              mc:Ignorable="d" 
@@ -106,7 +106,7 @@
                         <Slider Maximum="1" Minimum="0" LargeChange="0.1" SmallChange="0.01" 
                                                 Value="{Binding Offset}" 
                                                 Foreground="{Binding Color, Converter={StaticResource ColorBrushConverter}}" 
-                                                Style="{StaticResource TransparentSlider}"/>
+                                                Style="{StaticResource AIStudio.DiagramApp.Styles.Slider.Transparent}"/>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/GradientStopControl.xaml.cs

@@ -14,7 +14,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.DiagramHelper.Controls
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Controls
 {
     /// <summary>
     /// GradientStopControl.xaml 的交互逻辑

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/Light.Blue.xaml

@@ -6,58 +6,58 @@
                     xmlns:system="clr-namespace:System;assembly=mscorlib"
                     mc:Ignorable="options d">
     <!-- Matadata -->
-    <system:String x:Key="Theme.Name">{{ThemeName}}</system:String>
+    <system:String x:Key="Theme.Name">Light.Blue</system:String>
     <system:String x:Key="Theme.Origin">Fluent.Ribbon</system:String>
-    <system:String x:Key="Theme.DisplayName">{{ThemeDisplayName}}</system:String>
-    <system:String x:Key="Theme.BaseColorScheme">{{BaseColorScheme}}</system:String>
-    <system:String x:Key="Theme.ColorScheme">{{ColorScheme}}</system:String>
-    <system:String x:Key="Theme.AlternativeColorScheme">{{AlternativeColorScheme}}</system:String>
+    <system:String x:Key="Theme.DisplayName">Blue (Light)</system:String>
+    <system:String x:Key="Theme.BaseColorScheme">Light</system:String>
+    <system:String x:Key="Theme.ColorScheme">Blue</system:String>
+    <system:String x:Key="Theme.AlternativeColorScheme">Blue</system:String>
     
-    <Color x:Key="Theme.PrimaryAccentColor">{{Fluent.Ribbon.Colors.AccentBaseColor}}</Color>
-    <SolidColorBrush x:Key="Theme.ShowcaseBrush" Color="{{Fluent.Ribbon.Colors.AccentBaseColor}}" options:Freeze="True" />
-    <system:Boolean x:Key="Theme.IsHighContrast">{{IsHighContrast}}</system:Boolean>
+    <Color x:Key="Theme.PrimaryAccentColor">#FF0078D7</Color>
+    <SolidColorBrush x:Key="Theme.ShowcaseBrush" Color="#FF0078D7" options:Freeze="True" />
+    <system:Boolean x:Key="Theme.IsHighContrast">False</system:Boolean>
 
     <!-- COLORS -->
 
     <!-- Accent colors -->
-    <Color x:Key="Fluent.Ribbon.Colors.AccentBaseColor">{{Fluent.Ribbon.Colors.AccentBaseColor}}</Color>
+    <Color x:Key="Fluent.Ribbon.Colors.AccentBaseColor">#FF0078D7</Color>
     <!--80%-->
-    <Color x:Key="Fluent.Ribbon.Colors.AccentColor80">{{Fluent.Ribbon.Colors.AccentColor80}}</Color>
+    <Color x:Key="Fluent.Ribbon.Colors.AccentColor80">#CC0078D7</Color>
     <!--60%-->
-    <Color x:Key="Fluent.Ribbon.Colors.AccentColor60">{{Fluent.Ribbon.Colors.AccentColor60}}</Color>
+    <Color x:Key="Fluent.Ribbon.Colors.AccentColor60">#990078D7</Color>
     <!--40%-->
-    <Color x:Key="Fluent.Ribbon.Colors.AccentColor40">{{Fluent.Ribbon.Colors.AccentColor40}}</Color>
+    <Color x:Key="Fluent.Ribbon.Colors.AccentColor40">#660078D7</Color>
     <!--20%-->
-    <Color x:Key="Fluent.Ribbon.Colors.AccentColor20">{{Fluent.Ribbon.Colors.AccentColor20}}</Color>
+    <Color x:Key="Fluent.Ribbon.Colors.AccentColor20">#330078D7</Color>
 
-    <Color x:Key="Fluent.Ribbon.Colors.HighlightColor">{{Fluent.Ribbon.Colors.HighlightColor}}</Color>
+    <Color x:Key="Fluent.Ribbon.Colors.HighlightColor">#FF086F9E</Color>
 
     <!-- Base colors -->
-    <Color x:Key="BlackColor">{{BlackColor}}</Color>
-    <Color x:Key="BlackColor20">{{BlackColor20}}</Color>
-    <Color x:Key="WhiteColor">{{WhiteColor}}</Color>
-    <Color x:Key="WhiteColor20">{{WhiteColor20}}</Color>
-    <Color x:Key="Gray1">{{Gray1}}</Color>
-    <Color x:Key="Gray2">{{Gray2}}</Color>
-    <Color x:Key="Gray3">{{Gray3}}</Color>
-    <Color x:Key="Gray4">{{Gray4}}</Color>
-    <Color x:Key="Gray5">{{Gray5}}</Color>
-    <Color x:Key="Gray6">{{Gray6}}</Color>
-    <Color x:Key="Gray7">{{Gray7}}</Color>
-    <Color x:Key="Gray8">{{Gray8}}</Color>
-    <Color x:Key="Gray9">{{Gray9}}</Color>
-    <Color x:Key="Gray10">{{Gray10}}</Color>
+    <Color x:Key="BlackColor">#FF000000</Color>
+    <Color x:Key="BlackColor20">#51000000</Color>
+    <Color x:Key="WhiteColor">#FFFFFFFF</Color>
+    <Color x:Key="WhiteColor20">#51FFFFFF</Color>
+    <Color x:Key="Gray1">#FF333333</Color>
+    <Color x:Key="Gray2">#FF7F7F7F</Color>
+    <Color x:Key="Gray3">#FF9D9D9D</Color>
+    <Color x:Key="Gray4">#FFA59F93</Color>
+    <Color x:Key="Gray5">#FFB9B9B9</Color>
+    <Color x:Key="Gray6">#FFCCCCCC</Color>
+    <Color x:Key="Gray7">#FFD8D8D9</Color>
+    <Color x:Key="Gray8">#FFE0E0E0</Color>
+    <Color x:Key="Gray9">#5EC9C9C9</Color>
+    <Color x:Key="Gray10">#FFF7F7F7</Color>
 
     <Color x:Key="TransparentWhiteColor">#00FFFFFF</Color>
     <Color x:Key="Fluent.Ribbon.Colors.HighTransparentWhiteColor">#17FFFFFF</Color>
 
     <!-- Foreground -->
-    <Color x:Key="Fluent.Ribbon.Colors.IdealForegroundColor">{{Fluent.Ribbon.Colors.IdealForegroundColor}}</Color>
-    <Color x:Key="Fluent.Ribbon.Colors.DarkIdealForegroundDisabledColor">{{Fluent.Ribbon.Colors.DarkIdealForegroundDisabledColor}}</Color>
+    <Color x:Key="Fluent.Ribbon.Colors.IdealForegroundColor">White</Color>
+    <Color x:Key="Fluent.Ribbon.Colors.DarkIdealForegroundDisabledColor">#ADADAD</Color>
 
     <!-- Misc colors -->
-    <Color x:Key="Fluent.Ribbon.Colors.ExtremeHighlightColor">{{Fluent.Ribbon.Colors.ExtremeHighlightColor}}</Color>
-    <Color x:Key="Fluent.Ribbon.Colors.DarkExtremeHighlightColor">{{Fluent.Ribbon.Colors.DarkExtremeHighlightColor}}</Color>
+    <Color x:Key="Fluent.Ribbon.Colors.ExtremeHighlightColor">#FFFFD232</Color>
+    <Color x:Key="Fluent.Ribbon.Colors.DarkExtremeHighlightColor">#FFF29536</Color>
 
     <!-- END COLORS -->
 
@@ -99,26 +99,26 @@
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.IdealForegroundColorBrush" Color="{StaticResource Fluent.Ribbon.Colors.IdealForegroundColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.IdealForegroundDisabledBrush" Color="{StaticResource Fluent.Ribbon.Colors.IdealForegroundColor}" Opacity="0.4" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.DarkIdealForegroundDisabledBrush" Color="{StaticResource Fluent.Ribbon.Colors.DarkIdealForegroundDisabledColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.LabelTextBrush" Color="{{Fluent.Ribbon.Brushes.LabelTextBrush}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.LabelTextBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
 
     <!-- Generic control brushes -->
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Control.BorderBrush" Color="{StaticResource Gray6}" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Control.Disabled.BorderBrush" Color="{StaticResource Gray5}" options:Freeze="True" />
 
     <!-- Backstage -->
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Backstage.Background" Color="{{Fluent.Ribbon.Brushes.Backstage.Background}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Backstage.Foreground" Color="{{Fluent.Ribbon.Brushes.Backstage.Foreground}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Backstage.BackButton.Background" Color="{{Fluent.Ribbon.Brushes.Backstage.BackButton.Background}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Backstage.BackButton.Foreground" Color="{{Fluent.Ribbon.Brushes.Backstage.BackButton.Foreground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Backstage.Background" Color="{StaticResource Fluent.Ribbon.Colors.AccentBaseColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Backstage.Foreground" Color="{StaticResource Fluent.Ribbon.Colors.IdealForegroundColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Backstage.BackButton.Background" Color="Transparent" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Backstage.BackButton.Foreground" Color="{StaticResource Fluent.Ribbon.Colors.IdealForegroundColor}" options:Freeze="True" />
 
     <!-- BackstageTabControl -->
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.BackstageTabControl.Button.MouseOver.Background" Color="{{Fluent.Ribbon.Brushes.BackstageTabControl.Button.MouseOver.Background}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.BackstageTabControl.ItemsPanelBackground" Color="{{Fluent.Ribbon.Brushes.BackstageTabControl.ItemsPanelBackground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.BackstageTabControl.Button.MouseOver.Background" Color="{StaticResource BlackColor20}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.BackstageTabControl.ItemsPanelBackground" Color="{StaticResource Fluent.Ribbon.Colors.AccentBaseColor}" options:Freeze="True" />
 
     <!-- BackstageTabItem -->
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.BackstageTabItem.Header.Foreground" Color="{{Fluent.Ribbon.Brushes.BackstageTabItem.Header.Foreground}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.BackstageTabItem.MouseOver.Background" Color="{{Fluent.Ribbon.Brushes.BackstageTabItem.MouseOver.Background}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.BackstageTabItem.Selected.Background" Color="{{Fluent.Ribbon.Brushes.BackstageTabItem.Selected.Background}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.BackstageTabItem.Header.Foreground" Color="{StaticResource Fluent.Ribbon.Colors.IdealForegroundColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.BackstageTabItem.MouseOver.Background" Color="{StaticResource BlackColor20}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.BackstageTabItem.Selected.Background" Color="{StaticResource WhiteColor20}" options:Freeze="True" />
 
     <!-- Button -->
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Button.MouseOver.BorderBrush" Color="{StaticResource Fluent.Ribbon.Colors.AccentColor40}" options:Freeze="True" />
@@ -160,13 +160,13 @@
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.GalleryItem.Pressed" Color="{StaticResource Fluent.Ribbon.Colors.AccentColor60}" options:Freeze="True" />
 
     <!-- Images -->
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Images.QuickAccessToolbarDropDown" Color="{{Fluent.Ribbon.Colors.Images.DefaultColor}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Images.QuickAccessToolbarDropDown" Color="{StaticResource BlackColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Images.QuickAccessToolbarDropDown.BelowRibbon" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Images.QuickAccessToolbarExtender" Color="{{Fluent.Ribbon.Colors.Images.DefaultColor}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Images.QuickAccessToolbarExtender" Color="{StaticResource BlackColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Images.QuickAccessToolbarExtender.BelowRibbon" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Images.RibbonCollapse" Color="{{Fluent.Ribbon.Colors.Images.DefaultColor}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Images.RibbonExpand" Color="{{Fluent.Ribbon.Colors.Images.DefaultColor}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Images.RibbonPin" Color="{{Fluent.Ribbon.Colors.Images.DefaultColor}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Images.RibbonCollapse" Color="{StaticResource BlackColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Images.RibbonExpand" Color="{StaticResource BlackColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Images.RibbonPin" Color="{StaticResource BlackColor}" options:Freeze="True" />
 
     <!-- KeyTip -->
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.KeyTip.Background" Color="{StaticResource Gray1}" options:Freeze="True" />
@@ -174,8 +174,8 @@
 
     <!-- MenuItem -->
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.MenuItem.Background" Color="Transparent" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Background" Color="{{Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Background}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.BorderBrush" Color="{{Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.BorderBrush}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Background" Color="#FFFCF1C2" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.BorderBrush" Color="#FFF29536" options:Freeze="True" />
 
     <LinearGradientBrush x:Key="Fluent.Ribbon.MenuItem.SubMenu.Arrow.Fill" EndPoint="0.945,0.872" StartPoint="0.055,0.128" options:Freeze="True">
         <GradientStop Color="{StaticResource Gray2}" Offset="1" />
@@ -192,36 +192,36 @@
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonGroupBox.Collapsed.BorderBrush" Color="{StaticResource Gray6}" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonGroupBox.Collapsed.MouseOver.Background" Color="{StaticResource Gray10}" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonGroupBox.DropDownOpen.Background" Color="{StaticResource Gray8}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonGroupBox.Header.Foreground" Color="{{Fluent.Ribbon.Brushes.RibbonGroupBox.Header.Foreground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonGroupBox.Header.Foreground" Color="{StaticResource Gray2}" options:Freeze="True" />
 
     <!-- RibbonTabControl -->
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabControl.Background" Color="{{Fluent.Ribbon.Brushes.RibbonTabControl.Background}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabControl.Background" Color="{StaticResource WhiteColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabControl.Foreground" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabControl.Content.Background" Color="{{Fluent.Ribbon.Brushes.RibbonTabControl.Content.Background}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabControl.Content.Background" Color="{StaticResource WhiteColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabControl.Content.BorderBrush" Color="Transparent" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabControl.Content.Foreground" Color="{{Fluent.Ribbon.Brushes.RibbonTabControl.Content.Foreground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabControl.Content.Foreground" Color="{StaticResource BlackColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabControl.TabsGrid.Background" Color="Transparent" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabControl.TabsGrid.Foreground" Color="{StaticResource BlackColor}" options:Freeze="True" />
 
     <!-- RibbonContextualTabGroup -->
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonContextualTabGroup.TabItemSelectedForeground" Color="{{Fluent.Ribbon.Brushes.RibbonContextualTabGroup.TabItemSelectedForeground}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonContextualTabGroup.TabItemMouseOverForeground" Color="{{Fluent.Ribbon.Brushes.RibbonContextualTabGroup.TabItemMouseOverForeground}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonContextualTabGroup.TabItemSelectedMouseOverForeground" Color="{{Fluent.Ribbon.Brushes.RibbonContextualTabGroup.TabItemSelectedMouseOverForeground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonContextualTabGroup.TabItemSelectedForeground" Color="{StaticResource BlackColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonContextualTabGroup.TabItemMouseOverForeground" Color="{StaticResource Fluent.Ribbon.Colors.HighlightColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonContextualTabGroup.TabItemSelectedMouseOverForeground" Color="{StaticResource Fluent.Ribbon.Colors.HighlightColor}" options:Freeze="True" />
 
     <!-- RibbonTabItem -->
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.Foreground" Color="{{Fluent.Ribbon.Brushes.RibbonTabItem.Foreground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.Foreground" Color="{StaticResource BlackColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.BorderBrush" Color="{StaticResource Gray8}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.Active.Background" Color="{{Fluent.Ribbon.Brushes.RibbonTabItem.Active.Background}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Background" Color="{{Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Background}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Foreground" Color="{{Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Foreground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.Active.Background" Color="{StaticResource WhiteColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Background" Color="Transparent" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Foreground" Color="{StaticResource Fluent.Ribbon.Colors.HighlightColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.Selected.Foreground" Color="{StaticResource Gray1}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.Selected.MouseOver.Foreground" Color="{{Fluent.Ribbon.Brushes.RibbonTabItem.Selected.MouseOver.Foreground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.Selected.MouseOver.Foreground" Color="{StaticResource Fluent.Ribbon.Colors.HighlightColor}" options:Freeze="True" />
 
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.Contextual.Background.OpacityMask" Color="#14000000" options:Freeze="True" />
 
     <!-- RibbonWindow -->
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonWindow.TitleBackground" Color="{{Fluent.Ribbon.Brushes.RibbonWindow.TitleBackground}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonWindow.TitleForeground" Color="{{Fluent.Ribbon.Brushes.RibbonWindow.TitleForeground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonWindow.TitleBackground" Color="Transparent" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonWindow.TitleForeground" Color="{StaticResource BlackColor}" options:Freeze="True" />
 
     <!-- Separator -->
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Separator.BorderBrush" Color="{StaticResource Gray8}" options:Freeze="True" />
@@ -257,10 +257,10 @@
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.TextBox.Disabled.BorderBrush" Color="{StaticResource Gray8}" options:Freeze="True" />
 
     <!-- WindowCommands -->
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Foreground" Color="{{Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Foreground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Foreground" Color="{StaticResource BlackColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Background" Color="{StaticResource TransparentWhiteColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.MouseOver.Background" Color="{{Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.MouseOver.Background}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Pressed.Background" Color="{{Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Pressed.Background}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.MouseOver.Background" Color="{StaticResource Fluent.Ribbon.Colors.AccentColor20}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Pressed.Background" Color="{StaticResource Fluent.Ribbon.Colors.AccentColor40}" options:Freeze="True" />
 
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CloseButton.MouseOver.Background" Color="#E81123" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CloseButton.Pressed.Background" Color="#A92831" options:Freeze="True" />

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/OutlineText.cs

@@ -5,7 +5,7 @@ using System.Windows;
 using System.Windows.Documents;
 using System.Windows.Media;
 
-namespace AIStudio.Wpf.DiagramHelper.Controls
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Controls
 {
     public class OutlineText : FrameworkElement
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/Plane3D.cs

@@ -0,0 +1,259 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Media3D;
+
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Controls
+{
+    /// <summary>
+    /// View a control on a 3D plane.    
+    /// </summary>
+    /// <remarks>
+    /// Taken from http://blogs.msdn.com/greg_schechter/archive/2007/10/26/enter-the-planerator-dead-simple-3d-in-wpf-with-a-stupid-name.aspx , Greg Schechter - Fall 2007
+    /// </remarks>
+    [ContentProperty("Child")]
+    public class Plane3D : FrameworkElement
+    {
+        private FrameworkElement _logicalChild;
+        private FrameworkElement _visualChild;
+        private FrameworkElement _originalChild;
+
+        private readonly QuaternionRotation3D _quaternionRotation = new QuaternionRotation3D();
+        private readonly RotateTransform3D _rotationTransform = new RotateTransform3D();
+        private Viewport3D _viewport3D;
+        private readonly ScaleTransform3D _scaleTransform = new ScaleTransform3D();
+
+        private static readonly Point3D[] Mesh = { new Point3D(0, 0, 0), new Point3D(0, 1, 0), new Point3D(1, 1, 0), new Point3D(1, 0, 0) };
+        private static readonly Point[] TexCoords = { new Point(0, 1), new Point(0, 0), new Point(1, 0), new Point(1, 1) };
+        private static readonly int[] Indices = { 0, 2, 1, 0, 3, 2 };
+        private static readonly Vector3D XAxis = new Vector3D(1, 0, 0);
+        private static readonly Vector3D YAxis = new Vector3D(0, 1, 0);
+        private static readonly Vector3D ZAxis = new Vector3D(0, 0, 1);
+
+
+        public static readonly DependencyProperty RotationXProperty =
+            DependencyProperty.Register("RotationX", typeof(double), typeof(Plane3D), new UIPropertyMetadata(0.0, (d, args) => ((Plane3D)d).UpdateRotation()));
+
+        public double RotationX
+        {
+            get => (double)GetValue(RotationXProperty);
+            set => SetValue(RotationXProperty, value);
+        }
+
+        public static readonly DependencyProperty RotationYProperty =
+            DependencyProperty.Register("RotationY", typeof(double), typeof(Plane3D), new UIPropertyMetadata(0.0, (d, args) => ((Plane3D)d).UpdateRotation()));
+
+        public double RotationY
+        {
+            get => (double)GetValue(RotationYProperty);
+            set => SetValue(RotationYProperty, value);
+        }
+
+        public static readonly DependencyProperty RotationZProperty =
+            DependencyProperty.Register("RotationZ", typeof(double), typeof(Plane3D), new UIPropertyMetadata(0.0, (d, args) => ((Plane3D)d).UpdateRotation()));
+
+        public double RotationZ
+        {
+            get => (double)GetValue(RotationZProperty);
+            set => SetValue(RotationZProperty, value);
+        }
+
+        public static readonly DependencyProperty FieldOfViewProperty =
+            DependencyProperty.Register("FieldOfView", typeof(double), typeof(Plane3D), new UIPropertyMetadata(45.0, (d, args) => ((Plane3D)d).Update3D(),
+                (d, val) => Math.Min(Math.Max((double)val, 0.5), 179.9))); // clamp to a meaningful range
+
+        public double FieldOfView
+        {
+            get => (double)GetValue(FieldOfViewProperty);
+            set => SetValue(FieldOfViewProperty, value);
+        }
+
+        public static readonly DependencyProperty ZFactorProperty = DependencyProperty.Register(
+            "ZFactor", typeof(double), typeof(Plane3D), new UIPropertyMetadata(2.0, (d, args) => ((Plane3D)d).UpdateRotation()));
+
+        public double ZFactor
+        {
+            get => (double)GetValue(ZFactorProperty);
+            set => SetValue(ZFactorProperty, value);
+        }
+
+        public FrameworkElement Child
+        {
+            get => _originalChild;
+            set
+            {
+                if (Equals(_originalChild, value)) return;
+                RemoveVisualChild(_visualChild);
+                RemoveLogicalChild(_logicalChild);
+
+                // Wrap child with special decorator that catches layout invalidations. 
+                _originalChild = value;
+                _logicalChild = new LayoutInvalidationCatcher() { Child = _originalChild };
+                _visualChild = CreateVisualChild();
+
+                AddVisualChild(_visualChild);
+
+                // Need to use a logical child here to make sure databinding operations get down to it,
+                // since otherwise the child appears only as the Visual to a Viewport2DVisual3D, which 
+                // doesn't have databinding operations pass into it from above.
+                AddLogicalChild(_logicalChild);
+                InvalidateMeasure();
+            }
+        }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            Size result;
+            if (_logicalChild != null)
+            {
+                // Measure based on the size of the logical child, since we want to align with it.
+                _logicalChild.Measure(availableSize);
+                result = _logicalChild.DesiredSize;
+                _visualChild?.Measure(result);
+            }
+            else
+            {
+                result = new Size(0, 0);
+            }
+            return result;
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            if (_logicalChild is null) return base.ArrangeOverride(finalSize);
+            _logicalChild.Arrange(new Rect(finalSize));
+            _visualChild?.Arrange(new Rect(finalSize));
+            Update3D();
+            return base.ArrangeOverride(finalSize);
+        }
+
+        protected override Visual GetVisualChild(int index) => _visualChild;
+
+        protected override int VisualChildrenCount => _visualChild == null ? 0 : 1;
+
+        private FrameworkElement CreateVisualChild()
+        {
+            var simpleQuad = new MeshGeometry3D
+            {
+                Positions = new Point3DCollection(Mesh),
+                TextureCoordinates = new PointCollection(TexCoords),
+                TriangleIndices = new Int32Collection(Indices)
+            };
+
+            // Front material is interactive, back material is not.
+            Material frontMaterial = new DiffuseMaterial(Brushes.White);
+            frontMaterial.SetValue(Viewport2DVisual3D.IsVisualHostMaterialProperty, true);
+
+            var vb = new VisualBrush(_logicalChild);
+            SetCachingForObject(vb);  // big perf wins by caching!!
+            Material backMaterial = new DiffuseMaterial(vb);
+
+            _rotationTransform.Rotation = _quaternionRotation;
+            var xfGroup = new Transform3DGroup { Children = { _scaleTransform, _rotationTransform } };
+
+            var backModel = new GeometryModel3D { Geometry = simpleQuad, Transform = xfGroup, BackMaterial = backMaterial };
+            var m3DGroup = new Model3DGroup
+            {
+                Children = { new DirectionalLight(Colors.White, new Vector3D(0, 0, -1)),
+                                 new DirectionalLight(Colors.White, new Vector3D(0.1, -0.1, 1)),
+                                 backModel }
+            };
+
+            // Non-interactive Visual3D consisting of the backside, and two lights.
+            var mv3D = new ModelVisual3D { Content = m3DGroup };
+
+            // Interactive frontside Visual3D
+            var frontModel = new Viewport2DVisual3D { Geometry = simpleQuad, Visual = _logicalChild, Material = frontMaterial, Transform = xfGroup };
+
+            // Cache the brush in the VP2V3 by setting caching on it.  Big perf wins.
+            SetCachingForObject(frontModel);
+
+            // Scene consists of both the above Visual3D's.
+            _viewport3D = new Viewport3D { ClipToBounds = false, Children = { mv3D, frontModel } };
+
+            UpdateRotation();
+
+            return _viewport3D;
+        }
+
+        private void SetCachingForObject(DependencyObject d)
+        {
+            RenderOptions.SetCachingHint(d, CachingHint.Cache);
+            RenderOptions.SetCacheInvalidationThresholdMinimum(d, 0.5);
+            RenderOptions.SetCacheInvalidationThresholdMaximum(d, 2.0);
+        }
+
+        private void UpdateRotation()
+        {
+            var qx = new Quaternion(XAxis, RotationX);
+            var qy = new Quaternion(YAxis, RotationY);
+            var qz = new Quaternion(ZAxis, RotationZ);
+
+            _quaternionRotation.Quaternion = qx * qy * qz;
+        }
+
+        private void Update3D()
+        {
+            // Use GetDescendantBounds for sizing and centering since DesiredSize includes layout whitespace, whereas GetDescendantBounds 
+            // is tighter
+            var logicalBounds = VisualTreeHelper.GetDescendantBounds(_logicalChild);
+            var w = logicalBounds.Width;
+            var h = logicalBounds.Height;
+
+            // Create a camera that looks down -Z, with up as Y, and positioned right halfway in X and Y on the element, 
+            // and back along Z the right distance based on the field-of-view is the same projected size as the 2D content
+            // that it's looking at.  See http://blogs.msdn.com/greg_schechter/archive/2007/04/03/camera-construction-in-parallaxui.aspx
+            // for derivation of this camera.
+            var fovInRadians = FieldOfView * (Math.PI / 180);
+            var zValue = w / Math.Tan(fovInRadians / 2) / ZFactor;
+            if (_viewport3D != null)
+            {
+                _viewport3D.Camera = new PerspectiveCamera(new Point3D(w / 2, h / 2, zValue),
+                                                           -ZAxis,
+                                                           YAxis,
+                                                           FieldOfView);
+            }
+
+            _scaleTransform.ScaleX = w;
+            _scaleTransform.ScaleY = h;
+            _rotationTransform.CenterX = w / 2;
+            _rotationTransform.CenterY = h / 2;
+        }
+
+        #region Private Classes
+
+        /// <summary>
+        /// Wrap this around a class that we want to catch the measure and arrange 
+        /// processes occuring on, and propagate to the parent Planerator, if any.
+        /// Do this because layout invalidations don't flow up out of a 
+        /// Viewport2DVisual3D object.
+        /// </summary>
+        private class LayoutInvalidationCatcher : Decorator
+        {
+            protected override Size MeasureOverride(Size constraint)
+            {
+                Plane3D pl = Parent as Plane3D;
+                if (pl != null)
+                {
+                    pl.InvalidateMeasure();
+                }
+                return base.MeasureOverride(constraint);
+            }
+
+            protected override Size ArrangeOverride(Size arrangeSize)
+            {
+                Plane3D pl = Parent as Plane3D;
+                if (pl != null)
+                {
+                    pl.InvalidateArrange();
+                }
+                return base.ArrangeOverride(arrangeSize);
+            }
+        }
+
+        #endregion
+
+    }
+}

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/RectangleGrid.cs

@@ -6,7 +6,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Shapes;
 
-namespace AIStudio.Wpf.DiagramHelper.Controls
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Controls
 {
     public class RectangleGridEventArgs
     {
@@ -261,7 +261,7 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
             RectangleGridEventArgs oldArgs = e.OldValue as RectangleGridEventArgs;
             RectangleGridEventArgs newArgs = e.NewValue as RectangleGridEventArgs;
 
-            //grid.FillRectangle(newArgs.Row, newArgs.Column);
+            //grid.FillableRectangle(newArgs.Row, newArgs.Column);
 
             grid.OnSelectColumnChanged(oldArgs, newArgs);
         }

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/SliderRotation.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="AIStudio.Wpf.DiagramHelper.Controls.SliderRotation"
+<UserControl x:Class="AIStudio.Wpf.DiagramDesigner.Additionals.Controls.SliderRotation"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls"
+             xmlns:local="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800" 
              Name="sliderRotation"

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/SliderRotation.xaml.cs

@@ -12,7 +12,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace AIStudio.Wpf.DiagramHelper.Controls
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Controls
 {
     /// <summary>
     /// SliderRotation.xaml 的交互逻辑

AIStudio.Wpf.DiagramDesigner.Additionals/Controls/WPFRuler.cs

@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Media;
 
-namespace AIStudio.Wpf.DiagramHelper.Controls
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Controls
 {
     /// <summary>
     /// A ruler control which supports both centimeters and inches. In order to use it vertically, change the <see cref="Marks">Marks</see> property to <c>Up</c> and rotate it ninety degrees.
@@ -59,7 +59,7 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
             {
                 if (this.AutoSize)
                 {
-                    return (double)(Unit == Unit.Cm ? DipHelper.DipToCm(this.ActualWidth) : DipHelper.DipToInch(this.ActualWidth)) / this.Zoom;
+                    return (double)(Unit == Unit.Cm ? ScreenHelper.WidthToCm(this.ActualWidth) : ScreenHelper.WidthToInch(this.ActualWidth)) / this.Zoom;
                 }
                 else
                 {
@@ -255,9 +255,9 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
             var rect = new Rect(0, 0, RenderSize.Width, RenderSize.Height);
             drawingContext.DrawRectangle(Background, null, rect);
 
-            double xDest = (Unit == Unit.Cm ? DipHelper.CmToDip(Length) : DipHelper.InchToDip(Length)) * this.Zoom;
+            double xDest = (Unit == Unit.Cm ? ScreenHelper.CmToWidth(Length) : ScreenHelper.InchToWidth(Length)) * this.Zoom;
             drawingContext.DrawRectangle(null, BorderPen, new Rect(new Point(0.0, 0.0), new Point(xDest, Height)));
-            double chip = Unit == Unit.Cm ? DipHelper.CmToDip(Chip) : DipHelper.InchToDip(Chip);
+            double chip = Unit == Unit.Cm ? ScreenHelper.CmToWidth(Chip) : ScreenHelper.InchToWidth(Chip);
             drawingContext.DrawLine(RedPen, new Point(chip, 0), new Point(chip, Height));
 
             //画偏移位置之前的
@@ -268,21 +268,21 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
                     double d;
                     if (Unit == Unit.Cm)
                     {
-                        d = DipHelper.CmToDip(dUnit) * this.Zoom;
+                        d = ScreenHelper.CmToWidth(dUnit) * this.Zoom;
                         if (dUnit < Length)
                         {
                             for (int i = 1; i <= 9; i++)
                             {
                                 if (i != 5)
                                 {
-                                    double dMm = DipHelper.CmToDip(dUnit + 0.1 * i) * this.Zoom;
+                                    double dMm = ScreenHelper.CmToWidth(dUnit + 0.1 * i) * this.Zoom;
                                     if (Marks == MarksLocation.Up)
                                         drawingContext.DrawLine(ThinPen, new Point(dMm, 0), new Point(dMm, SegmentHeight / 3.0));
                                     else
                                         drawingContext.DrawLine(ThinPen, new Point(dMm, Height), new Point(dMm, Height - SegmentHeight / 3.0));
                                 }
                             }
-                            double dMiddle = DipHelper.CmToDip(dUnit + 0.5) * this.Zoom;
+                            double dMiddle = ScreenHelper.CmToWidth(dUnit + 0.5) * this.Zoom;
                             if (Marks == MarksLocation.Up)
                                 drawingContext.DrawLine(p, new Point(dMiddle, 0), new Point(dMiddle, SegmentHeight * 2.0 / 3.0));
                             else
@@ -291,30 +291,30 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
                     }
                     else
                     {
-                        d = DipHelper.InchToDip(dUnit) * this.Zoom;
+                        d = ScreenHelper.InchToWidth(dUnit) * this.Zoom;
                         if (dUnit < Length)
                         {
                             if (Marks == MarksLocation.Up)
                             {
-                                double dQuarter = DipHelper.InchToDip(dUnit + 0.25) * this.Zoom;
+                                double dQuarter = ScreenHelper.InchToWidth(dUnit + 0.25) * this.Zoom;
                                 drawingContext.DrawLine(ThinPen, new Point(dQuarter, 0),
                                                                 new Point(dQuarter, SegmentHeight / 3.0));
-                                double dMiddle = DipHelper.InchToDip(dUnit + 0.5) * this.Zoom;
+                                double dMiddle = ScreenHelper.InchToWidth(dUnit + 0.5) * this.Zoom;
                                 drawingContext.DrawLine(p, new Point(dMiddle, 0),
                                                                 new Point(dMiddle, SegmentHeight * 2D / 3D));
-                                double d3Quarter = DipHelper.InchToDip(dUnit + 0.75) * this.Zoom;
+                                double d3Quarter = ScreenHelper.InchToWidth(dUnit + 0.75) * this.Zoom;
                                 drawingContext.DrawLine(ThinPen, new Point(d3Quarter, 0),
                                                                 new Point(d3Quarter, SegmentHeight / 3.0));
                             }
                             else
                             {
-                                double dQuarter = DipHelper.InchToDip(dUnit + 0.25) * this.Zoom;
+                                double dQuarter = ScreenHelper.InchToWidth(dUnit + 0.25) * this.Zoom;
                                 drawingContext.DrawLine(ThinPen, new Point(dQuarter, Height),
                                                                 new Point(dQuarter, Height - SegmentHeight / 3.0));
-                                double dMiddle = DipHelper.InchToDip(dUnit + 0.5) * this.Zoom;
+                                double dMiddle = ScreenHelper.InchToWidth(dUnit + 0.5) * this.Zoom;
                                 drawingContext.DrawLine(p, new Point(dMiddle, Height),
                                                                 new Point(dMiddle, Height - SegmentHeight * 2D / 3D));
-                                double d3Quarter = DipHelper.InchToDip(dUnit + 0.75) * this.Zoom;
+                                double d3Quarter = ScreenHelper.InchToWidth(dUnit + 0.75) * this.Zoom;
                                 drawingContext.DrawLine(ThinPen, new Point(d3Quarter, Height),
                                                                 new Point(d3Quarter, Height - SegmentHeight / 3.0));
                             }
@@ -333,7 +333,7 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
                              CultureInfo.CurrentCulture,
                              FlowDirection.LeftToRight,
                              new Typeface("Arial"),
-                             DipHelper.PtToDip(6),
+                             9,
                              Brushes.DimGray);
                         ft.SetFontWeight(FontWeights.Regular);
                         ft.TextAlignment = TextAlignment.Center;
@@ -353,21 +353,21 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
                 double d;
                 if (Unit == Unit.Cm)
                 {
-                    d = DipHelper.CmToDip(dUnit) * this.Zoom;
+                    d = ScreenHelper.CmToWidth(dUnit) * this.Zoom;
                     if (dUnit < Length)
                     {
                         for (int i = 1; i <= 9; i++)
                         {
                             if (i != 5)
                             {
-                                double dMm = DipHelper.CmToDip(dUnit + 0.1 * i) * this.Zoom;
+                                double dMm = ScreenHelper.CmToWidth(dUnit + 0.1 * i) * this.Zoom;
                                 if (Marks == MarksLocation.Up)
                                     drawingContext.DrawLine(ThinPen, new Point(dMm, 0), new Point(dMm, SegmentHeight / 3.0));
                                 else
                                     drawingContext.DrawLine(ThinPen, new Point(dMm, Height), new Point(dMm, Height - SegmentHeight / 3.0));
                             }
                         }
-                        double dMiddle = DipHelper.CmToDip(dUnit + 0.5) * this.Zoom;
+                        double dMiddle = ScreenHelper.CmToWidth(dUnit + 0.5) * this.Zoom;
                         if (Marks == MarksLocation.Up)
                             drawingContext.DrawLine(p, new Point(dMiddle, 0), new Point(dMiddle, SegmentHeight * 2.0 / 3.0));
                         else
@@ -376,30 +376,30 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
                 }
                 else
                 {
-                    d = DipHelper.InchToDip(dUnit) * this.Zoom;
+                    d = ScreenHelper.InchToWidth(dUnit) * this.Zoom;
                     if (dUnit < Length)
                     {
                         if (Marks == MarksLocation.Up)
                         {
-                            double dQuarter = DipHelper.InchToDip(dUnit + 0.25) * this.Zoom;
+                            double dQuarter = ScreenHelper.InchToWidth(dUnit + 0.25) * this.Zoom;
                             drawingContext.DrawLine(ThinPen, new Point(dQuarter, 0),
                                                             new Point(dQuarter, SegmentHeight / 3.0));
-                            double dMiddle = DipHelper.InchToDip(dUnit + 0.5) * this.Zoom;
+                            double dMiddle = ScreenHelper.InchToWidth(dUnit + 0.5) * this.Zoom;
                             drawingContext.DrawLine(p, new Point(dMiddle, 0),
                                                             new Point(dMiddle, SegmentHeight * 2D / 3D));
-                            double d3Quarter = DipHelper.InchToDip(dUnit + 0.75) * this.Zoom;
+                            double d3Quarter = ScreenHelper.InchToWidth(dUnit + 0.75) * this.Zoom;
                             drawingContext.DrawLine(ThinPen, new Point(d3Quarter, 0),
                                                             new Point(d3Quarter, SegmentHeight / 3.0));
                         }
                         else
                         {
-                            double dQuarter = DipHelper.InchToDip(dUnit + 0.25) * this.Zoom;
+                            double dQuarter = ScreenHelper.InchToWidth(dUnit + 0.25) * this.Zoom;
                             drawingContext.DrawLine(ThinPen, new Point(dQuarter, Height),
                                                             new Point(dQuarter, Height - SegmentHeight / 3.0));
-                            double dMiddle = DipHelper.InchToDip(dUnit + 0.5) * this.Zoom;
+                            double dMiddle = ScreenHelper.InchToWidth(dUnit + 0.5) * this.Zoom;
                             drawingContext.DrawLine(p, new Point(dMiddle, Height),
                                                             new Point(dMiddle, Height - SegmentHeight * 2D / 3D));
-                            double d3Quarter = DipHelper.InchToDip(dUnit + 0.75) * this.Zoom;
+                            double d3Quarter = ScreenHelper.InchToWidth(dUnit + 0.75) * this.Zoom;
                             drawingContext.DrawLine(ThinPen, new Point(d3Quarter, Height),
                                                             new Point(d3Quarter, Height - SegmentHeight / 3.0));
                         }
@@ -418,7 +418,7 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
                          CultureInfo.CurrentCulture,
                          FlowDirection.LeftToRight,
                          new Typeface("Arial"),
-                         DipHelper.PtToDip(6),
+                         9,
                          Brushes.DimGray);
                     ft.SetFontWeight(FontWeights.Regular);
                     ft.TextAlignment = TextAlignment.Center;
@@ -442,11 +442,11 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
             //Size desiredSize;
             //if (Unit == Unit.Cm)
             //{
-            //    desiredSize = new Size(DipHelper.CmToDip(Length), Height);
+            //    desiredSize = new Size(ScreenHelper.CmToWidth(Length), Height);
             //}
             //else
             //{
-            //    desiredSize = new Size(DipHelper.InchToDip(Length), Height);
+            //    desiredSize = new Size(ScreenHelper.InchToWidth(Length), Height);
             //}
             //return desiredSize;
         }
@@ -474,145 +474,145 @@ namespace AIStudio.Wpf.DiagramHelper.Controls
         Up, Down
     }
 
-    /// <summary>
-    /// A helper class for DIP (Device Independent Pixels) conversion and scaling operations.
-    /// </summary>
-    public static class DipHelper
-    {
-        /// <summary>
-        /// Converts millimeters to DIP (Device Independant Pixels).
-        /// </summary>
-        /// <param name="mm">A millimeter value.</param>
-        /// <returns>A DIP value.</returns>
-        public static double MmToDip(double mm)
-        {
-            return CmToDip(mm / 10.0);
-        }
+    ///// <summary>
+    ///// A helper class for DIP (Device Independent Pixels) conversion and scaling operations.
+    ///// </summary>
+    //public static class DipHelper
+    //{
+    //    /// <summary>
+    //    /// Converts millimeters to DIP (Device Independant Pixels).
+    //    /// </summary>
+    //    /// <param name="mm">A millimeter value.</param>
+    //    /// <returns>A DIP value.</returns>
+    //    public static double MmToDip(double mm)
+    //    {
+    //        return CmToDip(mm / 10.0);
+    //    }
 
-        /// <summary>
-        /// Converts centimeters to DIP (Device Independant Pixels).
-        /// </summary>
-        /// <param name="cm">A centimeter value.</param>
-        /// <returns>A DIP value.</returns>
-        public static double CmToDip(double cm)
-        {
-            return (cm * 96.0 / 2.54);
-        }
+    //    /// <summary>
+    //    /// Converts centimeters to DIP (Device Independant Pixels).
+    //    /// </summary>
+    //    /// <param name="cm">A centimeter value.</param>
+    //    /// <returns>A DIP value.</returns>
+    //    public static double CmToDip(double cm)
+    //    {
+    //        return (cm * 96.0 / 2.54);
+    //    }
 
-        /// <summary>
-        /// Converts inches to DIP (Device Independant Pixels).
-        /// </summary>
-        /// <param name="inch">An inch value.</param>
-        /// <returns>A DIP value.</returns>
-        public static double InchToDip(double inch)
-        {
-            return (inch * 96.0);
-        }
-        public static double DipToInch(double dip)
-        {
-            return dip / 96D;
-        }
+    //    /// <summary>
+    //    /// Converts inches to DIP (Device Independant Pixels).
+    //    /// </summary>
+    //    /// <param name="inch">An inch value.</param>
+    //    /// <returns>A DIP value.</returns>
+    //    public static double InchToDip(double inch)
+    //    {
+    //        return (inch * 96.0);
+    //    }
+    //    public static double DipToInch(double dip)
+    //    {
+    //        return dip / 96D;
+    //    }
 
-        /// <summary>
-        /// Converts font points to DIP (Device Independant Pixels).
-        /// </summary>
-        /// <param name="pt">A font point value.</param>
-        /// <returns>A DIP value.</returns>
-        public static double PtToDip(double pt)
-        {
-            return (pt * 96.0 / 72.0);
-        }
+    //    /// <summary>
+    //    /// Converts font points to DIP (Device Independant Pixels).
+    //    /// </summary>
+    //    /// <param name="pt">A font point value.</param>
+    //    /// <returns>A DIP value.</returns>
+    //    public static double PtToDip(double pt)
+    //    {
+    //        return (pt * 96.0 / 72.0);
+    //    }
 
-        /// <summary>
-        /// Converts DIP (Device Independant Pixels) to centimeters.
-        /// </summary>
-        /// <param name="dip">A DIP value.</param>
-        /// <returns>A centimeter value.</returns>
-        public static double DipToCm(double dip)
-        {
-            return (dip * 2.54 / 96.0);
-        }
+    //    /// <summary>
+    //    /// Converts DIP (Device Independant Pixels) to centimeters.
+    //    /// </summary>
+    //    /// <param name="dip">A DIP value.</param>
+    //    /// <returns>A centimeter value.</returns>
+    //    public static double DipToCm(double dip)
+    //    {
+    //        return (dip * 2.54 / 96.0);
+    //    }
 
-        /// <summary>
-        /// Converts DIP (Device Independant Pixels) to millimeters.
-        /// </summary>
-        /// <param name="dip">A DIP value.</param>
-        /// <returns>A millimeter value.</returns>
-        public static double DipToMm(double dip)
-        {
-            return DipToCm(dip) * 10.0;
-        }
+    //    /// <summary>
+    //    /// Converts DIP (Device Independant Pixels) to millimeters.
+    //    /// </summary>
+    //    /// <param name="dip">A DIP value.</param>
+    //    /// <returns>A millimeter value.</returns>
+    //    public static double DipToMm(double dip)
+    //    {
+    //        return DipToCm(dip) * 10.0;
+    //    }
 
-        /// <summary>
-        /// Gets the system DPI scale factor (compared to 96 dpi).
-        /// From http://blogs.msdn.com/jaimer/archive/2007/03/07/getting-system-dpi-in-wpf-app.aspx
-        /// Should not be called before the Loaded event (else XamlException mat throw)
-        /// </summary>
-        /// <returns>A Point object containing the X- and Y- scale factor.</returns>
-        private static Point GetSystemDpiFactor()
-        {
-            PresentationSource source = PresentationSource.FromVisual(Application.Current.MainWindow);
-            Matrix m = source.CompositionTarget.TransformToDevice;
-            return new Point(m.M11, m.M22);
-        }
+    //    /// <summary>
+    //    /// Gets the system DPI scale factor (compared to 96 dpi).
+    //    /// From http://blogs.msdn.com/jaimer/archive/2007/03/07/getting-system-dpi-in-wpf-app.aspx
+    //    /// Should not be called before the Loaded event (else XamlException mat throw)
+    //    /// </summary>
+    //    /// <returns>A Point object containing the X- and Y- scale factor.</returns>
+    //    private static Point GetSystemDpiFactor()
+    //    {
+    //        PresentationSource source = PresentationSource.FromVisual(Application.Current.MainWindow);
+    //        Matrix m = source.CompositionTarget.TransformToDevice;
+    //        return new Point(m.M11, m.M22);
+    //    }
 
-        private const double DpiBase = 96.0;
+    //    private const double DpiBase = 96.0;
 
-        /// <summary>
-        /// Gets the system configured DPI.
-        /// </summary>
-        /// <returns>A Point object containing the X- and Y- DPI.</returns>
-        public static Point GetSystemDpi()
-        {
-            Point sysDpiFactor = GetSystemDpiFactor();
-            return new Point(
-                 sysDpiFactor.X * DpiBase,
-                 sysDpiFactor.Y * DpiBase);
-        }
+    //    /// <summary>
+    //    /// Gets the system configured DPI.
+    //    /// </summary>
+    //    /// <returns>A Point object containing the X- and Y- DPI.</returns>
+    //    public static Point GetSystemDpi()
+    //    {
+    //        Point sysDpiFactor = GetSystemDpiFactor();
+    //        return new Point(
+    //             sysDpiFactor.X * DpiBase,
+    //             sysDpiFactor.Y * DpiBase);
+    //    }
 
-        /// <summary>
-        /// Gets the physical pixel density (DPI) of the screen.
-        /// </summary>
-        /// <param name="diagonalScreenSize">Size - in inch - of the diagonal of the screen.</param>
-        /// <returns>A Point object containing the X- and Y- DPI.</returns>
-        public static Point GetPhysicalDpi(double diagonalScreenSize)
-        {
-            Point sysDpiFactor = GetSystemDpiFactor();
-            double pixelScreenWidth = SystemParameters.PrimaryScreenWidth * sysDpiFactor.X;
-            double pixelScreenHeight = SystemParameters.PrimaryScreenHeight * sysDpiFactor.Y;
-            double formatRate = pixelScreenWidth / pixelScreenHeight;
+    //    /// <summary>
+    //    /// Gets the physical pixel density (DPI) of the screen.
+    //    /// </summary>
+    //    /// <param name="diagonalScreenSize">Size - in inch - of the diagonal of the screen.</param>
+    //    /// <returns>A Point object containing the X- and Y- DPI.</returns>
+    //    public static Point GetPhysicalDpi(double diagonalScreenSize)
+    //    {
+    //        Point sysDpiFactor = GetSystemDpiFactor();
+    //        double pixelScreenWidth = SystemParameters.PrimaryScreenWidth * sysDpiFactor.X;
+    //        double pixelScreenHeight = SystemParameters.PrimaryScreenHeight * sysDpiFactor.Y;
+    //        double formatRate = pixelScreenWidth / pixelScreenHeight;
 
-            double inchHeight = diagonalScreenSize / Math.Sqrt(formatRate * formatRate + 1.0);
-            double inchWidth = formatRate * inchHeight;
+    //        double inchHeight = diagonalScreenSize / Math.Sqrt(formatRate * formatRate + 1.0);
+    //        double inchWidth = formatRate * inchHeight;
 
-            double xDpi = Math.Round(pixelScreenWidth / inchWidth);
-            double yDpi = Math.Round(pixelScreenHeight / inchHeight);
+    //        double xDpi = Math.Round(pixelScreenWidth / inchWidth);
+    //        double yDpi = Math.Round(pixelScreenHeight / inchHeight);
 
-            return new Point(xDpi, yDpi);
-        }
+    //        return new Point(xDpi, yDpi);
+    //    }
 
-        /// <summary>
-        /// Converts a DPI into a scale factor (compared to system DPI).
-        /// </summary>
-        /// <param name="dpi">A Point object containing the X- and Y- DPI to convert.</param>
-        /// <returns>A Point object containing the X- and Y- scale factor.</returns>
-        public static Point DpiToScaleFactor(Point dpi)
-        {
-            Point sysDpi = GetSystemDpi();
-            return new Point(
-                 dpi.X / sysDpi.X,
-                 dpi.Y / sysDpi.Y);
-        }
+    //    /// <summary>
+    //    /// Converts a DPI into a scale factor (compared to system DPI).
+    //    /// </summary>
+    //    /// <param name="dpi">A Point object containing the X- and Y- DPI to convert.</param>
+    //    /// <returns>A Point object containing the X- and Y- scale factor.</returns>
+    //    public static Point DpiToScaleFactor(Point dpi)
+    //    {
+    //        Point sysDpi = GetSystemDpi();
+    //        return new Point(
+    //             dpi.X / sysDpi.X,
+    //             dpi.Y / sysDpi.Y);
+    //    }
 
-        /// <summary>
-        /// Gets the scale factor to apply to a WPF application
-        /// so that 96 DIP always equals 1 inch on the screen (whatever the system DPI).
-        /// </summary>
-        /// <param name="diagonalScreenSize">Size - in inch - of the diagonal of the screen</param>
-        /// <returns>A Point object containing the X- and Y- scale factor.</returns>
-        public static Point GetScreenIndependentScaleFactor(double diagonalScreenSize)
-        {
-            return DpiToScaleFactor(GetPhysicalDpi(diagonalScreenSize));
-        }
-    }
+    //    /// <summary>
+    //    /// Gets the scale factor to apply to a WPF application
+    //    /// so that 96 DIP always equals 1 inch on the screen (whatever the system DPI).
+    //    /// </summary>
+    //    /// <param name="diagonalScreenSize">Size - in inch - of the diagonal of the screen</param>
+    //    /// <returns>A Point object containing the X- and Y- scale factor.</returns>
+    //    public static Point GetScreenIndependentScaleFactor(double diagonalScreenSize)
+    //    {
+    //        return DpiToScaleFactor(GetPhysicalDpi(diagonalScreenSize));
+    //    }
+    //}
 }

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/Boolean2VisibilityReConverter.cs

@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.DiagramHelper.Converters
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
 {
     public class Boolean2VisibilityReConverter : IValueConverter
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/CardClipConverter.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
+{
+    public class CardClipConverter : IMultiValueConverter
+    {
+        /// <summary>
+        /// 1 - Content presenter render size,
+        /// 2 - Clipping border padding (main control padding)
+        /// </summary>
+        /// <param name="values"></param>
+        /// <param name="targetType"></param>
+        /// <param name="parameter"></param>
+        /// <param name="culture"></param>
+        /// <returns></returns>
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values.Length != 2 || !(values[0] is Size) || !(values[1] is Thickness))
+                return Binding.DoNothing;
+
+            var size = (Size)values[0];
+            var farPoint = new Point(
+                Math.Max(0, size.Width),
+                Math.Max(0, size.Height));
+            var padding = (Thickness)values[1];
+            farPoint.Offset(padding.Left + padding.Right, padding.Top + padding.Bottom);
+
+            return new Rect(
+                new Point(),
+                new Point(farPoint.X, farPoint.Y));
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            return null;
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/CountShiftConverter.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using AIStudio.Wpf.DiagramDesigner.Additionals.Controls;
+using AIStudio.Wpf.DiagramDesigner;
+
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
+{
+    public class CountShiftConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values != null && values.Length > 2)
+            {
+                try
+                {
+
+                    var diagram = values[0] as FrameworkElement;
+                    var zoomValue = (double)values[1];
+                    var pageunit = (PageUnit)values[2];
+                    var unit = Unit.Cm;
+                    if (pageunit > PageUnit.km)
+                    {
+                        unit = Unit.Inch;
+                    }
+                    Vector vector = System.Windows.Media.VisualTreeHelper.GetOffset(diagram);
+
+                    if (parameter?.ToString() == "Y")
+                    {
+                        var value = 0 - (unit == Unit.Cm ? ScreenHelper.WidthToCm(vector.Y - 20) : ScreenHelper.WidthToInch(vector.Y - 20)) / zoomValue;
+                        return value;
+                    }
+                    else
+                    {
+                        var value = 0 - (unit == Unit.Cm ? ScreenHelper.WidthToCm(vector.X - 20) : ScreenHelper.WidthToInch(vector.X - 20)) / zoomValue;
+                        return value;
+                    }
+                }
+                catch { }
+            }
+            return 0;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/DoubleToThickness.cs

@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.DiagramHelper.Converters
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
 {
     public class DoubleToThickness : IValueConverter
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/HtmlColorConverter.cs

@@ -21,7 +21,7 @@ using System.Text;
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace AIStudio.Wpf.DiagramHelper.Converters
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
 {
     class HtmlColorConverter : IValueConverter
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/IndentConverter.cs

@@ -9,7 +9,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace AIStudio.Wpf.DiagramHelper.Converters
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
 {
     public class IndentConverter : IValueConverter
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/IntVisibilityConverter.cs

@@ -4,7 +4,7 @@ using System.Windows;
 using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace AIStudio.Wpf.DiagramHelper.Converters
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
 {
     //选中项索引转换成可见项
     public class IntVisibilityConverter : MarkupExtension, IValueConverter

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/NullableToBooleanConverter.cs

@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.DiagramHelper.Converters
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
 {
     public class NullableToBooleanConverter : IValueConverter
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/NullableToVisibilityConverter.cs

@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.DiagramHelper.Converters
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
 {
     public class NullableToVisibilityConverter : IValueConverter
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/NumberConverter.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.DiagramHelper.Converters
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
 {
     public class NumberConverter : IValueConverter
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/Object2VisibilityConverter.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
+{
+    public class Object2VisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value == null ? Visibility.Collapsed : Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/RulerUnitConverter.cs

@@ -1,4 +1,4 @@
-using AIStudio.Wpf.DiagramHelper.Controls;
+using AIStudio.Wpf.DiagramDesigner.Additionals.Controls;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows.Data;
 using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.DiagramHelper.Converters
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
 {
     public class RulerUnitConverter : IValueConverter
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/StringPathConverter.cs

@@ -7,7 +7,7 @@ using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace AIStudio.Wpf.DiagramHelper.Converters
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
 {
     public class StringPathConverter : IValueConverter
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/ThicknessBindingConverter.cs

@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.DiagramHelper.Converters
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
 {
     /// <summary>
     /// Converts a Thickness to a new Thickness. It's possible to ignore a side With the IgnoreThicknessSide property.

AIStudio.Wpf.DiagramDesigner.Additionals/Converters/ThicknessConverter.cs

@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.DiagramHelper.Converters
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Converters
 {
     public class ThicknessToDoubleConverter : IValueConverter
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/Models/PathDesignerItem.cs

@@ -1,6 +1,6 @@
 using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.DiagramHelper.Extensions.Models
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.Models
 {
     public class PathDesignerItem : DesignerItemBase
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/Models/PersistDesignerItem.cs

@@ -1,8 +1,8 @@
 using System.Xml.Serialization;
 using AIStudio.Wpf.DiagramDesigner;
-using AIStudio.Wpf.DiagramHelper.Extensions.ViewModels;
+using AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels;
 
-namespace AIStudio.Wpf.DiagramHelper.Extensions.Models
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.Models
 {
     public class PersistDesignerItem : DesignerItemBase
     {       

AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/Models/SettingsDesignerItem.cs

@@ -1,7 +1,7 @@
 using AIStudio.Wpf.DiagramDesigner;
-using AIStudio.Wpf.DiagramHelper.Extensions.ViewModels;
+using AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels;
 
-namespace AIStudio.Wpf.DiagramHelper.Extensions.Models
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.Models
 {
     public class SettingsDesignerItem : DesignerItemBase
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/BarcodeDesignerItemData.cs

@@ -1,9 +1,9 @@
-using AIStudio.Wpf.DiagramHelper.Commands;
-using AIStudio.Wpf.DiagramHelper.Models;
+using AIStudio.Wpf.DiagramDesigner.Additionals.Commands;
+using AIStudio.Wpf.DiagramDesigner.Additionals.Models;
 using System.Windows.Input;
 using ZXing;
 
-namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels
 {
     public class BarcodeDesignerItemData : TitleBindableBase
     {

AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/BarcodeDesignerItemViewModel.cs

@@ -0,0 +1,103 @@
+using System;
+using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner.Models;
+using AIStudio.Wpf.DiagramDesigner.Services;
+using ZXing;
+
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels
+{
+    public class BarcodeDesignerItemViewModel : DesignerItemViewModelBase
+    {
+        private IUIVisualizerService visualiserService;
+
+        public BarcodeDesignerItemViewModel() : this(null)
+        {
+
+        }
+
+        public BarcodeDesignerItemViewModel(IDiagramViewModel root) : base(root)
+        {
+
+        }
+
+        public BarcodeDesignerItemViewModel(IDiagramViewModel root, SelectableItemBase designer) : base(root, designer)
+        {
+
+        }
+
+        public BarcodeDesignerItemViewModel(IDiagramViewModel root, SerializableItem serializableItem, string serializableType) : base(root, serializableItem, serializableType)
+        {
+        }
+
+        public override SelectableItemBase GetSerializableObject()
+        {
+            return new DesignerItemBase(this, Format.ToString());
+        }
+
+        public override void Init(IDiagramViewModel root, bool initNew)
+        {
+            base.Init(root, initNew);
+
+            CustomText = true;
+
+            if (visualiserService == null)
+                visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
+        }
+
+        protected override void InitNew()
+        {
+            base.InitNew();
+        }
+
+        protected override void LoadDesignerItemViewModel(SelectableItemBase designerbase)
+        {
+            base.LoadDesignerItemViewModel(designerbase);
+
+            if (designerbase is DesignerItemBase designer)
+            {
+                Format = (BarcodeFormat)Enum.Parse(typeof(BarcodeFormat), designer.Reserve.ToString());
+            }
+        }
+
+        public void AutoSize()
+        {
+            ItemWidth = 140;
+            ItemHeight = 140;
+        }
+
+        protected override void ExecuteEditCommand(object parameter)
+        {
+            EditData();
+        }
+
+        public override bool Verify()
+        {
+            if (string.IsNullOrEmpty(Icon))
+                return EditData();
+            return true;
+        }
+
+        public BarcodeFormat Format { get; set; } = BarcodeFormat.QR_CODE;
+
+        public override bool EditData()
+        {
+            if (IsReadOnly == true) return false;
+
+            BarcodeDesignerItemData data = new BarcodeDesignerItemData(this);
+            if (visualiserService.ShowDialog(data) == true)
+            {
+                bool needauto = Text == null;
+                Text = data.Text;
+                Icon = data.Icon;
+                Margin = data.Margin;
+                if (needauto)
+                {
+                    AutoSize();
+                }
+                return true;
+            }
+
+            return false;
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml

@@ -1,17 +1,16 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramHelper.Extensions.ViewModels" 
+                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels" 
                     xmlns:gif="http://wpfanimatedgif.codeplex.com" 
-                    xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters"
-                    xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls"
+                    xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Converters"
+                    xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Controls"
                     xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram"
                     xmlns:Fluent="urn:fluent-ribbon"
-                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner"
                     xmlns:i="http://schemas.microsoft.com/xaml/behaviors">
 
-    <converter:BoolVisibilityConverter x:Key="BoolVisibilityConverter"/>
+    <dd:BoolVisibilityConverter x:Key="BoolVisibilityConverter"/>
     <converter:DoubleToThickness x:Key="DoubleToThickness"/>
-    <s:ColorBrushConverter x:Key="ColorBrushConverter"/>
+    <dd:ColorBrushConverter x:Key="ColorBrushConverter"/>
 
 
     <DataTemplate DataType="{x:Type viewmodel:BarcodeDesignerItemViewModel}">

AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/OutLineTextDesignerItemData.cs

@@ -1,7 +1,7 @@
-using AIStudio.Wpf.DiagramHelper.Models;
+using AIStudio.Wpf.DiagramDesigner.Additionals.Models;
 using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels
 {
     public class OutLineTextDesignerItemData : TitleBindableBase
     {
@@ -13,7 +13,7 @@ namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
         {
             this.Title = "矢量文本";
             this.Text = item.Text;
-            this.FontViewModel = CopyHelper.Mapper<FontViewModel, IFontViewModel>(item.FontViewModel);
+            this.FontViewModel = CopyHelper.Mapper(item.FontViewModel);
         }
 
         private IFontViewModel _fontViewModel;

AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/OutLineTextDesignerItemViewModel.cs

@@ -1,31 +1,51 @@
-using AIStudio.Wpf.DiagramHelper.Services;
-using System.Globalization;
+using System.Globalization;
 using System.Windows;
 using System.Windows.Media;
 using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner.Models;
+using AIStudio.Wpf.DiagramDesigner.Services;
 
-namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels
 {
     public class OutLineTextDesignerItemViewModel : TextDesignerItemViewModel
     {
         private IUIVisualizerService visualiserService;
-
-        public OutLineTextDesignerItemViewModel(IDiagramViewModel parent, DesignerItemBase designer) : base(parent, designer)
+        public OutLineTextDesignerItemViewModel() : this(null)
         {
 
         }
 
-        public OutLineTextDesignerItemViewModel() : base()
+        public OutLineTextDesignerItemViewModel(IDiagramViewModel root) : base(root)
         {
 
         }
 
-        protected override void Init()
+        public OutLineTextDesignerItemViewModel(IDiagramViewModel root, SelectableItemBase designer) : base(root, designer)
         {
-            base.Init();
 
-            visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
+        }
 
+        public OutLineTextDesignerItemViewModel(IDiagramViewModel root, SerializableItem serializableItem, string serializableType) : base(root, serializableItem, serializableType)
+        {
+
+        }
+
+        public override SelectableItemBase GetSerializableObject()
+        {
+            return new TextDesignerItem(this);
+        }
+
+        public override void Init(IDiagramViewModel root, bool initNew)
+        {
+            base.Init(root, initNew);
+
+            if (visualiserService == null)
+                visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
+        }
+
+        protected override void InitNew()
+        {
+            base.InitNew();
             FontViewModel.FontFamily = "Arial";
             FontViewModel.FontSize = 36;
         }
@@ -55,7 +75,7 @@ namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
             EditData();
         }
 
-        public override bool InitData()
+        public override bool Verify()
         {
             if (string.IsNullOrEmpty(Text))
                 return EditData();
@@ -70,7 +90,7 @@ namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
             if (visualiserService.ShowDialog(data) == true)
             {
                 Text = data.Text;
-                FontViewModel = CopyHelper.Mapper<FontViewModel, IFontViewModel>(data.FontViewModel);
+                FontViewModel = CopyHelper.Mapper(data.FontViewModel);
                 AutoSize();
                 return true;
             }

AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml

@@ -1,17 +1,15 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramHelper.Extensions.ViewModels" 
+                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels" 
                     xmlns:gif="http://wpfanimatedgif.codeplex.com" 
-                    xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters"
-                    xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls"
+                    xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Controls"
                     xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram"
                     xmlns:Fluent="urn:fluent-ribbon"
-                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner"
                     xmlns:i="http://schemas.microsoft.com/xaml/behaviors">
 
-    <converter:BoolVisibilityConverter x:Key="BoolVisibilityConverter"/>
-    <converter:DoubleToThickness x:Key="DoubleToThickness"/>
-    <s:ColorBrushConverter x:Key="ColorBrushConverter"/>
+    <dd:BoolVisibilityConverter x:Key="BoolVisibilityConverter"/>
+    <dd:DoubleToThickness x:Key="DoubleToThickness"/>
+    <dd:ColorBrushConverter x:Key="ColorBrushConverter"/>
    
     <DataTemplate DataType="{x:Type viewmodel:OutLineTextDesignerItemViewModel}">
         <Viewbox Stretch="Fill" IsHitTestVisible="False">
@@ -44,9 +42,9 @@
                     Text="{Binding Text}"
                     FontSize="{Binding ElementName=comboBoxFontSize,Path=SelectedItem}" 
                     FontFamily="{Binding ElementName=comboBoxFontName,Path=SelectedItem}"  
-                    FontWeight="{Binding ElementName=buttonBold,Path=IsChecked,Converter={converter:ConverterBoolToValueMap Parameter='Regular'}, ConverterParameter='Bold'}"
-                    FontStyle="{Binding ElementName=buttonItalic,Path=IsChecked,Converter={converter:ConverterBoolToValueMap Parameter='Normal'}, ConverterParameter='Italic'}"  
-                    TextDecorations="{Binding ElementName=buttonUnderline,Path=IsChecked,Converter={converter:ConverterBoolToValueMap Parameter='None'}, ConverterParameter='Underline'}"
+                    FontWeight="{Binding ElementName=buttonBold,Path=IsChecked,Converter={dd:ConverterBoolToValueMap Parameter='Regular'}, ConverterParameter='Bold'}"
+                    FontStyle="{Binding ElementName=buttonItalic,Path=IsChecked,Converter={dd:ConverterBoolToValueMap Parameter='Normal'}, ConverterParameter='Italic'}"  
+                    TextDecorations="{Binding ElementName=buttonUnderline,Path=IsChecked,Converter={dd:ConverterBoolToValueMap Parameter='None'}, ConverterParameter='Underline'}"
                      Height="100"
                     Margin="5" 
                     TextWrapping="Wrap"/>
@@ -91,19 +89,19 @@
                 </Fluent:ComboBox>
                 <Fluent:ToggleButton KeyTip="B"
                                              x:Name="buttonBold"
-                                             Icon="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Images/Bold.png"
+                                             Icon="pack://application:,,,/AIStudio.Wpf.DiagramDesigner.Additionals;component/Images/Bold.png"
                                              HorizontalAlignment="Left"
                                              SizeDefinition="Small" 
-                                             IsChecked="{Binding FontViewModel.FontWeight,Converter={converter:ConverterValueMapToBool Parameter='Regular'}, ConverterParameter='Bold'}"/>
+                                             IsChecked="{Binding FontViewModel.FontWeight,Converter={dd:ConverterValueMapToBool Parameter='Regular'}, ConverterParameter='Bold'}"/>
                 <Fluent:ToggleButton x:Name="buttonItalic"
                                              KeyTip="I"
-                                             Icon="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Images/Italic.png"
+                                             Icon="pack://application:,,,/AIStudio.Wpf.DiagramDesigner.Additionals;component/Images/Italic.png"
                                              HorizontalAlignment="Left"
                                              SizeDefinition="Small" 
-                                             IsChecked="{Binding FontViewModel.FontStyle,Converter={converter:ConverterValueMapToBool Parameter='Normal'}, ConverterParameter='Italic'}"/>
+                                             IsChecked="{Binding FontViewModel.FontStyle,Converter={dd:ConverterValueMapToBool Parameter='Normal'}, ConverterParameter='Italic'}"/>
                 <Fluent:ToggleButton x:Name="buttonUnderline"
                                              KeyTip="U"
-                                             Icon="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Images/Underline.png"
+                                             Icon="pack://application:,,,/AIStudio.Wpf.DiagramDesigner.Additionals;component/Images/Underline.png"
                                              HorizontalAlignment="Left"
                                              SizeDefinition="Small" 
                                              IsChecked="{Binding FontViewModel.Underline}"/>

AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/PathItemViewModel.cs

@@ -0,0 +1,47 @@
+using System;
+using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner.Models;
+using AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.Models;
+
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels
+{
+    public class PathItemViewModel : DesignerItemViewModelBase
+    {
+        public PathItemViewModel() : this(null)
+        {
+
+        }
+
+        public PathItemViewModel(IDiagramViewModel root) : base(root)
+        {
+
+        }
+
+        public PathItemViewModel(IDiagramViewModel root, SelectableItemBase designer) : base(root, designer)
+        {
+           
+        }
+
+        public PathItemViewModel(IDiagramViewModel root, SerializableItem serializableItem, string serializableType) : base(root, serializableItem, serializableType)
+        {
+
+        }
+
+        public override SelectableItemBase GetSerializableObject()
+        {
+            return new PathDesignerItem(this);
+        }
+
+        public override void Init(IDiagramViewModel root, bool initNew)
+        {
+            base.Init(root, initNew);
+
+            this.ShowConnectors = false;
+        }
+
+        protected override void InitNew()
+        {
+            base.InitNew();
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/PathItemViewModel.xaml

@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner"
-                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramHelper.Extensions.ViewModels"
-                    xmlns:convent="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters">
+                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels"
+                    xmlns:convent="clr-namespace:AIStudio.Wpf.DiagramDesigner.Additionals.Converters">
     <convent:StringPathConverter x:Key="stringPathConverter"/>
     <s:ColorBrushConverter x:Key="ColorBrushConverter" />
     <Brush x:Key="ItemStroke">#FFD69436</Brush>

AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/PersistDesignerItemData.cs

@@ -1,6 +1,6 @@
-using AIStudio.Wpf.DiagramHelper.Models;
+using AIStudio.Wpf.DiagramDesigner.Additionals.Models;
 
-namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels
 {
     /// <summary>
     /// This is passed to the PopupWindow.xaml window, where a DataTemplate is used to provide the

AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/PersistDesignerItemViewModel.cs

@@ -0,0 +1,78 @@
+using System;
+using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner.Models;
+using AIStudio.Wpf.DiagramDesigner.Services;
+using AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.Models;
+
+namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels
+{
+    public class PersistDesignerItemViewModel : DesignerItemViewModelBase
+    {
+        private IUIVisualizerService visualiserService;
+
+        public PersistDesignerItemViewModel() : this(null)
+        {
+
+        }
+
+        public PersistDesignerItemViewModel(IDiagramViewModel root) : base(root)
+        {
+
+        }
+
+        public PersistDesignerItemViewModel(IDiagramViewModel root, SelectableItemBase designer) : base(root, designer)
+        {
+
+        }
+
+        public PersistDesignerItemViewModel(IDiagramViewModel root, SerializableItem serializableItem, string serializableType) : base(root, serializableItem, serializableType)
+        {
+
+        }
+
+        public override SelectableItemBase GetSerializableObject()
+        {
+            return new PersistDesignerItem(this);
+        }
+
+        public override void Init(IDiagramViewModel root, bool initNew)
+        {
+            base.Init(root, initNew);
+
+            this.ShowConnectors = false;
+
+            if (visualiserService == null)
+                visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;       
+        }
+
+        protected override void InitNew()
+        {
+            base.InitNew();
+        }
+
+        protected override void LoadDesignerItemViewModel(SelectableItemBase designerbase)
+        {
+            base.LoadDesignerItemViewModel(designerbase);
+
+            if (designerbase is PersistDesignerItem designer)
+            {
+                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;
+            }
+        }
+
+
+
+    }
+}