ink

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

AIStudio.Wpf.Diagram.sln

@@ -35,6 +35,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramDesigne
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Script", "Extensions\AIStudio.Wpf.Script\AIStudio.Wpf.Script.csproj", "{27A4C86D-3792-4D14-BAEE-3B103A709872}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Block", "Extensions\AIStudio.Wpf.Block\AIStudio.Wpf.Block.csproj", "{C7031E27-57A9-498E-95EE-9C3E7DCCA642}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -81,6 +83,10 @@ Global
 		{27A4C86D-3792-4D14-BAEE-3B103A709872}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{27A4C86D-3792-4D14-BAEE-3B103A709872}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{27A4C86D-3792-4D14-BAEE-3B103A709872}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7031E27-57A9-498E-95EE-9C3E7DCCA642}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7031E27-57A9-498E-95EE-9C3E7DCCA642}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7031E27-57A9-498E-95EE-9C3E7DCCA642}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7031E27-57A9-498E-95EE-9C3E7DCCA642}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -92,6 +98,7 @@ Global
 		{85C437B9-16D2-4076-ABCD-52029AC232FC} = {4959F170-02FB-4B7F-8F53-93DAF22713F9}
 		{FCFC5ABF-8459-4B45-ABA0-9B820C7ED5C6} = {62DC8608-D98F-47BB-9F19-ABB0C60B72FF}
 		{27A4C86D-3792-4D14-BAEE-3B103A709872} = {4959F170-02FB-4B7F-8F53-93DAF22713F9}
+		{C7031E27-57A9-498E-95EE-9C3E7DCCA642} = {4959F170-02FB-4B7F-8F53-93DAF22713F9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D30FC641-F06C-4E35-AEA5-48A9B6E59CE0}

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

@@ -109,6 +109,7 @@
   </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>
@@ -128,6 +129,7 @@
     <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="..\Extensions\AIStudio.Wpf.Block\AIStudio.Wpf.Block.csproj" />
     <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" />
@@ -147,15 +149,27 @@
     </Reference>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <Reference Include="AIStudio.Wpf.Script.Core">
-      <HintPath>..\Extensions\AIStudio.Wpf.Script\Dlls\netcoreapp3.1\AIStudio.Wpf.Script.Core.dll</HintPath>
+      <HintPath>..\Extensions\AIStudio.Wpf.Script\Dlls\net461\AIStudio.Wpf.Script.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
+    <Reference Include="AIStudio.Wpf.Block.Core">
+      <HintPath>..\Extensions\AIStudio.Wpf.Block\Dlls\net5.0-windows\AIStudio.Wpf.Block.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
+    <Reference Include="AIStudio.Wpf.Block.Core">
+      <HintPath>..\Extensions\AIStudio.Wpf.Block\Dlls\net6.0-windows\AIStudio.Wpf.Block.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
-    <Reference Include="AIStudio.Wpf.Script.Core">
-      <HintPath>..\Extensions\AIStudio.Wpf.Script\Dlls\net461\AIStudio.Wpf.Script.Core.dll</HintPath>
+    <Reference Include="AIStudio.Wpf.Block.Core">
+      <HintPath>..\Extensions\AIStudio.Wpf.Block\Dlls\net461\AIStudio.Wpf.Block.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
 
@@ -263,6 +277,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="Images\Gifs\car_chase.gif">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Images\Svgs\account-book.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

AIStudio.Wpf.DiagramApp/App.xaml

@@ -17,6 +17,7 @@
                 <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Script.Core;component/Themes/RoslynScriptViewModel.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Script;component/Themes/ColorBoxFactoryScriptViewModel.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Script;component/Themes/ColorBoxCollectorScriptViewModel.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Block.Core;component/Themes/BlockItemViewModel.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

AIStudio.Wpf.DiagramApp/Models/CustomToolBoxData.cs

@@ -14,7 +14,7 @@ namespace AIStudio.Wpf.DiagramApp.Models
 {
     public class PathToolBoxData : ToolBoxData
     {
-        public PathToolBoxData(string icon, Type type, double width = 32, double height = 32, Size? desiredSize = null, string description = null) : base(null, icon, type, width, height, desiredSize, description)
+        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;
         }
@@ -23,7 +23,7 @@ namespace AIStudio.Wpf.DiagramApp.Models
 
     public class TextToolBoxData : ToolBoxData
     {
-        public TextToolBoxData(string text, Type type, double width = 32, double height = 32, Size? desiredSize = null, string description = null) : base(text, null, type, width, height, desiredSize, description)
+        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;
         }
@@ -32,7 +32,7 @@ namespace AIStudio.Wpf.DiagramApp.Models
 
     public class EllipseTextToolBoxData : ToolBoxData
     {
-        public EllipseTextToolBoxData(string text, Type type, double width = 32, double height = 32, Size? desiredSize = null, string description = null) : base(text, null, type, width, height, desiredSize, description)
+        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;
         }
@@ -41,7 +41,7 @@ namespace AIStudio.Wpf.DiagramApp.Models
 
     public class ImageToolBoxData : ToolBoxData
     {
-        public ImageToolBoxData(string icon, Type type, double width = 32, double height = 32, Size? desiredSize = null, string description = null) : base(null, icon, type, width, height, desiredSize, description)
+        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)
         {
 
         }
@@ -57,7 +57,7 @@ namespace AIStudio.Wpf.DiagramApp.Models
         {
             get; set;
         }
-        public DesignerItemToolBoxData(DesignerItemBase designerItemBase, string filename, Type type, double width = 32, double height = 32, Size? desiredSize = null, string description = null) : base(null, null, type, width, height, desiredSize, description)
+        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;
@@ -84,7 +84,7 @@ namespace AIStudio.Wpf.DiagramApp.Models
         {
             get; set;
         }
-        public MultipleDesignerItemToolBoxData(SerializableObject designerItemBase, string filename, double width = 32, double height = 32, Size? desiredSize = null, string description = null) : base(null, null, typeof(List<SelectableDesignerItemViewModelBase>), width, height, desiredSize, description)
+        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();
 
@@ -111,7 +111,7 @@ namespace AIStudio.Wpf.DiagramApp.Models
 
     public class SvgToolBoxData : ToolBoxData
     {
-        public SvgToolBoxData(string filename, Type type, double width = 32, double height = 32, Size? desiredSize = null, string description = null) : base(null, filename, type, width, height, desiredSize, description)
+        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;
         }
@@ -119,7 +119,7 @@ namespace AIStudio.Wpf.DiagramApp.Models
 
     public class MediaToolBoxData : ToolBoxData
     {
-        public MediaToolBoxData(string icon, Type type, double width = 32, double height = 32, Size? desiredSize = null, string description = null) : base(icon, null, type, width, height, desiredSize, description)
+        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/Styles/Expander.xaml

@@ -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}">
@@ -27,7 +27,7 @@
     </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/ViewModels/BlockViewModel.cs

@@ -0,0 +1,257 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using AIStudio.Wpf.Block;
+using AIStudio.Wpf.Block.Core.ViewModels;
+using AIStudio.Wpf.DiagramApp.Models;
+using AIStudio.Wpf.DiagramDesigner;
+
+namespace AIStudio.Wpf.DiagramApp.ViewModels
+{
+    internal class BlockViewModel : PageViewModel
+    {
+        public BlockViewModel(string title, string status, DiagramType diagramType) : base(title, status, diagramType)
+        {
+
+        }
+        public BlockViewModel(string filename, DiagramDocument diagramDocument) : base(filename, diagramDocument)
+        {
+            
+        }
+
+        protected override void InitDiagramViewModel()
+        {
+            base.InitDiagramViewModel();
+
+            DiagramViewModel.DiagramOption.LayoutOption.PageSizeOrientation = PageSizeOrientation.Horizontal;
+            DiagramViewModel.DiagramOption.LayoutOption.ShowGrid = false;
+        }
+
+        protected override void Init(bool initNew)
+        {
+            base.Init(initNew);
+
+            #region
+            //运动
+            BlockDesignerItemViewModel MoveNode = new MoveNode(DiagramViewModel) { Name = nameof(MoveNode), Left = 28, Top = 28 };
+            DiagramViewModel.Add(MoveNode);
+            BlockDesignerItemViewModel TurnRightNode = new TurnRightNode(DiagramViewModel) { Name = nameof(TurnRightNode), Left = 28, Top = 68 };
+            DiagramViewModel.Add(TurnRightNode);
+            BlockDesignerItemViewModel TurnLeftNode = new TurnLeftNode(DiagramViewModel) { Name = nameof(TurnLeftNode), Left = 28, Top = 108 };
+            DiagramViewModel.Add(TurnLeftNode);
+            BlockDesignerItemViewModel MoveToNode = new MoveToNode(DiagramViewModel) { Name = nameof(MoveToNode), Left = 28, Top = 148 };
+            DiagramViewModel.Add(MoveToNode);
+            BlockDesignerItemViewModel MoveToPointNode = new MoveToPointNode(DiagramViewModel) { Name = nameof(MoveToPointNode), Left = 28, Top = 188 };
+            DiagramViewModel.Add(MoveToPointNode);
+            BlockDesignerItemViewModel TimeMoveToNode = new TimeMoveToNode(DiagramViewModel) { Name = nameof(TimeMoveToNode), Left = 28, Top = 228 };
+            DiagramViewModel.Add(TimeMoveToNode);
+            BlockDesignerItemViewModel TimeMoveToPointNode = new TimeMoveToPointNode(DiagramViewModel) { Name = nameof(TimeMoveToPointNode), Left = 28, Top = 268 };
+            DiagramViewModel.Add(TimeMoveToPointNode);
+            BlockDesignerItemViewModel FaceToNode = new FaceToNode(DiagramViewModel) { Name = nameof(FaceToNode), Left = 28, Top = 308 };
+            DiagramViewModel.Add(FaceToNode);
+            BlockDesignerItemViewModel FaceToMouseNode = new FaceToMouseNode(DiagramViewModel) { Name = nameof(FaceToMouseNode), Left = 28, Top = 348 };
+            DiagramViewModel.Add(FaceToMouseNode);
+            BlockDesignerItemViewModel PointXAddNode = new PointXAddNode(DiagramViewModel) { Name = nameof(PointXAddNode), Left = 28, Top = 388 };
+            DiagramViewModel.Add(PointXAddNode);
+            BlockDesignerItemViewModel PointXSetNode = new PointXSetNode(DiagramViewModel) { Name = nameof(PointXSetNode), Left = 28, Top = 428 };
+            DiagramViewModel.Add(PointXSetNode);
+            BlockDesignerItemViewModel PointYAddNode = new PointYAddNode(DiagramViewModel) { Name = nameof(PointYAddNode), Left = 28, Top = 468 };
+            DiagramViewModel.Add(PointYAddNode);
+            BlockDesignerItemViewModel PointYSetNode = new PointYSetNode(DiagramViewModel) { Name = nameof(PointYSetNode), Left = 28, Top = 508 };
+            DiagramViewModel.Add(PointYSetNode);
+            BlockDesignerItemViewModel BorderBounceNode = new BorderBounceNode(DiagramViewModel) { Name = nameof(BorderBounceNode), Left = 28, Top = 548 };
+            DiagramViewModel.Add(BorderBounceNode);
+            BlockDesignerItemViewModel RotationMethodNode = new RotationMethodNode(DiagramViewModel) { Name = nameof(RotationMethodNode), Left = 28, Top = 588 };
+            DiagramViewModel.Add(RotationMethodNode);
+            BlockDesignerItemViewModel PointXNode = new PointXNode(DiagramViewModel) { Name = nameof(PointXNode), Left = 28, Top = 628 };
+            DiagramViewModel.Add(PointXNode);
+            BlockDesignerItemViewModel PointYNode = new PointYNode(DiagramViewModel) { Name = nameof(PointYNode), Left = 28, Top = 668 };
+            DiagramViewModel.Add(PointYNode);
+            BlockDesignerItemViewModel DirectionNode = new DirectionNode(DiagramViewModel) { Name = nameof(DirectionNode), Left = 28, Top = 708 };
+            DiagramViewModel.Add(DirectionNode);
+
+            BlockDesignerItemViewModel SayTimeNode = new SayTimeNode(DiagramViewModel) { Name = nameof(SayTimeNode), Left = 288, Top = 28 };
+            DiagramViewModel.Add(SayTimeNode);
+            BlockDesignerItemViewModel SayNode = new SayNode(DiagramViewModel) { Name = nameof(SayNode), Left = 288, Top = 68 };
+            DiagramViewModel.Add(SayNode);
+            BlockDesignerItemViewModel ThinkTimeNode = new ThinkTimeNode(DiagramViewModel) { Name = nameof(ThinkTimeNode), Left = 288, Top = 108 };
+            DiagramViewModel.Add(ThinkTimeNode);
+            BlockDesignerItemViewModel ThinkBlockNode = new ThinkBlockNode(DiagramViewModel) { Name = nameof(ThinkBlockNode), Left = 288, Top = 148 };
+            DiagramViewModel.Add(ThinkBlockNode);
+            BlockDesignerItemViewModel ChangeLookNode = new ChangeLookNode(DiagramViewModel) { Name = nameof(ChangeLookNode), Left = 288, Top = 188 };
+            DiagramViewModel.Add(ChangeLookNode);
+            BlockDesignerItemViewModel NextLookNode = new NextLookNode(DiagramViewModel) { Name = nameof(NextLookNode), Left = 288, Top = 228 };
+            DiagramViewModel.Add(NextLookNode);
+            BlockDesignerItemViewModel ChangeBackgroundNode = new ChangeBackgroundNode(DiagramViewModel) { Name = nameof(ChangeBackgroundNode), Left = 288, Top = 268 };
+            DiagramViewModel.Add(ChangeBackgroundNode);
+            BlockDesignerItemViewModel NextBackgroundNode = new NextBackgroundNode(DiagramViewModel) { Name = nameof(NextBackgroundNode), Left = 288, Top = 308 };
+            DiagramViewModel.Add(NextBackgroundNode);
+            BlockDesignerItemViewModel AddSizeNode = new AddSizeNode(DiagramViewModel) { Name = nameof(AddSizeNode), Left = 288, Top = 348 };
+            DiagramViewModel.Add(AddSizeNode);
+            BlockDesignerItemViewModel SetSizeNode = new SetSizeNode(DiagramViewModel) { Name = nameof(SetSizeNode), Left = 288, Top = 388 };
+            DiagramViewModel.Add(SetSizeNode);
+            BlockDesignerItemViewModel ClearEffectNode = new ClearEffectNode(DiagramViewModel) { Name = nameof(ClearEffectNode), Left = 288, Top = 428 };
+            DiagramViewModel.Add(ClearEffectNode);
+            BlockDesignerItemViewModel ShowEffectNode = new ShowNode(DiagramViewModel) { Name = nameof(ShowNode), Left = 288, Top = 468 };
+            DiagramViewModel.Add(ShowEffectNode);
+            BlockDesignerItemViewModel HideEffectNode = new HideNode(DiagramViewModel) { Name = nameof(HideNode), Left = 288, Top = 508 };
+            DiagramViewModel.Add(HideEffectNode);
+            BlockDesignerItemViewModel BringToNode = new BringToNode(DiagramViewModel) { Name = nameof(BringToNode), Left = 288, Top = 548 };
+            DiagramViewModel.Add(BringToNode);
+            BlockDesignerItemViewModel BringLayerNode = new BringLayerNode(DiagramViewModel) { Name = nameof(BringLayerNode), Left = 288, Top = 588 };
+            DiagramViewModel.Add(BringLayerNode);
+            BlockDesignerItemViewModel LookNode = new LookNode(DiagramViewModel) { Name = nameof(LookNode), Left = 288, Top = 628 };
+            DiagramViewModel.Add(LookNode);
+            BlockDesignerItemViewModel BackgroundNode = new BackgroundNode(DiagramViewModel) { Name = nameof(BackgroundNode), Left = 288, Top = 668 };
+            DiagramViewModel.Add(BackgroundNode);
+            BlockDesignerItemViewModel SizeNode = new SizeNode(DiagramViewModel) { Name = nameof(SizeNode), Left = 288, Top = 708 };
+            DiagramViewModel.Add(SizeNode);
+
+            BlockDesignerItemViewModel PlaySoundCompleteNode = new PlaySoundCompleteNode(DiagramViewModel) { Name = nameof(PlaySoundCompleteNode), Left = 448, Top = 28 };
+            DiagramViewModel.Add(PlaySoundCompleteNode);
+            BlockDesignerItemViewModel PlaySoundNode = new PlaySoundNode(DiagramViewModel) { Name = nameof(PlaySoundNode), Left = 448, Top = 68 };
+            DiagramViewModel.Add(PlaySoundNode);
+            BlockDesignerItemViewModel StopAllSoundNode = new StopAllSoundNode(DiagramViewModel) { Name = nameof(StopAllSoundNode), Left = 448, Top = 108 };
+            DiagramViewModel.Add(StopAllSoundNode);
+            BlockDesignerItemViewModel AddSoundEffectNode = new AddSoundEffectNode(DiagramViewModel) { Name = nameof(AddSoundEffectNode), Left = 448, Top = 148 };
+            DiagramViewModel.Add(AddSoundEffectNode);
+            BlockDesignerItemViewModel SetSoundEffectNode = new SetSoundEffectNode(DiagramViewModel) { Name = nameof(SetSoundEffectNode), Left = 448, Top = 188 };
+            DiagramViewModel.Add(SetSoundEffectNode);
+            BlockDesignerItemViewModel ClearSoundEffectNode = new ClearSoundEffectNode(DiagramViewModel) { Name = nameof(ClearSoundEffectNode), Left = 448, Top = 228 };
+            DiagramViewModel.Add(ClearSoundEffectNode);
+            BlockDesignerItemViewModel AddVolumeNode = new AddVolumeNode(DiagramViewModel) { Name = nameof(AddVolumeNode), Left = 448, Top = 268 };
+            DiagramViewModel.Add(AddVolumeNode);
+            BlockDesignerItemViewModel SetVolumeNode = new SetVolumeNode(DiagramViewModel) { Name = nameof(SetVolumeNode), Left = 448, Top = 308 };
+            DiagramViewModel.Add(SetVolumeNode);
+            BlockDesignerItemViewModel VolumeNode = new VolumeNode(DiagramViewModel) { Name = nameof(VolumeNode), Left = 448, Top = 348 };
+            DiagramViewModel.Add(VolumeNode);
+
+            BlockDesignerItemViewModel StartNode = new StartNode(DiagramViewModel) { Name = nameof(StartNode), Left = 638, Top = 28 };
+            DiagramViewModel.Add(StartNode);
+            BlockDesignerItemViewModel KeyboardPressNode = new KeyboardPressNode(DiagramViewModel) { Name = nameof(KeyboardPressNode), Left = 638, Top = 88 };
+            DiagramViewModel.Add(KeyboardPressNode);
+            BlockDesignerItemViewModel WhenRoleClickedNode = new WhenRoleClickedNode(DiagramViewModel) { Name = nameof(WhenRoleClickedNode), Left = 638, Top = 148 };
+            DiagramViewModel.Add(WhenRoleClickedNode);
+            BlockDesignerItemViewModel WhenBackgroundSwitchNode = new WhenBackgroundSwitchNode(DiagramViewModel) { Name = nameof(WhenBackgroundSwitchNode), Left = 638, Top = 208 };
+            DiagramViewModel.Add(WhenBackgroundSwitchNode);
+            BlockDesignerItemViewModel WhenGreaterThanNode = new WhenGreaterThanNode(DiagramViewModel) { Name = nameof(WhenGreaterThanNode), Left = 638, Top = 268 };
+            DiagramViewModel.Add(WhenGreaterThanNode);
+            BlockDesignerItemViewModel WhenReceivedMessageNode = new WhenReceivedMessageNode(DiagramViewModel) { Name = nameof(WhenReceivedMessageNode), Left = 638, Top = 328 };
+            DiagramViewModel.Add(WhenReceivedMessageNode);
+            BlockDesignerItemViewModel BroadcastMessageNode = new BroadcastMessageNode(DiagramViewModel) { Name = nameof(BroadcastMessageNode), Left = 638, Top = 388 };
+            DiagramViewModel.Add(BroadcastMessageNode);
+            BlockDesignerItemViewModel BroadcastMessageAndWaitingNode = new BroadcastMessageAndWaitingNode(DiagramViewModel) { Name = nameof(BroadcastMessageAndWaitingNode), Left = 638, Top = 448 };
+            DiagramViewModel.Add(BroadcastMessageAndWaitingNode);
+
+            BlockDesignerItemViewModel WaitTimeNode = new WaitTimeNode(DiagramViewModel) { Name = nameof(WaitTimeNode), Left = 788, Top = 28 };
+            DiagramViewModel.Add(WaitTimeNode);
+            BlockDesignerItemViewModel ForNode = new ForNode(DiagramViewModel) { Name = nameof(ForNode), Left = 788, Top = 68 };
+            DiagramViewModel.Add(ForNode);
+            BlockDesignerItemViewModel AlwaysNode = new AlwaysNode(DiagramViewModel) { Name = nameof(AlwaysNode), Left = 788, Top = 158 };
+            DiagramViewModel.Add(AlwaysNode);
+            BlockDesignerItemViewModel IfNode = new IfNode(DiagramViewModel) { Name = nameof(IfNode), Left = 788, Top = 238 };
+            DiagramViewModel.Add(IfNode);
+            BlockDesignerItemViewModel IfElseNode = new IfElseNode(DiagramViewModel) { Name = nameof(IfElseNode), Left = 788, Top = 328 };
+            DiagramViewModel.Add(IfElseNode);
+            BlockDesignerItemViewModel WaitNode = new WaitNode(DiagramViewModel) { Name = nameof(WaitNode), Left = 788, Top = 458 };
+            DiagramViewModel.Add(WaitNode);
+            BlockDesignerItemViewModel WhileNode = new WhileNode(DiagramViewModel) { Name = nameof(WhileNode), Left = 788, Top = 498 };
+            DiagramViewModel.Add(WhileNode);
+            BlockDesignerItemViewModel StopNode = new StopNode(DiagramViewModel) { Name = nameof(StopNode), Left = 788, Top = 578 };
+            DiagramViewModel.Add(StopNode);
+            BlockDesignerItemViewModel CloneStartNode = new CloneStartNode(DiagramViewModel) { Name = nameof(CloneStartNode), Left = 788, Top = 618 };
+            DiagramViewModel.Add(CloneStartNode);
+            BlockDesignerItemViewModel CloneNode = new CloneNode(DiagramViewModel) { Name = nameof(CloneNode), Left = 788, Top = 678 };
+            DiagramViewModel.Add(CloneNode);
+            BlockDesignerItemViewModel DeleteThisCloneNode = new DeleteThisCloneNode(DiagramViewModel) { Name = nameof(DeleteThisCloneNode), Left = 788, Top = 718 };
+            DiagramViewModel.Add(DeleteThisCloneNode);
+
+            BlockDesignerItemViewModel HitNode = new HitNode(DiagramViewModel) { Name = nameof(HitNode), Left = 928, Top = 28 };
+            DiagramViewModel.Add(HitNode);
+            BlockDesignerItemViewModel HitColorNode = new HitColorNode(DiagramViewModel) { Name = nameof(HitColorNode), Left = 928, Top = 68 };
+            DiagramViewModel.Add(HitColorNode);
+            BlockDesignerItemViewModel ColorHitColorNode = new ColorHitColorNode(DiagramViewModel) { Name = nameof(ColorHitColorNode), Left = 928, Top = 108 };
+            DiagramViewModel.Add(ColorHitColorNode);
+            BlockDesignerItemViewModel DistanceNode = new DistanceNode(DiagramViewModel) { Name = nameof(DistanceNode), Left = 928, Top = 148 };
+            DiagramViewModel.Add(DistanceNode);
+            BlockDesignerItemViewModel AskNode = new AskNode(DiagramViewModel) { Name = nameof(AskNode), Left = 928, Top = 188 };
+            DiagramViewModel.Add(AskNode);
+            BlockDesignerItemViewModel AnswerNode = new AnswerNode(DiagramViewModel) { Name = nameof(AnswerNode), Left = 928, Top = 228 };
+            DiagramViewModel.Add(AnswerNode);
+            BlockDesignerItemViewModel PressKeyNode = new PressKeyNode(DiagramViewModel) { Name = nameof(PressKeyNode), Left = 928, Top = 268 };
+            DiagramViewModel.Add(PressKeyNode);
+            BlockDesignerItemViewModel PressMouseNode = new PressMouseNode(DiagramViewModel) { Name = nameof(PressMouseNode), Left = 928, Top = 308 };
+            DiagramViewModel.Add(PressMouseNode);
+            BlockDesignerItemViewModel MousePointXNode = new MousePointXNode(DiagramViewModel) { Name = nameof(MousePointXNode), Left = 928, Top = 348 };
+            DiagramViewModel.Add(MousePointXNode);
+            BlockDesignerItemViewModel MousePointYNode = new MousePointYNode(DiagramViewModel) { Name = nameof(MousePointYNode), Left = 928, Top = 388 };
+            DiagramViewModel.Add(MousePointYNode);
+            BlockDesignerItemViewModel DragModeNode = new DragModeNode(DiagramViewModel) { Name = nameof(DragModeNode), Left = 928, Top = 428 };
+            DiagramViewModel.Add(DragModeNode);
+            BlockDesignerItemViewModel LoudnessNode = new LoudnessNode(DiagramViewModel) { Name = nameof(LoudnessNode), Left = 928, Top = 468 };
+            DiagramViewModel.Add(LoudnessNode);
+            BlockDesignerItemViewModel TimerNode = new TimerNode(DiagramViewModel) { Name = nameof(TimerNode), Left = 928, Top = 508 };
+            DiagramViewModel.Add(TimerNode);
+            BlockDesignerItemViewModel ClearTimerNode = new ClearTimerNode(DiagramViewModel) { Name = nameof(ClearTimerNode), Left = 928, Top = 548 };
+            DiagramViewModel.Add(ClearTimerNode);
+            BlockDesignerItemViewModel StageObjectNode = new StageObjectNode(DiagramViewModel) { Name = nameof(StageObjectNode), Left = 928, Top = 588 };
+            DiagramViewModel.Add(StageObjectNode);
+            BlockDesignerItemViewModel NowTimeNode = new NowTimeNode(DiagramViewModel) { Name = nameof(NowTimeNode), Left = 928, Top = 628 };
+            DiagramViewModel.Add(NowTimeNode);
+            BlockDesignerItemViewModel DaysFrom2000Node = new DaysFrom2000Node(DiagramViewModel) { Name = nameof(DaysFrom2000Node), Left = 928, Top = 668 };
+            DiagramViewModel.Add(DaysFrom2000Node);
+            BlockDesignerItemViewModel UserNameNode = new UserNameNode(DiagramViewModel) { Name = nameof(UserNameNode), Left = 928, Top = 708 };
+            DiagramViewModel.Add(UserNameNode);
+
+            BlockDesignerItemViewModel AddNode = new AddNode(DiagramViewModel) { Name = nameof(AddNode), Left = 1108, Top = 28 };
+            DiagramViewModel.Add(AddNode);
+            BlockDesignerItemViewModel SubtractNode = new SubtractNode(DiagramViewModel) { Name = nameof(SubtractNode), Left = 1108, Top = 68 };
+            DiagramViewModel.Add(SubtractNode);
+            BlockDesignerItemViewModel MultiplyNode = new MultiplyNode(DiagramViewModel) { Name = nameof(MultiplyNode), Left = 1108, Top = 108 };
+            DiagramViewModel.Add(MultiplyNode);
+            BlockDesignerItemViewModel DivisionNode = new DivisionNode(DiagramViewModel) { Name = nameof(DivisionNode), Left = 1108, Top = 148 };
+            DiagramViewModel.Add(DivisionNode);
+            BlockDesignerItemViewModel RandomNode = new RandomNode(DiagramViewModel) { Name = nameof(RandomNode), Left = 1108, Top = 188 };
+            DiagramViewModel.Add(RandomNode);
+            BlockDesignerItemViewModel GreaterThanNode = new GreaterThanNode(DiagramViewModel) { Name = nameof(GreaterThanNode), Left = 1108, Top = 228 };
+            DiagramViewModel.Add(GreaterThanNode);
+            BlockDesignerItemViewModel LessThanNode = new LessThanNode(DiagramViewModel) { Name = nameof(LessThanNode), Left = 1108, Top = 268 };
+            DiagramViewModel.Add(LessThanNode);
+            BlockDesignerItemViewModel EqualThanNode = new EqualThanNode(DiagramViewModel) { Name = nameof(EqualThanNode), Left = 1108, Top = 308 };
+            DiagramViewModel.Add(EqualThanNode);
+            BlockDesignerItemViewModel AndNode = new AndNode(DiagramViewModel) { Name = nameof(AndNode), Left = 1108, Top = 348 };
+            DiagramViewModel.Add(AndNode);
+            BlockDesignerItemViewModel OrNode = new OrNode(DiagramViewModel) { Name = nameof(OrNode), Left = 1108, Top = 388 };
+            DiagramViewModel.Add(OrNode);
+            BlockDesignerItemViewModel NotNode = new NotNode(DiagramViewModel) { Name = nameof(NotNode), Left = 1108, Top = 428 };
+            DiagramViewModel.Add(NotNode);
+            BlockDesignerItemViewModel StringAddNode = new StringAddNode(DiagramViewModel) { Name = nameof(StringAddNode), Left = 1108, Top = 468 };
+            DiagramViewModel.Add(StringAddNode);
+            BlockDesignerItemViewModel StringIndexNode = new StringIndexNode(DiagramViewModel) { Name = nameof(StringIndexNode), Left = 1108, Top = 508 };
+            DiagramViewModel.Add(StringIndexNode);
+            BlockDesignerItemViewModel StringContainNode = new StringContainNode(DiagramViewModel) { Name = nameof(StringContainNode), Left = 1108, Top = 548 };
+            DiagramViewModel.Add(StringContainNode);
+            BlockDesignerItemViewModel ModNode = new ModNode(DiagramViewModel) { Name = nameof(ModNode), Left = 1108, Top = 588 };
+            DiagramViewModel.Add(ModNode);
+            BlockDesignerItemViewModel RoundNode = new RoundNode(DiagramViewModel) { Name = nameof(RoundNode), Left = 1108, Top = 628 };
+            DiagramViewModel.Add(RoundNode);
+            BlockDesignerItemViewModel MathNode = new MathNode(DiagramViewModel) { Name = nameof(MathNode), Left = 1108, Top = 668 };
+            DiagramViewModel.Add(MathNode);
+
+            BlockDesignerItemViewModel VariableNode = new VariableNode(DiagramViewModel) { Name = nameof(VariableNode), Left = 1318, Top = 28 };
+            DiagramViewModel.Add(VariableNode);
+            BlockDesignerItemViewModel SetVariableNode = new SetVariableNode(DiagramViewModel) { Name = nameof(SetVariableNode), Left = 1318, Top = 68 };
+            DiagramViewModel.Add(SetVariableNode);
+            BlockDesignerItemViewModel IncreaseVariableNode = new IncreaseVariableNode(DiagramViewModel) { Name = nameof(IncreaseVariableNode), Left = 1318, Top = 108 };
+            DiagramViewModel.Add(IncreaseVariableNode);
+            BlockDesignerItemViewModel ShowVariableNode = new ShowVariableNode(DiagramViewModel) { Name = nameof(ShowVariableNode), Left = 1318, Top = 148 };
+            DiagramViewModel.Add(ShowVariableNode);
+            BlockDesignerItemViewModel HiddenVariableNode = new HiddenVariableNode(DiagramViewModel) { Name = nameof(HiddenVariableNode), Left = 1318, Top = 188 };
+            DiagramViewModel.Add(HiddenVariableNode);
+            #endregion
+        }
+    }
+}

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,17 +1,13 @@
-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 : PageViewModel
     {
@@ -32,10 +28,10 @@ namespace AIStudio.Wpf.Flowchart
         {
             base.InitDiagramViewModel();
 
-            DiagramViewModel.ShowGrid = true;
-            DiagramViewModel.GridCellSize = new Size(100, 100);
-            DiagramViewModel.CellHorizontalAlignment = CellHorizontalAlignment.Center;
-            DiagramViewModel.CellVerticalAlignment = CellVerticalAlignment.Center;
+            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;
         }
 
@@ -46,13 +42,13 @@ namespace AIStudio.Wpf.Flowchart
             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, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString(), Text = "主管审批", UserIds= new List<string> { "操作员1", "操作员2" }, ActType = "or", SimulateApprove = true };
+            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, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString(), Text = "5" };
             DiagramViewModel.Add(decide);
 
-            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 };
+            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, ItemWidth = 80, ItemHeight = 40, StatusColor = Colors.Yellow.ToString() };
@@ -105,7 +101,7 @@ namespace AIStudio.Wpf.Flowchart
             TextDesignerItemViewModel despcription = new TextDesignerItemViewModel()
             {
                 Name = nameof(despcription),
-                Left = 260,
+                Left = 360,
                 Top = 60,
                 ItemWidth = 300,
                 ItemHeight = 150,

AIStudio.Wpf.DiagramApp/ViewModels/LogicalViewModel.cs

@@ -1,13 +1,13 @@
-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 : PageViewModel
     {
@@ -24,11 +24,11 @@ namespace AIStudio.Wpf.Logical
         {
             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.LineDrawMode = DrawMode.ConnectingLineSmooth;

AIStudio.Wpf.DiagramApp/ViewModels/MainWindowViewModel.cs

@@ -21,6 +21,7 @@ using AIStudio.Wpf.DiagramDesigner.ViewModels;
 using AIStudio.Wpf.DiagramDesigner.ViewModels.BaseViewModel;
 using AIStudio.Wpf.Mind;
 using AIStudio.Wpf.Mind.Models;
+using ControlzEx.Controls;
 
 namespace AIStudio.Wpf.DiagramApp.ViewModels
 {
@@ -39,9 +40,9 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
         {
             ToolBoxViewModel = new ToolBoxViewModel(this);
 
-            DiagramsViewModels = new ObservableCollection<PageViewModel>();
-            DiagramsViewModels.Add(new PageViewModel("新建-1", "*", DiagramType.Normal));
-            PageViewModel = DiagramsViewModels.FirstOrDefault();
+            PageViewModels = new ObservableCollection<PageViewModel>();
+            PageViewModels.Add(new PageViewModel("新建-1", "*", DiagramType.Normal));
+            PageViewModel = PageViewModels.FirstOrDefault();
 
             StandardColor = GenerateStandardGradients();
 
@@ -62,16 +63,16 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             get; private set;
         }
 
-        private ObservableCollection<PageViewModel> _diagramsViewModels;
-        public ObservableCollection<PageViewModel> DiagramsViewModels
+        private ObservableCollection<PageViewModel> _pageViewModels;
+        public ObservableCollection<PageViewModel> PageViewModels
         {
             get
             {
-                return _diagramsViewModels;
+                return _pageViewModels;
             }
             set
             {
-                SetProperty(ref _diagramsViewModels, value);
+                SetProperty(ref _pageViewModels, value);
             }
         }
 
@@ -91,16 +92,16 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             }
         }
 
-        private Models.ColorType _colorObject;
+        private Models.ColorType _colorType;
         public Models.ColorType ColorType
         {
             get
             {
-                return _colorObject;
+                return _colorType;
             }
             set
             {
-                SetProperty(ref _colorObject, value);
+                SetProperty(ref _colorType, value);
             }
         }
 
@@ -246,7 +247,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             {
                 return
                     () => {
-                        return new PageViewModel(NewNameHelper.GetNewName(DiagramsViewModels.Select(p => p.Title), "新建-"), "*", DiagramType.Normal);
+                        return new PageViewModel(NewNameHelper.GetNewName(PageViewModels.Select(p => p.Title), "新建-"), "*", DiagramType.Normal);
                     };
             }
         }
@@ -387,6 +388,15 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             }
         }
 
+        private ICommand _colorPickerCommand;
+        public ICommand ColorPickerCommand
+        {
+            get
+            {
+                return this._colorPickerCommand ?? (this._colorPickerCommand = new DelegateCommand(() => this.ColorPickerExecuted()));
+            }
+        }
+
         private ICommand _screenshotCommand;
         public ICommand ScreenshotCommand
         {
@@ -502,7 +512,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
                 filename = para;
             }
 
-            var viewmodel = DiagramsViewModels.FirstOrDefault(p => p.FileName == filename);
+            var viewmodel = PageViewModels.FirstOrDefault(p => p.FileName == filename);
             if (viewmodel != null)
             {
                 PageViewModel = viewmodel;
@@ -532,11 +542,19 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             {
                 flow = new ScriptViewModel(filename, diagram);
             }
+            else if (diagram.DiagramType == DiagramType.Drawing)
+            {
+                flow = new DrawingViewModel(filename, diagram);
+            }
+            else if (diagram.DiagramType == DiagramType.Block)
+            {
+                flow = new BlockViewModel(filename, diagram);
+            }
             else
             {
                 flow = new PageViewModel(filename, diagram);
             }
-            DiagramsViewModels.Add(flow);
+            PageViewModels.Add(flow);
             PageViewModel = flow;
 
             if (string.IsNullOrEmpty(para))
@@ -637,36 +655,44 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             IsOpenBackstage = false;
             if (type == DiagramType.FlowChart.ToString())
             {
-                PageViewModel = new FlowchartViewModel(NewNameHelper.GetNewName(DiagramsViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type));
+                PageViewModel = new FlowchartViewModel(NewNameHelper.GetNewName(PageViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type));
             }
             else if (type == DiagramType.Logical.ToString())
             {
-                PageViewModel = new LogicalViewModel(NewNameHelper.GetNewName(DiagramsViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type));
+                PageViewModel = new LogicalViewModel(NewNameHelper.GetNewName(PageViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type));
             }
             else if (type == DiagramType.SFC.ToString())
             {
-                PageViewModel = new SFCViewModel(NewNameHelper.GetNewName(DiagramsViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type));
+                PageViewModel = new SFCViewModel(NewNameHelper.GetNewName(PageViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type));
             }
             else if (type == DiagramType.Script.ToString())
             {
-                PageViewModel = new ScriptViewModel(NewNameHelper.GetNewName(DiagramsViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type));
+                PageViewModel = new ScriptViewModel(NewNameHelper.GetNewName(PageViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type));
+            }
+            else if (type == DiagramType.Drawing.ToString())
+            {
+                PageViewModel = new DrawingViewModel(NewNameHelper.GetNewName(PageViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type));
+            }
+            else if (type == DiagramType.Block.ToString())
+            {
+                PageViewModel = new BlockViewModel(NewNameHelper.GetNewName(PageViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type));
             }
             else
             {
-                PageViewModel = new PageViewModel(NewNameHelper.GetNewName(DiagramsViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type));
+                PageViewModel = new PageViewModel(NewNameHelper.GetNewName(PageViewModels.Select(p => p.Title), "新建-"), "*", (DiagramType)Enum.Parse(typeof(DiagramType), type));
             }
 
-            DiagramsViewModels.Add(PageViewModel);
+            PageViewModels.Add(PageViewModel);
         }
 
         private void NewMind_Executed(string mindtype = "Mind")
         {
             IsOpenBackstage = false;
 
-            PageViewModel = new MindViewModel(NewNameHelper.GetNewName(DiagramsViewModels.Select(p => p.Title), "新建-"), "*", DiagramType.Mind, mindtype.ToEnum<MindType>());
+            PageViewModel = new MindViewModel(NewNameHelper.GetNewName(PageViewModels.Select(p => p.Title), "新建-"), "*", DiagramType.Mind, mindtype.ToEnum<MindType>());
 
 
-            DiagramsViewModels.Add(PageViewModel);
+            PageViewModels.Add(PageViewModel);
         }
 
         private void ExitExecuted()
@@ -690,7 +716,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
 
             switch (ColorType)
             {
-                case Models.ColorType.Text: PageViewModel?.DiagramViewModel?.SetFont(new FontViewModel() { FontColor = (Color)para }, "Color", PageViewModel.DiagramViewModel.SelectedItems); break;
+                case Models.ColorType.Text: PageViewModel?.DiagramViewModel?.SetFont(new FontViewModel() { FontColor = (Color)para }, "FontColor", PageViewModel.DiagramViewModel.SelectedItems); break;
                 case Models.ColorType.Fill: PageViewModel?.DiagramViewModel?.SetColor(new ColorViewModel() { FillColor = new ColorObject() { Color = (Color)para } }, "FillColor", PageViewModel.DiagramViewModel.SelectedItems); break;
                 case Models.ColorType.Line: PageViewModel?.DiagramViewModel?.SetColor(new ColorViewModel() { LineColor = new ColorObject() { Color = (Color)para } }, "LineColor", PageViewModel.DiagramViewModel.SelectedItems); break;
             }
@@ -708,6 +734,12 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             window.Show();
         }
 
+        private void ColorPickerExecuted()
+        {
+            AIStudio.Wpf.ColorPicker.MainWindow window = new AIStudio.Wpf.ColorPicker.MainWindow();
+            window.Show();
+        }
+
         #region 方法
         private Color[] GenerateStandardGradients()
         {
@@ -715,21 +747,128 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             List<Color> result = new List<Color>();
             for (var i = 0; i < count; i++)
             {
-                //var colors = ColorGallery.GetGradient(ColorGallery.StandardThemeColors[i], 10);
-                //for (var j = 9; j >= 0; j--)
-                //{
-                //    result.AddTo(colors[j]);
-                //}
+                var colors = GetGradient(ColorGallery.StandardThemeColors[i], 10);
+                for (var j = 9; j >= 0; j--)
+                {
+                    result.Add(colors[j]);
+                }
             }
             {
-                //var colors = ColorGallery.GetGradient(Colors.Black, 10);
-                //for (var j = 9; j >= 0; j--)
-                //{
-                //    result.AddTo(colors[j]);
-                //}
+                var colors = GetGradient(Colors.Black, 10);
+                for (var j = 9; j >= 0; j--)
+                {
+                    result.Add(colors[j]);
+                }
             }
             return result.ToArray();
         }
+
+        #endregion
+
+        #region Gradient Generation
+
+        /// <summary>
+        /// Returns brightness of the given color from 0..1
+        /// </summary>
+        /// <param name="color">Color</param>
+        /// <returns>Brightness of the given color from 0..1</returns>
+        private static double GetBrightness(Color color)
+        {
+            var summ = (double)color.R + color.G + color.B;
+            return summ / (255.0 * 3.0);
+        }
+
+        // Makes the given color lighter
+        private static Color Lighter(Color color, double power)
+        {
+            var totalAvailability = (255.0 * 3.0) - color.R + color.G + color.B;
+            double redAvailability;
+            double greenAvailability;
+            double blueAvailability;
+            double needToBeAdded;
+
+            if (color.R + color.G + color.B == 0)
+            {
+                redAvailability = 1.0 / 3.0;
+                greenAvailability = 1.0 / 3.0;
+                blueAvailability = 1.0 / 3.0;
+                needToBeAdded = power * 255.0 * 3.0;
+            }
+            else
+            {
+                redAvailability = (255.0 - color.R) / totalAvailability;
+                greenAvailability = (255.0 - color.G) / totalAvailability;
+                blueAvailability = (255.0 - color.B) / totalAvailability;
+                needToBeAdded = ((double)color.R + color.G + color.B) * (power - 1);
+            }
+
+            var result = Color.FromRgb(
+                (byte)(color.R + (byte)(redAvailability * needToBeAdded)),
+                (byte)(color.G + (byte)(greenAvailability * needToBeAdded)),
+                (byte)(color.B + (byte)(blueAvailability * needToBeAdded)));
+
+            return result;
+        }
+
+        // Makes the given color darker
+        private static Color Darker(Color color, double power)
+        {
+            var totalAvailability = (double)color.R + color.G + color.B;
+            var redAvailability = color.R / totalAvailability;
+            var greenAvailability = color.G / totalAvailability;
+            var blueAvailability = color.B / totalAvailability;
+
+            var needToBeAdded = (double)color.R + color.G + color.B;
+            needToBeAdded = needToBeAdded - (needToBeAdded * power);
+
+            var result = Color.FromRgb(
+                (byte)(color.R - (byte)(redAvailability * needToBeAdded)),
+                (byte)(color.G - (byte)(greenAvailability * needToBeAdded)),
+                (byte)(color.B - (byte)(blueAvailability * needToBeAdded)));
+
+            return result;
+        }
+
+        // Makes a new color from the given with new brightness
+        private static Color Rebright(Color color, double newBrightness)
+        {
+            var currentBrightness = GetBrightness(color);
+            var power = DoubleUtil.AreClose(currentBrightness, 0.0) == false
+                ? newBrightness / currentBrightness
+                : 1.0 + newBrightness;
+
+            // TODO: round power to make nice numbers
+            // ...
+
+            if (power > 1.0)
+            {
+                return Lighter(color, power);
+            }
+
+            return Darker(color, power);
+        }
+
+        /// <summary>
+        /// Makes gradient colors from lighter to darker
+        /// </summary>
+        /// <param name="color">Base color</param>
+        /// <param name="count">Count of items in the gradient</param>
+        /// <returns>Colors from lighter to darker</returns>
+        public static Color[] GetGradient(Color color, int count)
+        {
+            const double lowBrightness = 0.15;
+            const double highBrightness = 0.85;
+            var result = new Color[count];
+
+            for (var i = 0; i < count; i++)
+            {
+                var brightness = lowBrightness + (i * (highBrightness - lowBrightness) / count);
+                result[count - i - 1] = Rebright(color, brightness);
+            }
+
+            return result;
+        }
+
         #endregion
     }
 }

AIStudio.Wpf.DiagramApp/ViewModels/MindViewModel.cs

@@ -16,7 +16,7 @@ using AIStudio.Wpf.DiagramDesigner.Additionals;
 using AIStudio.Wpf.Mind.Helpers;
 using AIStudio.Wpf.Mind.Models;
 
-namespace AIStudio.Wpf.Flowchart
+namespace AIStudio.Wpf.DiagramApp.ViewModels
 {
     public class MindViewModel : PageViewModel
     {
@@ -26,11 +26,16 @@ namespace AIStudio.Wpf.Flowchart
         }
         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();
@@ -42,9 +47,9 @@ namespace AIStudio.Wpf.Flowchart
         {
             base.InitDiagramViewModel();
 
-            DiagramViewModel.GridCellSize = new Size(100, 100);
-            DiagramViewModel.ShowGrid = false;
-            DiagramViewModel.AllowDrop = false;
+            DiagramViewModel.DiagramOption.LayoutOption.GridCellSize = new Size(100, 100);
+            DiagramViewModel.DiagramOption.LayoutOption.ShowGrid = false;
+            DiagramViewModel.DiagramOption.LayoutOption.AllowDrop = false;
         }
 
         public IMindDiagramViewModel MindDiagramViewModel
@@ -72,7 +77,7 @@ namespace AIStudio.Wpf.Flowchart
 
         public MindTheme MindTheme
         {
-            get; 
+            get;set;
         }
 
         protected override void Init(bool initNew)
@@ -119,10 +124,7 @@ namespace AIStudio.Wpf.Flowchart
         {
             base.Dispose();
 
-            foreach (var viewModel in DiagramViewModels)
-            {
-                FlowchartService.Dispose(viewModel);
-            }
+
         }
     }
 }

AIStudio.Wpf.DiagramApp/ViewModels/PageViewModel.cs

@@ -20,6 +20,7 @@ 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
 {
@@ -34,29 +35,48 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             }
         }
 
+
         public PageViewModel(string title, string status, DiagramType diagramType, string subType = null)
         {
             Title = title;
             Status = status;
             DiagramType = diagramType;
             SubType = subType;
-            Init(true);
+
         }
         public PageViewModel(string filename)
         {
             FileName = filename;
             string ext = Path.GetExtension(filename);
-            var diagramDocument = OpenFile(filename, ext);
-            OpenFile(diagramDocument, ext);
+            DiagramDocument = OpenFile(filename, ext);
         }
 
         public PageViewModel(string filename, DiagramDocument diagramDocument)
         {
             FileName = filename;
-            string ext = Path.GetExtension(filename);
-            OpenFile(diagramDocument, ext);
+            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()
         {
 
@@ -106,24 +126,24 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             }
         }
 
-        private bool _showGrid;
-        public bool ShowGrid
-        {
-            get
-            {
-                return _showGrid;
-            }
-            set
-            {
-                if (SetProperty(ref _showGrid, value))
-                {
-                    foreach (var item in DiagramViewModels)
-                    {
-                        item.ShowGrid = _showGrid;
-                    }
-                }
-            }
-        }
+        //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
         {
@@ -162,6 +182,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
                     if (_diagramViewModel != null)
                     {
                         _diagramViewModel.PropertyChanged -= DiagramViewModel_PropertyChanged;
+                        _diagramViewModel.SaveThumbnail();
                     }
                     SetProperty(ref _diagramViewModel, value);
                     if (_diagramViewModel != null)
@@ -370,48 +391,14 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             List<DiagramViewModel> viewModels = new List<DiagramViewModel>();
             foreach (var diagramItem in diagramDocument.DiagramItems)
             {
-                var viewModel = GetDiagramViewModel(diagramItem.Name, diagramItem.DiagramType, false);
-                viewModel.ShowGrid = diagramItem.ShowGrid;
-                viewModel.PhysicalGridCellSize = diagramItem.PhysicalGridCellSize;
-                viewModel.CellHorizontalAlignment = diagramItem.CellHorizontalAlignment;
-                viewModel.CellVerticalAlignment = diagramItem.CellVerticalAlignment;
-                viewModel.PageSizeOrientation = diagramItem.PageSizeOrientation;
-                viewModel.PhysicalPageSize = diagramItem.PhysicalPageSize;
-                viewModel.PageSizeType = diagramItem.PageSizeType;
-                viewModel.PhysicalGridMarginSize = diagramItem.PhysicalGridMarginSize;
-                viewModel.GridColor = diagramItem.GridColor;
-                viewModel.AllowDrop = diagramItem.AllowDrop;
-
-                foreach (var diagramItemData in diagramItem.DesignerItems)
-                {
-                    Type type = TypeHelper.GetType(diagramItemData.ModelTypeName);
-                    DesignerItemViewModelBase itemBase = Activator.CreateInstance(type, viewModel, diagramItemData, ext) as DesignerItemViewModelBase;
-                    viewModel.Items.Add(itemBase);
-                }
-
-                foreach (var connection in diagramItem.Connections)
-                {
-                    Type type = TypeHelper.GetType(connection.SerializableTypeName);
-                    var connectionItem = SerializeHelper.DeserializeObject(type, connection.SerializableString, ext) as ConnectionItem;
-
-                    connectionItem.SourceType = System.Type.GetType(connectionItem.SourceTypeName);
-                    connectionItem.SinkType = System.Type.GetType(connectionItem.SinkTypeName);
-                    DesignerItemViewModelBase sourceItem = DiagramViewModelHelper.GetConnectorDataItem(viewModel.Items, connectionItem.SourceId, connectionItem.SourceType);
-                    ConnectorOrientation sourceConnectorOrientation = connectionItem.SourceOrientation;
-                    FullyCreatedConnectorInfo sourceConnectorInfo = sourceItem.GetFullConnectorInfo(connectionItem.Id, sourceConnectorOrientation, connectionItem.SourceXRatio, connectionItem.SourceYRatio, connectionItem.SourceInnerPoint, connectionItem.SourceInnerPoint);
-
-                    DesignerItemViewModelBase sinkItem = DiagramViewModelHelper.GetConnectorDataItem(viewModel.Items, connectionItem.SinkId, connectionItem.SinkType);
-                    ConnectorOrientation sinkConnectorOrientation = connectionItem.SinkOrientation;
-                    FullyCreatedConnectorInfo sinkConnectorInfo = sinkItem.GetFullConnectorInfo(connectionItem.Id, sinkConnectorOrientation, connectionItem.SinkXRatio, connectionItem.SinkYRatio, connectionItem.SinkInnerPoint, connectionItem.SinkInnerPoint);
-
-                    ConnectionViewModel connectionVM = new ConnectionViewModel(viewModel, sourceConnectorInfo, sinkConnectorInfo, connectionItem);
-                    connectionVM.Id = Guid.NewGuid();
-                    viewModel.Items.Add(connectionVM);
-                }
-
+                var viewModel = GetDiagramViewModel(diagramItem, ext);
                 viewModels.Add(viewModel);
             }
             DiagramViewModels = new ObservableCollection<IDiagramViewModel>(viewModels);
+            foreach (var vm in DiagramViewModels)
+            {
+                vm.Init(false);
+            }
             DiagramViewModel = DiagramViewModels.FirstOrDefault();
         }
 
@@ -444,13 +431,6 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             foreach (var viewModel in DiagramViewModels)
             {
                 DiagramItem diagramItem = new DiagramItem(viewModel);        
-
-                var selectedDesignerItems = viewModel.Items.OfType<DesignerItemViewModelBase>();
-                var selectedConnections = viewModel.Items.OfType<ConnectionViewModel>();
-
-                diagramItem.DesignerItems = selectedDesignerItems.Select(p => p.ToSerializableItem(ext)).Where(p => p != null).ToList();
-                diagramItem.Connections = selectedConnections.Select(p => p.ToSerializableItem(ext)).Where(p => p != null).ToList();
-
                 diagramDocument.DiagramItems.Add(diagramItem);
             }
 
@@ -485,9 +465,14 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             InitDiagramViewModel();
         }
 
+        protected virtual DiagramViewModel GetDiagramViewModel(DiagramItem diagramItem, string ext)
+        {
+            return new BlockDiagramViewModel(diagramItem, ext);
+        }
+
         protected virtual DiagramViewModel GetDiagramViewModel(string name, DiagramType diagramType, bool initNew)
         {
-            return new DiagramViewModel() { Name = name ?? NewNameHelper.GetNewName(DiagramViewModels.Select(p => p.Name), "页-"), DiagramType = diagramType };
+            return new BlockDiagramViewModel() { Name = name ?? NewNameHelper.GetNewName(DiagramViewModels.Select(p => p.Name), "页-"), DiagramType = diagramType };
         }
 
         public void AddCopyPageExecuted(object para)
@@ -496,41 +481,9 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             {
                 var viewModel = DiagramViewModel;
                 DiagramItem diagramItem = new DiagramItem(viewModel);
+                diagramItem.Name = NewNameHelper.GetNewName(DiagramViewModels.Select(p => p.Name), "页-");
 
-                var selectedDesignerItems = viewModel.Items.OfType<DesignerItemViewModelBase>();
-                var selectedConnections = viewModel.Items.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();
-
-                viewModel = new DiagramViewModel(diagramItem);
-                viewModel.Name = NewNameHelper.GetNewName(DiagramViewModels.Select(p => p.Name), "页-");
-
-                foreach (var diagramItemData in diagramItem.DesignerItems)
-                {
-                    Type type = TypeHelper.GetType(diagramItemData.ModelTypeName);
-                    DesignerItemViewModelBase itemBase = Activator.CreateInstance(type, viewModel, diagramItemData, "json") as DesignerItemViewModelBase;
-                    viewModel.Items.Add(itemBase);
-                }
-
-                foreach (var connection in diagramItem.Connections)
-                {
-                    var connectionItem = JsonConvert.DeserializeObject<ConnectionItem>(connection.SerializableString);
-
-                    connectionItem.SourceType = System.Type.GetType(connectionItem.SourceTypeName);
-                    connectionItem.SinkType = System.Type.GetType(connectionItem.SinkTypeName);
-                    DesignerItemViewModelBase sourceItem = DiagramViewModelHelper.GetConnectorDataItem(viewModel.Items, connectionItem.SourceId, connectionItem.SourceType);
-                    ConnectorOrientation sourceConnectorOrientation = connectionItem.SourceOrientation;
-                    FullyCreatedConnectorInfo sourceConnectorInfo = sourceItem.GetFullConnectorInfo(connectionItem.Id, sourceConnectorOrientation, connectionItem.SourceXRatio, connectionItem.SourceYRatio, connectionItem.SourceInnerPoint, connectionItem.SourceIsPortless);
-
-                    DesignerItemViewModelBase sinkItem = DiagramViewModelHelper.GetConnectorDataItem(viewModel.Items, connectionItem.SinkId, connectionItem.SinkType);
-                    ConnectorOrientation sinkConnectorOrientation = connectionItem.SinkOrientation;
-                    FullyCreatedConnectorInfo sinkConnectorInfo = sinkItem.GetFullConnectorInfo(connectionItem.Id, sinkConnectorOrientation, connectionItem.SinkXRatio, connectionItem.SinkYRatio, connectionItem.SinkInnerPoint, connectionItem.SinkIsPortless);
-
-                    ConnectionViewModel connectionVM = new ConnectionViewModel(viewModel, sourceConnectorInfo, sinkConnectorInfo, connectionItem);
-                    connectionVM.Id = Guid.NewGuid();
-                    viewModel.Items.Add(connectionVM);
-                }
+                viewModel = GetDiagramViewModel(diagramItem, ".json");      
 
                 DiagramViewModels.Add(viewModel);
                 DiagramViewModel = viewModel;
@@ -575,7 +528,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
         public void AddImageExecuted(object para)
         {
             ImageItemViewModel itemBase = new ImageItemViewModel();
-            DiagramViewModel?.AddItemCommand.Execute(itemBase);
+            DiagramViewModel?.AddCommand.Execute(itemBase);
             if (itemBase.Root != null)
             {
                 _service.DrawModeViewModel.CursorMode = CursorMode.Move;
@@ -626,7 +579,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
         public void AddVideoExectued(object para)
         {
             VideoItemViewModel itemBase = new VideoItemViewModel();
-            DiagramViewModel?.AddItemCommand.Execute(itemBase);
+            DiagramViewModel?.AddCommand.Execute(itemBase);
             if (itemBase.Root != null)
             {
                 _service.DrawModeViewModel.CursorMode = CursorMode.Move;
@@ -636,7 +589,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
         public void AddOutLineTextExecuted(object para)
         {
             OutLineTextDesignerItemViewModel itemBase = new OutLineTextDesignerItemViewModel();
-            DiagramViewModel?.AddItemCommand.Execute(itemBase);
+            DiagramViewModel?.AddCommand.Execute(itemBase);
             if (itemBase.Root != null)
             {
                 _service.DrawModeViewModel.CursorMode = CursorMode.Move;
@@ -646,7 +599,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
         public void AddBarcodeExecuted(object para)
         {
             BarcodeDesignerItemViewModel itemBase = new BarcodeDesignerItemViewModel() { Format = (BarcodeFormat)Enum.Parse(typeof(BarcodeFormat), para.ToString()), Text = "AIStudio.Wpf.DiagramApp" };
-            DiagramViewModel?.AddItemCommand.Execute(itemBase);
+            DiagramViewModel?.AddCommand.Execute(itemBase);
             if (itemBase.Root != null)
             {
                 _service.DrawModeViewModel.CursorMode = CursorMode.Move;

AIStudio.Wpf.DiagramApp/ViewModels/SFCViewModel.cs

@@ -1,26 +1,19 @@
-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 : PageViewModel
     {
         public SFCViewModel(string title, string status, DiagramType diagramType) : base(title, status, diagramType)
         {
-            Init(true);
+            
         }
 
         public SFCViewModel(string filename, DiagramDocument diagramDocument) : base(filename, diagramDocument)
@@ -40,10 +33,10 @@ namespace AIStudio.Wpf.Flowchart
         {
             base.InitDiagramViewModel();
 
-            DiagramViewModel.ShowGrid = true;
-            DiagramViewModel.GridCellSize = new Size(100, 60);
-            DiagramViewModel.CellHorizontalAlignment = CellHorizontalAlignment.Center;
-            DiagramViewModel.CellVerticalAlignment = CellVerticalAlignment.Center;
+            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;
         }
 

AIStudio.Wpf.DiagramApp/ViewModels/ScriptViewModel.cs

@@ -27,7 +27,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
 
         public ScriptViewModel(string title, string status, DiagramType diagramType) : base(title, status, diagramType)
         {
-            Init(true);
+          
         }
 
         public ScriptViewModel(string filename, DiagramDocument diagramDocument) : base(filename, diagramDocument)
@@ -47,8 +47,8 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
         {
             base.InitDiagramViewModel();
 
-            DiagramViewModel.PageSizeType = PageSizeType.Custom;
-            DiagramViewModel.PageSize = new Size(double.NaN, double.NaN);
+            DiagramViewModel.DiagramOption.LayoutOption.PageSizeType = PageSizeType.Custom;
+            DiagramViewModel.DiagramOption.LayoutOption.PageSize = new Size(double.NaN, double.NaN);
             DiagramViewModel.ColorViewModel = new ColorViewModel();
             DiagramViewModel.ColorViewModel.FillColor.Color = System.Windows.Media.Colors.Orange;
         }
@@ -61,8 +61,8 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             ConsoleLogViewModel logNode = new ConsoleLogViewModel(DiagramViewModel) { Name = "Log", Left = 150, Top = 420 };
             DiagramViewModel.Add(logNode);
 
-            IntScriptViewModel intLog = new IntScriptViewModel(DiagramViewModel) { Name = "Int", Left = 40, Top = 220 };
-            DiagramViewModel.Add(intLog);
+            IntScriptViewModel intNode = new IntScriptViewModel(DiagramViewModel) { Name = "Int", Left = 40, Top = 220 };
+            DiagramViewModel.Add(intNode);
 
             ColorBoxFactoryScriptViewModel factoryNode = new ColorBoxFactoryScriptViewModel(DiagramViewModel) { Name = "ColorBoxFactory", Left = 150, Top = 150 };
             DiagramViewModel.Add(factoryNode);
@@ -100,7 +100,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             DiagramViewModel.Add(collectorNode4);
 
             ColorBoxCollectorScriptViewModel collectorNode5 = new ColorBoxCollectorScriptViewModel(DiagramViewModel) { Name = "Collector5", Left = 790, Top = 475 };
-            collectorNode5.Tag = new ColorBoxModel("青色|梯形", "M 0 0 H 60 L 50 40 H 10 Z", Colors.Cyan);
+            collectorNode5.Tag = new ColorBoxModel("青色|梯形", "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", Colors.Cyan);
             DiagramViewModel.Add(collectorNode5);
 
             ColorBoxCollectorScriptViewModel collectorNode6 = new ColorBoxCollectorScriptViewModel(DiagramViewModel) { Name = "Collector6", Left = 790, Top = 560 };
@@ -111,7 +111,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             collectorNode7.Tag = new ColorBoxModel("紫色|六边形", "M 0,20 L 10,0  H 50 L 60,20 L 50,40 H10 Z", Colors.Purple);
             DiagramViewModel.Add(collectorNode7);
 
-            ConnectionViewModel int_factoryConnector = new ConnectionViewModel(DiagramViewModel, intLog.Output[0], factoryNode.Input[0], DrawMode.ConnectingLineSmooth, RouterMode.RouterNormal);
+            ConnectionViewModel int_factoryConnector = new ConnectionViewModel(DiagramViewModel, intNode.Output[0], factoryNode.Input[0], DrawMode.ConnectingLineSmooth, RouterMode.RouterNormal);
             DiagramViewModel.Add(int_factoryConnector);
 
             ConnectionViewModel bool_switchConnector = new ConnectionViewModel(DiagramViewModel, boolNode.Output[0], switchNode.Input[0], DrawMode.ConnectingLineSmooth, RouterMode.RouterNormal);
@@ -191,7 +191,9 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             {
                 item.Execute();
             }
-            readDataTimer.Start();
+
+            if (readDataTimer != null)
+                readDataTimer.Start();
         }
 
         public override void Dispose()
@@ -200,6 +202,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
 
             readDataTimer.Stop();
             readDataTimer.Dispose();
+            readDataTimer = null;
 
             foreach (var item in DiagramViewModel.Items.OfType<LogicalGateItemViewModelBase>().OrderBy(p => p.OrderNumber).ToList())
             {

AIStudio.Wpf.DiagramApp/ViewModels/ToolBoxViewModel.cs

@@ -49,11 +49,6 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
             }
         }
 
-        public ObservableCollection<ToolBoxCategory> TotalToolBoxCategory
-        {
-            get; set;
-        }
-
         public ToolBoxCategory MyToolBoxCategory
         {
             get
@@ -80,7 +75,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
         }
 
         private ICommand _addItemCommand;
-        public ICommand AddItemCommand
+        public ICommand AddCommand
         {
             get
             {
@@ -119,6 +114,15 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
 
             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 });
 
@@ -142,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) });
@@ -350,53 +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/PropertyControl.xaml

@@ -20,8 +20,8 @@
         <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 SelectedItemViewModel.ColorViewModel.FillColor}"
                         Visibility="{Binding .,Converter={StaticResource NullableToVisibilityConverter}}">
@@ -89,7 +89,7 @@
                             <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={dd:ConverterValueSetToOppositeVisibility},ConverterParameter='None'}">
@@ -97,12 +97,12 @@
                             <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 SelectedItemViewModel.ColorViewModel.LineColor}"
                         Visibility="{Binding .,Converter={StaticResource NullableToVisibilityConverter}}">
@@ -169,7 +169,7 @@
                             <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={dd:ConverterValueSetToOppositeVisibility},ConverterParameter='None'}">
@@ -177,12 +177,12 @@
                             <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,7 +195,7 @@
         </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 PageViewModel.AddImageCommand}">
@@ -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

@@ -0,0 +1,28 @@
+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;
+
+namespace AIStudio.Wpf.DiagramApp.Views
+{
+    /// <summary>
+    /// SearchControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class SearchControl : UserControl
+    {
+        public SearchControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml

@@ -9,18 +9,24 @@
              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: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"/>
+            <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
             <dd:EnumDescriptionConverter x:Key="EnumDescriptionConverter"/>
             <command:CommandReference x:Key="DeleteItemCommandReference" Command="{Binding DeleteItemCommand}"/>
-
+            <dd:MathConverter x:Key="MathAddConverter" Operation="Add" />
 
             <DataTemplate DataType="{x:Type model:ImageToolBoxData}">
                 <Grid Width="{Binding Width}" Height="{Binding Height}" ToolTip="{Binding Description}">
@@ -249,14 +255,14 @@
                     </Trigger>
                 </DataTemplate.Triggers>
             </DataTemplate>
-            <DataTemplate DataType="{x:Type viewmodels:ToolBoxCategory}">
+            <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 DefaultAnimationExpander}">
+                                                  Style="{StaticResource AIStudio.DiagramApp.Styles.Expander}">
                         <ItemsControl  ItemsSource="{Binding ToolBoxItems}">
                             <ItemsControl.Template>
                                 <ControlTemplate TargetType="{x:Type ItemsControl}">
@@ -292,7 +298,7 @@
                             </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">
+                    <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>
@@ -305,7 +311,7 @@
                                                   BorderThickness="0" 
                                                   Background="Transparent" 
                                                   Foreground="{DynamicResource Fluent.Ribbon.Brushes.LabelTextBrush}" 
-                                                  Style="{StaticResource DefaultAnimationExpander}">
+                                                  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>
@@ -363,7 +369,7 @@
                         <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">
+                        <Button Margin="0,5,2,5" ToolTip="添加到我的符号" Command="{Binding DataContext.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.DeleteCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding .}" Width="16" Height="16"  Foreground="{DynamicResource BlackBrush}" Background="{DynamicResource WhiteBrush}" BorderBrush="Transparent">
@@ -376,17 +382,81 @@
         </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>
@@ -408,7 +478,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}" 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

@@ -9,16 +9,22 @@
     <PackageIcon>A.png</PackageIcon>
     <PackageIconUrl />
     <NeutralLanguage />
-    <Version>1.0.1</Version>
+    <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.8" />
+    <PackageReference Include="ZXing.Net" Version="0.16.9" />
   </ItemGroup>
 
   <ItemGroup>
@@ -32,4 +38,10 @@
     </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

@@ -1,27 +1,52 @@
 <Project>
   <PropertyGroup>
-    <AssemblyName>AIStudio.Wpf.Flowchart</AssemblyName>
+    <AssemblyName>AIStudio.Wpf.DiagramDesigner.Additionals</AssemblyName>
     <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <MSBuildProjectExtensionsPath>F:\aistudio.-wpf.-diagram\AIStudio.Wpf.Flowchart\obj\</MSBuildProjectExtensionsPath>
-    <_TargetAssemblyProjectName>AIStudio.Wpf.Flowchart</_TargetAssemblyProjectName>
+    <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>
-    <PackageReference Include="MathParser.org-mXparser" Version="4.4.2" />
+    <None Remove="Images\Bold.png" />
+    <None Remove="Images\Italic.png" />
+    <None Remove="Images\Underline.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\AIStudio.Wpf.DiagramHelper\AIStudio.Wpf.DiagramHelper.csproj" />
+    <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="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramHelper\bin\Debug\netcoreapp3.1\AIStudio.Wpf.DiagramHelper.dll" />
+    <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" />
@@ -55,219 +80,230 @@
     <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:\Users\Administrator\.nuget\packages\mathparser.org-mxparser\4.4.2\lib\netcoreapp31\MathParser.org-mXparser.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:\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\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\util.svg2xaml\1.2.0\lib\netcoreapp3.1\Svg2Xaml.dll" />
-    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\util.svg2xamltestextension\1.2.5\lib\netcoreapp3.1\Svg2XamlTestExtension.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:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\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:\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:\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.Flowchart\obj\Debug\netcoreapp3.1\Controls\ToolBoxControl.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.Flowchart\obj\Debug\netcoreapp3.1\GeneratedInternalTypeHelper.g.cs" />
+    <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

@@ -19,12 +19,17 @@
     <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.8" />
+    <PackageReference Include="ZXing.Net" Version="0.16.9" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
@@ -36,6 +41,8 @@
       </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" />
@@ -277,7 +284,7 @@
     <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.8\lib\netcoreapp3.1\zxing.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" />

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

@@ -19,12 +19,17 @@
     <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.8" />
+    <PackageReference Include="ZXing.Net" Version="0.16.9" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
@@ -36,6 +41,8 @@
       </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" />
@@ -201,8 +208,8 @@
     <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.8\lib\net461\zxing.dll" />
-    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\zxing.net\0.16.8\lib\net461\zxing.presentation.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" />

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

@@ -116,6 +116,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Additionals.Controls
                     Margin = 0
                 }
             };
+            writer.Renderer = new GeometryRenderer();
             var image = writer.Write(Text ?? "AIStudio画板");
             imageBarcodeEncoderGeometry.Data = image;
 #else

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

@@ -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/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

@@ -261,7 +261,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Additionals.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/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/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/Themes/Generic.xaml

@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="/AIStudio.Wpf.DiagramDesigner.Additionals;component/Controls/Flipper.xaml" />
+        <ResourceDictionary Source="/AIStudio.Wpf.DiagramDesigner.Additionals;component/Controls/Carousel.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>

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

@@ -8,8 +8,7 @@
     <PackageIcon>A.png</PackageIcon>
     <PackageIconUrl />
     <NeutralLanguage />
-    <Version>1.1.5
-    </Version>
+    <Version>1.1.7</Version>
     <Description>一个Wpf的Diagram控件基础库</Description>
   </PropertyGroup>
 
@@ -18,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Remove="Images\color-picker.cur" />
     <None Remove="Images\file.png" />
     <None Remove="Images\FormatPainter.cur" />
     <None Include="A.png">
@@ -31,6 +31,7 @@
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="SvgPathProperties" Version="1.1.2" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
     <PackageReference Include="System.Management" Version="7.0.0" />
     <PackageReference Include="System.Reactive" Version="5.0.0" />
     <PackageReference Include="WpfAnimatedGif" Version="2.0.0" />
@@ -41,16 +42,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Resource Include="Images\color-picker.cur" />
     <Resource Include="Images\file.png" />
     <Resource Include="Images\FormatPainter.cur" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="Images\Gifs\car_chase.gif">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <Page Update="Controls\MultiSelectComboBox.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
@@ -67,4 +63,8 @@
     </Page>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="ViewModels\DrawingViewModel\Fillable\" />
+  </ItemGroup>
+  
 </Project>

AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner_5labitf3_wpftmp.csproj

@@ -1,267 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <AssemblyName>AIStudio.Wpf.DiagramDesigner</AssemblyName>
-    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <MSBuildProjectExtensionsPath>F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\</MSBuildProjectExtensionsPath>
-    <_TargetAssemblyProjectName>AIStudio.Wpf.DiagramDesigner</_TargetAssemblyProjectName>
-  </PropertyGroup>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
-  <PropertyGroup>
-    <UseWPF>true</UseWPF>
-    <Company>AIStudio.Wpf.Controls</Company>
-    <Authors>akwkevin</Authors>
-    <PackageProjectUrl>https://gitee.com/akwkevin</PackageProjectUrl>
-    <PackageIcon>A.png</PackageIcon>
-    <PackageIconUrl />
-    <NeutralLanguage />
-    <Version>1.0.4</Version>
-    <Description>一个Wpf的Diagram控件基础库</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Images\file.png" />
-    <None Remove="Images\FormatPainter.cur" />
-    <None Include="A.png">
-      <Pack>True</Pack>
-      <PackagePath>
-      </PackagePath>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="SvgPathProperties" Version="1.1.2" />
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
-    <PackageReference Include="WpfAnimatedGif" Version="2.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == true">
-    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="Images\Gifs\car_chase.gif">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </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="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:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\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:\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\buildTransitive\netcoreapp3.1\..\..\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:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\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" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\Controls\MultiSelectComboBox.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\Controls\PopupWindow.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\Controls\PropertiesView.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\ConnectorContainer.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\DiagramControl.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\LineControl.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\PointContainer.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\TextControl.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\GeneratedInternalTypeHelper.g.cs" />
-  </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
-</Project>

AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner_cqtxzinf_wpftmp.csproj

@@ -1,267 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <AssemblyName>AIStudio.Wpf.DiagramDesigner</AssemblyName>
-    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <MSBuildProjectExtensionsPath>F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\</MSBuildProjectExtensionsPath>
-    <_TargetAssemblyProjectName>AIStudio.Wpf.DiagramDesigner</_TargetAssemblyProjectName>
-  </PropertyGroup>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
-  <PropertyGroup>
-    <UseWPF>true</UseWPF>
-    <Company>AIStudio.Wpf.Controls</Company>
-    <Authors>akwkevin</Authors>
-    <PackageProjectUrl>https://gitee.com/akwkevin</PackageProjectUrl>
-    <PackageIcon>A.png</PackageIcon>
-    <PackageIconUrl />
-    <NeutralLanguage />
-    <Version>1.0.5</Version>
-    <Description>一个Wpf的Diagram控件基础库</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Images\file.png" />
-    <None Remove="Images\FormatPainter.cur" />
-    <None Include="A.png">
-      <Pack>True</Pack>
-      <PackagePath>
-      </PackagePath>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="SvgPathProperties" Version="1.1.2" />
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
-    <PackageReference Include="WpfAnimatedGif" Version="2.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == true">
-    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="Images\Gifs\car_chase.gif">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </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="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:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\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:\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\buildTransitive\netcoreapp3.1\..\..\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:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\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" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\Controls\MultiSelectComboBox.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\Controls\PopupWindow.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\Controls\PropertiesView.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\ConnectorContainer.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\DiagramControl.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\LineControl.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\PointContainer.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\TextControl.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\GeneratedInternalTypeHelper.g.cs" />
-  </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
-</Project>

AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner_sezm4xxq_wpftmp.csproj

@@ -1,267 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <AssemblyName>AIStudio.Wpf.DiagramDesigner</AssemblyName>
-    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <MSBuildProjectExtensionsPath>F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\</MSBuildProjectExtensionsPath>
-    <_TargetAssemblyProjectName>AIStudio.Wpf.DiagramDesigner</_TargetAssemblyProjectName>
-  </PropertyGroup>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
-  <PropertyGroup>
-    <UseWPF>true</UseWPF>
-    <Company>AIStudio.Wpf.Controls</Company>
-    <Authors>akwkevin</Authors>
-    <PackageProjectUrl>https://gitee.com/akwkevin</PackageProjectUrl>
-    <PackageIcon>A.png</PackageIcon>
-    <PackageIconUrl />
-    <NeutralLanguage />
-    <Version>1.0.4</Version>
-    <Description>一个Wpf的Diagram控件基础库</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Images\file.png" />
-    <None Remove="Images\FormatPainter.cur" />
-    <None Include="A.png">
-      <Pack>True</Pack>
-      <PackagePath>
-      </PackagePath>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="SvgPathProperties" Version="1.1.2" />
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
-    <PackageReference Include="WpfAnimatedGif" Version="2.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == true">
-    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="Images\Gifs\car_chase.gif">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </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="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:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\3.1.0\ref\netcoreapp3.1\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:\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\buildTransitive\netcoreapp3.1\..\..\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:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\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" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\Controls\MultiSelectComboBox.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\Controls\PopupWindow.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\Controls\PropertiesView.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\ConnectorContainer.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\DiagramControl.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\LineControl.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\PointContainer.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\UserControls\TextControl.g.cs" />
-    <Compile Include="F:\aistudio.-wpf.-diagram\AIStudio.Wpf.DiagramDesigner\obj\Debug\netcoreapp3.1\GeneratedInternalTypeHelper.g.cs" />
-  </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
-</Project>

AIStudio.Wpf.DiagramDesigner/Adorners/DrawingRubberbandAdorner.cs

@@ -0,0 +1,218 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Resources;
+using System.Windows.Shapes;
+using AIStudio.Wpf.DiagramDesigner.ViewModels;
+using AIStudio.Wpf.DiagramDesigner.ViewModels.BaseViewModel;
+
+namespace AIStudio.Wpf.DiagramDesigner
+{
+    public class DrawingRubberbandAdorner : Adorner
+    {
+        private Brush _rubberbandBrush;
+        private Pen _rubberbandPen;
+
+        private DesignerCanvas _designerCanvas;
+
+        private IDiagramViewModel _viewModel
+        {
+            get
+            {
+                return _designerCanvas.DataContext as IDiagramViewModel;
+            }
+        }
+        private IDiagramServiceProvider _service
+        {
+            get
+            {
+                return DiagramServicesProvider.Instance.Provider;
+            }
+        }
+
+        private DrawMode DrawMode
+        {
+            get
+            {
+                if (_viewModel.DrawModeViewModel != null)
+                {
+                    return _viewModel.DrawModeViewModel.GetDrawMode();
+                }
+                else
+                {
+                    return _service.DrawModeViewModel.GetDrawMode();
+                }
+            }
+        }
+
+        private DrawingDesignerItemViewModelBase _drawingDesignerItem;
+        public DrawingRubberbandAdorner(DesignerCanvas designerCanvas, Point dragStartPoint)
+            : base(designerCanvas)
+        {
+            this._designerCanvas = designerCanvas;
+            this._designerCanvas.Focus();
+
+            if (DrawMode >= DrawMode.Eraser && DrawMode <= DrawMode.EraserPreview)
+            {
+                if (DrawMode == DrawMode.Eraser)
+                {
+                    _drawingDesignerItem = new EraserDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null);
+                }
+                if (DrawMode == DrawMode.EraserPreview)
+                {
+                    _drawingDesignerItem = new EraserPreviewDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null);
+                }                  
+
+                _rubberbandBrush = null;
+                _rubberbandPen = new Pen(new SolidColorBrush(Colors.Red) { Opacity = 0.5 }, _drawingDesignerItem.ColorViewModel.LineWidth);
+            }
+            else if (DrawMode >= DrawMode.ColorPicker && DrawMode <= DrawMode.ErasableHeart)
+            {
+                if (DrawMode == DrawMode.ErasableLine)
+                {
+                    _drawingDesignerItem = new LineDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null, true);
+                }
+                else if (DrawMode == DrawMode.ErasableRectangle)
+                {
+                    _drawingDesignerItem = new RectangleDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null, true);
+                }
+                else if (DrawMode == DrawMode.ErasableEllipse)
+                {
+                    _drawingDesignerItem = new EllipseDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null, true);
+                }
+                else if (DrawMode == DrawMode.ErasablePolyline)
+                {
+                    _drawingDesignerItem = new PolylineDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null, true);
+                }
+                else if (DrawMode == DrawMode.ErasablePolygon)
+                {
+                    _drawingDesignerItem = new PolygonDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null, true);
+                }
+                else if (DrawMode == DrawMode.ErasableDirectLine)
+                {
+                    _drawingDesignerItem = new DirectLineDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null, true);
+                }
+                else if (DrawMode == DrawMode.ErasableText)
+                {
+                    _drawingDesignerItem = new TextDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null, true);
+                }
+                else if (DrawMode == DrawMode.ColorPicker)
+                {
+                    _drawingDesignerItem = new ColorPickerDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null, true);
+                    StreamResourceInfo sri = Application.GetResourceStream(new Uri("pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Images/color-picker.cur", UriKind.RelativeOrAbsolute));
+                    this.Cursor = new Cursor(sri.Stream);
+                }
+                else
+                {
+                    _drawingDesignerItem = new SharpDrawingDesignerItemViewModel(_viewModel, DrawMode, dragStartPoint, null, true);
+                }
+
+                _rubberbandBrush = null;//ColorObject.ToBrush(_drawingDesignerItem.ColorViewModel.FillColor);
+                _rubberbandPen = new Pen(_drawingDesignerItem.ColorViewModel.LineColor.ToBrush(), _drawingDesignerItem.ColorViewModel.LineWidth);
+                _rubberbandPen.DashStyle = new DashStyle(StrokeDashArray.Dash[(int)_drawingDesignerItem.ColorViewModel.LineDashStyle], 1);
+            }
+            else if (DrawMode >= DrawMode.Line && DrawMode <= DrawMode.DirectLine)
+            {
+                if (DrawMode == DrawMode.Line)
+                {
+                    _drawingDesignerItem = new LineDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null, false);
+                }
+                else if (DrawMode == DrawMode.Rectangle)
+                {
+                    _drawingDesignerItem = new RectangleDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null, false);
+                }
+                else if (DrawMode == DrawMode.Ellipse)
+                {
+                    _drawingDesignerItem = new EllipseDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null, false);
+                }
+                else if (DrawMode == DrawMode.Polyline)
+                {
+                    _drawingDesignerItem = new PolylineDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null, false);
+                }
+                else if (DrawMode == DrawMode.Polygon)
+                {
+                    _drawingDesignerItem = new PolygonDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null, false);
+                }
+                else if (DrawMode == DrawMode.DirectLine)
+                {
+                    _drawingDesignerItem = new DirectLineDrawingDesignerItemViewModel(_viewModel, dragStartPoint, null, false);
+                }
+
+                _rubberbandBrush = _drawingDesignerItem.ColorViewModel.FillColor.ToBrush();
+                _rubberbandPen = new Pen(_drawingDesignerItem.ColorViewModel.LineColor.ToBrush(), _drawingDesignerItem.ColorViewModel.LineWidth);
+                _rubberbandPen.DashStyle = new DashStyle(StrokeDashArray.Dash[(int)_drawingDesignerItem.ColorViewModel.LineDashStyle], 1);
+            }
+
+            if (_drawingDesignerItem == null)
+            {
+
+            }
+        }
+
+        protected override void OnMouseMove(System.Windows.Input.MouseEventArgs e)
+        {
+            if (_drawingDesignerItem?.OnMouseMove(this, e) == true)
+            {
+                if (!this.IsMouseCaptured)
+                    this.CaptureMouse();
+
+                this.InvalidateVisual();
+            }
+            else
+            {
+                if (this.IsMouseCaptured) this.ReleaseMouseCapture();
+            }
+
+            e.Handled = true;
+        }
+
+        protected override void OnMouseUp(System.Windows.Input.MouseButtonEventArgs e)
+        {
+            if (_drawingDesignerItem?.OnMouseUp(this, e) == false)
+            {
+                return;
+            }
+
+            // release mouse capture
+            if (this.IsMouseCaptured) this.ReleaseMouseCapture();
+
+            // remove this adorner from adorner layer
+            AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer(this._designerCanvas);
+            if (adornerLayer != null)
+                adornerLayer.Remove(this);
+
+            if (_drawingDesignerItem?.IsFinish == true)
+            {
+                _viewModel.AddCommand.Execute(_drawingDesignerItem);
+            }
+
+            this._service.DrawModeViewModel.ResetDrawMode();
+            e.Handled = true;
+        }
+
+        protected override void OnMouseDown(MouseButtonEventArgs e)
+        {
+            _drawingDesignerItem?.OnMouseDown(this, e);
+
+            e.Handled = true;
+        }
+
+        protected override void OnRender(DrawingContext dc)
+        {
+            base.OnRender(dc);
+
+            // without a background the OnMouseMove event would not be fired !
+            // Alternative: implement a CanvasBrush as a child of this adorner, like
+            // the ConnectionAdorner does.
+            dc.DrawRectangle(Brushes.Transparent, null, new Rect(RenderSize));
+
+            dc.DrawGeometry(_rubberbandBrush, _rubberbandPen, _drawingDesignerItem?.Geometry);
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner/Adorners/RubberbandAdorner.cs

@@ -1,14 +1,14 @@
-using System.Windows;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using AIStudio.Wpf.DiagramDesigner.ViewModels;
 using AIStudio.Wpf.DiagramDesigner.ViewModels.BaseViewModel;
-using System.Windows.Threading;
 
 namespace AIStudio.Wpf.DiagramDesigner
 {
@@ -43,6 +43,7 @@ namespace AIStudio.Wpf.DiagramDesigner
             this._designerCanvas.Focus();
             this.startPoint = dragStartPoint;
             rubberbandPen = new Pen(Brushes.LightSlateGray, 1);
+
             rubberbandPen.DashStyle = new DashStyle(new double[] { 2 }, 1);
         }
 
@@ -54,29 +55,6 @@ namespace AIStudio.Wpf.DiagramDesigner
                     this.CaptureMouse();
 
                 endPoint = e.GetPosition(this);
-                if (this._service.DrawModeViewModel.GetDrawMode() == DrawMode.Polyline)
-                {
-                    if (pointList.Count == 0 && this.startPoint.HasValue)
-                    {
-                        pointList.Add(this.startPoint.Value);
-                    }
-                    pointList.Add(endPoint.Value);
-                }
-
-                UpdateSelection();
-                this.InvalidateVisual();
-            }
-            else if (this._service.DrawModeViewModel.GetDrawMode() == DrawMode.DirectLine)
-            {
-                if (!this.IsMouseCaptured)
-                    this.CaptureMouse();
-
-                endPoint = e.GetPosition(this);
-
-                if (pointList.Count == 0 && this.startPoint.HasValue)
-                {
-                    pointList.Add(this.startPoint.Value);
-                }
 
                 UpdateSelection();
                 this.InvalidateVisual();
@@ -91,25 +69,6 @@ namespace AIStudio.Wpf.DiagramDesigner
 
         protected override void OnMouseUp(System.Windows.Input.MouseButtonEventArgs e)
         {
-            if (this._service.DrawModeViewModel.GetDrawMode() == DrawMode.DirectLine && e.ChangedButton == MouseButton.Left)
-            {
-                //按着ctrl自动封闭曲线
-                if (Keyboard.IsKeyDown(Key.LeftCtrl) == true || Keyboard.IsKeyDown(Key.RightCtrl) == true)
-                {                   
-                    pointList.Add(this.startPoint.Value);                                    
-                }
-                else
-                {
-                    endPoint = e.GetPosition(this);
-                    pointList.Add(endPoint.Value);
-
-                    UpdateSelection();
-                    this.InvalidateVisual();
-
-                    return;
-                }
-            }
-
             // release mouse capture
             if (this.IsMouseCaptured) this.ReleaseMouseCapture();
 
@@ -118,13 +77,7 @@ namespace AIStudio.Wpf.DiagramDesigner
             if (adornerLayer != null)
                 adornerLayer.Remove(this);
 
-            if (this._service.DrawModeViewModel.GetDrawMode() == DrawMode.Line ||
-                this._service.DrawModeViewModel.GetDrawMode() == DrawMode.Rectangle ||
-                this._service.DrawModeViewModel.GetDrawMode() == DrawMode.Ellipse ||
-                this._service.DrawModeViewModel.GetDrawMode() == DrawMode.Polyline ||
-                this._service.DrawModeViewModel.GetDrawMode() == DrawMode.Polygon ||
-                this._service.DrawModeViewModel.GetDrawMode() == DrawMode.DirectLine ||
-                this._service.DrawModeViewModel.GetDrawMode() == DrawMode.Text)
+            if (this._service.DrawModeViewModel.GetDrawMode() == DrawMode.Text)
             {
                 if (this.startPoint.HasValue && this.endPoint.HasValue)
                 {
@@ -137,19 +90,7 @@ namespace AIStudio.Wpf.DiagramDesigner
                         itemBase.ItemWidth = Math.Abs(this.endPoint.Value.X - this.startPoint.Value.X);
                         itemBase.ItemHeight = Math.Abs(this.endPoint.Value.Y - this.startPoint.Value.Y);
 
-                        _viewModel.AddItemCommand.Execute(itemBase);
-                    }
-                    else if (this._service.DrawModeViewModel.GetDrawMode() == DrawMode.Polyline
-                        || this._service.DrawModeViewModel.GetDrawMode() == DrawMode.Polygon
-                        || this._service.DrawModeViewModel.GetDrawMode() == DrawMode.DirectLine)
-                    {
-                        ShapeDesignerItemViewModel itemBase = new ShapeDesignerItemViewModel(this._service.DrawModeViewModel.GetDrawMode(), pointList);
-                        _viewModel.AddItemCommand.Execute(itemBase);
-                    }
-                    else
-                    {
-                        ShapeDesignerItemViewModel itemBase = new ShapeDesignerItemViewModel(this._service.DrawModeViewModel.GetDrawMode(), new List<Point> { this.startPoint.Value, this.endPoint.Value });
-                        _viewModel.AddItemCommand.Execute(itemBase);
+                        _viewModel.AddCommand.Execute(itemBase);
                     }
                 }
                 this._service.DrawModeViewModel.ResetDrawMode();
@@ -163,51 +104,13 @@ namespace AIStudio.Wpf.DiagramDesigner
             base.OnRender(dc);
 
             // without a background the OnMouseMove event would not be fired !
-            // Alternative: implement a Canvas as a child of this adorner, like
+            // Alternative: implement a CanvasBrush as a child of this adorner, like
             // the ConnectionAdorner does.
             dc.DrawRectangle(Brushes.Transparent, null, new Rect(RenderSize));
 
             if (this.startPoint.HasValue && this.endPoint.HasValue)
             {
-                if (this._service.DrawModeViewModel.GetDrawMode() == DrawMode.Line)
-                {
-                    dc.DrawLine(rubberbandPen, this.startPoint.Value, this.endPoint.Value);
-                }
-                else if (this._service.DrawModeViewModel.GetDrawMode() == DrawMode.Ellipse)
-                {
-                    var centerPoint = new Point((this.startPoint.Value.X + this.endPoint.Value.X) / 2, (this.startPoint.Value.Y + this.endPoint.Value.Y) / 2);
-                    dc.DrawEllipse(Brushes.Transparent, rubberbandPen, centerPoint, Math.Abs(this.startPoint.Value.X - this.endPoint.Value.X) / 2, Math.Abs(this.startPoint.Value.Y - this.endPoint.Value.Y) / 2);
-                }
-                else if (_service.DrawModeViewModel.GetDrawMode() == DrawMode.Polyline)
-                {
-                    var disList = pointList.ToList();
-                    for (int i = 1; i < pointList.Count; i++)
-                    {
-                        dc.DrawLine(rubberbandPen, disList[i - 1], disList[i]);
-                    }
-                }
-                else if (_service.DrawModeViewModel.GetDrawMode() == DrawMode.DirectLine)
-                {
-                    var disList = pointList.ToList();
-                    //按着ctrl自动封闭曲线
-                    if (Keyboard.IsKeyDown(Key.LeftCtrl) == true || Keyboard.IsKeyDown(Key.RightCtrl) == true)
-                    {
-                        disList.Add(this.startPoint.Value);
-                    }
-                    else
-                    {
-                        disList.Add(this.endPoint.Value);
-                    }
-
-                    for (int i = 1; i < disList.Count; i++)
-                    {
-                        dc.DrawLine(rubberbandPen, disList[i - 1], disList[i]);
-                    }
-                }
-                else
-                {
-                    dc.DrawRectangle(Brushes.Transparent, rubberbandPen, new Rect(this.startPoint.Value, this.endPoint.Value));
-                }
+                dc.DrawRectangle(Brushes.Transparent, rubberbandPen, new Rect(this.startPoint.Value, this.endPoint.Value));
             }
         }
 
@@ -227,7 +130,7 @@ namespace AIStudio.Wpf.DiagramDesigner
             Rect rubberBand = new Rect(startPoint.Value, endPoint.Value);
             ItemsControl itemsControl = GetParent<ItemsControl>(typeof(ItemsControl), _designerCanvas);
 
-            foreach (SelectableDesignerItemViewModelBase item in vm.Items)
+            foreach (SelectableDesignerItemViewModelBase item in vm.Items.ToList())
             {
                 if (item is SelectableDesignerItemViewModelBase)
                 {
@@ -239,14 +142,16 @@ namespace AIStudio.Wpf.DiagramDesigner
                     if (rubberBand.Contains(itemBounds))
                     {
                         //item.IsSelected = true;
-                        vm.SelectionService.AddToSelection(item);
+                        //vm.SelectionService.AddToSelection(item);
+                        item.AddToSelection(true, false);
                     }
                     else
                     {
                         if (!(Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl)))
                         {
                             //item.IsSelected = false;
-                            vm.SelectionService.RemoveFromSelection(item);
+                            //vm.SelectionService.RemoveFromSelection(item);
+                            item.RemoveFromSelection();
                         }
                     }
                 }

AIStudio.Wpf.DiagramDesigner/AttachedProperties/DragAndDropProps.cs

@@ -31,10 +31,10 @@ namespace AIStudio.Wpf.DiagramDesigner
 
         private static void OnEnabledForDragChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            FrameworkElement fe = (FrameworkElement) d;
+            FrameworkElement fe = (FrameworkElement)d;
 
 
-            if((bool)e.NewValue)
+            if ((bool)e.NewValue)
             {
                 fe.PreviewMouseDown += Fe_PreviewMouseDown;
                 fe.MouseMove += Fe_MouseMove;
@@ -67,19 +67,33 @@ namespace AIStudio.Wpf.DiagramDesigner
 
         static void Fe_MouseMove(object sender, System.Windows.Input.MouseEventArgs e)
         {
-            Point? dragStartPoint = GetDragStartPoint((DependencyObject)sender);
-
             if (e.LeftButton != MouseButtonState.Pressed)
-                dragStartPoint = null;
+            {
+                return;
+            }
+
+            Point? dragStartPoint = GetDragStartPoint((DependencyObject)sender);
+            var point = e.GetPosition((IInputElement)sender);
+            if (dragStartPoint == point)
+                return;
 
             if (dragStartPoint.HasValue && ((FrameworkElement)sender).DataContext is ToolBoxData toolBoxData)
             {
                 DragObject dataObject = new DragObject();
                 dataObject.ContentType = toolBoxData.Type;
                 dataObject.DesiredSize = toolBoxData.DesiredSize;
+                dataObject.DesiredMinSize = toolBoxData.DesiredMinSize;
                 dataObject.Icon = toolBoxData.Icon;
+                dataObject.Text = toolBoxData.Text;
                 dataObject.ColorViewModel = toolBoxData.ColorViewModel;
-                dataObject.DesignerItem = toolBoxData.Addition;
+                if (toolBoxData.Addition is DesignerItemViewModelBase designerItemViewModelBase)
+                {
+                    dataObject.DesignerItem = designerItemViewModelBase.ToSerializableItem();
+                }
+                else
+                {
+                    dataObject.DesignerItem = toolBoxData.Addition;
+                }
 
                 DragDrop.DoDragDrop((DependencyObject)sender, dataObject, DragDropEffects.Copy);
                 e.Handled = true;

AIStudio.Wpf.DiagramDesigner/AttachedProperties/SelectionProps.cs

@@ -51,17 +51,20 @@ namespace AIStudio.Wpf.DiagramDesigner
                     {
                         if ((Keyboard.Modifiers & (ModifierKeys.Shift)) != ModifierKeys.None)
                         {
-                            selectable.IsSelected = !selectable.IsSelected;
+                            //selectable.IsSelected = !selectable.IsSelected;
+                            selectable.AddToSelection(!selectable.IsSelected, false);
                         }
 
                         if ((Keyboard.Modifiers & (ModifierKeys.Control)) != ModifierKeys.None)
                         {
-                            selectable.IsSelected = !selectable.IsSelected;
+                            //selectable.IsSelected = !selectable.IsSelected;
+                            selectable.AddToSelection(!selectable.IsSelected, false);
                         }
                     }
                     else if (!selectable.IsSelected)
                     {
-                        selectable.AddToSelection(true);
+
+                        selectable.AddToSelection(true, true);
                     }
                 }
             }

AIStudio.Wpf.DiagramDesigner/AttachedProperties/WidthAndHeightProps.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace AIStudio.Wpf.DiagramDesigner
+{
+
+    public static class WidthAndHeightProps
+    {
+        public static readonly DependencyProperty ActiveProperty = DependencyProperty.RegisterAttached(
+        "Active",
+        typeof(bool),
+        typeof(WidthAndHeightProps),
+        new FrameworkPropertyMetadata(OnActiveChanged));
+
+        public static bool GetActive(FrameworkElement frameworkElement)
+        {
+            return (bool)frameworkElement.GetValue(ActiveProperty);
+        }
+
+        public static void SetActive(FrameworkElement frameworkElement, bool active)
+        {
+            frameworkElement.SetValue(ActiveProperty, active);
+        }
+
+        public static readonly DependencyProperty BoundActualWidthProperty = DependencyProperty.RegisterAttached(
+            "BoundActualWidth",
+            typeof(double),
+            typeof(WidthAndHeightProps));
+
+        public static double GetBoundActualWidth(FrameworkElement frameworkElement)
+        {
+            return (double)frameworkElement.GetValue(BoundActualWidthProperty);
+        }
+
+        public static void SetBoundActualWidth(FrameworkElement frameworkElement, double width)
+        {
+            frameworkElement.SetValue(BoundActualWidthProperty, width);
+        }
+
+        public static readonly DependencyProperty BoundActualHeightProperty = DependencyProperty.RegisterAttached(
+            "BoundActualHeight",
+            typeof(double),
+            typeof(WidthAndHeightProps));
+
+        public static double GetBoundActualHeight(FrameworkElement frameworkElement)
+        {
+            return (double)frameworkElement.GetValue(BoundActualHeightProperty);
+        }
+
+        public static void SetBoundActualHeight(FrameworkElement frameworkElement, double height)
+        {
+            frameworkElement.SetValue(BoundActualHeightProperty, height);
+        }
+
+        private static void OnActiveChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
+        {
+            if (!(dependencyObject is FrameworkElement frameworkElement))
+            {
+                return;
+            }
+
+            if ((bool)e.NewValue)
+            {
+                frameworkElement.SizeChanged -= OnFrameworkElementSizeChanged;
+                frameworkElement.SizeChanged += OnFrameworkElementSizeChanged;
+                frameworkElement.Loaded -= FrameworkElement_Loaded;
+                frameworkElement.Loaded += FrameworkElement_Loaded;
+               
+            }
+            else
+            {
+                frameworkElement.SizeChanged -= OnFrameworkElementSizeChanged;
+                frameworkElement.Loaded -= FrameworkElement_Loaded;
+            }
+        }
+
+        private static void FrameworkElement_Loaded(object sender, RoutedEventArgs e)
+        {
+            UpdateObservedSizesForFrameworkElement(sender as FrameworkElement);
+        }
+
+        private static void OnFrameworkElementSizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            if (sender is FrameworkElement frameworkElement)
+            {
+                UpdateObservedSizesForFrameworkElement(frameworkElement);
+            }
+        }
+
+        private static void UpdateObservedSizesForFrameworkElement(FrameworkElement frameworkElement)
+        {
+            frameworkElement.SetCurrentValue(BoundActualWidthProperty, frameworkElement.ActualWidth);
+            frameworkElement.SetCurrentValue(BoundActualHeightProperty, frameworkElement.ActualHeight);
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner/Common/BindableBase.cs

@@ -36,6 +36,11 @@ namespace AIStudio.Wpf.DiagramDesigner
             }
         }
 
+        public bool HasOldValue(string propertyName, string guid = null)
+        {
+            return _oldDic.ContainsKey(propertyName + guid ?? string.Empty);
+        }
+
         public void ClearOldValue<T>(string propertyName, string guid = null)
         {
             if (_oldDic.ContainsKey(propertyName + guid ?? string.Empty))

AIStudio.Wpf.DiagramDesigner/Controls/BlockConnector.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace AIStudio.Wpf.DiagramDesigner
+{
+    public class BlockConnector : ContentControl
+    {
+        public ConnectorOrientation Orientation { get; set; }
+
+        public ConnectorInfoBase Info
+        {
+            get
+            {
+                if (Content is ConnectorInfoBase connectorInfo)
+                    return connectorInfo;
+
+                return this.DataContext as ConnectorInfoBase;
+            }
+        }
+
+    }
+
+    public class BlockGrid : Grid
+    {
+    }
+
+}

AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsContainer.cs

@@ -0,0 +1,220 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using AIStudio.Wpf.DiagramDesigner.Helpers;
+
+namespace AIStudio.Wpf.DiagramDesigner
+{
+    public class BlockItemsContainer : ContentControl
+    {
+        static BlockItemsContainer()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(BlockItemsContainer), new FrameworkPropertyMetadata(typeof(BlockItemsContainer)));
+        }
+
+        public static readonly DependencyProperty BorderProperty = DependencyProperty.Register(
+          nameof(Border), typeof(object), typeof(BlockItemsContainer), new PropertyMetadata(default(object)));
+
+        public object Border
+        {
+            get => GetValue(BorderProperty);
+            set => SetValue(BorderProperty, value);
+        }
+
+        public static readonly DependencyProperty BorderTemplateProperty = DependencyProperty.Register(
+            nameof(BorderTemplate), typeof(DataTemplate), typeof(BlockItemsContainer), new PropertyMetadata(default(DataTemplate)));
+
+        [Bindable(true), Category("Content")]
+        public DataTemplate BorderTemplate
+        {
+            get => (DataTemplate)GetValue(BorderTemplateProperty);
+            set => SetValue(BorderTemplateProperty, value);
+        }
+
+        public static readonly DependencyProperty BorderTemplateSelectorProperty = DependencyProperty.Register(
+            nameof(BorderTemplateSelector), typeof(DataTemplateSelector), typeof(BlockItemsContainer), new PropertyMetadata(default(DataTemplateSelector)));
+
+        [Bindable(true), Category("Content")]
+        public DataTemplateSelector BorderTemplateSelector
+        {
+            get => (DataTemplateSelector)GetValue(BorderTemplateSelectorProperty);
+            set => SetValue(BorderTemplateSelectorProperty, value);
+        }
+
+        public static readonly DependencyProperty BorderStringFormatProperty = DependencyProperty.Register(
+            nameof(BorderStringFormat), typeof(string), typeof(BlockItemsContainer), new PropertyMetadata(default(string)));
+
+        [Bindable(true), Category("Content")]
+        public string BorderStringFormat
+        {
+            get => (string)GetValue(BorderStringFormatProperty);
+            set => SetValue(BorderStringFormatProperty, value);
+        }
+
+
+        public static readonly DependencyProperty ParentPanelProperty =
+           DependencyProperty.Register(nameof(ParentPanel), typeof(FrameworkElement), typeof(BlockItemsContainer),
+               new FrameworkPropertyMetadata(null));
+
+        public FrameworkElement ParentPanel
+        {
+            get
+            {
+                return (FrameworkElement)GetValue(ParentPanelProperty);
+            }
+            set
+            {
+                SetValue(ParentPanelProperty, value);
+            }
+        }
+
+        public static readonly DependencyProperty GetOffSetFuncProperty =
+       DependencyProperty.Register(nameof(GetOffSetFunc),
+                                  typeof(Func<Point>),
+                                  typeof(BlockItemsContainer),
+                                  new FrameworkPropertyMetadata(null));
+        public Func<Point> GetOffSetFunc
+        {
+            get
+            {
+                return (Func<Point>)this.GetValue(GetOffSetFuncProperty);
+            }
+            set
+            {
+                this.SetValue(GetOffSetFuncProperty, value);
+            }
+        }
+
+        public Func<Point> GetOffSet
+        {
+            get
+            {
+                return new Func<Point>(() => this.TransformToAncestor(ParentPanel).Transform(new Point(0, 0)));
+            }
+        }
+
+        public BlockItemsContainerInfo Info
+        {
+            get
+            {
+                if (Border is BlockItemsContainerInfo itemsContainerInfo)
+                    return itemsContainerInfo;
+
+                return this.DataContext as BlockItemsContainerInfo;
+            }
+        }
+
+        public BlockDesignerItemViewModel DragObject
+        {
+            get; private set;
+        }
+
+        public Point DragOffset
+        {
+            get; private set;
+        }
+
+        public Point? FirstPoint
+        {
+            get; private set;
+        }
+
+        public BlockItemsContainer()
+        {
+
+        }
+
+        public static List<BlockItemsContainer> Containers = new List<BlockItemsContainer>();
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            GetOffSetFunc = GetOffSet;
+        }
+
+      
+        protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
+        {
+            base.OnMouseLeftButtonDown(e);
+            FirstPoint = e.GetPosition(this);
+            Containers.Add(this);
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            if (FirstPoint != null)
+            {
+                var currentPoint = e.GetPosition(this);
+                if (Math.Sqrt(Math.Pow(FirstPoint.Value.X - currentPoint.X, 2) + Math.Pow(FirstPoint.Value.Y - currentPoint.Y, 2)) > 5)
+                {
+                    FirstPoint = null;
+                    if (Info?.Children.Count > 0)
+                    {
+                        var borders = VisualHelper.FindVisualChildren<BlockGrid>(this);
+                        foreach (var border in borders)
+                        {
+                            var itemsContainers = VisualHelper.TryFindParent<BlockItemsContainer>(border);
+                            if (this != itemsContainers)
+                            {
+                                continue;
+                            }
+
+                            var point = border.TransformToAncestor(this).Transform(new Point(0, 0));
+                            var rect = new Rect(point.X, point.Y, border.ActualWidth, border.ActualHeight);
+                            if (rect.Contains(currentPoint))
+                            {
+                                DragObject = border.DataContext as BlockDesignerItemViewModel;
+                                DragOffset = new Point(currentPoint.X - point.X, currentPoint.Y - point.Y);
+                                break;
+                            }
+                        }
+
+                        if (DragObject != null)
+                        {
+                            Containers.ForEach(p => p.FirstPoint = null);
+                            DesignerCanvas canvas = GetDesignerCanvas(this);
+                            if (canvas != null)
+                            {                               
+                                canvas.SourceItemsContainer = this;
+                                e.Handled = true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        protected override void OnMouseUp(MouseButtonEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            FirstPoint = null;
+
+            Containers.Clear();
+        }
+
+        public ConnectorOrientation Orientation
+        {
+            get; set;
+        }
+
+        // iterate through visual tree to get parent DesignerCanvas
+        private DesignerCanvas GetDesignerCanvas(DependencyObject element)
+        {
+            while (element != null && !(element is DesignerCanvas))
+                element = VisualTreeHelper.GetParent(element);
+
+            return element as DesignerCanvas;
+        }
+
+    }
+}

AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsControl.xaml

@@ -0,0 +1,67 @@
+<ItemsControl x:Class="AIStudio.Wpf.DiagramDesigner.BlockItemsControl"
+             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.DiagramDesigner"
+             xmlns:dd="clr-namespace:AIStudio.Wpf.DiagramDesigner"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <ItemsControl.Resources>
+        <ResourceDictionary>
+            <ControlTemplate x:Key="BlockConnectorDecoratorTemplate"
+                     TargetType="{x:Type Control}">
+                <Grid Margin="{Binding ConnectorMargin}">
+                    <dd:BlockConnector 
+                        Content="{Binding LeftConnector}" 
+                        SnapsToDevicePixels="True"
+                        Orientation="Left"
+                        VerticalAlignment="Stretch"
+                        HorizontalAlignment="Left"/>
+                    <dd:BlockConnector 
+                        Content="{Binding TopConnector}"
+                        SnapsToDevicePixels="True"
+                        Orientation="Top"
+                        VerticalAlignment="Top"
+                        HorizontalAlignment="Stretch"/>
+                    <dd:BlockConnector 
+                        Content="{Binding RightConnector}"
+                        SnapsToDevicePixels="True"
+                        Orientation="Right"
+                        VerticalAlignment="Stretch"
+                        HorizontalAlignment="Right"/>
+                    <dd:BlockConnector 
+                        Content="{Binding BottomConnector}"
+                        SnapsToDevicePixels="True"
+                        Orientation="Bottom"
+                        VerticalAlignment="Bottom"
+                        HorizontalAlignment="Stretch"/>
+                </Grid>
+            </ControlTemplate>
+        </ResourceDictionary>
+    </ItemsControl.Resources>
+    <ItemsControl.ItemContainerStyle>
+        <Style TargetType="{x:Type ListBoxItem}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                        <dd:BlockGrid 
+                            dd:WidthAndHeightProps.Active="True"
+                            dd:WidthAndHeightProps.BoundActualWidth="{Binding ActualItemWidth,Mode=OneWayToSource}"
+                            dd:WidthAndHeightProps.BoundActualHeight="{Binding ActualItemHeight,Mode=OneWayToSource}">
+                            <ContentControl Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
+                            <!-- PART_ConnectorDecorator -->
+                            <Control x:Name="PART_ConnectorDecorator" Template="{StaticResource BlockConnectorDecoratorTemplate}"/>
+                        </dd:BlockGrid>
+
+                        <ControlTemplate.Triggers>
+                            <DataTrigger Binding="{Binding Connectors.Count}" Value="0">
+                                <Setter TargetName="PART_ConnectorDecorator" Property="Visibility" Value="Collapsed" />
+                            </DataTrigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </ItemsControl.ItemContainerStyle>
+</ItemsControl>

AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsControl.xaml.cs

@@ -0,0 +1,33 @@
+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;
+
+namespace AIStudio.Wpf.DiagramDesigner
+{
+    /// <summary>
+    /// BlockItemsControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class BlockItemsControl : ItemsControl
+    {
+        public BlockItemsControl()
+        {
+            InitializeComponent();
+        }
+
+        protected override System.Windows.DependencyObject GetContainerForItemOverride()
+        {
+            return new ListBoxItem();
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs

@@ -1,22 +1,15 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Markup;
 using System.Windows.Media;
-using System.Xml;
-using System.Linq;
-using System.Windows.Shapes;
 using System.Windows.Resources;
-using System.Runtime.InteropServices;
-using Newtonsoft.Json;
+using AIStudio.Wpf.DiagramDesigner.Helpers;
 using AIStudio.Wpf.DiagramDesigner.Models;
 using AIStudio.Wpf.DiagramDesigner.ViewModels;
 using AIStudio.Wpf.DiagramDesigner.ViewModels.BaseViewModel;
-using System.Diagnostics;
 
 namespace AIStudio.Wpf.DiagramDesigner
 {
@@ -37,7 +30,7 @@ namespace AIStudio.Wpf.DiagramDesigner
                 return DiagramServicesProvider.Instance.Provider;
             }
         }
-        private ConnectionViewModel partialConnection;
+        private ConnectionViewModel _partialConnection;
 
         private Point? rubberbandSelectionStartPoint = null;
 
@@ -63,10 +56,10 @@ namespace AIStudio.Wpf.DiagramDesigner
 
                         Point point = sourceDataItem.MiddlePosition;
 
-                        partialConnection = new ConnectionViewModel(_viewModel, sourceDataItem, new PartCreatedConnectorInfo(point.X, point.Y), DrawMode, RouterMode);
+                        _partialConnection = new ConnectionViewModel(_viewModel, sourceDataItem, new PartCreatedConnectorInfo(point.X, point.Y), LineDrawMode, RouterMode);
 
-                        _viewModel.Add(partialConnection);
-                        partialConnection.ZIndex = -1;
+                        _viewModel.Add(_partialConnection);
+                        _partialConnection.ZIndex = -1;
                     }
                 }
             }
@@ -92,7 +85,46 @@ namespace AIStudio.Wpf.DiagramDesigner
             }
         }
 
+        private BlockItemsContainer _sourceItemsContainer;
+        public BlockItemsContainer SourceItemsContainer
+        {
+            get
+            {
+                return _sourceItemsContainer;
+            }
+            set
+            {
+                if (_sourceItemsContainer != value)
+                {
+                    _sourceItemsContainer = value;
+                    if (_sourceItemsContainer != null)
+                    {
+                        BlockItemsContainerInfo sourceContainerInfo = _sourceItemsContainer.Info;
+
+                        sourceContainerInfo.DataItem.RemoveChild(_sourceItemsContainer.DragObject, sourceContainerInfo);
+
+                        EnterMove();
+                    }
+                }
+            }
+        }
+
         private DrawMode DrawMode
+        {
+            get
+            {
+                if (_viewModel.DrawModeViewModel != null)
+                {
+                    return _viewModel.DrawModeViewModel.GetDrawMode();
+                }
+                else
+                {
+                    return _service.DrawModeViewModel.GetDrawMode();
+                }
+            }
+        }
+
+        private DrawMode LineDrawMode
         {
             get
             {
@@ -106,6 +138,7 @@ namespace AIStudio.Wpf.DiagramDesigner
                 }
             }
         }
+
         private RouterMode RouterMode
         {
             get
@@ -121,36 +154,6 @@ namespace AIStudio.Wpf.DiagramDesigner
             }
         }
 
-        private bool EnableSnapping
-        {
-            get
-            {
-                if (_viewModel.DrawModeViewModel != null)
-                {
-                    return _viewModel.DrawModeViewModel.EnableSnapping;
-                }
-                else
-                {
-                    return _service.DrawModeViewModel.EnableSnapping;
-                }
-            }
-        }
-
-        private double SnappingRadius
-        {
-            get
-            {
-                if (_viewModel.DrawModeViewModel != null)
-                {
-                    return _viewModel.DrawModeViewModel.SnappingRadius;
-                }
-                else
-                {
-                    return _service.DrawModeViewModel.SnappingRadius;
-                }
-            }
-        }
-
         #region GridCellSize
 
         public static readonly DependencyProperty GridCellSizeProperty =
@@ -245,11 +248,24 @@ namespace AIStudio.Wpf.DiagramDesigner
         public DesignerCanvas()
         {
             this.Focusable = true;
-            Mediator.Instance.Register(this);
 
-            _service.PropertyChanged += _service_PropertyChanged;
             this.Loaded += DesignerCanvas_Loaded;
             this.IsVisibleChanged += DesignerCanvas_IsVisibleChanged;
+            this.DataContextChanged += DesignerCanvas_DataContextChanged;
+        }
+
+        private void DesignerCanvas_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+
+            if (e.OldValue is IDiagramViewModel oldvalue)
+            {
+                //var image = this.ToBitmap().ToBitmapSource();
+                //oldvalue.Thumbnail = new ImageBrush(image) { Stretch = Stretch.Uniform };
+            }
+            if (e.NewValue is IDiagramViewModel newvalue)
+            {
+                newvalue.Thumbnail = new VisualBrush(this) { Stretch = Stretch.Uniform };
+            }
         }
 
         private void DesignerCanvas_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
@@ -260,9 +276,11 @@ namespace AIStudio.Wpf.DiagramDesigner
             }
         }
 
-        private void DesignerCanvas_Loaded(object sender, RoutedEventArgs e)
+        protected void DesignerCanvas_Loaded(object sender, RoutedEventArgs e)
         {
+            //Mediator.Instance.Register(this);
             this.Focus();
+            _service.PropertyChanged += _service_PropertyChanged;
         }
 
         protected override void OnRender(DrawingContext dc)
@@ -301,6 +319,17 @@ namespace AIStudio.Wpf.DiagramDesigner
                     {
                         EnterMove();
                     }
+                    else if (_service.DrawModeViewModel.CursorMode == CursorMode.Exit)
+                    {
+                        ExitCursor();
+                    }
+                }
+                else if (e.PropertyName == nameof(_service.DrawModeViewModel.DrawingDrawMode))
+                {
+                    if (_service.DrawModeViewModel.DrawingDrawMode == DrawMode.ColorPicker)
+                    {
+                        EnterColorPicker();
+                    }
                 }
             }
         }
@@ -309,6 +338,7 @@ namespace AIStudio.Wpf.DiagramDesigner
         {
             StreamResourceInfo sri = Application.GetResourceStream(new Uri("pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Images/FormatPainter.cur", UriKind.RelativeOrAbsolute));
             this.Cursor = new Cursor(sri.Stream);
+
             foreach (SelectableDesignerItemViewModelBase item in _viewModel.Items)
             {
                 item.IsHitTestVisible = false;
@@ -324,6 +354,21 @@ namespace AIStudio.Wpf.DiagramDesigner
             }
         }
 
+        private void EnterColorPicker()
+        {
+
+            // create rubberband adorner
+            AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer(this);
+            if (adornerLayer != null)
+            {
+                DrawingRubberbandAdorner adorner = new DrawingRubberbandAdorner(this, new Point());
+                if (adorner != null)
+                {
+                    adornerLayer.Add(adorner);
+                }
+            }
+        }
+
         private void ExitCursor()
         {
             this.Cursor = Cursors.Arrow;
@@ -382,7 +427,21 @@ namespace AIStudio.Wpf.DiagramDesigner
 
                     }
 
-                    if (_service.DrawModeViewModel.LineDrawModeSelected)//画线模式,可以不命中实体
+                    if (_service.DrawModeViewModel.SharpDrawModeSelected ||
+                        (_service.DrawModeViewModel.DrawingDrawModeSelected && _service.DrawModeViewModel.DrawingDrawMode != DrawMode.Select))
+                    {
+                        // create rubberband adorner
+                        AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer(this);
+                        if (adornerLayer != null)
+                        {
+                            DrawingRubberbandAdorner adorner = new DrawingRubberbandAdorner(this, currentPoint);
+                            if (adorner != null)
+                            {
+                                adornerLayer.Add(adorner);
+                            }
+                        }
+                    }
+                    else if (_service.DrawModeViewModel.LineDrawModeSelected)//画线模式,可以不命中实体
                     {
                         if (SourceConnector == null)
                         {
@@ -390,7 +449,6 @@ namespace AIStudio.Wpf.DiagramDesigner
                             SourceConnector = new Connector() { Content = new PartCreatedConnectorInfo(currentPoint.X, currentPoint.Y), Tag = "虚拟的连接点" };
                         }
                     }
-
                     e.Handled = true;
                 }
             }
@@ -399,8 +457,8 @@ namespace AIStudio.Wpf.DiagramDesigner
 
         protected override void OnMouseMove(MouseEventArgs e)
         {
-            var focusedElement = Keyboard.FocusedElement;
-            Debug.WriteLine("focusedElement：" + focusedElement?.ToString());
+            //var focusedElement = Keyboard.FocusedElement;
+            //Debug.WriteLine("focusedElement：" + focusedElement?.ToString());
 
             base.OnMouseMove(e);
 
@@ -425,7 +483,7 @@ namespace AIStudio.Wpf.DiagramDesigner
             {
                 if (e.LeftButton == MouseButtonState.Pressed)
                 {
-                    partialConnection.SinkConnectorInfo = new PartCreatedConnectorInfo(currentPoint.X, currentPoint.Y);
+                    _partialConnection.SinkConnectorInfo = new PartCreatedConnectorInfo(currentPoint.X, currentPoint.Y);
 
                     SinkConnector = HitTesting(currentPoint);
                     if (SinkConnector?.Info?.CanAttachTo(SourceConnector?.Info) == false)
@@ -433,16 +491,26 @@ namespace AIStudio.Wpf.DiagramDesigner
                         SinkConnector.Info.DisableAttachTo = true;
                     }
 
-                    if (EnableSnapping)
+                    if (_viewModel.DiagramOption.SnappingOption.EnableSnapping)
                     {
-                        var nearPort = _viewModel.FindNearPortToAttachTo(partialConnection);
+                        var nearPort = _viewModel.FindNearPortToAttachTo(_partialConnection);
                         if (nearPort != null)
                         {
-                            partialConnection.SinkConnectorInfo = nearPort;
+                            _partialConnection.SinkConnectorInfo = nearPort;
                         }
                     }
                 }
             }
+            else if (SourceItemsContainer != null)
+            {
+                if (e.LeftButton == MouseButtonState.Pressed)
+                {
+                    SourceItemsContainer.DragObject.Left = currentPoint.X - SourceItemsContainer.DragOffset.X;
+                    SourceItemsContainer.DragObject.Top = currentPoint.Y - SourceItemsContainer.DragOffset.Y;
+
+                    (_viewModel as IBlockDiagramViewModel).PreviewNearBlock(new System.Collections.Generic.List<BlockDesignerItemViewModel> { SourceItemsContainer.DragObject });
+                }
+            }
             else
             {
                 // if mouse button is not pressed we have no drag operation, ...
@@ -484,36 +552,40 @@ namespace AIStudio.Wpf.DiagramDesigner
                 {
                     ConnectorInfoBase sinkDataItem = SinkConnector.Info;
 
-                    _viewModel.Remove(partialConnection);
-                    _viewModel.AddItemCommand.Execute(new ConnectionViewModel(_viewModel, sourceDataItem, sinkDataItem, DrawMode, RouterMode));
+                    _viewModel.Delete(_partialConnection);
+                    _viewModel.AddCommand.Execute(new ConnectionViewModel(_viewModel, sourceDataItem, sinkDataItem, LineDrawMode, RouterMode));
                 }
-                else if (partialConnection.IsFullConnection)//自动连接模式
+                else if (_partialConnection.IsFullConnection)//自动连接模式
                 {
-                    _viewModel.ClearNearPort();
+                    _viewModel.ClearAttachTo();
                 }
                 else if (_service.DrawModeViewModel.LineDrawModeSelected)
                 {
                     Point currentPoint = e.GetPosition(this);
                     ConnectorInfoBase sinkDataItem = new PartCreatedConnectorInfo(currentPoint.X, currentPoint.Y);
 
-                    _viewModel.Remove(partialConnection);
-                    _viewModel.AddItemCommand.Execute(new ConnectionViewModel(_viewModel, sourceDataItem, sinkDataItem, DrawMode, RouterMode));
+                    _viewModel.Delete(_partialConnection);
+                    _viewModel.AddCommand.Execute(new ConnectionViewModel(_viewModel, sourceDataItem, sinkDataItem, LineDrawMode, RouterMode));
                 }
                 else
                 {
                     //Need to remove last item as we did not finish drawing the path
-                    _viewModel.Remove(partialConnection);
+                    _viewModel.Delete(_partialConnection);
                 }
             }
+            else if (SourceItemsContainer != null)
+            {
+                (_viewModel as IBlockDiagramViewModel).FinishNearBlock(new System.Collections.Generic.List<BlockDesignerItemViewModel> { SourceItemsContainer.DragObject });
+                ExitCursor();
+            }
 
             SourceConnector = null;
             SinkConnector = null;
-            partialConnection = null;
+            _partialConnection = null;
 
-            if (_service.DrawModeViewModel.GetDrawMode() != DrawMode.DirectLine)
-            {
-                _service.DrawModeViewModel.ResetDrawMode();
-            }
+            SourceItemsContainer = null;
+
+            _service.DrawModeViewModel.ResetDrawMode();
         }
 
         protected override void OnPreviewKeyDown(KeyEventArgs e)
@@ -585,6 +657,36 @@ namespace AIStudio.Wpf.DiagramDesigner
             return null;
         }
 
+        protected override void OnDragOver(DragEventArgs e)
+        {
+            DragObject dragObject = e.Data.GetData(typeof(DragObject)) as DragObject;
+            if (dragObject != null && (dragObject.ContentType == typeof(BlockDesignerItemViewModel) || dragObject.ContentType.IsSubclassOf(typeof(BlockDesignerItemViewModel))))
+            {
+                var position = e.GetPosition(this);
+
+                BlockDesignerItemViewModel itemBase = Activator.CreateInstance(dragObject.ContentType) as BlockDesignerItemViewModel;
+                itemBase.Text = dragObject.Text;
+                itemBase.Icon = dragObject.Icon;
+                itemBase.ColorViewModel = CopyHelper.Mapper(dragObject.ColorViewModel);
+                if (dragObject.DesiredSize != null)
+                {
+                    itemBase.ItemWidth = dragObject.DesiredSize.Value.Width;
+                    itemBase.ItemHeight = dragObject.DesiredSize.Value.Height;
+                }
+                if (dragObject.DesiredMinSize != null)
+                {
+                    itemBase.MinItemWidth = dragObject.DesiredMinSize.Value.Width;
+                    itemBase.MinItemHeight = dragObject.DesiredMinSize.Value.Height;
+                }
+                itemBase.Left = Math.Max(0, position.X - itemBase.GetItemWidth() / 2);
+                itemBase.Top = Math.Max(0, position.Y - itemBase.GetItemHeight() / 2);
+
+                (_viewModel as IBlockDiagramViewModel)?.PreviewNearBlock(new System.Collections.Generic.List<BlockDesignerItemViewModel> { itemBase });
+            }
+
+            base.OnDragOver(e);
+        }
+
         protected override void OnDrop(DragEventArgs e)
         {
             base.OnDrop(e);
@@ -601,8 +703,8 @@ namespace AIStudio.Wpf.DiagramDesigner
                     var designerItems = serializableObject.ToObject();
                     var minleft = designerItems.OfType<DesignerItemViewModelBase>().Min(p => p.Left);
                     var mintop = designerItems.OfType<DesignerItemViewModelBase>().Min(p => p.Top);
-                    var maxright = designerItems.OfType<DesignerItemViewModelBase>().Max(p => p.Left + p.ItemWidth);
-                    var maxbottom = designerItems.OfType<DesignerItemViewModelBase>().Max(p => p.Top + p.ItemHeight);
+                    var maxright = designerItems.OfType<DesignerItemViewModelBase>().Max(p => p.Left + p.GetItemWidth());
+                    var maxbottom = designerItems.OfType<DesignerItemViewModelBase>().Max(p => p.Top + p.GetItemHeight());
                     var itemswidth = maxright - minleft;
                     var itemsheight = maxbottom - mintop;
 
@@ -611,7 +713,30 @@ namespace AIStudio.Wpf.DiagramDesigner
                         item.Left += position.X - itemswidth / 2;
                         item.Top += position.Y - itemsheight / 2;
                     }
-                    _viewModel.AddItemCommand.Execute(designerItems);
+                    _viewModel.AddCommand.Execute(designerItems);
+                }
+                else if (dragObject.DesignerItem is SerializableItem serializableItem)
+                {
+                    Type type = TypeHelper.GetType(serializableItem.ModelTypeName);
+                    DesignerItemViewModelBase itemBase = Activator.CreateInstance(type, _viewModel, serializableItem, ".json") as DesignerItemViewModelBase;
+                    itemBase.Left = Math.Max(0, position.X - itemBase.GetItemWidth() / 2);
+                    itemBase.Top = Math.Max(0, position.Y - itemBase.GetItemHeight() / 2);
+                    if (dragObject.DesiredSize != null)
+                    {
+                        itemBase.ItemWidth = dragObject.DesiredSize.Value.Width;
+                        itemBase.ItemHeight = dragObject.DesiredSize.Value.Height;
+                    }
+                    if (dragObject.DesiredMinSize != null)
+                    {
+                        itemBase.MinItemWidth = dragObject.DesiredMinSize.Value.Width;
+                        itemBase.MinItemHeight = dragObject.DesiredMinSize.Value.Height;
+                    }
+                    _viewModel.AddCommand.Execute(itemBase);
+
+                    if (itemBase is BlockDesignerItemViewModel block)
+                    {
+                        (_viewModel as IBlockDiagramViewModel).FinishNearBlock(new System.Collections.Generic.List<BlockDesignerItemViewModel> { block });
+                    }
                 }
                 else
                 {
@@ -623,35 +748,52 @@ namespace AIStudio.Wpf.DiagramDesigner
                     else
                     {
                         itemBase = Activator.CreateInstance(dragObject.ContentType) as DesignerItemViewModelBase;
-                        itemBase.Icon = dragObject.Icon;
+                        if (!string.IsNullOrEmpty(dragObject.Text))
+                            itemBase.Text = dragObject.Text;
+                        if (!string.IsNullOrEmpty(dragObject.Icon))
+                            itemBase.Icon = dragObject.Icon;
                         itemBase.ColorViewModel = CopyHelper.Mapper(dragObject.ColorViewModel);
                         if (dragObject.DesiredSize != null)
                         {
                             itemBase.ItemWidth = dragObject.DesiredSize.Value.Width;
                             itemBase.ItemHeight = dragObject.DesiredSize.Value.Height;
                         }
+                        if (dragObject.DesiredMinSize != null)
+                        {
+                            itemBase.MinItemWidth = dragObject.DesiredMinSize.Value.Width;
+                            itemBase.MinItemHeight = dragObject.DesiredMinSize.Value.Height;
+                        }
+
+                    }
+                    itemBase.Left = Math.Max(0, position.X - itemBase.GetItemWidth() / 2);
+                    itemBase.Top = Math.Max(0, position.Y - itemBase.GetItemHeight() / 2);
+                    _viewModel.AddCommand.Execute(itemBase);
+
+                    if (itemBase is BlockDesignerItemViewModel block)
+                    {
+                        (_viewModel as IBlockDiagramViewModel).FinishNearBlock(new System.Collections.Generic.List<BlockDesignerItemViewModel> { block });
                     }
-                    itemBase.Left = Math.Max(0, position.X - itemBase.ItemWidth / 2);
-                    itemBase.Top = Math.Max(0, position.Y - itemBase.ItemHeight / 2);
-                    _viewModel.AddItemCommand.Execute(itemBase);
                 }
             }
-            var dragFile = e.Data.GetData(DataFormats.FileDrop);
-            if (dragFile != null && dragFile is string[] files)
+            else
             {
-                foreach (var file in files)
+                var dragFile = e.Data.GetData(DataFormats.FileDrop);
+                if (dragFile != null && dragFile is string[] files)
                 {
-                    _viewModel.ClearSelectedItems();
-                    Point position = e.GetPosition(this);
-                    ImageItemViewModel itemBase = new ImageItemViewModel();
-                    itemBase.Icon = file;
-                    itemBase.Suffix = System.IO.Path.GetExtension(itemBase.Icon).ToLower();
-                    itemBase.InitWidthAndHeight();
-                    itemBase.AutoSize();
+                    foreach (var file in files)
+                    {
+                        _viewModel.ClearSelectedItems();
+                        Point position = e.GetPosition(this);
+                        ImageItemViewModel itemBase = new ImageItemViewModel();
+                        itemBase.Icon = file;
+                        itemBase.Suffix = System.IO.Path.GetExtension(itemBase.Icon).ToLower();
+                        itemBase.InitWidthAndHeight();
+                        itemBase.AutoSize();
 
-                    itemBase.Left = Math.Max(0, position.X - itemBase.ItemWidth / 2);
-                    itemBase.Top = Math.Max(0, position.Y - itemBase.ItemHeight / 2);
-                    _viewModel.AddItemCommand.Execute(itemBase);
+                        itemBase.Left = Math.Max(0, position.X - itemBase.GetItemWidth() / 2);
+                        itemBase.Top = Math.Max(0, position.Y - itemBase.GetItemHeight() / 2);
+                        _viewModel.AddCommand.Execute(itemBase);
+                    }
                 }
             }
             e.Handled = true;

AIStudio.Wpf.DiagramDesigner/Controls/DiagramTabControl.cs

@@ -0,0 +1,318 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Markup;
+
+namespace AIStudio.Wpf.DiagramDesigner.Controls
+{
+    //public class DiagramTabControl : TabControl
+    //{
+    //    public DiagramTabControl()
+    //    {
+    //        // Attach event handler to TabControl.SelectionChanged event
+    //        this.SelectionChanged += DiagramTabControl_SelectionChanged;
+    //        this.IsVisibleChanged += DiagramTabControl_IsVisibleChanged;
+    //    }
+
+    //    private void DiagramTabControl_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+    //    {
+    //        foreach (var item in this.Items)
+    //        {
+    //            if (item is DiagramViewModel viewModel)
+    //            {
+    //                viewModel.ShowSearch = false;
+    //            }
+    //        }
+    //    }
+
+    //    private void DiagramTabControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    //    {
+    //        // Iterate through all TabItems and manually set the Visibility property
+    //        foreach (var item in this.Items)
+    //        {
+    //            if (item is DiagramViewModel viewModel)
+    //            {
+    //                if (item != this.SelectedItem)
+    //                {
+    //                    viewModel.ShowSearch = false;
+    //                }
+    //            }
+    //        }
+    //    }
+    //}
+
+    /// <summary>
+    /// Attached properties for persistent tab control
+    /// </summary>
+    /// <remarks>By default WPF TabControl bound to an ItemsSource destroys visual state of invisible tabs. 
+    /// Set ikriv:DiagramTabControl.IsCached="True" to preserve visual state of each tab.
+    /// </remarks>
+    public static class DiagramTabControl
+    {
+        public static bool GetIsCached(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(IsCachedProperty);
+        }
+
+        public static void SetIsCached(DependencyObject obj, bool value)
+        {
+            obj.SetValue(IsCachedProperty, value);
+        }
+
+        /// <summary>
+        /// Controls whether tab content is cached or not
+        /// </summary>
+        /// <remarks>When DiagramTabControl.IsCached is true, visual state of each tab is preserved (cached), even when the tab is hidden</remarks>
+        public static readonly DependencyProperty IsCachedProperty =
+            DependencyProperty.RegisterAttached("IsCached", typeof(bool), typeof(DiagramTabControl), new UIPropertyMetadata(false, OnIsCachedChanged));
+
+
+        public static DataTemplate GetTemplate(DependencyObject obj)
+        {
+            return (DataTemplate)obj.GetValue(TemplateProperty);
+        }
+
+        public static void SetTemplate(DependencyObject obj, DataTemplate value)
+        {
+            obj.SetValue(TemplateProperty, value);
+        }
+
+        /// <summary>
+        /// Used instead of TabControl.ContentTemplate for cached tabs
+        /// </summary>
+        public static readonly DependencyProperty TemplateProperty =
+            DependencyProperty.RegisterAttached("Template", typeof(DataTemplate), typeof(DiagramTabControl), new UIPropertyMetadata(null));
+
+
+        public static DataTemplateSelector GetTemplateSelector(DependencyObject obj)
+        {
+            return (DataTemplateSelector)obj.GetValue(TemplateSelectorProperty);
+        }
+
+        public static void SetTemplateSelector(DependencyObject obj, DataTemplateSelector value)
+        {
+            obj.SetValue(TemplateSelectorProperty, value);
+        }
+
+        /// <summary>
+        /// Used instead of TabControl.ContentTemplateSelector for cached tabs
+        /// </summary>
+        public static readonly DependencyProperty TemplateSelectorProperty =
+            DependencyProperty.RegisterAttached("TemplateSelector", typeof(DataTemplateSelector), typeof(DiagramTabControl), new UIPropertyMetadata(null));
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static TabControl GetInternalTabControl(DependencyObject obj)
+        {
+            return (TabControl)obj.GetValue(InternalTabControlProperty);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static void SetInternalTabControl(DependencyObject obj, TabControl value)
+        {
+            obj.SetValue(InternalTabControlProperty, value);
+        }
+
+        // Using a DependencyProperty as the backing store for InternalTabControl.  This enables animation, styling, binding, etc...
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static readonly DependencyProperty InternalTabControlProperty =
+            DependencyProperty.RegisterAttached("InternalTabControl", typeof(TabControl), typeof(DiagramTabControl), new UIPropertyMetadata(null, OnInternalTabControlChanged));
+
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static ContentControl GetInternalCachedContent(DependencyObject obj)
+        {
+            return (ContentControl)obj.GetValue(InternalCachedContentProperty);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static void SetInternalCachedContent(DependencyObject obj, ContentControl value)
+        {
+            obj.SetValue(InternalCachedContentProperty, value);
+        }
+
+        // Using a DependencyProperty as the backing store for InternalCachedContent.  This enables animation, styling, binding, etc...
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static readonly DependencyProperty InternalCachedContentProperty =
+            DependencyProperty.RegisterAttached("InternalCachedContent", typeof(ContentControl), typeof(DiagramTabControl), new UIPropertyMetadata(null));
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static object GetInternalContentManager(DependencyObject obj)
+        {
+            return (object)obj.GetValue(InternalContentManagerProperty);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static void SetInternalContentManager(DependencyObject obj, object value)
+        {
+            obj.SetValue(InternalContentManagerProperty, value);
+        }
+
+        // Using a DependencyProperty as the backing store for InternalContentManager.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty InternalContentManagerProperty =
+            DependencyProperty.RegisterAttached("InternalContentManager", typeof(object), typeof(DiagramTabControl), new UIPropertyMetadata(null));
+
+        private static void OnIsCachedChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+        {
+            if (obj == null) return;
+
+            var tabControl = obj as TabControl;
+            if (tabControl == null)
+            {
+                throw new InvalidOperationException("Cannot set DiagramTabControl.IsCached on object of type " + args.NewValue.GetType().Name +
+                    ". Only objects of type TabControl can have DiagramTabControl.IsCached property.");
+            }
+
+            bool newValue = (bool)args.NewValue;
+
+            if (!newValue)
+            {
+                if (args.OldValue != null && ((bool)args.OldValue))
+                {
+                    throw new NotImplementedException("Cannot change DiagramTabControl.IsCached from True to False. Turning tab caching off is not implemented");
+                }
+
+                return;
+            }
+
+            EnsureContentTemplateIsNull(tabControl);
+            tabControl.ContentTemplate = CreateContentTemplate();
+            EnsureContentTemplateIsNotModified(tabControl);
+        }
+
+        private static DataTemplate CreateContentTemplate()
+        {
+            const string xaml =
+                "<DataTemplate><Border b:DiagramTabControl.InternalTabControl=\"{Binding RelativeSource={RelativeSource AncestorType=TabControl}}\" /></DataTemplate>";
+
+            var context = new ParserContext();
+
+            context.XamlTypeMapper = new XamlTypeMapper(new string[0]);
+            context.XamlTypeMapper.AddMappingProcessingInstruction("b", typeof(DiagramTabControl).Namespace, typeof(DiagramTabControl).Assembly.FullName);
+
+            context.XmlnsDictionary.Add("", "http://schemas.microsoft.com/winfx/2006/xaml/presentation");
+            context.XmlnsDictionary.Add("b", "b");
+
+            var template = (DataTemplate)XamlReader.Parse(xaml, context);
+            return template;
+        }
+
+        private static void OnInternalTabControlChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+        {
+            if (obj == null) return;
+            var container = obj as Decorator;
+
+            if (container == null)
+            {
+                var message = "Cannot set DiagramTabControl.InternalTabControl on object of type " + obj.GetType().Name +
+                    ". Only controls that derive from Decorator, such as Border can have a DiagramTabControl.InternalTabControl.";
+                throw new InvalidOperationException(message);
+            }
+
+            if (args.NewValue == null) return;
+            if (!(args.NewValue is TabControl))
+            {
+                throw new InvalidOperationException("Value of DiagramTabControl.InternalTabControl cannot be of type " + args.NewValue.GetType().Name + ", it must be of type TabControl");
+            }
+
+            var tabControl = (TabControl)args.NewValue;
+            var contentManager = GetContentManager(tabControl, container);
+            contentManager.UpdateSelectedTab();
+        }
+
+        private static ContentManager GetContentManager(TabControl tabControl, Decorator container)
+        {
+            var contentManager = (ContentManager)GetInternalContentManager(tabControl);
+            if (contentManager != null)
+            {
+                /*
+                 * Content manager already exists for the tab control. This means that tab content template is applied 
+                 * again, and new instance of the Border control (container) has been created. The old container 
+                 * referenced by the content manager is no longer visible and needs to be replaced
+                 */
+                contentManager.ReplaceContainer(container);
+            }
+            else
+            {
+                // create content manager for the first time
+                contentManager = new ContentManager(tabControl, container);
+                SetInternalContentManager(tabControl, contentManager);
+            }
+
+            return contentManager;
+        }
+
+        private static void EnsureContentTemplateIsNull(TabControl tabControl)
+        {
+            if (tabControl.ContentTemplate != null)
+            {
+                throw new InvalidOperationException("TabControl.ContentTemplate value is not null. If DiagramTabControl.IsCached is True, use DiagramTabControl.Template instead of ContentTemplate");
+            }
+        }
+
+        private static void EnsureContentTemplateIsNotModified(TabControl tabControl)
+        {
+            var descriptor = DependencyPropertyDescriptor.FromProperty(TabControl.ContentTemplateProperty, typeof(TabControl));
+            descriptor.AddValueChanged(tabControl, (sender, args) =>
+            {
+                throw new InvalidOperationException("Cannot assign to TabControl.ContentTemplate when DiagramTabControl.IsCached is True. Use DiagramTabControl.Template instead");
+            });
+        }
+
+        public class ContentManager
+        {
+            TabControl _tabControl;
+            Decorator _border;
+
+            public ContentManager(TabControl tabControl, Decorator border)
+            {
+                _tabControl = tabControl;
+                _border = border;
+                _tabControl.SelectionChanged += (sender, args) => { UpdateSelectedTab(); };
+            }
+
+            public void ReplaceContainer(Decorator newBorder)
+            {
+                if (Object.ReferenceEquals(_border, newBorder)) return;
+
+                _border.Child = null; // detach any tab content that old border may hold
+                _border = newBorder;
+            }
+
+            public void UpdateSelectedTab()
+            {
+                _border.Child = GetCurrentContent();
+            }
+
+            private ContentControl GetCurrentContent()
+            {
+                var item = _tabControl.SelectedItem;
+                if (item == null) return null;
+
+                var tabItem = _tabControl.ItemContainerGenerator.ContainerFromItem(item);
+                if (tabItem == null) return null;
+
+                var cachedContent = DiagramTabControl.GetInternalCachedContent(tabItem);
+                if (cachedContent == null)
+                {
+                    cachedContent = new ContentControl
+                    {
+                        DataContext = item,
+                        ContentTemplate = DiagramTabControl.GetTemplate(_tabControl),
+                        ContentTemplateSelector = DiagramTabControl.GetTemplateSelector(_tabControl)
+                    };
+
+                    cachedContent.SetBinding(ContentControl.ContentProperty, new Binding());
+                    DiagramTabControl.SetInternalCachedContent(tabItem, cachedContent);
+                }
+
+                return cachedContent;
+            }
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner/Controls/DragThumb.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls.Primitives;
+using System.Windows.Input;
 using System.Windows.Media;
 using AIStudio.Wpf.DiagramDesigner.Geometrys;
 
@@ -12,6 +13,16 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
 {
     public class DragThumb : Thumb
     {
+        public static readonly DependencyProperty EditClickCountProperty = DependencyProperty.Register(
+           nameof(EditClickCount), typeof(int), typeof(DragThumb), new FrameworkPropertyMetadata(
+           2));
+
+        public int EditClickCount
+        {
+            get => (int)GetValue(EditClickCountProperty);
+            set => SetValue(EditClickCountProperty, value);
+        }
+
         public DragThumb()
         {
             base.DragDelta += new DragDeltaEventHandler(DragThumb_DragDelta);
@@ -20,12 +31,18 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
         }
 
         public IDiagramViewModel DiagramViewModel
+        {
+            get;set;
+        }
+
+        private SelectableDesignerItemViewModelBase DesignerItem
         {
             get
             {
-                return (this.DataContext as SelectableDesignerItemViewModelBase)?.Root;
+                return DataContext as SelectableDesignerItemViewModelBase;
             }
         }
+
         private List<SelectableDesignerItemViewModelBase> designerItems;
 
         private bool drag;
@@ -35,6 +52,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
 
             drag = false;
             SelectableDesignerItemViewModelBase designerItem = this.DataContext as SelectableDesignerItemViewModelBase;
+            DiagramViewModel = designerItem?.Root;
 
             if (designerItem != null && designerItem.IsSelected)
             {
@@ -96,9 +114,17 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
                     item.SetCellAlignment();
                 }
 
+                Interlocked.Decrement(ref DiagramViewModel.DoCommandManager.BeginDo);
+
+                var blocks = designerItems.OfType<BlockDesignerItemViewModel>().ToList();
+                if (blocks.Any())
+                {
+                    (DiagramViewModel as IBlockDiagramViewModel)?.FinishNearBlock(blocks);
+                }
+
                 Dictionary<DesignerItemViewModelBase, Tuple<PointBase, PointBase>> infos =
-                    designerItems.OfType<DesignerItemViewModelBase>().ToDictionary(p => p,
-                    p => new Tuple<PointBase, PointBase>(p.GetOldValue<PointBase>(nameof(p.TopLeft)), p.TopLeft));
+                designerItems.OfType<DesignerItemViewModelBase>().ToDictionary(p => p,
+                p => new Tuple<PointBase, PointBase>(p.GetOldValue<PointBase>(nameof(p.TopLeft)), p.TopLeft));
 
                 //部分连接点可以移动
                 Dictionary<ConnectionViewModel, Tuple<Tuple<PointBase?, PointBase?>, Tuple<PointBase?, PointBase?>>> conncetorinfos =
@@ -109,7 +135,6 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
                       new Tuple<PointBase?, PointBase?>(p.SourceConnectorInfoPart?.Position,
                                                         p.SinkConnectorInfoPart?.Position)));
 
-                Interlocked.Decrement(ref DiagramViewModel.DoCommandManager.BeginDo);
                 DiagramViewModel.DoCommandManager.DoNewCommand(this.ToString(),
                   () => {
                       foreach (var info in infos)
@@ -162,10 +187,57 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
                     item.SetPartPostion(sourcePoint, sinkPoint);
                 }
 
+                var blocks = designerItems.OfType<BlockDesignerItemViewModel>().ToList();
+                (DiagramViewModel as IBlockDiagramViewModel)?.PreviewNearBlock(blocks);
+
                 e.Handled = true;
             }
         }
 
+        #region 点击
+
+        private Point? firstPoint;
+        protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
+        {
+            base.OnPreviewMouseLeftButtonDown(e);
+
+            if (EditClickCount == 1)
+            {
+                if (e.LeftButton == MouseButtonState.Pressed && firstPoint == null)
+                {
+                    firstPoint = e.GetPosition(this);
+                    DesignerItem.PreviewExecuteEdit();
+                }
+            }
+        }
+
+        protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
+        {
+            base.OnPreviewMouseLeftButtonUp(e);
+
+            if (EditClickCount == 1)
+            {
+                DesignerItem.ExitPreviewExecuteEdit();
+                if (firstPoint == e.GetPosition(this))
+                {
+                    DesignerItem.EditCommand?.Execute(e.GetPosition(this));                    
+                }
+                firstPoint = null;
+            }
+        }
+
+        protected override void OnPreviewMouseDoubleClick(MouseButtonEventArgs e)
+        {        
+            base.OnPreviewMouseDoubleClick(e);
+            if (EditClickCount == 2)
+            {
+                DesignerItem.EditCommand?.Execute(e.GetPosition(this));
+
+                e.Handled = true;
+            }
+        }
+        #endregion
+
         private DesignerCanvas GetDesignerCanvas(DependencyObject element)
         {
             while (element != null && !(element is DesignerCanvas))

AIStudio.Wpf.DiagramDesigner/Controls/MyTabControl.cs

@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace AIStudio.Wpf.DiagramDesigner.Controls
-{
-    public class DiagramTabControl : TabControl
-    {
-        public DiagramTabControl()
-        {
-            // Attach event handler to TabControl.SelectionChanged event
-            this.SelectionChanged += DiagramTabControl_SelectionChanged;
-            this.IsVisibleChanged += DiagramTabControl_IsVisibleChanged;
-        }
-
-        private void DiagramTabControl_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            foreach (var item in this.Items)
-            {
-                if (item is DiagramViewModel viewModel)
-                {
-                    viewModel.ShowSearch = false;
-                }
-            }
-        }
-
-        private void DiagramTabControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            // Iterate through all TabItems and manually set the Visibility property
-            foreach (var item in this.Items)
-            {
-                if (item is DiagramViewModel viewModel)
-                {
-                    if (item != this.SelectedItem)
-                    {
-                        viewModel.ShowSearch = false;
-                    }
-                }
-            }
-        }
-    }
-}

AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs

@@ -95,13 +95,13 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
                         {
                             case VerticalAlignment.Bottom:
                                 dragDeltaVertical = Math.Min(-e.VerticalChange, minDeltaVertical);
-                                scale = (item.ItemHeight - dragDeltaVertical) / item.ItemHeight;
+                                scale = (item.GetItemHeight() - dragDeltaVertical) / item.GetItemHeight();
                                 DragBottom(scale, item, DiagramViewModel.SelectionService);
                                 break;
                             case VerticalAlignment.Top:
                                 double top = item.Top;
                                 dragDeltaVertical = Math.Min(Math.Max(-minTop, e.VerticalChange), minDeltaVertical);
-                                scale = (item.ItemHeight - dragDeltaVertical) / item.ItemHeight;
+                                scale = (item.GetItemHeight() - dragDeltaVertical) / item.GetItemHeight();
                                 DragTop(scale, item, DiagramViewModel.SelectionService);
                                 break;
                             default:
@@ -113,12 +113,12 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
                             case HorizontalAlignment.Left:
                                 double left = item.Left;
                                 dragDeltaHorizontal = Math.Min(Math.Max(-minLeft, e.HorizontalChange), minDeltaHorizontal);
-                                scale = (item.ItemWidth - dragDeltaHorizontal) / item.ItemWidth;
+                                scale = (item.GetItemWidth() - dragDeltaHorizontal) / item.GetItemWidth();
                                 DragLeft(scale, item, DiagramViewModel.SelectionService);
                                 break;
                             case HorizontalAlignment.Right:
                                 dragDeltaHorizontal = Math.Min(-e.HorizontalChange, minDeltaHorizontal);
-                                scale = (item.ItemWidth - dragDeltaHorizontal) / item.ItemWidth;
+                                scale = (item.GetItemWidth() - dragDeltaHorizontal) / item.GetItemWidth();
                                 DragRight(scale, item, DiagramViewModel.SelectionService);
                                 break;
                             default:
@@ -133,34 +133,34 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
 
         #region Helper methods
 
-        private void DragLeft(double scale, DesignerItemViewModelBase item, SelectionService selectionService)
+        private void DragLeft(double scale, DesignerItemViewModelBase item, DiagramSelectionService selectionService)
         {
             IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item, false).Cast<DesignerItemViewModelBase>();
 
-            double groupLeft = item.Left + item.ItemWidth;
+            double groupLeft = item.Left + item.GetItemWidth();
             foreach (DesignerItemViewModelBase groupItem in groupItems)
             {
                 double groupItemLeft = groupItem.Left;
                 double delta = (groupLeft - groupItemLeft) * (scale - 1);
                 groupItem.Left = groupItemLeft - delta;
-                groupItem.ItemWidth = groupItem.ItemWidth * scale;
+                groupItem.ItemWidth = groupItem.GetItemWidth() * scale;
             }
         }
 
-        private void DragTop(double scale, DesignerItemViewModelBase item, SelectionService selectionService)
+        private void DragTop(double scale, DesignerItemViewModelBase item, DiagramSelectionService selectionService)
         {
             IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item, false).Cast<DesignerItemViewModelBase>();
-            double groupBottom = item.Top + item.ItemHeight;
+            double groupBottom = item.Top + item.GetItemHeight();
             foreach (DesignerItemViewModelBase groupItem in groupItems)
             {
                 double groupItemTop = groupItem.Top;
                 double delta = (groupBottom - groupItemTop) * (scale - 1);
                 groupItem.Top = groupItemTop - delta;
-                groupItem.ItemHeight = groupItem.ItemHeight * scale;
+                groupItem.ItemHeight = groupItem.GetItemHeight() * scale;
             }
         }
 
-        private void DragRight(double scale, DesignerItemViewModelBase item, SelectionService selectionService)
+        private void DragRight(double scale, DesignerItemViewModelBase item, DiagramSelectionService selectionService)
         {
             IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item, false).Cast<DesignerItemViewModelBase>();
 
@@ -171,11 +171,11 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
                 double delta = (groupItemLeft - groupLeft) * (scale - 1);
 
                 groupItem.Left = groupItemLeft + delta;
-                groupItem.ItemWidth = groupItem.ItemWidth * scale;
+                groupItem.ItemWidth = groupItem.GetItemWidth() * scale;
             }
         }
 
-        private void DragBottom(double scale, DesignerItemViewModelBase item, SelectionService selectionService)
+        private void DragBottom(double scale, DesignerItemViewModelBase item, DiagramSelectionService selectionService)
         {
             IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item, false).Cast<DesignerItemViewModelBase>();
             double groupTop = item.Top;
@@ -185,7 +185,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
                 double delta = (groupItemTop - groupTop) * (scale - 1);
 
                 groupItem.Top = groupItemTop + delta;
-                groupItem.ItemHeight = groupItem.ItemHeight * scale;
+                groupItem.ItemHeight = groupItem.GetItemHeight() * scale;
             }
         }
 

AIStudio.Wpf.DiagramDesigner/Controls/RotateThumb.cs

@@ -53,8 +53,8 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
                 if (this.designerCanvas != null)
                 {
                     this.centerPoint =
-                        new Point(this.designerItem.Left + this.designerItem.ItemWidth * 0.5,
-                                  this.designerItem.Top + this.designerItem.ItemHeight * 0.5);
+                        new Point(this.designerItem.Left + this.designerItem.GetItemHeight() * 0.5,
+                                  this.designerItem.Top + this.designerItem.GetItemHeight() * 0.5);
 
                     Point startPoint = Mouse.GetPosition(this.designerCanvas);
                     this.startVector = Point.Subtract(startPoint, this.centerPoint);

AIStudio.Wpf.DiagramDesigner/Converters/ColorBrushConverter.cs

@@ -22,175 +22,7 @@ namespace AIStudio.Wpf.DiagramDesigner
             }
             else if (value is ColorObject colorObject)
             {
-                if (colorObject.BrushType == BrushType.None)
-                    brush = new SolidColorBrush(Colors.Transparent);
-                else if (colorObject.BrushType == BrushType.SolidColorBrush)
-                    brush = new SolidColorBrush(colorObject.Color);
-                else if (colorObject.BrushType == BrushType.LinearGradientBrush)
-                {
-                    Point startPoint;
-                    Point endPoint;
-                    if (colorObject.LinearOrientation == LinearOrientation.LeftToRight)
-                    {
-                        startPoint = new Point(0, 0.5);
-                        endPoint = new Point(1, 0.5);
-                    }
-                    else if (colorObject.LinearOrientation == LinearOrientation.LeftTopToRightBottom)
-                    {
-                        startPoint = new Point(0, 0);
-                        endPoint = new Point(1, 1);
-                    }
-                    else if (colorObject.LinearOrientation == LinearOrientation.TopToBottom)
-                    {
-                        startPoint = new Point(0.5, 0);
-                        endPoint = new Point(0.5, 1);
-                    }
-                    else if (colorObject.LinearOrientation == LinearOrientation.RightTopToLeftBottom)
-                    {
-                        startPoint = new Point(1, 0);
-                        endPoint = new Point(0, 1);
-                    }
-                    else if (colorObject.LinearOrientation == LinearOrientation.RightToLeft)
-                    {
-                        startPoint = new Point(1, 0.5);
-                        endPoint = new Point(0, 0.5);
-                    }
-                    else if (colorObject.LinearOrientation == LinearOrientation.RightBottomToLeftTop)
-                    {
-                        startPoint = new Point(1, 1);
-                        endPoint = new Point(0, 0);
-                    }
-                    else if (colorObject.LinearOrientation == LinearOrientation.BottomToTop)
-                    {
-                        startPoint = new Point(0.5, 1);
-                        endPoint = new Point(0.5, 0);
-                    }
-                    else if (colorObject.LinearOrientation == LinearOrientation.LeftBottomToRightTop)
-                    {
-                        startPoint = new Point(0, 1);
-                        endPoint = new Point(1, 0);
-                    }
-                    else
-                    {
-                        startPoint = new Point(0, 0.5);
-                        endPoint = new Point(1, 0.5);
-                    }
-
-                    LinearGradientBrush myBrush = new LinearGradientBrush();
-                    myBrush.StartPoint = startPoint;
-                    myBrush.EndPoint = endPoint;
-                    if (colorObject.GradientStop != null)
-                    {
-                        foreach (var stop in colorObject.GradientStop)
-                        {
-                            myBrush.GradientStops.Add(new System.Windows.Media.GradientStop(stop.Color, stop.Offset));
-                        }
-                    }
-                    brush = myBrush;
-
-                    RotateTransform rotateTransform = new RotateTransform(colorObject.Angle, 0.5, 0.5);
-                    myBrush.RelativeTransform = rotateTransform;
-                }
-                else if (colorObject.BrushType == BrushType.RadialGradientBrush)
-                {
-                    Point center;
-                    Point gradientOrigin;
-                    double radiusX;
-                    double radiusY;
-
-                    if (colorObject.RadialOrientation == RadialOrientation.LeftTop)
-                    {
-                        center = new Point(0, 0);
-                        gradientOrigin = center;
-                        radiusX = 1;
-                        radiusY = 1;
-                    }
-                    else if (colorObject.RadialOrientation == RadialOrientation.RightTop)
-                    {
-                        center = new Point(1, 0);
-                        gradientOrigin = center;
-                        radiusX = 1;
-                        radiusY = 1;
-                    }
-                    else if (colorObject.RadialOrientation == RadialOrientation.RightBottom)
-                    {
-                        center = new Point(1, 1);
-                        gradientOrigin = center;
-                        radiusX = 1;
-                        radiusY = 1;
-                    }
-                    else if (colorObject.RadialOrientation == RadialOrientation.LeftBottom)
-                    {
-                        center = new Point(0, 1);
-                        gradientOrigin = center;
-                        radiusX = 1;
-                        radiusY = 1;
-                    }
-                    else
-                    {
-                        center = new Point(0.5, 0.5);
-                        gradientOrigin = center;
-                        radiusX = 0.5;
-                        radiusY = 0.5;
-                    }
-
-                    RadialGradientBrush myBrush = new RadialGradientBrush();
-                    myBrush.Center = center;
-                    myBrush.GradientOrigin = gradientOrigin;
-                    myBrush.RadiusX = radiusX;
-                    myBrush.RadiusY = radiusY;
-                    if (colorObject.GradientStop != null)
-                    {
-                        foreach (var stop in colorObject.GradientStop)
-                        {
-                            myBrush.GradientStops.Add(new System.Windows.Media.GradientStop(stop.Color, stop.Offset));
-                        }
-                    }
-                    brush = myBrush;
-
-                    RotateTransform rotateTransform = new RotateTransform(colorObject.Angle, 0.5, 0.5);
-                    myBrush.RelativeTransform = rotateTransform;
-                }
-                else if (colorObject.BrushType == BrushType.ImageBrush)
-                {
-                    ImageBrush myBrush = new ImageBrush();
-                    myBrush.ImageSource = new BitmapImage(new Uri(colorObject.Image, UriKind.Absolute));
-                    brush = myBrush;
-                }
-                else if (colorObject.BrushType == BrushType.DrawingBrush)
-                {
-                    DrawingBrush myBrush = new DrawingBrush();
-
-                    GeometryDrawing backgroundSquare =
-                        new GeometryDrawing(
-                            Brushes.White,
-                            null,
-                            new RectangleGeometry(new Rect(0, 0, 100, 100)));
-
-                    GeometryGroup aGeometryGroup = new GeometryGroup();
-                    aGeometryGroup.Children.Add(new RectangleGeometry(new Rect(0, 0, 50, 50)));
-                    aGeometryGroup.Children.Add(new RectangleGeometry(new Rect(50, 50, 50, 50)));
-
-                    LinearGradientBrush checkerBrush = new LinearGradientBrush();
-                    checkerBrush.GradientStops.Add(new System.Windows.Media.GradientStop(Colors.Black, 0.0));
-                    checkerBrush.GradientStops.Add(new System.Windows.Media.GradientStop(Colors.Gray, 1.0));
-
-                    GeometryDrawing checkers = new GeometryDrawing(checkerBrush, null, aGeometryGroup);
-
-                    DrawingGroup checkersDrawingGroup = new DrawingGroup();
-                    checkersDrawingGroup.Children.Add(backgroundSquare);
-                    checkersDrawingGroup.Children.Add(checkers);
-
-                    myBrush.Drawing = checkersDrawingGroup;
-                    myBrush.Viewport = new Rect(0, 0, 0.25, 0.25);
-                    myBrush.TileMode = TileMode.Tile;
-
-                    brush = myBrush;
-                }
-                if (brush != null)
-                {
-                    brush.Opacity = colorObject.Opacity;
-                }
+                brush = colorObject.ToBrush();
             }
             else if (value is ObservableCollection<GradientStop> gradientStop)
             {

AIStudio.Wpf.DiagramDesigner/Converters/Converters.cs

@@ -48,7 +48,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Converters
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return DependencyProperty.UnsetValue;
+            return !(bool)value;
         }
     }
     #endregion

AIStudio.Wpf.DiagramDesigner/Converters/NegativeConverter.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace AIStudio.Wpf.DiagramDesigner
+{
+    public class NegativeConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            if (value is double)
+            {
+                return 0 - (double)value;
+            }
+
+            return value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner/Enums/CursorMode.cs

@@ -9,5 +9,6 @@ namespace AIStudio.Wpf.DiagramDesigner
         Normal = 0,
         Format = 1,
         Move = 2,
+        Exit = 3,
     }
 }

AIStudio.Wpf.DiagramDesigner/Enums/DiagramType.cs

@@ -11,6 +11,8 @@ namespace AIStudio.Wpf.DiagramDesigner
         Logical,
         SFC,
         Mind,
-        Script
+        Script,
+        Drawing,
+        Block
     }
 }

AIStudio.Wpf.DiagramDesigner/Enums/DrawMode.cs

@@ -7,16 +7,47 @@ namespace AIStudio.Wpf.DiagramDesigner
     public enum DrawMode
     {
         Normal = 0,       
-        Line = 1,
-        Rectangle = 2,
-        Ellipse = 3,
-        Polyline = 4,
-        Polygon = 5,
-        DirectLine = 6,
         ConnectingLineSmooth = 10,
         ConnectingLineStraight = 11,
         ConnectingLineCorner = 12,
         ConnectingLineBoundary = 13,
-        Text = 20,
+        //实心图使用
+        Text = 119,
+        Line = 120,
+        Rectangle = 121,
+        Ellipse = 122,
+        Polyline = 123,
+        Polygon = 124,
+        DirectLine = 125,
+        //200-300为可部分擦除的形状
+        Select = 200,
+        Eraser = 201,
+        EraserPreview = 202,
+        //画笔使用
+        Pen1 = 210,
+        Pen2 = 211,
+        Pen3 = 212,
+        ColorPicker = 213,
+        ErasableText = 219,
+        ErasableLine = 220,
+        ErasableRectangle = 221,
+        ErasableEllipse = 222,
+        ErasablePolyline = 223,
+        ErasablePolygon = 224,
+        ErasableDirectLine = 225,
+        ErasableTriangle = 226, //三角形  
+        ErasableRhombus = 227, //菱形        
+        ErasableHexagon = 228,//六边形
+        ErasablePentagram = 229,//五角星
+        ErasableStarFour = 230,//四角星
+        ErasableStarThree = 231,//三角星
+        ErasableChat = 232,//对话框
+        ErasableComment = 233,//评论
+        ErasableCloud = 234,//云
+        ErasableArrowRight = 235,
+        ErasableArrowLeft = 236,
+        ErasableCheck = 237,
+        ErasableClose = 238,
+        ErasableHeart = 239,
     }
 }

AIStudio.Wpf.DiagramDesigner/Geometrys/PointBase.cs

@@ -16,6 +16,12 @@ namespace AIStudio.Wpf.DiagramDesigner.Geometrys
             _y = y;
         }
 
+        public PointBase(Point point)
+        {
+            _x = point.X;
+            _y = point.Y;
+        }
+
         /// <summary>
         /// 中间X
         /// </summary>

AIStudio.Wpf.DiagramDesigner/Helpers/BitmapHelper.cs

@@ -0,0 +1,339 @@
+using System;
+using System.Collections;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.IO.Pipes;
+using System.Runtime.InteropServices.ComTypes;
+using System.Windows;
+using System.Windows.Media.Imaging;
+
+namespace AIStudio.Wpf.DiagramDesigner
+{
+    public static class BitmapHelper
+    {
+
+        /// <summary>
+        /// 截图转换成bitmap
+        /// </summary>
+        /// <param name="element"></param>
+        /// <param name="width">默认控件宽度</param>
+        /// <param name="height">默认控件高度</param>
+        /// <param name="x">默认0</param>
+        /// <param name="y">默认0</param>
+        /// <returns></returns>
+        public static Bitmap ToBitmap(this FrameworkElement element, int width = 0, int height = 0, int x = 0, int y = 0)
+        {
+            if (width == 0) width = (int)element.ActualWidth;
+            if (height == 0) height = (int)element.ActualHeight;
+
+            var rtb = new RenderTargetBitmap(width, height, x, y, System.Windows.Media.PixelFormats.Default);
+            rtb.Render(element);
+            var bit = BitmapSourceToBitmap(rtb);
+
+            return bit;
+        }
+
+
+        public static Bitmap ToBitmap(this System.Windows.Media.VisualBrush brush, Rect rect)
+        {
+            var visual = new System.Windows.Media.DrawingVisual();
+            using (var dc = visual.RenderOpen())
+            {
+                dc.DrawRectangle(brush, null, rect);
+            }
+
+            var rtb = new RenderTargetBitmap((int)rect.Width, (int)rect.Height, 96, 96, System.Windows.Media.PixelFormats.Default);
+            rtb.Render(visual);
+
+            var bit = BitmapSourceToBitmap(rtb);
+
+            return bit;
+        }
+
+
+        /// <summary>
+        /// BitmapSource转Bitmap
+        /// </summary>
+        /// <param name="source"></param>
+        /// <returns></returns>
+        public static Bitmap BitmapSourceToBitmap(this BitmapSource source)
+        {
+            return BitmapSourceToBitmap(source, source.PixelWidth, source.PixelHeight);
+        }
+
+        /// <summary>
+        /// Convert BitmapSource to Bitmap
+        /// </summary>
+        /// <param name="source"></param>
+        /// <returns></returns>
+        public static Bitmap BitmapSourceToBitmap(this BitmapSource source, int width, int height)
+        {
+            Bitmap bmp = null;
+            try
+            {
+                PixelFormat format = PixelFormat.Format24bppRgb;
+                /*set the translate type according to the in param(source)*/
+                switch (source.Format.ToString())
+                {
+                    case "Rgb24":
+                    case "Bgr24": format = PixelFormat.Format24bppRgb; break;
+                    case "Bgra32": format = PixelFormat.Format32bppPArgb; break;
+                    case "Bgr32": format = PixelFormat.Format32bppRgb; break;
+                    case "Pbgra32": format = PixelFormat.Format32bppArgb; break;
+                }
+                bmp = new Bitmap(width, height, format);
+                BitmapData data = bmp.LockBits(new System.Drawing.Rectangle(System.Drawing.Point.Empty, bmp.Size),
+                    ImageLockMode.WriteOnly,
+                    format);
+                source.CopyPixels(Int32Rect.Empty, data.Scan0, data.Height * data.Stride, data.Stride);
+                bmp.UnlockBits(data);
+            }
+            catch
+            {
+                if (bmp != null)
+                {
+                    bmp.Dispose();
+                    bmp = null;
+                }
+            }
+
+            return bmp;
+        }
+
+        public static System.Windows.Media.ImageSource ToBitmapSource(this Bitmap bitmap, int width, int height)
+        {
+            MemoryStream stream = new MemoryStream();
+            bitmap.Save(stream, ImageFormat.Bmp);
+            stream.Position = 0;
+            BitmapImage bitmapImage = new BitmapImage();
+            bitmapImage.BeginInit();
+            bitmapImage.CreateOptions = BitmapCreateOptions.IgnoreColorProfile;
+            bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
+            bitmapImage.DecodePixelWidth = width;//需要缩略图的解码宽度
+            bitmapImage.DecodePixelHeight = height;//缩略图的解码高度
+            bitmapImage.StreamSource = stream;
+            bitmapImage.EndInit();
+            return bitmapImage;
+        }       
+
+        public static System.Windows.Media.Brush ToBrush(this string base64String, int width, int height)
+        {
+            if (string.IsNullOrEmpty(base64String))
+                return null;
+
+            try
+            {
+                var bitmapImage = base64String.ToBitmapImage(width, height);
+
+                return new System.Windows.Media.ImageBrush(bitmapImage) { Stretch = System.Windows.Media.Stretch.Uniform };
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        public static BitmapImage ToBitmapImage(this string base64String, int width = 0, int height = 0)
+        {
+            if (string.IsNullOrEmpty(base64String))
+                return null;
+
+            try
+            {
+                var byteArray = Convert.FromBase64String(base64String);
+                BitmapImage bitmapImage = null;
+                bitmapImage = new BitmapImage();
+                bitmapImage.BeginInit();
+                bitmapImage.CreateOptions = BitmapCreateOptions.IgnoreColorProfile;
+                bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
+                bitmapImage.DecodePixelWidth = width;//需要缩略图的解码宽度
+                bitmapImage.DecodePixelHeight = height;//缩略图的解码高度
+                bitmapImage.StreamSource = new MemoryStream(byteArray);
+                bitmapImage.EndInit();
+
+                return bitmapImage;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        public static BitmapImage ToBitmapImage(this System.Drawing.Bitmap ImageOriginal, int width = 0, int height = 0)
+        {
+            System.Drawing.Bitmap ImageOriginalBase = new System.Drawing.Bitmap(ImageOriginal);
+            BitmapImage bitmapImage = new BitmapImage() { DecodePixelWidth = width, DecodePixelHeight = height };
+            System.IO.MemoryStream ms = new System.IO.MemoryStream();
+            ImageOriginalBase.Save(ms, System.Drawing.Imaging.ImageFormat.Png);
+            bitmapImage.BeginInit();
+            bitmapImage.StreamSource = ms;
+            bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
+            bitmapImage.EndInit();
+            bitmapImage.Freeze();
+
+            return bitmapImage;
+        }
+
+        public static BitmapImage ToBitmapImage(this byte[] byteArray, int width = 0, int height = 0)
+        {
+            BitmapImage bitmapImage = new BitmapImage() { DecodePixelWidth = width, DecodePixelHeight = height };
+            System.IO.MemoryStream ms = new System.IO.MemoryStream(byteArray);
+            bitmapImage.BeginInit();
+            bitmapImage.StreamSource = ms;
+            bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
+            bitmapImage.EndInit();
+            bitmapImage.Freeze();
+
+            return bitmapImage;
+
+        }
+
+        public static Bitmap ToBitmap(this string base64String, int width = 0, int height = 0)
+        {
+            if (string.IsNullOrEmpty(base64String))
+                return null;
+
+            try
+            {
+                var byteArray = Convert.FromBase64String(base64String);               
+
+                return byteArray.ToBitmap();
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        public static Bitmap ToBitmap(this byte[] byteArray)
+        {
+            //var stream = new MemoryStream(byteArray);
+            //return new Bitmap(stream);
+            MemoryStream ms = new MemoryStream(byteArray);
+            Bitmap bitmap = (Bitmap)Image.FromStream(ms);
+            ms.Close();
+
+            return bitmap;
+        }
+
+        public static string ToBase64String(this System.Windows.Media.Brush brush)
+        {
+            try
+            {
+                if (brush is System.Windows.Media.VisualBrush visualBrush)
+                {
+                    var size = ((UIElement)visualBrush.Visual).DesiredSize;
+                    var image = visualBrush.ToBitmap(new Rect(size));
+                    MemoryStream stream = new MemoryStream();
+                    image.Save(stream, ImageFormat.Bmp);
+                    stream.Position = 0;
+                    var bytearray = stream.ToArray();
+                    return Convert.ToBase64String(bytearray);
+                }
+                else if (brush is System.Windows.Media.ImageBrush imageBrush)
+                {
+                    var bitmap = (imageBrush.ImageSource as BitmapImage);
+                    byte[] bytearray = null;
+                    Stream smarket = bitmap.StreamSource;
+                    if (smarket != null && smarket.Length > 0)
+                    {
+                        //设置当前位置
+                        smarket.Position = 0;
+                        using (BinaryReader br = new BinaryReader(smarket))
+                        {
+                            bytearray = br.ReadBytes((int)smarket.Length);
+                        }
+                    }
+                    return Convert.ToBase64String(bytearray);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            catch (Exception ex)
+            {
+                return null;
+            }
+        }
+
+        public static string ToBase64String(this BitmapImage bitmap)
+        {
+            Stream stream = bitmap.StreamSource;
+            byte[] bytearray = new byte[stream.Length];
+            stream.Seek(0, SeekOrigin.Begin);
+            stream.Read(bytearray, 0, bytearray.Length);
+
+            return Convert.ToBase64String(bytearray);
+        }
+
+        public static string ToBase64String(this Bitmap bitmap)
+        {
+            var ms = new MemoryStream();
+            bitmap.Save(ms, bitmap.RawFormat);
+            byte[] bytearray = new byte[ms.Length];
+            bytearray = ms.ToArray();
+
+            return Convert.ToBase64String(bytearray);
+        }
+
+
+        public static string ToBase64String(this Stream stream)
+        {
+            byte[] bytearray = new byte[stream.Length];
+            stream.Seek(0, SeekOrigin.Begin);
+            stream.Read(bytearray, 0, bytearray.Length);
+
+            return Convert.ToBase64String(bytearray);
+        }
+
+        public static MemoryStream ToMemoryStream(this string base64String, int width = 0, int height = 0)
+        {
+            if (string.IsNullOrEmpty(base64String))
+                return null;
+
+            try
+            {
+                var byteArray = Convert.FromBase64String(base64String);
+                var stream = new MemoryStream(byteArray);
+                stream.Seek(0, SeekOrigin.Begin);
+
+                return stream;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        public static FileStream ToFileStream(this string base64String, string filename, int width = 0, int height = 0)
+        {
+            if (string.IsNullOrEmpty(base64String))
+                return null;
+
+            try
+            {
+                var byteArray = Convert.FromBase64String(base64String);
+                FileStream fs = new FileStream(filename, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+                fs.Write(byteArray, 0, byteArray.Length);
+                fs.Seek(0, SeekOrigin.Begin);
+                return fs;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        public static Stream CopyStream(this Stream stream)
+        {
+            byte[] bytearray = new byte[stream.Length];
+            stream.Seek(0, SeekOrigin.Begin);
+            stream.Read(bytearray, 0, bytearray.Length);
+
+            var destination = new MemoryStream(bytearray);
+            return destination;
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner/Helpers/CopyHelper.cs

@@ -230,7 +230,7 @@ namespace AIStudio.Wpf.DiagramDesigner
         public static T Mapper<T>(IAnimationViewModel s) where T : IAnimationViewModel
         {
             var d = CopyHelper.Mapper<T, IAnimationViewModel>(s);
-             d.AnimationPath = CopyHelper.Mapper<SharpPathItem, ISharpPath>(s.AnimationPath);
+            d.AnimationPath = CopyHelper.Mapper<SharpPathItem, ISharpPath>(s.AnimationPath);
             return d;
         }
 

AIStudio.Wpf.DiagramDesigner/Helpers/DoubleUtil.cs

@@ -0,0 +1,64 @@
+namespace AIStudio.Wpf.DiagramDesigner
+{
+    using System;
+
+    public static class DoubleUtil
+    {
+        // Const values come from sdk\inc\crt\float.h
+#pragma warning disable SA1310 // Field names must not contain underscore
+        // ReSharper disable once InconsistentNaming
+        private const double DBL_EPSILON = 2.2204460492503131e-016; /* smallest such that 1.0+DBL_EPSILON != 1.0 */
+#pragma warning restore SA1310 // Field names must not contain underscore
+
+        /// <summary>
+        /// AreClose - Returns whether or not two doubles are "close".  That is, whether or
+        /// not they are within epsilon of each other.  Note that this epsilon is proportional
+        /// to the numbers themselves to that AreClose survives scalar multiplication.
+        /// There are plenty of ways for this to return false even for numbers which
+        /// are theoretically identical, so no code calling this should fail to work if this
+        /// returns false.  This is important enough to repeat:
+        /// NB: NO CODE CALLING THIS FUNCTION SHOULD DEPEND ON ACCURATE RESULTS - this should be
+        /// used for optimizations *only*.
+        /// </summary>
+        /// <returns>
+        /// bool - the result of the AreClose comparision.
+        /// </returns>
+        /// <param name="value1"> The first double to compare. </param>
+        /// <param name="value2"> The second double to compare. </param>
+        public static bool AreClose(double value1, double value2)
+        {
+            // in case they are Infinities (then epsilon check does not work)
+            // ReSharper disable once CompareOfFloatsByEqualityOperator
+            if (value1 == value2)
+            {
+                return true;
+            }
+
+            // This computes (|value1-value2| / (|value1| + |value2| + 10.0)) &lt; DBL_EPSILON
+            var eps = (Math.Abs(value1) + Math.Abs(value2) + 10.0) * DBL_EPSILON;
+            var delta = value1 - value2;
+            return (-eps < delta) && (eps > delta);
+        }
+
+        /// <summary>
+        /// GreaterThan - Returns whether or not the first double is greater than the second double.
+        /// That is, whether or not the first is strictly greater than *and* not within epsilon of
+        /// the other number.  Note that this epsilon is proportional to the numbers themselves
+        /// to that AreClose survives scalar multiplication.  Note,
+        /// There are plenty of ways for this to return false even for numbers which
+        /// are theoretically identical, so no code calling this should fail to work if this
+        /// returns false.  This is important enough to repeat:
+        /// NB: NO CODE CALLING THIS FUNCTION SHOULD DEPEND ON ACCURATE RESULTS - this should be
+        /// used for optimizations *only*.
+        /// </summary>
+        /// <returns>
+        /// bool - the result of the GreaterThan comparision.
+        /// </returns>
+        /// <param name="value1"> The first double to compare. </param>
+        /// <param name="value2"> The second double to compare. </param>
+        public static bool GreaterThan(double value1, double value2)
+        {
+            return (value1 > value2) && !AreClose(value1, value2);
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner/Helpers/DrawingHelper.cs

@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace AIStudio.Wpf.DiagramDesigner
+{
+    public static class DrawingHelper
+    {
+        public static List<Point> GetPoints(Point startPoint, double angle, List<Tuple<double, double>> angleAndWidth)
+        {
+            List<Point> points = new List<Point>();
+            points.Add(startPoint);
+
+            Point thisPoint = startPoint;
+            double thisAngle = angle;
+
+            Point nextPoint;
+            foreach (var item in angleAndWidth)
+            {
+                nextPoint = GetEndPointByTrigonometric(thisPoint, thisAngle, item.Item1);
+                //if (thisPoint != nextPoint)
+                {
+                    points.Add(nextPoint);
+                }
+
+                thisPoint = nextPoint;
+                thisAngle = thisAngle + item.Item2;
+            }
+
+
+            return points;
+        }
+
+
+        /// <summary>
+        /// 通过三角函数求终点坐标
+        /// </summary>
+        /// <param name="angle">角度</param>
+        /// <param name="startPoint">起点</param>
+        /// <param name="distance">距离</param>
+        /// <returns>终点坐标</returns>
+        public static Point GetEndPointByTrigonometric(Point startPoint, double angle, double distance)
+        {
+            //角度转弧度
+            var radian = (angle * Math.PI) / 180;
+
+            //计算新坐标 r 就是两者的距离
+            Point endPoint = new Point(startPoint.X + distance * Math.Cos(radian), startPoint.Y + distance * Math.Sin(radian));
+
+            return endPoint;
+        }
+
+        /// <summary>
+        /// 通过三角函数求终点坐标
+        /// </summary>
+        /// <param name="angle">角度</param>
+        /// <param name="startPoint">起点</param>
+        /// <param name="distance">距离</param>
+        /// <returns>终点坐标</returns>
+        public static Point GetEndPointByDirection(Point startPoint, double direction, double distance)
+        {
+            return GetEndPointByTrigonometric(startPoint, 90 - direction, distance);
+        }
+
+        public static double GetAngle(Point startPoint, Point endPoint)
+        {
+            var radian = (endPoint.Y - startPoint.Y) / (endPoint.X - startPoint.X);
+            var angle = radian * 180 / Math.PI;
+            return angle;
+        }
+
+        public static double GetDirection(Point startPoint, Point endPoint)
+        {
+
+            var radian = Math.Atan2(endPoint.Y - startPoint.Y, endPoint.X - startPoint.X);
+            var angle = radian * 180 / Math.PI;
+
+
+            return ConvertToPositive360(90 - angle);
+
+        }
+
+        public static double ConvertToPositive360(double angle)
+        {
+            double positiveAngle = angle % 360;
+            if (positiveAngle < 0)
+            {
+                positiveAngle += 360;
+            }
+            return positiveAngle;
+        }
+
+        public static Point RotatePoint(Point point, Point center, double angle)
+        {
+            var x = (point.X - center.X) * Math.Cos(Math.PI / 180.0 * angle) - (point.Y - center.Y) * Math.Sin(Math.PI / 180.0 * angle) + center.X;
+            var y = (point.X - center.X) * Math.Sin(Math.PI / 180.0 * angle) + (point.Y - center.Y) * Math.Cos(Math.PI / 180.0 * angle) + center.Y;
+            return new Point(x, y);
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner/Helpers/PointHelper.cs

@@ -13,10 +13,17 @@ namespace AIStudio.Wpf.DiagramDesigner
                 return point;
             }
 
+            var connectorWidth =  double.IsNaN(connector.ConnectorWidth) ? 0 : connector.ConnectorWidth;
+            var connectorHeight = double.IsNaN(connector.ConnectorHeight) ? 0 : connector.ConnectorHeight;
+            var left = connector.DataItem.Left;
+            var top = connector.DataItem.Top;
+            var itemWidth = connector.DataItem.GetItemWidth();
+            var itemHeight = connector.DataItem.GetItemHeight();
+
             if (connector.IsInnerPoint)
             {
-                point = new PointBase(connector.DataItem.Left + connector.DataItem.ItemWidth * connector.XRatio - connector.ConnectorWidth / 2,
-                        connector.DataItem.Top + connector.DataItem.ItemHeight * connector.YRatio - connector.ConnectorHeight / 2);
+                point = new PointBase(left + itemWidth * connector.XRatio - connectorWidth / 2,
+                        top + itemHeight * connector.YRatio - connectorHeight / 2);
             }
             else if (connector.IsPortless)
             {
@@ -27,39 +34,39 @@ namespace AIStudio.Wpf.DiagramDesigner
                 switch (connector.Orientation)
                 {
                     case ConnectorOrientation.Left:
-                        point = new PointBase(connector.DataItem.Left - connector.ConnectorWidth / 2, connector.DataItem.Top + (connector.DataItem.ItemHeight / 2) - connector.ConnectorHeight / 2);
+                        point = new PointBase(left - connectorWidth / 2, top + (itemHeight / 2) - connectorHeight / 2);
                         break;
                     case ConnectorOrientation.TopLeft:
-                        point = new PointBase(connector.DataItem.Left - connector.ConnectorWidth / 2, connector.DataItem.Top - connector.ConnectorHeight / 2);
+                        point = new PointBase(left - connectorWidth / 2, top - connectorHeight / 2);
                         break;
                     case ConnectorOrientation.Top:
-                        point = new PointBase(connector.DataItem.Left + (connector.DataItem.ItemWidth / 2) - connector.ConnectorWidth / 2, connector.DataItem.Top - connector.ConnectorHeight / 2);
+                        point = new PointBase(left + (itemWidth / 2) - connectorWidth / 2, top - connectorHeight / 2);
                         break;
                     case ConnectorOrientation.TopRight:
-                        point = new PointBase(connector.DataItem.Left + connector.DataItem.ItemWidth - connector.ConnectorWidth / 2, connector.DataItem.Top - connector.ConnectorHeight / 2);
+                        point = new PointBase(left + itemWidth - connectorWidth / 2, top - connectorHeight / 2);
                         break;
                     case ConnectorOrientation.Right:
-                        point = new PointBase(connector.DataItem.Left + connector.DataItem.ItemWidth - connector.ConnectorWidth / 2, connector.DataItem.Top + (connector.DataItem.ItemHeight / 2) - connector.ConnectorHeight / 2);
+                        point = new PointBase(left + itemWidth - connectorWidth / 2, top + (itemHeight / 2) - connectorHeight / 2);
                         break;
                     case ConnectorOrientation.BottomRight:
-                        point = new PointBase(connector.DataItem.Left + connector.DataItem.ItemWidth - connector.ConnectorWidth / 2, connector.DataItem.Top + connector.DataItem.ItemHeight - connector.ConnectorHeight / 2);
+                        point = new PointBase(left + itemWidth - connectorWidth / 2, top + itemHeight - connectorHeight / 2);
                         break;
                     case ConnectorOrientation.Bottom:
-                        point = new PointBase(connector.DataItem.Left + (connector.DataItem.ItemWidth / 2) - connector.ConnectorWidth / 2, connector.DataItem.Top + connector.DataItem.ItemHeight - connector.ConnectorHeight / 2);
+                        point = new PointBase(left + (itemWidth / 2) - connectorWidth / 2, top + itemHeight - connectorHeight / 2);
                         break;
                     case ConnectorOrientation.BottomLeft:
-                        point = new PointBase(connector.DataItem.Left - connector.ConnectorWidth / 2, connector.DataItem.Top + connector.DataItem.ItemHeight - connector.ConnectorHeight / 2);
+                        point = new PointBase(left - connectorWidth / 2, top + itemHeight - connectorHeight / 2);
                         break;
                     default:
-                        point = new PointBase(connector.DataItem.Left + (connector.DataItem.ItemWidth / 2) - connector.ConnectorWidth / 2, connector.DataItem.Top + (connector.DataItem.ItemHeight / 2) - connector.ConnectorHeight / 2);
+                        point = new PointBase(left + (itemWidth / 2) - connectorWidth / 2, top + (itemHeight / 2) - connectorHeight / 2);
                         break;
                 }
             }
 
             if (middle)
             {
-                point.X = point.X + connector.ConnectorWidth / 2;
-                point.Y = point.Y + connector.ConnectorHeight / 2;
+                point.X = point.X + connectorWidth / 2;
+                point.Y = point.Y + connectorHeight / 2;
             }
             //旋转后的坐标
             var newX = (point.X - connector.DataItem.MiddlePosition.X) * Math.Cos(connector.DataItem.Angle * Math.PI / 180) - (point.Y - connector.DataItem.MiddlePosition.Y) * Math.Sin(connector.DataItem.Angle * Math.PI / 180) + connector.DataItem.MiddlePosition.X;
@@ -70,7 +77,5 @@ namespace AIStudio.Wpf.DiagramDesigner
             newY = (newY - connector.DataItem.MiddlePosition.Y) * connector.DataItem.ScaleY + connector.DataItem.MiddlePosition.Y;
             return new PointBase(newX, newY);
         }
-
-
     }
 }

AIStudio.Wpf.DiagramDesigner/Models/DragObject.cs

@@ -9,10 +9,33 @@ namespace AIStudio.Wpf.DiagramDesigner
     // Wraps info of the dragged object into a class
     public class DragObject
     {
-        public Size? DesiredSize { get; set; }
-        public Type ContentType { get; set; }
-        public string Icon { get; set; }
-        public IColorViewModel ColorViewModel { get; set; }
-        public object DesignerItem { get; set; }
+        public Size? DesiredSize
+        {
+            get; set;
+        }
+        public Size? DesiredMinSize
+        {
+            get; set;
+        }
+        public Type ContentType
+        {
+            get; set;
+        }
+        public string Icon
+        {
+            get; set;
+        }
+        public string Text
+        {
+            get; set;
+        }
+        public IColorViewModel ColorViewModel
+        {
+            get; set;
+        }
+        public object DesignerItem
+        {
+            get; set;
+        }
     }
 }

AIStudio.Wpf.DiagramDesigner/Models/Serializables/BlockDesignerItem.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+
+namespace AIStudio.Wpf.DiagramDesigner
+{
+    [Serializable]
+    [XmlInclude(typeof(BlockDesignerItem))]
+    public class BlockDesignerItem : DesignerItemBase
+    {
+        public BlockDesignerItem()
+        {
+        }
+
+        public BlockDesignerItem(BlockDesignerItemViewModel viewmodel) : base(viewmodel)
+        {
+            Containers = new List<BlockItemsContainerInfoItem>(viewmodel.Containers.Select(p => new BlockItemsContainerInfoItem(p)));
+            Flag = viewmodel.Flag;
+        }
+
+
+        [XmlArray]
+        public List<BlockItemsContainerInfoItem> Containers
+        {
+            get; set;
+        }
+
+        [XmlAttribute]
+        public string Flag
+        {
+            get; set;
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner/Models/Serializables/ConnectionItem.cs

@@ -45,7 +45,7 @@ namespace AIStudio.Wpf.DiagramDesigner
 
             this.RouterMode = viewmodel.RouterMode;
             this.PathMode = viewmodel.PathMode;
-            this.Vertices = viewmodel.Vertices.Select(p => new ConnectorVertexItem(p)).ToList();
+            this.Vertices = viewmodel.Vertices.Where(p => p.ConnectorVertexType == ConnectorVertexType.None).Select(p => new ConnectorVertexItem(p)).ToList();
             this.Labels = viewmodel.Labels.Select(p => new ConnectorLabelItem(p)).ToList();
         }
 

AIStudio.Wpf.DiagramDesigner/Models/Serializables/Container/BlockItemsContainerInfoItem.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
+
+namespace AIStudio.Wpf.DiagramDesigner
+{
+
+    [Serializable]
+    [XmlInclude(typeof(BlockItemsContainerInfoItem))]
+    public class BlockItemsContainerInfoItem : SelectableItemBase
+    {
+        public BlockItemsContainerInfoItem()
+        {
+        }
+
+        public BlockItemsContainerInfoItem(BlockItemsContainerInfo viewmodel) : base(viewmodel)
+        {
+            this.OnlyOneChild = viewmodel.OnlyOneChild;
+            this.ChildFlag = viewmodel.ChildFlag;
+            this.PhysicalItemWidth = viewmodel.PhysicalItemWidth;
+            this.PhysicalItemHeight = viewmodel.PhysicalItemHeight;
+            this.Parameter = new ConstParameterItem(viewmodel.Parameter);
+
+            Children = new List<BlockDesignerItem>(viewmodel.Children.Select(p => new BlockDesignerItem(p)));
+        }
+
+        public bool OnlyOneChild
+        {
+            get; set;
+        }
+
+        public List<string> ChildFlag
+        {
+            get; set;
+        }
+
+
+        [JsonProperty(PropertyName = "ItemWidth")]
+        [XmlAttribute("ItemWidth")]
+        public double PhysicalItemWidth
+        {
+            get; set;
+        }
+
+        [JsonProperty(PropertyName = "ItemHeight")]
+        [XmlAttribute("ItemHeight")]
+        public double PhysicalItemHeight
+        {
+            get; set;
+        }
+
+        [XmlElement]
+        public ConstParameterItem Parameter
+        {
+            get; set;
+        }
+
+        [XmlArray]
+        public List<BlockDesignerItem> Children
+        {
+            get; set;
+        }    
+    }
+}

AIStudio.Wpf.DiagramDesigner/Models/Serializables/Container/ConstParameterItem.cs

@@ -0,0 +1,31 @@
+using AIStudio.Wpf.DiagramDesigner;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+
+namespace AIStudio.Wpf.DiagramDesigner
+{
+    [XmlInclude(typeof(ConstParameterItem))]
+    public class ConstParameterItem
+    {
+        [XmlAttribute]
+        public string Text { get; set; }
+
+        [XmlAttribute]
+        public virtual string Value { get; set; }     
+
+        public ConstParameterItem()
+        {
+
+        }
+
+        public ConstParameterItem(ConstParameter viewmodel) 
+        {
+            Text = viewmodel?.Text;
+            Value = viewmodel?.Value?.ToString();
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner/Models/Serializables/DesignerItemBase.cs

@@ -29,6 +29,8 @@ namespace AIStudio.Wpf.DiagramDesigner
             this.ScaleY = viewmodel.ScaleY;
             this.PhysicalItemWidth = viewmodel.PhysicalItemWidth;
             this.PhysicalItemHeight = viewmodel.PhysicalItemHeight;
+            this.MinItemWidth = viewmodel.MinItemWidth;
+            this.MinItemHeight = viewmodel.MinItemHeight;
             this.Icon = viewmodel.Icon;
             this.ItemTypeName = viewmodel.GetType().FullName;
             this.Margin = viewmodel.Margin;
@@ -89,6 +91,19 @@ namespace AIStudio.Wpf.DiagramDesigner
             get; set;
         }
 
+        [XmlAttribute]
+        public double MinItemWidth
+        {
+            get; set;
+        }
+
+
+        [XmlAttribute]
+        public double MinItemHeight
+        {
+            get; set;
+        }
+
         [XmlAttribute]
         public string Icon
         {

AIStudio.Wpf.DiagramDesigner/Models/Serializables/DiagramItem.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows;
 using System.Windows.Media;
 using System.Xml;
@@ -17,20 +18,29 @@ namespace AIStudio.Wpf.DiagramDesigner
 
         }
 
-        public DiagramItem(IDiagramViewModel diagramView)
+        public DiagramItem(IDiagramViewModel diagramView, string ext = ".json")
         {
             Name = diagramView.Name;
             DiagramType = diagramView.DiagramType;
-            ShowGrid = diagramView.ShowGrid;
-            PhysicalGridCellSize = diagramView.PhysicalGridCellSize;
-            CellHorizontalAlignment = diagramView.CellHorizontalAlignment;
-            CellVerticalAlignment = diagramView.CellVerticalAlignment;
-            PageSizeOrientation = diagramView.PageSizeOrientation;
-            PhysicalPageSize = diagramView.PhysicalPageSize;
-            PageSizeType = diagramView.PageSizeType;
-            PhysicalGridMarginSize = diagramView.PhysicalGridMarginSize;
-            GridColor = diagramView.GridColor;
-            AllowDrop = diagramView.AllowDrop;
+            ShowGrid = diagramView.DiagramOption.LayoutOption.ShowGrid;
+            PhysicalGridCellSize = diagramView.DiagramOption.LayoutOption.PhysicalGridCellSize;
+            CellHorizontalAlignment = diagramView.DiagramOption.LayoutOption.CellHorizontalAlignment;
+            CellVerticalAlignment = diagramView.DiagramOption.LayoutOption.CellVerticalAlignment;
+            PageSizeOrientation = diagramView.DiagramOption.LayoutOption.PageSizeOrientation;
+            PhysicalPageSize = diagramView.DiagramOption.LayoutOption.PhysicalPageSize;
+            PageSizeType = diagramView.DiagramOption.LayoutOption.PageSizeType;
+            PhysicalGridMarginSize = diagramView.DiagramOption.LayoutOption.PhysicalGridMarginSize;
+            GridColor = diagramView.DiagramOption.LayoutOption.GridColor;
+            PageBackground = diagramView.DiagramOption.LayoutOption.PageBackground;
+            AllowDrop = diagramView.DiagramOption.LayoutOption.AllowDrop;
+
+            Thumbnail = diagramView.Thumbnail.ToBase64String();
+
+            var selectedDesignerItems = diagramView.Items.OfType<DesignerItemViewModelBase>();
+            var selectedConnections = diagramView.Items.OfType<ConnectionViewModel>();
+
+            DesignerItems = selectedDesignerItems.Select(p => p.ToSerializableItem(ext)).Where(p => p != null).ToList();
+            Connections = selectedConnections.Select(p => p.ToSerializableItem(ext)).Where(p => p != null).ToList();
         }
 
         [XmlAttribute]
@@ -155,6 +165,26 @@ namespace AIStudio.Wpf.DiagramDesigner
             }
         }
 
+        [XmlIgnore]
+        public Color PageBackground
+        {
+            get; set;
+        }
+
+        [JsonIgnore]
+        [XmlAttribute("PageBackground")]
+        public string XmlPageBackground
+        {
+            get
+            {
+                return SerializeHelper.SerializeColor(PageBackground);
+            }
+            set
+            {
+                PageBackground = SerializeHelper.DeserializeColor(value);
+            }
+        }
+
         [XmlAttribute]
         public bool AllowDrop
         {
@@ -167,6 +197,10 @@ namespace AIStudio.Wpf.DiagramDesigner
         [XmlArray]
         public List<SerializableItem> Connections { get; set; } = new List<SerializableItem>();
 
-
+        [XmlAttribute]
+        public string Thumbnail
+        {
+            get; set;
+        }
     }
 }

AIStudio.Wpf.DiagramDesigner/Models/Serializables/DrawingDesignerItemBase.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
+
+namespace AIStudio.Wpf.DiagramDesigner
+{
+    public class DrawingDesignerItemBase : DesignerItemBase
+    {
+        public DrawingDesignerItemBase()
+        {
+
+        }
+        public DrawingDesignerItemBase(DrawingDesignerItemViewModelBase item) : base(item)
+        {
+            this.Erasable = item.Erasable;
+            this.Geometry = item.Geometry.ToString();
+            if (item.Geometry.Transform != null)
+            {
+                this.Matrix = item.Geometry.Transform.Value.ToString();
+            }
+            this.Points = item.Points;
+            this.DrawMode = item.DrawMode;
+        }
+
+        [XmlAttribute]
+        public bool Erasable
+        {
+            get; set;
+        }
+
+        [XmlAttribute]
+        public string Geometry
+        {
+            get; set;
+        }
+
+        [XmlAttribute]
+        public string Matrix
+        {
+            get; set;
+        }
+        //[JsonIgnore]
+        //[XmlElement("Matrix")]
+        //public string XmlMatrix
+        //{
+        //    get
+        //    {
+        //        return SerializeHelper.SerializeMatrix(Matrix);
+        //    }
+        //    set
+        //    {
+        //        Matrix = SerializeHelper.DeserializeMatrix(value);
+        //    }
+        //}
+
+        [XmlIgnore]
+        public List<Point> Points
+        {
+            get; set;
+        }
+
+        [JsonIgnore]
+        [XmlElement("Points")]
+        public string XmlPoints
+        {
+            get
+            {
+                return SerializeHelper.SerializePointList(Points);
+            }
+            set
+            {
+                Points = SerializeHelper.DeserializePointList(value);
+            }
+        }
+
+        [XmlAttribute]
+        public DrawMode DrawMode
+        {
+            get; set;
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner/Models/Serializables/ImageDesignerItem.cs

@@ -19,9 +19,5 @@ namespace AIStudio.Wpf.DiagramDesigner
                 Connectors.Add(connector);
             }
         }
-
-        [XmlArray]
-        public List<FullyCreatedConnectorInfoItem> Connectors { get; set; }
-
     }
 }

AIStudio.Wpf.DiagramDesigner/Models/Serializables/SelectableItemBase.cs

@@ -12,6 +12,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 using System.Xml;
 using System.Xml.Serialization;
 
@@ -25,6 +26,7 @@ namespace AIStudio.Wpf.DiagramDesigner
             ColorItem = new ColorItem() { LineColor = new ColorObjectItem(), FillColor = new ColorObjectItem() };
             FontItem = new FontItem();
             SharpItem = new SharpItem() { SourceMarker = new SharpPathItem(), SinkMarker = new SharpPathItem() };
+            AnimationItem = new AnimationItem() { AnimationPath = new SharpPathItem() };
         }
 
         public SelectableItemBase(SelectableViewModelBase viewmodel)
@@ -634,6 +636,34 @@ namespace AIStudio.Wpf.DiagramDesigner
             return value;
         }
 
+        public static string SerializeMatrix(Matrix matrix)
+        {
+            return string.Format("{0},{1},{2},{3},{4},{5}", matrix.M11, matrix.M12, matrix.M21, matrix.M22, matrix.OffsetX, matrix.OffsetY); ;
+        }
+
+        public static Matrix DeserializeMatrix(string matrix)
+        {
+            string[] pieces = matrix.Split(new char[] { ',' });
+            return new Matrix(double.Parse(pieces[0]), double.Parse(pieces[1]), double.Parse(pieces[2]), double.Parse(pieces[3]), double.Parse(pieces[4]), double.Parse(pieces[5]));
+        }
+
+        public static string SerializeBitmapImage(BitmapImage bitmapImage)
+        {
+            return bitmapImage.ToBase64String();
+        }
+
+        public static BitmapImage DeserializeBitmapImage(string bitmapImagestring)
+        {
+            try
+            {
+                return bitmapImagestring.ToBitmapImage();
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
         public static string SerializeObject(object obj, string serializableType = null)
         {
             if (serializableType?.ToLower() == ".xml")
@@ -865,7 +895,10 @@ namespace AIStudio.Wpf.DiagramDesigner
             get; set;
         }
 
-      
+        public Brush ToBrush()
+        {
+            throw new NotImplementedException();
+        }
     }
 
     public class SharpPathItem : ISharpPath

AIStudio.Wpf.DiagramDesigner/Models/ToolBoxData.cs

@@ -1,14 +1,15 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Windows;
 
 namespace AIStudio.Wpf.DiagramDesigner
 {
-    public class ToolBoxData
+    public class ToolBoxData : BindableBase
     {
-        public string Text
+        public virtual string Text
         {
             get; protected set;
         }
@@ -36,6 +37,10 @@ namespace AIStudio.Wpf.DiagramDesigner
         {
             get; set;
         }
+        public Size? DesiredMinSize
+        {
+            get; set;
+        }
         public string Description
         {
             get; set;
@@ -46,7 +51,7 @@ namespace AIStudio.Wpf.DiagramDesigner
             get; set;
         }
 
-        public ToolBoxData(string text, string icon, Type type, double width, double height, Size? desiredSize = null, string description = null)
+        public ToolBoxData(string text, string icon, Type type, double width, double height, Size? desiredSize = null, Size? desiredMinSize = null, string description = null)
         {
             this.Text = text;
             this.Icon = icon;
@@ -54,8 +59,56 @@ namespace AIStudio.Wpf.DiagramDesigner
             this.Width = width;
             this.Height = height;
             this.DesiredSize = desiredSize;
+            this.DesiredMinSize = desiredMinSize;
             this.ColorViewModel = new ColorViewModel();
             this.Description = description;
         }
     }
+
+    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);
+            }
+        }
+    }
 }

AIStudio.Wpf.DiagramDesigner/Models/Values/ConstParameter.cs

@@ -0,0 +1,85 @@
+using System;
+
+namespace AIStudio.Wpf.DiagramDesigner
+{
+    public class ConstParameter : BindableBase, IParameter
+    {
+        public ConstParameter()
+        {
+        }
+
+        public ConstParameter(ConstParameterItem item) 
+        {
+            Text = item.Text;
+            Value = item.Value?.ToString();
+        }
+
+        private string _text;
+
+        public string Text
+        {
+            get
+            {
+                return _text;
+            }
+            set
+            {
+                SetProperty(ref _text, value);
+            }
+        }
+
+        private object _value;
+
+        public object Value
+        {
+            get
+            {
+                return _value;
+            }
+            set
+            {
+                SetProperty(ref _value, value);
+            }
+        }
+
+
+
+        public void Add(object value)
+        {
+            if (double.TryParse(Value?.ToString() ?? "", out var value1) && double.TryParse(value?.ToString() ?? "", out var value2))
+            {
+                Value = value1 + value2;
+            }
+            else
+            {
+                Value = $"{Value}{value}";
+            }
+        }
+
+        public T GetValue<T>()
+        {
+            T var1 = default(T);
+
+            if (Value is T double1)
+            {
+                var1 = double1;
+            }
+            else
+            {
+                try
+                {
+                    var1 = (T)Convert.ChangeType(Value?.ToString(), typeof(T));
+                }
+                catch { }
+            }
+
+            return var1;
+
+        }
+
+        public override string ToString()
+        {
+            return $"{Text}:{Value}";
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner/Models/Values/IGroup.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AIStudio.Wpf.DiagramDesigner
+{
+    public interface IGroup
+    {
+        string Text
+        {
+            get;
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner/Models/Values/IParameter.cs

@@ -0,0 +1,18 @@
+namespace AIStudio.Wpf.DiagramDesigner
+{
+    public interface IParameter
+    {
+        string Text
+        {
+            get; set;
+        }
+
+        object Value
+        {
+            get; set;
+        }
+
+        void Add(object value);
+
+    }
+}

AIStudio.Wpf.DiagramDesigner/PathGenerators/PathGenerators.Boundary.cs

@@ -33,12 +33,12 @@ namespace AIStudio.Wpf.DiagramDesigner
         private static PointBase[] GetRouteWithMiddlePoints(IDiagramViewModel _, ConnectionViewModel link, PointBase[] route)
         {
             var middle = GetMiddlePoints(
-                link.SourceConnectorInfoFully.MiddlePosition,
-                link.SourceConnectorInfoFully.Orientation,
+                link.SourceConnectorInfo.MiddlePosition,
+                link.SourceConnectorInfo.Orientation,
                 link.SinkConnectorInfo.MiddlePosition,
                 link.IsFullConnection ? link.SinkConnectorInfoFully.Orientation : (link.SinkConnectorInfo.MiddlePosition.Y >= link.SourceConnectorInfo.MiddlePosition.Y ? ConnectorOrientation.Top : ConnectorOrientation.Bottom),
-                _.GridCellSize,
-                _.GridMarginSize);
+                _.DiagramOption.LayoutOption.GridCellSize,
+                _.DiagramOption.LayoutOption.GridMarginSize);
 
             middle.Insert(0, route[0]);
             middle.Add(route[1]);

AIStudio.Wpf.DiagramDesigner/Services/ApplicationServicesProvider.cs

@@ -7,7 +7,10 @@ namespace AIStudio.Wpf.DiagramDesigner.Services
     /// </summary>
     public interface IServiceProvider
     {
-        IUIVisualizerService VisualizerService { get; }
+        IUIVisualizerService VisualizerService 
+        {
+            get; set;
+        }
         IMessageBoxService MessageBoxService { get; }
         //IDatabaseAccessService DatabaseAccessService { get; }
     }
@@ -25,6 +28,10 @@ namespace AIStudio.Wpf.DiagramDesigner.Services
         public IUIVisualizerService VisualizerService
         {
             get { return visualizerService; }
+            set
+            {
+                visualizerService = value;
+            }
         }
 
         public IMessageBoxService MessageBoxService

AIStudio.Wpf.DiagramDesigner/Services/IUIVisualizerService.cs

@@ -17,7 +17,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Services
         /// </summary>
         /// <param name="dataContextForPopup">Object state to associate with the dialog</param>
         /// <returns>True/False if UI is displayed.</returns>
-        bool? ShowDialog(object dataContextForPopup);
+        bool? ShowDialog(object dataContextForPopup, bool buttonVisable = true);
 
         /// <summary>
         /// This method displays a modal dialog associated with the given key.

AIStudio.Wpf.DiagramDesigner/Services/WPFUIVisualizerService.cs

@@ -12,7 +12,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Services
         /// </summary>
         /// <param name="dataContextForPopup">Object state to associate with the dialog</param>
         /// <returns>True/False if UI is displayed.</returns>
-        public bool? ShowDialog(object dataContextForPopup)
+        public bool? ShowDialog(object dataContextForPopup, bool buttonVisable = true)
         {
             Window win = new PopupWindow();
             win.DataContext = dataContextForPopup;