From 83b846f15f30c2cdea098fb73933edc8ffec2030 Mon Sep 17 00:00:00 2001
From: GG Z <903524121@qq.com>
Date: Sun, 22 Dec 2024 10:26:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E9=A1=B9=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RvAddinTest/CADCurveToModelCurveCmd.cs        |  107 ++
 RvAddinTest/CorrectSlope.cs                   |   33 +-
 RvAddinTest/CreateWindow.xaml                 |   25 +
 RvAddinTest/CreateWindow.xaml.cs              |   72 +
 RvAddinTest/DeleteCmd.cs                      |  105 ++
 RvAddinTest/FluentAddin.cs                    |  120 +-
 RvAddinTest/GASInstancesCreator.cs            |    9 +-
 RvAddinTest/ModifySystemTypeCmd.cs            |  233 +++
 RvAddinTest/RemoveParamCmd.cs                 |  180 +++
 RvAddinTest/RvAddinTest.csproj                |    1 +
 RvAddinTest/SeparateModel.cs                  |   20 +
 RvAddinTest/SeparateModelWin.xaml             |   31 +
 RvAddinTest/SeparateModelWin.xaml.cs          |  105 ++
 .../{RotateDimension.cs => SetDimensions.cs}  |   23 +-
 RvAddinTest/TempCmd.cs                        |  161 +-
 .../ModelManager/ModelCheckViewModel.cs       |    4 +-
 Sai.RvKits/RvCivil/CreateOpeningsViewModel.cs |    2 +-
 Sai.RvKits/RvCivil/WallFinishesViewModel.cs   |    4 +-
 Sai.RvKits/RvCommon/AlignModelElement.cs      |   12 +-
 Sai.RvKits/RvCommon/CustomLeader.cs           |   28 -
 Sai.RvKits/RvCommon/PureModelCmd.cs           |   18 +-
 Sai.RvKits/RvCommon/QuickSelectionCmd.cs      |   21 +
 Sai.RvKits/RvCommon/QuickSelectionView.xaml   |   15 +
 .../RvCommon/QuickSelectionView.xaml.cs       |   25 +
 Sai.RvKits/RvMEP/AnyConnectViewModel.cs       | 1294 ++++++++---------
 Sai.RvKits/RvMEP/ArrangeMEPCurveViewModel.cs  |   24 +-
 Sai.RvKits/RvMEP/BloomConnectorCmd.cs         |  205 ++-
 Sai.RvKits/RvMEP/BreakMEPCurveCmd.cs          |    6 +-
 Sai.RvKits/RvMEP/CableLayoutCmd.cs            |    6 +-
 Sai.RvKits/RvMEP/ClashResolveCmd.cs           |   16 +-
 Sai.RvKits/RvMEP/ClashResolveView.xaml        |   10 +-
 Sai.RvKits/RvMEP/ClashResolveViewModel.cs     |  602 ++++----
 Sai.RvKits/RvMEP/CorrectMEPCurveSlopeCmd.cs   |    2 +-
 Sai.RvKits/RvMEP/HeadroomCheckCmd.cs          |    2 +-
 Sai.RvKits/RvMEP/InsulationItem.cs            |   13 +-
 Sai.RvKits/RvMEP/MoveConnectCmd.cs            |   34 +-
 Sai.RvKits/RvMEP/MoveMEPCurveViewModel.cs     |    2 +-
 Sai.RvKits/RvMEP/StandMepCurveViewModel.cs    |    2 +-
 Sai.RvKits/RvMEP/SystemModel.cs               |   75 +-
 .../RvView/QuickViewSectionViewModel.cs       |  117 +-
 Sai.RvKits/RvView/SectionBoxControllerCmd.cs  |   31 +-
 .../RvView/SectionBoxControllerViewModel.cs   |   36 +-
 Sai.RvKits/RvView/SwitchBackgroundCmd.cs      |    6 +-
 Sai.RvKits/RvView/ViewManagerViewModel.cs     |    2 +-
 Sai.RvKits/Sai.RvKits.csproj                  |   15 +-
 Sai.RvKits/UIRibbon/FamilyApp.cs              |  376 ++---
 Sai.RvKits/UIRibbon/ModifyTabApp.cs           |   74 +-
 Sai.RvKits/UIRibbon/RvApp.cs                  |   33 +-
 .../Extensions/DataTableExtensions.cs         |  244 ++--
 .../Extensions/ImageExtensions.cs             |   25 +-
 Sai.Toolkit.Core/Heplers/ConfigHelpers.cs     |    6 +-
 Sai.Toolkit.Core/Heplers/EnumHelpers.cs       |  176 +--
 Sai.Toolkit.Core/Heplers/WinDialogHelper.cs   |   29 +-
 Sai.Toolkit.Revit/Assist/CollectorAssist.cs   |   75 +-
 Sai.Toolkit.Revit/Assist/ConnectorAssist.cs   |   65 +-
 Sai.Toolkit.Revit/Assist/MEPAssist.cs         |   19 +-
 Sai.Toolkit.Revit/Assist/SpatialAssist.cs     |    4 +-
 Sai.Toolkit.Revit/Helpers/KeyIntPtrHelper.cs  |    6 +-
 Sai.Toolkit.Revit/Helpers/ParameterAssist.cs  | 1176 +++++++++++++++
 .../Helpers/SharedParamsAssist.cs             | 1011 -------------
 Sai.Toolkit.Revit/Sai.Toolkit.Revit.projitems |    2 +-
 Wpf.Ui.Extend/Controls/ColorFormatUtils.cs    |  280 ++++
 .../Controls/ColorPickerControl.xaml          |  406 ++++++
 .../Controls/ColorPickerControl.xaml.cs       |  406 ++++++
 Wpf.Ui.Extend/Controls/HSVColor.cs            |   83 ++
 WpfApp/MainWindow.xaml                        |    1 +
 66 files changed, 5424 insertions(+), 2927 deletions(-)
 create mode 100644 RvAddinTest/CADCurveToModelCurveCmd.cs
 create mode 100644 RvAddinTest/CreateWindow.xaml
 create mode 100644 RvAddinTest/CreateWindow.xaml.cs
 create mode 100644 RvAddinTest/DeleteCmd.cs
 create mode 100644 RvAddinTest/ModifySystemTypeCmd.cs
 create mode 100644 RvAddinTest/RemoveParamCmd.cs
 create mode 100644 RvAddinTest/SeparateModel.cs
 create mode 100644 RvAddinTest/SeparateModelWin.xaml
 create mode 100644 RvAddinTest/SeparateModelWin.xaml.cs
 rename RvAddinTest/{RotateDimension.cs => SetDimensions.cs} (86%)
 delete mode 100644 Sai.RvKits/RvCommon/CustomLeader.cs
 create mode 100644 Sai.RvKits/RvCommon/QuickSelectionCmd.cs
 create mode 100644 Sai.RvKits/RvCommon/QuickSelectionView.xaml
 create mode 100644 Sai.RvKits/RvCommon/QuickSelectionView.xaml.cs
 create mode 100644 Sai.Toolkit.Revit/Helpers/ParameterAssist.cs
 delete mode 100644 Sai.Toolkit.Revit/Helpers/SharedParamsAssist.cs
 create mode 100644 Wpf.Ui.Extend/Controls/ColorFormatUtils.cs
 create mode 100644 Wpf.Ui.Extend/Controls/ColorPickerControl.xaml
 create mode 100644 Wpf.Ui.Extend/Controls/ColorPickerControl.xaml.cs
 create mode 100644 Wpf.Ui.Extend/Controls/HSVColor.cs

diff --git a/RvAddinTest/CADCurveToModelCurveCmd.cs b/RvAddinTest/CADCurveToModelCurveCmd.cs
new file mode 100644
index 0000000..4d694f0
--- /dev/null
+++ b/RvAddinTest/CADCurveToModelCurveCmd.cs
@@ -0,0 +1,107 @@
+using System;
+
+using Autodesk.Revit.Attributes;
+using Autodesk.Revit.DB;
+using Autodesk.Revit.UI;
+using Autodesk.Revit.UI.Selection;
+
+using Sai.Toolkit.Revit.Assist;
+
+namespace RvAddinTest;
+[Transaction(TransactionMode.Manual)]
+[Regeneration(RegenerationOption.Manual)]
+public class CADCurveToModelCurveCmd : IExternalCommand
+{
+    public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
+    {
+        //程序UI界面
+        UIApplication uiapp = commandData.Application;
+        //获取元素（选择） 显示元素 视图（活动视图）管理（对象）
+        UIDocument uidoc = uiapp.ActiveUIDocument;
+        //程序
+        Autodesk.Revit.ApplicationServices.Application app = uiapp.Application;
+        //获取位置和场地 视图（多个视图）管理 获取元素（Revit 项目里的全部元素）
+        Document doc = uidoc.Document;
+        //获取所有打开文档
+        DocumentSet docset = uiapp.Application.Documents;
+        //当前视图
+        View view = doc.ActiveView;
+
+        #region SelectExecute
+
+        using (Transaction trans = new Transaction(doc, "default"))
+        {
+            try
+            {
+                Reference refer = uidoc.Selection.PickObject(ObjectType.Element, "请选择CAD");
+                Element e = uidoc.Document.GetElement(refer);
+                if (e is ImportInstance ins)
+                {
+                    trans.Start();
+                    var cadGeo = e.GetGeometryObjects().FirstOrDefault();
+                    List<GeometryObject> curves = [];
+                    if (cadGeo is GeometryInstance geometryInstance)
+                    {
+                        curves = [.. geometryInstance.GetInstanceGeometry()];
+                    }
+                    foreach (var c in curves)
+                    {
+
+                        if (c is NurbSpline nurb)
+                        {
+                            if (nurb.Length > 100 / 304.8)
+                            {
+                                var points = nurb.Tessellate();
+                                ReferencePointArray array = new ReferencePointArray();
+                                foreach (var p in points)
+                                {
+                                    var rp = doc.FamilyCreate.NewReferencePoint(p);
+                                    array.Append(rp);
+                                }
+                                var curveBypoints = doc.FamilyCreate.NewCurveByPoints(array);
+                            }
+                        }
+                        if (c is PolyLine poly)
+                        {
+                            ReferencePointArray array = new ReferencePointArray();
+
+                            for (int i = 0; i < poly.NumberOfCoordinates - 1; i++)
+                            {
+                                var p = poly.GetCoordinate(i);
+                                //Line.CreateBound(p, poly.GetCoordinate(i + 1));
+                            }
+                        }
+                        if (c is Line l)
+                        {
+
+                        }
+                    }
+                    trans.Commit();
+                }
+
+            }
+            catch (Autodesk.Revit.Exceptions.OperationCanceledException ex)
+            {
+                if (trans.GetStatus() == TransactionStatus.Started)
+                {
+                    trans.Commit();
+                }
+
+                return Result.Succeeded;
+            }
+            catch (Exception ex)
+            {
+                message = ex.Message;
+                if (trans.GetStatus() == TransactionStatus.Started)
+                {
+                    trans.RollBack();
+                }
+                return Result.Failed;
+            }
+        }
+
+        #endregion SelectExecute
+
+        return Result.Succeeded;
+    }
+}
\ No newline at end of file
diff --git a/RvAddinTest/CorrectSlope.cs b/RvAddinTest/CorrectSlope.cs
index 3e3c8f3..5e08b5e 100644
--- a/RvAddinTest/CorrectSlope.cs
+++ b/RvAddinTest/CorrectSlope.cs
@@ -28,23 +28,22 @@ internal class CorrectSlope : ExternalCommand
                     var elem = Document.GetElement(id);
                     if (elem is MEPCurve mep)
                     {
-                        var loc = mep.GetLocCurve() as Line;
-                        var x = loc.Direction.X;
-                        var y = loc.Direction.Y;
-                        var z = loc.Direction.Z;
-                        if (Math.Abs(loc.Direction.X) > 0 && Math.Abs(loc.Direction.X) < 10E-5)
-                        {
-                            x = 0;
-                        }
-                        if (Math.Abs(loc.Direction.Y) > 0 && Math.Abs(loc.Direction.Y) < 10E-5)
-                        {
-                            y = 0;
-                        }
-                        if (Math.Abs(loc.Direction.Z) > 0 && Math.Abs(loc.Direction.Z) < 10E-5)
-                        {
-                            z = 0;
-                        }
-
+                        var loc = mep.GetCurve() as Line;
+                        var x = Math.Round(loc.Direction.X);
+                        var y = Math.Round(loc.Direction.Y);
+                        var z = Math.Round(loc.Direction.Z);
+                        //if (Math.Abs(x) < 10E-5)
+                        //{
+                        //    x = 0;
+                        //}
+                        //if (Math.Abs(y) < 10E-5)
+                        //{
+                        //    y = 0;
+                        //}
+                        //if (Math.Abs(z) < 10E-5)
+                        //{
+                        //    z = 0;
+                        //}
                         var dir = new XYZ(x, y, z);
                         var endPoint = loc.Origin + dir * loc.Length;
                         var li = Line.CreateBound(loc.Origin, endPoint);
diff --git a/RvAddinTest/CreateWindow.xaml b/RvAddinTest/CreateWindow.xaml
new file mode 100644
index 0000000..1f91a00
--- /dev/null
+++ b/RvAddinTest/CreateWindow.xaml
@@ -0,0 +1,25 @@
+<Window
+    x:Class="RvAddinTest.CreateWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:RvAddinTest"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    xmlns:ws="https://schemas.elecho.dev/wpfsuite"
+    Width="250"
+    SizeToContent="Height"
+    Topmost="True"
+    mc:Ignorable="d">
+    <Grid>
+        <ws:StackPanel Margin="5" Spacing="5">
+            <Button Click="Button_Click" Content="铜球阀" />
+            <Button Click="Button_Click" Content="自闭阀" />
+            <Button Click="Button_Click" Content="旋塞阀" />
+            <Button Click="Button_Click" Content="丝堵" />
+            <Button Click="Button_Click" Content="盲板" />
+            <Button Click="Button_Click" Content="放散管" />
+            <Button Click="Button_Click" Content="商业" />
+        </ws:StackPanel>
+    </Grid>
+</Window>
diff --git a/RvAddinTest/CreateWindow.xaml.cs b/RvAddinTest/CreateWindow.xaml.cs
new file mode 100644
index 0000000..9eaed9b
--- /dev/null
+++ b/RvAddinTest/CreateWindow.xaml.cs
@@ -0,0 +1,72 @@
+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.Shapes;
+
+using Autodesk.Revit.DB;
+using Autodesk.Revit.UI;
+
+using Nice3point.Revit.Toolkit.External.Handlers;
+
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+
+namespace RvAddinTest;
+/// <summary>
+/// CreateWindow.xaml 的交互逻辑
+/// </summary>
+public partial class CreateWindow
+{
+    private readonly ActionEventHandler handler = new ActionEventHandler();
+
+    public CreateWindow()
+    {
+        InitializeComponent();
+    }
+
+    private void Button_Click(object sender, RoutedEventArgs e)
+    {
+        var button = sender as Button;
+        handler.Raise(uiapp =>
+        {
+            //uiapp.Application.DocumentChanged += Application_DocumentChanged;
+            try
+            {
+                var doc = uiapp.ActiveUIDocument.Document;
+                var family = new FilteredElementCollector(doc).OfClass(typeof(Family))
+    .FirstOrDefault(pt => pt.Name.Contains(button.Content.ToString())) as Family;
+                var fs = doc.GetElement(family.GetFamilySymbolIds().FirstOrDefault()) as FamilySymbol;
+                if (fs != null && uiapp.ActiveUIDocument.CanPlaceElementType(fs))
+                {
+                    uiapp.ActiveUIDocument.PromptForFamilyInstancePlacement(fs);
+                }
+            }
+            catch (Autodesk.Revit.Exceptions.OperationCanceledException)
+            {
+            }
+            //uiapp.Application.DocumentChanged -= Application_DocumentChanged;
+        });
+    }
+
+    private void Application_DocumentChanged(object sender, Autodesk.Revit.DB.Events.DocumentChangedEventArgs e)
+    {
+        if (e.GetAddedElementIds().Count == 1)
+        {
+            var id = e.GetAddedElementIds().FirstOrDefault();
+            var elem = e.GetDocument().GetElement(id);
+            if (elem is FamilyInstance ins && ins.Symbol.FamilyName.Contains("铜球阀"))
+            {
+
+            }
+        }
+
+    }
+}
diff --git a/RvAddinTest/DeleteCmd.cs b/RvAddinTest/DeleteCmd.cs
new file mode 100644
index 0000000..01dae11
--- /dev/null
+++ b/RvAddinTest/DeleteCmd.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Reflection;
+using System.Windows;
+
+using Autodesk.Revit.Attributes;
+using Autodesk.Revit.DB;
+using Autodesk.Revit.DB.Plumbing;
+using Autodesk.Revit.UI;
+using Autodesk.Revit.UI.Selection;
+
+using Sai.Toolkit.Revit.Assist;
+
+namespace RvAddinTest;
+[Transaction(TransactionMode.Manual)]
+[Regeneration(RegenerationOption.Manual)]
+public class DeleteCmd : IExternalCommand
+{
+    public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
+    {
+        //程序UI界面
+        var uiapp = commandData.Application;
+        //获取元素（选择） 显示元素 视图（活动视图）管理（对象）
+        var uidoc = uiapp.ActiveUIDocument;
+        //程序
+        var app = uiapp.Application;
+        //获取位置和场地 视图（多个视图）管理 获取元素（Revit 项目里的全部元素）
+        var doc = uidoc.Document;
+        //获取所有打开文档
+        var docset = uiapp.Application.Documents;
+        //当前视图
+        var view = doc.ActiveView;
+
+        #region FilterExecute
+        //if (doc.IsFamilyDocument)
+        //{
+        //    var manager = doc.FamilyManager;
+        //    using (var trans = new Transaction(doc, "default"))
+        //    {
+        //        try
+        //        {
+        //            trans.Start();
+        //            var param = manager.AddParameter(
+        //                 "测试",
+        //                 BuiltInParameterGroup.PG_ADSK_MODEL_PROPERTIES,
+        //                 ParameterType.Number,
+        //                 true);
+        //            trans.Commit();
+        //        }
+        //        catch (Exception ex)
+        //        {
+        //            throw ex;
+        //        }
+        //    }
+        //}
+        var docType = doc.GetType();
+        var method = docType.GetMethod("GetUnusedFamilies", BindingFlags.NonPublic | BindingFlags.Instance);
+        if (method != null)
+        {
+            var unusedFamilyIds = method.Invoke(doc, null) as ISet<ElementId>;
+            using (var trans = new Transaction(doc, nameof(DeleteCmd)))
+            {
+                trans.Start();
+                //foreach (var id in unusedFamilyIds)
+                //{
+                //    doc.Delete(id);
+                //}
+                MessageBox.Show(unusedFamilyIds.Count.ToString());
+                trans.Commit();
+            }
+        }
+        //var instances = new FilteredElementCollector(doc).OfClass(typeof(Pipe)).ToElements();
+        //using (Transaction trans = new Transaction(doc, "default"))
+        //{
+        //    try
+        //    {
+        //        trans.Start();
+        //        var ids = new List<ElementId>();
+        //        foreach (Pipe pipe in instances)
+        //        {
+        //            if (Math.Abs(pipe.Diameter - 32 / 304.8) < 10E-5)
+        //            {
+        //                ids.Add(pipe.Id);
+        //            }
+        //        }
+        //        //doc.Delete(ids);
+        //        uidoc.Selection.SetElementIds(ids);
+        //        //Do Something.
+        //        trans.Commit();
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        message = ex.Message;
+        //        if (trans.GetStatus() == TransactionStatus.Started)
+        //        {
+        //            trans.RollBack();
+        //        }
+        //        return Result.Failed;
+        //    }
+        //}
+
+        #endregion FilterExecute
+
+        return Result.Succeeded;
+    }
+}
\ No newline at end of file
diff --git a/RvAddinTest/FluentAddin.cs b/RvAddinTest/FluentAddin.cs
index da7e1cb..6fc70b7 100644
--- a/RvAddinTest/FluentAddin.cs
+++ b/RvAddinTest/FluentAddin.cs
@@ -3,18 +3,24 @@ using System.Diagnostics;
 using System.IO;
 using System.Management.Instrumentation;
 using System.Text;
+using System.Windows;
 
 using Autodesk.Revit.Attributes;
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Mechanical;
+using Autodesk.Revit.DB.Plumbing;
 using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Selection;
 
+using eTransmitForRevitDB;
+
 using Microsoft.Win32;
 
 using Nice3point.Revit.Toolkit.External;
 using Nice3point.Revit.Toolkit.Utils;
 
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+
 using Sai.Toolkit.Revit.Assist;
 using Sai.Toolkit.Revit.Helpers;
 
@@ -24,8 +30,86 @@ namespace RvAddinTest;
 [Regeneration(RegenerationOption.Manual)]
 internal class FluentAddin : ExternalCommand
 {
+    public static bool Purge(Document doc)
+    {
+        var eTransmitUpgradeOMatic = new eTransmitUpgradeOMatic(doc.Application);
+
+        var result = eTransmitUpgradeOMatic.purgeUnused(doc);
+
+        return result == UpgradeFailureType.UpgradeSucceeded;
+    }
     public override void Execute()
     {
+        //var elemIds = Document.OfAllModelElements().Select(e=>e.Id).ToList();
+        //UiDocument.Selection.SetElementIds(elemIds);
+        var refer=UiDocument.Selection.PickObject(ObjectType.Element);
+        var elem=Document.GetElement(refer);
+        var conn=elem.GetConnectors().Cast<Connector>().Where(c=>c.IsConnected).FirstOrDefault();
+        var connto = conn.GetConnectedConnector();
+        Debug.WriteLine("管线：");
+        Debug.WriteLine(conn.CoordinateSystem.BasisX);
+        Debug.WriteLine(conn.CoordinateSystem.BasisY);
+        Debug.WriteLine(conn.CoordinateSystem.BasisZ);
+        Debug.WriteLine("管件：");
+        Debug.WriteLine(connto.CoordinateSystem.BasisX);
+        Debug.WriteLine(connto.CoordinateSystem.BasisY);
+        Debug.WriteLine(connto.CoordinateSystem.BasisZ);
+        //StringBuilder sb = new StringBuilder();
+        //var n = 1;
+        //foreach (var item in elems)
+        //{
+        //    sb.Append(n +":"+ item.Name + item.Id.ToString()+"new");
+        //    n++;
+        //}
+        //MessageBox.Show(sb.ToString());
+        //StringBuilder sb = new();
+        //var regions = Document.OfCollector().OfCategory(BuiltInCategory.OST_DetailComponents).WhereElementIsNotElementType().ToList();
+        //sb.AppendLine(regions.Count.ToString());
+        //regions.ToList().ForEach(f => sb.AppendLine($"{f.Id}"));
+        //MessageBox.Show(sb.ToString());
+
+        //UiDocument.Selection.SetElementIds(elements);
+        #region MyRegion
+        //OpenFileDialog openFileDialog = new OpenFileDialog() { Multiselect = true, Filter = "Revit文件|*.rvt" };
+        //if (openFileDialog.ShowDialog() == false)
+        //{
+        //    return;
+        //};
+
+        //foreach (var file in openFileDialog.FileNames)
+        //{
+        //    var doc = UiApplication.Application.OpenDocumentFile(file);
+        //    var options = new SaveAsOptions()
+        //    {
+        //        Compact = true,
+        //        OverwriteExistingFile = true,
+        //        MaximumBackups = 3,
+        //    };
+        //    try
+        //    {
+        //        var ids = doc.OfCollector().OfCategory(BuiltInCategory.OST_Lines).Select(e => e.Id).ToList();
+        //        doc.Modify(set => set.Transaction)
+        //            .Commit(
+        //                (doc, t) =>
+        //                {
+        //                    doc.Delete(ids);
+        //                });
+        //        for (var i = 0; i < 5; i++)
+        //        {
+        //            Purge(doc);
+        //        }
+        //        //doc.SaveAs(file, options);
+        //        doc.Close(true);
+        //    }
+        //    catch (Exception)
+        //    {
+        //        doc.Close();
+        //    }
+
+        //}
+        //MessageBox.Show("处理完成"); 
+        #endregion
+
         //var b = Document.ActiveView.ViewTemplateId == null;
         //MessageExtensions.ShowMessage(b.ToString());
         //var h = Document.ActiveView
@@ -38,23 +122,25 @@ internal class FluentAddin : ExternalCommand
         //	)
         //	.Max(d => d.Height);
         //Document.Invoke
-        OpenFileDialog dialog = new() { Filter = "Revit(*.rvt)|*.rvt", Multiselect = true };
-        dialog.ShowDialog();
-        foreach (var item in dialog.FileNames)
-        {
-            var sb = new StringBuilder();
-            sb.AppendLine($"元素ID,族名称,类型名称,标记,");
-            var doc = Application.OpenDocumentFile(item);
-            var instances = doc.OfCollector().OfClass(typeof(FamilyInstance)).Cast<FamilyInstance>().Where(e => e.Symbol.FamilyName.Contains("摄像头"));
-            foreach (var instance in instances)
-            {
-                var number = instance.get_Parameter(BuiltInParameter.DOOR_NUMBER);
-                sb.AppendLine($"{instance.Id},{instance.Symbol.FamilyName},{instance.Name},{number.AsString()},");
-            }
-            var filePath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + $"\\{doc.Title}.txt";
-            File.WriteAllText(filePath, sb.ToString(), Encoding.UTF8);
-            doc.Close(false);
-        }
+        #region RegionName
+        //OpenFileDialog dialog = new() { Filter = "Revit(*.rvt)|*.rvt", Multiselect = true };
+        //dialog.ShowDialog();
+        //foreach (var item in dialog.FileNames)
+        //{
+        //    var sb = new StringBuilder();
+        //    sb.AppendLine($"元素ID,族名称,类型名称,标记,");
+        //    var doc = Application.OpenDocumentFile(item);
+        //    var instances = doc.OfCollector().OfClass(typeof(FamilyInstance)).Cast<FamilyInstance>().Where(e => e.Symbol.FamilyName.Contains("摄像头"));
+        //    foreach (var instance in instances)
+        //    {
+        //        var number = instance.get_Parameter(BuiltInParameter.DOOR_NUMBER);
+        //        sb.AppendLine($"{instance.Id},{instance.Symbol.FamilyName},{instance.Name},{number.AsString()},");
+        //    }
+        //    var filePath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + $"\\{doc.Title}.txt";
+        //    File.WriteAllText(filePath, sb.ToString(), Encoding.UTF8);
+        //    doc.Close(false);
+        //}
+        #endregion
         //Document.Modify(set => set.Transaction)
         //    .Commit(
         //        (doc, t) =>
diff --git a/RvAddinTest/GASInstancesCreator.cs b/RvAddinTest/GASInstancesCreator.cs
index 326f7f1..fd5d1f6 100644
--- a/RvAddinTest/GASInstancesCreator.cs
+++ b/RvAddinTest/GASInstancesCreator.cs
@@ -50,7 +50,7 @@ namespace RvAddinTest
             //Pipe p;
             //foreach (var pipe in pipes)
             //{
-            //    var line = pipe.GetLocCurve() as Line;
+            //    var line = pipe.GetCurve() as Line;
             //    var lineOrigin = line.Origin.Flatten();
             //    var temp = double.MaxValue;
             //    if (line.Direction == XYZ.BasisZ)
@@ -63,11 +63,16 @@ namespace RvAddinTest
             //    }
             //}
             //var conns = elem.MEPModel.ConnectorManager.UnusedConnectors.OfType<Connector>().FirstOrDefault();
+
+        }
+
+        private void GASCreator()
+        {
             var dialog = new OpenFileDialog
             {
                 Filter = "dwg文件(*.dwg)|*.dwg"
             };
-            if (dialog.ShowDialog()==true)
+            if (dialog.ShowDialog() == true)
             {
                 var file = dialog.FileName;
                 var cad = new ACadSharp.IO.DwgReader(file).Read();
diff --git a/RvAddinTest/ModifySystemTypeCmd.cs b/RvAddinTest/ModifySystemTypeCmd.cs
new file mode 100644
index 0000000..3706e82
--- /dev/null
+++ b/RvAddinTest/ModifySystemTypeCmd.cs
@@ -0,0 +1,233 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+using Autodesk.Revit.Attributes;
+using Autodesk.Revit.DB;
+using Autodesk.Revit.DB.Plumbing;
+using Autodesk.Revit.UI;
+
+using Sai.Toolkit.Revit.Assist;
+
+namespace RvAddinTest;
+[Transaction(TransactionMode.Manual)]
+[Regeneration(RegenerationOption.Manual)]
+internal class ModifySystemTypeCmd : IExternalCommand
+{
+    /// <summary>
+    /// 获取标高
+    /// </summary>
+    /// <param name="model"></param>
+    /// <returns></returns>
+    public ElementId GetLevelId(Element model)
+    {
+        // 定义需要检查的参数列表
+        var parametersToCheck = new BuiltInParameter[]
+        {
+                BuiltInParameter.WALL_BASE_CONSTRAINT,       // 墙
+                BuiltInParameter.SCHEDULE_BASE_LEVEL_PARAM,       // 柱子标高
+                BuiltInParameter.INSTANCE_REFERENCE_LEVEL_PARAM,   // 梁标高
+                BuiltInParameter.STAIRS_BASE_LEVEL_PARAM,          // 楼梯标高
+                BuiltInParameter.INSTANCE_ELEVATION_PARAM,          // 族实例明细表标高
+                BuiltInParameter.ROOF_CONSTRAINT_LEVEL_PARAM,//屋顶
+                BuiltInParameter.INSTANCE_SCHEDULE_ONLY_LEVEL_PARAM,// 族实例明细表标高
+                BuiltInParameter.RBS_START_LEVEL_PARAM// 管线标高
+        };
+        // 依次检查每个参数
+        foreach (var param in parametersToCheck)
+        {
+            var baseLevelId = model.get_Parameter(param)?.AsElementId();
+            if (baseLevelId != ElementId.InvalidElementId && baseLevelId != null)
+            {
+                return baseLevelId;
+            }
+        }
+
+        //最后检查楼板或族基准标高
+        return model.LevelId;
+    }
+    public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
+    {
+        //程序UI界面
+        var uiapp = commandData.Application;
+        //获取元素（选择） 显示元素 视图（活动视图）管理（对象）
+        var uidoc = uiapp.ActiveUIDocument;
+        //程序
+        var app = uiapp.Application;
+        //获取位置和场地 视图（多个视图）管理 获取元素（Revit 项目里的全部元素）
+        var doc = uidoc.Document;
+        //获取所有打开文档
+        var docset = uiapp.Application.Documents;
+        //当前视图
+        var view = doc.ActiveView;
+
+        //var views = doc.OfClass<View>().Cast<View>().Where(v => !v.IsTemplate);
+        //foreach (var v in views)
+        //{
+        //    if (v.GetParameter("子视图分类")?.AsString() == "01 平面")
+        //    {
+        //        MessageBox.Show(v.Id.ToString());
+        //        break;
+        //    }
+        //}
+
+        #region RegionName
+        //var ins = doc.OfClass<FamilyInstance>().Cast<FamilyInstance>();
+        //var pipes = doc.OfClass<Pipe>().Cast<Pipe>();
+
+        //using (var trans = new Transaction(doc, nameof(ModifySystemTypeCmd)))
+        //{
+        //    trans.Start();
+        //    var level = doc.OfClass<Level>().Cast<Level>().FirstOrDefault(l => l.Name == "站厅层");
+        //    foreach (var pipe in pipes)
+        //    {
+        //        if (pipe.ReferenceLevel.Name == "站厅层.")
+        //        {
+        //            try
+        //            {
+        //                pipe.ReferenceLevel = doc.GetElement(level.Id) as Level;
+        //            }
+        //            catch (Exception ex)
+        //            {
+        //                MessageBox.Show(pipe.Name);
+        //            }
+        //        }
+        //    }
+        //    foreach (var instance in ins)
+        //    {
+
+        //        var e = doc.GetElement(instance.LevelId);
+        //        if (e != null && e.Name == "站厅层.")
+        //        {
+        //            try
+        //            {
+        //                instance.get_Parameter(BuiltInParameter.FAMILY_LEVEL_PARAM)?.Set(level.Id);
+        //            }
+        //            catch (Exception ex)
+        //            {
+        //                MessageBox.Show(e.Name);
+        //            }
+        //        }
+        //    }
+        //    trans.Commit();
+        //}
+        #endregion
+
+        //var templates = doc.OfClass<View>().Cast<View>().Where(v => v.IsTemplate);
+        //foreach (var template in templates)
+        //{
+        //    var filters = template.GetFilters();
+        //    foreach (var id in filters)
+        //    {
+        //        var filterElement = doc.GetElement(id);
+        //        if (filterElement is ParameterFilterElement filter)
+        //        {
+        //            if (filter.Name.Contains("生产生活给水系统"))
+        //            {
+        //                var ogs = new OverrideGraphicSettings();
+        //                ogs.SetProjectionLineColor(new Color(0, 255, 0));
+        //                ogs.SetProjectionLineColor(new Color(0, 255, 0));
+        //                ogs.SetProjectionLineColor(new Color(0, 255, 0));
+        //                ogs.SetProjectionLineColor(new Color(0, 255, 0));
+        //                template.SetFilterOverrides(id, ogs);
+        //            }
+        //        }
+        //    }
+        //}
+
+
+
+        //var maps = doc.ParameterBindings;
+        //var li = maps.ForwardIterator();
+        //try
+        //{
+        //    using (var trans = new Transaction(doc, "修改"))
+        //    {
+        //        trans.Start();
+        //        var pipeCate = Category.GetCategory(doc, BuiltInCategory.OST_PipeCurves);
+        //        var cabtrayCate = Category.GetCategory(doc, BuiltInCategory.OST_CableTray);
+        //        var conduitCate = Category.GetCategory(doc, BuiltInCategory.OST_Conduit);
+
+        //        while (li.MoveNext())
+        //        {
+        //            var k = li.Key;
+        //            if (Regex.IsMatch(k.Name, @"^[A-Z][A-Z](-)\d(00-)"))
+        //            {
+        //                if (li.Current is InstanceBinding binding && binding.Categories.Contains(pipeCate))
+        //                {
+        //                    //binding.Categories.Insert(cabtrayCate);
+        //                    //binding.Categories.Insert(conduitCate);
+        //                    //binding.Categories.Erase(pipeCate);
+        //                    doc.ParameterBindings.ReInsert(k, binding, BuiltInParameterGroup.PG_ADSK_MODEL_PROPERTIES);
+        //                }
+        //            }
+        //        }
+        //        trans.Commit();
+        //    }
+        //}
+        //catch (Exception)
+        //{
+
+        //    throw;
+        //}
+
+        #region RegionName
+        //var templates = doc.OfClass<LinePatternElement>()
+        //    .Cast<LinePatternElement>()
+        //    .Where(e => e.Name.StartsWith("IMPORT"))
+        //    .Select(e => e.Id).ToList();
+        //using (var trans = new Transaction(doc, nameof(ModifySystemTypeCmd)))
+        //{
+        //    trans.Start();
+        //    doc.Delete(templates);
+        //    //foreach (var id in uidoc.Selection.GetElementIds())
+        //    //{
+        //    //    var elem = doc.GetElement(id);
+        //    //    elem.ChangeTypeId(systemType.Id);
+        //    //}
+        //    trans.Commit();
+        //}
+        #endregion
+        try
+        {
+
+            //var r = uidoc.Selection.PickObject(Autodesk.Revit.UI.Selection.ObjectType.Element);
+            var ids = uidoc.Selection.GetElementIds();
+            foreach (var id in ids)
+            {
+                var elem = doc.GetElement(id);
+                if (elem is not Pipe)
+                {
+                    continue;
+                }
+                var systemType = new FilteredElementCollector(doc).OfClass(typeof(PipingSystemType))
+                    .FirstOrDefault(p => p.Name == "气体灭火管网系统") as PipingSystemType;
+                using (var trans = new Transaction(doc, nameof(ModifySystemTypeCmd)))
+                {
+
+                    trans.Start();
+                    elem.get_Parameter(BuiltInParameter.RBS_PIPING_SYSTEM_TYPE_PARAM).Set(systemType.Id);
+
+                    //foreach (var id in uidoc.Selection.GetElementIds())
+                    //{
+                    //    var elem = doc.GetElement(id);
+                    //    elem.ChangeTypeId(systemType.Id);
+                    //}
+                    trans.Commit();
+                }
+            }
+
+        }
+        catch (Exception)
+        {
+
+        }
+        return Result.Succeeded;
+    }
+}
diff --git a/RvAddinTest/RemoveParamCmd.cs b/RvAddinTest/RemoveParamCmd.cs
new file mode 100644
index 0000000..c9d81ba
--- /dev/null
+++ b/RvAddinTest/RemoveParamCmd.cs
@@ -0,0 +1,180 @@
+using System.Text;
+
+using Autodesk.Revit.Attributes;
+using Autodesk.Revit.DB;
+
+using Nice3point.Revit.Toolkit.External;
+
+using Sai.Toolkit.Revit.Assist;
+using Sai.Toolkit.Revit.Helpers;
+
+
+namespace RvAddinTest;
+/// <summary>
+/// Revit执行命令
+/// </summary>
+[Transaction(TransactionMode.Manual)]
+[Regeneration(RegenerationOption.Manual)]
+public class RemoveParamCmd : ExternalCommand
+{
+    public override void Execute()
+    {
+
+    }
+    /// <summary>
+    /// 移除任意参数
+    /// </summary>
+    /// <param name="element"></param>
+    /// <param name="paramNames"></param>
+    private void RemoveParams(Element element, params string[] paramNames)
+    {
+        var dict = ParameterAssist.GetParameterElementBindings(Document);
+        var bindings = Document.ParameterBindings;
+        var parameterElements = Document.OfClass<ParameterElement>().Cast<ParameterElement>();
+        Document.InvokeGroup(
+            _ =>
+            {
+                StringBuilder sb = new StringBuilder();
+                Element type = null;
+                var hasTypeId = element.GetTypeId() != ElementId.InvalidElementId;
+                if (hasTypeId)
+                {
+                    type = Document.GetElement(element.GetTypeId());
+                }
+                Document.Invoke(
+                ts =>
+                {
+                    //实例参数
+                    foreach (Parameter param in element.ParametersMap)
+                    {
+                        if (paramNames.Contains(param.Definition.Name))
+                        {
+                            //var name = param.Definition.Name;
+                            //var defs = dict.Keys.Select(e => e.GetDefinition());
+                            var ds = dict.Where(
+                                e => e.Key.GetDefinition().Id == (param.Definition as InternalDefinition)?.Id);
+                            if (ds.Any())//说明是项目参数
+                            {
+                                var d = ds.FirstOrDefault();
+                                var parameter = d.Key;
+                                var binding = d.Value;
+                                if (binding.Categories.Size == 1)//如果只剩下一个类别，则直接移除
+                                {
+                                    if (parameter is SharedParameterElement)//共享参数
+                                    {
+                                        bindings.Remove(param.Definition);
+                                    }
+                                    else//项目参数
+                                    {
+                                        dict.Remove(parameter);
+                                        Document.Delete(parameter.Id);
+                                    }
+                                }
+                                else//否则只移除一个类别
+                                {
+                                    binding.Categories.Erase(element.Category);
+                                    Document.ParameterBindings.ReInsert(parameter.GetDefinition(), binding);
+                                }
+                            }
+                        }
+                    }
+                    Document.Regenerate();
+
+                    //类型参数
+                    if (hasTypeId)
+                    {
+                        foreach (Parameter param in type.ParametersMap)
+                        {
+                            if (paramNames.Contains(param.Definition.Name))
+                            {
+                                //var name = param.Definition.Name;
+                                //var defs = dict.Keys.Select(e => e.GetDefinition());
+                                var ds = dict.Where(
+                                    e => e.Key.GetDefinition().Id == (param.Definition as InternalDefinition)?.Id);
+                                if (ds.Any())//说明是项目参数
+                                {
+                                    var d = ds.FirstOrDefault();
+                                    var parameter = d.Key;
+                                    var binding = d.Value;
+                                    if (binding.Categories.Size == 1)//如果只剩下一个类别，则直接移除
+                                    {
+                                        if (parameter is SharedParameterElement)//共享参数
+                                        {
+                                            bindings.Remove(param.Definition);
+                                        }
+                                        else//项目参数
+                                        {
+                                            dict.Remove(parameter);
+                                            Document.Delete(parameter.Id);
+                                        }
+                                    }
+                                    else
+                                    {
+                                        binding.Categories.Erase(element.Category);
+                                        Document.ParameterBindings.ReInsert(parameter.GetDefinition(), binding);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }, "清理项目参数");
+
+                bool instaneFlag = element.ParametersMap
+                    .OfType<Parameter>()
+                    .Any(param => paramNames.Contains(param.Definition.Name));
+                bool typeFlag = false;
+
+                if (hasTypeId)
+                {
+                    typeFlag = type.ParametersMap.OfType<Parameter>()
+                    .Any(param => paramNames.Contains(param.Definition.Name));
+                }
+                var NeedToEditFamily = instaneFlag || typeFlag;
+
+                if (NeedToEditFamily && element is FamilyInstance instance)
+                {
+                    Document famdoc = null;
+                    try
+                    {
+                        Family family = instance.Symbol.Family;
+
+                        if (family.IsEditable)
+                        {
+                            famdoc = Document.EditFamily(family);
+                        }
+                        else
+                        {
+                            sb.AppendLine($"{family.Name} 不可编辑。");
+                        }
+
+                        if (famdoc != null)
+                        {
+                            using (Transaction ts = new(famdoc, "删除参数"))
+                            {
+                                ts.Start();
+                                var parametersToRemove = famdoc.FamilyManager
+                                    .GetParameters()
+                                    .Where(fp => paramNames.Contains(fp.Definition.Name));
+                                foreach (FamilyParameter fp in parametersToRemove)
+                                {
+                                    famdoc.FamilyManager.RemoveParameter(fp);
+                                }
+                                ts.Commit();
+                            }
+
+                            famdoc.LoadFamily(Document, new FamilyLoadOption());
+                            famdoc.Close(false);
+                        }
+                    }
+                    catch (Exception)
+                    {
+                        sb.AppendLine($"{famdoc.Title} 发生错误！");
+                    }
+                }
+                if (sb.Length > 0)
+                {
+                    MessageBox.Show(sb.ToString());
+                }
+            }, "参数移除");
+    }
+}
\ No newline at end of file
diff --git a/RvAddinTest/RvAddinTest.csproj b/RvAddinTest/RvAddinTest.csproj
index 5455bd1..3b60799 100644
--- a/RvAddinTest/RvAddinTest.csproj
+++ b/RvAddinTest/RvAddinTest.csproj
@@ -20,6 +20,7 @@
 	  <DefineConstants>$(DefineConstants);REVIT2018</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup>
+        <Reference Include="eTransmitForRevitDB" HintPath="..\libs\2018\eTransmitForRevitDB.dll" />
         <PackageReference Include="ACadSharp" Version="1.0.2" />
 		<PackageReference Include="Bogus" Version="35.6.1" />
 		<PackageReference Include="EleCho.WpfSuite" Version="0.9.1.2" />
diff --git a/RvAddinTest/SeparateModel.cs b/RvAddinTest/SeparateModel.cs
new file mode 100644
index 0000000..376f9bf
--- /dev/null
+++ b/RvAddinTest/SeparateModel.cs
@@ -0,0 +1,20 @@
+using System;
+
+using Autodesk.Revit.Attributes;
+using Autodesk.Revit.DB;
+using Autodesk.Revit.UI;
+using Autodesk.Revit.UI.Selection;
+
+using Nice3point.Revit.Toolkit.External;
+
+namespace RvAddinTest;
+[Transaction(TransactionMode.Manual)]
+[Regeneration(RegenerationOption.Manual)]
+public class SeparateModel : ExternalCommand
+{
+    public override void Execute()
+    {
+        SeparateModelWin win = new SeparateModelWin();
+        win.Show();
+    }
+}
\ No newline at end of file
diff --git a/RvAddinTest/SeparateModelWin.xaml b/RvAddinTest/SeparateModelWin.xaml
new file mode 100644
index 0000000..264eae4
--- /dev/null
+++ b/RvAddinTest/SeparateModelWin.xaml
@@ -0,0 +1,31 @@
+<Window
+    x:Class="RvAddinTest.SeparateModelWin"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:AduSkin="https://github.com/aduskin"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:RvAddinTest"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="拆分模型"
+    Width="300"
+    Height="300"
+    SizeToContent="Height"
+    Topmost="True"
+    mc:Ignorable="d">
+    <Grid>
+        <StackPanel Margin="5">
+            <AduSkin:MetroTextBox
+                x:Name="TbFileName"
+                Margin="5"
+                InputHint="文件名" />
+            <AduSkin:MetroTextBox
+                x:Name="TbFolder"
+                Margin="5"
+                InputHint="保存路径" />
+            <AduSkin:MetroButton
+                Margin="5"
+                Click="MetroButton_Click"
+                Content="拆分" />
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/RvAddinTest/SeparateModelWin.xaml.cs b/RvAddinTest/SeparateModelWin.xaml.cs
new file mode 100644
index 0000000..19ee6fc
--- /dev/null
+++ b/RvAddinTest/SeparateModelWin.xaml.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+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 Autodesk.Revit.DB;
+using Autodesk.Revit.UI;
+using Sai.Toolkit.Revit.Assist;
+using Nice3point.Revit.Toolkit.External.Handlers;
+
+using UIFrameworkServices;
+
+namespace RvAddinTest;
+/// <summary>
+/// SeparateModelWin.xaml 的交互逻辑
+/// </summary>
+public partial class SeparateModelWin
+{
+    ActionEventHandler separate = new ActionEventHandler();
+    public SeparateModelWin()
+    {
+        InitializeComponent();
+        TbFolder.Text = "F:\\燃气改造项目\\归档";
+    }
+
+    private void MetroButton_Click(object sender, RoutedEventArgs e)
+    {
+        separate.Raise(
+            uiapp =>
+            {
+
+                var uidoc = uiapp.ActiveUIDocument;
+                var doc = uidoc.Document;
+                var list = uidoc.Selection.GetElementIds();
+
+                if (list.Count == 0)
+                {
+                    MessageBox.Show("未选中元素", "提示");
+                    return;
+                }
+                var walls = list.Select(id => doc.GetElement(id)).Where(e => e is Wall).Select(e => e.Id).ToList();
+                var others = list.Select(id => doc.GetElement(id)).Where(e => e is not Wall).Select(e => e.Id).ToList();
+                SpearateByIds(doc, walls, true);
+                SpearateByIds(doc, others, false);
+                using (Transaction trans = new Transaction(doc, "删除选中"))
+                {
+                    try
+                    {
+                        trans.Start();
+                        doc.Delete(list);
+                        trans.Commit();
+                    }
+                    catch (Exception ex)
+                    {
+                        throw ex;
+                    }
+                }
+            });
+    }
+
+    private void SpearateByIds(Document doc, ICollection<ElementId> list, bool isA)
+    {
+        var allOthers = doc.OfModelCollector()
+        .Excluding(list)
+        .ToElementIds();
+        var ids = doc.OfClass<ImportInstance>().ToElementIds();
+        var modelLineIds = doc.OfCollector().OfCategory(BuiltInCategory.OST_Lines).Select(e => e.Id).ToList();
+        var texts = doc.OfCollector().OfCategory(BuiltInCategory.OST_TextNotes).Select(e => e.Id).ToList();
+        using (Transaction trans = new Transaction(doc, "拆分模型"))
+        {
+            try
+            {
+                trans.Start();
+                doc.Delete(allOthers);
+                doc.Delete(ids);
+                doc.Delete(modelLineIds);
+                doc.Delete(texts);
+                trans.Commit();
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        if (!Directory.Exists(TbFolder.Text))
+        {
+            Directory.CreateDirectory(TbFolder.Text);
+        }
+        var fileName = isA ? TbFileName.Text + "-A" : TbFileName.Text + "-GE";
+        var filePath = Path.Combine(TbFolder.Text, $"{fileName}.rvt");
+        SaveAsOptions options = new SaveAsOptions() { OverwriteExistingFile = true, PreviewViewId = doc.ActiveView.Id, Compact = true };
+        
+        doc.SaveAs(filePath, options);
+        QuickAccessToolBarService.performMultipleUndoRedoOperations(true, 1);
+    }
+}
diff --git a/RvAddinTest/RotateDimension.cs b/RvAddinTest/SetDimensions.cs
similarity index 86%
rename from RvAddinTest/RotateDimension.cs
rename to RvAddinTest/SetDimensions.cs
index 99096f8..2580832 100644
--- a/RvAddinTest/RotateDimension.cs
+++ b/RvAddinTest/SetDimensions.cs
@@ -7,7 +7,7 @@ namespace RvAddinTest
 {
     [Transaction(TransactionMode.Manual)]
     [Regeneration(RegenerationOption.Manual)]
-    public class RotateDimension : IExternalCommand
+    public class SetDimensions : IExternalCommand
     {
         public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
         {
@@ -25,36 +25,37 @@ namespace RvAddinTest
             var view = doc.ActiveView;
             try
             {
-
                 var refers = uidoc.Selection.GetElementIds();
-                var li = new List<IndependentTag>();
+                var toRotate = new List<IndependentTag>();
+                var toDelete = new List<ElementId>();
                 foreach (var item in refers)
                 {
                     var e = doc.GetElement(item) as IndependentTag;
-                    var mep = doc.GetElement(e.TaggedElementId.HostElementId) as Duct;
+                    var mep = doc.GetElement(e.TaggedElementId.HostElementId);
                     var loc = mep.Location as LocationCurve;
                     var c = loc.Curve.Length < 2;
+                    if (c || Math.Abs((loc.Curve as Line).Direction.Z) > 0.2)
+                    {
+                        toDelete.Add(item);
+                        continue;
+                    }
                     if (loc.Curve is Line l)
                     {
                         var ra = l.Direction.AngleTo(XYZ.BasisX);
                         if (ra > Math.PI / 4 && ra < Math.PI / 4 * 3)
                         {
-                            li.Add(e);
+                            toRotate.Add(e);
                         }
                     }
-                    //if (c)
-                    //{
-                    //    li.Add(e.Id);
-                    //}
                 }
                 using (var ts = new Transaction(doc, "旋转标注"))
                 {
                     ts.Start();
-                    foreach (var item in li)
+                    foreach (var item in toRotate)
                     {
                         item.TagOrientation = TagOrientation.Vertical;
                     }
-                    //doc.Delete(li);
+                    doc.Delete(toDelete);
                     ts.Commit();
                 }
             }
diff --git a/RvAddinTest/TempCmd.cs b/RvAddinTest/TempCmd.cs
index 548f82a..02a5733 100644
--- a/RvAddinTest/TempCmd.cs
+++ b/RvAddinTest/TempCmd.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 using System.Windows;
 
 using Autodesk.Revit.Attributes;
@@ -22,7 +23,126 @@ public class TempCmd : ExternalCommand
 {
     public override void Execute()
     {
-        var elemIds = Document.OfClass<Pipe>().Cast<Pipe>().Where(p => p.Diameter == 50 / 304.8 && !(p.GetLocCurve() as Line).Direction.IsParallelTo(XYZ.BasisZ)).Select(p => p.Id).ToList();
+        CreateWindow win = new CreateWindow();
+        win.Show();
+        //ConnectSprinklers();
+        //var unUseSpk = Document.ActiveView.OfClass<FamilyInstance>().OfCategory(BuiltInCategory.OST_Sprinklers).Where(e => e.GetConnectors(true).Size == 1).Select(e => e.Id).ToList();
+        //UiDocument.Selection.SetElementIds(unUseSpk);
+        //ConnectToStandPipe();
+        //var unUseSpk = Document.ActiveView.OfClass<FamilyInstance>().OfCategory(BuiltInCategory.OST_Sprinklers).Where(e => e.GetConnectors(true).Size == 1).ToList();
+        //var spks = Document.ActiveView.OfClass<FamilyInstance>().OfCategory(BuiltInCategory.OST_Sprinklers).Where(e => e.GetConnectors(true).Size == 0).ToList();
+        //List<Element> li = [];
+        //foreach (var item in spks)
+        //{
+        //    var conn = item.GetLocXYZ();
+        //    foreach (var spk in unUseSpk)
+        //    {
+        //        //var conn1 = spk.GetConnectors(true).OfType<Connector>().FirstOrDefault();
+
+        //        if (item.GetLocXYZ().IsAlmostEqualTo(spk.GetLocXYZ()))
+        //        {
+        //            li.Add(spk);
+        //        }
+        //    }
+        //}
+        //Document.Invoke(
+        //    ts =>
+        //    {
+        //        Document.Delete(li.Select(e => e.Id).ToList());
+        //    });
+        //MessageBox.Show(sks.Count.ToString());
+
+    }
+
+    private void ConnectToStandPipe()
+    {
+        var pipes = Document.ActiveView.OfClass<Pipe>().Where(e => e.GetConnectors(true).Size == 1 && (e.GetCurve() as Line).Direction.IsParallelTo(XYZ.BasisZ));
+        var spks = Document.ActiveView.OfClass<FamilyInstance>().OfCategory(BuiltInCategory.OST_Sprinklers).Where(e => e.GetConnectors(true).Size == 1);
+
+        Document.Invoke(
+               ts =>
+               {
+                   foreach (var ins in spks)
+                   {
+                       //Element instance = null;
+                       var conn1 = ins.GetConnectors(true).OfType<Connector>().FirstOrDefault();
+                       foreach (var p in pipes)
+                       {
+                           var conn = p.GetConnectors(true).OfType<Connector>().FirstOrDefault();
+                           if (conn.Origin.IsAlmostEqualTo(conn1.Origin))
+                           {
+                               conn.ConnectTo(conn1);
+                               break;
+                           }
+                       }
+                       //try
+                       //{
+                       //    var connector = ins.GetConnectors(true).OfType<Connector>().FirstOrDefault();
+                       //    var connector1 = instance.GetConnectors(true).OfType<Connector>().FirstOrDefault();
+                       //    var id = ElementTransformUtils.CopyElement(Document, pipe.Id, XYZ.Zero).FirstOrDefault();
+                       //    Document.Regenerate();
+                       //    connector.ConnectTo(newPipe.ConnectorManager.Connectors.GetNearestConnector(connector.Origin));
+                       //    connector1.ConnectTo(newPipe.ConnectorManager.Connectors.GetNearestConnector(connector1.Origin));
+                       //}
+                       //catch (Exception)
+                       //{
+                       //    continue;
+                       //}
+
+                   }
+               });
+    }
+
+    private void ConnectSprinklers()
+    {
+        var fittings = Document.ActiveView.OfClass<FamilyInstance>().OfCategory(BuiltInCategory.OST_PipeFitting).Where(e => e.GetConnectors(true).Size == 1);
+        var spks = Document.ActiveView.OfClass<FamilyInstance>().OfCategory(BuiltInCategory.OST_Sprinklers).Where(e => e.GetConnectors(true).Size == 1);
+        var refer = UiDocument.Selection.PickObject(ObjectType.Element);
+        var pipe = Document.GetElement(refer) as Pipe;
+        Document.Invoke(
+               ts =>
+               {
+                   foreach (var ins in spks)
+                   {
+                       var temp = double.MaxValue;
+                       Element instance = null;
+                       foreach (var ins1 in fittings)
+                       {
+                           if (ins.Id == ins1.Id)
+                           {
+                               continue;
+                           }
+                           var current = ins.GetLocXYZ().DistanceTo(ins1.GetLocXYZ());
+                           if (current < temp && Math.Abs(current - Math.Abs(ins.GetLocXYZ().Z - ins1.GetLocXYZ().Z)) < 10E-5)
+                           {
+                               temp = current;
+                               instance = ins1;
+                           }
+                       }
+                       try
+                       {
+                           var connector = ins.GetConnectors(true).OfType<Connector>().FirstOrDefault();
+                           var connector1 = instance.GetConnectors(true).OfType<Connector>().FirstOrDefault();
+                           var id = ElementTransformUtils.CopyElement(Document, pipe.Id, XYZ.Zero).FirstOrDefault();
+                           var newPipe = Document.GetElement(id) as Pipe;
+                           newPipe.get_Parameter(BuiltInParameter.RBS_PIPE_DIAMETER_PARAM).SetValueString("15");
+                           (newPipe.Location as LocationCurve).Curve = Line.CreateBound(connector.Origin, connector1.Origin);
+                           Document.Regenerate();
+                           connector.ConnectTo(newPipe.ConnectorManager.Connectors.GetNearestConnector(connector.Origin));
+                           connector1.ConnectTo(newPipe.ConnectorManager.Connectors.GetNearestConnector(connector1.Origin));
+                       }
+                       catch (Exception)
+                       {
+                           continue;
+                       }
+
+                   }
+               });
+    }
+
+    private void Method()
+    {
+        var elemIds = Document.OfClass<Pipe>().Cast<Pipe>().Where(p => p.Diameter == 50 / 304.8 && (p.GetCurve() as Line).Direction.IsParallelTo(XYZ.BasisZ)).Select(p => p.Id).ToList();
         //var elementIds = uidoc.Selection.GetElementIds();
         //var elementIds = new FilteredElementCollector(Document).OfClass(typeof(FamilyInstance)).Where(ins => ins.Name == "DN15").Select(ins => ins.Id).ToList();
         //using (var ts = new Transaction(Document, "Temp"))
@@ -31,11 +151,11 @@ public class TempCmd : ExternalCommand
         //doc.Delete(elementIds);
         //foreach (var id in elementIds)
         //{
-        //    var elem = Document.GetElement(id) as FamilyInstance;
-        //    var p = elem.GetLocXYZ();
-        //    //ElementTransformUtils.MoveElement(Document,id,-elem.HandOrientation*125/304.8);
+        //    var unUseSpk = Document.GetElement(id) as FamilyInstance;
+        //    var p = unUseSpk.GetLocXYZ();
+        //    //ElementTransformUtils.MoveElement(Document,id,-unUseSpk.HandOrientation*125/304.8);
         //    //Document.Regenerate();
-        //    //ElementTransformUtils.MoveElement(Document, id,-elem.FacingOrientation*95/304.8);
+        //    //ElementTransformUtils.MoveElement(Document, id,-unUseSpk.FacingOrientation*95/304.8);
         //    ElementTransformUtils.RotateElement(
         //        Document,
         //        id,
@@ -43,14 +163,14 @@ public class TempCmd : ExternalCommand
         //        Math.PI / 2);
         //}
         //内衬
-        //var e = InsulationLiningBase.GetLiningIds(doc, elem.Id);
+        //var e = InsulationLiningBase.GetLiningIds(doc, unUseSpk.Id);
         //保温
-        //var p = InsulationLiningBase.GetInsulationIds(doc, elem.Id);
+        //var p = InsulationLiningBase.GetInsulationIds(doc, unUseSpk.Id);
         //var uidoc = UiApplication.ActiveUIDocument;
         //var doc = uidoc.Document;
         //var reference = uidoc.Selection.PickObject(ObjectType.Element);
-        //var elem = doc.GetElement(reference);
-        //var id = InsulationLiningBase.GetInsulationIds(Document, elem.Id).FirstOrDefault();
+        //var unUseSpk = doc.GetElement(reference);
+        //var id = InsulationLiningBase.GetInsulationIds(Document, unUseSpk.Id).FirstOrDefault();
         //    ts.Commit();
         //}
         Document.Invoke(
@@ -58,20 +178,33 @@ public class TempCmd : ExternalCommand
             {
                 try
                 {
-                    UiDocument.Selection.SetElementIds(elemIds);
+                    //UiDocument.Selection.SetElementIds(elemIds);
 
                     //ElementTransformUtils.MoveElements(Document, elemIds, XYZ.BasisZ * 200 / 304.8);
 
-                    //foreach (var elem in elems)
-                    //{
-                    //    elem.get_Parameter(BuiltInParameter.RBS_PIPE_DIAMETER_PARAM).Set(50 / 304.8);
-                    //}
+                    foreach (var id in elemIds)
+                    {
+                        var e = Document.GetElement(id) as Pipe;
+                        if (e != null)
+                        {
+                            var b = e.GetCurve().GetEndPoint(0);
+                            if (b.Z == 0)
+                            {
+                                e.GetLocationCurve().Curve = Line.CreateBound(
+                                    b + XYZ.BasisZ * 1800 / 304.8,
+                                    e.GetCurve().GetEndPoint(1));
+                                continue;
+                            }
+                        }
+                        //unUseSpk.get_Parameter(BuiltInParameter.RBS_PIPE_DIAMETER_PARAM).Set(50 / 304.8);
+                    }
                 }
                 catch (Autodesk.Revit.Exceptions.OperationCanceledException)
                 {
                 }
             }, "CMD");
     }
+
     public class ArrangeElement
     {
         public XYZ Translation { get; set; }
diff --git a/Sai.RvKits/ModelManager/ModelCheckViewModel.cs b/Sai.RvKits/ModelManager/ModelCheckViewModel.cs
index da55694..d32419a 100644
--- a/Sai.RvKits/ModelManager/ModelCheckViewModel.cs
+++ b/Sai.RvKits/ModelManager/ModelCheckViewModel.cs
@@ -81,7 +81,7 @@ public partial class ModelCheckViewModel : ObservableObject
         //{
         //	view3d = doc.OfClass<View3D>().FirstOrDefault(e => FilteredElementCollector.IsViewValidForElementIteration(doc, e.Id)) as View3D;
         //}
-        var elements = doc.OfCollector().OfModelElements();
+        var elements = doc.OfParentModelElements();
         var typeInstancesGroups = elements.GroupBy(e => e.GetTypeId());
         if (IsCheckLevel)
         {
@@ -292,7 +292,7 @@ public partial class ModelCheckViewModel : ObservableObject
                 {
                     if (c1.Id != c2.Id)
                     {
-                        var result = c1.GetLocCurve().Intersect(c2.GetLocCurve());
+                        var result = c1.GetCurve().Intersect(c2.GetCurve());
                         if (result == SetComparisonResult.Equal)
                         {
                             var errorItem = new MessageModel(c1, "管线存在重叠");
diff --git a/Sai.RvKits/RvCivil/CreateOpeningsViewModel.cs b/Sai.RvKits/RvCivil/CreateOpeningsViewModel.cs
index 938fdf6..b57e351 100644
--- a/Sai.RvKits/RvCivil/CreateOpeningsViewModel.cs
+++ b/Sai.RvKits/RvCivil/CreateOpeningsViewModel.cs
@@ -69,7 +69,7 @@ namespace Sai.RvKits.RvCivil
                                                 elementToOpen.LevelId);
                                         },
                                         "设置工作平面");
-                                    var curve = mepCurve.GetLocCurve();
+                                    var curve = mepCurve.GetCurve();
                                     var conn = mepCurve.GetConnectors().OfType<Connector>().FirstOrDefault();
                                     double diameter = default;
                                     double width = default;
diff --git a/Sai.RvKits/RvCivil/WallFinishesViewModel.cs b/Sai.RvKits/RvCivil/WallFinishesViewModel.cs
index 6a96915..61cd94d 100644
--- a/Sai.RvKits/RvCivil/WallFinishesViewModel.cs
+++ b/Sai.RvKits/RvCivil/WallFinishesViewModel.cs
@@ -54,10 +54,10 @@ public partial class WallFinishesViewModel(List<WallType> wallTypes) : Observabl
 
 /* 项目“Sai.RvKits (net48)”的未合并的更改
 在此之前:
-							PlaceWallFinishesByFace(uidoc, SelectedWallType, wallWidth, WallHeight, WallBaseOffset);
+							PlaceWallFinishesByFace(uiapp, SelectedWallType, wallWidth, WallHeight, WallBaseOffset);
 							break;
 在此之后:
-                            PlaceWallFinishesByFace(uidoc, SelectedWallType, wallWidth, WallHeight, WallBaseOffset);
+                            PlaceWallFinishesByFace(uiapp, SelectedWallType, wallWidth, WallHeight, WallBaseOffset);
 							break;
 */
                             WallFinishesViewModel.PlaceWallFinishesByFace(uidoc, SelectedWallType, wallWidth, WallHeight, WallBaseOffset);
diff --git a/Sai.RvKits/RvCommon/AlignModelElement.cs b/Sai.RvKits/RvCommon/AlignModelElement.cs
index fbe4396..d57099d 100644
--- a/Sai.RvKits/RvCommon/AlignModelElement.cs
+++ b/Sai.RvKits/RvCommon/AlignModelElement.cs
@@ -17,12 +17,12 @@ internal class AlignModelElement
 
         //var viewPlane = Plane.CreateByNormalAndOrigin(ownerView is View3D ? XYZ.BasisZ : ownerView!.ViewDirection, ownerView.Origin);
 
-        var elementBBox = e.get_BoundingBox(ownerView);
+        var bounding = e.get_BoundingBox(ownerView);
 
-        var max = elementBBox.Max;
-        var min = elementBBox.Min;
-        //var globalMax = elementBBox.Max;
-        //var globalMin = elementBBox.Min;
+        var max = bounding.Max;
+        var min = bounding.Min;
+        //var globalMax = bounding.Max;
+        //var globalMin = bounding.Min;
 
         //var distanceProjected = ProjectedDistance(viewPlane, globalMax, globalMin);
 
@@ -40,10 +40,12 @@ internal class AlignModelElement
         //var max = ownerViewTransform.Inverse.OfPoint(globalMax); //Max in the coordinate space of the view
         //var min = ownerViewTransform.Inverse.OfPoint(globalMin); //Min in the coordinate space of the view
 
+
         UpLeft = new XYZ(Math.Min(min.X, max.X), Math.Max(max.Y, min.Y), 0);
         UpRight = new XYZ(Math.Max(min.X, max.X), Math.Max(max.Y, min.Y), 0);
         DownLeft = new XYZ(Math.Min(min.X, max.X), Math.Min(max.Y, min.Y), 0);
         DownRight = new XYZ(Math.Max(min.X, max.X), Math.Min(max.Y, min.Y), 0);
+
         Center = (UpRight + DownLeft) / 2;
         Bottom = min.Z;
         Top = max.Z;
diff --git a/Sai.RvKits/RvCommon/CustomLeader.cs b/Sai.RvKits/RvCommon/CustomLeader.cs
deleted file mode 100644
index baafd42..0000000
--- a/Sai.RvKits/RvCommon/CustomLeader.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Autodesk.Revit.DB;
-
-namespace Sai.RvKits.RvCommon
-{
-    internal class CustomLeader
-    {
-        public CustomLeader(Leader leader)
-        {
-            End = leader.End;
-            Elbow = leader.Elbow;
-        }
-
-        public CustomLeader()
-        {
-            End = new XYZ(0, 0, 0);
-            Elbow = new XYZ(0, 0, 0);
-        }
-
-        public CustomLeader(XYZ end, XYZ elbow)
-        {
-            End = end;
-            Elbow = elbow;
-        }
-
-        public XYZ End { get; set; }
-        public XYZ Elbow { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Sai.RvKits/RvCommon/PureModelCmd.cs b/Sai.RvKits/RvCommon/PureModelCmd.cs
index 2bba05c..12d8af3 100644
--- a/Sai.RvKits/RvCommon/PureModelCmd.cs
+++ b/Sai.RvKits/RvCommon/PureModelCmd.cs
@@ -1,4 +1,8 @@
-using Autodesk.Revit.Attributes;
+using System.IO;
+using System.Reflection;
+
+using Autodesk.Revit.ApplicationServices;
+using Autodesk.Revit.Attributes;
 using Autodesk.Revit.DB;
 
 using eTransmitForRevitDB;
@@ -28,12 +32,18 @@ public class PureModelCmd : ExternalCommand
             OverwriteExistingFile = true,
             MaximumBackups = 3
         };
-        for (var i = 0; i < 5; i++)
+        try
         {
             Purge(Document);
+            Document.SaveAs(Document.PathName, options);
+            System.Windows.MessageBox.Show("清理完成", "提示");
         }
-        Document.SaveAs(Document.PathName, options);
-        System.Windows.MessageBox.Show("清理完成", "提示");
+        catch (Exception)
+        {
+
+            throw;
+        }
+
     }
     /// <summary>
     /// 使用eTransmitForRevitDB清理文档未使用项
diff --git a/Sai.RvKits/RvCommon/QuickSelectionCmd.cs b/Sai.RvKits/RvCommon/QuickSelectionCmd.cs
new file mode 100644
index 0000000..67b3455
--- /dev/null
+++ b/Sai.RvKits/RvCommon/QuickSelectionCmd.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Autodesk.Revit.Attributes;
+
+using Nice3point.Revit.Toolkit.External;
+
+namespace Sai.RvKits.RvCommon;
+[Transaction(TransactionMode.Manual)]
+[Regeneration(RegenerationOption.Manual)]
+
+internal class QuickSelectionCmd : ExternalCommand
+{
+    public override void Execute()
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/Sai.RvKits/RvCommon/QuickSelectionView.xaml b/Sai.RvKits/RvCommon/QuickSelectionView.xaml
new file mode 100644
index 0000000..c102865
--- /dev/null
+++ b/Sai.RvKits/RvCommon/QuickSelectionView.xaml
@@ -0,0 +1,15 @@
+<Window
+    x:Class="Sai.RvKits.RvCommon.QuickSelectionView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Sai.RvKits.RvCommon"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="条件选择"
+    Width="800"
+    Height="450"
+    mc:Ignorable="d">
+    <Grid>
+        <GroupBox Header="选项" />
+    </Grid>
+</Window>
diff --git a/Sai.RvKits/RvCommon/QuickSelectionView.xaml.cs b/Sai.RvKits/RvCommon/QuickSelectionView.xaml.cs
new file mode 100644
index 0000000..95acc2b
--- /dev/null
+++ b/Sai.RvKits/RvCommon/QuickSelectionView.xaml.cs
@@ -0,0 +1,25 @@
+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.Shapes;
+
+namespace Sai.RvKits.RvCommon;
+/// <summary>
+/// QuickSelectionView.xaml 的交互逻辑
+/// </summary>
+public partial class QuickSelectionView : Window
+{
+    public QuickSelectionView()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/Sai.RvKits/RvMEP/AnyConnectViewModel.cs b/Sai.RvKits/RvMEP/AnyConnectViewModel.cs
index d6c2eff..4bb0cce 100644
--- a/Sai.RvKits/RvMEP/AnyConnectViewModel.cs
+++ b/Sai.RvKits/RvMEP/AnyConnectViewModel.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
 using System.Windows;
 
@@ -47,17 +48,13 @@ public partial class AnyConnectViewModel : ObservableValidator
     private string message;
 
     [RelayCommand]
-    private void Closing()
+    private static void Closing()
     {
-        #region 关闭窗口退出选择
-
-        if (!CanRunning)
-        {
-            return;
-        }
-
-        KeyIntPtrHelper.ActionEsc();
-        #endregion
+        KeyIntPtrHelper.RaiseEscTwice();
+    }
+    partial void OnIsMultiSelectChanged(bool value)
+    {
+        KeyIntPtrHelper.RaiseEscTwice();
     }
 
     [RelayCommand(CanExecute = nameof(CanRunning))]
@@ -75,19 +72,14 @@ public partial class AnyConnectViewModel : ObservableValidator
             try
             {
 #if REVIT2018
-                if (IsMultiSelect)
-                {
-                    list = uidoc.Selection
+                list = IsMultiSelect
+                    ? uidoc.Selection
                         .PickObjects(ObjectType.Element, filter, "请选择管线并完成")
                         .Select(r => doc.GetElement(r))
                         .OfType<MEPCurve>()
-                        .ToList();
-                }
-                else
-                {
-                    list = uidoc.Selection.PickElementsByRectangle(filter, "请框选管线").Cast<MEPCurve>().ToList();
-                }
-#elif REVIT2020||REVIT2025
+                        .ToList()
+                    : uidoc.Selection.PickElementsByRectangle(filter, "请框选管线").Cast<MEPCurve>().ToList();
+#elif REVIT2020 || REVIT2025
                 list = uidoc.Selection
                         .PickObjects(ObjectType.Element, filter, "请选择管线并完成")
                         .Select(r => doc.GetElement(r))
@@ -95,112 +87,541 @@ public partial class AnyConnectViewModel : ObservableValidator
                         .ToList();
 #endif
 
-            }
-            catch (Autodesk.Revit.Exceptions.OperationCanceledException)
-            {
-                CanRunning = true;
-#if REVIT2020
-                OptionsBarAssist.HideOptionsBar();
-#endif
-                return;
-            }
 
-            var defaultType = list.FirstOrDefault()?.GetType();
-            if (list.Count < 2 || list.Any(t => defaultType != t.GetType()))
-            {
-                Message = "所选管线数量小于2或类别不同，不允许连接";
-                CanRunning = true;
-#if REVIT2020
-                OptionsBarAssist.HideOptionsBar();
-#endif
-                return;
-            }
 
-            doc.Invoke(
-                ts =>
+                var defaultType = list.FirstOrDefault()?.GetType();
+                if (list.Count < 2 || list.Any(t => defaultType != t.GetType()))
                 {
-                    switch (list.Count)
+                    Message = "所选管线数量小于2或类别不同，不允许连接";
+                    CanRunning = true;
+#if REVIT2020
+                OptionsBarAssist.HideOptionsBar();
+#endif
+                    return;
+                }
+
+                doc.Invoke(
+                    ts =>
                     {
-                        case 2:
-                            {
-                                var originMEPCurve1 = list[0];
-                                var originMEPCurve2 = list[1];
-                                var line1 = originMEPCurve1.GetLocCurve() as Line;
-                                var line2 = originMEPCurve2.GetLocCurve() as Line;
-                                var unboundLine1 = originMEPCurve1.GetLocCurve() as Line;
-                                var unboundLine2 = originMEPCurve2.GetLocCurve() as Line;
-                                unboundLine1!.MakeUnbound();
-                                unboundLine2!.MakeUnbound();
-                                var isPerpendicular = line1.IsPerpendicularTo(line2);
-                                var result = line1!.Intersect(line2, out var array);
-                                MEPCurve mainMEPCurve;
-                                MEPCurve branchMEPCurve;
-                                var intersectionUnbound = unboundLine1.IntersectionPoint(unboundLine2);
-
-                                switch (result)
+                        switch (list.Count)
+                        {
+                            case 2:
                                 {
-                                    case SetComparisonResult.Disjoint:
+                                    var originMEPCurve1 = list[0];
+                                    var originMEPCurve2 = list[1];
+                                    var line1 = originMEPCurve1.GetCurve() as Line;
+                                    var line2 = originMEPCurve2.GetCurve() as Line;
+                                    var unboundLine1 = originMEPCurve1.GetCurve() as Line;
+                                    var unboundLine2 = originMEPCurve2.GetCurve() as Line;
+                                    unboundLine1!.MakeUnbound();
+                                    unboundLine2!.MakeUnbound();
+                                    var isPerpendicular = line1.IsPerpendicularTo(line2);
+                                    var result = line1!.Intersect(line2, out var array);
+                                    MEPCurve mainMEPCurve;
+                                    MEPCurve branchMEPCurve;
+                                    var intersectionUnbound = unboundLine1.IntersectionPoint(unboundLine2);
+
+                                    switch (result)
+                                    {
+                                        case SetComparisonResult.Disjoint:
 
-                                        {
-                                            Debug.WriteLine("管线没有交点");
-                                            var intersection1 = line1.IntersectionPoint(unboundLine2);
-                                            var intersection2 = line2.IntersectionPoint(unboundLine1);
-                                            if (intersection1 == null && intersection2 != null)
                                             {
-                                                branchMEPCurve = originMEPCurve1;
-                                                mainMEPCurve = originMEPCurve2;
-                                                Debug.WriteLine($"共面无交点:交点在第二条线上{mainMEPCurve.Id}，为主管");
-                                                if (isPerpendicular && Angle is not 0 and not 90)
+                                                Debug.WriteLine("管线没有交点");
+                                                var intersection1 = line1.IntersectionPoint(unboundLine2);
+                                                var intersection2 = line2.IntersectionPoint(unboundLine1);
+                                                if (intersection1 == null && intersection2 != null)
                                                 {
-                                                    Debug.WriteLine("使用角度");
-                                                    ConnectByAngle(mainMEPCurve, branchMEPCurve, intersection2, Angle);
+                                                    branchMEPCurve = originMEPCurve1;
+                                                    mainMEPCurve = originMEPCurve2;
+                                                    Debug.WriteLine($"共面无交点:交点在第二条线上{mainMEPCurve.Id}，为主管");
+                                                    if (isPerpendicular && Angle is not 0 and not 90)
+                                                    {
+                                                        Debug.WriteLine("使用角度");
+                                                        ConnectByAngle(mainMEPCurve, branchMEPCurve, intersection2, Angle);
+                                                    }
+                                                    else
+                                                    {
+                                                        mainMEPCurve.ConnectTo(branchMEPCurve);
+                                                    }
+
+                                                    break;
+                                                }
+
+                                                if (intersection1 != null && intersection2 == null)
+                                                {
+                                                    mainMEPCurve = originMEPCurve1;
+                                                    branchMEPCurve = originMEPCurve2;
+                                                    Debug.WriteLine($"共面无交点:交点在第一条线上{mainMEPCurve.Id}，为主管");
+                                                    if (isPerpendicular && Angle is not 0 and not 90)
+                                                    {
+                                                        Debug.WriteLine("使用角度");
+                                                        ConnectByAngle(mainMEPCurve, branchMEPCurve, intersection1, Angle);
+                                                    }
+                                                    else
+                                                    {
+                                                        mainMEPCurve.ConnectTo(branchMEPCurve);
+                                                    }
+
+                                                    break;
+                                                }
+
+                                                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                                                if (
+                                                    intersection1 == null
+                                                    && intersection2 == null
+                                                    && intersectionUnbound != null
+                                                )
+                                                {
+                                                    Debug.WriteLine("共面无交点:两根线都延长才有交点，交叉成角");
+                                                    var conn5 = originMEPCurve1
+                                                        .GetConnectors()
+                                                        .GetNearestConnector(intersectionUnbound);
+                                                    var conn6 = originMEPCurve2
+                                                        .GetConnectors()
+                                                        .GetNearestConnector(intersectionUnbound);
+                                                    var cos = conn5.CoordinateSystem.BasisZ.DotProduct(
+                                                        conn6.CoordinateSystem.BasisZ
+                                                    );
+                                                    if (cos < -10E-8 || Math.Abs(cos) < 10E-8)
+                                                    {
+                                                        Debug.WriteLine("夹角大于等于90度,直接连接");
+                                                        if (line1.Direction.IsAlmostEqualTo(XYZ.BasisZ))
+                                                        {
+                                                            mainMEPCurve = originMEPCurve1;
+                                                            branchMEPCurve = originMEPCurve2;
+                                                        }
+                                                        else if (line2!.Direction.IsAlmostEqualTo(XYZ.BasisZ))
+                                                        {
+                                                            mainMEPCurve = originMEPCurve2;
+                                                            branchMEPCurve = originMEPCurve1;
+                                                        }
+                                                        else if (line1.Length > line2!.Length)
+                                                        {
+                                                            mainMEPCurve = originMEPCurve1;
+                                                            branchMEPCurve = originMEPCurve2;
+                                                        }
+                                                        else
+                                                        {
+                                                            mainMEPCurve = originMEPCurve2;
+                                                            branchMEPCurve = originMEPCurve1;
+                                                        }
+
+                                                        if (isPerpendicular && Angle is not 0 and not 90)
+                                                        {
+                                                            Debug.WriteLine("使用角度");
+                                                            ConnectByAngle(
+                                                                mainMEPCurve,
+                                                                branchMEPCurve,
+                                                                intersectionUnbound,
+                                                                Angle
+                                                            );
+                                                        }
+                                                        else
+                                                        {
+                                                            var extendLine = line1.ExtendLine(intersectionUnbound);
+                                                            originMEPCurve1.SetLocationCurve(extendLine);
+                                                            var extendLine2 = line2.ExtendLine(intersectionUnbound);
+                                                            originMEPCurve2.SetLocationCurve(extendLine2);
+                                                            conn5.ConnectByFitting(conn6);
+                                                        }
+                                                    }
+                                                    else
+                                                    {
+                                                        Debug.WriteLine($"夹角是锐角{Math.Acos(cos).ToDegree()}°，创建一条管线再连接");
+                                                        var newMepCurveId = ElementTransformUtils
+                                                            .CopyElement(doc, originMEPCurve1.Id, XYZ.Zero)
+                                                            .FirstOrDefault();
+                                                        var connectMEPCurve = doc.GetElement(newMepCurveId) as MEPCurve;
+                                                        connectMEPCurve.SetLocationCurve(
+                                                            Line.CreateBound(conn5.Origin, conn6.Origin)
+                                                        );
+                                                        var connectors = connectMEPCurve.GetConnectors().Cast<Connector>();
+                                                        conn5.ConnectByFitting(connectors.ElementAt(0));
+                                                        conn6.ConnectByFitting(connectors.ElementAt(1));
+                                                    }
+
+                                                    break;
+                                                }
+
+                                                if (line1.IsParallelTo(line2))
+                                                {
+                                                    var c = line1.Intersect(unboundLine2); //第一个是第二个的SubSet子集
+
+                                                    //var c1 = unboundLine1.Intersect(line2);//第一个是第二个的SuperSet超集
+                                                    //距离最近的两个连接件
+                                                    var originConnectors = ConnectorAssist.GetNearestConnectors(
+                                                           originMEPCurve1,
+                                                           originMEPCurve2
+                                                       );
+
+                                                    if (c == SetComparisonResult.Subset)
+                                                    {
+                                                        Debug.WriteLine("共线平行");
+
+                                                        originConnectors[0].ConnectByFitting(originConnectors[1]);
+                                                    }
+                                                    else
+                                                    {
+                                                        Debug.WriteLine("非共线平行");
+
+                                                        //最近连接件距离太短时
+                                                        var dis = originConnectors[0].Origin.DistanceTo(
+                                                            originConnectors[1].Origin
+                                                        );
+                                                        if (dis < uiapp.Application.ShortCurveTolerance)
+                                                        {
+                                                            MessageBox.Show("连接处相距太近");
+                                                            break;
+                                                        }
+
+                                                        var isOriginMEPCurve1Bigger = false;
+                                                        //取小的管径,用于复制作为转弯管
+                                                        switch (originConnectors[0].Shape)
+                                                        {
+                                                            case ConnectorProfileType.Round:
+                                                                isOriginMEPCurve1Bigger = originMEPCurve1.Diameter > originMEPCurve2.Diameter;
+                                                                break;
+                                                            case ConnectorProfileType.Rectangular:
+                                                            case ConnectorProfileType.Oval:
+                                                                isOriginMEPCurve1Bigger =
+                                                                    originMEPCurve1.Width > originMEPCurve2.Width
+                                                                    || originMEPCurve1.Height > originMEPCurve2.Height;
+                                                                break;
+                                                        }
+
+                                                        var elementToCopy = isOriginMEPCurve1Bigger ? originMEPCurve2 : originMEPCurve1;
+                                                        ////原位复制
+                                                        //var copyMepCurveId = ElementTransformUtils
+                                                        //    .CopyElement(doc, elementToCopy.Id, XYZ.Zero)
+                                                        //    .FirstOrDefault();
+                                                        //var copyMepCurve = doc.GetElement(copyMepCurveId) as ElementToMove;
+                                                        //取短的线作为旋转轴的基准点，保证能创建
+                                                        var isFirstMEPCurveLengther = line1.Length < line2.Length;
+                                                        var l = isFirstMEPCurveLengther ? Line.CreateBound(
+                                                                  originConnectors[0].Origin,
+                                                                  originConnectors[1].Origin
+                                                              ) : Line.CreateBound(
+                                                                  originConnectors[1].Origin,
+                                                                  originConnectors[0].Origin);
+                                                        ////取短的线作为旋转轴的基准点，保证能创建
+                                                        //var origin = line1.Length < line2.Length
+                                                        //    ? originConnectors[0].Origin
+                                                        //    : originConnectors[1].Origin;
+
+                                                        var copyMepCurve = elementToCopy.CopyAndSetLocationCurve(l);
+
+                                                        doc.Regenerate();
+
+                                                        var conns1 = ConnectorAssist.GetNearestConnectors(
+                                                            originMEPCurve1,
+                                                            copyMepCurve
+                                                        );
+
+                                                        var conns2 = ConnectorAssist.GetNearestConnectors(
+                                                            originMEPCurve2,
+                                                            copyMepCurve
+                                                        );
+                                                        //同向，原管线和复制转弯管线的夹角，一定是大于等于90度，单位向量等价于余弦值
+                                                        var cos = conns1[0].CoordinateSystem.BasisZ.DotProduct(
+                                                            conns1[1].CoordinateSystem.BasisZ
+                                                        );
+                                                        //平行管可以垂直连接
+                                                        if (Angle != 0)
+                                                        {
+                                                            Debug.WriteLine("修改角度");
+                                                            var radian = Angle.ToRadian() - (Math.PI - Math.Acos(cos));
+                                                            //侧向的轴,反向斜管的接口向量，使其为锐角
+                                                            var direction = conns1[0].CoordinateSystem.BasisZ.CrossProduct(
+                                                                -conns1[1].CoordinateSystem.BasisZ
+                                                            );
+
+                                                            var axis = Line.CreateUnbound(l.Origin, direction);
+                                                            ElementTransformUtils.RotateElement(
+                                                                doc,
+                                                                copyMepCurve!.Id,
+                                                                axis,
+                                                                radian
+                                                            );
+                                                        }
+
+                                                        if (cos < -10E-8 || Math.Abs(cos) < 10E-8)
+                                                        {
+                                                            Debug.WriteLine("夹角大于等于时90度");
+                                                            //var angleUnboundLine = copyMepCurve.GetCurve().Clone();
+                                                            //angleUnboundLine.MakeUnbound();
+                                                            //if (!conns1[0].Origin.IsAlmostEqualTo(conns1[1].Origin))
+                                                            //{
+                                                            //    var point = unboundLine1.IntersectionPoint(angleUnboundLine);
+                                                            //    var newOriginMEPCurve1 = line1.ExtendLine(point);
+                                                            //    originMEPCurve1.SetLocationCurve(newOriginMEPCurve1);
+                                                            //    //copyMepCurve.SetLocationCurve()
+                                                            //}
+                                                            //if (!conns2[0].Origin.IsAlmostEqualTo(conns2[1].Origin))
+                                                            //{
+                                                            //    var point = unboundLine2.IntersectionPoint(angleUnboundLine);
+                                                            //    var newOriginMEPCurve2 = line2.ExtendLine(point);
+                                                            //    originMEPCurve2.SetLocationCurve(newOriginMEPCurve2);
+                                                            //}
+                                                            //doc.Regenerate();
+                                                            conns1[0].ConnectByFitting(conns1[1]);
+                                                            conns2[0].ConnectByFitting(conns2[1]);
+                                                        }
+                                                        else
+                                                        {
+                                                            ts.RollBack();
+                                                        }
+                                                    }
                                                 }
                                                 else
                                                 {
-                                                    mainMEPCurve.ConnectTo(branchMEPCurve);
+                                                    Debug.WriteLine("异面无交点");
+                                                    var conn = originMEPCurve1
+                                                        .GetConnectors()
+                                                        .OfType<Connector>()
+                                                        .FirstOrDefault();
+                                                    if (line1.Distance(line2) > conn.GetExtensionLength())
+                                                    {
+                                                        //找到两条线都垂直的向量
+                                                        var normal = line1.Direction.CrossProduct(line2!.Direction);
+                                                        var p1 = originMEPCurve1.GetCurve().GetEndPoint(0);
+                                                        //根据垂直向量，找到能投影到的同一平面
+                                                        var plane = Plane.CreateByNormalAndOrigin(normal, p1);
+                                                        //投影线
+                                                        var newProjectLine = plane.ProjectOnto(
+                                                            originMEPCurve2.GetCurve() as Line
+                                                        );
+                                                        //不动的线
+                                                        var stableCurve = originMEPCurve1.GetCurve();
+                                                        stableCurve.MakeUnbound();
+                                                        newProjectLine.MakeUnbound();
+                                                        //共面线关系
+                                                        var comparisonResult = stableCurve.Intersect(
+                                                            newProjectLine,
+                                                            out var array2
+                                                        );
+                                                        if (comparisonResult == SetComparisonResult.Overlap)
+                                                        {
+                                                            Debug.WriteLine("非共面相交");
+
+                                                            var intersectPoint1 = array2.get_Item(0).XYZPoint;
+                                                            var intersectPoint2 = unboundLine2
+                                                                .Project(intersectPoint1)
+                                                                .XYZPoint;
+                                                            if (
+                                                                intersectPoint1.DistanceTo(intersectPoint2)
+                                                                < uiapp.Application.ShortCurveTolerance
+                                                            )
+                                                            {
+                                                                Debug.WriteLine("交点距离太近");
+                                                                break;
+                                                            }
+
+                                                            var verticalLine = Line.CreateBound(
+                                                                intersectPoint1,
+                                                                intersectPoint2
+                                                            );
+                                                            var verticalMEPCurveId = ElementTransformUtils
+                                                                .CopyElement(doc, originMEPCurve1.Id, XYZ.Zero)
+                                                                .FirstOrDefault();
+                                                            var verticalMEPCurve = doc.GetElement(verticalMEPCurveId);
+                                                            verticalMEPCurve.SetLocationCurve(verticalLine);
+                                                            if (
+                                                                !line1.IsInsideEx(intersectPoint1)
+                                                                && !line2.IsInsideEx(intersectPoint2)
+                                                            )
+                                                            {
+                                                                Debug.WriteLine("都不在直线内,直角连接");
+                                                                var extendLine1 = (
+                                                                    originMEPCurve1.GetCurve() as Line
+                                                                ).ExtendLine(intersectPoint1);
+                                                                originMEPCurve1.SetLocationCurve(extendLine1);
+                                                                var extendLine2 = (
+                                                                    originMEPCurve2.GetCurve() as Line
+                                                                ).ExtendLine(intersectPoint2);
+                                                                originMEPCurve2.SetLocationCurve(extendLine2);
+                                                                var conn1 = originMEPCurve1
+                                                                    .GetConnectors()
+                                                                    .GetNearestConnector(intersectPoint1);
+                                                                var conn2 = verticalMEPCurve
+                                                                    .GetConnectors()
+                                                                    .GetNearestConnector(intersectPoint1);
+                                                                var conn3 = originMEPCurve2
+                                                                    .GetConnectors()
+                                                                    .GetNearestConnector(intersectPoint1);
+                                                                var conn4 = verticalMEPCurve
+                                                                    .GetConnectors()
+                                                                    .GetNearestConnector(intersectPoint2);
+                                                                conn1.ConnectByFitting(conn2);
+                                                                conn3.ConnectByFitting(conn4);
+                                                                break;
+                                                            }
+
+                                                            if (
+                                                                line1.IsInsideEx(intersectPoint1, 0.5)
+                                                                && !line2.IsInsideEx(intersectPoint2, 0.1)
+                                                            ) //在直线一内，在直线二端点，生成一个三通，一个弯头
+                                                            {
+                                                                mainMEPCurve = originMEPCurve1;
+                                                                branchMEPCurve = originMEPCurve2;
+                                                                Debug.WriteLine($"在直线一{mainMEPCurve.Id}内，在直线一端点，生成一个三通，一个弯头");
+
+                                                                var line = (branchMEPCurve.GetCurve() as Line).ExtendLine(
+                                                                    intersectPoint2
+                                                                );
+                                                                branchMEPCurve.SetLocationCurve(line);
+                                                                ConnectBranchMEP(
+                                                                    intersectPoint2,
+                                                                    intersectPoint1,
+                                                                    verticalMEPCurve,
+                                                                    mainMEPCurve,
+                                                                    branchMEPCurve
+                                                                );
+                                                                break;
+                                                            }
+
+                                                            if (
+                                                                !line1.IsInsideEx(intersectPoint1, 0.1)
+                                                                && line2.IsInsideEx(intersectPoint2, 0.5)
+                                                            )
+                                                            {
+                                                                mainMEPCurve = originMEPCurve2;
+                                                                branchMEPCurve = originMEPCurve1;
+                                                                Debug.WriteLine($"在直线二内{mainMEPCurve.Id}，在直线一端点，生成一个三通，一个弯头");
+
+                                                                var line = (branchMEPCurve.GetCurve() as Line).ExtendLine(
+                                                                    intersectPoint1
+                                                                );
+                                                                branchMEPCurve.SetLocationCurve(line);
+                                                                ConnectBranchMEP(
+                                                                    intersectPoint1,
+                                                                    intersectPoint2,
+                                                                    verticalMEPCurve,
+                                                                    mainMEPCurve,
+                                                                    branchMEPCurve
+                                                                );
+                                                                break;
+                                                            }
+
+                                                            if (
+                                                                line1.IsInsideEx(intersectPoint1, 0.5)
+                                                                && line2.IsInsideEx(intersectPoint2, 0.5)
+                                                            ) //
+                                                            {
+                                                                Debug.WriteLine("都在直线范围内，生成两个三通");
+                                                                var newMEP = doc.GetElement(
+                                                                    originMEPCurve1.BreakByPoint(intersectPoint1)
+                                                                );
+                                                                var newMEP2 = doc.GetElement(
+                                                                    originMEPCurve2.BreakByPoint(intersectPoint2)
+                                                                );
+                                                                //找到交点最近的连接件
+                                                                var connector1 = originMEPCurve1
+                                                                    .GetConnectors()
+                                                                    .GetNearestConnector(intersectPoint1);
+                                                                var connector2 = newMEP
+                                                                    .GetConnectors()
+                                                                    .GetNearestConnector(intersectPoint1);
+                                                                var connector3 = verticalMEPCurve
+                                                                    .GetConnectors()
+                                                                    .GetNearestConnector(intersectPoint1);
+                                                                var connector4 = originMEPCurve2
+                                                                    .GetConnectors()
+                                                                    .GetNearestConnector(intersectPoint2);
+                                                                var connector5 = newMEP2
+                                                                    .GetConnectors()
+                                                                    .GetNearestConnector(intersectPoint2);
+                                                                var connector6 = verticalMEPCurve
+                                                                    .GetConnectors()
+                                                                    .GetNearestConnector(intersectPoint2);
+                                                                doc.Create.NewTeeFitting(connector1, connector2, connector3);
+                                                                doc.Create.NewTeeFitting(connector4, connector5, connector6);
+                                                            }
+                                                        }
+                                                    }
                                                 }
-
-                                                break;
                                             }
+                                            break;
+                                        case SetComparisonResult.Overlap:
 
-                                            if (intersection1 != null && intersection2 == null)
                                             {
-                                                mainMEPCurve = originMEPCurve1;
-                                                branchMEPCurve = originMEPCurve2;
-                                                Debug.WriteLine($"共面无交点:交点在第一条线上{mainMEPCurve.Id}，为主管");
-                                                if (isPerpendicular && Angle is not 0 and not 90)
+                                                Debug.WriteLine("共面相交");
+                                                var intersectPoint = array.get_Item(0).XYZPoint;
+                                                if (
+                                                    line1.IsInsideEx(intersectPoint, 0.3)
+                                                    && line2.IsInsideEx(intersectPoint, 0.3)
+                                                ) //
                                                 {
-                                                    Debug.WriteLine("使用角度");
-                                                    ConnectByAngle(mainMEPCurve, branchMEPCurve, intersection1, Angle);
+                                                    Debug.WriteLine("管线交叉");
+                                                    doc.Regenerate();
+                                                    var mepCurve1 =
+                                                        doc.GetElement(originMEPCurve1.BreakByPoint(intersectPoint))
+                                                        as MEPCurve;
+                                                    var mepCurve2 =
+                                                        doc.GetElement(originMEPCurve2.BreakByPoint(intersectPoint))
+                                                        as MEPCurve;
+                                                    var conn1 = mepCurve1!.ConnectorManager.Connectors.GetNearestConnector(
+                                                        intersectPoint
+                                                    );
+                                                    var conn2 = mepCurve2!.ConnectorManager.Connectors.GetNearestConnector(
+                                                        intersectPoint
+                                                    );
+                                                    var conn3 = originMEPCurve1.ConnectorManager.Connectors.GetNearestConnector(
+                                                        intersectPoint
+                                                    );
+                                                    var conn4 = originMEPCurve2.ConnectorManager.Connectors.GetNearestConnector(
+                                                        intersectPoint
+                                                    );
+                                                    try
+                                                    {
+                                                        doc.Create.NewCrossFitting(conn1, conn3, conn2, conn4);
+                                                    }
+                                                    catch (Autodesk.Revit.Exceptions.InvalidOperationException) { }
+                                                }
+                                                else if (
+                                                    !line1.IsInsideEx(intersectPoint, 0.1)
+                                                    && line2.IsInsideEx(intersectPoint, 0.3)
+                                                )
+                                                {
+                                                    Debug.WriteLine($"主({originMEPCurve2.Id})次分支");
+                                                    if (isPerpendicular && Angle is not 0 and not 90)
+                                                    {
+                                                        Debug.WriteLine("使用角度");
+                                                        ConnectByAngle(
+                                                            originMEPCurve2,
+                                                            originMEPCurve1,
+                                                            intersectionUnbound,
+                                                            Angle
+                                                        );
+                                                    }
+                                                    else
+                                                    {
+                                                        originMEPCurve2.ConnectTo(originMEPCurve1);
+                                                    }
+                                                }
+                                                else if (
+                                                    line1.IsInsideEx(intersectPoint, 0.1)
+                                                    && !line2.IsInsideEx(intersectPoint, 0.3)
+                                                )
+                                                {
+                                                    Debug.WriteLine($"主({originMEPCurve1.Id})次分支");
+                                                    if (isPerpendicular && Angle is not 0 and not 90)
+                                                    {
+                                                        Debug.WriteLine("使用角度");
+                                                        ConnectByAngle(
+                                                            originMEPCurve1,
+                                                            originMEPCurve2,
+                                                            intersectionUnbound,
+                                                            Angle
+                                                        );
+                                                    }
+                                                    else
+                                                    {
+                                                        originMEPCurve1.ConnectTo(originMEPCurve2);
+                                                    }
                                                 }
                                                 else
                                                 {
-                                                    mainMEPCurve.ConnectTo(branchMEPCurve);
-                                                }
-
-                                                break;
-                                            }
-
-                                            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                                            if (
-                                                intersection1 == null
-                                                && intersection2 == null
-                                                && intersectionUnbound != null
-                                            )
-                                            {
-                                                Debug.WriteLine("共面无交点:两根线都延长才有交点，交叉成角");
-                                                var conn5 = originMEPCurve1
-                                                    .GetConnectors()
-                                                    .GetNearestConnector(intersectionUnbound);
-                                                var conn6 = originMEPCurve2
-                                                    .GetConnectors()
-                                                    .GetNearestConnector(intersectionUnbound);
-                                                var cos = conn5.CoordinateSystem.BasisZ.DotProduct(
-                                                    conn6.CoordinateSystem.BasisZ
-                                                );
-                                                if (cos < -10E-8 || Math.Abs(cos) < 10E-8)
-                                                {
-                                                    Debug.WriteLine("夹角大于等于90度,直接连接");
+                                                    Debug.WriteLine("端点相交");
                                                     if (line1.Direction.IsAlmostEqualTo(XYZ.BasisZ))
                                                     {
                                                         mainMEPCurve = originMEPCurve1;
@@ -234,556 +655,131 @@ public partial class AnyConnectViewModel : ObservableValidator
                                                     }
                                                     else
                                                     {
-                                                        var extendLine = line1.ExtendLine(intersectionUnbound);
-                                                        originMEPCurve1.SetLocationCurve(extendLine);
-                                                        var extendLine2 = line2.ExtendLine(intersectionUnbound);
-                                                        originMEPCurve2.SetLocationCurve(extendLine2);
-                                                        conn5.ConnectByFitting(conn6);
-                                                    }
-                                                }
-                                                else
-                                                {
-                                                    Debug.WriteLine($"夹角是锐角{Math.Acos(cos).ToDegree()}°，创建一条管线再连接");
-                                                    var newMepCurveId = ElementTransformUtils
-                                                        .CopyElement(doc, originMEPCurve1.Id, XYZ.Zero)
-                                                        .FirstOrDefault();
-                                                    var connectMEPCurve = doc.GetElement(newMepCurveId) as MEPCurve;
-                                                    connectMEPCurve.SetLocationCurve(
-                                                        Line.CreateBound(conn5.Origin, conn6.Origin)
-                                                    );
-                                                    var connectors = connectMEPCurve.GetConnectors().Cast<Connector>();
-                                                    conn5.ConnectByFitting(connectors.ElementAt(0));
-                                                    conn6.ConnectByFitting(connectors.ElementAt(1));
-                                                }
-
-                                                break;
-                                            }
-
-                                            if (line1.IsParallelTo(line2))
-                                            {
-                                                var c = line1.Intersect(unboundLine2); //第一个是第二个的SubSet子集
-
-                                                //var c1 = unboundLine1.Intersect(line2);//第一个是第二个的SuperSet超集
-                                                //距离最近的两个连接件
-                                                var originConnectors = ConnectorAssist.GetNearestConnectors(
-                                                       originMEPCurve1,
-                                                       originMEPCurve2
-                                                   );
-
-                                                if (c == SetComparisonResult.Subset)
-                                                {
-                                                    Debug.WriteLine("共线平行");
-
-                                                    originConnectors[0].ConnectByFitting(originConnectors[1]);
-                                                }
-                                                else
-                                                {
-                                                    Debug.WriteLine("非共线平行");
-
-                                                    //最近连接件距离太短时
-                                                    var dis = originConnectors[0].Origin.DistanceTo(
-                                                        originConnectors[1].Origin
-                                                    );
-                                                    if (dis < uiapp.Application.ShortCurveTolerance)
-                                                    {
-                                                        MessageBox.Show("连接处相距太近");
-                                                        break;
-                                                    }
-
-                                                    var isOriginMEPCurve1Bigger = false;
-                                                    //取小的管径,用于复制作为转弯管
-                                                    switch (originConnectors[0].Shape)
-                                                    {
-                                                        case ConnectorProfileType.Round:
-                                                            isOriginMEPCurve1Bigger = originMEPCurve1.Diameter > originMEPCurve2.Diameter;
-                                                            break;
-                                                        case ConnectorProfileType.Rectangular:
-                                                        case ConnectorProfileType.Oval:
-                                                            isOriginMEPCurve1Bigger =
-                                                                originMEPCurve1.Width > originMEPCurve2.Width
-                                                                || originMEPCurve1.Height > originMEPCurve2.Height;
-                                                            break;
-                                                    }
-
-                                                    var elementToCopy = isOriginMEPCurve1Bigger ? originMEPCurve2 : originMEPCurve1;
-                                                    ////原位复制
-                                                    //var copyMepCurveId = ElementTransformUtils
-                                                    //    .CopyElement(doc, elementToCopy.Id, XYZ.Zero)
-                                                    //    .FirstOrDefault();
-                                                    //var copyMepCurve = doc.GetElement(copyMepCurveId) as ElementToMove;
-                                                    //取短的线作为旋转轴的基准点，保证能创建
-                                                    var isFirstMEPCurveLengther = line1.Length < line2.Length;
-                                                    var l = isFirstMEPCurveLengther ? Line.CreateBound(
-                                                              originConnectors[0].Origin,
-                                                              originConnectors[1].Origin
-                                                          ) : Line.CreateBound(
-                                                              originConnectors[1].Origin,
-                                                              originConnectors[0].Origin);
-                                                    ////取短的线作为旋转轴的基准点，保证能创建
-                                                    //var origin = line1.Length < line2.Length
-                                                    //    ? originConnectors[0].Origin
-                                                    //    : originConnectors[1].Origin;
-
-                                                    var copyMepCurve = elementToCopy.CopyAndSetLocationCurve(l);
-
-                                                    doc.Regenerate();
-
-                                                    var conns1 = ConnectorAssist.GetNearestConnectors(
-                                                        originMEPCurve1,
-                                                        copyMepCurve
-                                                    );
-
-                                                    var conns2 = ConnectorAssist.GetNearestConnectors(
-                                                        originMEPCurve2,
-                                                        copyMepCurve
-                                                    );
-                                                    //同向，原管线和复制转弯管线的夹角，一定是大于等于90度，单位向量等价于余弦值
-                                                    var cos = conns1[0].CoordinateSystem.BasisZ.DotProduct(
-                                                        conns1[1].CoordinateSystem.BasisZ
-                                                    );
-                                                    //平行管可以垂直连接
-                                                    if (Angle != 0)
-                                                    {
-                                                        Debug.WriteLine("修改角度");
-                                                        var radian = Angle.ToRadian() - (Math.PI - Math.Acos(cos));
-                                                        //侧向的轴,反向斜管的接口向量，使其为锐角
-                                                        var direction = conns1[0].CoordinateSystem.BasisZ.CrossProduct(
-                                                            -conns1[1].CoordinateSystem.BasisZ
-                                                        );
-
-                                                        var axis = Line.CreateUnbound(l.Origin, direction);
-                                                        ElementTransformUtils.RotateElement(
-                                                            doc,
-                                                            copyMepCurve!.Id,
-                                                            axis,
-                                                            radian
-                                                        );
-                                                    }
-
-                                                    if (cos < -10E-8 || Math.Abs(cos) < 10E-8)
-                                                    {
-                                                        Debug.WriteLine("夹角大于等于时90度");
-                                                        //var angleUnboundLine = copyMepCurve.GetLocCurve().Clone();
-                                                        //angleUnboundLine.MakeUnbound();
-                                                        //if (!conns1[0].Origin.IsAlmostEqualTo(conns1[1].Origin))
-                                                        //{
-                                                        //    var point = unboundLine1.IntersectionPoint(angleUnboundLine);
-                                                        //    var newOriginMEPCurve1 = line1.ExtendLine(point);
-                                                        //    originMEPCurve1.SetLocationCurve(newOriginMEPCurve1);
-                                                        //    //copyMepCurve.SetLocationCurve()
-                                                        //}
-                                                        //if (!conns2[0].Origin.IsAlmostEqualTo(conns2[1].Origin))
-                                                        //{
-                                                        //    var point = unboundLine2.IntersectionPoint(angleUnboundLine);
-                                                        //    var newOriginMEPCurve2 = line2.ExtendLine(point);
-                                                        //    originMEPCurve2.SetLocationCurve(newOriginMEPCurve2);
-                                                        //}
-                                                        //doc.Regenerate();
-                                                        conns1[0].ConnectByFitting(conns1[1]);
-                                                        conns2[0].ConnectByFitting(conns2[1]);
-                                                    }
-                                                    else
-                                                    {
-                                                        ts.RollBack();
+                                                        originMEPCurve1.ConnectTo(originMEPCurve2);
                                                     }
                                                 }
                                             }
-                                            else
-                                            {
-                                                Debug.WriteLine("异面无交点");
-                                                var conn = originMEPCurve1
-                                                    .GetConnectors()
-                                                    .OfType<Connector>()
-                                                    .FirstOrDefault();
-                                                if (line1.Distance(line2) > conn.GetExtensionLength())
-                                                {
-                                                    //找到两条线都垂直的向量
-                                                    var normal = line1.Direction.CrossProduct(line2!.Direction);
-                                                    var p1 = originMEPCurve1.GetLocCurve().GetEndPoint(0);
-                                                    //根据垂直向量，找到能投影到的同一平面
-                                                    var plane = Plane.CreateByNormalAndOrigin(normal, p1);
-                                                    //投影线
-                                                    var newProjectLine = plane.ProjectOnto(
-                                                        originMEPCurve2.GetLocCurve() as Line
-                                                    );
-                                                    //不动的线
-                                                    var stableCurve = originMEPCurve1.GetLocCurve();
-                                                    stableCurve.MakeUnbound();
-                                                    newProjectLine.MakeUnbound();
-                                                    //共面线关系
-                                                    var comparisonResult = stableCurve.Intersect(
-                                                        newProjectLine,
-                                                        out var array2
-                                                    );
-                                                    if (comparisonResult == SetComparisonResult.Overlap)
-                                                    {
-                                                        Debug.WriteLine("非共面相交");
+                                            break;
+                                        case SetComparisonResult.Subset:
+                                        case SetComparisonResult.Superset:
+                                        case SetComparisonResult.Equal:
+                                            Debug.WriteLine("共线，且只有一个交点，即两条有边界直线共线且首尾相连或者两条直线有重合部分");
+                                            MergeParallelMEPCurve(originMEPCurve1, originMEPCurve2);
+                                            break;
+                                    }
 
-                                                        var intersectPoint1 = array2.get_Item(0).XYZPoint;
-                                                        var intersectPoint2 = unboundLine2
-                                                            .Project(intersectPoint1)
-                                                            .XYZPoint;
-                                                        if (
-                                                            intersectPoint1.DistanceTo(intersectPoint2)
-                                                            < uiapp.Application.ShortCurveTolerance
-                                                        )
-                                                        {
-                                                            Debug.WriteLine("交点距离太近");
-                                                            break;
-                                                        }
+                                    //List<Connector> conns4 = ConnectorAssist.GetNearestConnectors(originMEPCurve1, originMEPCurve2, true);
+                                    //conns4[0].ConnectByFitting(conns4[1], true);
+                                    break;
+                                }
+                            case 3:
+                                {
+                                    var unboundLine1 = list[0].GetCurve();
+                                    var unboundLine2 = list[1].GetCurve();
+                                    var unboundLine3 = list[2].GetCurve();
+                                    //无边界保证相交
+                                    unboundLine1.MakeUnbound();
+                                    unboundLine2.MakeUnbound();
+                                    unboundLine3.MakeUnbound();
+                                    var result1 = unboundLine1.Intersect(unboundLine2, out var array1);
+                                    var result2 = unboundLine1.Intersect(unboundLine3, out var array2);
+                                    var result3 = unboundLine2.Intersect(unboundLine3, out var array3);
 
-                                                        var verticalLine = Line.CreateBound(
-                                                            intersectPoint1,
-                                                            intersectPoint2
-                                                        );
-                                                        var verticalMEPCurveId = ElementTransformUtils
-                                                            .CopyElement(doc, originMEPCurve1.Id, XYZ.Zero)
-                                                            .FirstOrDefault();
-                                                        var verticalMEPCurve = doc.GetElement(verticalMEPCurveId);
-                                                        verticalMEPCurve.SetLocationCurve(verticalLine);
-                                                        if (
-                                                            !line1.IsInsideEx(intersectPoint1)
-                                                            && !line2.IsInsideEx(intersectPoint2)
-                                                        )
-                                                        {
-                                                            Debug.WriteLine("都不在直线内,直角连接");
-                                                            var extendLine1 = (
-                                                                originMEPCurve1.GetLocCurve() as Line
-                                                            ).ExtendLine(intersectPoint1);
-                                                            originMEPCurve1.SetLocationCurve(extendLine1);
-                                                            var extendLine2 = (
-                                                                originMEPCurve2.GetLocCurve() as Line
-                                                            ).ExtendLine(intersectPoint2);
-                                                            originMEPCurve2.SetLocationCurve(extendLine2);
-                                                            var conn1 = originMEPCurve1
-                                                                .GetConnectors()
-                                                                .GetNearestConnector(intersectPoint1);
-                                                            var conn2 = verticalMEPCurve
-                                                                .GetConnectors()
-                                                                .GetNearestConnector(intersectPoint1);
-                                                            var conn3 = originMEPCurve2
-                                                                .GetConnectors()
-                                                                .GetNearestConnector(intersectPoint1);
-                                                            var conn4 = verticalMEPCurve
-                                                                .GetConnectors()
-                                                                .GetNearestConnector(intersectPoint2);
-                                                            conn1.ConnectByFitting(conn2);
-                                                            conn3.ConnectByFitting(conn4);
-                                                            break;
-                                                        }
+                                    if (result1 == SetComparisonResult.Equal && result2 == SetComparisonResult.Overlap)
+                                    {
+                                        ConnectBy3MEPCurve(list[0], list[1], list[2], array2);
+                                    }
 
-                                                        if (
-                                                            line1.IsInsideEx(intersectPoint1, 0.5)
-                                                            && !line2.IsInsideEx(intersectPoint2, 0.1)
-                                                        ) //在直线一内，在直线二端点，生成一个三通，一个弯头
-                                                        {
-                                                            mainMEPCurve = originMEPCurve1;
-                                                            branchMEPCurve = originMEPCurve2;
-                                                            Debug.WriteLine($"在直线一{mainMEPCurve.Id}内，在直线一端点，生成一个三通，一个弯头");
+                                    if (result2 == SetComparisonResult.Equal && result3 == SetComparisonResult.Overlap)
+                                    {
+                                        ConnectBy3MEPCurve(list[0], list[2], list[1], array3);
+                                    }
 
-                                                            var line = (branchMEPCurve.GetLocCurve() as Line).ExtendLine(
-                                                                intersectPoint2
-                                                            );
-                                                            branchMEPCurve.SetLocationCurve(line);
-                                                            ConnectBranchMEP(
-                                                                intersectPoint2,
-                                                                intersectPoint1,
-                                                                verticalMEPCurve,
-                                                                mainMEPCurve,
-                                                                branchMEPCurve
-                                                            );
-                                                            break;
-                                                        }
+                                    if (result3 == SetComparisonResult.Equal && result1 == SetComparisonResult.Overlap)
+                                    {
+                                        ConnectBy3MEPCurve(list[1], list[2], list[0], array1);
+                                    }
 
-                                                        if (
-                                                            !line1.IsInsideEx(intersectPoint1, 0.1)
-                                                            && line2.IsInsideEx(intersectPoint2, 0.5)
-                                                        )
-                                                        {
-                                                            mainMEPCurve = originMEPCurve2;
-                                                            branchMEPCurve = originMEPCurve1;
-                                                            Debug.WriteLine($"在直线二内{mainMEPCurve.Id}，在直线一端点，生成一个三通，一个弯头");
+                                    break;
+                                }
+                            case 4:
+                                {
+                                    var unboundLine1 = list[0].GetCurve() as Line;
+                                    var unboundLine2 = list[1].GetCurve() as Line;
+                                    var unboundLine3 = list[2].GetCurve() as Line;
+                                    var unboundLine4 = list[3].GetCurve() as Line;
+                                    unboundLine1!.MakeUnbound();
+                                    unboundLine2!.MakeUnbound();
+                                    unboundLine3!.MakeUnbound();
+                                    unboundLine4!.MakeUnbound();
 
-                                                            var line = (branchMEPCurve.GetLocCurve() as Line).ExtendLine(
-                                                                intersectPoint1
-                                                            );
-                                                            branchMEPCurve.SetLocationCurve(line);
-                                                            ConnectBranchMEP(
-                                                                intersectPoint1,
-                                                                intersectPoint2,
-                                                                verticalMEPCurve,
-                                                                mainMEPCurve,
-                                                                branchMEPCurve
-                                                            );
-                                                            break;
-                                                        }
+                                    var result1 = unboundLine1.Intersect(unboundLine2, out var array1);
+                                    var result2 = unboundLine3.Intersect(unboundLine4);
 
-                                                        if (
-                                                            line1.IsInsideEx(intersectPoint1, 0.5)
-                                                            && line2.IsInsideEx(intersectPoint2, 0.5)
-                                                        ) //
-                                                        {
-                                                            Debug.WriteLine("都在直线范围内，生成两个三通");
-                                                            var newMEP = doc.GetElement(
-                                                                originMEPCurve1.BreakByPoint(intersectPoint1)
-                                                            );
-                                                            var newMEP2 = doc.GetElement(
-                                                                originMEPCurve2.BreakByPoint(intersectPoint2)
-                                                            );
-                                                            //找到交点最近的连接件
-                                                            var connector1 = originMEPCurve1
-                                                                .GetConnectors()
-                                                                .GetNearestConnector(intersectPoint1);
-                                                            var connector2 = newMEP
-                                                                .GetConnectors()
-                                                                .GetNearestConnector(intersectPoint1);
-                                                            var connector3 = verticalMEPCurve
-                                                                .GetConnectors()
-                                                                .GetNearestConnector(intersectPoint1);
-                                                            var connector4 = originMEPCurve2
-                                                                .GetConnectors()
-                                                                .GetNearestConnector(intersectPoint2);
-                                                            var connector5 = newMEP2
-                                                                .GetConnectors()
-                                                                .GetNearestConnector(intersectPoint2);
-                                                            var connector6 = verticalMEPCurve
-                                                                .GetConnectors()
-                                                                .GetNearestConnector(intersectPoint2);
-                                                            doc.Create.NewTeeFitting(connector1, connector2, connector3);
-                                                            doc.Create.NewTeeFitting(connector4, connector5, connector6);
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        break;
-                                    case SetComparisonResult.Overlap:
+                                    var result3 = unboundLine1.Intersect(unboundLine3, out var array3);
+                                    var result4 = unboundLine2.Intersect(unboundLine4);
 
+                                    var result5 = unboundLine1.Intersect(unboundLine4);
+                                    var result6 = unboundLine2.Intersect(unboundLine3);
+                                    //保证垂直关系
+                                    if (
+                                        result1 == SetComparisonResult.Equal
+                                        && result2 == SetComparisonResult.Equal
+                                        && result3 == SetComparisonResult.Overlap
+                                    )
+                                    {
+                                        if (unboundLine1.IsPerpendicularTo(unboundLine3))
                                         {
-                                            Debug.WriteLine("共面相交");
-                                            var intersectPoint = array.get_Item(0).XYZPoint;
-                                            if (
-                                                line1.IsInsideEx(intersectPoint, 0.3)
-                                                && line2.IsInsideEx(intersectPoint, 0.3)
-                                            ) //
-                                            {
-                                                Debug.WriteLine("管线交叉");
-                                                doc.Regenerate();
-                                                var mepCurve1 =
-                                                    doc.GetElement(originMEPCurve1.BreakByPoint(intersectPoint))
-                                                    as MEPCurve;
-                                                var mepCurve2 =
-                                                    doc.GetElement(originMEPCurve2.BreakByPoint(intersectPoint))
-                                                    as MEPCurve;
-                                                var conn1 = mepCurve1!.ConnectorManager.Connectors.GetNearestConnector(
-                                                    intersectPoint
-                                                );
-                                                var conn2 = mepCurve2!.ConnectorManager.Connectors.GetNearestConnector(
-                                                    intersectPoint
-                                                );
-                                                var conn3 = originMEPCurve1.ConnectorManager.Connectors.GetNearestConnector(
-                                                    intersectPoint
-                                                );
-                                                var conn4 = originMEPCurve2.ConnectorManager.Connectors.GetNearestConnector(
-                                                    intersectPoint
-                                                );
-                                                try
-                                                {
-                                                    doc.Create.NewCrossFitting(conn1, conn3, conn2, conn4);
-                                                }
-                                                catch (Autodesk.Revit.Exceptions.InvalidOperationException) { }
-                                            }
-                                            else if (
-                                                !line1.IsInsideEx(intersectPoint, 0.1)
-                                                && line2.IsInsideEx(intersectPoint, 0.3)
-                                            )
-                                            {
-                                                Debug.WriteLine($"主({originMEPCurve2.Id})次分支");
-                                                if (isPerpendicular && Angle is not 0 and not 90)
-                                                {
-                                                    Debug.WriteLine("使用角度");
-                                                    ConnectByAngle(
-                                                        originMEPCurve2,
-                                                        originMEPCurve1,
-                                                        intersectionUnbound,
-                                                        Angle
-                                                    );
-                                                }
-                                                else
-                                                {
-                                                    originMEPCurve2.ConnectTo(originMEPCurve1);
-                                                }
-                                            }
-                                            else if (
-                                                line1.IsInsideEx(intersectPoint, 0.1)
-                                                && !line2.IsInsideEx(intersectPoint, 0.3)
-                                            )
-                                            {
-                                                Debug.WriteLine($"主({originMEPCurve1.Id})次分支");
-                                                if (isPerpendicular && Angle is not 0 and not 90)
-                                                {
-                                                    Debug.WriteLine("使用角度");
-                                                    ConnectByAngle(
-                                                        originMEPCurve1,
-                                                        originMEPCurve2,
-                                                        intersectionUnbound,
-                                                        Angle
-                                                    );
-                                                }
-                                                else
-                                                {
-                                                    originMEPCurve1.ConnectTo(originMEPCurve2);
-                                                }
-                                            }
-                                            else
-                                            {
-                                                Debug.WriteLine("端点相交");
-                                                if (line1.Direction.IsAlmostEqualTo(XYZ.BasisZ))
-                                                {
-                                                    mainMEPCurve = originMEPCurve1;
-                                                    branchMEPCurve = originMEPCurve2;
-                                                }
-                                                else if (line2!.Direction.IsAlmostEqualTo(XYZ.BasisZ))
-                                                {
-                                                    mainMEPCurve = originMEPCurve2;
-                                                    branchMEPCurve = originMEPCurve1;
-                                                }
-                                                else if (line1.Length > line2!.Length)
-                                                {
-                                                    mainMEPCurve = originMEPCurve1;
-                                                    branchMEPCurve = originMEPCurve2;
-                                                }
-                                                else
-                                                {
-                                                    mainMEPCurve = originMEPCurve2;
-                                                    branchMEPCurve = originMEPCurve1;
-                                                }
-
-                                                if (isPerpendicular && Angle is not 0 and not 90)
-                                                {
-                                                    Debug.WriteLine("使用角度");
-                                                    ConnectByAngle(
-                                                        mainMEPCurve,
-                                                        branchMEPCurve,
-                                                        intersectionUnbound,
-                                                        Angle
-                                                    );
-                                                }
-                                                else
-                                                {
-                                                    originMEPCurve1.ConnectTo(originMEPCurve2);
-                                                }
-                                            }
+                                            ConnectBy4MEPCurve(list[0], list[1], list[2], list[3], array3);
                                         }
-                                        break;
-                                    case SetComparisonResult.Subset:
-                                    case SetComparisonResult.Superset:
-                                    case SetComparisonResult.Equal:
-                                        Debug.WriteLine("共线，且只有一个交点，即两条有边界直线共线且首尾相连或者两条直线有重合部分");
-                                        MergeParallelMEPCurve(originMEPCurve1, originMEPCurve2);
-                                        break;
-                                }
-
-                                //List<Connector> conns4 = ConnectorAssist.GetNearestConnectors(originMEPCurve1, originMEPCurve2, true);
-                                //conns4[0].ConnectByFitting(conns4[1], true);
-                                break;
-                            }
-                        case 3:
-                            {
-                                var unboundLine1 = list[0].GetLocCurve();
-                                var unboundLine2 = list[1].GetLocCurve();
-                                var unboundLine3 = list[2].GetLocCurve();
-                                //无边界保证相交
-                                unboundLine1.MakeUnbound();
-                                unboundLine2.MakeUnbound();
-                                unboundLine3.MakeUnbound();
-                                var result1 = unboundLine1.Intersect(unboundLine2, out var array1);
-                                var result2 = unboundLine1.Intersect(unboundLine3, out var array2);
-                                var result3 = unboundLine2.Intersect(unboundLine3, out var array3);
-
-                                if (result1 == SetComparisonResult.Equal && result2 == SetComparisonResult.Overlap)
-                                {
-                                    ConnectBy3MEPCurve(list[0], list[1], list[2], array2);
-                                }
-
-                                if (result2 == SetComparisonResult.Equal && result3 == SetComparisonResult.Overlap)
-                                {
-                                    ConnectBy3MEPCurve(list[0], list[2], list[1], array3);
-                                }
-
-                                if (result3 == SetComparisonResult.Equal && result1 == SetComparisonResult.Overlap)
-                                {
-                                    ConnectBy3MEPCurve(list[1], list[2], list[0], array1);
-                                }
-
-                                break;
-                            }
-                        case 4:
-                            {
-                                var unboundLine1 = list[0].GetLocCurve() as Line;
-                                var unboundLine2 = list[1].GetLocCurve() as Line;
-                                var unboundLine3 = list[2].GetLocCurve() as Line;
-                                var unboundLine4 = list[3].GetLocCurve() as Line;
-                                unboundLine1!.MakeUnbound();
-                                unboundLine2!.MakeUnbound();
-                                unboundLine3!.MakeUnbound();
-                                unboundLine4!.MakeUnbound();
-
-                                var result1 = unboundLine1.Intersect(unboundLine2, out var array1);
-                                var result2 = unboundLine3.Intersect(unboundLine4);
-
-                                var result3 = unboundLine1.Intersect(unboundLine3, out var array3);
-                                var result4 = unboundLine2.Intersect(unboundLine4);
-
-                                var result5 = unboundLine1.Intersect(unboundLine4);
-                                var result6 = unboundLine2.Intersect(unboundLine3);
-                                //保证垂直关系
-                                if (
-                                    result1 == SetComparisonResult.Equal
-                                    && result2 == SetComparisonResult.Equal
-                                    && result3 == SetComparisonResult.Overlap
-                                )
-                                {
-                                    if (unboundLine1.IsPerpendicularTo(unboundLine3))
-                                    {
-                                        ConnectBy4MEPCurve(list[0], list[1], list[2], list[3], array3);
                                     }
-                                }
 
-                                if (
-                                    result3 == SetComparisonResult.Equal
-                                    && result4 == SetComparisonResult.Equal
-                                    && result1 == SetComparisonResult.Overlap
-                                )
-                                {
-                                    if (unboundLine1.IsPerpendicularTo(unboundLine2))
+                                    if (
+                                        result3 == SetComparisonResult.Equal
+                                        && result4 == SetComparisonResult.Equal
+                                        && result1 == SetComparisonResult.Overlap
+                                    )
                                     {
-                                        ConnectBy4MEPCurve(list[0], list[2], list[1], list[3], array1);
+                                        if (unboundLine1.IsPerpendicularTo(unboundLine2))
+                                        {
+                                            ConnectBy4MEPCurve(list[0], list[2], list[1], list[3], array1);
+                                        }
                                     }
-                                }
 
-                                if (
-                                    result5 == SetComparisonResult.Equal
-                                    && result6 == SetComparisonResult.Equal
-                                    && result1 == SetComparisonResult.Overlap
-                                )
-                                {
-                                    if (unboundLine1.IsPerpendicularTo(unboundLine2))
+                                    if (
+                                        result5 == SetComparisonResult.Equal
+                                        && result6 == SetComparisonResult.Equal
+                                        && result1 == SetComparisonResult.Overlap
+                                    )
                                     {
-                                        ConnectBy4MEPCurve(list[0], list[3], list[1], list[2], array1);
+                                        if (unboundLine1.IsPerpendicularTo(unboundLine2))
+                                        {
+                                            ConnectBy4MEPCurve(list[0], list[3], list[1], list[2], array1);
+                                        }
                                     }
-                                }
 
-                                break;
-                            }
-                    }
+                                    break;
+                                }
+                        }
 #if REVIT2020
                     OptionsBarAssist.HideOptionsBar();
 #endif
-                },
-                "任意连接"
-            );
-
+                    },
+                    "任意连接"
+                );
+            }
+            catch (Autodesk.Revit.Exceptions.OperationCanceledException)
+            {
+                CanRunning = true;
+#if REVIT2020
+                OptionsBarAssist.HideOptionsBar();
+#endif
+                return;
+            }
+            catch (Exception)
+            {
+                CanRunning = true;
+            }
             CanRunning = true;
         });
     }
@@ -832,9 +828,9 @@ public partial class AnyConnectViewModel : ObservableValidator
     {
         var doc = originMEPCurve1.Document;
         var intersection = array.get_Item(0).XYZPoint;
-        var line1 = originMEPCurve1.GetLocCurve() as Line;
-        var line2 = originMEPCurve2.GetLocCurve() as Line;
-        var line3 = originMEPCurve3.GetLocCurve() as Line;
+        var line1 = originMEPCurve1.GetCurve() as Line;
+        var line2 = originMEPCurve2.GetCurve() as Line;
+        var line3 = originMEPCurve3.GetCurve() as Line;
         var extendLine = line1.ExtendLine(intersection);
         originMEPCurve1.SetLocationCurve(extendLine);
         var extendLine2 = line2.ExtendLine(intersection);
@@ -875,10 +871,10 @@ public partial class AnyConnectViewModel : ObservableValidator
     {
         var doc = originMEPCurve1.Document;
         var intersection = array.get_Item(0).XYZPoint;
-        var line = originMEPCurve1.GetLocCurve() as Line;
-        var line2 = originMEPCurve2.GetLocCurve() as Line;
-        var line3 = originMEPCurve3.GetLocCurve() as Line;
-        var line4 = originMEPCurve4.GetLocCurve() as Line;
+        var line = originMEPCurve1.GetCurve() as Line;
+        var line2 = originMEPCurve2.GetCurve() as Line;
+        var line3 = originMEPCurve3.GetCurve() as Line;
+        var line4 = originMEPCurve4.GetCurve() as Line;
         var extendLine = line.ExtendLine(intersection);
         originMEPCurve1.SetLocationCurve(extendLine);
         var extendLine2 = line2.ExtendLine(intersection);
@@ -914,7 +910,7 @@ public partial class AnyConnectViewModel : ObservableValidator
         {
             var branchEndpoint =
                 branchNearestConnector.Origin - (branchNearestConnector.CoordinateSystem.BasisZ * extendLength);
-            var branchLine = (branchMepCurve.GetLocCurve() as Line).ExtendLine(branchEndpoint);
+            var branchLine = (branchMepCurve.GetCurve() as Line).ExtendLine(branchEndpoint);
             branchMepCurve.SetLocationCurve(branchLine);
         }
 
@@ -924,7 +920,7 @@ public partial class AnyConnectViewModel : ObservableValidator
         );
         var axis = Line.CreateUnbound(branchNearestConnector.Origin, normal);
         var angleLine = Line.CreateBound(intersection2, branchNearestConnector.Origin);
-        if (!angleLine.Direction.IsAlmostEqualTo((branchMepCurve.GetLocCurve() as Line)?.Direction))
+        if (!angleLine.Direction.IsAlmostEqualTo((branchMepCurve.GetCurve() as Line)?.Direction))
         {
             angleLine = angleLine.CreateReversed() as Line;
         }
@@ -934,12 +930,12 @@ public partial class AnyConnectViewModel : ObservableValidator
         angleMepCurve.SetLocationCurve(angleLine);
         ElementTransformUtils.RotateElement(doc, angleMepCurve!.Id, axis, angle.ToRadian());
         doc.Regenerate();
-        var unboundMainLine = mainMepCurve.GetLocCurve() as Line;
+        var unboundMainLine = mainMepCurve.GetCurve() as Line;
         unboundMainLine!.MakeUnbound();
-        var unboundAngleLine = angleMepCurve.GetLocCurve() as Line;
+        var unboundAngleLine = angleMepCurve.GetCurve() as Line;
         unboundAngleLine!.MakeUnbound();
         var mainEndpoint = unboundAngleLine.IntersectionPoint(unboundMainLine);
-        var mainLine = (mainMepCurve.GetLocCurve() as Line).ExtendLine(mainEndpoint);
+        var mainLine = (mainMepCurve.GetCurve() as Line).ExtendLine(mainEndpoint);
         mainMepCurve.SetLocationCurve(mainLine);
         doc.Regenerate();
         mainMepCurve.ConnectTo(angleMepCurve);
@@ -962,14 +958,14 @@ public partial class AnyConnectViewModel : ObservableValidator
             case ConnectorProfileType.Round:
                 flag =
                     originMEPCurve1.Diameter > originMEPCurve2.Diameter
-                    || originMEPCurve1.GetLocCurve().Length > originMEPCurve2.GetLocCurve().Length;
+                    || originMEPCurve1.GetCurve().Length > originMEPCurve2.GetCurve().Length;
                 break;
             case ConnectorProfileType.Rectangular:
             case ConnectorProfileType.Oval:
                 flag =
                     originMEPCurve1.Width > originMEPCurve2.Width
                     || originMEPCurve1.Height > originMEPCurve2.Height
-                    || originMEPCurve1.GetLocCurve().Length > originMEPCurve2.GetLocCurve().Length;
+                    || originMEPCurve1.GetCurve().Length > originMEPCurve2.GetCurve().Length;
                 break;
         }
 
@@ -987,7 +983,7 @@ public partial class AnyConnectViewModel : ObservableValidator
             removeMEPCurve = originMEPCurve1;
         }
 
-        List<Connector> connsConnected = new();
+        List<Connector> connsConnected = [];
         //Dictionary<Connector, Connector> dict = new ();
         foreach (var item in conns)
         {
diff --git a/Sai.RvKits/RvMEP/ArrangeMEPCurveViewModel.cs b/Sai.RvKits/RvMEP/ArrangeMEPCurveViewModel.cs
index 1081053..55056e2 100644
--- a/Sai.RvKits/RvMEP/ArrangeMEPCurveViewModel.cs
+++ b/Sai.RvKits/RvMEP/ArrangeMEPCurveViewModel.cs
@@ -44,10 +44,15 @@ namespace Sai.RvKits.RvMEP
                                                     e is not InsulationLiningBase &&
                                                     e is not FlexDuct &&
                                                     e is not FlexPipe &&
-                                                    !(e.GetLocCurve() as Line).Direction.IsParallelTo(XYZ.BasisZ)),
+                                                    !(e.GetCurve() as Line).Direction.IsParallelTo(XYZ.BasisZ)),
                                             "请选择要整理的管线")
                                         .Select(e => e.Id)
                                         .ToList();
+                                    if (ids.Count <= 1)
+                                    {
+                                        return;
+                                    }
+
                                     var baseId = uidoc.Selection
                                         .PickObject(
                                             Autodesk.Revit.UI.Selection.ObjectType.Element,
@@ -55,13 +60,8 @@ namespace Sai.RvKits.RvMEP
                                             "请选择基准管线")
                                         .ElementId;
 
-                                    if (ids.Count <= 1)
-                                    {
-                                        return;
-                                    }
-
                                     var baseElement = doc.GetElement(baseId);
-                                    var baseLine = baseElement.GetLocCurve() as Line;
+                                    var baseLine = baseElement.GetCurve() as Line;
                                     baseLine.MakeUnbound();
                                     if (IsHorizon)
                                     {
@@ -72,10 +72,10 @@ namespace Sai.RvKits.RvMEP
                                         foreach (var id in ids)
                                         {
                                             var elem = doc.GetElement(id);
-                                            var l = elem.GetLocCurve() as Line;
+                                            var l = elem.GetCurve() as Line;
                                             if (!l.Direction.IsParallelTo(baseLine.Direction))
                                             {
-                                                MessageBox.Show("错误", "所选管线不平行");
+                                                MessageBox.Show("所选管线不平行", "错误");
                                                 return;
                                             }
                                             var d = baseLine.Distance(l.Origin);
@@ -225,14 +225,14 @@ namespace Sai.RvKits.RvMEP
                                     {
                                         //通过LocationCurve确定相对位置关系
                                         var orderIds = ids.Select(id => doc.GetElement(id) as MEPCurve)
-                                            .OrderBy(c => (c.GetLocCurve() as Line).Origin.Z).Select(e => e.Id).ToList();
+                                            .OrderBy(c => (c.GetCurve() as Line).Origin.Z).Select(e => e.Id).ToList();
                                         //中心距
                                         if (MEPCurveCenter)
                                         {
                                             var baseIndex = orderIds.IndexOf(baseId);
                                             for (var i = 0; i < orderIds.Count; i++)
                                             {
-                                                var currentZ = (doc.GetElement(orderIds[i]).GetLocCurve() as Line).Origin.Z;
+                                                var currentZ = (doc.GetElement(orderIds[i]).GetCurve() as Line).Origin.Z;
                                                 var dis = Math.Abs(baseLine.Origin.Z - currentZ);
                                                 var actualDis = Math.Abs((baseIndex - i)) * Gap / 304.8;
                                                 //判断方向
@@ -255,7 +255,7 @@ namespace Sai.RvKits.RvMEP
                                         {
                                             ids.Remove(baseId);
                                             var groups = ids.Select(id => doc.GetElement(id) as MEPCurve)
-                                            .OrderBy(c => (c.GetLocCurve() as Line).Origin.Z).GroupBy(e => (e.GetLocCurve() as Line).Origin.Z > baseLine.Origin.Z);
+                                            .OrderBy(c => (c.GetCurve() as Line).Origin.Z).GroupBy(e => (e.GetCurve() as Line).Origin.Z > baseLine.Origin.Z);
                                             var baseTop = baseElement.get_BoundingBox(null).Max.Z;
                                             var baseBottom = baseElement.get_BoundingBox(null).Min.Z;
                                             if (baseElement is Pipe or Duct)
diff --git a/Sai.RvKits/RvMEP/BloomConnectorCmd.cs b/Sai.RvKits/RvMEP/BloomConnectorCmd.cs
index 7e33b3a..55d35a2 100644
--- a/Sai.RvKits/RvMEP/BloomConnectorCmd.cs
+++ b/Sai.RvKits/RvMEP/BloomConnectorCmd.cs
@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Diagnostics;
 
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Electrical;
@@ -9,6 +10,8 @@ using Autodesk.Revit.UI.Selection;
 
 using Nice3point.Revit.Toolkit.External;
 
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+
 using Sai.Toolkit.Revit.Helpers;
 
 namespace Sai.RvKits.RvMEP;
@@ -24,7 +27,11 @@ internal class BloomConnectorCmd : ExternalCommand //根据连接件创建一根
             var elemIds = UiDocument.Selection.GetElementIds();
             if (elemIds.Count == 0)
             {
-                var reference = UiDocument.Selection.PickObject(ObjectType.Element, new FuncFilter(e => e is FamilyInstance ins && ins.MEPModel.ConnectorManager != null), "请选择族实例");
+                var reference = UiDocument.Selection
+                    .PickObject(
+                        ObjectType.Element,
+                        new FuncFilter(e => e is FamilyInstance ins && ins.GetConnectors(true).Size > 0),
+                        "请选择族实例");
                 elemIds.Add(Document.GetElement(reference).Id);
             }
 
@@ -34,15 +41,13 @@ internal class BloomConnectorCmd : ExternalCommand //根据连接件创建一根
                 var cableTrayTypeId = Document.OfClass<CableTrayType>().FirstElementId();
                 var conduitTypeId = Document.OfClass<ConduitType>().FirstElementId();
 
-                var filteredElementCollector = Document.OfClass<DuctType>();
+                var ductTypeCollector = Document.OfClass<DuctType>().Cast<DuctType>();
                 var roundDuctTypeId = ElementId.InvalidElementId;
                 var rectangleDuctTypeId = ElementId.InvalidElementId;
                 var ovalDuctTypeId = ElementId.InvalidElementId;
-
-                foreach (var element2 in filteredElementCollector)
+                //设置默认的风管类型
+                foreach (var ductType in ductTypeCollector)
                 {
-                    var ductType = (DuctType)element2;
-
                     if (ductType.FamilyName == "圆形风管" || ductType.FamilyName.Contains("Round Duct"))
                     {
                         roundDuctTypeId = ductType.Id;
@@ -65,7 +70,7 @@ internal class BloomConnectorCmd : ExternalCommand //根据连接件创建一根
                 }
                 CableTray referCabTray = null;
                 Conduit referConduit = null;
-                //拿到连接的管线的类型
+                //根据连接件拿到连接的管线的类型
                 foreach (Connector conn in elem.GetConnectors())
                 {
                     if (conn.IsConnected)
@@ -117,8 +122,8 @@ internal class BloomConnectorCmd : ExternalCommand //根据连接件创建一根
                 Document.Invoke(
                     _ =>
                     {
-                        var conns = elem.GetConnectors(true);
-                        foreach (Connector connector in conns)
+                        var connectors = elem.GetConnectors(true);
+                        foreach (Connector connector in connectors)
                         {
                             Element element = null;
                             if (elem.Category.Id.IntegerValue == (int)BuiltInCategory.OST_FabricationPipework)
@@ -166,6 +171,7 @@ internal class BloomConnectorCmd : ExternalCommand //根据连接件创建一根
                             }
                             var extensionLength = connector.GetExtensionLength();
                             var origin = connector.Origin;
+                            //延伸后的点
                             var xyz2 = origin + (extensionLength * connector.CoordinateSystem.BasisZ);
                             var levelId = elem.LevelId;
                             if (levelId == ElementId.InvalidElementId)
@@ -193,43 +199,43 @@ internal class BloomConnectorCmd : ExternalCommand //根据连接件创建一根
                                     break;
                                 //风管
                                 case Domain.DomainHvac:
-                                    var mechanicalSystemTypes = new FilteredElementCollector(Document)
-                                        .OfClass(typeof(MechanicalSystemType))
-                                        .Cast<MechanicalSystemType>();
-                                    //风管系统类型
-                                    var mechanicalSystem =
-                                        connector.MEPSystem == null
-                                            ? connector.DuctSystemType switch
-                                            {
-                                                //送风
-                                                DuctSystemType.SupplyAir
-                                                    => mechanicalSystemTypes.FirstOrDefault(
-                                                        pst =>
-                                                            pst.SystemClassification
-                                                            == Autodesk.Revit.DB.MEPSystemClassification.SupplyAir
-                                                    ),
-                                                //回风
-                                                DuctSystemType.ReturnAir
-                                                    => mechanicalSystemTypes.FirstOrDefault(
-                                                        pst =>
-                                                            pst.SystemClassification
-                                                            == Autodesk.Revit.DB.MEPSystemClassification.ReturnAir
-                                                    ),
-                                                //排风
-                                                DuctSystemType.ExhaustAir
-                                                    => mechanicalSystemTypes.FirstOrDefault(
-                                                        pst =>
-                                                            pst.SystemClassification
-                                                            == Autodesk.Revit.DB.MEPSystemClassification.ExhaustAir
-                                                    ),
-                                                _
-                                                    => mechanicalSystemTypes.FirstOrDefault(
-                                                        pst =>
-                                                            pst.SystemClassification
-                                                            == Autodesk.Revit.DB.MEPSystemClassification.OtherAir
-                                                    )
-                                            }
-                                            : Document.GetElement(connector.MEPSystem.GetTypeId()) as MechanicalSystemType;
+                                    //var mechanicalSystemTypes = new FilteredElementCollector(Document)
+                                    //    .OfClass(typeof(MechanicalSystemType))
+                                    //    .Cast<MechanicalSystemType>();
+                                    ////风管系统类型
+                                    //var mechanicalSystem =
+                                    //    connector.MEPSystem == null
+                                    //        ? connector.DuctSystemType switch
+                                    //        {
+                                    //            //送风
+                                    //            DuctSystemType.SupplyAir
+                                    //                => mechanicalSystemTypes.FirstOrDefault(
+                                    //                    pst =>
+                                    //                        pst.SystemClassification
+                                    //                        == Autodesk.Revit.DB.MEPSystemClassification.SupplyAir
+                                    //                ),
+                                    //            //回风
+                                    //            DuctSystemType.ReturnAir
+                                    //                => mechanicalSystemTypes.FirstOrDefault(
+                                    //                    pst =>
+                                    //                        pst.SystemClassification
+                                    //                        == Autodesk.Revit.DB.MEPSystemClassification.ReturnAir
+                                    //                ),
+                                    //            //排风
+                                    //            DuctSystemType.ExhaustAir
+                                    //                => mechanicalSystemTypes.FirstOrDefault(
+                                    //                    pst =>
+                                    //                        pst.SystemClassification
+                                    //                        == Autodesk.Revit.DB.MEPSystemClassification.ExhaustAir
+                                    //                ),
+                                    //            _
+                                    //                => mechanicalSystemTypes.FirstOrDefault(
+                                    //                    pst =>
+                                    //                        pst.SystemClassification
+                                    //                        == Autodesk.Revit.DB.MEPSystemClassification.OtherAir
+                                    //                )
+                                    //        }
+                                    //        : Document.GetElement(connector.MEPSystem.GetTypeId()) as MechanicalSystemType;
 
                                     //if (new FilteredElementCollector(Document).OfClass(typeof(DuctType)).FirstElement() is not DuctType)
                                     //{
@@ -242,10 +248,9 @@ internal class BloomConnectorCmd : ExternalCommand //根据连接件创建一根
                                         case ConnectorProfileType.Round:
                                             element = Duct.Create(
                                                 Document,
-                                                mechanicalSystem.Id,
                                                 roundDuctTypeId,
                                                 levelId,
-                                                origin,
+                                                connector,
                                                 xyz2
                                             );
 
@@ -256,31 +261,33 @@ internal class BloomConnectorCmd : ExternalCommand //根据连接件创建一根
                                         case ConnectorProfileType.Rectangular:
                                             element = Duct.Create(
                                                 Document,
-                                                mechanicalSystem.Id,
                                                 rectangleDuctTypeId,
                                                 levelId,
-                                                origin,
+                                                connector,
                                                 xyz2
                                             );
                                             Document.Regenerate();
-                                            element.get_Parameter(BuiltInParameter.RBS_CURVE_WIDTH_PARAM).Set(connector.Width);
-                                            element.get_Parameter(BuiltInParameter.RBS_CURVE_HEIGHT_PARAM).Set(connector.Height);
+                                            var width = Math.Max(connector.Width, connector.Height);
+                                            var height = Math.Min(connector.Width, connector.Height);
+                                            element.get_Parameter(BuiltInParameter.RBS_CURVE_WIDTH_PARAM).Set(width);
+                                            element.get_Parameter(BuiltInParameter.RBS_CURVE_HEIGHT_PARAM).Set(height);
                                             break;
 
                                         case ConnectorProfileType.Oval:
-                                            element = Duct.Create(Document, mechanicalSystem.Id, ovalDuctTypeId, levelId, origin, xyz2);
+                                            element = Duct.Create(Document, ovalDuctTypeId, levelId, connector, xyz2);
                                             Document.Regenerate();
-                                            element.get_Parameter(BuiltInParameter.RBS_CURVE_WIDTH_PARAM).Set(connector.Width);
-                                            element.get_Parameter(BuiltInParameter.RBS_CURVE_HEIGHT_PARAM).Set(connector.Height);
+                                            var w = Math.Max(connector.Width, connector.Height);
+                                            var h = Math.Min(connector.Width, connector.Height);
+                                            element.get_Parameter(BuiltInParameter.RBS_CURVE_WIDTH_PARAM).Set(w);
+                                            element.get_Parameter(BuiltInParameter.RBS_CURVE_HEIGHT_PARAM).Set(h);
                                             break;
 
                                         default:
                                             element = Duct.Create(
                                                 Document,
-                                                mechanicalSystem.Id,
                                                 roundDuctTypeId,
                                                 levelId,
-                                                origin,
+                                                connector,
                                                 xyz2
                                             );
                                             break;
@@ -297,7 +304,7 @@ internal class BloomConnectorCmd : ExternalCommand //根据连接件创建一根
                                     .Cast<PipingSystemType>();
                                     if (pipeTypeId == ElementId.InvalidElementId)
                                     {
-                                        pipeTypeId = Document.OfClass<PipeType>().WhereElementIsElementType().FirstElementId();
+                                        pipeTypeId = Document.OfClass<PipeType>().FirstElementId();
                                     }
                                     var system = connector.MEPSystem;
                                     var pipingSystemType =
@@ -435,9 +442,11 @@ internal class BloomConnectorCmd : ExternalCommand //根据连接件创建一根
                                             break;
 
                                         case ConnectorProfileType.Rectangular:
+                                            var width = Math.Max(connector.Width, connector.Height);
+                                            var height = Math.Min(connector.Width, connector.Height);
                                             element = CableTray.Create(Document, cableTrayTypeId, origin, xyz2, levelId);
-                                            element.get_Parameter(BuiltInParameter.RBS_CABLETRAY_WIDTH_PARAM).Set(connector.Width);
-                                            element.get_Parameter(BuiltInParameter.RBS_CABLETRAY_HEIGHT_PARAM).Set(connector.Height);
+                                            element.get_Parameter(BuiltInParameter.RBS_CABLETRAY_WIDTH_PARAM).Set(width);
+                                            element.get_Parameter(BuiltInParameter.RBS_CABLETRAY_HEIGHT_PARAM).Set(height);
                                             if (referCabTray != null)
                                             {
                                                 var value = referCabTray.get_Parameter(
@@ -460,15 +469,81 @@ internal class BloomConnectorCmd : ExternalCommand //根据连接件创建一根
                                 continue;
                             }
                             var curve = element as MEPCurve;
-                            var manager = curve.ConnectorManager;
-                            var lter = manager.UnusedConnectors.ForwardIterator();
-                            while (lter.MoveNext())
+                            var conns = curve.ConnectorManager.UnusedConnectors.Cast<Connector>();
+                            foreach (var connect in conns)
                             {
-                                var connect = lter.Current as Connector;
                                 if (connect.Origin.IsAlmostEqualTo(connector.Origin))
                                 {
+                                    Debug.WriteLine("新建管线：");
+                                    Debug.WriteLine(connect.CoordinateSystem.BasisX);
+                                    Debug.WriteLine(connect.CoordinateSystem.BasisY);
+                                    Debug.WriteLine(connect.CoordinateSystem.BasisZ);
+                                    Debug.WriteLine("管件：");
+                                    Debug.WriteLine(connector.CoordinateSystem.BasisX);
+                                    Debug.WriteLine(connector.CoordinateSystem.BasisY);
+                                    Debug.WriteLine(connector.CoordinateSystem.BasisZ);
+                                    var isStandMEPCurve = connect.CoordinateSystem.BasisZ.CrossProduct(XYZ.BasisZ).IsAlmostEqualTo(XYZ.Zero);
+
+                                    if (isStandMEPCurve)
+                                    {
+                                        var angleX = Math.Acos(connect.CoordinateSystem.BasisX.DotProduct(connector.CoordinateSystem.BasisX));
+                                        Debug.WriteLine(angleX);
+                                        var crossProduct = connect.CoordinateSystem.BasisX
+                                            .CrossProduct(connector.CoordinateSystem.BasisX).Normalize();
+                                        var angle = Math.Acos(connect.CoordinateSystem.BasisX.DotProduct(connector.CoordinateSystem.BasisX));
+                                        if (crossProduct.IsAlmostEqualTo(XYZ.Zero))
+                                        {
+                                            if (connect.CoordinateSystem.BasisX
+                                                .IsAlmostEqualTo(connector.CoordinateSystem.BasisX))
+                                            {
+                                                ElementTransformUtils.RotateElement(
+                                                    Document,
+                                                    element.Id,
+                                                    Line.CreateUnbound(origin, XYZ.BasisZ),
+                                                    Math.PI / 2);
+                                            }
+                                        }
+                                        else
+                                        {
+                                            if (angleX > Math.PI / 2)
+                                            {
+                                                ElementTransformUtils.RotateElement(
+                                                    Document,
+                                                    element.Id,
+                                                    Line.CreateUnbound(origin, XYZ.BasisZ),
+                                                    angleX - Math.PI / 2);
+                                            }
+                                            else
+                                            {
+                                                ElementTransformUtils.RotateElement(
+                                                    Document,
+                                                    element.Id,
+                                                    Line.CreateUnbound(origin, XYZ.BasisZ),
+                                                    Math.PI / 2 - angleX);
+                                            }
+                                        }
+                                        //if (Math.Abs(angleX - Math.PI / 2) > 0.001)
+                                        //{
+                                        //    ElementTransformUtils.RotateElement(
+                                        //       Document,
+                                        //       element.Id,
+                                        //       Line.CreateUnbound(origin, crossProduct),
+                                        //  angleX - Math.PI / 2
+                                        //       );
+                                        //    Debug.WriteLine("旋转后新建管线：");
+                                        //    Debug.WriteLine(connect.CoordinateSystem.BasisX);
+                                        //    Debug.WriteLine(connect.CoordinateSystem.BasisY);
+                                        //    Debug.WriteLine(connect.CoordinateSystem.BasisZ);
+                                        //    Document.Regenerate();
+                                        //    angle = Math.Acos(connect.CoordinateSystem.BasisX.DotProduct(connector.CoordinateSystem.BasisX));
+                                        //    Debug.WriteLine(nameof(angle) + angle);
+                                        //}
+                                    }
                                     var conn = elem.GetConnectors(true).GetNearestConnector(connector.Origin);
-                                    conn.ConnectTo(connect);
+                                    if (!connect.IsConnectedTo(connector))
+                                    {
+                                        connect.ConnectTo(connector);
+                                    }
                                     break;
                                 }
                             }
diff --git a/Sai.RvKits/RvMEP/BreakMEPCurveCmd.cs b/Sai.RvKits/RvMEP/BreakMEPCurveCmd.cs
index 6f8a006..6bd8824 100644
--- a/Sai.RvKits/RvMEP/BreakMEPCurveCmd.cs
+++ b/Sai.RvKits/RvMEP/BreakMEPCurveCmd.cs
@@ -32,14 +32,14 @@ public class BreakMEPCurveCmd : ExternalCommand
                 var pointPicked = refer1.GlobalPoint;
 
                 var mepCurve = UiDocument.Document.GetElement(refer1) as MEPCurve;
-                var loc = mepCurve.GetLocCurve() as Line;
+                var loc = mepCurve.GetCurve() as Line;
                 var d = loc.Direction;
                 var halfGap = 20 / 304.8;
                 var point1 = pointPicked - d * halfGap;
                 var point2 = pointPicked + d * halfGap;
                
-                var breakPoint1 = mepCurve.GetLocCurve().Project(point1).XYZPoint;
-                var breakPoint2 = mepCurve.GetLocCurve().Project(point2).XYZPoint;
+                var breakPoint1 = mepCurve.GetCurve().Project(point1).XYZPoint;
+                var breakPoint2 = mepCurve.GetCurve().Project(point2).XYZPoint;
                 if (!loc.IsInsideEx(breakPoint1, halfGap) || !loc.IsInsideEx(breakPoint2, halfGap))
                 {
                     MessageBox.Show("打断点距离管线端点太近");
diff --git a/Sai.RvKits/RvMEP/CableLayoutCmd.cs b/Sai.RvKits/RvMEP/CableLayoutCmd.cs
index 1c23218..6eca101 100644
--- a/Sai.RvKits/RvMEP/CableLayoutCmd.cs
+++ b/Sai.RvKits/RvMEP/CableLayoutCmd.cs
@@ -48,8 +48,8 @@ public class CableLayoutCmd : ExternalCommand
                         var conduit = Conduit.Create(
                             Document,
                             conduitType.Id,
-                            mepCurve.GetLocCurve().GetEndPoint(0),
-                            mepCurve.GetLocCurve().GetEndPoint(1),
+                            mepCurve.GetCurve().GetEndPoint(0),
+                            mepCurve.GetCurve().GetEndPoint(1),
                             mepCurve.LevelId
                         );
                         firstConduits.Add(conduit);
@@ -71,7 +71,7 @@ public class CableLayoutCmd : ExternalCommand
 
                         foreach (var conduit in firstConduits)
                         {
-                            var line = conduit.GetLocCurve() as Line;
+                            var line = conduit.GetCurve() as Line;
                             var direction = line!.Direction.CrossProduct(XYZ.BasisZ);
                             var id = ElementTransformUtils.CopyElement(Document, conduit.Id, direction * offest).FirstOrDefault();
                             var conduitCopied = Document.GetElement(id) as Conduit;
diff --git a/Sai.RvKits/RvMEP/ClashResolveCmd.cs b/Sai.RvKits/RvMEP/ClashResolveCmd.cs
index 7ec3ff9..7cfe15e 100644
--- a/Sai.RvKits/RvMEP/ClashResolveCmd.cs
+++ b/Sai.RvKits/RvMEP/ClashResolveCmd.cs
@@ -10,8 +10,16 @@ namespace Sai.RvKits.RvMEP;
 [Regeneration(RegenerationOption.Manual)]
 public class ClashResolveCmd : ExternalCommand
 {
-	public override void Execute()
-	{
-		WinDialogHelper.ShowModeless<ClashResolveView>(new ClashResolveViewModel());
-	}
+    public override void Execute()
+    {
+        try
+        {
+            WinDialogHelper.ShowModeless<ClashResolveView>(new ClashResolveViewModel());
+        }
+        catch (Exception)
+        {
+
+            throw;
+        }
+    }
 }
diff --git a/Sai.RvKits/RvMEP/ClashResolveView.xaml b/Sai.RvKits/RvMEP/ClashResolveView.xaml
index cbeb445..4f96220 100644
--- a/Sai.RvKits/RvMEP/ClashResolveView.xaml
+++ b/Sai.RvKits/RvMEP/ClashResolveView.xaml
@@ -89,8 +89,14 @@
         <ex:StackPanelEx Orientation="Horizontal" Spacing="5">
             <GroupBox ex:StackPanelEx.Fill="Fill" Header="参考方式">
                 <UniformGrid Rows="1">
-                    <RadioButton Content="手动" IsChecked="{Binding LocationType, ConverterParameter={x:Static local:LocationType.Manual}, Converter={StaticResource ComparisonConverter}}" />
-                    <RadioButton Content="参考" IsChecked="{Binding LocationType, ConverterParameter={x:Static local:LocationType.Reference}, Converter={StaticResource ComparisonConverter}}" />
+                    <RadioButton
+                        Content="手动"
+                        IsChecked="{Binding LocationType, ConverterParameter={x:Static local:LocationType.Manual}, Converter={StaticResource ComparisonConverter}}"
+                        ToolTip="手动选取两点" />
+                    <RadioButton
+                        Content="参考"
+                        IsChecked="{Binding LocationType, ConverterParameter={x:Static local:LocationType.Reference}, Converter={StaticResource ComparisonConverter}}"
+                        ToolTip="选择相交的两条管线，将翻弯管线偏移一定距离" />
                 </UniformGrid>
             </GroupBox>
             <GroupBox ex:StackPanelEx.Fill="Fill" Header="调整方式">
diff --git a/Sai.RvKits/RvMEP/ClashResolveViewModel.cs b/Sai.RvKits/RvMEP/ClashResolveViewModel.cs
index b491529..d892bbf 100644
--- a/Sai.RvKits/RvMEP/ClashResolveViewModel.cs
+++ b/Sai.RvKits/RvMEP/ClashResolveViewModel.cs
@@ -1,8 +1,10 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
 using System.Windows;
 
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI.Selection;
+using Autodesk.Windows;
 
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -36,15 +38,15 @@ public partial class ClashResolveViewModel : ObservableObject
     private LocationType locationType = LocationType.Manual;
 
     public ActionEventHandler ActionEventHandler { get; } = new();
-
+    partial void OnLocationTypeChanged(LocationType value)
+    {
+        KeyIntPtrHelper.RaiseEscTwice();
+    }
     [RelayCommand]
-    private void Closing()
+    private static void Closing()
     {
         //关闭窗口退出选择
-        if (!CanRunning)
-        {
-            KeyIntPtrHelper.ActionEsc();
-        }
+        KeyIntPtrHelper.RaiseEscTwice();
     }
 
     [RelayCommand(CanExecute = nameof(CanRunning))]
@@ -74,7 +76,7 @@ public partial class ClashResolveViewModel : ObservableObject
                                         new FuncFilter(
                                             e =>
                                                 e is MEPCurve mepCurve and not InsulationLiningBase
-                                                && mepCurve.GetLocCurve() is Line line
+                                                && mepCurve.GetCurve() is Line line
                                                 && !line.Direction.CrossProduct(XYZ.BasisZ).IsAlmostEqualTo(XYZ.Zero)
                                         ),
                                         "请选择翻弯的管线上的点"
@@ -92,8 +94,8 @@ public partial class ClashResolveViewModel : ObservableObject
                                         "请选择另一个翻弯管线上的点或确定单侧翻弯的需要偏移一侧"
                                     );
                                     //两个断点,breakPoint1距离原直线起点近，反向时，交换值
-                                    breakPoint1 = mepCurveToBend.GetLocCurve().Project(reference1.GlobalPoint).XYZPoint;
-                                    breakPoint2 = mepCurveToBend.GetLocCurve().Project(reference2.GlobalPoint).XYZPoint;
+                                    breakPoint1 = mepCurveToBend.GetCurve().Project(reference1.GlobalPoint).XYZPoint;
+                                    breakPoint2 = mepCurveToBend.GetCurve().Project(reference2.GlobalPoint).XYZPoint;
                                 }
                                 break;
                             case LocationType.Reference:
@@ -104,21 +106,21 @@ public partial class ClashResolveViewModel : ObservableObject
                                         new FuncFilter(
                                             e =>
                                                 e is MEPCurve mepCurve and not InsulationLiningBase
-                                                && mepCurve.GetLocCurve() is Line line
+                                                && mepCurve.GetCurve() is Line line
                                                 && !line.Direction.CrossProduct(XYZ.BasisZ).IsAlmostEqualTo(XYZ.Zero)
                                         ),
                                         "请选择参照的管线"
                                     );
                                     //参考的管线定位
                                     var referenceMEPCurve = doc.GetElement(reference);
-                                    var referenceLine = referenceMEPCurve.GetLocCurve() as Line;
+                                    var referenceLine = referenceMEPCurve.GetCurve() as Line;
 
                                     var reference1 = uidoc.Selection.PickObject(
                                         ObjectType.PointOnElement,
                                         new FuncFilter(
                                             e =>
                                                 e is MEPCurve mepCurve and not InsulationLiningBase
-                                                && mepCurve.GetLocCurve() is Line line
+                                                && mepCurve.GetCurve() is Line line
                                                 && !line.Direction.CrossProduct(XYZ.BasisZ).IsAlmostEqualTo(XYZ.Zero)
                                                 && e.Id != referenceMEPCurve!.Id
                                         ),
@@ -126,7 +128,7 @@ public partial class ClashResolveViewModel : ObservableObject
                                     );
                                     //翻弯的管线定位
                                     mepCurveToBend = doc.GetElement(reference1) as MEPCurve;
-                                    var bendLine = mepCurveToBend.GetLocCurve() as Line;
+                                    var bendLine = mepCurveToBend.GetCurve() as Line;
 
                                     var result = bendLine!.Intersect(referenceLine, out var array);
 
@@ -172,296 +174,302 @@ public partial class ClashResolveViewModel : ObservableObject
                                 }
                                 break;
                         }
+
+
+                        var originBaseLine = mepCurveToBend.GetCurve() as Line;
+                        var baseLine = originBaseLine!.Clone() as Line;
+                        //原管线的方向
+                        var direction = baseLine?.Direction;
+                        var startPoint = baseLine!.GetEndPoint(0);
+                        var endPoint = baseLine.GetEndPoint(1);
+                        var breakLine = Line.CreateBound(breakPoint1, breakPoint2);
+                        //var minLength = mepCurveToBend.GetConnectors().OfType<Connector>().FirstOrDefault().GetExtensionLength();
+                        //if (breakLine.Length < minLength)
+                        //{
+                        //    return;
+                        //}
+                        var translateDirection = AdjustDirection switch
+                        {
+                            AdjustDirection.Up => XYZ.BasisZ,
+                            AdjustDirection.Down => -XYZ.BasisZ,
+                            AdjustDirection.Left => XYZ.BasisZ.CrossProduct(breakLine.Direction),
+                            AdjustDirection.Right => -XYZ.BasisZ.CrossProduct(breakLine.Direction),
+                            _ => null
+                        };
+                        switch (AdjustType)
+                        {
+                            case AdjustType.OneSide:
+
+                                {
+                                    MEPCurve baseMepCurve1;
+                                    MEPCurve baseMepCurve2;
+
+                                    var newMepCurveId = mepCurveToBend.BreakByPoint(breakPoint1);
+                                    var newMepCurve = doc.GetElement(newMepCurveId) as MEPCurve;
+
+                                    //baseMepCurve2始终是打断后生成的新管线，并且是需要偏移的管线
+                                    if ((newMepCurve.GetCurve() as Line).IsInsideEx(breakPoint2))
+                                    {
+                                        baseMepCurve1 = mepCurveToBend;
+                                        baseMepCurve2 = newMepCurve;
+                                    }
+                                    else
+                                    {
+                                        baseMepCurve1 = newMepCurve;
+                                        baseMepCurve2 = mepCurveToBend;
+                                    }
+                                    //移动新生成的管线
+                                    ElementTransformUtils.MoveElement(
+                                        doc,
+                                        baseMepCurve2.Id,
+                                        translateDirection * Offset / 304.8
+                                    );
+                                    doc.Regenerate();
+                                    ////偏移变换
+                                    //var translateTransform = Transform.CreateTranslation(translateDirection * Offset / 304.8);
+                                    //
+                                    //var originOffsetUnboundLine = baseLine.CreateTransformed(translateTransform) as Line;
+                                    //需要偏移直线定位线
+                                    var originOffsetUnboundLine = baseMepCurve2.GetCurve();
+                                    //用于判断交点是否在偏移后的直线内，避免生成不了
+                                    var originOffsetLine = originOffsetUnboundLine.Clone() as Line;
+                                    originOffsetUnboundLine.MakeUnbound();
+
+                                    var radian = Angle.ToRadian();
+                                    //反向时角度取补角
+                                    if (breakLine.Direction.IsAlmostEqualTo(-direction))
+                                    {
+                                        radian = (180 - Angle).ToRadian();
+                                    }
+
+                                    var rotation = Transform.CreateRotationAtPoint(
+                                        direction.CrossProduct(translateDirection),
+                                        radian,
+                                        breakPoint1
+                                    );
+                                    //因为原来的管线可能被移动，所以用baseline的克隆线
+                                    var unboundAngleLine = baseLine.CreateTransformed(rotation) as Line;
+                                    unboundAngleLine!.MakeUnbound();
+                                    //偏移管线与倾斜管线交点
+                                    var offsetIntersectPoint = originOffsetUnboundLine.IntersectionPoint(unboundAngleLine);
+                                    var isInside = originOffsetLine.IsInsideEx(offsetIntersectPoint); //当角度线于偏移直线交点在偏移直线内时
+                                                                                                      //var flag2 = breakPoint1!.DistanceTo(offsetIntersectPoint) > minLength; //偏移间距大于一定一定值
+                                    if (!isInside)
+                                    {
+                                        MessageBox.Show("管线偏移角度过大或过小，导致交点不在偏移的管线范围内");
+                                        break;
+                                    }
+                                    //if (!flag2)
+                                    //{
+                                    //    MessageBox.Show("管线偏移距离过近");
+                                    //    break;
+                                    //}
+                                    //if (isInside)
+                                    else
+                                    {
+                                        var angleLine = Line.CreateBound(breakPoint1, offsetIntersectPoint);
+                                        var angleMepCurve = mepCurveToBend.CopyAndSetLocationCurve(angleLine);
+
+                                        //拿到角度管的偏移交点处的连接件
+                                        var angleMEPCurveIntersectPointConnector = angleMepCurve
+                                            .GetConnectors(true)
+                                            .GetNearestConnector(offsetIntersectPoint);
+                                        //移动后的管线原有的连接件中，不用连接角度曲线的连接件，用来确定移动后管线的定位线
+                                        Connector originOffsetConnector = null;
+
+                                        foreach (Connector conn in baseMepCurve2.GetConnectors(true))
+                                        {
+                                            //90度时，偏移管线的两个连接都是90度，但要选择偏移管原有的，非打断处的连接件
+                                            if (
+                                                conn.CoordinateSystem.BasisZ.DotProduct(
+                                                    angleMEPCurveIntersectPointConnector.CoordinateSystem.BasisZ
+                                                ) >= 0
+                                                && !offsetIntersectPoint.IsAlmostEqualTo(conn.Origin)
+                                            ) //锐角
+                                            {
+                                                originOffsetConnector = conn;
+                                                break;
+                                            }
+                                        }
+                                        try
+                                        {
+                                            //if (originOffsetConnector != null && offsetIntersectPoint.DistanceTo(originOffsetConnector.Origin) > minLength)
+                                            if (originOffsetConnector != null)
+                                            {
+                                                var finalOffsetLine = Line.CreateBound(
+                                                    offsetIntersectPoint,
+                                                    originOffsetConnector.Origin
+                                                );
+                                                baseMepCurve2.SetLocationCurve(finalOffsetLine);
+                                            }
+
+
+                                            var conn1 = ConnectorAssist.GetNearestConnectors(
+                                                baseMepCurve1,
+                                                angleMepCurve
+                                            );
+                                            doc.Create.NewElbowFitting(conn1[0], conn1[1]);
+
+                                            var conn2 = ConnectorAssist.GetNearestConnectors(
+                                                angleMepCurve,
+                                                baseMepCurve2
+                                            );
+                                            doc.Create.NewElbowFitting(conn2[0], conn2[1]);
+                                        }
+                                        catch (Exception ex)
+                                        {
+                                            Debug.WriteLine(ex.Message);
+                                            ex.Message.ToLog();
+                                        }
+                                    }
+                                }
+                                break;
+                            case AdjustType.TwoSide:
+
+                                {
+                                    MEPCurve baseMepCurve1;
+                                    MEPCurve baseMepCurve2;
+                                    //选择点的方向与原直线方向相反时，使得breakPoint1~breakPoint2始终与原直线同向
+                                    if (breakLine.Direction.IsAlmostEqualTo(-baseLine.Direction))
+                                    {
+                                        //交换值
+                                        (breakPoint1, breakPoint2) = (breakPoint2, breakPoint1);
+                                    }
+
+                                    //doc.Regenerate();
+                                    //偏移变换
+                                    var translateTransform = Transform.CreateTranslation(
+                                        translateDirection * Offset / 304.8
+                                    );
+                                    //偏移直线
+                                    var offsetLine = baseLine.CreateTransformed(translateTransform) as Line;
+                                    offsetLine!.MakeUnbound();
+                                    //根据角度旋转的矩阵变换，创建变换后的直线
+                                    //第一个交点
+                                    var rotateTransform1 = Transform.CreateRotationAtPoint(
+                                        direction.CrossProduct(translateDirection),
+                                        Angle.ToRadian(),
+                                        breakPoint1
+                                    );
+                                    var angleLine1 = baseLine.CreateTransformed(rotateTransform1) as Line;
+                                    angleLine1!.MakeUnbound();
+                                    var offsetPoint1 = offsetLine.IntersectionPoint(angleLine1);
+
+                                    //根据角度旋转的矩阵变换，创建变换后的直线
+                                    //第二个交点
+                                    var rotateTransform2 = Transform.CreateRotationAtPoint(
+                                        direction.CrossProduct(translateDirection),
+                                        (180 - Angle).ToRadian(),
+                                        breakPoint2
+                                    );
+                                    var angleLine2 = baseLine.CreateTransformed(rotateTransform2) as Line;
+                                    angleLine2!.MakeUnbound();
+                                    var offsetPoint2 = offsetLine.IntersectionPoint(angleLine2);
+                                    var b = Line.CreateBound(offsetPoint1, offsetPoint2);
+                                    if (b.Direction.IsAlmostEqualTo(-baseLine.Direction))
+                                    {
+                                        Debug.WriteLine("翻弯的管线交叉");
+                                        MessageBox.Show(
+                                            "两点距离太近，无法翻弯",
+                                            "提醒",
+                                            MessageBoxButton.OK,
+                                            MessageBoxImage.Information
+                                        );
+                                        ts.RollBack();
+                                        break;
+                                    }
+
+                                    var newMepCurveId = mepCurveToBend.BreakByPoint(breakPoint1);
+                                    var newMepCurve = doc.GetElement(newMepCurveId) as MEPCurve;
+                                    //判断打断生成的新管线的位置是原管线的前端还是后端
+                                    if ((newMepCurve.GetCurve() as Line).IsInsideEx(breakPoint2)) //后端
+                                    {
+                                        baseMepCurve1 = mepCurveToBend;
+                                        baseMepCurve2 = newMepCurve;
+                                    }
+                                    else
+                                    {
+                                        baseMepCurve1 = newMepCurve;
+                                        baseMepCurve2 = mepCurveToBend;
+                                    }
+
+                                    //第一条管线
+                                    var newBaseLine1 = Line.CreateBound(startPoint, breakPoint1);
+                                    //第二条管线
+                                    var newBaseLine2 = Line.CreateBound(breakPoint2, endPoint);
+                                    baseMepCurve1.SetLocationCurve(newBaseLine1);
+                                    baseMepCurve2.SetLocationCurve(newBaseLine2);
+                                    //生成的偏移线方向相反时，会导致两条翻弯的管线交叉
+
+                                    //第一根翻弯管
+                                    var firstMepCurve = mepCurveToBend.CopyAndSetLocationCurve(
+                                        Line.CreateBound(breakPoint1, offsetPoint1)
+                                    );
+                                    //偏移管
+                                    var secondMepCurve = mepCurveToBend.CopyAndSetLocationCurve(
+                                        Line.CreateBound(offsetPoint1, offsetPoint2)
+                                    );
+                                    //第二根翻弯管
+                                    var thirdMepCurve = mepCurveToBend.CopyAndSetLocationCurve(
+                                        Line.CreateBound(offsetPoint2, breakPoint2)
+                                    );
+
+                                    doc.Regenerate();
+                                    try
+                                    {
+                                        var connectors1 = ConnectorAssist.GetNearestConnectors(
+                                            baseMepCurve1,
+                                            firstMepCurve
+                                        );
+                                        doc.Create.NewElbowFitting(connectors1[0], connectors1[1]);
+                                        var connectors4 = ConnectorAssist.GetNearestConnectors(
+                                            thirdMepCurve,
+                                            baseMepCurve2
+                                        );
+                                        doc.Create.NewElbowFitting(connectors4[0], connectors4[1]);
+                                    }
+                                    catch (Autodesk.Revit.Exceptions.InvalidOperationException)
+                                    {
+                                        MessageBox.Show("角度过大或过小", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                                    }
+                                    catch (Exception ex)
+                                    {
+                                        ex.Message.ToLog();
+                                    }
+                                    try
+                                    {
+                                        var connectors2 = ConnectorAssist.GetNearestConnectors(
+                                            firstMepCurve,
+                                            secondMepCurve
+                                        );
+                                        doc.Create.NewElbowFitting(connectors2[0], connectors2[1]);
+                                        var connectors3 = ConnectorAssist.GetNearestConnectors(
+                                            secondMepCurve,
+                                            thirdMepCurve
+                                        );
+                                        doc.Create.NewElbowFitting(connectors3[0], connectors3[1]);
+                                    }
+                                    catch (Autodesk.Revit.Exceptions.InvalidOperationException)
+                                    {
+                                        MessageBox.Show("角度过大或过小", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                                    }
+                                    catch (Exception ex)
+                                    {
+                                        ex.Message.ToLog();
+                                    }
+                                }
+                                break;
+                        }
                     }
                     catch (Autodesk.Revit.Exceptions.OperationCanceledException)
                     {
                         CanRunning = true;
                         return;
                     }
-
-                    var originBaseLine = mepCurveToBend.GetLocCurve() as Line;
-                    var baseLine = originBaseLine!.Clone() as Line;
-                    //原管线的方向
-                    var direction = baseLine?.Direction;
-                    var startPoint = baseLine!.GetEndPoint(0);
-                    var endPoint = baseLine.GetEndPoint(1);
-                    var breakLine = Line.CreateBound(breakPoint1, breakPoint2);
-                    //var minLength = mepCurveToBend.GetConnectors().OfType<Connector>().FirstOrDefault().GetExtensionLength();
-                    //if (breakLine.Length < minLength)
-                    //{
-                    //    return;
-                    //}
-                    var translateDirection = AdjustDirection switch
+                    catch (Exception)
                     {
-                        AdjustDirection.Up => XYZ.BasisZ,
-                        AdjustDirection.Down => -XYZ.BasisZ,
-                        AdjustDirection.Left => XYZ.BasisZ.CrossProduct(breakLine.Direction),
-                        AdjustDirection.Right => -XYZ.BasisZ.CrossProduct(breakLine.Direction),
-                        _ => null
-                    };
-                    switch (AdjustType)
-                    {
-                        case AdjustType.OneSide:
-
-                            {
-                                MEPCurve baseMepCurve1;
-                                MEPCurve baseMepCurve2;
-
-                                var newMepCurveId = mepCurveToBend.BreakByPoint(breakPoint1);
-                                var newMepCurve = doc.GetElement(newMepCurveId) as MEPCurve;
-
-                                //baseMepCurve2始终是打断后生成的新管线，并且是需要偏移的管线
-                                if ((newMepCurve.GetLocCurve() as Line).IsInsideEx(breakPoint2))
-                                {
-                                    baseMepCurve1 = mepCurveToBend;
-                                    baseMepCurve2 = newMepCurve;
-                                }
-                                else
-                                {
-                                    baseMepCurve1 = newMepCurve;
-                                    baseMepCurve2 = mepCurveToBend;
-                                }
-                                //移动新生成的管线
-                                ElementTransformUtils.MoveElement(
-                                    doc,
-                                    baseMepCurve2.Id,
-                                    translateDirection * Offset / 304.8
-                                );
-                                doc.Regenerate();
-                                ////偏移变换
-                                //var translateTransform = Transform.CreateTranslation(translateDirection * Offset / 304.8);
-                                //
-                                //var originOffsetUnboundLine = baseLine.CreateTransformed(translateTransform) as Line;
-                                //需要偏移直线定位线
-                                var originOffsetUnboundLine = baseMepCurve2.GetLocCurve();
-                                //用于判断交点是否在偏移后的直线内，避免生成不了
-                                var originOffsetLine = originOffsetUnboundLine.Clone() as Line;
-                                originOffsetUnboundLine.MakeUnbound();
-
-                                var radian = Angle.ToRadian();
-                                //反向时角度取补角
-                                if (breakLine.Direction.IsAlmostEqualTo(-direction))
-                                {
-                                    radian = (180 - Angle).ToRadian();
-                                }
-
-                                var rotation = Transform.CreateRotationAtPoint(
-                                    direction.CrossProduct(translateDirection),
-                                    radian,
-                                    breakPoint1
-                                );
-                                //因为原来的管线可能被移动，所以用baseline的克隆线
-                                var unboundAngleLine = baseLine.CreateTransformed(rotation) as Line;
-                                unboundAngleLine!.MakeUnbound();
-                                //偏移管线与倾斜管线交点
-                                var offsetIntersectPoint = originOffsetUnboundLine.IntersectionPoint(unboundAngleLine);
-                                var isInside = originOffsetLine.IsInsideEx(offsetIntersectPoint); //当角度线于偏移直线交点在偏移直线内时
-                                                                                                  //var flag2 = breakPoint1!.DistanceTo(offsetIntersectPoint) > minLength; //偏移间距大于一定一定值
-                                if (!isInside)
-                                {
-                                    MessageBox.Show("管线偏移角度过大或过小，导致交点不在偏移的管线范围内");
-                                    break;
-                                }
-                                //if (!flag2)
-                                //{
-                                //    MessageBox.Show("管线偏移距离过近");
-                                //    break;
-                                //}
-                                //if (isInside)
-                                else
-                                {
-                                    var angleLine = Line.CreateBound(breakPoint1, offsetIntersectPoint);
-                                    var angleMepCurve = mepCurveToBend.CopyAndSetLocationCurve(angleLine);
-
-                                    //拿到角度管的偏移交点处的连接件
-                                    var angleMEPCurveIntersectPointConnector = angleMepCurve
-                                        .GetConnectors(true)
-                                        .GetNearestConnector(offsetIntersectPoint);
-                                    //移动后的管线原有的连接件中，不用连接角度曲线的连接件，用来确定移动后管线的定位线
-                                    Connector originOffsetConnector = null;
-
-                                    foreach (Connector conn in baseMepCurve2.GetConnectors(true))
-                                    {
-                                        //90度时，偏移管线的两个连接都是90度，但要选择偏移管原有的，非打断处的连接件
-                                        if (
-                                            conn.CoordinateSystem.BasisZ.DotProduct(
-                                                angleMEPCurveIntersectPointConnector.CoordinateSystem.BasisZ
-                                            ) >= 0
-                                            && !offsetIntersectPoint.IsAlmostEqualTo(conn.Origin)
-                                        ) //锐角
-                                        {
-                                            originOffsetConnector = conn;
-                                            break;
-                                        }
-                                    }
-
-                                    //if (originOffsetConnector != null && offsetIntersectPoint.DistanceTo(originOffsetConnector.Origin) > minLength)
-                                    if (originOffsetConnector != null)
-                                    {
-                                        var finalOffsetLine = Line.CreateBound(
-                                            offsetIntersectPoint,
-                                            originOffsetConnector.Origin
-                                        );
-                                        baseMepCurve2.SetLocationCurve(finalOffsetLine);
-                                    }
-
-                                    try
-                                    {
-                                        var conn1 = ConnectorAssist.GetNearestConnectors(
-                                            baseMepCurve1,
-                                            angleMepCurve
-                                        );
-                                        doc.Create.NewElbowFitting(conn1[0], conn1[1]);
-
-                                        var conn2 = ConnectorAssist.GetNearestConnectors(
-                                            angleMepCurve,
-                                            baseMepCurve2
-                                        );
-                                        doc.Create.NewElbowFitting(conn2[0], conn2[1]);
-                                    }
-                                    catch (Exception ex)
-                                    {
-                                        Debug.WriteLine(ex.Message);
-                                        ex.Message.ToLog();
-                                    }
-                                }
-                            }
-                            break;
-                        case AdjustType.TwoSide:
-
-                            {
-                                MEPCurve baseMepCurve1;
-                                MEPCurve baseMepCurve2;
-                                //选择点的方向与原直线方向相反时，使得breakPoint1~breakPoint2始终与原直线同向
-                                if (breakLine.Direction.IsAlmostEqualTo(-baseLine.Direction))
-                                {
-                                    //交换值
-                                    (breakPoint1, breakPoint2) = (breakPoint2, breakPoint1);
-                                }
-
-                                //doc.Regenerate();
-                                //偏移变换
-                                var translateTransform = Transform.CreateTranslation(
-                                    translateDirection * Offset / 304.8
-                                );
-                                //偏移直线
-                                var offsetLine = baseLine.CreateTransformed(translateTransform) as Line;
-                                offsetLine!.MakeUnbound();
-                                //根据角度旋转的矩阵变换，创建变换后的直线
-                                //第一个交点
-                                var rotateTransform1 = Transform.CreateRotationAtPoint(
-                                    direction.CrossProduct(translateDirection),
-                                    Angle.ToRadian(),
-                                    breakPoint1
-                                );
-                                var angleLine1 = baseLine.CreateTransformed(rotateTransform1) as Line;
-                                angleLine1!.MakeUnbound();
-                                var offsetPoint1 = offsetLine.IntersectionPoint(angleLine1);
-
-                                //根据角度旋转的矩阵变换，创建变换后的直线
-                                //第二个交点
-                                var rotateTransform2 = Transform.CreateRotationAtPoint(
-                                    direction.CrossProduct(translateDirection),
-                                    (180 - Angle).ToRadian(),
-                                    breakPoint2
-                                );
-                                var angleLine2 = baseLine.CreateTransformed(rotateTransform2) as Line;
-                                angleLine2!.MakeUnbound();
-                                var offsetPoint2 = offsetLine.IntersectionPoint(angleLine2);
-                                var b = Line.CreateBound(offsetPoint1, offsetPoint2);
-                                if (b.Direction.IsAlmostEqualTo(-baseLine.Direction))
-                                {
-                                    Debug.WriteLine("翻弯的管线交叉");
-                                    MessageBox.Show(
-                                        "两点距离太近，无法翻弯",
-                                        "提醒",
-                                        MessageBoxButton.OK,
-                                        MessageBoxImage.Information
-                                    );
-                                    ts.RollBack();
-                                    break;
-                                }
-
-                                var newMepCurveId = mepCurveToBend.BreakByPoint(breakPoint1);
-                                var newMepCurve = doc.GetElement(newMepCurveId) as MEPCurve;
-                                //判断打断生成的新管线的位置是原管线的前端还是后端
-                                if ((newMepCurve.GetLocCurve() as Line).IsInsideEx(breakPoint2)) //后端
-                                {
-                                    baseMepCurve1 = mepCurveToBend;
-                                    baseMepCurve2 = newMepCurve;
-                                }
-                                else
-                                {
-                                    baseMepCurve1 = newMepCurve;
-                                    baseMepCurve2 = mepCurveToBend;
-                                }
-
-                                //第一条管线
-                                var newBaseLine1 = Line.CreateBound(startPoint, breakPoint1);
-                                //第二条管线
-                                var newBaseLine2 = Line.CreateBound(breakPoint2, endPoint);
-                                baseMepCurve1.SetLocationCurve(newBaseLine1);
-                                baseMepCurve2.SetLocationCurve(newBaseLine2);
-                                //生成的偏移线方向相反时，会导致两条翻弯的管线交叉
-
-                                //第一根翻弯管
-                                var firstMepCurve = mepCurveToBend.CopyAndSetLocationCurve(
-                                    Line.CreateBound(breakPoint1, offsetPoint1)
-                                );
-                                //偏移管
-                                var secondMepCurve = mepCurveToBend.CopyAndSetLocationCurve(
-                                    Line.CreateBound(offsetPoint1, offsetPoint2)
-                                );
-                                //第二根翻弯管
-                                var thirdMepCurve = mepCurveToBend.CopyAndSetLocationCurve(
-                                    Line.CreateBound(offsetPoint2, breakPoint2)
-                                );
-
-                                doc.Regenerate();
-                                try
-                                {
-                                    var connectors1 = ConnectorAssist.GetNearestConnectors(
-                                        baseMepCurve1,
-                                        firstMepCurve
-                                    );
-                                    doc.Create.NewElbowFitting(connectors1[0], connectors1[1]);
-                                    var connectors4 = ConnectorAssist.GetNearestConnectors(
-                                        thirdMepCurve,
-                                        baseMepCurve2
-                                    );
-                                    doc.Create.NewElbowFitting(connectors4[0], connectors4[1]);
-                                }
-                                catch (Autodesk.Revit.Exceptions.InvalidOperationException)
-                                {
-                                    MessageBox.Show("角度过大或过小", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
-                                }
-                                catch (Exception ex)
-                                {
-                                    ex.Message.ToLog();
-                                }
-                                try
-                                {
-                                    var connectors2 = ConnectorAssist.GetNearestConnectors(
-                                        firstMepCurve,
-                                        secondMepCurve
-                                    );
-                                    doc.Create.NewElbowFitting(connectors2[0], connectors2[1]);
-                                    var connectors3 = ConnectorAssist.GetNearestConnectors(
-                                        secondMepCurve,
-                                        thirdMepCurve
-                                    );
-                                    doc.Create.NewElbowFitting(connectors3[0], connectors3[1]);
-                                }
-                                catch (Autodesk.Revit.Exceptions.InvalidOperationException)
-                                {
-                                    MessageBox.Show("角度过大或过小", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
-                                }
-                                catch (Exception ex)
-                                {
-                                    ex.Message.ToLog();
-                                }
-                            }
-                            break;
+                        CanRunning = true;
+                        return;
                     }
                 },
                 "碰撞处理"
diff --git a/Sai.RvKits/RvMEP/CorrectMEPCurveSlopeCmd.cs b/Sai.RvKits/RvMEP/CorrectMEPCurveSlopeCmd.cs
index 70217c1..7921983 100644
--- a/Sai.RvKits/RvMEP/CorrectMEPCurveSlopeCmd.cs
+++ b/Sai.RvKits/RvMEP/CorrectMEPCurveSlopeCmd.cs
@@ -119,7 +119,7 @@ public class CorrectMEPCurveSlopeCmd : ExternalCommand
             case Duct:
                 {
                     var param = mepCurve.get_Parameter(BuiltInParameter.RBS_DUCT_SLOPE);
-                    var loc = mepCurve.GetLocCurve() as Line;
+                    var loc = mepCurve.GetCurve() as Line;
 
                     isError = param.HasValue && ((param.AsDouble() < 0.025 && param.AsDouble() > 0) || param.AsDouble() > 0.055); //坡度过大或过小时
                     break;
diff --git a/Sai.RvKits/RvMEP/HeadroomCheckCmd.cs b/Sai.RvKits/RvMEP/HeadroomCheckCmd.cs
index e30eb59..ea3522c 100644
--- a/Sai.RvKits/RvMEP/HeadroomCheckCmd.cs
+++ b/Sai.RvKits/RvMEP/HeadroomCheckCmd.cs
@@ -25,7 +25,7 @@ public class HeadroomCheckCmd : ExternalCommand
 		Element element = null;
 		foreach (var item in elems)
 		{
-			if (item.GetLocCurve().Length < minLength)
+			if (item.GetCurve().Length < minLength)
 			{
 				continue;
 			}
diff --git a/Sai.RvKits/RvMEP/InsulationItem.cs b/Sai.RvKits/RvMEP/InsulationItem.cs
index 0846a49..d48153c 100644
--- a/Sai.RvKits/RvMEP/InsulationItem.cs
+++ b/Sai.RvKits/RvMEP/InsulationItem.cs
@@ -30,7 +30,6 @@ public partial class InsulationItem : ObservableValidator
     private double maxDiameter;
 
     [Range(0, 1000)]
-
     public double MinDiameter
     {
         get => minDiameter;
@@ -44,12 +43,14 @@ public partial class InsulationItem : ObservableValidator
 
     [Required]
     [Range(10, 1000)]
-    public double Thickness
-    {
-        get => thickness;
-        set => SetProperty(ref thickness, value, true);
-    }
+    [NotifyDataErrorInfo]
+    [ObservableProperty]
     private double thickness;
+    //{
+    //    get => thickness;
+    //    set => SetProperty(ref thickness, value, true);
+    //}
+    //private double thickness;
 
     [ObservableProperty]
     private PipeInsulationType pipeInsulationType;
diff --git a/Sai.RvKits/RvMEP/MoveConnectCmd.cs b/Sai.RvKits/RvMEP/MoveConnectCmd.cs
index 97e4103..da8f74b 100644
--- a/Sai.RvKits/RvMEP/MoveConnectCmd.cs
+++ b/Sai.RvKits/RvMEP/MoveConnectCmd.cs
@@ -17,37 +17,19 @@ public class MoveConnectCmd : ExternalCommand
         Reference moveReference;
         try
         {
-            FuncFilter filter =
-                new(
-                    e =>
-                        ((e is MEPCurve mep and not InsulationLiningBase) && mep.GetConnectors(true).Size > 0)
-                        || (
-                            e is FamilyInstance instance
-                            && instance.MEPModel.ConnectorManager != null
-                            && instance.MEPModel.ConnectorManager.UnusedConnectors.Size > 0
-                        )
-                );
-
             baseReference = UiDocument.Selection.PickObject(
                 Autodesk.Revit.UI.Selection.ObjectType.Element,
-                filter,
+                new FuncFilter(e => e.GetConnectors(true)?.Size > 0),
                 "请选择基准的管线、管件、设备实例"
             );
-            FuncFilter filter1 =
-                new(
-                    e =>
-                        e.Id != baseReference.ElementId
-                            && ((e is MEPCurve mep and not InsulationLiningBase) && mep.GetConnectors(true).Size > 0)
-                        || (
-                            e is FamilyInstance instance
-                            && instance.MEPModel.ConnectorManager != null
-                            && instance.MEPModel.ConnectorManager.UnusedConnectors.Size > 0
-                            && instance.Id != baseReference.ElementId
-                        )
-                );
+
             moveReference = UiDocument.Selection.PickObject(
                 Autodesk.Revit.UI.Selection.ObjectType.Element,
-                filter,
+                new FuncFilter(
+                    e =>
+                        e.Id != baseReference.ElementId
+                            && e.GetConnectors(true)?.Size > 0
+                ),
                 "请选择需要移动连接的管线、管件、设备实例"
             );
         }
@@ -120,7 +102,7 @@ public class MoveConnectCmd : ExternalCommand
                     else
                     {
                         //避免交点在原管线外，导致反向连接
-                        if ((mainMEPCurve.GetLocCurve() as Line).IsInsideEx(intersectPoint, 0.5))
+                        if ((mainMEPCurve.GetCurve() as Line).IsInsideEx(intersectPoint, 0.5))
                         {
                             ElementTransformUtils.MoveElement(Document, elementToMove!.Id, intersectPoint - origin2);
                         }
diff --git a/Sai.RvKits/RvMEP/MoveMEPCurveViewModel.cs b/Sai.RvKits/RvMEP/MoveMEPCurveViewModel.cs
index facd3ad..50dd935 100644
--- a/Sai.RvKits/RvMEP/MoveMEPCurveViewModel.cs
+++ b/Sai.RvKits/RvMEP/MoveMEPCurveViewModel.cs
@@ -44,7 +44,7 @@ public partial class MoveMEPCurveViewModel : ObservableValidator
 
         if (!CanRunning)
         {
-            KeyIntPtrHelper.ActionEsc();
+            KeyIntPtrHelper.RaiseEscTwice();
         }
 
         #endregion
diff --git a/Sai.RvKits/RvMEP/StandMepCurveViewModel.cs b/Sai.RvKits/RvMEP/StandMepCurveViewModel.cs
index 777f418..15595a4 100644
--- a/Sai.RvKits/RvMEP/StandMepCurveViewModel.cs
+++ b/Sai.RvKits/RvMEP/StandMepCurveViewModel.cs
@@ -114,7 +114,7 @@ public partial class StandMepCurveViewModel : ObservableObject
             return;
         }
 
-        KeyIntPtrHelper.ActionEsc();
+        KeyIntPtrHelper.RaiseEscTwice();
     }
 
     [RelayCommand(CanExecute = nameof(CanCreate))]
diff --git a/Sai.RvKits/RvMEP/SystemModel.cs b/Sai.RvKits/RvMEP/SystemModel.cs
index 2db8ac6..2bdeade 100644
--- a/Sai.RvKits/RvMEP/SystemModel.cs
+++ b/Sai.RvKits/RvMEP/SystemModel.cs
@@ -7,7 +7,7 @@ using System.ComponentModel;
 
 namespace Sai.RvKits.RvMEP
 {
-    public class SystemModel : ObservableObject
+    public partial class SystemModel : ObservableObject
     {
         public SystemModel(MEPSystemType systemType)
         {
@@ -19,75 +19,28 @@ namespace Sai.RvKits.RvMEP
             FillColor = systemType.FillColor;
             Abbreviation = systemType.Abbreviation;
         }
-
-        private string abbreviation;
+        [ObservableProperty]
         private System.Windows.Media.Brush backgroundColor;
 
+        [ObservableProperty]
         private Color fillColor;
-        private Color lineColor;
 
-        private MEPSystemClassification mepSystemClassification;
+        [ObservableProperty]
+        private MEPSystemClassification mEPSystemClassification;
 
+        [ObservableProperty]
         private string name;
-
+        [ObservableProperty]
         private PipeSystemType pipeSystemType;
+        //系统类型
+        [ObservableProperty]
         private MEPSystemType systemType;
 
-        public Color LineColor
-        {
-            get => lineColor;
-            set => SetProperty(ref lineColor, value);
-        }
-
-        public string Abbreviation
-        {
-            get => abbreviation;
-            set => SetProperty(ref abbreviation, value);
-        }
-
-        public Color FillColor
-        {
-            get => fillColor;
-            set => SetProperty(ref fillColor, value);
-        }
-
-        public PipeSystemType PipeSystemType
-        {
-            get => pipeSystemType;
-            set => SetProperty(ref pipeSystemType, value);
-        }
-
-        /// <summary>
-        ///     系统类型
-        /// </summary>
-        public MEPSystemType SystemType
-        {
-            get => systemType;
-            set => SetProperty(ref systemType, value);
-        }
-
-        public MEPSystemClassification MEPSystemClassification
-        {
-            get => mepSystemClassification;
-            set => SetProperty(ref mepSystemClassification, value);
-        }
-
-        public string Name
-        {
-            get => name;
-            set => SetProperty(ref name, value);
-        }
-
-        public System.Windows.Media.Brush BackgroundColor
-        {
-            get => backgroundColor;
-            //if (fillColor.IsValid)
-            //{
-            //    return backgroundColor = new System.Windows.Media.SolidColorBrush(System.Windows.Media.SelectedColor.FromRgb(fillColor.Red, fillColor.Green, fillColor.Blue));
-            //}
-            //return backgroundColor = new System.Windows.Media.SolidColorBrush();
-            set => SetProperty(ref backgroundColor, value);
-        }
+        [ObservableProperty]
+        private Color lineColor;
+        [ObservableProperty]
+        private string abbreviation;
+       
     }
 
     public enum MEPSystemClassification
diff --git a/Sai.RvKits/RvView/QuickViewSectionViewModel.cs b/Sai.RvKits/RvView/QuickViewSectionViewModel.cs
index 0744abc..4a9f6a8 100644
--- a/Sai.RvKits/RvView/QuickViewSectionViewModel.cs
+++ b/Sai.RvKits/RvView/QuickViewSectionViewModel.cs
@@ -5,6 +5,7 @@ using System.Windows;
 
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
+using Autodesk.Revit.UI.Selection;
 
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -55,7 +56,71 @@ namespace Sai.RvKits.RvView
                   uiapp =>
                   {
                       var uidoc = uiapp.ActiveUIDocument;
-                      var element = uidoc.SelectObject(new FuncFilter(elem => elem.GetLocCurve() is Line));
+                      var doc = uidoc.Document;
+                      //var element = uidoc.SelectObject(new FuncFilter(elem => elem.GetCurve() is Line));
+                      var placeProjectPoint = XYZ.Zero;
+                      Line locLine = null;
+                      XYZ lookDirection = null;
+                      var depth = 4.0;
+                      double baseLength = 4.0;
+                      Element element;
+                      if (IsParallel)
+                      {
+                          var refer = uidoc.Selection
+                              .PickObject(
+                                  ObjectType.PointOnElement,
+                                  new FuncFilter(elem => elem.GetCurve() is Line),
+                                  "请选择前进方向起点（剖面看向将会在前进方向左侧）");
+                          var refer1 = uidoc.Selection
+                              .PickObject(
+                                  ObjectType.PointOnElement,
+                                  new FuncFilter(elem => elem.Id == refer.ElementId),
+                                  "请选择前进方向终点（剖面看向将会在前进方向左侧）");
+                          element = doc.GetElement(refer);
+
+                          var startPointPicked = refer.GlobalPoint;
+                          var startProjectPoint = element.GetCurve().Project(startPointPicked).XYZPoint;
+                          //终点投影
+                          var forwardPointPicked = refer1.GlobalPoint;
+                          var forwardProjectPoint = element.GetCurve().Project(forwardPointPicked).XYZPoint;
+                          //前进方向
+                          var d = forwardProjectPoint - startProjectPoint;
+                          //剖面宽度、跨度
+                          baseLength = d.GetLength();
+                          //左侧
+                          lookDirection = XYZ.BasisZ.CrossProduct(forwardProjectPoint - startProjectPoint).Normalize();
+
+                          //中点，向查看方向反向移动，用于平行剖面的放置
+                          placeProjectPoint = (forwardProjectPoint + startProjectPoint) / 2 - lookDirection;
+                      }
+                      else
+                      {
+                          var refer = uidoc.Selection
+                              .PickObject(
+                                  ObjectType.PointOnElement,
+                                  new FuncFilter(elem => elem.GetCurve() is Line),
+                                  "请选择放置剖面位置");
+                          var refer1 = uidoc.Selection
+                              .PickObject(
+                                  ObjectType.PointOnElement,
+                                  new FuncFilter(elem => elem.Id == refer.ElementId),
+                                  "剖面看向方向和相对剖面放置的深度");
+                          element = doc.GetElement(refer);
+                          //正交剖面的放置位置
+                          var placePointPicked = refer.GlobalPoint;
+                          placeProjectPoint = element.GetCurve().Project(placePointPicked).XYZPoint;
+                          //深度的投影
+                          var lookPointPicked = refer1.GlobalPoint;
+                          var lookProjectPoint = element.GetCurve().Project(lookPointPicked).XYZPoint;
+
+                          depth = placeProjectPoint.DistanceTo(lookProjectPoint);
+
+                          //if (locLine.Direction.IsAlmostEqualTo((lookPointPicked - startPointPicked).Normalize()))
+                          //{
+                          //}
+                          lookDirection = (lookProjectPoint - placeProjectPoint).Normalize();
+                      }
+                      locLine = element.GetCurve() as Line;
                       #region 选择方向
                       //var firstTip = "请选择第一个点以确定正交剖面的定位点";
                       //var lastTip = "请选择第二个点以确定拉抻的深度";
@@ -64,33 +129,22 @@ namespace Sai.RvKits.RvView
                       //    firstTip = "请选择第一个剖面范围水平的边界点";
                       //    lastTip = "请选择第二个剖面范围水平的边界点";
                       //}
-                      //var firstrefer = uidoc.Selection
+                      //var firstrefer = uiapp.Selection
                       //    .PickObject(Autodesk.Revit.UI.Selection.ObjectType.PointOnElement, firstTip);
-                      //var lastrefer = uidoc.Selection
+                      //var lastrefer = uiapp.Selection
                       //    .PickObject(Autodesk.Revit.UI.Selection.ObjectType.PointOnElement, lastTip);
                       //var first = firstrefer.GlobalPoint;
                       //var last = firstrefer.GlobalPoint;
-                      //var elementByCurve = uidoc.Document.GetElement(firstrefer);
+                      //var elementByCurve = uiapp.Document.GetElement(firstrefer);
 
-                      //var firstPoint = elementByCurve.GetLocCurve().Project(first).XYZPoint;
-                      //var lastPoint = elementByCurve.GetLocCurve().Project(last).XYZPoint;
+                      //var firstProjectPoint = elementByCurve.GetCurve().Project(first).XYZPoint;
+                      //var lookProjectPoint = elementByCurve.GetCurve().Project(last).XYZPoint;
                       #endregion
 
-                      var lc = element.Location as LocationCurve;
-                      var line = lc.Curve as Line;
-                      var doc = uidoc.Document;
-                      //获取剖面图类型
-                      var viewfamilyType = doc.OfClass<ViewFamilyType>()
-                                  .Cast<ViewFamilyType>()
-                                  .Where(t => t.ViewFamily == ViewFamily.Section)
-                                  .FirstOrDefault();
-
                       var bb = element.get_BoundingBox(null);
                       var minZ = bb.Min.Z;
                       var maxZ = bb.Max.Z;
 
-                      var baseLength = (bb.Max - bb.Min).GetLength();
-
                       ViewSection viewSection = null;
                       BoundingBoxXYZ sectionBox;
                       //transform.x：RightDirection，transform.y：UpDirection=Z轴，transform.z：ViewDirection (r x u=v)
@@ -100,8 +154,9 @@ namespace Sai.RvKits.RvView
 
                       Debug.WriteLine($"Min：{bb.Min}");
                       Debug.WriteLine($"Max：{bb.Max}");
-                      //获得定位点
-                      t.Origin = line.Evaluate(0.5, true).Flatten();
+                      //设置定位点
+                      //t.Origin = line.Evaluate(0.5, true).Flatten();
+                      t.Origin = placeProjectPoint.Flatten();
                       //t.Origin = line.GetEndPoint(0).Flatten();
                       Debug.WriteLine("定义剖面：");
                       Debug.WriteLine($"Transform.Origin：{t.Origin}");
@@ -110,15 +165,17 @@ namespace Sai.RvKits.RvView
                       if (IsParallel)
                       {
                           //剖面视图中，裁剪框左下角的点
-                          var min = new XYZ(-(baseLength + 1) / 2, minZ - 10, -2);
+                          var min = new XYZ(-(baseLength) / 2, minZ - 10, 0);
                           //剖面视图中，裁剪框右上角的点
-                          var max = new XYZ((baseLength + 1) / 2, maxZ + 10, 2);
+                          var max = new XYZ((baseLength) / 2, maxZ + 10, depth);
                           Debug.WriteLine($"Min：{min}");
                           Debug.WriteLine($"Max：{max}");
 
                           viewName = $"平行剖面-{viewName}";
-                          t.BasisX = line.Direction;//与生成的最终剖面视图的RightDirection反向(定义Transform)
-                          t.BasisZ = line.Direction.CrossProduct(XYZ.BasisZ);//与生成的最终剖面视图的ViewDirection反向(定义Transform)
+                          //与生成的最终剖面视图的RightDirection反向(定义Transform)
+                          t.BasisX = XYZ.BasisZ.CrossProduct(lookDirection).Normalize();
+                          //与生成的最终剖面视图的ViewDirection反向(定义Transform)
+                          t.BasisZ = lookDirection;
 
                           Debug.WriteLine($"Transform.BasisX：{t.BasisX}");
                           Debug.WriteLine($"Transform.BasisZ：{t.BasisZ}");
@@ -134,10 +191,10 @@ namespace Sai.RvKits.RvView
                       {
                           //var transform = line.ComputeDerivatives(0.5, true);//求导切向为BasisX
                           viewName = $"正交剖面-{viewName}";
-                          t.BasisX = XYZ.BasisZ.CrossProduct(line.Direction);
-                          t.BasisZ = line.Direction;
-                          var min = new XYZ(-5, minZ - 5, -2);
-                          var max = new XYZ(5, maxZ + 5, 2);
+                          t.BasisX = XYZ.BasisZ.CrossProduct(locLine.Direction).Normalize();
+                          t.BasisZ = locLine.Direction;
+                          var min = new XYZ(-10, minZ - 5, 0);
+                          var max = new XYZ(10, maxZ + 5, depth);
 
                           Debug.WriteLine($"Transform.BasisX：{t.BasisX}");
                           Debug.WriteLine($"Transform.BasisZ：{t.BasisZ}");
@@ -152,7 +209,6 @@ namespace Sai.RvKits.RvView
                           }
                           catch (Exception)
                           {
-
                               throw;
                           }
                       }
@@ -163,6 +219,11 @@ namespace Sai.RvKits.RvView
                            {
                                return;
                            }
+                           //获取剖面图类型
+                           var viewfamilyType = doc.OfClass<ViewFamilyType>()
+                                       .Cast<ViewFamilyType>()
+                                       .Where(t => t.ViewFamily == ViewFamily.Section)
+                                       .FirstOrDefault();
                            viewSection = ViewSection.CreateSection(uidoc.Document, viewfamilyType.Id, sectionBox);
                            viewSection.DisplayStyle = DisplayStyle.ShadingWithEdges;
                            viewSection.DetailLevel = ViewDetailLevel.Fine;
diff --git a/Sai.RvKits/RvView/SectionBoxControllerCmd.cs b/Sai.RvKits/RvView/SectionBoxControllerCmd.cs
index 47f2fcb..05d6b63 100644
--- a/Sai.RvKits/RvView/SectionBoxControllerCmd.cs
+++ b/Sai.RvKits/RvView/SectionBoxControllerCmd.cs
@@ -1,4 +1,5 @@
 using Autodesk.Revit.DB;
+
 using Nice3point.Revit.Toolkit.External;
 
 namespace Sai.RvKits.RvView;
@@ -7,20 +8,20 @@ namespace Sai.RvKits.RvView;
 [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)]
 public class SectionBoxControllerCmd : ExternalCommand
 {
-	public override void Execute()
-	{
-		//if (Document.ActiveView.ViewType != ViewType.ThreeD)
-		//{
-		//    UiDocument.ActiveView = Document.OfCollector<View3D>().Cast<View3D>().FirstOrDefault(v => !v.IsTemplate);
+    public override void Execute()
+    {
+        //if (Document.ActiveView.ViewType != ViewType.ThreeD)
+        //{
+        //    UiDocument.ActiveView = Document.OfCollector<View3D>().Cast<View3D>().FirstOrDefault(v => !v.IsTemplate);
 
-		//}
-		try
-		{
-			WinDialogHelper.ShowModeless<SectionBoxControllerView>(new SectionBoxControllerViewModel(UiDocument));
-		}
-		catch (Exception ex)
-		{
-			ErrorMessage = ex.Message;
-		}
-	}
+        //}
+        try
+        {
+            WinDialogHelper.ShowModeless<SectionBoxControllerView>(new SectionBoxControllerViewModel(UiApplication));
+        }
+        catch (Exception ex)
+        {
+            ErrorMessage = ex.Message;
+        }
+    }
 }
diff --git a/Sai.RvKits/RvView/SectionBoxControllerViewModel.cs b/Sai.RvKits/RvView/SectionBoxControllerViewModel.cs
index fd2a04a..9494abe 100644
--- a/Sai.RvKits/RvView/SectionBoxControllerViewModel.cs
+++ b/Sai.RvKits/RvView/SectionBoxControllerViewModel.cs
@@ -15,14 +15,14 @@ namespace Sai.RvKits.RvView;
 
 public partial class SectionBoxControllerViewModel : ObservableObject
 {
-    public SectionBoxControllerViewModel(UIDocument uidoc)
+    public SectionBoxControllerViewModel(UIApplication uiapp)
     {
-        uidoc.Application.ViewActivated -= Application_ViewActivated;
-        uidoc.Application.ViewActivated += Application_ViewActivated;
+        uiapp.ViewActivated -= Application_ViewActivated;
+        uiapp.ViewActivated += Application_ViewActivated;
 
-        if (uidoc.ActiveView is View3D view3d)
+        if (uiapp.ActiveUIDocument.ActiveView is View3D view3d)
         {
-            using var trans = new Transaction(uidoc.Document, "激活剖面框");
+            using var trans = new Transaction(uiapp.ActiveUIDocument.Document, "激活剖面框");
             trans.Start();
             if (!view3d.IsSectionBoxActive)
             {
@@ -37,7 +37,7 @@ public partial class SectionBoxControllerViewModel : ObservableObject
             CanModify = false;
         }
         setSectionBoxHandler = new ActionEventHandler();
-        this.uidoc = uidoc;
+        this.uiapp = uiapp;
     }
 
     private void Application_ViewActivated(object sender, Autodesk.Revit.UI.Events.ViewActivatedEventArgs e)
@@ -58,13 +58,13 @@ public partial class SectionBoxControllerViewModel : ObservableObject
     public ObservableCollection<SectionBox> BoundingBoxes { get; set; } = [];
 
     private readonly ActionEventHandler setSectionBoxHandler;
-    private readonly UIDocument uidoc;
+    private readonly UIApplication uiapp;
     private int index = 1;
 
     [RelayCommand(CanExecute = nameof(CanModify))]
     private void RecordSectionBox()
     {
-        if (uidoc.Document.ActiveView is View3D { IsSectionBoxActive: true } view3D)
+        if (uiapp.ActiveUIDocument.Document.ActiveView is View3D { IsSectionBoxActive: true } view3D)
         {
             BoundingBoxes.Insert(0, new SectionBox($"剖面框 {index}", view3D.GetSectionBox()));
             index++;
@@ -78,19 +78,19 @@ public partial class SectionBoxControllerViewModel : ObservableObject
     [RelayCommand]
     private void ResetSectionBox()
     {
-        setSectionBoxHandler.Raise(_ =>
+        setSectionBoxHandler.Raise(uiapp =>
         {
-            var doc = uidoc.Document;
+            var uidoc = uiapp.ActiveUIDocument;
             switch (SectionBoxType)
             {
                 case SectionBoxType.Element:
-                    ResetSectionBoxByElement();
+                    ResetSectionBoxByElement(uidoc);
                     break;
                 case SectionBoxType.Rectangle:
-                    ResetSectionBoxByRectangle();
+                    ResetSectionBoxByRectangle(uidoc);
                     break;
                 case SectionBoxType.ViewSection:
-                    ResetSectionBoxByViewSection();
+                    ResetSectionBoxByViewSection(uidoc);
                     break;
                 default:
                     break;
@@ -101,7 +101,7 @@ public partial class SectionBoxControllerViewModel : ObservableObject
     /// <summary>
     /// 重设元素剖面框
     /// </summary>
-    private void ResetSectionBoxByElement()
+    private void ResetSectionBoxByElement(UIDocument uidoc)
     {
         var doc = uidoc.Document;
         doc.Invoke(
@@ -163,10 +163,9 @@ public partial class SectionBoxControllerViewModel : ObservableObject
     /// <summary>
     /// 重设框选剖面框
     /// </summary>
-    private void ResetSectionBoxByRectangle()
+    private void ResetSectionBoxByRectangle(UIDocument uidoc)
     {
         var doc = uidoc.Document;
-
         doc.Invoke(
             ts =>
             {
@@ -207,7 +206,7 @@ public partial class SectionBoxControllerViewModel : ObservableObject
     /// <summary>
     /// 重设剖面视图范围的剖面框
     /// </summary>
-    private void ResetSectionBoxByViewSection()
+    private void ResetSectionBoxByViewSection(UIDocument uidoc)
     {
         var reference = uidoc.Selection.PickObject(Autodesk.Revit.UI.Selection.ObjectType.Element, new FuncFilter(elem => elem.Category?.GetHashCode() == -2000278), "请选择剖面视图");
         var doc = uidoc.Document;
@@ -266,8 +265,9 @@ public partial class SectionBoxControllerViewModel : ObservableObject
     {
         if (obj is BoundingBoxXYZ boundingBoxXyz)
         {
-            setSectionBoxHandler.Raise(_ =>
+            setSectionBoxHandler.Raise(uiapp =>
             {
+                var uidoc = uiapp.ActiveUIDocument;
                 if (uidoc.ActiveView is View3D view3d)
                 {
                     uidoc.Document.Invoke(_ =>
diff --git a/Sai.RvKits/RvView/SwitchBackgroundCmd.cs b/Sai.RvKits/RvView/SwitchBackgroundCmd.cs
index c052cfc..90d4c77 100644
--- a/Sai.RvKits/RvView/SwitchBackgroundCmd.cs
+++ b/Sai.RvKits/RvView/SwitchBackgroundCmd.cs
@@ -2,8 +2,6 @@
 
 using Nice3point.Revit.Toolkit.External;
 
-using UIFramework;
-
 namespace Sai.RvKits.RvView;
 
 [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)]
@@ -13,6 +11,8 @@ public class SwitchBackgroundCmd : ExternalCommand
     public override void Execute()
     {
         var col = Application.BackgroundColor;
-        Application.BackgroundColor = col.Red == 255 && col.Green == 255 && col.Blue == 255 ? new Color(32, 40, 49) : new Color(255, 255, 255);
+        Application.BackgroundColor = col.Red == 255 && col.Green == 255 && col.Blue == 255
+            ? new Color(32, 40, 49)
+            : new Color(255, 255, 255);
     }
 }
\ No newline at end of file
diff --git a/Sai.RvKits/RvView/ViewManagerViewModel.cs b/Sai.RvKits/RvView/ViewManagerViewModel.cs
index 2980003..1e5fdc9 100644
--- a/Sai.RvKits/RvView/ViewManagerViewModel.cs
+++ b/Sai.RvKits/RvView/ViewManagerViewModel.cs
@@ -313,7 +313,7 @@ public partial class ViewManagerViewModel : ObservableObject
                 return true;
             }
             var item = o as ViewManagerModel;
-            return item.Name.Contains(SearchText) || item.UserViewType.GetDescription().Contains(SearchText);
+            return item.Name.Contains(SearchText) || item.UserViewType.GetAttribute<DescriptionAttribute>().Description.Contains(SearchText);
         };
     }
 
diff --git a/Sai.RvKits/Sai.RvKits.csproj b/Sai.RvKits/Sai.RvKits.csproj
index 137fd22..90d7480 100644
--- a/Sai.RvKits/Sai.RvKits.csproj
+++ b/Sai.RvKits/Sai.RvKits.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <LangVersion>12.0</LangVersion>
+        <LangVersion>13.0</LangVersion>
         <Configurations>Debug;Release</Configurations>
         <AccelerateBuildsInVisualStudio>True</AccelerateBuildsInVisualStudio>
         <!-- 添加默认的五个命名空间 -->
         <ImplicitUsings>enable</ImplicitUsings>
         <!-- 生成多语言的问题 -->
-        <SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>
+        <!--<SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>-->
         <GenerateAssemblyInfo>True</GenerateAssemblyInfo>
         <!--netcore框架指定目标运行时-->
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+        <!--<RuntimeIdentifier>win-x64</RuntimeIdentifier>-->
         <UseWPF>True</UseWPF>
         <!--<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>-->
     </PropertyGroup>
@@ -84,20 +84,17 @@
         <PackageReference Include="CommunityToolkit.Diagnostics" Version="8.3.2" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
         <PackageReference Include="EPPlus.Core.Extensions" Version="2.4.0" />
-        <PackageReference Include="ACadSharp" Version="1.0.1" />
+        <PackageReference Include="ACadSharp" Version="1.0.3" />
         <PackageReference Include="FuzzySharp" Version="2.0.2" />
-        <PackageReference Include="HtmlAgilityPack" Version="1.11.65" />
+        <PackageReference Include="HtmlAgilityPack" Version="1.11.70" />
         <!--TreatAsUsed="true"标记为已使用-->
-        <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" TreatAsUsed="true">
-            <TreatAsUsed></TreatAsUsed>
-        </PackageReference>
+        <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.122" TreatAsUsed="True"/>
         <PackageReference Include="randomColorSharped.NetStandard" Version="1.0.2" />
     </ItemGroup>
     <!-- <ItemGroup Condition="$(DefineConstants.Contains('WINFORMS'))"> -->
     <!-- 	<Reference Include="System.Windows.Forms" /> -->
     <!-- </ItemGroup> -->
     <ItemGroup>
-        <!--针对目标的版本有条件地引用最新的Revit SDK程序集。-->
         <!--<PackageReference Include="Autodesk.Revit.SDK" Version="$(RevitVersion).*"  PrivateAssets="All" />-->
         <PackageReference Include="Nice3point.Revit.Api.RevitAPI" Version="$(RevitVersion).*" PrivateAssets="All" />
         <PackageReference Include="Nice3point.Revit.Api.RevitAPIUI" Version="$(RevitVersion).*" PrivateAssets="All" />
diff --git a/Sai.RvKits/UIRibbon/FamilyApp.cs b/Sai.RvKits/UIRibbon/FamilyApp.cs
index 38ea52e..a2e7ca8 100644
--- a/Sai.RvKits/UIRibbon/FamilyApp.cs
+++ b/Sai.RvKits/UIRibbon/FamilyApp.cs
@@ -13,58 +13,58 @@ namespace Sai.RvKits.UIRibbon;
 
 public class FamilyApp
 {
-	public FamilyApp(UIControlledApplication application, UIApplication uiapp)
-	{
-		Items = new ObservableCollection<FamilyModel>();
-		uiapp.Application.DocumentChanged += Application_DocumentChanged;
-		uiapp.Application.DocumentClosed += Application_DocumentClosed;
-		//uiapp.Application.FamilyLoadedIntoDocument += Application_FamilyLoadedIntoDocument;
-		CreateFamilyUI(application);
+    public FamilyApp(UIControlledApplication application, UIApplication uiapp)
+    {
+        Items = new ObservableCollection<FamilyModel>();
+        uiapp.Application.DocumentChanged += Application_DocumentChanged;
+        uiapp.Application.DocumentClosed += Application_DocumentClosed;
+        //uiapp.Application.FamilyLoadedIntoDocument += Application_FamilyLoadedIntoDocument;
+        CreateFamilyUI(application);
 
-		CreateRecentPanel();
-		BindingData();
-		this.uiapp = uiapp;
-	}
+        CreateRecentPanel();
+        BindingData();
+        this.uiapp = uiapp;
+    }
 
-	//private void Application_FamilyLoadedIntoDocument(object sender, Autodesk.Revit.DB.Events.FamilyLoadedIntoDocumentEventArgs e)
-	//{
-	//    Document doc = e.Document;
-	//    var existedFamilyIds = Items.Select(i => i.ReferenceFamily).Cast<Family>().Select(f => f.Id).ToList();
-	//    var i = existedFamilyIds.IndexOf(e.OriginalFamilyId);
-	//    if (i == -1)
-	//    {
-	//        var family = doc.GetElement(e.NewFamilyId) as Family;
-	//        var symbol = doc.GetElement(family.GetFamilySymbolIds().FirstOrDefault()) as FamilySymbol;
-	//        var bitmapsymbol?.GetPreviewImage(new System.Drawing.Size(56, 56)).ToBitmapImage();
-	//        Items.Insert(0, new FamilyModel
-	//        {
-	//            Title = e.FamilyName,
-	//            ReferenceFamily = family,
-	//            $"布置 {e.FamilyName}",
-	//            uiApplication = uiapp,
-	//            BitmapbitmapImage
-	//        });
-	//    }
-	//    else
-	//    {
-	//        Items.Move(i, 0);
-	//    }
-	//}
+    //private void Application_FamilyLoadedIntoDocument(object sender, Autodesk.Revit.DB.Events.FamilyLoadedIntoDocumentEventArgs e)
+    //{
+    //    Document doc = e.Document;
+    //    var existedFamilyIds = Items.Select(i => i.ReferenceFamily).Cast<Family>().Select(f => f.Id).ToList();
+    //    var i = existedFamilyIds.IndexOf(e.OriginalFamilyId);
+    //    if (i == -1)
+    //    {
+    //        var family = doc.GetElement(e.NewFamilyId) as Family;
+    //        var symbol = doc.GetElement(family.GetFamilySymbolIds().FirstOrDefault()) as FamilySymbol;
+    //        var bitmapsymbol?.GetPreviewImage(new System.Drawing.Size(56, 56)).ToBitmapImage();
+    //        Items.Insert(0, new FamilyModel
+    //        {
+    //            Title = e.FamilyName,
+    //            ReferenceFamily = family,
+    //            $"布置 {e.FamilyName}",
+    //            uiApplication = uiapp,
+    //            BitmapbitmapImage
+    //        });
+    //    }
+    //    else
+    //    {
+    //        Items.Move(i, 0);
+    //    }
+    //}
 
-	private const string VbPanelName = "族工具";
-	private const string VbRecentPanelName = "最近使用";
+    private const string VbPanelName = "族工具";
+    private const string VbRecentPanelName = "最近使用";
 
-	//获取Ribbon类所在的通用类库目录
-	private static readonly string TabName = Properties.Settings.Default.TabName;
-	private readonly UIApplication uiapp;
+    //获取Ribbon类所在的通用类库目录
+    private static readonly string TabName = Properties.Settings.Default.TabName;
+    private readonly UIApplication uiapp;
 
-	public ObservableCollection<FamilyModel> Items { get; set; }
+    public ObservableCollection<FamilyModel> Items { get; set; }
 
-	private static bool IsFitting(FamilyInstance instance)
-	{
-		var category = instance.Category;
-		if (category != null)
-		{
+    private static bool IsFitting(FamilyInstance instance)
+    {
+        var category = instance.Category;
+        if (category != null)
+        {
 #if REVIT2018 || REVIT2020
             var builtIncategory = (BuiltInCategory)category.Id.IntegerValue;
 #elif REVIT2025
@@ -73,137 +73,137 @@ public class FamilyApp
             //var name = Enum.Parse(typeof(BuiltInCategory), .ToString());
 
             var name = Enum.GetName(typeof(BuiltInCategory), builtIncategory);
-			if (name.Contains("Fitting"))
-			{
-				return true;
-			}
-		}
+            if (name.Contains("Fitting"))
+            {
+                return true;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	private void Application_DocumentChanged(object sender, Autodesk.Revit.DB.Events.DocumentChangedEventArgs e)
-	{
-		var doc = e.GetDocument();
-		ElementClassFilter instanceClass = new(typeof(FamilyInstance));
-		var elementIds = e.GetAddedElementIds(instanceClass);
+    private void Application_DocumentChanged(object sender, Autodesk.Revit.DB.Events.DocumentChangedEventArgs e)
+    {
+        var doc = e.GetDocument();
+        ElementClassFilter instanceClass = new(typeof(FamilyInstance));
+        var elementIds = e.GetAddedElementIds(instanceClass);
         //e.GetTransactionNames()
         //elementIds.AddRange(e.GetModifiedElementIds());
-        if (elementIds.Any())
-		{
-			var elems = elementIds.ToList().ConvertAll(id => doc.GetElement(id)).OfType<FamilyInstance>();
-			var instances = elems.Where(instance => !IsFitting(instance));
-			var existedFamilyIds = Items.Select(i => i.ReferenceFamily).Select(f => f.Id).ToList();
-			var instanceGroups = instances.GroupBy(ins => ins.Symbol.Family.Id);
-			foreach (var grouping in instanceGroups)
-			{
-				var familyId = grouping.Key;
-				var i = existedFamilyIds.IndexOf(familyId);
-				if (i == -1)
-				{
-					NewGalleryItem(doc, familyId);
-				}
-				//不在第一位则新建到第一位
-				else if (i > 0)
-				{
-					Items.RemoveAt(i);
-					NewGalleryItem(doc, familyId);
-				}
-			}
-		}
+        if (elementIds.Count > 0)
+        {
+            var elems = elementIds.Select(doc.GetElement).OfType<FamilyInstance>();
+            var instances = elems.Where(instance => !IsFitting(instance));
+            var existedFamilyIds = Items.Select(i => i.ReferenceFamily).Select(f => f.Id).ToList();
+            var instanceGroups = instances.GroupBy(ins => ins.Symbol.Family.Id);
+            foreach (var grouping in instanceGroups)
+            {
+                var familyId = grouping.Key;
+                var i = existedFamilyIds.IndexOf(familyId);
+                if (i == -1)
+                {
+                    NewGalleryItem(doc, familyId);
+                }
+                //不在第一位则新建到第一位
+                else if (i > 0)
+                {
+                    Items.RemoveAt(i);
+                    NewGalleryItem(doc, familyId);
+                }
+            }
+        }
 
-		//foreach (var elementFunc in instances)
-		//{
-		//    if (!(elementFunc is FamilyInstance instance)) continue;
-		//    var family = instance.Symbol.Family;
-		//    var symbolId = family?.GetFamilySymbolIds().FirstOrDefault();
-		//    var symbol = doc.GetElement(symbolId) as FamilySymbol;
-		//    var bitmapsymbol?.GetPreviewImage(new System.Drawing.Size(56, 56)).ConvertBitmapToBitmapImage();
+        //foreach (var elementFunc in instances)
+        //{
+        //    if (!(elementFunc is FamilyInstance instance)) continue;
+        //    var family = instance.Symbol.Family;
+        //    var symbolId = family?.GetFamilySymbolIds().FirstOrDefault();
+        //    var symbol = doc.GetElement(symbolId) as FamilySymbol;
+        //    var bitmapsymbol?.GetPreviewImage(new System.Drawing.Size(56, 56)).ConvertBitmapToBitmapImage();
 
 
-		//    Items.Insert(0, new FamilyModel
-		//    {
-		//        Title = family?.Name,
-		//        ReferenceFamily = family,
-		//        $"布置{family?.Name}",
-		//        uiApplication = uiApplication,
-		//        BitmapbitmapImage
-		//    });
-		//}
-	}
+        //    Items.Insert(0, new FamilyModel
+        //    {
+        //        Title = family?.Name,
+        //        ReferenceFamily = family,
+        //        $"布置{family?.Name}",
+        //        uiApplication = uiApplication,
+        //        BitmapbitmapImage
+        //    });
+        //}
+    }
 
-	private void Application_DocumentClosed(object sender, Autodesk.Revit.DB.Events.DocumentClosedEventArgs e)
-	{
-		Items.Clear();
-	}
+    private void Application_DocumentClosed(object sender, Autodesk.Revit.DB.Events.DocumentClosedEventArgs e)
+    {
+        Items.Clear();
+    }
 
-	private void BindingData()
-	{
-		var adTab = ComponentManager.Ribbon.Tabs.First(o => o.Title == TabName);
-		var adPanel = adTab.Panels.First(o => o.Source.Title == VbRecentPanelName);
-		var gallery = adPanel.Source.Items.First() as RibbonGallery;
-		gallery!.ItemWidth = 56;
-		gallery.ItemHeight = 56;
-		gallery.ResizeStyle = RibbonItemResizeStyles.ChangeSize;
-		gallery.DisplayMode = GalleryDisplayMode.Window;
-		gallery.ResizableBoxWidth = 0.0;
-		gallery.IsVirtualizing = true;
-		gallery.RowsInWindowMode = 1;
-		gallery.ShowImage = true;
-		gallery.MinWidth = 400;
-		var resourceLocator = new Uri("Sai.RvKits;component/WPFUI.xaml", UriKind.Relative);
-		var dictionary = (ResourceDictionary)Application.LoadComponent(resourceLocator);
+    private void BindingData()
+    {
+        var adTab = ComponentManager.Ribbon.Tabs.First(o => o.Title == TabName);
+        var adPanel = adTab.Panels.First(o => o.Source.Title == VbRecentPanelName);
+        var gallery = adPanel.Source.Items.First() as RibbonGallery;
+        gallery!.ItemWidth = 56;
+        gallery.ItemHeight = 56;
+        gallery.ResizeStyle = RibbonItemResizeStyles.ChangeSize;
+        gallery.DisplayMode = GalleryDisplayMode.Window;
+        gallery.ResizableBoxWidth = 0.0;
+        gallery.IsVirtualizing = true;
+        gallery.RowsInWindowMode = 1;
+        gallery.ShowImage = true;
+        gallery.MinWidth = 400;
+        var resourceLocator = new Uri("Sai.RvKits;component/WPFUI.xaml", UriKind.Relative);
+        var dictionary = (ResourceDictionary)Application.LoadComponent(resourceLocator);
 
-		gallery.ItemTemplate = (DataTemplate)dictionary["FamilyGalleryItemTemplate"];
-		//绑定数据
-		gallery.ItemsBinding = new System.Windows.Data.Binding
-		{
-			Source = this,
-			Path = new PropertyPath(nameof(Items)),
-			//Source = Items,
-			Mode = System.Windows.Data.BindingMode.OneWay
-		};
-		//绑定样式
-	}
+        gallery.ItemTemplate = (DataTemplate)dictionary["FamilyGalleryItemTemplate"];
+        //绑定数据
+        gallery.ItemsBinding = new System.Windows.Data.Binding
+        {
+            Source = this,
+            Path = new PropertyPath(nameof(Items)),
+            //Source = Items,
+            Mode = System.Windows.Data.BindingMode.OneWay
+        };
+        //绑定样式
+    }
 
-	public void CreateFamilyUI(UIControlledApplication application)
-	{
-		//AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+    public void CreateFamilyUI(UIControlledApplication application)
+    {
+        //AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
 
-		//application.CreateRibbonTab(TabName);
+        //application.CreateRibbonTab(TabName);
 
-		//UserPanel.AddAwItem(_loginPBData);
-		//".\\*.*"中的“.”表示通用类库文件所在的目录（Debug），“..”表示的是上级的目录（bin），“..”\\..，引号表示再上一级目录
-		//ContextualHelp contextualHelp = new ContextualHelp(ContextualHelpType.Url, "https://www.szmedi.com.cn");
-		//_loginPBData.CreateContextualHelp(contextualHelp);
+        //UserPanel.AddAwItem(_loginPBData);
+        //".\\*.*"中的“.”表示通用类库文件所在的目录（Debug），“..”表示的是上级的目录（bin），“..”\\..，引号表示再上一级目录
+        //ContextualHelp contextualHelp = new ContextualHelp(ContextualHelpType.Url, "https://www.szmedi.com.cn");
+        //_loginPBData.CreateContextualHelp(contextualHelp);
 
-		var familyManagePanel = application.CreateRibbonPanel(TabName, VbPanelName);
+        var familyManagePanel = application.CreateRibbonPanel(TabName, VbPanelName);
 
-		//在面板上添加添加浏览族库按钮
-		var localFamilyPbd = UIAssist.NewPushButtonData<FamilyLibraryCmd>(
-			"本地族库",
-			Resources.library_32px,
-			Resources.library_16px
-		);
+        //在面板上添加添加浏览族库按钮
+        var localFamilyPbd = UIAssist.NewPushButtonData<FamilyLibraryCmd>(
+            "本地族库",
+            Resources.library_32px,
+            Resources.library_16px
+        );
 
 
-		var familyMassSave = UIAssist.NewPushButtonData<FamilyProcessorCmd>(
-			"族复用",
-			Resources.family_processor_32px,
-			Resources.family_processor_16px
-		);
-		var replaceInstance = UIAssist.NewPushButtonData<ReplaceInstanceCmd>(
-			"替换族",
-			Resources.replace_32px,
-			Resources.replace_16px
-		);
+        var familyMassSave = UIAssist.NewPushButtonData<FamilyProcessorCmd>(
+            "族复用",
+            Resources.family_processor_32px,
+            Resources.family_processor_16px
+        );
+        var replaceInstance = UIAssist.NewPushButtonData<ReplaceInstanceCmd>(
+            "替换族",
+            Resources.replace_32px,
+            Resources.replace_16px
+        );
 
-		var updateFamilyFile = UIAssist.NewPushButtonData<UpgradeFamilyCmd>(
-			"更新族",
-			Resources.available_updates_32px,
-			Resources.available_updates_16px,
-			"更新族文件缩略图及升级至当前版本"
-		);
+        var updateFamilyFile = UIAssist.NewPushButtonData<UpgradeFamilyCmd>(
+            "更新族",
+            Resources.available_updates_32px,
+            Resources.available_updates_16px,
+            "更新族文件缩略图及升级至当前版本"
+        );
 
         var renameFamily = UIAssist.NewPushButtonData<RenameFamilyNameCmd>(
             "重命名族",
@@ -219,37 +219,37 @@ public class FamilyApp
         familyManagePanel.AddItem(localFamilyPbd);
         familyManagePanel.AddStackedItems(familyMassSave, replaceInstance, updateFamilyFile);
         familyManagePanel.AddStackedItems(renameFamily, renameType);
-	}
+    }
 
-	private static void CreateRecentPanel()
-	{
-		var adTab = ComponentManager.Ribbon.Tabs.First(o => o.Title == TabName);
-		var recentPanel = new Autodesk.Windows.RibbonPanel
-		{
-			Source = new RibbonPanelSource { Title = VbRecentPanelName }
-		};
+    private static void CreateRecentPanel()
+    {
+        var adTab = ComponentManager.Ribbon.Tabs.First(o => o.Title == TabName);
+        var recentPanel = new Autodesk.Windows.RibbonPanel
+        {
+            Source = new RibbonPanelSource { Title = VbRecentPanelName }
+        };
 
-		adTab.Panels.Insert(adTab.Panels.Count, recentPanel);
+        adTab.Panels.Insert(adTab.Panels.Count, recentPanel);
 
-		recentPanel.Source.Items.Add(new RibbonGallery { Name = "_ribbonGallery_recent" });
-		recentPanel.IsVisible = true;
-	}
+        recentPanel.Source.Items.Add(new RibbonGallery { Name = "_ribbonGallery_recent" });
+        recentPanel.IsVisible = true;
+    }
 
-	private void NewGalleryItem(Document doc, ElementId familyId)
-	{
-		var family = doc.GetElement(familyId) as Family;
-		var symbol = doc.GetElement(family!.GetFamilySymbolIds().FirstOrDefault()) as FamilySymbol;
-		var bitmap = symbol?.GetPreviewImage(new System.Drawing.Size(50, 50)).ToBitmapImage();
-		Items.Insert(
-			0,
-			new FamilyModel
-			{
-				ReferenceFamily = family,
-				Title = family.Name,
-				UiApplication = uiapp,
-				BitmapImage = bitmap,
-				ToolTip = $"布置：{family.Name}\n\r所属文档：{family.Document.Title}",
-			}
-		);
-	}
+    private void NewGalleryItem(Document doc, ElementId familyId)
+    {
+        var family = doc.GetElement(familyId) as Family;
+        var symbol = doc.GetElement(family!.GetFamilySymbolIds().FirstOrDefault()) as FamilySymbol;
+        var bitmap = symbol?.GetPreviewImage(new System.Drawing.Size(50, 50)).ToBitmapImage();
+        Items.Insert(
+            0,
+            new FamilyModel
+            {
+                ReferenceFamily = family,
+                Title = family.Name,
+                UiApplication = uiapp,
+                BitmapImage = bitmap,
+                ToolTip = $"布置：{family.Name}\n\r所属文档：{family.Document.Title}",
+            }
+        );
+    }
 }
diff --git a/Sai.RvKits/UIRibbon/ModifyTabApp.cs b/Sai.RvKits/UIRibbon/ModifyTabApp.cs
index 29607d9..410c607 100644
--- a/Sai.RvKits/UIRibbon/ModifyTabApp.cs
+++ b/Sai.RvKits/UIRibbon/ModifyTabApp.cs
@@ -1,4 +1,5 @@
-using System.Windows.Controls;
+using System.ComponentModel;
+using System.Windows.Controls;
 
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
@@ -40,10 +41,11 @@ public class ModifyTabApp
         {
             case AlignType.Left:
                 {
-                    var farthestAlign = alignElements.OrderBy(x => x.UpLeft.X).FirstOrDefault();
+                    //最左的元素
+                    var leftAlignElement = alignElements.OrderBy(x => x.UpLeft.X).FirstOrDefault();
                     foreach (var alignElement in alignElements)
                     {
-                        XYZ resultingPoint = new(farthestAlign.UpLeft.X, alignElement.UpLeft.Y, 0);
+                        XYZ resultingPoint = new(leftAlignElement.UpLeft.X, alignElement.UpLeft.Y, 0);
                         alignElement.MoveTo(resultingPoint, AlignType.Left);
                     }
 
@@ -52,10 +54,10 @@ public class ModifyTabApp
 
             case AlignType.Right:
                 {
-                    var farthestAlign = alignElements.OrderByDescending(x => x.UpRight.X).FirstOrDefault();
+                    var rightAlignElement = alignElements.OrderByDescending(x => x.UpRight.X).FirstOrDefault();
                     foreach (var alignElement in alignElements)
                     {
-                        XYZ resultingPoint = new(farthestAlign.UpRight.X, alignElement.UpRight.Y, 0);
+                        XYZ resultingPoint = new(rightAlignElement.UpRight.X, alignElement.UpRight.Y, 0);
                         alignElement.MoveTo(resultingPoint, AlignType.Right);
                     }
 
@@ -64,10 +66,10 @@ public class ModifyTabApp
 
             case AlignType.Up:
                 {
-                    var farthestAlign = alignElements.OrderByDescending(x => x.UpRight.Y).FirstOrDefault();
+                    var upAlignElement = alignElements.OrderByDescending(x => x.UpRight.Y).FirstOrDefault();
                     foreach (var alignElement in alignElements)
                     {
-                        XYZ resultingPoint = new(alignElement.UpRight.X, farthestAlign.UpRight.Y, 0);
+                        XYZ resultingPoint = new(alignElement.UpRight.X, upAlignElement.UpRight.Y, 0);
                         alignElement.MoveTo(resultingPoint, AlignType.Up);
                     }
 
@@ -87,9 +89,9 @@ public class ModifyTabApp
             case AlignType.HorizontallyCenter: //同一条垂直轴
                 {
                     var sortedElements = alignElements.OrderBy(x => x.UpRight.X).ToList();
-                    var rightAlignAnnotation = sortedElements.LastOrDefault();
-                    var leftAlignAnnotation = sortedElements.FirstOrDefault();
-                    var xCoord = (rightAlignAnnotation.Center.X + leftAlignAnnotation.Center.X) / 2;
+                    var rightElement = sortedElements.LastOrDefault();
+                    var leftElement = sortedElements.FirstOrDefault();
+                    var xCoord = (rightElement.Center.X + leftElement.Center.X) / 2;
                     foreach (var alignElement in sortedElements)
                     {
                         XYZ resultingPoint = new(xCoord, alignElement.Center.Y, 0);
@@ -151,8 +153,11 @@ public class ModifyTabApp
                 }
         }
     }
-
-    private void Align(object obj)
+    /// <summary>
+    /// 对齐命令
+    /// </summary>
+    /// <param name="obj"></param>
+    private void AlignCommand(object obj)
     {
         if (obj is not Autodesk.Windows.RibbonButton rb)
         {
@@ -162,11 +167,13 @@ public class ModifyTabApp
         var alignType = (AlignType)rb.CommandParameter;
         handler.Raise(_ =>
         {
-            Document.Invoke(
+                Document.Invoke(
                 _ =>
                 {
                     var selectedIds = UIDocument.Selection.GetElementIds();
-                    var alignElements = (from id in selectedIds let e = new AlignModelElement(Document.GetElement(id)) select e).ToList();
+                    var alignElements = (from id in selectedIds
+                        let e = new AlignModelElement(Document.GetElement(id))
+                        select e).ToList();
                     //List<AlignModelElement> alignElements = new();
                     //foreach (var id in selectedIds)
                     //{
@@ -175,18 +182,23 @@ public class ModifyTabApp
                     //}
                     AlignByType(alignElements, alignType);
                 },
-                alignType.GetDescription()
-            );
+                alignType.GetAttribute<DescriptionAttribute>().Description);
         });
     }
-
+    /// <summary>
+    /// 是否能进行对齐操作
+    /// </summary>
+    /// <returns></returns>
     private bool CanAlign()
     {
         return UIDocument?.Selection
                 .GetElementIds()
                 .Count(id => Document.GetElement(id) is GenericForm || Document.GetElement(id).Category?.CategoryType == CategoryType.Model) > 1;
     }
-
+    /// <summary>
+    /// 对齐面板
+    /// </summary>
+    /// <param name="tab"></param>
     private void AlignPanel(RibbonTab tab)
     {
         //新建面板
@@ -207,7 +219,7 @@ public class ModifyTabApp
             ToolTip = "根据几何元素范围，元素左侧对齐",
             Text = "左对齐",
             IsCheckable = true,
-            CommandHandler = new RelayCommand<object>(Align, _ => CanAlign()),
+            CommandHandler = new RelayCommand<object>(AlignCommand, _ => CanAlign()),
             CommandParameter = AlignType.Left
             //Orientation = System.Windows.Controls.Orientation.Vertical
         };
@@ -222,7 +234,7 @@ public class ModifyTabApp
             ToolTip = "根据几何元素范围，元素右侧对齐",
             Text = "右对齐",
             IsCheckable = true,
-            CommandHandler = new RelayCommand<object>(Align, _ => CanAlign()),
+            CommandHandler = new RelayCommand<object>(AlignCommand, _ => CanAlign()),
             CommandParameter = AlignType.Right
             //Orientation = System.Windows.Controls.Orientation.Vertical
         };
@@ -238,7 +250,7 @@ public class ModifyTabApp
             ToolTip = "根据几何元素范围，元素底部对齐",
             Text = "下对齐",
             IsCheckable = true,
-            CommandHandler = new RelayCommand<object>(Align, _ => CanAlign()),
+            CommandHandler = new RelayCommand<object>(AlignCommand, _ => CanAlign()),
             CommandParameter = AlignType.Down
             //Orientation = System.Windows.Controls.Orientation.Vertical
         };
@@ -253,7 +265,7 @@ public class ModifyTabApp
             ToolTip = "根据几何元素范围，元素顶部对齐",
             Text = "上对齐",
             IsCheckable = true,
-            CommandHandler = new RelayCommand<object>(Align, _ => CanAlign()),
+            CommandHandler = new RelayCommand<object>(AlignCommand, _ => CanAlign()),
             CommandParameter = AlignType.Up
             //Orientation = System.Windows.Controls.Orientation.Vertical
         };
@@ -268,7 +280,7 @@ public class ModifyTabApp
             ToolTip = "根据几何元素范围，水平居中",
             Text = "水平中",
             IsCheckable = true,
-            CommandHandler = new RelayCommand<object>(Align, _ => CanAlign()),
+            CommandHandler = new RelayCommand<object>(AlignCommand, _ => CanAlign()),
             CommandParameter = AlignType.HorizontallyCenter
             //Orientation = System.Windows.Controls.Orientation.Vertical
         };
@@ -283,7 +295,7 @@ public class ModifyTabApp
             ToolTip = "根据几何元素范围，垂直居中",
             Text = "垂直中",
             IsCheckable = true,
-            CommandHandler = new RelayCommand<object>(Align, _ => CanAlign()),
+            CommandHandler = new RelayCommand<object>(AlignCommand, _ => CanAlign()),
             CommandParameter = AlignType.VerticallyCenter
             //Orientation = System.Windows.Controls.Orientation.Vertical
         };
@@ -300,7 +312,7 @@ public class ModifyTabApp
             IsCheckable = true,
             //默认水平，文字与图标
             //Orientation = Orientation.Vertical,
-            CommandHandler = new RelayCommand<object>(Align, _ => CanAlign()),
+            CommandHandler = new RelayCommand<object>(AlignCommand, _ => CanAlign()),
             CommandParameter = AlignType.Top
         };
         var alignMiddleBtn = new Autodesk.Windows.RibbonButton
@@ -315,7 +327,7 @@ public class ModifyTabApp
             Text = "中对齐",
             IsCheckable = true,
             //Orientation = Orientation.Vertical,
-            CommandHandler = new RelayCommand<object>(Align, _ => CanAlign()),
+            CommandHandler = new RelayCommand<object>(AlignCommand, _ => CanAlign()),
             CommandParameter = AlignType.Middle
         };
         var alignBottomBtn = new Autodesk.Windows.RibbonButton
@@ -331,7 +343,7 @@ public class ModifyTabApp
             Text = "底对齐",
             IsCheckable = true,
             //Orientation = Orientation.Vertical,
-            CommandHandler = new RelayCommand<object>(Align, _ => CanAlign()),
+            CommandHandler = new RelayCommand<object>(AlignCommand, _ => CanAlign()),
             CommandParameter = AlignType.Bottom
         };
 
@@ -359,7 +371,10 @@ public class ModifyTabApp
         alignSource.Items.Add(ribbonRowPanel1);
         tab.Panels.Add(alignElemsPanel);
     }
-
+    /// <summary>
+    /// 选择元素面板
+    /// </summary>
+    /// <param name="tab"></param>
     private void SelectionPanel(RibbonTab tab)
     {
         //新建面板
@@ -509,7 +524,6 @@ public class ModifyTabApp
                 )
                 //Orientation = System.Windows.Controls.Orientation.Vertical
             };
-
         //面板按钮
         Autodesk.Windows.RibbonButton selFilterBtn =
             new()
@@ -526,7 +540,7 @@ public class ModifyTabApp
                 IsCheckable = true,
                 Orientation = Orientation.Vertical,
                 CommandHandler = new RelayCommand(
-                    () => WinDialogHelper.ShowModeless<DetailSelectFiltersView>(new DetailSelectFiltersViewModel(uiapp, handler)),
+                     () => WinDialogHelper.ShowModeless<DetailSelectFiltersView>(new DetailSelectFiltersViewModel(uiapp, handler)),
                     () =>
                         UIDocument?.Selection
                             .GetElementIds()
diff --git a/Sai.RvKits/UIRibbon/RvApp.cs b/Sai.RvKits/UIRibbon/RvApp.cs
index 0fbb462..141fc9e 100644
--- a/Sai.RvKits/UIRibbon/RvApp.cs
+++ b/Sai.RvKits/UIRibbon/RvApp.cs
@@ -1,5 +1,4 @@
-
-using System.Windows;
+using System.Windows;
 
 using Autodesk.Revit.UI;
 
@@ -26,25 +25,29 @@ public class RvApp : ExternalApplication
     {
         saveHandler.RaiseAsync(app =>
             {
-
+                var doc = app.ActiveUIDocument.Document;
 #if REVIT2018
-                foreach (Autodesk.Revit.DB.Document doc in app.Application.Documents)
-                {
-                    if (doc.IsModified && !string.IsNullOrEmpty(doc.PathName))
-                    {
-                        doc.Save();
-                    }
-                }
 
+                if (doc.IsModified && !string.IsNullOrEmpty(doc.PathName))
 #else
-                foreach (Autodesk.Revit.DB.Document doc in app.Application.Documents)
+                if (!doc.IsBackgroundCalculationInProgress() && doc.IsModified && !string.IsNullOrEmpty(doc.PathName))
+#endif
                 {
-                    if (!doc.IsBackgroundCalculationInProgress() && doc.IsModified&&!string.IsNullOrEmpty(doc.PathName))
+                    try
                     {
                         doc.Save();
                     }
+                    catch (Autodesk.Revit.Exceptions.OperationCanceledException)
+                    {
+                        MessageBox.Show("已手动取消本次保存", "提示");
+                    }
+                    catch (Exception)
+                    {
+                        var command = RevitCommandId.LookupPostableCommandId(PostableCommand.Save);
+                        app.PostCommand(command);
+                        //MessageBox.Show("本次自动保存失败，将重新计时", "提示");
+                    }
                 }
-#endif
             });
     }
     public override void OnStartup()
@@ -87,7 +90,7 @@ public class RvApp : ExternalApplication
 
         if (Properties.Settings.Default.IsActiveAutoSave)
         {
-            var interval = Properties.Settings.Default.AutoSaveIntervalTime * 60 * 1000;
+            var interval = Properties.Settings.Default.AutoSaveIntervalTime * 60_000;
             saveTimer.Interval = interval;
             saveTimer.Elapsed -= OnTimedEvent;
             saveTimer.Elapsed += OnTimedEvent;
@@ -95,6 +98,8 @@ public class RvApp : ExternalApplication
         }
     }
 
+
+
     public static void CivilApp(UIControlledApplication application)
     {
         var ribbonPanel = application.CreateRibbonPanel(TabName, "土建装饰");
diff --git a/Sai.Toolkit.Core/Extensions/DataTableExtensions.cs b/Sai.Toolkit.Core/Extensions/DataTableExtensions.cs
index 0aec59e..40191de 100644
--- a/Sai.Toolkit.Core/Extensions/DataTableExtensions.cs
+++ b/Sai.Toolkit.Core/Extensions/DataTableExtensions.cs
@@ -8,148 +8,134 @@ namespace Sai.Toolkit.Core.Extensions;
 
 public static class DataTableExtensions
 {
+    /// <summary>
+    /// 获取数据
+    /// </summary>
+    /// <param name="dt"></param>
+    /// <param name="row"></param>
+    /// <param name="column"></param>
+    /// <returns></returns>
 	public static string GetValue(this DataTable dt, int row, int column)
-	{
-		return dt != null ? dt.Rows[row][column].ToString() : string.Empty;
-	}
-
+    {
+        return dt != null ? dt.Rows[row][column].ToString() : string.Empty;
+    }
+    /// <summary>
+    /// 获取值
+    /// </summary>
+    /// <param name="dr"></param>
+    /// <param name="column"></param>
+    /// <returns></returns>
+    /// <exception cref="ArgumentNullException"></exception>
 	public static string GetValue(this DataRow dr, int column)
-	{
-		return dr == null ? throw new ArgumentNullException() : dr[column].ToString();
-	}
-
+    {
+        return dr == null ? throw new ArgumentNullException(nameof(dr)) : dr[column].ToString();
+    }
+    /// <summary>
+    /// 设置值
+    /// </summary>
+    /// <param name="dt"></param>
+    /// <param name="row"></param>
+    /// <param name="column"></param>
+    /// <param name="value"></param>
 	public static void SetValue(this DataTable dt, int row, int column, object value)
-	{
-		dt.Rows[row][column] = value;
-	}
-
+    {
+        dt.Rows[row][column] = value;
+    }
+    /// <summary>
+    /// 设置值
+    /// </summary>
+    /// <param name="dr"></param>
+    /// <param name="column"></param>
+    /// <param name="value"></param>
+    /// <exception cref="ArgumentNullException"></exception>
 	public static void SetValue(this DataRow dr, int column, object value)
-	{
-		if (dr == null)
-		{
-			throw new ArgumentNullException();
-		}
+    {
+        if (dr == null)
+        {
+            throw new ArgumentNullException(nameof(dr));
+        }
 
-		dr[column] = value;
-	}
+        dr[column] = value;
+    }
 
-	/// <summary>
-	///     转实体，属性名必须与列名相同
-	/// </summary>
-	/// <typeparam name="T"></typeparam>
-	/// <param name="table"></param>
-	/// <returns></returns>
-	public static List<T> ToEntities<T>(this DataTable table)
-		where T : new()
-	{
-		var entities = new List<T>();
-		if (table == null)
-		{
-			return null;
-		}
+    /// <summary>
+    ///     转实体，属性名必须与列名相同
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="table"></param>
+    /// <returns></returns>
+    public static List<T> ToEntities<T>(this DataTable table)
+        where T : new()
+    {
+        var entities = new List<T>();
+        if (table == null)
+        {
+            return null;
+        }
 
-		foreach (DataRow row in table.Rows)
-		{
-			T entity = new();
-			foreach (var item in entity.GetType().GetProperties())
-			{
-				if (table.Columns.Contains(item.Name))
-				{
-					if (DBNull.Value != row[item.Name])
-					{
-						var newType = item.PropertyType;
-						//判断type类型是否为泛型，因为nullable是泛型类,
-						if (newType.IsGenericType && newType.GetGenericTypeDefinition() == typeof(Nullable<>)) //判断convertsionType是否为nullable泛型类
-						{
-							//如果type为nullable类，声明一个NullableConverter类，该类提供从Nullable类到基础基元类型的转换
-							var nullableConverter = new System.ComponentModel.NullableConverter(newType);
-							//将type转换为nullable对的基础基元类型
-							newType = nullableConverter.UnderlyingType;
-						}
+        foreach (DataRow row in table.Rows)
+        {
+            T entity = new();
+            foreach (var item in entity.GetType().GetProperties())
+            {
+                if (table.Columns.Contains(item.Name))
+                {
+                    if (DBNull.Value != row[item.Name])
+                    {
+                        var newType = item.PropertyType;
+                        //判断type类型是否为泛型，因为nullable是泛型类,
+                        if (newType.IsGenericType && newType.GetGenericTypeDefinition() == typeof(Nullable<>)) //判断convertsionType是否为nullable泛型类
+                        {
+                            //如果type为nullable类，声明一个NullableConverter类，该类提供从Nullable类到基础基元类型的转换
+                            var nullableConverter = new System.ComponentModel.NullableConverter(newType);
+                            //将type转换为nullable对的基础基元类型
+                            newType = nullableConverter.UnderlyingType;
+                        }
 
-						item.SetValue(entity, Convert.ChangeType(row[item.Name], newType), null);
-					}
-				}
-			}
+                        item.SetValue(entity, Convert.ChangeType(row[item.Name], newType), null);
+                    }
+                }
+            }
 
-			entities.Add(entity);
-		}
+            entities.Add(entity);
+        }
 
-		return entities;
-	}
+        return entities;
+    }
 
-	/// <summary>
-	///     将指定的集合转换成DataTable。
-	/// </summary>
-	/// <param name="list">将指定的集合。</param>
-	/// <returns>返回转换后的DataTable。</returns>
-	public static DataTable ToDataTable(IList list)
-	{
-		var table = new DataTable();
-		if (list.Count > 0)
-		{
-			var properties = list[0].GetType().GetProperties();
-			foreach (var pi in properties)
-			{
-				var pt = pi.PropertyType;
-				if (pt.IsGenericType && pt.GetGenericTypeDefinition() == typeof(Nullable<>))
-				{
-					pt = pt.GetGenericArguments()[0];
-				}
+    /// <summary>
+    ///     将指定的集合转换成DataTable。
+    /// </summary>
+    /// <param name="list">将指定的集合。</param>
+    /// <returns>返回转换后的DataTable。</returns>
+    public static DataTable ToDataTable(this IList list)
+    {
+        var table = new DataTable();
 
-				table.Columns.Add(new DataColumn(pi.Name, pt));
-			}
+        var properties = list[0].GetType().GetProperties();
+        foreach (var pi in properties)
+        {
+            var pt = pi.PropertyType;
+            if (pt.IsGenericType && pt.GetGenericTypeDefinition() == typeof(Nullable<>))
+            {
+                pt = pt.GetGenericArguments()[0];
+            }
 
-			for (var i = 0; i < list.Count; i++)
-			{
-				var tempList = new ArrayList();
-				foreach (var pi in properties)
-				{
-					var obj = pi.GetValue(list[i], null);
-					tempList.Add(obj);
-				}
+            table.Columns.Add(new DataColumn(pi.Name, pt));
+        }
 
-				var array = tempList.ToArray();
-				table.LoadDataRow(array, true);
-			}
-		}
+        for (var i = 0; i < list.Count; i++)
+        {
+            var tempList = new ArrayList();
+            foreach (var pi in properties)
+            {
+                var obj = pi.GetValue(list[i], null);
+                tempList.Add(obj);
+            }
 
-		return table;
-	}
-
-	public static DataTable ToDataTable<T>(this List<T> list)
-	{
-		var table = new DataTable();
-		//创建列头
-		var properties = typeof(T).GetProperties();
-		foreach (var pi in properties)
-		{
-			var pt = pi.PropertyType;
-			if (pt.IsGenericType && pt.GetGenericTypeDefinition() == typeof(Nullable<>))
-			{
-				pt = pt.GetGenericArguments()[0];
-			}
-
-			table.Columns.Add(new DataColumn(pi.Name, pt));
-		}
-
-		//创建数据行
-		if (list.Count > 0)
-		{
-			for (var i = 0; i < list.Count; i++)
-			{
-				var tempList = new ArrayList();
-				foreach (var pi in properties)
-				{
-					var obj = pi.GetValue(list[i], null);
-					tempList.Add(obj);
-				}
-
-				var array = tempList.ToArray();
-				table.LoadDataRow(array, true);
-			}
-		}
-
-		return table;
-	}
+            var array = tempList.ToArray();
+            table.LoadDataRow(array, true);
+        }
+        return table;
+    }
 }
diff --git a/Sai.Toolkit.Core/Extensions/ImageExtensions.cs b/Sai.Toolkit.Core/Extensions/ImageExtensions.cs
index 4beb16c..cf6d15f 100644
--- a/Sai.Toolkit.Core/Extensions/ImageExtensions.cs
+++ b/Sai.Toolkit.Core/Extensions/ImageExtensions.cs
@@ -10,10 +10,15 @@ namespace Sai.Toolkit.Core.Extensions;
 
 public static class ImageExtensions
 {
+    /// <summary>
+    /// 提取资源
+    /// </summary>
+    /// <param name="resourceName"></param>
+    /// <param name="path"></param>
 	public static void ExtractResource(string resourceName, string path)
 	{
 		using var manifestResourceStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName);
-		using Stream stream = File.Create(path);
+		using var stream = File.Create(path);
 		var array = new byte[8192];
 		int count;
 		while ((count = manifestResourceStream.Read(array, 0, array.Length)) > 0)
@@ -34,7 +39,12 @@ public static class ImageExtensions
 		var bm = WindowsThumbnailProvider.GetThumbnail(filename, width, height, ThumbnailOptions.None);
 		return Imaging.CreateBitmapSourceFromHBitmap(bm.GetHbitmap(), IntPtr.Zero, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions());
 	}
-
+    /// <summary>
+    /// 位图转图片
+    /// </summary>
+    /// <param name="bitmap"></param>
+    /// <returns></returns>
+    /// <exception cref="ArgumentNullException"></exception>
 	public static BitmapImage ToBitmapImage(this Bitmap bitmap)
 	{
 		if (bitmap is null)
@@ -59,13 +69,18 @@ public static class ImageExtensions
 
 		return result;
 	}
-
+    /// <summary>
+    /// 位图转像素集
+    /// </summary>
+    /// <param name="bitmap"></param>
+    /// <returns></returns>
+    /// <exception cref="ArgumentNullException"></exception>
 	public static BitmapSource ToBitmapSource(this Bitmap bitmap)
 	{
 		if (bitmap == null)
 		{
-			return null;
-		}
+            throw new ArgumentNullException(nameof(bitmap));
+        }
 		return Imaging.CreateBitmapSourceFromHBitmap(bitmap.GetHbitmap(), IntPtr.Zero, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions());
 	}
 
diff --git a/Sai.Toolkit.Core/Heplers/ConfigHelpers.cs b/Sai.Toolkit.Core/Heplers/ConfigHelpers.cs
index 751db4e..67cc810 100644
--- a/Sai.Toolkit.Core/Heplers/ConfigHelpers.cs
+++ b/Sai.Toolkit.Core/Heplers/ConfigHelpers.cs
@@ -9,7 +9,7 @@ namespace Sai.Toolkit.Core.Helpers
 		/// <summary>
 		///     获取项目文件夹下的配置文件根据Key获取Value
 		/// </summary>
-		/// <param name="key"></param>
+		/// <param name="key">键</param>
 		/// <returns></returns>
 		public static string GetCfgValue(string key)
 		{
@@ -25,8 +25,8 @@ namespace Sai.Toolkit.Core.Helpers
 		/// <summary>
 		///     保存到程序目录下的配置文件
 		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="value"></param>
+		/// <param name="key">键</param>
+		/// <param name="value">值</param>
 		public static void SetCfgPairs(string key, string value)
 		{
 			var assembly = Assembly.GetCallingAssembly();
diff --git a/Sai.Toolkit.Core/Heplers/EnumHelpers.cs b/Sai.Toolkit.Core/Heplers/EnumHelpers.cs
index eeb8298..e6818bf 100644
--- a/Sai.Toolkit.Core/Heplers/EnumHelpers.cs
+++ b/Sai.Toolkit.Core/Heplers/EnumHelpers.cs
@@ -6,170 +6,14 @@ namespace Sai.Toolkit.Core.Helpers;
 
 public static class EnumHelpers
 {
-	/// <summary>
-	///     获取当前枚举的值和枚举描述
-	/// </summary>
-	/// <returns></returns>
-	public static List<KeyValuePair<int, string>> GetAll<T>()
-		where T : IComparable, IFormattable, IConvertible
-	{
-		var list = new List<KeyValuePair<int, string>>();
-		foreach (var field in typeof(T).GetFields())
-		{
-			if (field.FieldType.IsEnum)
-			{
-				var tmp = field.GetValue(null);
-				var enumValue = (Enum)tmp;
-				var intValue = Convert.ToInt32(enumValue);
-				var showName = enumValue.GetDescription();
-				list.Add(new KeyValuePair<int, string>(intValue, showName));
-			}
-		}
-
-		return list;
-	}
-
-	/// <summary>
-	///     获取当前枚举值的描述，没有描述则返回空字符串
-	/// </summary>
-	/// <param name="value"></param>
-	/// <returns></returns>
-	public static string GetDescription(this Enum value)
-	{
-		var description = string.Empty;
-		var fieldInfo = value.GetType().GetField(value.ToString());
-		var attr = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
-		if (attr != null)
-		{
-			description = attr.Description;
-		}
-
-		return description;
-	}
-
-	public static Dictionary<string, T> GetDescriptionEnumMap<T>()
-		where T : Enum
-	{
-		var results = new Dictionary<string, T>();
-
-		var values = Enum.GetValues(typeof(T));
-
-		foreach (T value in values)
-		{
-			var member = typeof(T).GetMember(value.ToString()).FirstOrDefault();
-
-			if (member is null)
-			{
-				continue;
-			}
-
-			var customAttributes = member.GetCustomAttributes(typeof(DescriptionAttribute), false);
-
-			var name = (customAttributes.FirstOrDefault() as DescriptionAttribute)?.Description;
-
-			if (name != null)
-			{
-				results.Add(name, value);
-			}
-		}
-
-		return results;
-	}
-
-	public static Dictionary<string, T> GetDisplayEnumDict<T>()
-		where T : Enum
-	{
-		var results = new Dictionary<string, T>();
-
-		var values = Enum.GetValues(typeof(T));
-
-		foreach (T value in values)
-		{
-			var member = typeof(T).GetMember(value.ToString()).FirstOrDefault();
-
-			if (member is null)
-			{
-				continue;
-			}
-
-			var atts = member.GetCustomAttributes(typeof(DisplayAttribute), false);
-
-			var name = (atts.FirstOrDefault() as DisplayAttribute)?.Name;
-
-			if (name != null)
-			{
-				results.Add(name, value);
-			}
-		}
-
-		return results;
-	}
-
-	/// <summary>
-	///     获取描述的扩展方法
-	/// </summary>
-	/// <param name="enumObj"></param>
-	/// <param name="value">枚举值</param>
-	/// <returns></returns>
-	public static string GetEnumDescription(this Enum enumObj, int? value)
-	{
-		var fields = enumObj.GetType().GetFields();
-		for (int i = 1, count = fields.Length; i < count; i++)
-		{
-			if ((int)Enum.Parse(enumObj.GetType(), fields[i].Name) == value)
-			{
-				var enumAttributes = (DescriptionAttribute[])fields[i].GetCustomAttributes(typeof(DescriptionAttribute), false);
-				if (enumAttributes.Length > 0)
-				{
-					return enumAttributes[0].Description;
-				}
-			}
-		}
-
-		return string.Empty;
-	}
-
-	private static void GetInfo(Type enumType)
-	{
-		_ = Enum.GetValues(enumType); //得到的是枚举类型，用于遍历枚举类
-
-		_ = Enum.GetNames(enumType); //得到的是枚举类的字符串
-	}
-
-	public static List<string> TraverseEnum<T>()
-	{
-		List<string> pName = new();
-		foreach (T p in Enum.GetValues(typeof(T)))
-		{
-			pName.Add(p.ToString());
-		}
-
-		return pName;
-	}
-
-	public static bool TryParseByDescAttr<T>(string value, out T result)
-		where T : Enum
-	{
-		if (value is null)
-		{
-			throw new ArgumentNullException(nameof(value));
-		}
-
-		var descs = GetDescriptionEnumMap<T>();
-
-		return !descs.TryGetValue(value, out result) ? throw new InvalidEnumArgumentException() : true;
-	}
-
-	public static bool TryParseByDisplayAttr<T>(string value, out T result)
-		where T : Enum
-	{
-		if (value is null)
-		{
-			throw new ArgumentNullException(nameof(value));
-		}
-
-		var dict = GetDisplayEnumDict<T>();
-
-		return !dict.TryGetValue(value, out result) ? throw new InvalidEnumArgumentException() : true;
-	}
+    /// <summary>
+    ///     获取当前枚举值的描述，没有描述则返回空字符串
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public static T GetAttribute<T>(this Enum value) where T : Attribute
+    {
+        var fieldInfo = value.GetType().GetField(value.ToString());
+        return fieldInfo.GetCustomAttribute<T>();
+    }
 }
diff --git a/Sai.Toolkit.Core/Heplers/WinDialogHelper.cs b/Sai.Toolkit.Core/Heplers/WinDialogHelper.cs
index 71f2171..8f1b91d 100644
--- a/Sai.Toolkit.Core/Heplers/WinDialogHelper.cs
+++ b/Sai.Toolkit.Core/Heplers/WinDialogHelper.cs
@@ -17,11 +17,12 @@ public static class WinDialogHelper
     /// <param name="filterName">过滤器的名称</param>
     /// <param name="extensions">仅扩展名,*代表所有文件</param>
     /// <returns></returns>
-    public static string CreateFilter(string filterName, params string[] extensions)
+    public static FileDialog SetFilter(this FileDialog dialog, string filterName, params string[] extensions)
     {
         if (extensions[0] == "*")
         {
-            return "所有文件(*)|*";
+            dialog.Filter = "所有文件(*)|*";
+            //return "所有文件(*)|*";
         }
 
         var str = string.Empty;
@@ -34,8 +35,9 @@ public static class WinDialogHelper
                 str += ";";
             }
         }
-
-        return $"{filterName}({str})|{str}";
+        dialog.Filter = $"{filterName}({str})|{str}";
+        return dialog;
+        //return $"{filterName}({str})|{str}";
     }
 
     /// <summary>
@@ -50,9 +52,10 @@ public static class WinDialogHelper
             new()
             {
                 CheckFileExists = true,
-                Filter = CreateFilter(title, extensions),
+
                 InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
             };
+        dialog.SetFilter(title, extensions);
         return dialog.ShowDialog() == true ? dialog.FileName : null;
     }
 
@@ -93,6 +96,7 @@ public static class WinDialogHelper
     public static void ShowModeless<T>(ObservableObject viewModel)
         where T : Window, new()
     {
+        AppDomain.CurrentDomain.AssemblyResolve += CurrentDomainOnAssemblyResolve;
         var view = SingletonViewHelper<T>.GetInstance(out var isNewCreate);
         if (isNewCreate)
         {
@@ -100,6 +104,8 @@ public static class WinDialogHelper
             view.ShowAhead();
         }
         view.Activate();
+        AppDomain.CurrentDomain.AssemblyResolve -= CurrentDomainOnAssemblyResolve;
+
         //AssemblyLoaderHelpers loaderUtil = new(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location));
         //loaderUtil.HookAssemblyResolve();
         //try
@@ -121,6 +127,19 @@ public static class WinDialogHelper
         //	loaderUtil.UnhookAssemblyResolve();
         //}
     }
+    private static Assembly CurrentDomainOnAssemblyResolve(object sender, ResolveEventArgs args)
+    {
+        if (!args.Name.Contains("Xaml.Behaviors"))
+        {
+            return null;
+        }
+
+        var assemblyFile = Path.Combine(
+            Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
+            "Microsoft.Xaml.Behaviors.dll"
+        );
+        return File.Exists(assemblyFile) ? Assembly.LoadFrom(assemblyFile) : null;
+    }
     private static Dictionary<Type, Window> _windows = [];
     public static void ShowOrActivate<TWindow, TViewModel>(params object[] viewModelParams)
         where TWindow : Window, new()
diff --git a/Sai.Toolkit.Revit/Assist/CollectorAssist.cs b/Sai.Toolkit.Revit/Assist/CollectorAssist.cs
index e287ce6..983bb0f 100644
--- a/Sai.Toolkit.Revit/Assist/CollectorAssist.cs
+++ b/Sai.Toolkit.Revit/Assist/CollectorAssist.cs
@@ -70,24 +70,6 @@ public static class CollectorAssist
             : FilteredElementCollector.IsViewValidForElementIteration(view.Document, view.Id)
                 ? new FilteredElementCollector(view.Document, view.Id)
                 : throw new ArgumentException($"��ͼ{view.Id}����Ӧ���ռ���");
-    public static FilteredElementCollector OfModelCollector(this Document doc)
-    {
-        if (doc == null)
-        {
-            throw new ArgumentNullException(nameof(doc), "�ĵ�Ϊ��");
-        }
-        var li = doc.OfCollector()
-            .WhereElementIsNotElementType()
-            .Where(
-                e => e is TopographySurface ||
-                    (e.CanHaveTypeAssigned() &&
-                        e.HasPhases() &&
-                        e.Category is { Parent: null, CategoryType: CategoryType.Model } &&
-                        e is not Panel &&
-                        e is not Mullion &&
-                        e is not RevitLinkInstance)).Select(e => e.Id).ToList();
-        return new FilteredElementCollector(doc, li);
-    }
     /// <summary>
     ///     �ĵ���Ԫ���ռ���
     /// </summary>
@@ -135,18 +117,19 @@ public static class CollectorAssist
     /// </summary>
     /// <param name="collector">�ռ���</param>
     /// <returns>����Ԫ���ռ���</returns>
-    public static FilteredElementCollector OfInstance(this FilteredElementCollector collector) =>
+    public static FilteredElementCollector OfInstances(this FilteredElementCollector collector) =>
         collector.WhereElementIsNotElementType();
-
-    /// <summary>
-    /// ������Ŀ�ļ���ģ��Ԫ��
-    /// </summary>
-    /// <returns>Ԫ�ؼ���</returns>
-    public static IEnumerable<Element> OfModelElements(this FilteredElementCollector collector) =>
-        collector
+    public static FilteredElementCollector OfModelCollector(this Document doc)
+    {
+        if (doc == null)
+        {
+            throw new ArgumentNullException(nameof(doc), "�ĵ�Ϊ��");
+        }
+        var li = doc.OfCollector()
             .WhereElementIsNotElementType()
             .Where(
                 e => e is TopographySurface ||
+                e is DirectShape ||
                     (e.CanHaveTypeAssigned()
                     && e.IsValidObject
                     && e.HasPhases()
@@ -154,6 +137,46 @@ public static class CollectorAssist
                     && e.Category is { Parent: null, CategoryType: CategoryType.Model }
                     && e is not Panel
                     && e is not Mullion
+                    && e is not RevitLinkInstance)).Select(e => e.Id).ToList();
+        return new FilteredElementCollector(doc, li);
+    }
+
+    /// <summary>
+    /// ������Ŀ�ļ�����ģ��Ԫ��
+    /// </summary>
+    /// <returns>Ԫ�ؼ���</returns>
+    public static IEnumerable<Element> OfParentModelElements(this Document doc) =>
+        doc.OfCollector()
+            .WhereElementIsNotElementType()
+            .Where(
+                e => e is TopographySurface ||
+                e is DirectShape ||
+                    (e.CanHaveTypeAssigned()
+                    && e.IsValidObject
+                    && e.HasPhases()
+                    && e.get_BoundingBox(null) != null
+                    && e.Category is { CategoryType: CategoryType.Model, AllowsBoundParameters: true }
+                    && (e is HostObject || e.Category.Parent == null)
+                    && e is not Panel
+                    && e is not Mullion
+                    && e is not RevitLinkInstance)
+            );
+    /// <summary>
+    /// ������Ŀ�ļ�������ģ��Ԫ��
+    /// </summary>
+    /// <returns>Ԫ�ؼ���</returns>
+    public static IEnumerable<Element> OfAllModelElements(this Document doc) =>
+        doc.OfCollector()
+            .WhereElementIsNotElementType()
+            .Where(
+                e => e is TopographySurface ||
+                e is DirectShape ||
+                    (e.CanHaveTypeAssigned()
+                    && e.IsValidObject
+                    && e.HasPhases()
+                    && e.ViewSpecific == false
+                    && e.Category is { CategoryType: CategoryType.Model, AllowsBoundParameters: true }
+                    && e.get_BoundingBox(null) != null
                     && e is not RevitLinkInstance)
             );
 }
diff --git a/Sai.Toolkit.Revit/Assist/ConnectorAssist.cs b/Sai.Toolkit.Revit/Assist/ConnectorAssist.cs
index bb506cf..4ba750b 100644
--- a/Sai.Toolkit.Revit/Assist/ConnectorAssist.cs
+++ b/Sai.Toolkit.Revit/Assist/ConnectorAssist.cs
@@ -21,7 +21,7 @@ public static class ConnectorAssist
             return null;
         }
         var document = first.Owner.Document;
-        var isUnion = false; //活接头
+        var isSameSize = false; //相同规格、尺寸
         if (first.Domain != second.Domain)
         {
             throw new ArgumentException("无法连接不同类型的管线");
@@ -35,14 +35,14 @@ public static class ConnectorAssist
                     {
                         var shape = first.Shape;
                         //判断管径是否一致
-                        isUnion = shape is ConnectorProfileType.Oval or ConnectorProfileType.Rectangular
+                        isSameSize = shape is ConnectorProfileType.Oval or ConnectorProfileType.Rectangular
                             ? Math.Abs(first.Width - second.Width) < 0.0001 && Math.Abs(first.Height - second.Height) < 0.0001
                             : Math.Abs(first.Radius - second.Radius) < 0.0001;
                     }
                     break;
                 }
             case Domain.DomainPiping:
-                isUnion = Math.Abs(first.Radius - second.Radius) < 0.0001;
+                isSameSize = Math.Abs(first.Radius - second.Radius) < 0.0001;
                 break;
             case Domain.DomainCableTrayConduit:
                 {
@@ -50,11 +50,11 @@ public static class ConnectorAssist
                     {
                         if (second.Owner is Conduit)
                         {
-                            isUnion = Math.Abs(first.Radius - second.Radius) < 0.0001;
+                            isSameSize = Math.Abs(first.Radius - second.Radius) < 0.0001;
                         }
                         if (second.Owner is CableTray)
                         {
-                            isUnion = Math.Abs(first.Width - second.Width) < 0.0001 && Math.Abs(first.Height - second.Height) < 0.0001;
+                            isSameSize = Math.Abs(first.Width - second.Width) < 0.0001 && Math.Abs(first.Height - second.Height) < 0.0001;
                         }
                     }
                     break;
@@ -62,11 +62,11 @@ public static class ConnectorAssist
         }
         try
         {
-            //平行创建过渡件和活接头
+            //平行时，创建过渡件和活接头
             if (first.CoordinateSystem.BasisZ.IsParallelTo(second.CoordinateSystem.BasisZ))
             {
-                //活接头创建
-                if (isUnion) //管径一致时
+                //管径一致时，根据情况创建活接头
+                if (isSameSize) 
                 {
                     //有一个是族的时候，始终直接连接,不创建活接头
                     if (first.Owner is MEPCurve ^ second.Owner is MEPCurve)
@@ -75,29 +75,40 @@ public static class ConnectorAssist
                         {
                             first.ConnectTo(second);
                         }
-                        return null;
                     }
-
-                    if (first.Owner is MEPCurve && second.Owner is MEPCurve) //都是管线
+                    //都是管线
+                    if (first.Owner is MEPCurve && second.Owner is MEPCurve) 
                     {
                         return document.Create.NewUnionFitting(first, second);
                     }
-
                     //都是族的连接件
+                    if (first.Owner is FamilyInstance && second.Owner is FamilyInstance)
+                    {
+                        first.ConnectTo(second);
+                    }
+                    
                     return null;
                 }
-
-                //过渡件，管径不一致时
-                if (first.Owner is MEPCurve)
+                else
                 {
-                    return document.Create.NewTransitionFitting(first, second);
-                }
-                if (second.Owner is MEPCurve)
-                {
-                    return document.Create.NewTransitionFitting(second, first);
+                    //管径不一致时，创建过渡件
+                    if (first.Owner is MEPCurve)
+                    {
+                        return document.Create.NewTransitionFitting(first, second);
+                    }
+                    if (second.Owner is MEPCurve)
+                    {
+                        return document.Create.NewTransitionFitting(second, first);
+                    }
+                    //都是族的连接件
+                    if (first.Owner is FamilyInstance && second.Owner is FamilyInstance)
+                    {
+                        first.ConnectTo(second);
+                    }
+                    return null;
                 }
             }
-
+            //不平行则创建弯头
             return document.Create.NewElbowFitting(first, second);
         }
         catch (Exception)
@@ -130,9 +141,9 @@ public static class ConnectorAssist
         //垂直主管的分支管，为了创建默认三通
         var verticalLine = Line.CreateBound(intersect, intersect + (3.0 * vertical));
         //延长管线到交点处
-        branch.Owner.SetLocationCurve((branch.Owner.GetLocCurve() as Line).ExtendLine(intersect));
-        connector.Owner.SetLocationCurve((connector.Owner.GetLocCurve() as Line).ExtendLine(intersect));
-        connector1.Owner.SetLocationCurve((connector1.Owner.GetLocCurve() as Line).ExtendLine(intersect));
+        branch.Owner.SetLocationCurve((branch.Owner.GetCurve() as Line).ExtendLine(intersect));
+        connector.Owner.SetLocationCurve((connector.Owner.GetCurve() as Line).ExtendLine(intersect));
+        connector1.Owner.SetLocationCurve((connector1.Owner.GetCurve() as Line).ExtendLine(intersect));
         //复制支管创建垂直主管的管线
         var verticalMEPCurveId = ElementTransformUtils.CopyElement(document, branch.Owner.Id, XYZ.Zero).FirstOrDefault();
         var verticalMEPCurve = document.GetElement(verticalMEPCurveId) as MEPCurve;
@@ -160,10 +171,10 @@ public static class ConnectorAssist
         document.Regenerate();
         //Connector branchFarConn = branch.Owner.GetConnectors().GetFarthestConnector(intersect);
         //Line newBranch = Line.CreateBound(branchFarConn.Origin, teeBranchConn.Origin);
-        var l = branch.Owner.GetLocCurve() as Line;
+        var l = branch.Owner.GetCurve() as Line;
         var newBranchLine = l.ExtendLine(teeBranchConn!.Origin);
         branch.Owner.SetLocationCurve(newBranchLine);
-        //Line line = branch.Owner.GetLocCurve() as Line;
+        //Line line = branch.Owner.GetCurve() as Line;
         //if (newBranch.Direction.IsAlmostEqualTo(line.Direction))
         //{
         //    (branch.Owner.Location as LocationCurve).Curve = newBranch;
@@ -302,7 +313,7 @@ public static class ConnectorAssist
             Domain.DomainHvac when connector.Shape == ConnectorProfileType.Rectangular => (connector.Width * 0.2) + (connector.Height * 0.2),
             Domain.DomainHvac when connector.Shape == ConnectorProfileType.Oval => (connector.Width * 0.2) + (connector.Height * 0.2),
             Domain.DomainHvac when connector.Shape == ConnectorProfileType.Round => connector.Radius * 0.5,
-            Domain.DomainPiping => connector.Radius * 0.5,
+            Domain.DomainPiping => connector.Radius * 4,
             Domain.DomainCableTrayConduit => 1,
             _ => 0.5
         };
diff --git a/Sai.Toolkit.Revit/Assist/MEPAssist.cs b/Sai.Toolkit.Revit/Assist/MEPAssist.cs
index b989baa..4817baa 100644
--- a/Sai.Toolkit.Revit/Assist/MEPAssist.cs
+++ b/Sai.Toolkit.Revit/Assist/MEPAssist.cs
@@ -39,8 +39,8 @@ public static class MEPAssist
     public static Dictionary<MEPCurve, XYZ> GetNearestPoints(this MEPCurve mepCurve, MEPCurve mepCurve1)
     {
         Dictionary<MEPCurve, XYZ> dictionary = [];
-        var line1 = mepCurve.GetLocCurve() as Line;
-        var line2 = mepCurve1.GetLocCurve() as Line;
+        var line1 = mepCurve.GetCurve() as Line;
+        var line2 = mepCurve1.GetCurve() as Line;
         var a = line1.Direction.DotProduct(line2.Direction);
         var b = line1.Direction.DotProduct(line1.Direction);
         var c = line2.Direction.DotProduct(line2.Direction);
@@ -76,7 +76,6 @@ public static class MEPAssist
 	/// </summary>
 	/// <param name="mepCurve">用来复制的管线</param>
 	/// <param name="line">定位线</param>
-	/// <param name="canNewElbow">可以创建弯头</param>
 	/// <returns></returns>
 	public static MEPCurve CopyAndSetLocationCurve(this MEPCurve mepCurve, Line line)
     {
@@ -193,7 +192,7 @@ public static class MEPAssist
         document.Regenerate();
         //投影点
         if (
-            electricMepCurve.GetLocCurve() is not Line line
+            electricMepCurve.GetCurve() is not Line line
             || electricMepCurve is FlexDuct
             || electricMepCurve is FlexPipe
             || electricMepCurve is PipeInsulation
@@ -205,7 +204,7 @@ public static class MEPAssist
         }
         var projectPoint = line.Project(point).XYZPoint;
 
-        if ((electricMepCurve.GetLocCurve() as Line).IsInsideEx(point, application.ShortCurveTolerance))
+        if ((electricMepCurve.GetCurve() as Line).IsInsideEx(point, application.ShortCurveTolerance))
         {
             var startLine = Line.CreateBound(line.GetEndPoint(0), projectPoint);
             var endLine = Line.CreateBound(projectPoint, line.GetEndPoint(1));
@@ -377,12 +376,12 @@ public static class MEPAssist
     public static void ConnectTo(this MEPCurve mainMepCurve, MEPCurve branchMepCurve)
     {
         var document = mainMepCurve.Document;
-        var unboundBranchCurve = branchMepCurve.GetLocCurve();
+        var unboundBranchCurve = branchMepCurve.GetCurve();
         unboundBranchCurve.MakeUnbound();
-        var unboundMainCurve = mainMepCurve.GetLocCurve();
+        var unboundMainCurve = mainMepCurve.GetCurve();
         unboundMainCurve.MakeUnbound();
         var intersection = unboundBranchCurve.IntersectionPoint(unboundMainCurve) ?? throw new InvalidOperationException("主次分支管线不存在交点");
-        var line = mainMepCurve.GetLocCurve() as Line;
+        var line = mainMepCurve.GetCurve() as Line;
         //根据交点在管线内的位置，判断是形成弯头还是三通
         if (line.IsInsideEx(intersection, 0.5)) //三通
         {
@@ -459,9 +458,9 @@ public static class MEPAssist
     {
         var doc = pipe.Document;
         var v = doc.ActiveView as View3D;
-        List<T> li = new();
+        List<T> li = [];
         //线段长度
-        var pline = pipe.GetLocCurve() as Line;
+        var pline = pipe.GetCurve() as Line;
         var p1 = pline.GetEndPoint(0);
         var p2 = pline.GetEndPoint(1);
         //线段方向
diff --git a/Sai.Toolkit.Revit/Assist/SpatialAssist.cs b/Sai.Toolkit.Revit/Assist/SpatialAssist.cs
index e7656a9..f2c1615 100644
--- a/Sai.Toolkit.Revit/Assist/SpatialAssist.cs
+++ b/Sai.Toolkit.Revit/Assist/SpatialAssist.cs
@@ -709,7 +709,7 @@ public static class SpatialAssist
     /// </summary>
     /// <param name="instance">以点定位的实例</param>
     /// <returns></returns>
-    public static Curve GetLocCurve(this Element instance)
+    public static Curve GetCurve(this Element instance)
     {
         return instance.Location is LocationCurve lc ? lc.Curve : null;
     }
@@ -1348,6 +1348,8 @@ public static class SpatialAssist
         {
             throw new ArgumentNullException(nameof(curve));
         }
+        //var sourceCurve=instance.GetCurve();
+       
         if (instance.Location is LocationCurve lc)
         {
             try
diff --git a/Sai.Toolkit.Revit/Helpers/KeyIntPtrHelper.cs b/Sai.Toolkit.Revit/Helpers/KeyIntPtrHelper.cs
index b91bcec..66cad6b 100644
--- a/Sai.Toolkit.Revit/Helpers/KeyIntPtrHelper.cs
+++ b/Sai.Toolkit.Revit/Helpers/KeyIntPtrHelper.cs
@@ -222,11 +222,13 @@ public class KeyIntPtrHelper
     /// <summary>
     /// 执行Esc两次，退出Revit选择
     /// </summary>
-    public static void ActionEsc()
+    public static void RaiseEscTwice()
     {
         SetForegroundWindow(ComponentManager.ApplicationWindow);
         keybdEvent(27, 0, 0, 0);
         keybdEvent(27, 0, 2, 0);
+        //keybdEvent(0x1B, 0, 0, 0);
+        //keybdEvent(0x1B, 0, 0, 0);
     }
 
     /// <summary>
@@ -260,7 +262,7 @@ public class KeyIntPtrHelper
                         return true;
                     }
 
-                    GetWindowThreadProcessId(hWnd, out uint num);
+                    GetWindowThreadProcessId(hWnd, out var num);
                     if (num != (ulong)pid)
                     {
                         return true;
diff --git a/Sai.Toolkit.Revit/Helpers/ParameterAssist.cs b/Sai.Toolkit.Revit/Helpers/ParameterAssist.cs
new file mode 100644
index 0000000..82489fc
--- /dev/null
+++ b/Sai.Toolkit.Revit/Helpers/ParameterAssist.cs
@@ -0,0 +1,1176 @@
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Windows.Data;
+
+using Autodesk.Revit.ApplicationServices;
+using Autodesk.Revit.DB;
+using Autodesk.Revit.UI;
+
+
+namespace Sai.Toolkit.Revit.Helpers;
+
+public class ParameterAssist
+{
+
+    public static Dictionary<Definition, ElementBinding> GetDefinitionBindings(Document doc)
+    {
+        Dictionary<Definition, ElementBinding> dict = [];
+        var dep = doc.ParameterBindings.ForwardIterator();
+        while (dep.MoveNext())
+        {
+            var definition = dep.Key;
+            var binding = dep.Current as ElementBinding;
+            dict.Add(definition, binding);
+        }
+        return dict;
+    }
+    /// <summary>
+    /// 判断参数是什么参数，true是项目参数，false是共享参数的项目参数，null，都不是
+    /// </summary>
+    /// <param name="param"></param>
+    /// <returns></returns>
+    public static bool? IsProjectParameter(Parameter param)
+    {
+        var doc = param.Element.Document;
+
+        var dict = GetParameterElementBindings(doc);
+
+        var ds = dict.Where(
+    e => e.Key.GetDefinition().Id == (param.Definition as InternalDefinition)?.Id);
+        if (ds.Any())//说明是项目参数
+        {
+            var d = ds.FirstOrDefault();
+            var parameter = d.Key;
+            var binding = d.Value;
+            if (binding.Categories.Size == 1)//如果只剩下一个类别，则直接移除
+            {
+                if (parameter is SharedParameterElement)//共享参数
+                {
+                    return true;
+                }
+                else//项目参数
+                {
+                    return false;
+                }
+            }
+        }
+        return null;
+    }
+    public static void RemoveFamilyParameter(FamilyInstance instance, string paramName)
+    {
+        Document famdoc = null;
+        Document Document = instance.Document;
+        try
+        {
+            Family family = instance.Symbol.Family;
+
+            if (family.IsEditable)
+            {
+                famdoc = instance.Document.EditFamily(family);
+            }
+            else
+            {
+                Debug.WriteLine($"{family.Name} 不可编辑。");
+            }
+
+            if (famdoc != null)
+            {
+                using (Transaction ts = new(famdoc, "删除参数"))
+                {
+                    ts.Start();
+                    var parametersToRemove = famdoc.FamilyManager
+                        .GetParameters()
+                        .Where(fp => paramName == fp.Definition.Name);
+                    foreach (FamilyParameter fp in parametersToRemove)
+                    {
+                        famdoc.FamilyManager.RemoveParameter(fp);
+                    }
+                    ts.Commit();
+                }
+
+                famdoc.LoadFamily(Document);
+                famdoc.Close(false);
+            }
+        }
+        catch (Exception)
+        {
+            Debug.WriteLine($"{famdoc.Title} 发生错误！");
+        }
+    }
+    /// <summary>
+    /// 移除元素上的项目参数
+    /// </summary>
+    /// <param name="param"></param>
+    public static void RemoveProjectParameter(Parameter param)
+    {
+        Element element = param.Element;
+        var doc = element.Document;
+
+        var dict = GetParameterElementBindings(doc);
+        var bindings = doc.ParameterBindings;
+
+        var ds = dict.Where(
+                e => e.Key.GetDefinition().Id == (param.Definition as InternalDefinition)?.Id);
+        if (ds.Any())//说明是项目参数
+        {
+            var d = ds.FirstOrDefault();
+            var parameter = d.Key;
+            var binding = d.Value;
+            if (binding.Categories.Size == 1)//如果只剩下一个类别，则直接移除
+            {
+                if (parameter is SharedParameterElement)//共享参数
+                {
+                    bindings.Remove(param.Definition);
+                }
+                else//项目参数
+                {
+                    doc.Delete(parameter.Id);
+                }
+            }
+            else//否则只移除一个类别
+            {
+                binding.Categories.Erase(element.Category);
+                doc.ParameterBindings.ReInsert(parameter.GetDefinition(), binding);
+            }
+        }
+    }
+    public static IEnumerable<string> InstanceCategories
+    {
+        get
+        {
+            yield return "HVAC 区";
+            yield return "专用设备";
+            yield return "体量";
+            yield return "停车场";
+            yield return "卫浴装置";
+            yield return "喷头";
+            yield return "图纸";
+            yield return "地形";
+            yield return "场地";
+            yield return "坡道";
+            yield return "墙";
+            yield return "天花板";
+            yield return "安全设备";
+            yield return "家具";
+            yield return "家具系统";
+            yield return "导线";
+            yield return "屋顶";
+            yield return "常规模型";
+            yield return "幕墙嵌板";
+            yield return "幕墙竖梃";
+            yield return "幕墙系统";
+            yield return "开关系统";
+            yield return "房间";
+            yield return "护理呼叫设备";
+            yield return "数据设备";
+            yield return "机械设备";
+            yield return "材质";
+            yield return "柱";
+            yield return "标高";
+            yield return "栏杆扶手";
+            yield return "植物";
+            yield return "楼板";
+            yield return "楼梯";
+            yield return "橱柜";
+            yield return "火警设备";
+            yield return "灯具";
+            yield return "照明设备";
+            yield return "环境";
+            yield return "电气装置";
+            yield return "电气设备";
+            yield return "电缆桥架";
+            yield return "电缆桥架管路";
+            yield return "电缆桥架配件";
+            yield return "电话设备";
+            yield return "电路";
+            yield return "空间";
+            yield return "窗";
+            yield return "竖井洞口";
+            yield return "管件";
+            yield return "管道";
+            yield return "管道占位符";
+            yield return "管道系统";
+            yield return "管道附件";
+            yield return "线管";
+            yield return "线管管路";
+            yield return "线管配件";
+            yield return "组成部分";
+            yield return "结构加强板";
+            yield return "结构区域钢筋";
+            yield return "结构基础";
+            yield return "结构柱";
+            yield return "结构桁架";
+            yield return "结构框架";
+            yield return "结构梁系统";
+            yield return "结构路径钢筋";
+            yield return "结构连接";
+            yield return "结构钢筋";
+            yield return "结构钢筋网";
+            yield return "结构钢筋网区域";
+            yield return "视图";
+            yield return "详图项目";
+            yield return "软管";
+            yield return "软风管";
+            yield return "轴网";
+            yield return "通讯设备";
+            yield return "道路";
+            yield return "部件";
+            yield return "钢筋形状";
+            yield return "门";
+            yield return "面积";
+            yield return "项目信息";
+            yield return "预制零件";
+            yield return "风管";
+            yield return "风管内衬";
+            yield return "风管占位符";
+            yield return "风管管件";
+            yield return "风管系统";
+            yield return "风管附件";
+            yield return "风管隔热层";
+            yield return "风道末端";
+        }
+    }
+
+    public static IEnumerable<string> ProjectParamGroups
+    {
+        get
+        {
+            yield return "IFC参数";
+            yield return "主端点";
+            yield return "光域";
+            yield return "其他";
+            yield return "分区几何图形";
+            yield return "分析平差";
+            yield return "分析模型";
+            yield return "分析结果";
+            yield return "力";
+            yield return "力矩";
+            yield return "卫浴";
+            yield return "可见性";
+            yield return "图层";
+            yield return "图形";
+            yield return "尺寸标注";
+            yield return "常规";
+            yield return "数据";
+            yield return "整个图例";
+            yield return "文字";
+            yield return "机械";
+            yield return "机械 - 流量";
+            yield return "机械 - 负荷";
+            yield return "材质和装饰";
+            yield return "构造";
+            yield return "标识数据";
+            yield return "标题文字";
+            yield return "模型属性";
+            yield return "次端点";
+            yield return "消防系统";
+            yield return "电气";
+            yield return "电气 - 照明";
+            yield return "电气 - 线路";
+            yield return "电气 - 负荷";
+            yield return "电气工程";
+            yield return "管段和管件";
+            yield return "结构";
+            yield return "结构分析";
+            yield return "绿色建筑属性";
+            yield return "编辑板形状";
+            yield return "能量分析";
+            yield return "释放/杆件力";
+            yield return "钢筋集";
+            yield return "阶段化";
+            yield return "限制条件";
+        }
+    }
+
+    public static IEnumerable<string> TypeCategories
+    {
+        get
+        {
+            yield return "专用设备";
+            yield return "体量";
+            yield return "停车场";
+            yield return "卫浴装置";
+            yield return "喷头";
+            yield return "地形";
+            yield return "场地";
+            yield return "坡道";
+            yield return "墙";
+            yield return "天花板";
+            yield return "安全设备";
+            yield return "家具";
+            yield return "家具系统";
+            yield return "导线";
+            yield return "屋顶";
+            yield return "常规模型";
+            yield return "幕墙嵌板";
+            yield return "幕墙竖梃";
+            yield return "幕墙系统";
+            yield return "开关系统";
+            yield return "护理呼叫设备";
+            yield return "数据设备";
+            yield return "机械设备";
+            yield return "柱";
+            yield return "标高";
+            yield return "栏杆扶手";
+            yield return "植物";
+            yield return "楼板";
+            yield return "楼梯";
+            yield return "橱柜";
+            yield return "火警设备";
+            yield return "灯具";
+            yield return "照明设备";
+            yield return "环境";
+            yield return "电气装置";
+            yield return "电气设备";
+            yield return "电缆桥架";
+            yield return "电缆桥架管路";
+            yield return "电缆桥架配件";
+            yield return "电话设备";
+            yield return "窗";
+            yield return "管件";
+            yield return "管道";
+            yield return "管道占位符";
+            yield return "管道系统";
+            yield return "管道附件";
+            yield return "线管";
+            yield return "线管管路";
+            yield return "线管配件";
+            yield return "组成部分";
+            yield return "结构加强板";
+            yield return "结构区域钢筋";
+            yield return "结构基础";
+            yield return "结构柱";
+            yield return "结构桁架";
+            yield return "结构框架";
+            yield return "结构梁系统";
+            yield return "结构路径钢筋";
+            yield return "结构连接";
+            yield return "结构钢筋";
+            yield return "结构钢筋网";
+            yield return "结构钢筋网区域";
+            yield return "详图项目";
+            yield return "软管";
+            yield return "软风管";
+            yield return "轴网";
+            yield return "通讯设备";
+            yield return "部件";
+            yield return "钢筋形状";
+            yield return "门";
+            yield return "预制零件";
+            yield return "风管";
+            yield return "风管内衬";
+            yield return "风管占位符";
+            yield return "风管管件";
+            yield return "风管系统";
+            yield return "风管附件";
+            yield return "风管隔热层";
+            yield return "风道末端";
+        }
+    }
+    /// <summary>
+    /// 获取参数和元素绑定
+    /// </summary>
+    /// <param name="doc"></param>
+    /// <returns></returns>
+    public static Dictionary<ParameterElement, ElementBinding> GetParameterElementBindings(Document doc)
+    {
+        //项目中所有的参数元素实体
+        var parameterElements = new FilteredElementCollector(doc).OfClass(typeof(ParameterElement)).Cast<ParameterElement>();
+
+        Dictionary<ParameterElement, ElementBinding> dict = [];
+        //绑定
+        var dep = doc.ParameterBindings.ForwardIterator();
+        while (dep.MoveNext())
+        {
+            if (dep.Key is InternalDefinition definition)
+            {
+                var binding = dep.Current as ElementBinding;
+                foreach (var param in parameterElements)
+                {
+                    var def = param.GetDefinition();
+
+                    if (def.Id == definition.Id)
+                    {
+                        dict.Add(param, binding);
+                    }
+                }
+            }
+
+        }
+        return dict;
+    }
+
+    /// <summary>
+    ///     关联族参数
+    /// </summary>
+    /// <param name="familyMgr"></param>
+    /// <param name="lengthElementPara"></param>
+    /// <param name="lengthFamilyPara"></param>
+    public static void AssociateParametersInFamilyDocument(
+        FamilyManager familyMgr,
+        Parameter lengthElementPara, // 长度类型的图元参数
+        FamilyParameter lengthFamilyPara
+    ) // 长度类型的族参数
+    {
+#if REVIT2018 || REVIT2020
+        var lengthElementParaType = lengthElementPara.Definition.ParameterType;
+        var lengthFamilyParaType = lengthFamilyPara.Definition.ParameterType;
+#elif REVIT2025
+		var lengthElementParaType = lengthElementPara.Definition.GetDataType();
+		var lengthFamilyParaType = lengthFamilyPara.Definition.GetDataType();
+#endif
+        // 能关联起来的图元参数和族参数的类型要相同
+        if (lengthElementParaType != lengthFamilyParaType)
+        {
+            // 注意：有些类型不同的图元参数和族参数也是可以关联的。
+            // 比如PipeSize和Length类型的参数可以关联，因为他们代表了相同的物理量：长度
+            return;
+        }
+
+        // 判断该长度单位是否能够和族参数关联
+        if (!familyMgr.CanElementParameterBeAssociated(lengthElementPara))
+        {
+            return;
+        }
+
+        // 进行关联操作
+        familyMgr.AssociateElementParameterToFamilyParameter(lengthElementPara, lengthFamilyPara);
+    }
+
+    /// <summary>
+    ///     绑定新建参数参数
+    /// </summary>
+    /// <param name="doc"></param>
+    /// <param name="e"></param>
+    /// <param name="definition"></param>
+    /// <param name="isInstance"></param>
+    public static void BindingElementCategory(Document doc, Element e, Definition definition, bool isInstance)
+    {
+        var app = doc.Application;
+        var bindmap = doc.ParameterBindings;
+        Binding binding = null;
+        var dep = bindmap.ForwardIterator();
+        while (dep.MoveNext())
+        {
+            var depKey = dep.Key;
+            var definitionName = depKey.Name;
+            if (definitionName == definition.Name)
+            {
+#if REVIT2018 || REVIT2020
+
+                _ = depKey.ParameterType;
+#elif REVIT2025
+				_ = depKey.GetDataType();
+#endif
+
+                binding = bindmap.get_Item(depKey);
+                break;
+            }
+        }
+
+        if (binding == null)
+        {
+            var categorySet = app.Create.NewCategorySet();
+            categorySet.Insert(e.Category);
+            binding = isInstance ? app.Create.NewInstanceBinding(categorySet) : app.Create.NewTypeBinding(categorySet);
+
+            bindmap.Remove(definition);
+
+#if REVIT2018 || REVIT2020
+            bindmap.ReInsert(definition, binding, BuiltInParameterGroup.PG_ADSK_MODEL_PROPERTIES);
+#elif REVIT2025
+			bindmap.ReInsert(definition, binding, GroupTypeId.AdskModelProperties);
+#endif
+        }
+        else
+        {
+            CategorySet categorySet;
+            if (binding is InstanceBinding instanceBinding)
+            {
+                categorySet = instanceBinding.Categories;
+            }
+            else
+            {
+                var typeBinding = binding as TypeBinding;
+                categorySet = typeBinding!.Categories;
+            }
+
+            categorySet.Insert(e.Category);
+        }
+    }
+
+    public static FamilyParameter CreateFamilyPara(
+        Document famdoc,
+        string paraName,
+#if REVIT2018 || REVIT2020
+        BuiltInParameterGroup paraGroup,
+        ParameterType paramType,
+#elif REVIT2025
+		ForgeTypeId paraGroup,
+		ForgeTypeId paramType,
+#endif
+        bool isInstance
+    )
+    {
+        // 得到FamilyManager
+        if (!famdoc.IsFamilyDocument)
+        {
+            throw new Exception("不是族文档");
+        }
+
+        var familyMgr = famdoc.FamilyManager;
+        return familyMgr.AddParameter(paraName, paraGroup, paramType, isInstance);
+    }
+
+    public static void CreateSharedFamilyParam(Application app, Document famdoc)
+    {
+        var familyMgr = famdoc.FamilyManager;
+
+        // 共享参数的基本信息, 包括定义文件路径，参数分组名称，参数名称和参数类型。
+        var sharedParameterFilePath = @"C:\SharedParameter.txt";
+        var sharedParameterGroupName = "Shared_Group";
+        var sharedParameter = "Shared_Parameter";
+#if REVIT2018 || REVIT2020
+        var sharedParameterType = ParameterType.Length;
+#elif REVIT2025
+        var sharedParameterType = SpecTypeId.Length;
+#endif
+        ExternalDefinitionCreationOptions externalDefinitionCreationOptions = new(sharedParameter, sharedParameterType);
+        // 打开或创建共享参数定义文件。
+        app.SharedParametersFilename = sharedParameterFilePath;
+        var sharedDefinitonFile = app.OpenSharedParameterFile();
+        if (sharedDefinitonFile == null)
+        {
+            return;
+        }
+
+        // 查找共享参数的分组名称，如果没找到，就创建一个。
+        DefinitionGroup sharedGroup;
+        sharedGroup = sharedDefinitonFile.Groups.get_Item(sharedParameterGroupName);
+        if (null == sharedGroup)
+        {
+            sharedGroup = sharedDefinitonFile.Groups.Create(sharedParameterGroupName);
+        }
+
+        // 查找共享参数的定义，如果没有找到，就用名字和类型创建一个。
+        if (sharedGroup.Definitions.get_Item(sharedParameter) is not ExternalDefinition parameterDef)
+        {
+            parameterDef = sharedGroup.Definitions.Create(externalDefinitionCreationOptions) as ExternalDefinition;
+        }
+
+        // 创建共享族参数
+#if REVIT2018 || REVIT2020
+        _ = familyMgr.AddParameter(parameterDef, BuiltInParameterGroup.PG_CONSTRAINTS, true);
+#elif REVIT2025
+		_ = familyMgr.AddParameter(parameterDef, GroupTypeId.Constraints, true);
+#endif
+    }
+
+    public void CreateSharedParam(
+        Application app,
+        Document doc,
+        bool instanceParameter,
+        string sharedParametersFilePath,
+        string groupName,
+        string definitionName
+    )
+    {
+#if REVIT2018 || REVIT2020
+        var parameterType = ParameterType.Text;
+        var parameterGroup = BuiltInParameterGroup.PG_DATA;
+#elif REVIT2025
+		var parameterType = SpecTypeId.String.Text;
+		var parameterGroup = GroupTypeId.Data;
+#endif
+        CategorySet categorySet = new();
+        var wallCategory = doc.Settings.Categories.get_Item(BuiltInCategory.OST_Walls);
+        categorySet.Insert(wallCategory);
+
+        if (!File.Exists(sharedParametersFilePath))
+        {
+            try
+            {
+                var sw = File.CreateText(sharedParametersFilePath);
+                sw.Close();
+            }
+            catch (Exception)
+            {
+                throw new Exception("无法创建共享参数文件: " + sharedParametersFilePath);
+            }
+        }
+
+        // 设置共享参数文件
+        app.SharedParametersFilename = sharedParametersFilePath;
+
+        // 打开共享参数文件
+        var definitionFile = app.OpenSharedParameterFile();
+        if (definitionFile == null)
+        {
+            throw new Exception("无法打开共享参数文件");
+        }
+
+        // 获取参数组的集合
+        var groups = definitionFile.Groups;
+
+        // 获取参数组
+        var group = groups.get_Item(groupName);
+        if (null == group)
+        {
+            // 如果参数组不存在，则创建一个
+            group = groups.Create(groupName);
+        }
+
+        if (null == group)
+        {
+            throw new Exception("获取参数组失败: " + groupName);
+        }
+
+        // 获取参数定义
+        var definition = group.Definitions.get_Item(definitionName);
+        // 如果参数定义不存在，则创建一个
+        definition ??= group.Definitions.Create(new ExternalDefinitionCreationOptions(definitionName, parameterType));
+
+        // 调用不同的函数创建类型参数或者实例参数
+        ElementBinding binding = instanceParameter
+            ? app.Create.NewInstanceBinding(categorySet)
+            : app.Create.NewTypeBinding(categorySet);
+
+        // 把参数定义和类别绑定起来，元素的新的参数就创建成功了。
+        var insertSuccess = doc.ParameterBindings.Insert(definition, binding, parameterGroup);
+
+        if (!insertSuccess)
+        {
+            throw new Exception("绑定类别失败");
+        }
+    }
+
+    public DefinitionFile CreateTempSharedParameterFile(Application revitApp, string fileName)
+    {
+        var shapeFile = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + $"\\{fileName}.txt";
+        System.Text.StringBuilder contents = new();
+        contents.AppendLine("# This is a Revit shared parameter file.");
+        contents.AppendLine("# Do not edit manually.");
+        contents.AppendLine("*META	VERSION	MINVERSION");
+        contents.AppendLine("META	2	1");
+        contents.AppendLine("*GROUP	ID	NAME");
+        contents.AppendLine("*PARAM	GUID	NAME	DATATYPE	DATACATEGORY	GROUP	VISIBLE");
+        File.WriteAllText(shapeFile, contents.ToString());
+        revitApp.SharedParametersFilename = shapeFile;
+        return revitApp.OpenSharedParameterFile();
+    }
+
+    /// <summary>
+    ///     生成共享文件
+    /// </summary>
+    /// <param name="groups">参数组</param>
+    /// <param name="definitions">参数外部定义</param>
+    /// <returns></returns>
+    public static string GenerateSharedParameterFile(List<DefinitionGroup> groups, List<ExternalDefinition> definitions)
+    {
+        var name = Assembly.GetCallingAssembly().GetName();
+        var date = string.Format(
+            "{0:s}",
+            File.GetLastWriteTime(Assembly.GetExecutingAssembly().Location).ToUniversalTime()
+        );
+        var result =
+            "# This is a Revit shared parameter file, generated "
+            + DateTime.Now.ToShortDateString()
+            + " using "
+            + name.Name
+            + " v"
+            + name.Version
+            + " built "
+            + date
+            + "\r\n";
+        result += "# Do not edit manually.\r\n";
+        result += "*META\tVERSION\tMINVERSION\r\n";
+        result += "META\t2\t1\r\n";
+        result += "*GROUP\tID\tNAME\r\n";
+        for (var i = 0; i < groups.Count; i++)
+        {
+            var group = groups[i];
+            result += "GROUP\t" + $"{i + 1}" + "\t" + group.Name + "\r\n";
+        }
+
+        result += "*PARAM\tGUID\tNAME\tDATATYPE\tDATACATEGORY\tGROUP\tVISIBLE\tDESCRIPTION\tUSERMODIFIABLE\r\n";
+        foreach (var definition in definitions)
+        {
+            var id = groups.FindIndex(g => g.Name == definition.OwnerGroup.Name) + 1;
+            if (id > 0)
+            {
+                result +=
+                    "PARAM\t"
+                    + definition.GUID
+                    + "\t"
+                    + definition.Name
+                    + "\t"
+#if REVIT2018 || REVIT2020
+                    + definition.ParameterType.ToString().ToUpper()
+#elif REVIT2025
+                    + definition.GetDataType().ToString().ToUpper()
+#endif
+                    + "\t\t"
+                    + id
+                    + (definition.Visible ? "\t1\t" : "\t0\t")
+                    + System.Text.RegularExpressions.Regex.Replace(definition.Description, @"\t|\n|\r", string.Empty)
+                    + "\t"
+                    + (definition.UserModifiable ? "1" : string.Empty)
+                    + "\r\n";
+            }
+        }
+
+        return result;
+    }
+
+    public static ExternalDefinition GetDefinition(
+        DefinitionFile sharedParamFile,
+        string definitionName,
+#if REVIT2018 || REVIT2020
+        ParameterType paramType,
+#elif REVIT2025
+        ForgeTypeId paramType,
+#endif
+        ref Guid guid,
+        DefinitionGroup group
+    )
+    {
+        new List<ExternalDefinition>();
+        foreach (var definitionGroup in sharedParamFile.Groups)
+        {
+            foreach (var definition in definitionGroup.Definitions)
+            {
+                var externalDefinition = (ExternalDefinition)definition;
+                if (externalDefinition.Name == definitionName)
+                {
+                    return externalDefinition;
+                }
+            }
+        }
+
+        ExternalDefinitionCreationOptions externalDefinitionCreationOptions = new(definitionName, paramType);
+        return group.Definitions.Create(externalDefinitionCreationOptions) as ExternalDefinition;
+    }
+
+    /// <summary>
+    ///     获取或创建共享参数文件的参数组中的参数
+    /// </summary>
+    /// <param name="group"></param>
+    /// <param name="paramName"></param>
+    /// <param name="canEdit"></param>
+    /// <returns></returns>
+    public static Definition GetDefinition(DefinitionGroup group, string paramName, bool canEdit = false)
+    {
+        if (group is null)
+        {
+            throw new ArgumentNullException(nameof(group));
+        }
+
+        if (paramName is null)
+        {
+            throw new ArgumentNullException(nameof(paramName));
+        }
+
+        var definition = group.Definitions.get_Item(paramName);
+
+        if (definition != null)
+        {
+            return definition;
+        }
+#if REVIT2018 || REVIT2020
+        var opt = new ExternalDefinitionCreationOptions(paramName, ParameterType.Text) { UserModifiable = canEdit };
+
+#elif REVIT2025
+		var opt = new ExternalDefinitionCreationOptions(paramName, SpecTypeId.String.Text) { UserModifiable = canEdit };
+#endif
+
+        return group.Definitions.Create(opt);
+    }
+
+    public static DefinitionGroup GetGroup(DefinitionFile myDefinitionFile, string groupName, string log)
+    {
+        DefinitionGroup definitionGroup = null;
+        var groups = myDefinitionFile.Groups;
+        foreach (var definitionGroup2 in groups)
+        {
+            if (definitionGroup2.Name == groupName)
+            {
+                using (StreamWriter streamWriter = new(log, true))
+                {
+                    streamWriter.WriteLine("Group {0} already exists", groupName);
+                }
+
+                definitionGroup = definitionGroup2;
+                return definitionGroup;
+            }
+        }
+
+        using (StreamWriter streamWriter2 = new(log, true))
+        {
+            streamWriter2.WriteLine("Group {0} not found", groupName);
+        }
+
+        definitionGroup = groups.Create(groupName);
+        using (StreamWriter streamWriter3 = new(log, true))
+        {
+            streamWriter3.WriteLine("Group {0} created", definitionGroup.Name);
+        }
+
+        return definitionGroup;
+    }
+
+    /// <summary>
+    ///     获取共享参数文件中的参数组
+    /// </summary>
+    /// <param name="groups"></param>
+    /// <param name="groupName">分组</param>
+    /// <returns></returns>
+    public static DefinitionGroup GetGroup(DefinitionGroups groups, string groupName)
+    {
+        return groups is null
+            ? throw new ArgumentNullException(nameof(groups))
+            : groupName is null
+                ? throw new ArgumentNullException(nameof(groupName))
+                : groups.get_Item(groupName) ?? groups.Create(groupName);
+    }
+
+    /// <summary>
+    ///     获取共享参数文件中的参数组
+    /// </summary>
+    /// <param name="uiapp"></param>
+    /// <param name="parmPath">共享文件路径</param>
+    /// <returns></returns>
+    public static DefinitionGroups GetGroupList(UIApplication uiapp, string parmPath)
+    {
+        if (uiapp is null)
+        {
+            throw new ArgumentNullException(nameof(uiapp));
+        }
+
+        if (parmPath is null)
+        {
+            throw new ArgumentNullException(nameof(parmPath));
+        }
+
+        if (!File.Exists(parmPath))
+        {
+            File.CreateText(parmPath);
+        }
+
+        uiapp.Application.SharedParametersFilename = parmPath;
+
+        return uiapp.Application.OpenSharedParameterFile()?.Groups;
+    }
+
+    public void GetSharedPara(Application revitApp)
+    {
+        // 打开共享参数文件
+        var definitionFile = revitApp.OpenSharedParameterFile();
+        // 获取参数组的集合
+        var groups = definitionFile.Groups;
+
+        foreach (var group in groups)
+        {
+            // 获取参数组内的参数定义
+            foreach (var definition in group.Definitions)
+            {
+                _ = definition.Name;
+#if REVIT2018 || REVIT2020
+                _ = definition.ParameterType;
+#elif REVIT2025
+                _ = definition.GetDataType();
+#endif
+                // 对参数定义的其他操作
+            }
+        }
+    }
+
+    /// <summary>
+    ///     初始化元素绑定（或类型）
+    /// </summary>
+    /// <param name="uiapp"></param>
+    /// <param name="elm">要绑定类别的元素</param>
+    /// <param name="paramPath">共享文件路径</param>
+    public static void InitParamList(UIApplication uiapp, Element elm, string paramPath)
+    {
+        if (uiapp is null)
+        {
+            throw new ArgumentNullException(nameof(uiapp));
+        }
+
+        if (elm is null)
+        {
+            throw new ArgumentNullException(nameof(elm));
+        }
+
+        if (paramPath is null)
+        {
+            throw new ArgumentNullException(nameof(paramPath));
+        }
+
+        var doc = uiapp.ActiveUIDocument.Document;
+
+        var bindingMap = doc.ParameterBindings;
+
+        var groups = GetGroupList(uiapp, paramPath);
+
+        CategorySet elmCtgs = new();
+
+        elmCtgs.Insert(elm.Category);
+
+        foreach (var groupPram in groups)
+        {
+            var paramGroup = GetGroup(groups, groupPram.Name);
+
+            foreach (var definition in groupPram.Definitions)
+            {
+                var binding = bindingMap.get_Item(definition);
+
+                // If the parameter group's name contains type key, it's means type binding.
+                if (!paramGroup.Name.Contains("Group"))
+                {
+                    if (binding is InstanceBinding instanceBinding)
+                    {
+                        bindingMap.ReInsert(definition, instanceBinding);
+                    }
+                    else
+                    {
+                        instanceBinding = uiapp.Application.Create.NewInstanceBinding(elmCtgs);
+
+                        bindingMap.Insert(definition, instanceBinding);
+                    }
+                }
+                else
+                {
+                    if (binding is TypeBinding typeBinding)
+                    {
+                        bindingMap.ReInsert(definition, typeBinding);
+                    }
+                    else
+                    {
+                        typeBinding = uiapp.Application.Create.NewTypeBinding(elmCtgs);
+
+                        bindingMap.Insert(definition, typeBinding);
+                    }
+                }
+            }
+        }
+    }
+    /// <summary>
+    /// 是否存在该项目参数(共享参数/项目参数)
+    /// </summary>
+    /// <param name="doc"></param>
+    /// <param name="paramName"></param>
+    /// <param name="definition"></param>
+    /// <param name="binding"></param>
+    /// <returns></returns>
+    public bool IsExistSharedParam(
+        Document doc,
+        string paramName,
+        out Definition definition,
+        out ElementBinding binding
+    )
+    {
+        DefinitionBindingMap map = doc.ParameterBindings;
+        var dep = map.ForwardIterator();
+        var isExist = false;
+        binding = null;
+        definition = null;
+        while (dep.MoveNext())
+        {
+            definition = dep.Key;
+            var definitionName = definition.Name;
+            binding = dep.Current as ElementBinding;
+            //ParameterType parameterType = definition.ParameterType;
+            //InstanceBinding instanceBinding = dep.Current as InstanceBinding;
+            //if (instanceBinding != null)
+            //{
+            //    CategorySet categorySet = instanceBinding.Categories;
+            //}
+            if (definitionName == paramName)
+            {
+                isExist = true;
+                break;
+            }
+        }
+
+        return isExist;
+    }
+
+    /// <summary>
+    ///     判断共享参数和项目参数
+    /// </summary>
+    /// <param name="parameter">The parameter<see cref="Parameter" /></param>
+    /// <returns></returns>
+    public bool IsSharedPara(Parameter parameter)
+    {
+        var definition = parameter.Definition as InternalDefinition;
+
+        var isSharedParameter = parameter.IsShared; //共享参数
+
+        var isProjectParameter = definition.BuiltInParameter == BuiltInParameter.INVALID && !parameter.IsShared; //项目参数
+        return isSharedParameter;
+    }
+
+    /// <summary>
+    ///     修改内建参数
+    /// </summary>
+    /// <param name="parameter"></param>
+    /// <param name="value"></param>
+    /// <exception cref="Exception"></exception>
+    public static void ModifyBuiltInParameter(Parameter parameter, object value)
+    {
+        var success = false;
+        if (parameter != null && !parameter.IsReadOnly)
+        {
+            switch (parameter.StorageType)
+            {
+                case StorageType.Double:
+                    success = parameter.Set((double)value);
+                    break;
+
+                case StorageType.ElementId:
+                    success = parameter.Set((ElementId)value);
+                    break;
+
+                case StorageType.String:
+                    success = parameter.Set((string)value);
+                    break;
+
+                case StorageType.Integer:
+                    success = parameter.Set((int)value);
+                    break;
+            }
+
+            if (!success)
+            {
+                throw new Exception("赋值失败");
+            }
+        }
+        else
+        {
+            throw new Exception("参数是只读的");
+        }
+    }
+
+    public static DefinitionFile OpenSharedParametersFile(Application application)
+    {
+        var sharedParametersFile = application.OpenSharedParameterFile();
+        return sharedParametersFile;
+    }
+
+    /// <summary>
+    ///     移除当前文档中所有族的某些参数
+    /// </summary>
+    /// <param name="doc"></param>
+    /// <param name="paramnames"></param>
+    public static void RemoveParams(Document doc, params string[] paramnames)
+    {
+        var instances = new FilteredElementCollector(doc).OfClass(typeof(FamilyInstance)).Cast<FamilyInstance>();
+        foreach (var instance in instances)
+        {
+            var family = instance.Symbol.Family;
+            var famdoc = doc.EditFamily(family);
+            using (Transaction trans = new(famdoc, "删除参数"))
+            {
+                trans.Start();
+                foreach (var paramname in paramnames)
+                {
+                    var param1 = instance.Symbol.GetParameters(paramname).FirstOrDefault();
+                    if (param1 != null)
+                    {
+                        var fparam1 = famdoc.FamilyManager.get_Parameter(paramname);
+                        if (fparam1 != null)
+                        {
+                            famdoc.FamilyManager.RemoveParameter(fparam1);
+                        }
+                    }
+
+                    //MessageBox.ShowAhead(famdoc.Title);
+                    //var fparams = famdoc.FamilyManager.GetAllTypeParameter();
+
+                    //var para = from p in fparams
+                    //           where p.Definition.Name == "Code"
+                    //           select p;
+                }
+
+                famdoc.LoadFamily(doc, new LoadFamilyOptions());
+                trans.Commit();
+            }
+
+            famdoc.Close(false);
+        }
+    }
+
+    public static void SharedParamsBindingCategoryset(
+        UIApplication uiapp,
+        DefinitionFile sharedParametersFile,
+        ExternalDefinition param,
+        CategorySet categorySet,
+        bool isInstance
+    )
+    {
+#if REVIT2018 || REVIT2020
+        var paramGroup = param.ParameterGroup;
+#elif REVIT2025
+        var paramGroup = param.GetGroupTypeId();
+#endif
+
+        var instanceBinding = uiapp.Application.Create.NewInstanceBinding(categorySet);
+        var typeBinding = uiapp.Application.Create.NewTypeBinding(categorySet);
+        var bindingMap = uiapp.ActiveUIDocument.Document.ParameterBindings;
+
+        var extDef = GetSharedParameter(sharedParametersFile, param.OwnerGroup.Name, param.Name);
+
+        if (isInstance)
+        {
+            bindingMap.Insert(extDef, instanceBinding, paramGroup);
+        }
+        else
+        {
+            bindingMap.Insert(extDef, typeBinding, paramGroup);
+        }
+    }
+
+    /// <summary>
+    ///     获取类别和参数的绑定
+    /// </summary>
+    /// <param name="doc">激活的文档</param>
+    public void ShareParameterBinging(Document doc)
+    {
+        var map = doc.ParameterBindings;
+        var dep = map.ForwardIterator();
+        while (dep.MoveNext())
+        {
+            var definition = dep.Key;
+            // 获取参数定义的基本信息
+            var definitionName = definition.Name;
+#if REVIT2018 || REVIT2020
+            var parameterType = definition.ParameterType;
+#elif REVIT2025
+            var parameterType = definition.GetDataType();
+#endif
+            // 几乎都可以转型为InstanceBinding
+            if (dep.Current is InstanceBinding instanceBinding)
+            {
+                // 获取绑定的类别列表
+                var categorySet = instanceBinding.Categories;
+            }
+        }
+    }
+
+    private static ExternalDefinition GetSharedParameter(DefinitionFile file, string groupname, string paramname)
+    {
+        var myGroups = file.Groups;
+        var myGroup = myGroups.get_Item(groupname);
+
+        ExternalDefinition extDef = null;
+
+        if (myGroup != null)
+        {
+            extDef = myGroup.Definitions.get_Item(paramname) as ExternalDefinition;
+        }
+
+        return extDef;
+    }
+}
diff --git a/Sai.Toolkit.Revit/Helpers/SharedParamsAssist.cs b/Sai.Toolkit.Revit/Helpers/SharedParamsAssist.cs
deleted file mode 100644
index fa9806c..0000000
--- a/Sai.Toolkit.Revit/Helpers/SharedParamsAssist.cs
+++ /dev/null
@@ -1,1011 +0,0 @@
-using System.IO;
-using System.Reflection;
-
-using Autodesk.Revit.ApplicationServices;
-using Autodesk.Revit.DB;
-using Autodesk.Revit.UI;
-
-namespace Sai.Toolkit.Revit.Helpers;
-
-public class SharedParamsAssist
-{
-	public static IEnumerable<string> InstanceCategories
-	{
-		get
-		{
-			yield return "HVAC 区";
-			yield return "专用设备";
-			yield return "体量";
-			yield return "停车场";
-			yield return "卫浴装置";
-			yield return "喷头";
-			yield return "图纸";
-			yield return "地形";
-			yield return "场地";
-			yield return "坡道";
-			yield return "墙";
-			yield return "天花板";
-			yield return "安全设备";
-			yield return "家具";
-			yield return "家具系统";
-			yield return "导线";
-			yield return "屋顶";
-			yield return "常规模型";
-			yield return "幕墙嵌板";
-			yield return "幕墙竖梃";
-			yield return "幕墙系统";
-			yield return "开关系统";
-			yield return "房间";
-			yield return "护理呼叫设备";
-			yield return "数据设备";
-			yield return "机械设备";
-			yield return "材质";
-			yield return "柱";
-			yield return "标高";
-			yield return "栏杆扶手";
-			yield return "植物";
-			yield return "楼板";
-			yield return "楼梯";
-			yield return "橱柜";
-			yield return "火警设备";
-			yield return "灯具";
-			yield return "照明设备";
-			yield return "环境";
-			yield return "电气装置";
-			yield return "电气设备";
-			yield return "电缆桥架";
-			yield return "电缆桥架管路";
-			yield return "电缆桥架配件";
-			yield return "电话设备";
-			yield return "电路";
-			yield return "空间";
-			yield return "窗";
-			yield return "竖井洞口";
-			yield return "管件";
-			yield return "管道";
-			yield return "管道占位符";
-			yield return "管道系统";
-			yield return "管道附件";
-			yield return "线管";
-			yield return "线管管路";
-			yield return "线管配件";
-			yield return "组成部分";
-			yield return "结构加强板";
-			yield return "结构区域钢筋";
-			yield return "结构基础";
-			yield return "结构柱";
-			yield return "结构桁架";
-			yield return "结构框架";
-			yield return "结构梁系统";
-			yield return "结构路径钢筋";
-			yield return "结构连接";
-			yield return "结构钢筋";
-			yield return "结构钢筋网";
-			yield return "结构钢筋网区域";
-			yield return "视图";
-			yield return "详图项目";
-			yield return "软管";
-			yield return "软风管";
-			yield return "轴网";
-			yield return "通讯设备";
-			yield return "道路";
-			yield return "部件";
-			yield return "钢筋形状";
-			yield return "门";
-			yield return "面积";
-			yield return "项目信息";
-			yield return "预制零件";
-			yield return "风管";
-			yield return "风管内衬";
-			yield return "风管占位符";
-			yield return "风管管件";
-			yield return "风管系统";
-			yield return "风管附件";
-			yield return "风管隔热层";
-			yield return "风道末端";
-		}
-	}
-
-	public static IEnumerable<string> ProjectParamGroups
-	{
-		get
-		{
-			yield return "IFC参数";
-			yield return "主端点";
-			yield return "光域";
-			yield return "其他";
-			yield return "分区几何图形";
-			yield return "分析平差";
-			yield return "分析模型";
-			yield return "分析结果";
-			yield return "力";
-			yield return "力矩";
-			yield return "卫浴";
-			yield return "可见性";
-			yield return "图层";
-			yield return "图形";
-			yield return "尺寸标注";
-			yield return "常规";
-			yield return "数据";
-			yield return "整个图例";
-			yield return "文字";
-			yield return "机械";
-			yield return "机械 - 流量";
-			yield return "机械 - 负荷";
-			yield return "材质和装饰";
-			yield return "构造";
-			yield return "标识数据";
-			yield return "标题文字";
-			yield return "模型属性";
-			yield return "次端点";
-			yield return "消防系统";
-			yield return "电气";
-			yield return "电气 - 照明";
-			yield return "电气 - 线路";
-			yield return "电气 - 负荷";
-			yield return "电气工程";
-			yield return "管段和管件";
-			yield return "结构";
-			yield return "结构分析";
-			yield return "绿色建筑属性";
-			yield return "编辑板形状";
-			yield return "能量分析";
-			yield return "释放/杆件力";
-			yield return "钢筋集";
-			yield return "阶段化";
-			yield return "限制条件";
-		}
-	}
-
-	public static IEnumerable<string> TypeCategories
-	{
-		get
-		{
-			yield return "专用设备";
-			yield return "体量";
-			yield return "停车场";
-			yield return "卫浴装置";
-			yield return "喷头";
-			yield return "地形";
-			yield return "场地";
-			yield return "坡道";
-			yield return "墙";
-			yield return "天花板";
-			yield return "安全设备";
-			yield return "家具";
-			yield return "家具系统";
-			yield return "导线";
-			yield return "屋顶";
-			yield return "常规模型";
-			yield return "幕墙嵌板";
-			yield return "幕墙竖梃";
-			yield return "幕墙系统";
-			yield return "开关系统";
-			yield return "护理呼叫设备";
-			yield return "数据设备";
-			yield return "机械设备";
-			yield return "柱";
-			yield return "标高";
-			yield return "栏杆扶手";
-			yield return "植物";
-			yield return "楼板";
-			yield return "楼梯";
-			yield return "橱柜";
-			yield return "火警设备";
-			yield return "灯具";
-			yield return "照明设备";
-			yield return "环境";
-			yield return "电气装置";
-			yield return "电气设备";
-			yield return "电缆桥架";
-			yield return "电缆桥架管路";
-			yield return "电缆桥架配件";
-			yield return "电话设备";
-			yield return "窗";
-			yield return "管件";
-			yield return "管道";
-			yield return "管道占位符";
-			yield return "管道系统";
-			yield return "管道附件";
-			yield return "线管";
-			yield return "线管管路";
-			yield return "线管配件";
-			yield return "组成部分";
-			yield return "结构加强板";
-			yield return "结构区域钢筋";
-			yield return "结构基础";
-			yield return "结构柱";
-			yield return "结构桁架";
-			yield return "结构框架";
-			yield return "结构梁系统";
-			yield return "结构路径钢筋";
-			yield return "结构连接";
-			yield return "结构钢筋";
-			yield return "结构钢筋网";
-			yield return "结构钢筋网区域";
-			yield return "详图项目";
-			yield return "软管";
-			yield return "软风管";
-			yield return "轴网";
-			yield return "通讯设备";
-			yield return "部件";
-			yield return "钢筋形状";
-			yield return "门";
-			yield return "预制零件";
-			yield return "风管";
-			yield return "风管内衬";
-			yield return "风管占位符";
-			yield return "风管管件";
-			yield return "风管系统";
-			yield return "风管附件";
-			yield return "风管隔热层";
-			yield return "风道末端";
-		}
-	}
-
-	/// <summary>
-	///     关联族参数
-	/// </summary>
-	/// <param name="familyMgr"></param>
-	/// <param name="lengthElementPara"></param>
-	/// <param name="lengthFamilyPara"></param>
-	public static void AssociateParametersInFamilyDocument(
-		FamilyManager familyMgr,
-		Parameter lengthElementPara, // 长度类型的图元参数
-		FamilyParameter lengthFamilyPara
-	) // 长度类型的族参数
-	{
-#if REVIT2018 || REVIT2020
-		var lengthElementParaType = lengthElementPara.Definition.ParameterType;
-		var lengthFamilyParaType = lengthFamilyPara.Definition.ParameterType;
-#elif REVIT2025
-		var lengthElementParaType = lengthElementPara.Definition.GetDataType();
-		var lengthFamilyParaType = lengthFamilyPara.Definition.GetDataType();
-#endif
-		// 能关联起来的图元参数和族参数的类型要相同
-		if (lengthElementParaType != lengthFamilyParaType)
-		{
-			// 注意：有些类型不同的图元参数和族参数也是可以关联的。
-			// 比如PipeSize和Length类型的参数可以关联，因为他们代表了相同的物理量：长度
-			return;
-		}
-
-		// 判断该长度单位是否能够和族参数关联
-		if (!familyMgr.CanElementParameterBeAssociated(lengthElementPara))
-		{
-			return;
-		}
-
-		// 进行关联操作
-		familyMgr.AssociateElementParameterToFamilyParameter(lengthElementPara, lengthFamilyPara);
-	}
-
-	/// <summary>
-	///     绑定新建参数参数
-	/// </summary>
-	/// <param name="doc"></param>
-	/// <param name="e"></param>
-	/// <param name="definition"></param>
-	/// <param name="isInstance"></param>
-	public static void BindingElementCategory(Document doc, Element e, Definition definition, bool isInstance)
-	{
-		var app = doc.Application;
-		var bindmap = doc.ParameterBindings;
-		Binding binding = null;
-		var dep = bindmap.ForwardIterator();
-		while (dep.MoveNext())
-		{
-			var depKey = dep.Key;
-			var definitionName = depKey.Name;
-			if (definitionName == definition.Name)
-			{
-#if REVIT2018 || REVIT2020
-
-				_ = depKey.ParameterType;
-#elif REVIT2025
-				_ = depKey.GetDataType();
-#endif
-
-				binding = bindmap.get_Item(depKey);
-				break;
-			}
-		}
-
-		if (binding == null)
-		{
-			var categorySet = app.Create.NewCategorySet();
-			categorySet.Insert(e.Category);
-			binding = isInstance ? app.Create.NewInstanceBinding(categorySet) : app.Create.NewTypeBinding(categorySet);
-
-			bindmap.Remove(definition);
-
-#if REVIT2018 || REVIT2020
-			bindmap.ReInsert(definition, binding, BuiltInParameterGroup.PG_ADSK_MODEL_PROPERTIES);
-#elif REVIT2025
-			bindmap.ReInsert(definition, binding, GroupTypeId.AdskModelProperties);
-#endif
-		}
-		else
-		{
-			CategorySet categorySet;
-			if (binding is InstanceBinding instanceBinding)
-			{
-				categorySet = instanceBinding.Categories;
-			}
-			else
-			{
-				var typeBinding = binding as TypeBinding;
-				categorySet = typeBinding!.Categories;
-			}
-
-			categorySet.Insert(e.Category);
-		}
-	}
-
-	public static FamilyParameter CreateFamilyPara(
-		Document famdoc,
-		string paraName,
-#if REVIT2018 || REVIT2020
-		BuiltInParameterGroup paraGroup,
-		ParameterType paramType,
-#elif REVIT2025
-		ForgeTypeId paraGroup,
-		ForgeTypeId paramType,
-#endif
-		bool isInstance
-	)
-	{
-		// 得到FamilyManager
-		if (!famdoc.IsFamilyDocument)
-		{
-			throw new Exception("不是族文档");
-		}
-
-		var familyMgr = famdoc.FamilyManager;
-		return familyMgr.AddParameter(paraName, paraGroup, paramType, isInstance);
-	}
-
-	public static void CreateSharedFamilyParam(Application app, Document famdoc)
-	{
-		var familyMgr = famdoc.FamilyManager;
-
-		// 共享参数的基本信息, 包括定义文件路径，参数分组名称，参数名称和参数类型。
-		var sharedParameterFilePath = @"C:\SharedParameter.txt";
-		var sharedParameterGroupName = "Shared_Group";
-		var sharedParameter = "Shared_Parameter";
-#if REVIT2018 || REVIT2020
-        var sharedParameterType = ParameterType.Length;
-#elif REVIT2025
-        var sharedParameterType = SpecTypeId.Length;
-#endif
-        ExternalDefinitionCreationOptions externalDefinitionCreationOptions = new(sharedParameter, sharedParameterType);
-		// 打开或创建共享参数定义文件。
-		app.SharedParametersFilename = sharedParameterFilePath;
-		var sharedDefinitonFile = app.OpenSharedParameterFile();
-		if (sharedDefinitonFile == null)
-		{
-			return;
-		}
-
-		// 查找共享参数的分组名称，如果没找到，就创建一个。
-		DefinitionGroup sharedGroup;
-		sharedGroup = sharedDefinitonFile.Groups.get_Item(sharedParameterGroupName);
-		if (null == sharedGroup)
-		{
-			sharedGroup = sharedDefinitonFile.Groups.Create(sharedParameterGroupName);
-		}
-
-		// 查找共享参数的定义，如果没有找到，就用名字和类型创建一个。
-		if (sharedGroup.Definitions.get_Item(sharedParameter) is not ExternalDefinition parameterDef)
-		{
-			parameterDef = sharedGroup.Definitions.Create(externalDefinitionCreationOptions) as ExternalDefinition;
-		}
-
-		// 创建共享族参数
-#if REVIT2018 || REVIT2020
-		_ = familyMgr.AddParameter(parameterDef, BuiltInParameterGroup.PG_CONSTRAINTS, true);
-#elif REVIT2025
-		_ = familyMgr.AddParameter(parameterDef, GroupTypeId.Constraints, true);
-#endif
-	}
-
-	public void CreateSharedParam(
-		Application app,
-		Document doc,
-		bool instanceParameter,
-		string sharedParametersFilePath,
-		string groupName,
-		string definitionName
-	)
-	{
-#if REVIT2018 || REVIT2020
-		var parameterType = ParameterType.Text;
-		var parameterGroup = BuiltInParameterGroup.PG_DATA;
-#elif REVIT2025
-		var parameterType = SpecTypeId.String.Text;
-		var parameterGroup = GroupTypeId.Data;
-#endif
-		CategorySet categorySet = new();
-		var wallCategory = doc.Settings.Categories.get_Item(BuiltInCategory.OST_Walls);
-		categorySet.Insert(wallCategory);
-
-		if (!File.Exists(sharedParametersFilePath))
-		{
-			try
-			{
-				var sw = File.CreateText(sharedParametersFilePath);
-				sw.Close();
-			}
-			catch (Exception)
-			{
-				throw new Exception("无法创建共享参数文件: " + sharedParametersFilePath);
-			}
-		}
-
-		// 设置共享参数文件
-		app.SharedParametersFilename = sharedParametersFilePath;
-
-		// 打开共享参数文件
-		var definitionFile = app.OpenSharedParameterFile();
-		if (definitionFile == null)
-		{
-			throw new Exception("无法打开共享参数文件");
-		}
-
-		// 获取参数组的集合
-		var groups = definitionFile.Groups;
-
-		// 获取参数组
-		var group = groups.get_Item(groupName);
-		if (null == group)
-		{
-			// 如果参数组不存在，则创建一个
-			group = groups.Create(groupName);
-		}
-
-		if (null == group)
-		{
-			throw new Exception("获取参数组失败: " + groupName);
-		}
-
-		// 获取参数定义
-		var definition = group.Definitions.get_Item(definitionName);
-		// 如果参数定义不存在，则创建一个
-		definition ??= group.Definitions.Create(new ExternalDefinitionCreationOptions(definitionName, parameterType));
-
-		// 调用不同的函数创建类型参数或者实例参数
-		ElementBinding binding = instanceParameter
-			? app.Create.NewInstanceBinding(categorySet)
-			: app.Create.NewTypeBinding(categorySet);
-
-		// 把参数定义和类别绑定起来，元素的新的参数就创建成功了。
-		var insertSuccess = doc.ParameterBindings.Insert(definition, binding, parameterGroup);
-
-		if (!insertSuccess)
-		{
-			throw new Exception("绑定类别失败");
-		}
-	}
-
-	public DefinitionFile CreateTempSharedParameterFile(Application revitApp, string fileName)
-	{
-		var shapeFile = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + $"\\{fileName}.txt";
-		System.Text.StringBuilder contents = new();
-		contents.AppendLine("# This is a Revit shared parameter file.");
-		contents.AppendLine("# Do not edit manually.");
-		contents.AppendLine("*META	VERSION	MINVERSION");
-		contents.AppendLine("META	2	1");
-		contents.AppendLine("*GROUP	ID	NAME");
-		contents.AppendLine("*PARAM	GUID	NAME	DATATYPE	DATACATEGORY	GROUP	VISIBLE");
-		File.WriteAllText(shapeFile, contents.ToString());
-		revitApp.SharedParametersFilename = shapeFile;
-		return revitApp.OpenSharedParameterFile();
-	}
-
-	/// <summary>
-	///     生成共享文件
-	/// </summary>
-	/// <param name="groups">参数组</param>
-	/// <param name="definitions">参数外部定义</param>
-	/// <returns></returns>
-	public static string GenerateSharedParameterFile(List<DefinitionGroup> groups, List<ExternalDefinition> definitions)
-	{
-		var name = Assembly.GetCallingAssembly().GetName();
-		var date = string.Format(
-			"{0:s}",
-			File.GetLastWriteTime(Assembly.GetExecutingAssembly().Location).ToUniversalTime()
-		);
-		var result =
-			"# This is a Revit shared parameter file, generated "
-			+ DateTime.Now.ToShortDateString()
-			+ " using "
-			+ name.Name
-			+ " v"
-			+ name.Version
-			+ " built "
-			+ date
-			+ "\r\n";
-		result += "# Do not edit manually.\r\n";
-		result += "*META\tVERSION\tMINVERSION\r\n";
-		result += "META\t2\t1\r\n";
-		result += "*GROUP\tID\tNAME\r\n";
-		for (var i = 0; i < groups.Count; i++)
-		{
-			var group = groups[i];
-			result += "GROUP\t" + $"{i + 1}" + "\t" + group.Name + "\r\n";
-		}
-
-		result += "*PARAM\tGUID\tNAME\tDATATYPE\tDATACATEGORY\tGROUP\tVISIBLE\tDESCRIPTION\tUSERMODIFIABLE\r\n";
-		foreach (var definition in definitions)
-		{
-			var id = groups.FindIndex(g => g.Name == definition.OwnerGroup.Name) + 1;
-			if (id > 0)
-			{
-				result +=
-					"PARAM\t"
-					+ definition.GUID
-					+ "\t"
-					+ definition.Name
-					+ "\t"
-#if REVIT2018 || REVIT2020
-                    + definition.ParameterType.ToString().ToUpper()
-#elif REVIT2025
-                    + definition.GetDataType().ToString().ToUpper()
-#endif
-                    + "\t\t"
-					+ id
-					+ (definition.Visible ? "\t1\t" : "\t0\t")
-					+ System.Text.RegularExpressions.Regex.Replace(definition.Description, @"\t|\n|\r", string.Empty)
-					+ "\t"
-					+ (definition.UserModifiable ? "1" : string.Empty)
-					+ "\r\n";
-			}
-		}
-
-		return result;
-	}
-
-	public static ExternalDefinition GetDefinition(
-		DefinitionFile sharedParamFile,
-		string definitionName,
-#if REVIT2018 || REVIT2020
-        ParameterType paramType,
-#elif REVIT2025
-        ForgeTypeId paramType,
-#endif
-        ref Guid guid,
-		DefinitionGroup group
-	)
-	{
-		new List<ExternalDefinition>();
-		foreach (var definitionGroup in sharedParamFile.Groups)
-		{
-			foreach (var definition in definitionGroup.Definitions)
-			{
-				var externalDefinition = (ExternalDefinition)definition;
-				if (externalDefinition.Name == definitionName)
-				{
-					return externalDefinition;
-				}
-			}
-		}
-
-		ExternalDefinitionCreationOptions externalDefinitionCreationOptions = new(definitionName, paramType);
-		return group.Definitions.Create(externalDefinitionCreationOptions) as ExternalDefinition;
-	}
-
-	/// <summary>
-	///     获取或创建共享参数文件的参数组中的参数
-	/// </summary>
-	/// <param name="group"></param>
-	/// <param name="paramName"></param>
-	/// <param name="canEdit"></param>
-	/// <returns></returns>
-	public static Definition GetDefinition(DefinitionGroup group, string paramName, bool canEdit = false)
-	{
-		if (group is null)
-		{
-			throw new ArgumentNullException(nameof(group));
-		}
-
-		if (paramName is null)
-		{
-			throw new ArgumentNullException(nameof(paramName));
-		}
-
-		var definition = group.Definitions.get_Item(paramName);
-
-		if (definition != null)
-		{
-			return definition;
-		}
-#if REVIT2018 || REVIT2020
-		var opt = new ExternalDefinitionCreationOptions(paramName, ParameterType.Text) { UserModifiable = canEdit };
-
-#elif REVIT2025
-		var opt = new ExternalDefinitionCreationOptions(paramName, SpecTypeId.String.Text) { UserModifiable = canEdit };
-#endif
-
-		return group.Definitions.Create(opt);
-	}
-
-	public static DefinitionGroup GetGroup(DefinitionFile myDefinitionFile, string groupName, string log)
-	{
-		DefinitionGroup definitionGroup = null;
-		var groups = myDefinitionFile.Groups;
-		foreach (var definitionGroup2 in groups)
-		{
-			if (definitionGroup2.Name == groupName)
-			{
-				using (StreamWriter streamWriter = new(log, true))
-				{
-					streamWriter.WriteLine("Group {0} already exists", groupName);
-				}
-
-				definitionGroup = definitionGroup2;
-				return definitionGroup;
-			}
-		}
-
-		using (StreamWriter streamWriter2 = new(log, true))
-		{
-			streamWriter2.WriteLine("Group {0} not found", groupName);
-		}
-
-		definitionGroup = groups.Create(groupName);
-		using (StreamWriter streamWriter3 = new(log, true))
-		{
-			streamWriter3.WriteLine("Group {0} created", definitionGroup.Name);
-		}
-
-		return definitionGroup;
-	}
-
-	/// <summary>
-	///     获取共享参数文件中的参数组
-	/// </summary>
-	/// <param name="groups"></param>
-	/// <param name="groupName">分组</param>
-	/// <returns></returns>
-	public static DefinitionGroup GetGroup(DefinitionGroups groups, string groupName)
-	{
-		return groups is null
-			? throw new ArgumentNullException(nameof(groups))
-			: groupName is null
-				? throw new ArgumentNullException(nameof(groupName))
-				: groups.get_Item(groupName) ?? groups.Create(groupName);
-	}
-
-	/// <summary>
-	///     获取共享参数文件中的参数组
-	/// </summary>
-	/// <param name="uiapp"></param>
-	/// <param name="parmPath">共享文件路径</param>
-	/// <returns></returns>
-	public static DefinitionGroups GetGroupList(UIApplication uiapp, string parmPath)
-	{
-		if (uiapp is null)
-		{
-			throw new ArgumentNullException(nameof(uiapp));
-		}
-
-		if (parmPath is null)
-		{
-			throw new ArgumentNullException(nameof(parmPath));
-		}
-
-		if (!File.Exists(parmPath))
-		{
-			File.CreateText(parmPath);
-		}
-
-		uiapp.Application.SharedParametersFilename = parmPath;
-
-		return uiapp.Application.OpenSharedParameterFile()?.Groups;
-	}
-
-	public void GetSharedPara(Application revitApp)
-	{
-		// 打开共享参数文件
-		var definitionFile = revitApp.OpenSharedParameterFile();
-		// 获取参数组的集合
-		var groups = definitionFile.Groups;
-
-		foreach (var group in groups)
-		{
-			// 获取参数组内的参数定义
-			foreach (var definition in group.Definitions)
-			{
-				_ = definition.Name;
-#if REVIT2018 || REVIT2020
-                _ = definition.ParameterType;
-#elif REVIT2025
-                _ = definition.GetDataType();
-#endif
-                // 对参数定义的其他操作
-            }
-        }
-	}
-
-	/// <summary>
-	///     初始化元素绑定（或类型）
-	/// </summary>
-	/// <param name="uiapp"></param>
-	/// <param name="elm">要绑定类别的元素</param>
-	/// <param name="paramPath">共享文件路径</param>
-	public static void InitParamList(UIApplication uiapp, Element elm, string paramPath)
-	{
-		if (uiapp is null)
-		{
-			throw new ArgumentNullException(nameof(uiapp));
-		}
-
-		if (elm is null)
-		{
-			throw new ArgumentNullException(nameof(elm));
-		}
-
-		if (paramPath is null)
-		{
-			throw new ArgumentNullException(nameof(paramPath));
-		}
-
-		var doc = uiapp.ActiveUIDocument.Document;
-
-		var bindingMap = doc.ParameterBindings;
-
-		var groups = GetGroupList(uiapp, paramPath);
-
-		CategorySet elmCtgs = new();
-
-		elmCtgs.Insert(elm.Category);
-
-		foreach (var groupPram in groups)
-		{
-			var paramGroup = GetGroup(groups, groupPram.Name);
-
-			foreach (var definition in groupPram.Definitions)
-			{
-				var binding = bindingMap.get_Item(definition);
-
-				// If the parameter group's name contains type key, it's means type binding.
-				if (!paramGroup.Name.Contains("Group"))
-				{
-					if (binding is InstanceBinding instanceBinding)
-					{
-						bindingMap.ReInsert(definition, instanceBinding);
-					}
-					else
-					{
-						instanceBinding = uiapp.Application.Create.NewInstanceBinding(elmCtgs);
-
-						bindingMap.Insert(definition, instanceBinding);
-					}
-				}
-				else
-				{
-					if (binding is TypeBinding typeBinding)
-					{
-						bindingMap.ReInsert(definition, typeBinding);
-					}
-					else
-					{
-						typeBinding = uiapp.Application.Create.NewTypeBinding(elmCtgs);
-
-						bindingMap.Insert(definition, typeBinding);
-					}
-				}
-			}
-		}
-	}
-
-	public bool IsExistSharedParam(
-		Document doc,
-		string paramName,
-		out Definition definition,
-		out ElementBinding binding
-	)
-	{
-		DefinitionBindingMap map = doc.ParameterBindings;
-		var dep = map.ForwardIterator();
-		var isExist = false;
-		binding = null;
-		definition = null;
-		while (dep.MoveNext())
-		{
-			definition = dep.Key;
-			var definitionName = definition.Name;
-			binding = dep.Current as ElementBinding;
-			//ParameterType parameterType = definition.ParameterType;
-			//InstanceBinding instanceBinding = dep.Current as InstanceBinding;
-			//if (instanceBinding != null)
-			//{
-			//    CategorySet categorySet = instanceBinding.Categories;
-			//}
-			if (definitionName == paramName)
-			{
-				isExist = true;
-				break;
-			}
-		}
-
-		return isExist;
-	}
-
-	/// <summary>
-	///     判断共享参数和项目参数
-	/// </summary>
-	/// <param name="parameter">The parameter<see cref="Parameter" /></param>
-	/// <returns></returns>
-	public bool IsSharedPara(Parameter parameter)
-	{
-		var definition = parameter.Definition as InternalDefinition;
-
-		var isSharedParameter = parameter.IsShared; //共享参数
-
-		var isProjectParameter = definition.BuiltInParameter == BuiltInParameter.INVALID && !parameter.IsShared; //项目参数
-		return isSharedParameter;
-	}
-
-	/// <summary>
-	///     修改内建参数
-	/// </summary>
-	/// <param name="parameter"></param>
-	/// <param name="value"></param>
-	/// <exception cref="Exception"></exception>
-	public static void ModifyBuiltInParameter(Parameter parameter, object value)
-	{
-		var success = false;
-		if (parameter != null && !parameter.IsReadOnly)
-		{
-			switch (parameter.StorageType)
-			{
-				case StorageType.Double:
-					success = parameter.Set((double)value);
-					break;
-
-				case StorageType.ElementId:
-					success = parameter.Set((ElementId)value);
-					break;
-
-				case StorageType.String:
-					success = parameter.Set((string)value);
-					break;
-
-				case StorageType.Integer:
-					success = parameter.Set((int)value);
-					break;
-			}
-
-			if (!success)
-			{
-				throw new Exception("赋值失败");
-			}
-		}
-		else
-		{
-			throw new Exception("参数是只读的");
-		}
-	}
-
-	public static DefinitionFile OpenSharedParametersFile(Application application)
-	{
-		var sharedParametersFile = application.OpenSharedParameterFile();
-		return sharedParametersFile;
-	}
-
-	/// <summary>
-	///     移除当前文档中所有族的某些参数
-	/// </summary>
-	/// <param name="doc"></param>
-	/// <param name="paramnames"></param>
-	public static void RemoveParams(Document doc, params string[] paramnames)
-	{
-		var instances = new FilteredElementCollector(doc).OfClass(typeof(FamilyInstance)).Cast<FamilyInstance>();
-		foreach (var instance in instances)
-		{
-			var family = instance.Symbol.Family;
-			var famdoc = doc.EditFamily(family);
-			using (Transaction trans = new(famdoc, "删除参数"))
-			{
-				trans.Start();
-				foreach (var paramname in paramnames)
-				{
-					var param1 = instance.Symbol.GetParameters(paramname).FirstOrDefault();
-					if (param1 != null)
-					{
-						var fparam1 = famdoc.FamilyManager.get_Parameter(paramname);
-						if (fparam1 != null)
-						{
-							famdoc.FamilyManager.RemoveParameter(fparam1);
-						}
-					}
-
-					//MessageBox.ShowAhead(famdoc.Title);
-					//var fparams = famdoc.FamilyManager.GetAllTypeParameter();
-
-					//var para = from p in fparams
-					//           where p.Definition.Name == "Code"
-					//           select p;
-				}
-
-				famdoc.LoadFamily(doc, new LoadFamilyOptions());
-				trans.Commit();
-			}
-
-			famdoc.Close(false);
-		}
-	}
-
-	public static void SharedParamsBindingCategoryset(
-		UIApplication uiapp,
-		DefinitionFile sharedParametersFile,
-		ExternalDefinition param,
-		CategorySet categorySet,
-		bool isInstance
-	)
-	{
-#if REVIT2018 || REVIT2020
-        var paramGroup = param.ParameterGroup;
-#elif REVIT2025
-        var paramGroup = param.GetGroupTypeId();
-#endif
-
-        var instanceBinding = uiapp.Application.Create.NewInstanceBinding(categorySet);
-		var typeBinding = uiapp.Application.Create.NewTypeBinding(categorySet);
-		var bindingMap = uiapp.ActiveUIDocument.Document.ParameterBindings;
-
-		var extDef = GetSharedParameter(sharedParametersFile, param.OwnerGroup.Name, param.Name);
-
-		if (isInstance)
-		{
-			bindingMap.Insert(extDef, instanceBinding, paramGroup);
-		}
-		else
-		{
-			bindingMap.Insert(extDef, typeBinding, paramGroup);
-		}
-	}
-
-	/// <summary>
-	///     获取类别和参数的绑定
-	/// </summary>
-	/// <param name="doc">激活的文档</param>
-	public void ShareParameterBinging(Document doc)
-	{
-		var map = doc.ParameterBindings;
-		var dep = map.ForwardIterator();
-		while (dep.MoveNext())
-		{
-			var definition = dep.Key;
-			// 获取参数定义的基本信息
-			var definitionName = definition.Name;
-#if REVIT2018 || REVIT2020
-            var parameterType = definition.ParameterType;
-#elif REVIT2025
-            var parameterType = definition.GetDataType();
-#endif
-            // 几乎都可以转型为InstanceBinding
-            if (dep.Current is InstanceBinding instanceBinding)
-			{
-				// 获取绑定的类别列表
-				var categorySet = instanceBinding.Categories;
-			}
-		}
-	}
-
-	private static ExternalDefinition GetSharedParameter(DefinitionFile file, string groupname, string paramname)
-	{
-		var myGroups = file.Groups;
-		var myGroup = myGroups.get_Item(groupname);
-
-		ExternalDefinition extDef = null;
-
-		if (myGroup != null)
-		{
-			extDef = myGroup.Definitions.get_Item(paramname) as ExternalDefinition;
-		}
-
-		return extDef;
-	}
-}
diff --git a/Sai.Toolkit.Revit/Sai.Toolkit.Revit.projitems b/Sai.Toolkit.Revit/Sai.Toolkit.Revit.projitems
index 4aa9c48..d65a1c1 100644
--- a/Sai.Toolkit.Revit/Sai.Toolkit.Revit.projitems
+++ b/Sai.Toolkit.Revit/Sai.Toolkit.Revit.projitems
@@ -53,7 +53,7 @@
     <Compile Include="..\Sai.Toolkit.Revit\Helpers\OptionsBarAssist.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\RevitIniAssist.cs" />
     <Compile Include="..\Sai.Toolkit.Revit\Helpers\StatusBarAssist.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\SharedParamsAssist.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\ParameterAssist.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\ViewFilterAssist.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\VisualAssist.cs" />
   </ItemGroup>
diff --git a/Wpf.Ui.Extend/Controls/ColorFormatUtils.cs b/Wpf.Ui.Extend/Controls/ColorFormatUtils.cs
new file mode 100644
index 0000000..29f8212
--- /dev/null
+++ b/Wpf.Ui.Extend/Controls/ColorFormatUtils.cs
@@ -0,0 +1,280 @@
+// Copyright 2003-2024 by Autodesk, Inc.
+// 
+// Permission to use, copy, modify, and distribute this software in
+// object code form for any purpose and without fee is hereby granted,
+// provided that the above copyright notice appears in all copies and
+// that both that copyright notice and the limited warranty and
+// restricted rights notice below appear in all supporting
+// documentation.
+// 
+// AUTODESK PROVIDES THIS PROGRAM "AS IS" AND WITH ALL FAULTS.
+// AUTODESK SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTY OF
+// MERCHANTABILITY OR FITNESS FOR A PARTICULAR USE.  AUTODESK, INC.
+// DOES NOT WARRANT THAT THE OPERATION OF THE PROGRAM WILL BE
+// UNINTERRUPTED OR ERROR FREE.
+// 
+// Use, duplication, or disclosure by the U.S. Government is subject to
+// restrictions set forth in FAR 52.227-19 (Commercial Computer
+// Software - Restricted Rights) and DFAR 252.227-7013(c)(1)(ii)
+// (Rights in Technical Data and Computer Software), as applicable.
+
+using System;
+
+using Color = System.Drawing.Color;
+
+namespace Wpf.Ui.Extend.Controls;
+
+/// <summary>
+///     Helper class to easier work with color formats
+/// </summary>
+/// <remarks>
+///     Implementation: https://github.com/microsoft/PowerToys/blob/main/src/common/ManagedCommon/ColorFormatHelper.cs
+/// </remarks>
+public static class ColorFormatUtils
+{
+    /// <summary>
+    ///     Return a drawing color of a given <see cref="System.Windows.Media.Color"/>
+    /// </summary>
+    public static Color GetDrawingColor(this System.Windows.Media.Color color)
+    {
+        return Color.FromArgb(1, color.R, color.G, color.B);
+    }
+
+    ///// <summary>
+    /////     Return a drawing color of a given <see cref="Autodesk.Revit.DB.Color"/>
+    ///// </summary>
+    //public static Color GetDrawingColor(this Autodesk.Revit.DB.Color color)
+    //{
+    //    return Color.FromArgb(1, color.Red, color.Green, color.Blue);
+    //}
+
+    /// <summary>
+    /// Convert a given <see cref="Color"/> to a CMYK color (cyan, magenta, yellow, black key)
+    /// </summary>
+    /// <param name="color">The <see cref="Color"/> to convert</param>
+    /// <returns>The cyan[0..1], magenta[0..1], yellow[0..1] and black key[0..1] of the converted color</returns>
+    public static (double Cyan, double Magenta, double Yellow, double BlackKey) ConvertToCmykColor(Color color)
+    {
+        // special case for black (avoid division by zero)
+        if (color is { R: 0, G: 0, B: 0 })
+        {
+            return (0d, 0d, 0d, 1d);
+        }
+
+        var red = color.R / 255d;
+        var green = color.G / 255d;
+        var blue = color.B / 255d;
+
+        var blackKey = 1d - Math.Max(Math.Max(red, green), blue);
+
+        // special case for black (avoid division by zero)
+        if (1d - blackKey == 0d)
+        {
+            return (0d, 0d, 0d, 1d);
+        }
+
+        var cyan = (1d - red - blackKey) / (1d - blackKey);
+        var magenta = (1d - green - blackKey) / (1d - blackKey);
+        var yellow = (1d - blue - blackKey) / (1d - blackKey);
+
+        return (cyan, magenta, yellow, blackKey);
+    }
+
+    /// <summary>
+    /// Convert a given <see cref="Color"/> to a HSB color (hue, saturation, brightness)
+    /// </summary>
+    /// <param name="color">The <see cref="Color"/> to convert</param>
+    /// <returns>The hue [0°..360°], saturation [0..1] and brightness [0..1] of the converted color</returns>
+    public static (double Hue, double Saturation, double Brightness) ConvertToHsbColor(Color color)
+    {
+        // HSB and HSV represents the same color space
+        return ConvertToHsvColor(color);
+    }
+
+    /// <summary>
+    /// Convert a given <see cref="Color"/> to a HSV color (hue, saturation, value)
+    /// </summary>
+    /// <param name="color">The <see cref="Color"/> to convert</param>
+    /// <returns>The hue [0°..360°], saturation [0..1] and value [0..1] of the converted color</returns>
+    public static (double Hue, double Saturation, double Value) ConvertToHsvColor(Color color)
+    {
+        var min = Math.Min(Math.Min(color.R, color.G), color.B) / 255d;
+        var max = Math.Max(Math.Max(color.R, color.G), color.B) / 255d;
+
+        return (color.GetHue(), max == 0d ? 0d : (max - min) / max, max);
+    }
+
+    /// <summary>
+    /// Convert a given <see cref="Color"/> to a HSI color (hue, saturation, intensity)
+    /// </summary>
+    /// <param name="color">The <see cref="Color"/> to convert</param>
+    /// <returns>The hue [0°..360°], saturation [0..1] and intensity [0..1] of the converted color</returns>
+    public static (double Hue, double Saturation, double Intensity) ConvertToHsiColor(Color color)
+    {
+        // special case for black
+        if (color.R == 0 && color.G == 0 && color.B == 0)
+        {
+            return (0d, 0d, 0d);
+        }
+
+        var red = color.R / 255d;
+        var green = color.G / 255d;
+        var blue = color.B / 255d;
+
+        var intensity = (red + green + blue) / 3d;
+
+        var min = Math.Min(Math.Min(color.R, color.G), color.B) / 255d;
+
+        return (color.GetHue(), 1d - (min / intensity), intensity);
+    }
+
+    /// <summary>
+    /// Convert a given <see cref="Color"/> to a HSL color (hue, saturation, lightness)
+    /// </summary>
+    /// <param name="color">The <see cref="Color"/> to convert</param>
+    /// <returns>The hue [0°..360°], saturation [0..1] and lightness [0..1] values of the converted color</returns>
+    public static (double Hue, double Saturation, double Lightness) ConvertToHslColor(Color color)
+    {
+        var min = Math.Min(Math.Min(color.R, color.G), color.B) / 255d;
+        var max = Math.Max(Math.Max(color.R, color.G), color.B) / 255d;
+
+        var lightness = (max + min) / 2d;
+
+        if (lightness == 0d || Math.Abs(min - max) < 1e-9)
+        {
+            return (color.GetHue(), 0d, lightness);
+        }
+
+        if (lightness is > 0d and <= 0.5d)
+        {
+            return (color.GetHue(), (max - min) / (max + min), lightness);
+        }
+
+        return (color.GetHue(), (max - min) / (2d - (max + min)), lightness);
+    }
+
+    /// <summary>
+    /// Convert a given <see cref="Color"/> to a HWB color (hue, whiteness, blackness)
+    /// </summary>
+    /// <param name="color">The <see cref="Color"/> to convert</param>
+    /// <returns>The hue [0°..360°], whiteness [0..1] and blackness [0..1] of the converted color</returns>
+    public static (double Hue, double Whiteness, double Blackness) ConvertToHwbColor(Color color)
+    {
+        var min = Math.Min(Math.Min(color.R, color.G), color.B) / 255d;
+        var max = Math.Max(Math.Max(color.R, color.G), color.B) / 255d;
+
+        return (color.GetHue(), min, 1 - max);
+    }
+
+    /// <summary>
+    /// Convert a given <see cref="Color"/> to a CIE LAB color (LAB)
+    /// </summary>
+    /// <param name="color">The <see cref="Color"/> to convert</param>
+    /// <returns>The lightness [0..100] and two chromaticities [-128..127]</returns>
+    public static (double Lightness, double ChromaticityA, double ChromaticityB) ConvertToCielabColor(Color color)
+    {
+        var xyz = ConvertToCiexyzColor(color);
+        var lab = GetCielabColorFromCieXyz(xyz.X, xyz.Y, xyz.Z);
+
+        return lab;
+    }
+
+    /// <summary>
+    /// Convert a given <see cref="Color"/> to a CIE XYZ color (XYZ)
+    /// The constants of the formula matches this Wikipedia page, but at a higher precision:
+    /// https://en.wikipedia.org/wiki/SRGB#The_reverse_transformation_(sRGB_to_CIE_XYZ)
+    /// This page provides a method to calculate the constants:
+    /// http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
+    /// </summary>
+    /// <param name="color">The <see cref="Color"/> to convert</param>
+    /// <returns>The X [0..1], Y [0..1] and Z [0..1]</returns>
+    public static (double X, double Y, double Z) ConvertToCiexyzColor(Color color)
+    {
+        var r = color.R / 255d;
+        var g = color.G / 255d;
+        var b = color.B / 255d;
+
+        // inverse companding, gamma correction must be undone
+        var rLinear = (r > 0.04045) ? Math.Pow((r + 0.055) / 1.055, 2.4) : (r / 12.92);
+        var gLinear = (g > 0.04045) ? Math.Pow((g + 0.055) / 1.055, 2.4) : (g / 12.92);
+        var bLinear = (b > 0.04045) ? Math.Pow((b + 0.055) / 1.055, 2.4) : (b / 12.92);
+
+        return (
+            (rLinear * 0.41239079926595948) + (gLinear * 0.35758433938387796) + (bLinear * 0.18048078840183429),
+            (rLinear * 0.21263900587151036) + (gLinear * 0.71516867876775593) + (bLinear * 0.07219231536073372),
+            (rLinear * 0.01933081871559185) + (gLinear * 0.11919477979462599) + (bLinear * 0.95053215224966058)
+        );
+    }
+
+    /// <summary>
+    /// Convert a CIE XYZ color <see cref="double"/> to a CIE LAB color (LAB) adapted to sRGB D65 white point
+    /// The constants of the formula used come from this wikipedia page:
+    /// https://en.wikipedia.org/wiki/CIELAB_color_space#Converting_between_CIELAB_and_CIEXYZ_coordinates
+    /// </summary>
+    /// <param name="x">The <see cref="x"/> represents a mix of the three CIE RGB curves</param>
+    /// <param name="y">The <see cref="y"/> represents the luminance</param>
+    /// <param name="z">The <see cref="z"/> is quasi-equal to blue (of CIE RGB)</param>
+    /// <returns>The lightness [0..100] and two chromaticities [-128..127]</returns>
+    private static (double Lightness, double ChromaticityA, double ChromaticityB) GetCielabColorFromCieXyz(double x, double y, double z)
+    {
+        // sRGB reference white (x=0.3127, y=0.3290, Y=1.0), actually CIE Standard Illuminant D65 truncated to 4 decimal places,
+        // then converted to XYZ using the formula:
+        //   X = x * (Y / y)
+        //   Y = Y
+        //   Z = (1 - x - y) * (Y / y)
+        const double xN = 0.9504559270516717;
+        const double yN = 1.0;
+        const double zN = 1.0890577507598784;
+
+        // Scale XYZ values relative to reference white
+        x /= xN;
+        y /= yN;
+        z /= zN;
+
+        // XYZ to CIELab transformation
+        const double delta = 6d / 29;
+        var m = (1d / 3) * Math.Pow(delta, -2);
+        var t = Math.Pow(delta, 3);
+
+        var fx = (x > t) ? Math.Pow(x, 1.0 / 3.0) : (x * m) + (16.0 / 116.0);
+        var fy = (y > t) ? Math.Pow(y, 1.0 / 3.0) : (y * m) + (16.0 / 116.0);
+        var fz = (z > t) ? Math.Pow(z, 1.0 / 3.0) : (z * m) + (16.0 / 116.0);
+
+        var l = (116 * fy) - 16;
+        var a = 500 * (fx - fy);
+        var b = 200 * (fy - fz);
+
+        return (l, a, b);
+    }
+
+    /// <summary>
+    /// Convert a given <see cref="Color"/> to a natural color (hue, whiteness, blackness)
+    /// </summary>
+    /// <param name="color">The <see cref="Color"/> to convert</param>
+    /// <returns>The hue, whiteness [0..1] and blackness [0..1] of the converted color</returns>
+    public static (string Hue, double Whiteness, double Blackness) ConvertToNaturalColor(Color color)
+    {
+        var min = Math.Min(Math.Min(color.R, color.G), color.B) / 255d;
+        var max = Math.Max(Math.Max(color.R, color.G), color.B) / 255d;
+
+        return (GetNaturalColorFromHue(color.GetHue()), min, 1 - max);
+    }
+
+    /// <summary>
+    /// Return the natural color for the given hue value
+    /// </summary>
+    /// <param name="hue">The hue value to convert</param>
+    /// <returns>A natural color</returns>
+    private static string GetNaturalColorFromHue(double hue)
+    {
+        return hue switch
+        {
+            < 60d => $"R{Math.Round(hue / 0.6d, 0)}",
+            < 120d => $"Y{Math.Round((hue - 60d) / 0.6d, 0)}",
+            < 180d => $"G{Math.Round((hue - 120d) / 0.6d, 0)}",
+            < 240d => $"C{Math.Round((hue - 180d) / 0.6d, 0)}",
+            < 300d => $"B{Math.Round((hue - 240d) / 0.6d, 0)}",
+            _ => $"M{Math.Round((hue - 300d) / 0.6d, 0)}"
+        };
+    }
+}
\ No newline at end of file
diff --git a/Wpf.Ui.Extend/Controls/ColorPickerControl.xaml b/Wpf.Ui.Extend/Controls/ColorPickerControl.xaml
new file mode 100644
index 0000000..ea9a7e5
--- /dev/null
+++ b/Wpf.Ui.Extend/Controls/ColorPickerControl.xaml
@@ -0,0 +1,406 @@
+<ContentControl
+    x:Class="Wpf.Ui.Extend.Controls.ColorPickerControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="http://schemas.lepo.co/wpfui/2022/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:exc="clr-namespace:Wpf.Ui.Extend.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <ContentControl.Resources>
+        <Style TargetType="{x:Type Slider}">
+            <Setter Property="MinWidth" Value="104" />
+            <Setter Property="MinHeight" Value="21" />
+            <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+            <Setter Property="SnapsToDevicePixels" Value="True" />
+            <Setter Property="OverridesDefaultStyle" Value="True" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Slider}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <TickBar
+                                x:Name="TopTick"
+                                Grid.Row="0"
+                                Height="6"
+                                Fill="Transparent"
+                                Placement="Top"
+                                SnapsToDevicePixels="True"
+                                Visibility="Collapsed" />
+                            <Border
+                                x:Name="TrackBackground"
+                                Grid.Row="1"
+                                Height="8"
+                                Margin="0"
+                                Background="{TemplateBinding Background}"
+                                BorderThickness="0"
+                                CornerRadius="4" />
+                            <Track x:Name="PART_Track" Grid.Row="1">
+                                <Track.DecreaseRepeatButton>
+                                    <RepeatButton Command="Slider.DecreaseLarge">
+                                        <RepeatButton.Style>
+                                            <Style TargetType="{x:Type RepeatButton}">
+                                                <Setter Property="IsTabStop" Value="False" />
+                                                <Setter Property="Focusable" Value="False" />
+                                                <Setter Property="SnapsToDevicePixels" Value="True" />
+                                                <Setter Property="OverridesDefaultStyle" Value="True" />
+                                                <Setter Property="Template">
+                                                    <Setter.Value>
+                                                        <ControlTemplate TargetType="{x:Type RepeatButton}">
+                                                            <Border Background="Transparent" />
+                                                        </ControlTemplate>
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </Style>
+                                        </RepeatButton.Style>
+                                    </RepeatButton>
+                                </Track.DecreaseRepeatButton>
+                                <Track.Thumb>
+                                    <Thumb x:Name="Thumb">
+                                        <Thumb.Style>
+                                            <Style TargetType="{x:Type Thumb}">
+                                                <Setter Property="Height" Value="20" />
+                                                <Setter Property="Width" Value="20" />
+                                                <Setter Property="SnapsToDevicePixels" Value="True" />
+                                                <Setter Property="OverridesDefaultStyle" Value="True" />
+                                                <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
+                                                <Setter Property="Foreground" Value="Black" />
+                                                <Setter Property="BorderThickness" Value="1" />
+                                                <Setter Property="Background" Value="{DynamicResource SliderOuterThumbBackground}" />
+                                                <Setter Property="Template">
+                                                    <Setter.Value>
+                                                        <ControlTemplate TargetType="{x:Type Thumb}">
+                                                            <Border
+                                                                Background="{TemplateBinding Background}"
+                                                                BorderBrush="{TemplateBinding BorderBrush}"
+                                                                BorderThickness="{TemplateBinding BorderThickness}"
+                                                                CornerRadius="16">
+                                                                <Ellipse
+                                                                    x:Name="Ellipse"
+                                                                    Width="12"
+                                                                    Height="12"
+                                                                    Fill="{TemplateBinding Foreground}"
+                                                                    Stroke="Transparent"
+                                                                    StrokeThickness="0" />
+                                                            </Border>
+                                                        </ControlTemplate>
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </Style>
+                                        </Thumb.Style>
+                                    </Thumb>
+                                </Track.Thumb>
+                                <Track.IncreaseRepeatButton>
+                                    <RepeatButton Command="Slider.IncreaseLarge">
+                                        <RepeatButton.Style>
+                                            <Style TargetType="{x:Type RepeatButton}">
+                                                <Setter Property="IsTabStop" Value="False" />
+                                                <Setter Property="Focusable" Value="False" />
+                                                <Setter Property="SnapsToDevicePixels" Value="True" />
+                                                <Setter Property="OverridesDefaultStyle" Value="True" />
+                                                <Setter Property="Template">
+                                                    <Setter.Value>
+                                                        <ControlTemplate TargetType="{x:Type RepeatButton}">
+                                                            <Border Background="Transparent" />
+                                                        </ControlTemplate>
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </Style>
+                                        </RepeatButton.Style>
+                                    </RepeatButton>
+
+                                </Track.IncreaseRepeatButton>
+                            </Track>
+                            <TickBar
+                                x:Name="BottomTick"
+                                Grid.Row="2"
+                                Height="6"
+                                Fill="Transparent"
+                                Placement="Bottom"
+                                SnapsToDevicePixels="True"
+                                Visibility="Collapsed" />
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="TickPlacement" Value="TopLeft">
+                                <Setter TargetName="TopTick" Property="Visibility" Value="Visible" />
+                            </Trigger>
+                            <Trigger Property="TickPlacement" Value="BottomRight">
+                                <Setter TargetName="BottomTick" Property="Visibility" Value="Visible" />
+                            </Trigger>
+                            <Trigger Property="TickPlacement" Value="Both">
+                                <Setter TargetName="TopTick" Property="Visibility" Value="Visible" />
+                                <Setter TargetName="BottomTick" Property="Visibility" Value="Visible" />
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="True" />
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="ColorShadeButtonStyle" TargetType="Button">
+            <Setter Property="OverridesDefaultStyle" Value="True" />
+            <Setter Property="Background" Value="{DynamicResource ButtonBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrush}" />
+            <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
+            <Setter Property="Padding" Value="0" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+            <Setter Property="FontWeight" Value="Normal" />
+            <Setter Property="MinHeight" Value="20" />
+            <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+            <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
+            <Setter Property="Stylus.IsPressAndHoldEnabled" Value="False" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border
+                            x:Name="Background"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="{TemplateBinding Border.CornerRadius}"
+                            SnapsToDevicePixels="True">
+                            <Border
+                                x:Name="Border"
+                                Padding="{TemplateBinding Padding}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}">
+                                <ContentPresenter
+                                    x:Name="ContentPresenter"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Focusable="False"
+                                    RecognizesAccessKey="True"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            </Border>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsMouseOver" Value="True" />
+                                    <Condition Property="IsMouseCaptureWithin" Value="False" />
+                                </MultiTrigger.Conditions>
+                                <Setter TargetName="Background" Property="Opacity" Value="0.8" />
+                            </MultiTrigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="Background" Property="Opacity" Value="0.9" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </ContentControl.Resources>
+
+    <Border
+        BorderBrush="{DynamicResource SurfaceStrokeColorDefaultBrush}"
+        BorderThickness="1"
+        CornerRadius="{DynamicResource ControlCornerRadius}">
+        <Grid
+            x:Name="PickerPanel"
+            Width="248"
+            VerticalAlignment="Stretch"
+            ClipToBounds="True"
+            Opacity="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="36" />
+                <ColumnDefinition Width="36" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="36" />
+                <ColumnDefinition Width="36" />
+            </Grid.ColumnDefinitions>
+            <controls:Button
+                x:Name="ColorVariation1Button"
+                Grid.Column="0"
+                Background="LightPink"
+                Click="OnColorVariationButtonClicked"
+                CornerRadius="4,0,0,4"
+                Style="{DynamicResource ColorShadeButtonStyle}"
+                ToolTipService.ToolTip="Select color" />
+            <Button
+                x:Name="ColorVariation2Button"
+                Grid.Column="1"
+                Background="LightPink"
+                Click="OnColorVariationButtonClicked"
+                Style="{DynamicResource ColorShadeButtonStyle}"
+                ToolTipService.ToolTip="Select color" />
+            <Button
+                x:Name="ColorVariation3Button"
+                Grid.Column="3"
+                Background="LightPink"
+                Click="OnColorVariationButtonClicked"
+                Style="{DynamicResource ColorShadeButtonStyle}"
+                ToolTipService.ToolTip="Select color" />
+            <controls:Button
+                x:Name="ColorVariation4Button"
+                Grid.Column="4"
+                Background="LightPink"
+                Click="OnColorVariationButtonClicked"
+                CornerRadius="0,4,4,0"
+                Style="{DynamicResource ColorShadeButtonStyle}"
+                ToolTipService.ToolTip="Select color" />
+            <Button
+                x:Name="CurrentColorButton"
+                Grid.Column="0"
+                Grid.ColumnSpan="5"
+                Width="104"
+                Margin="72,0"
+                Click="OnCurrentColorButtonClicked"
+                Style="{DynamicResource ColorShadeButtonStyle}"
+                ToolTipService.ToolTip="Adjust color">
+                <controls:Flyout
+                    x:Name="DetailsFlyout"
+                    Margin="160,0,0,0"
+                    Closed="OnDetailsFlyoutClosed"
+                    Placement="Right">
+                    <Grid x:Name="DetailsGrid" KeyboardNavigation.TabNavigation="Contained">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="44" />
+                            <ColumnDefinition Width="86" />
+                            <ColumnDefinition Width="86" />
+                            <ColumnDefinition Width="86" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="8" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="8" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="12" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="12" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <TextBlock
+                            VerticalAlignment="Center"
+                            Text="H"
+                            TextAlignment="Center" />
+                        <Slider
+                            x:Name="HueGradientSlider"
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Grid.ColumnSpan="3"
+                            VerticalAlignment="Center"
+                            IsMoveToPointEnabled="True"
+                            Maximum="289"
+                            Minimum="0"
+                            ValueChanged="OnHueGradientSliderValueChanged" />
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            VerticalAlignment="Center"
+                            Text="S"
+                            TextAlignment="Center" />
+                        <Slider
+                            x:Name="SaturationGradientSlider"
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Grid.ColumnSpan="3"
+                            IsMoveToPointEnabled="True"
+                            Maximum="289"
+                            Minimum="0"
+                            ValueChanged="OnSaturationGradientSliderValueChanged">
+                            <Slider.Background>
+                                <LinearGradientBrush StartPoint="0, 0.5" EndPoint="1,0.5">
+                                    <GradientStop x:Name="SaturationStartColor" Color="Black" />
+                                    <GradientStop x:Name="SaturationStopColor" Offset="1" Color="Red" />
+                                </LinearGradientBrush>
+                            </Slider.Background>
+                        </Slider>
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            VerticalAlignment="Center"
+                            Text="V"
+                            TextAlignment="Center" />
+                        <Slider
+                            x:Name="ValueGradientSlider"
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Grid.ColumnSpan="3"
+                            IsMoveToPointEnabled="True"
+                            Maximum="289"
+                            Minimum="0"
+                            ValueChanged="OnValueGradientSliderValueChanged">
+                            <Slider.Background>
+                                <LinearGradientBrush StartPoint="0, 0.5" EndPoint="1,0.5">
+                                    <GradientStop x:Name="ValueStartColor" Color="Black" />
+                                    <GradientStop x:Name="ValueStopColor" Offset="1" Color="Red" />
+                                </LinearGradientBrush>
+                            </Slider.Background>
+                        </Slider>
+                        <TextBlock
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            VerticalAlignment="Center"
+                            Text="RGB"
+                            TextAlignment="Center" />
+                        <controls:NumberBox
+                            x:Name="RNumberBox"
+                            Grid.Row="6"
+                            Grid.Column="1"
+                            Maximum="255"
+                            Minimum="0"
+                            SpinButtonPlacementMode="Compact"
+                            TextChanged="OnRgbNumberBoxTextChanged" />
+                        <controls:NumberBox
+                            x:Name="GNumberBox"
+                            Grid.Row="6"
+                            Grid.Column="2"
+                            Margin="4,0,0,0"
+                            Maximum="255"
+                            Minimum="0"
+                            SpinButtonPlacementMode="Compact"
+                            TextChanged="OnRgbNumberBoxTextChanged" />
+                        <controls:NumberBox
+                            x:Name="BNumberBox"
+                            Grid.Row="6"
+                            Grid.Column="3"
+                            Margin="4,0,0,0"
+                            Maximum="255"
+                            Minimum="0"
+                            SpinButtonPlacementMode="Compact"
+                            TextChanged="OnRgbNumberBoxTextChanged" />
+                        <TextBlock
+                            Grid.Row="8"
+                            Grid.Column="0"
+                            Width="38"
+                            VerticalAlignment="Center"
+                            Text="HEX"
+                            TextAlignment="Center" />
+                        <TextBox
+                            x:Name="HexCode"
+                            Grid.Row="8"
+                            Grid.Column="1"
+                            Grid.ColumnSpan="3"
+                            HorizontalAlignment="Stretch"
+                            CharacterCasing="Lower"
+                            GotKeyboardFocus="OnHexCodeGotKeyboardFocus"
+                            MaxLength="7"
+                            TextChanged="OnHexCodeTextChanged"
+                            TextWrapping="Wrap" />
+                        <controls:Button
+                            x:Name="OkButton"
+                            Grid.Row="9"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="4"
+                            Margin="0,32,0,0"
+                            HorizontalAlignment="Stretch"
+                            Appearance="Primary"
+                            Click="OnOkButtonClicked"
+                            Content="Select" />
+                    </Grid>
+                </controls:Flyout>
+            </Button>
+        </Grid>
+    </Border>
+</ContentControl>
\ No newline at end of file
diff --git a/Wpf.Ui.Extend/Controls/ColorPickerControl.xaml.cs b/Wpf.Ui.Extend/Controls/ColorPickerControl.xaml.cs
new file mode 100644
index 0000000..e45545b
--- /dev/null
+++ b/Wpf.Ui.Extend/Controls/ColorPickerControl.xaml.cs
@@ -0,0 +1,406 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using Wpf.Ui.Controls;
+using Wpf.Ui.Extend.Controls;
+
+using Color = System.Windows.Media.Color;
+using Point = System.Windows.Point;
+using TextBox = System.Windows.Controls.TextBox;
+
+namespace Wpf.Ui.Extend.Controls;
+
+public sealed partial class ColorPickerControl
+{
+    private double _currH = 360;
+    private double _currS = 1;
+    private double _currV = 1;
+    private bool _ignoreHexChanges;
+    private bool _ignoreRgbChanges;
+    private bool _ignoreGradientsChanges;
+    private bool _isCollapsed = true;
+    private Color _originalColor;
+    private Color _currentColor;
+    
+    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register(nameof(SelectedColor),
+        typeof(Color),
+        typeof(ColorPickerControl),
+        new FrameworkPropertyMetadata(Color.FromArgb(0, 0, 0, 0), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, SelectedColorPropertyChanged));
+    
+    public ColorPickerControl()
+    {
+        InitializeComponent();
+        UpdateHueGradient(1, 1);
+    }
+    
+    public Color SelectedColor
+    {
+        get => (Color) GetValue(SelectedColorProperty);
+        set => SetValue(SelectedColorProperty, value);
+    }
+    
+    private static void SelectedColorPropertyChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
+    {
+        var control = (ColorPickerControl) dependencyObject;
+        var newColor = (Color) e.NewValue;
+        
+        control._originalColor = control._currentColor = newColor;
+        var newColorBackground = new SolidColorBrush(newColor);
+        control.CurrentColorButton.Background = newColorBackground;
+        
+        control._ignoreHexChanges = true;
+        control._ignoreRgbChanges = true;
+        
+        control.HexCode.Text = ColorToHex(newColor);
+        control.RNumberBox.Value = newColor.R;
+        control.GNumberBox.Value = newColor.G;
+        control.BNumberBox.Value = newColor.B;
+        control.SetColorFromTextBoxes(System.Drawing.Color.FromArgb(newColor.R, newColor.G, newColor.B));
+        
+        control._ignoreRgbChanges = false;
+        control._ignoreHexChanges = false;
+        
+        var hsv = ColorFormatUtils.ConvertToHsvColor(System.Drawing.Color.FromArgb(newColor.R, newColor.G, newColor.B));
+        SetColorVariationsForCurrentColor(dependencyObject, hsv);
+    }
+    
+    private void UpdateHueGradient(double saturation, double value)
+    {
+        var g6 = HsvColor.HueSpectrum(saturation, value);
+        
+        var gradientBrush = new LinearGradientBrush
+        {
+            StartPoint = new Point(0, 0),
+            EndPoint = new Point(1, 0)
+        };
+        
+        for (var i = 0; i < g6.Length; i++)
+        {
+            var stop = new GradientStop(g6[i], i * 0.16);
+            gradientBrush.GradientStops.Add(stop);
+        }
+        
+        HueGradientSlider.Background = gradientBrush;
+    }
+    
+    private static void SetColorVariationsForCurrentColor(DependencyObject d, (double Hue, double Saturation, double Value) hsv)
+    {
+        var hueCoefficient = 0;
+        var hueCoefficient2 = 0;
+        if (1 - hsv.Value < 0.15)
+        {
+            hueCoefficient = 1;
+        }
+        
+        if (hsv.Value - 0.3 < 0)
+        {
+            hueCoefficient2 = 1;
+        }
+        
+        var s = hsv.Saturation;
+        var control = (ColorPickerControl) d;
+        
+        control.ColorVariation1Button.Background = new SolidColorBrush(HsvColor.RgbFromHsv(Math.Min(hsv.Hue + (hueCoefficient * 8), 360), s, Math.Min(hsv.Value + 0.3, 1)));
+        control.ColorVariation2Button.Background = new SolidColorBrush(HsvColor.RgbFromHsv(Math.Min(hsv.Hue + (hueCoefficient * 4), 360), s, Math.Min(hsv.Value + 0.15, 1)));
+        
+        control.ColorVariation3Button.Background = new SolidColorBrush(HsvColor.RgbFromHsv(Math.Max(hsv.Hue - (hueCoefficient2 * 4), 0), s, Math.Max(hsv.Value - 0.2, 0)));
+        control.ColorVariation4Button.Background = new SolidColorBrush(HsvColor.RgbFromHsv(Math.Max(hsv.Hue - (hueCoefficient2 * 8), 0), s, Math.Max(hsv.Value - 0.3, 0)));
+    }
+    
+    private void UpdateValueColorGradient(double posX)
+    {
+        ValueGradientSlider.Value = posX;
+        
+        _currV = posX / ValueGradientSlider.Maximum;
+        
+        UpdateHueGradient(_currS, _currV);
+        
+        SaturationStartColor.Color = HsvColor.RgbFromHsv(_currH, 0f, _currV);
+        SaturationStopColor.Color = HsvColor.RgbFromHsv(_currH, 1f, _currV);
+    }
+    
+    private void UpdateSaturationColorGradient(double posX)
+    {
+        SaturationGradientSlider.Value = posX;
+        
+        _currS = posX / HueGradientSlider.Maximum;
+        
+        UpdateHueGradient(_currS, _currV);
+        
+        ValueStartColor.Color = HsvColor.RgbFromHsv(_currH, _currS, 0f);
+        ValueStopColor.Color = HsvColor.RgbFromHsv(_currH, _currS, 1f);
+    }
+    
+    private void UpdateHueColorGradient(double posX)
+    {
+        HueGradientSlider.Value = posX;
+        _currH = posX / HueGradientSlider.Maximum * 360;
+        
+        SaturationStartColor.Color = HsvColor.RgbFromHsv(_currH, 0f, _currV);
+        SaturationStopColor.Color = HsvColor.RgbFromHsv(_currH, 1f, _currV);
+        
+        ValueStartColor.Color = HsvColor.RgbFromHsv(_currH, _currS, 0f);
+        ValueStopColor.Color = HsvColor.RgbFromHsv(_currH, _currS, 1f);
+    }
+    
+    private void UpdateTextBoxesAndCurrentColor(Color currentColor)
+    {
+        if (!_ignoreHexChanges)
+        {
+            // Second parameter is set to keep the hashtag if typed by the user before
+            HexCode.Text = ColorToHex(currentColor, HexCode.Text);
+        }
+        
+        if (!_ignoreRgbChanges)
+        {
+            RNumberBox.Value = currentColor.R;
+            GNumberBox.Value = currentColor.G;
+            BNumberBox.Value = currentColor.B;
+        }
+        
+        _currentColor = currentColor;
+        CurrentColorButton.Background = new SolidColorBrush(currentColor);
+    }
+    
+    private void OnCurrentColorButtonClicked(object sender, RoutedEventArgs e)
+    {
+        ShowDetails();
+    }
+    
+    private void ShowDetails()
+    {
+        if (_isCollapsed)
+        {
+            _isCollapsed = false;
+            
+            var resizeColor = new DoubleAnimation(256, new Duration(TimeSpan.FromMilliseconds(250)))
+            {
+                EasingFunction = new ExponentialEase {EasingMode = EasingMode.EaseInOut}
+            };
+            
+            var moveColor = new ThicknessAnimation(new Thickness(0), new Duration(TimeSpan.FromMilliseconds(250)))
+            {
+                EasingFunction = new ExponentialEase {EasingMode = EasingMode.EaseInOut}
+            };
+            
+            CurrentColorButton.BeginAnimation(WidthProperty, resizeColor);
+            CurrentColorButton.BeginAnimation(MarginProperty, moveColor);
+            CurrentColorButton.IsEnabled = false;
+            DetailsFlyout.IsOpen = true;
+        }
+    }
+    
+    private void HideDetails()
+    {
+        if (_isCollapsed) return;
+        
+        _isCollapsed = true;
+        
+        var resizeColor = new DoubleAnimation(165, new Duration(TimeSpan.FromMilliseconds(150)))
+        {
+            EasingFunction = new ExponentialEase {EasingMode = EasingMode.EaseInOut}
+        };
+        
+        var moveColor = new ThicknessAnimation(new Thickness(72, 0, 72, 0), new Duration(TimeSpan.FromMilliseconds(150)))
+        {
+            EasingFunction = new ExponentialEase {EasingMode = EasingMode.EaseInOut}
+        };
+        
+        CurrentColorButton.BeginAnimation(WidthProperty, resizeColor);
+        CurrentColorButton.BeginAnimation(MarginProperty, moveColor);
+        CurrentColorButton.IsEnabled = true;
+    }
+    
+    private void OnOkButtonClicked(object sender, RoutedEventArgs e)
+    {
+        SelectedColor = _currentColor;
+        DetailsFlyout.Hide();
+    }
+    
+    private void OnDetailsFlyoutClosed(object sender, object e)
+    {
+        HideDetails();
+        
+        // Revert to original color
+        var originalColorBackground = new SolidColorBrush(_originalColor);
+        CurrentColorButton.Background = originalColorBackground;
+        
+        HexCode.Text = ColorToHex(_originalColor);
+    }
+    
+    private void OnColorVariationButtonClicked(object sender, RoutedEventArgs e)
+    {
+        var selectedColor = ((SolidColorBrush) ((System.Windows.Controls.Button) sender).Background).Color;
+        SelectedColor = selectedColor;
+    }
+    
+    private void OnSaturationGradientSliderValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+    {
+        UpdateSaturationColorGradient(((Slider) sender).Value);
+        _ignoreGradientsChanges = true;
+        UpdateTextBoxesAndCurrentColor(HsvColor.RgbFromHsv(_currH, _currS, _currV));
+        _ignoreGradientsChanges = false;
+    }
+    
+    private void OnHueGradientSliderValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+    {
+        UpdateHueColorGradient(((Slider) sender).Value);
+        _ignoreGradientsChanges = true;
+        UpdateTextBoxesAndCurrentColor(HsvColor.RgbFromHsv(_currH, _currS, _currV));
+        _ignoreGradientsChanges = false;
+    }
+    
+    private void OnValueGradientSliderValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+    {
+        UpdateValueColorGradient(((Slider) sender).Value);
+        _ignoreGradientsChanges = true;
+        UpdateTextBoxesAndCurrentColor(HsvColor.RgbFromHsv(_currH, _currS, _currV));
+        _ignoreGradientsChanges = false;
+    }
+    
+    private void OnHexCodeTextChanged(object sender, TextChangedEventArgs e)
+    {
+        var newValue = ((TextBox) sender).Text;
+        
+        // support hex with 3 and 6 characters and optional with hashtag
+        var reg = new Regex("^#?([0-9A-Fa-f]{3}){1,2}$");
+        
+        if (!reg.IsMatch(newValue))
+        {
+            return;
+        }
+        
+        if (_ignoreHexChanges) return;
+        
+        var converter = new System.Drawing.ColorConverter();
+        
+        // "FormatHexColorString()" is needed to add hashtag if missing and to convert the hex code from three to six characters. Without this we get format exceptions and incorrect color values.
+        var color = (System.Drawing.Color) converter.ConvertFromString(FormatHexColorString(HexCode.Text))!;
+        
+        _ignoreHexChanges = true;
+        SetColorFromTextBoxes(color);
+        _ignoreHexChanges = false;
+    }
+    
+    private void SetColorFromTextBoxes(System.Drawing.Color color)
+    {
+        if (!_ignoreGradientsChanges)
+        {
+            var hsv = ColorFormatUtils.ConvertToHsvColor(color);
+            
+            var huePosition = (hsv.Hue / 360) * HueGradientSlider.Maximum;
+            var saturationPosition = hsv.Saturation * SaturationGradientSlider.Maximum;
+            var valuePosition = hsv.Value * ValueGradientSlider.Maximum;
+            UpdateHueColorGradient(huePosition);
+            UpdateSaturationColorGradient(saturationPosition);
+            UpdateValueColorGradient(valuePosition);
+        }
+        
+        UpdateTextBoxesAndCurrentColor(Color.FromRgb(color.R, color.G, color.B));
+    }
+    
+    private static string ColorToHex(Color color, string oldValue = "")
+    {
+#if NETCOREAPP
+        var newHexString = BitConverter.ToString([color.R, color.G, color.B]).Replace("-", string.Empty, StringComparison.InvariantCulture);
+#else
+        var newHexString = BitConverter.ToString([color.R, color.G, color.B]).Replace("-", string.Empty);
+#endif
+        newHexString = newHexString.ToLowerInvariant();
+        
+        // Return only with hashtag if user typed it before
+#if NETCOREAPP
+        var addHashtag = oldValue.StartsWith('#');
+#else
+        var addHashtag = oldValue.StartsWith("#");
+#endif
+        return addHashtag ? "#" + newHexString : newHexString;
+    }
+    
+    /// <summary>
+    /// Formats the hex code string to be accepted by <see cref="System.Drawing.ColorConverter.ConvertFromString(string)"/>. We are adding hashtag at the beginning if needed and convert from three characters to six characters code.
+    /// </summary>
+    /// <param name="hexCodeText">The string we read from the hex text box.</param>
+    /// <returns>Formatted string with hashtag and six characters of hex code.</returns>
+    private static string FormatHexColorString(string hexCodeText)
+    {
+        if (hexCodeText.Length is 3 or 4)
+        {
+            // Hex with or without hashTag and three characters
+            return Regex.Replace(hexCodeText, "^#?([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])$", "#$1$1$2$2$3$3");
+        }
+        
+        // Hex with or without hashTag and six characters
+#if NETCOREAPP
+        return hexCodeText.StartsWith('#') ? hexCodeText : "#" + hexCodeText;
+#else
+        return hexCodeText.StartsWith("#") ? hexCodeText : "#" + hexCodeText;
+#endif
+    }
+    
+    private void OnHexCodeGotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
+    {
+        ((TextBox) sender).SelectAll();
+    }
+    
+    private void OnRgbNumberBoxTextChanged(object sender, TextChangedEventArgs e)
+    {
+        if (_ignoreRgbChanges) return;
+        
+        var numberBox = (NumberBox) sender;
+        
+        if (!RNumberBox.Value.HasValue) return;
+        if (!GNumberBox.Value.HasValue) return;
+        if (!BNumberBox.Value.HasValue) return;
+        
+        var r = numberBox.Name == "RNumberBox" ? GetValueFromNumberBox(numberBox) : (byte) RNumberBox.Value;
+        var g = numberBox.Name == "GNumberBox" ? GetValueFromNumberBox(numberBox) : (byte) GNumberBox.Value;
+        var b = numberBox.Name == "BNumberBox" ? GetValueFromNumberBox(numberBox) : (byte) BNumberBox.Value;
+        
+        _ignoreRgbChanges = true;
+        SetColorFromTextBoxes(System.Drawing.Color.FromArgb(r, g, b));
+        _ignoreRgbChanges = false;
+    }
+    
+    /// <summary>
+    /// NumberBox provides value only after it has been validated - happens after pressing enter or leaving this control.
+    /// However, we need to get value immediately after the underlying textbox value changes
+    /// </summary>
+    /// <param name="numberBox">numberBox control which value we want to get</param>
+    /// <returns>Validated value as per numberbox conditions, if content is invalid it returns previous value</returns>
+    private static byte GetValueFromNumberBox(NumberBox numberBox)
+    {
+        if (!numberBox.Value.HasValue) return byte.MinValue;
+        
+        var parsedValue = ParseDouble(numberBox.Text);
+        if (!parsedValue.HasValue) return (byte) numberBox.Value;
+        
+        var parsedValueByte = (byte) parsedValue;
+        
+        if (parsedValueByte >= numberBox.Minimum && parsedValueByte <= numberBox.Maximum)
+        {
+            return parsedValueByte;
+        }
+        
+        // not valid input, return previous value
+        return (byte) numberBox.Value;
+    }
+    
+    public static double? ParseDouble(string text)
+    {
+        if (double.TryParse(text, out var result))
+        {
+            return result;
+        }
+        
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/Wpf.Ui.Extend/Controls/HSVColor.cs b/Wpf.Ui.Extend/Controls/HSVColor.cs
new file mode 100644
index 0000000..780238d
--- /dev/null
+++ b/Wpf.Ui.Extend/Controls/HSVColor.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+using Color = System.Windows.Media.Color;
+
+namespace Wpf.Ui.Extend.Controls;
+
+public static class HsvColor
+{
+    public static Color[] GetSpectrum()
+    {
+        var rgbs = new Color[360];
+        
+        for (var h = 0; h < 360; h++)
+        {
+            rgbs[h] = RgbFromHsv(h, 1f, 1f);
+        }
+        
+        return rgbs;
+    }
+    
+    public static Color[] HueSpectrum(double saturation, double value)
+    {
+        var rgbs = new Color[7];
+        
+        for (var h = 0; h < 7; h++)
+        {
+            rgbs[h] = RgbFromHsv(h * 60, saturation, value);
+        }
+        
+        return rgbs;
+    }
+    
+    public static Color RgbFromHsv(double h, double s, double v)
+    {
+        if (h > 360 || h < 0 || s > 1 || s < 0 || v > 1 || v < 0)
+        {
+            return Color.FromRgb(0, 0, 0);
+        }
+        
+        var c = v * s;
+        var x = c * (1 - Math.Abs(((h / 60) % 2) - 1));
+        var m = v - c;
+        
+        double r = 0, g = 0, b = 0;
+        
+        if (h < 60)
+        {
+            r = c;
+            g = x;
+        }
+        else if (h < 120)
+        {
+            r = x;
+            g = c;
+        }
+        else if (h < 180)
+        {
+            g = c;
+            b = x;
+        }
+        else if (h < 240)
+        {
+            g = x;
+            b = c;
+        }
+        else if (h < 300)
+        {
+            r = x;
+            b = c;
+        }
+        else if (h <= 360)
+        {
+            r = c;
+            b = x;
+        }
+        
+        return Color.FromRgb((byte)((r + m) * 255), (byte)((g + m) * 255), (byte)((b + m) * 255));
+    }
+}
\ No newline at end of file
diff --git a/WpfApp/MainWindow.xaml b/WpfApp/MainWindow.xaml
index e3a6ff9..bfbb9b8 100644
--- a/WpfApp/MainWindow.xaml
+++ b/WpfApp/MainWindow.xaml
@@ -152,6 +152,7 @@
                 DisplayMemberPath="GradeLevel"
                 ItemsSource="{Binding Grades}"
                 SelectedObjList="{Binding SelectedItems, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+            <ex:ColorPickerControl />
             <Button Command="{Binding ButtonClickCommand}" Content="显示Snackbar" />
             <!--<Border Height="8" CornerRadius="4">s
                 <Border.Background>