整理代码

ShrlAlgoToolkit.RevitAddins/RvMEP/StandMepCurveView.xaml

@@ -1,21 +1,22 @@
 <ui:NeoWindow
-    Height="320"
-    MinHeight="320"
-    MinWidth="300"
-    SizeToContent="Height"
-    Title="创建立管"
-    Width="300"
-    WindowStartupLocation="CenterOwner"
-    d:DataContext="{d:DesignInstance Type=rvMep:StandMepCurveViewModel}"
-    mc:Ignorable="d"
     x:Class="ShrlAlgoToolkit.RevitAddins.RvMEP.StandMepCurveView"
     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:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:rvMep="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
     xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="创建立管"
+    Width="300"
+    Height="200"
+    MinWidth="300"
+    MinHeight="200"
+    d:DataContext="{d:DesignInstance Type=rvMep:StandMepCurveViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    SizeToContent="Height"
+    WindowStartupLocation="CenterOwner"
+    mc:Ignorable="d">
     <b:Interaction.Triggers>
         <!--<b:EventTrigger EventName="Deactivated">
             <b:InvokeCommandAction Command="{Binding CreateMepCurveCommand}" />
@@ -31,66 +32,66 @@
         <ui:StackPanel Spacing="5">
             <UniformGrid Rows="1">
                 <RadioButton
+                    x:Name="RbPipe"
                     Content="水管"
-                    IsChecked="{Binding IsPipe}"
-                    x:Name="RbPipe" />
+                    IsChecked="{Binding IsPipe}" />
                 <RadioButton
+                    x:Name="RbDuct"
                     Content="风管"
-                    IsChecked="{Binding IsDuct}"
-                    x:Name="RbDuct" />
+                    IsChecked="{Binding IsDuct}" />
                 <RadioButton
+                    x:Name="RbCableTray"
                     Content="桥架"
-                    IsChecked="{Binding IsCableTray}"
-                    x:Name="RbCableTray" />
+                    IsChecked="{Binding IsCableTray}" />
                 <RadioButton
+                    x:Name="RbConduit"
                     Content="线管"
-                    IsChecked="{Binding IsConduit}"
-                    x:Name="RbConduit" />
+                    IsChecked="{Binding IsConduit}" />
             </UniformGrid>
             <ui:StackPanel Spacing="5" Visibility="{Binding IsPipe, Converter={x:Static ui:BooleanToVisibilityConverter.CollapsedInstance}}">
                 <ComboBox
+                    ui:SelectorAssist.Placeholder="&lt;管道类型&gt;"
                     ItemTemplate="{StaticResource MultiDisplayMemberPath}"
                     ItemsSource="{Binding PipeTypes}"
-                    ui:InputAssist.Placeholder="&lt;管道类型&gt;"
                     SelectedItem="{Binding SelectedPipeType}" />
                 <ComboBox
+                    ui:SelectorAssist.Placeholder="&lt;系统类型&gt;"
                     DisplayMemberPath="Name"
                     ItemsSource="{Binding PipeSystemTypes}"
-                    ui:InputAssist.Placeholder="&lt;系统类型&gt;"
                     SelectedItem="{Binding SelectedPipeSystemType}" />
             </ui:StackPanel>
 
             <ui:StackPanel Spacing="5" Visibility="{Binding IsDuct, Converter={x:Static ui:BooleanToVisibilityConverter.CollapsedInstance}}">
                 <ComboBox
+                    ui:SelectorAssist.Placeholder="&lt;风管类型&gt;"
                     ItemTemplate="{StaticResource MultiDisplayMemberPath}"
                     ItemsSource="{Binding DuctTypes}"
-                    ui:InputAssist.Placeholder="&lt;风管类型&gt;"
                     SelectedItem="{Binding SelectedDuctType}" />
                 <ComboBox
+                    ui:SelectorAssist.Placeholder="&lt;系统类型&gt;"
                     DisplayMemberPath="Name"
                     ItemsSource="{Binding DuctSystemTypes}"
-                    ui:InputAssist.Placeholder="&lt;系统类型&gt;"
                     SelectedItem="{Binding SelectedDuctSystemType}" />
             </ui:StackPanel>
 
             <ComboBox
+                ui:SelectorAssist.Placeholder="&lt;线管类型&gt;"
                 ItemTemplate="{StaticResource MultiDisplayMemberPath}"
                 ItemsSource="{Binding ConduitTypes}"
-                ui:InputAssist.Placeholder="&lt;线管类型&gt;"
                 SelectedItem="{Binding SelectedConduitType}"
                 Visibility="{Binding IsConduit, Converter={x:Static ui:BooleanToVisibilityConverter.CollapsedInstance}}" />
             <ComboBox
+                ui:SelectorAssist.Placeholder="&lt;桥架类型&gt;"
                 ItemTemplate="{StaticResource MultiDisplayMemberPath}"
                 ItemsSource="{Binding CableTrayTypes}"
-                ui:InputAssist.Placeholder="&lt;桥架类型&gt;"
                 SelectedItem="{Binding SelectedCableTrayType}"
                 Visibility="{Binding IsCableTray, Converter={x:Static ui:BooleanToVisibilityConverter.CollapsedInstance}}" />
         </ui:StackPanel>
         <Button
-            Command="{Binding CreateMepCurveCommand}"
-            Content="创建立管"
             Grid.Row="1"
             HorizontalAlignment="Stretch"
-            VerticalAlignment="Bottom" />
+            VerticalAlignment="Bottom"
+            Command="{Binding CreateMepCurveCommand}"
+            Content="创建立管" />
     </ui:StackPanel>
 </ui:NeoWindow>