整理代码

ShrlAlgoToolkit.RevitAddins/RvCommon/InstanceCreatorView.xaml

@@ -1,17 +1,18 @@
 <ui:NeoWindow
-    Height="340"
-    MinHeight="300"
-    Title="族实例布置"
-    Width="220"
-    d:DataContext="{d:DesignInstance local:InstanceCreatorViewModel}"
-    mc:Ignorable="d"
     x:Class="ShrlAlgoToolkit.RevitAddins.RvCommon.InstanceCreatorView"
     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:ShrlAlgoToolkit.RevitAddins.RvCommon"
     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="340"
+    MinHeight="300"
+    d:DataContext="{d:DesignInstance local:InstanceCreatorViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -21,21 +22,20 @@
     </Window.Resources>
     <ui:StackPanel Margin="5" Spacing="5">
         <ComboBox
+            ui:SelectorAssist.Placeholder="选择族"
             DisplayMemberPath="Name"
             ItemsSource="{Binding Families}"
-            ui:InputAssist.Placeholder="选择族"
             SelectedItem="{Binding SelectedFamily, UpdateSourceTrigger=PropertyChanged}" />
-        <ui:NeuComboBox
+        <ComboBox
+            ui:SelectorAssist.Placeholder="选择族类型"
             DisplayMemberPath="Name"
             ItemsSource="{Binding FamilySymbols, Mode=OneWay}"
-            ui:InputAssist.Placeholder="选择族类型"
-            SelectedItem="{Binding SelectedFamilySymbol, UpdateSourceTrigger=PropertyChanged}"
-            IsFilteringEnabled="False" />
+            SelectedItem="{Binding SelectedFamilySymbol, UpdateSourceTrigger=PropertyChanged}" />
         <Image
             Grid.Row="2"
+            Width="128"
             Height="128"
-            Source="{Binding Image}"
-            Width="128" />
+            Source="{Binding Image}" />
         <TextBox
             Grid.Row="3"
             ui:InputAssist.Prefix="偏移量:"
@@ -50,10 +50,10 @@
                 </TextBox.Text>-->
         </TextBox>
         <Button
-            Command="{Binding PlaceInstancesCommand}"
-            Content="布置"
             Grid.Row="4"
             HorizontalAlignment="Stretch"
+            Command="{Binding PlaceInstancesCommand}"
+            Content="布置"
             ToolTip="选择dwg块并布置族实例" />
     </ui:StackPanel>
 </ui:NeoWindow>