整理代码

ShrlAlgoToolkit.RevitAddins/RvMEP/CableLayoutView.xaml

@@ -1,26 +1,27 @@
 <ui:NeoWindow
-    Height="200"
-    MinWidth="220"
-    Title="线缆布置"
-    Width="220"
-    d:DataContext="{d:DesignInstance Type=electricDesign:CableLayoutViewModel}"
-    mc:Ignorable="d"
     x:Class="ShrlAlgoToolkit.RevitAddins.RvMEP.CableLayoutView"
     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:electricDesign="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="220"
+    Height="200"
+    MinWidth="220"
+    d:DataContext="{d:DesignInstance Type=electricDesign:CableLayoutViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
     <Window.Resources>
         <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
     </Window.Resources>
     <ui:StackPanel Margin="5" Spacing="5">
         <ComboBox
+            ui:SelectorAssist.Placeholder="线缆型号"
             ItemTemplate="{StaticResource MultiDisplayMemberPath}"
             ItemsSource="{Binding Specifications}"
-            ui:InputAssist.Placeholder="线缆型号"
             SelectedItem="{Binding SelectedConduitType, UpdateSourceTrigger=PropertyChanged}">
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
@@ -29,16 +30,16 @@
             </b:Interaction.Triggers>
         </ComboBox>
         <ComboBox
+            ui:SelectorAssist.Placeholder="线缆线径"
             DisplayMemberPath="Key"
             ItemsSource="{Binding Sizes}"
-            ui:InputAssist.Placeholder="线缆线径"
             SelectedValue="{Binding Size, UpdateSourceTrigger=PropertyChanged}"
             SelectedValuePath="Value" />
         <TextBox
-            InputMethod.IsInputMethodEnabled="False"
             ui:InputAssist.Placeholder="线缆数量"
+            InputMethod.IsInputMethodEnabled="False"
             Text="{Binding Count, UpdateSourceTrigger=PropertyChanged}" />
-        <Button Content="布置" HorizontalAlignment="Stretch">
+        <Button HorizontalAlignment="Stretch" Content="布置">
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="Click">
                     <b:InvokeCommandAction Command="{Binding CloseWinCommand}" CommandParameter="{Binding RelativeSource={RelativeSource AncestorType={x:Type Window}, Mode=FindAncestor}}" />