大量更新

2025-12-23 21:35:54 +08:00
parent cd4733ee01
commit ceccab9abb
211 changed files with 9439 additions and 6578 deletions
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/AddInsulationView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/AddInsulationView.xaml
@@ -32,7 +32,7 @@
            IsEnabled="{Binding AddToPipe, Mode=TwoWay}"
            Spacing="5">
            <ComboBox
-                ui:SelectorAssist.Placeholder="管道系统类型"
+                ui:InputAssist.PlaceholderText="管道系统类型"
                DisplayMemberPath="Name"
                ItemsSource="{Binding PipingSystemTypes}"
                SelectedItem="{Binding SelectedPipingSystemType}" />
@@ -73,16 +73,16 @@
            IsEnabled="{Binding AddToDuct, Mode=TwoWay}"
            Spacing="5">
            <ComboBox
-                ui:SelectorAssist.Placeholder="风管系统类型:"
+                ui:InputAssist.PlaceholderText="风管系统类型:"
                DisplayMemberPath="Name"
                ItemsSource="{Binding DuctSystemTypes}"
                SelectedItem="{Binding SelectedDuctSystem}" />
            <ComboBox
-                ui:SelectorAssist.Placeholder="保温层类型:"
+                ui:InputAssist.PlaceholderText="保温层类型:"
                DisplayMemberPath="Name"
                ItemsSource="{Binding DuctInsulationTypes}"
                SelectedItem="{Binding DuctInsulationItem.DuctInsulationType}" />
-            <TextBox ui:SelectorAssist.Placeholder="保温层厚度:" Text="{Binding DuctInsulationItem.Thickness, UpdateSourceTrigger=PropertyChanged}" />
+            <TextBox ui:InputAssist.PlaceholderText="保温层厚度:" Text="{Binding DuctInsulationItem.Thickness, UpdateSourceTrigger=PropertyChanged}" />
        </ui:StackPanel>
        <StackPanel
            Grid.Row="1"
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/AnyConnectView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/AnyConnectView.xaml
@@ -109,7 +109,7 @@
        </GroupBox>
        <Button
            HorizontalAlignment="Stretch"
-            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=PlugConnect}"
+            ui:ControlAssist.Icon="{ui:Icon SymbolValue=PlugConnect}"
            Command="{Binding ConnectCommand}"
            Content="连接管线" />
    </ui:StackPanel>
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/BreakMEPCurveCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/BreakMEPCurveCmd.cs
@@ -14,7 +14,6 @@ namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
 /// Revit执行命令
 /// </summary>
 [Transaction(TransactionMode.Manual)]
-[Regeneration(RegenerationOption.Manual)]
 public class BreakMEPCurveCmd : ExternalCommand
 {
    public override void Execute()
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/CableLayoutCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/CableLayoutCmd.cs
@@ -9,7 +9,6 @@ using Nice3point.Revit.Toolkit.External;
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;

 [Transaction(TransactionMode.Manual)]
-[Regeneration(RegenerationOption.Manual)]
 public class CableLayoutCmd : ExternalCommand
 {
    private readonly List<Element> elems = new();
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/CableLayoutView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/CableLayoutView.xaml
@@ -19,7 +19,7 @@
    </Window.Resources>
    <ui:StackPanel Margin="5" Spacing="5">
        <ComboBox
-            ui:SelectorAssist.Placeholder="线缆型号"
+            ui:InputAssist.PlaceholderText="线缆型号"
            ItemTemplate="{StaticResource MultiDisplayMemberPath}"
            ItemsSource="{Binding Specifications}"
            SelectedItem="{Binding SelectedConduitType, UpdateSourceTrigger=PropertyChanged}">
@@ -30,13 +30,13 @@
            </b:Interaction.Triggers>
        </ComboBox>
        <ComboBox
-            ui:SelectorAssist.Placeholder="线缆线径"
+            ui:InputAssist.PlaceholderText="线缆线径"
            DisplayMemberPath="Key"
            ItemsSource="{Binding Sizes}"
            SelectedValue="{Binding Size, UpdateSourceTrigger=PropertyChanged}"
            SelectedValuePath="Value" />
        <TextBox
-            ui:InputAssist.Placeholder="线缆数量"
+            ui:InputAssist.PlaceholderText="线缆数量"
            InputMethod.IsInputMethodEnabled="False"
            Text="{Binding Count, UpdateSourceTrigger=PropertyChanged}" />
        <Button HorizontalAlignment="Stretch" Content="布置">
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashReportCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashReportCmd.cs
@@ -8,7 +8,6 @@ namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
 /// Revit执行命令
 /// </summary>
 [Transaction(TransactionMode.Manual)]
-[Regeneration(RegenerationOption.Manual)]
 public class ClashReportCmd : ExternalCommand
 {
 	public override void Execute()
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveCmd.cs
@@ -5,7 +5,6 @@ using ShrlAlgoToolkit.RevitAddins.Assists;
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;

 [Transaction(TransactionMode.Manual)]
-[Regeneration(RegenerationOption.Manual)]
 public class ClashResolveCmd : ExternalCommand
 {
    public override void Execute()
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/CorrectMEPCurveSlopeCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/CorrectMEPCurveSlopeCmd.cs
@@ -9,7 +9,6 @@ using Nice3point.Revit.Toolkit.External;
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;

 [Transaction(TransactionMode.Manual)]
-[Regeneration(RegenerationOption.Manual)]
 public class CorrectMEPCurveSlopeCmd : ExternalCommand
 {
    public override void Execute()
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/DisconnectCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/DisconnectCmd.cs
@@ -7,7 +7,6 @@ using Nice3point.Revit.Toolkit.External;
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;

 [Transaction(TransactionMode.Manual)]
-[Regeneration(RegenerationOption.Manual)]
 public class DisconnectCmd : ExternalCommand
 {
 	public override void Execute()
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/FlipWorkplaneCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/FlipWorkplaneCmd.cs
@@ -7,7 +7,6 @@ using Nice3point.Revit.Toolkit.External;
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP
 {
    [Transaction(TransactionMode.Manual)]
-    [Regeneration(RegenerationOption.Manual)]
    public class FlipWorkplaneCmd : ExternalCommand
    {
        public override void Execute()
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/ForceConnectCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/ForceConnectCmd.cs
@@ -7,7 +7,6 @@ using Nice3point.Revit.Toolkit.External;
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;

 [Transaction(TransactionMode.Manual)]
-[Regeneration(RegenerationOption.Manual)]
 public class ForceConnectCmd : ExternalCommand
 {
 	public override void Execute()
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckCmd.cs
@@ -14,7 +14,6 @@ namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
 ///     Revit执行命令
 /// </summary>
 [Transaction(TransactionMode.Manual)]
-[Regeneration(RegenerationOption.Manual)]
 public class HeadroomCheckCmd : ExternalCommand
 {
 	private void CheckHeadroom(IEnumerable<MEPCurve> elems, double compareMetric, double minValueMetric, double minLengthMetric)
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckView.xaml
@@ -1,19 +1,19 @@
 <ui:NeoWindow
-    Height="800"
-    Icon="{DynamicResource RevitIcon}"
-    Title="净空检查"
-    Width="400"
-    d:DataContext="{d:DesignInstance local:HeadroomCheckViewModel}"
-    mc:Ignorable="d"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvMEP.HeadroomCheckView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
    xmlns:conv="clr-namespace:ShrlAlgoToolkit.RevitAddins.Converters"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="净空检查"
+    Width="400"
+    Height="800"
+    d:DataContext="{d:DesignInstance local:HeadroomCheckViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
    <Window.Resources>
        <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
    </Window.Resources>
@@ -26,21 +26,21 @@
            <RowDefinition Height="Auto" />
        </Grid.RowDefinitions>
        <DataGrid
+            Grid.Row="0"
+            Grid.Column="0"
+            Height="200"
+            Margin="5"
+            d:ItemsSource="{d:SampleData ItemCount=5}"
            AutoGenerateColumns="False"
            CanUserAddRows="False"
-            Grid.Column="0"
-            Grid.Row="0"
-            Height="200"
            ItemsSource="{Binding Rooms}"
-            Margin="5"
-            SelectionMode="Extended"
-            d:ItemsSource="{d:SampleData ItemCount=5}">
+            SelectionMode="Extended">
            <DataGrid.Columns>
                <DataGridCheckBoxColumn
+                    Width="60"
                    Binding="{Binding IsSelected}"
                    ElementStyle="{StaticResource DataGridCheckBoxStyle}"
-                    Header="选择"
-                    Width="60" />
+                    Header="选择" />
                <DataGridTextColumn
                    Binding="{Binding Name}"
                    Header="房间名称"
@@ -56,14 +56,14 @@
        </DataGrid>
        <GridSplitter Grid.Row="1" HorizontalAlignment="Stretch" />
        <DataGrid
+            Grid.Row="2"
+            Grid.Column="0"
+            Height="340"
+            Margin="5"
            AutoGenerateColumns="False"
            CanUserAddRows="False"
-            Grid.Column="0"
-            Grid.Row="2"
-            Height="340"
            IsReadOnly="True"
            ItemsSource="{Binding ErrorModels}"
-            Margin="5"
            ToolTip="双击行可快速定位">
            <b:Interaction.Triggers>
                <b:EventTrigger EventName="MouseDoubleClick">
@@ -92,8 +92,8 @@
        <!--  树状结构，按楼层=>专业=>管线  -->
        <GridSplitter Grid.Row="3" HorizontalAlignment="Stretch" />
        <ui:StackPanel
-            Grid.Column="0"
            Grid.Row="4"
+            Grid.Column="0"
            Margin="5"
            Spacing="5">
            <!--<TextBlock
@@ -102,45 +102,45 @@
                Text="排除高度低的管线(mm)：" />-->
            <TextBox
                MinWidth="120"
-                Text="1000"
-                ui:InputAssist.Placeholder="排除高度低的管线:"
-                ui:InputAssist.Suffix="mm" />
+                ui:InputAssist.PlaceholderText="排除高度低的管线:"
+                ui:InputAssist.Suffix="mm"
+                Text="1000" />
            <!--<TextBlock
                HorizontalAlignment="Right"
                VerticalAlignment="Center"
                Text="排除长度短的管线(mm)：" />-->
            <TextBox
                MinWidth="120"
-                Text="500"
-                ui:InputAssist.Placeholder="排除长度短的管线:"
-                ui:InputAssist.Suffix="mm" />
+                ui:InputAssist.PlaceholderText="排除长度短的管线:"
+                ui:InputAssist.Suffix="mm"
+                Text="500" />
            <!--<TextBlock
                HorizontalAlignment="Right"
                VerticalAlignment="Center"
                Text="净高要求高度(mm)：" />-->
            <TextBox
                MinWidth="120"
-                Text="2600"
-                ui:InputAssist.Placeholder="净高要求高度:"
-                ui:InputAssist.Suffix="mm" />
+                ui:InputAssist.PlaceholderText="净高要求高度:"
+                ui:InputAssist.Suffix="mm"
+                Text="2600" />
            <Button
+                HorizontalAlignment="Stretch"
                Command="{Binding AnalysisHeadroomCommand}"
                Content="净高分析"
-                HorizontalAlignment="Stretch"
                ToolTip="得到净高分析的平面以及不满足净高要求的管线" />
            <!--<Button
                    Command="{Binding FindOverCommand}"
                    Content="查询管线"
                    ToolTip="根据净高要求查询" />-->
            <Button
+                HorizontalAlignment="Stretch"
                Command="{Binding ResetRoomHeightCommand}"
                Content="重设高度"
-                HorizontalAlignment="Stretch"
                ToolTip="重新设置房间高度为4000mm，避免影响平面查看" />
            <Button
+                HorizontalAlignment="Stretch"
                Command="{Binding GenerateRoom3DCommand}"
                Content="房间实体"
-                HorizontalAlignment="Stretch"
                ToolTip="生成三维房间实体" />
        </ui:StackPanel>
    </Grid>
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveConnectCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveConnectCmd.cs
@@ -8,7 +8,6 @@ using Nice3point.Revit.Toolkit.External;
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;

 [Transaction(TransactionMode.Manual)]
-[Regeneration(RegenerationOption.Manual)]
 public class MoveConnectCmd : ExternalCommand
 {
    public override void Execute()
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCmd.cs
@@ -8,7 +8,6 @@ namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
 /// Revit执行命令
 /// </summary>
 [Transaction(TransactionMode.Manual)]
-[Regeneration(RegenerationOption.Manual)]
 public class MoveMEPCmd : ExternalCommand
 {
 	public override void Execute()
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/RotateInstanceCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/RotateInstanceCmd.cs
@@ -5,7 +5,6 @@ using ShrlAlgoToolkit.RevitAddins.Assists;
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP
 {
    [Transaction(TransactionMode.Manual)]
-    [Regeneration(RegenerationOption.Manual)]
    class RotateInstanceCmd : ExternalCommand
    {
        public override void Execute()
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/StandMepCurveView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/StandMepCurveView.xaml
@@ -50,12 +50,12 @@
            </UniformGrid>
            <ui:StackPanel Spacing="5" Visibility="{Binding IsPipe, Converter={x:Static ui:BooleanToVisibilityConverter.CollapsedInstance}}">
                <ComboBox
-                    ui:SelectorAssist.Placeholder="&lt;管道类型&gt;"
+                    ui:InputAssist.PlaceholderText="&lt;管道类型&gt;"
                    ItemTemplate="{StaticResource MultiDisplayMemberPath}"
                    ItemsSource="{Binding PipeTypes}"
                    SelectedItem="{Binding SelectedPipeType}" />
                <ComboBox
-                    ui:SelectorAssist.Placeholder="&lt;系统类型&gt;"
+                    ui:InputAssist.PlaceholderText="&lt;系统类型&gt;"
                    DisplayMemberPath="Name"
                    ItemsSource="{Binding PipeSystemTypes}"
                    SelectedItem="{Binding SelectedPipeSystemType}" />
@@ -63,25 +63,25 @@

            <ui:StackPanel Spacing="5" Visibility="{Binding IsDuct, Converter={x:Static ui:BooleanToVisibilityConverter.CollapsedInstance}}">
                <ComboBox
-                    ui:SelectorAssist.Placeholder="&lt;风管类型&gt;"
+                    ui:InputAssist.PlaceholderText="&lt;风管类型&gt;"
                    ItemTemplate="{StaticResource MultiDisplayMemberPath}"
                    ItemsSource="{Binding DuctTypes}"
                    SelectedItem="{Binding SelectedDuctType}" />
                <ComboBox
-                    ui:SelectorAssist.Placeholder="&lt;系统类型&gt;"
+                    ui:InputAssist.PlaceholderText="&lt;系统类型&gt;"
                    DisplayMemberPath="Name"
                    ItemsSource="{Binding DuctSystemTypes}"
                    SelectedItem="{Binding SelectedDuctSystemType}" />
            </ui:StackPanel>

            <ComboBox
-                ui:SelectorAssist.Placeholder="&lt;线管类型&gt;"
+                ui:InputAssist.PlaceholderText="&lt;线管类型&gt;"
                ItemTemplate="{StaticResource MultiDisplayMemberPath}"
                ItemsSource="{Binding ConduitTypes}"
                SelectedItem="{Binding SelectedConduitType}"
                Visibility="{Binding IsConduit, Converter={x:Static ui:BooleanToVisibilityConverter.CollapsedInstance}}" />
            <ComboBox
-                ui:SelectorAssist.Placeholder="&lt;桥架类型&gt;"
+                ui:InputAssist.PlaceholderText="&lt;桥架类型&gt;"
                ItemTemplate="{StaticResource MultiDisplayMemberPath}"
                ItemsSource="{Binding CableTrayTypes}"
                SelectedItem="{Binding SelectedCableTrayType}"
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/TerminalConnectToDuctCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/TerminalConnectToDuctCmd.cs
@@ -7,7 +7,6 @@ using Nice3point.Revit.Toolkit.External;
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;

 [Transaction(TransactionMode.Manual)]
-[Regeneration(RegenerationOption.Manual)]
 public class TerminalConnectToDuctCmd : ExternalCommand
 {
    public override void Execute()