大量更新

ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerView.xaml

@@ -1,12 +1,7 @@
 <ui:NeoWindow
-    Height="450"
-    Icon="{DynamicResource RevitIcon}"
-    Title="视图管理"
-    Width="800"
-    d:DataContext="{d:DesignInstance Type=local:ViewManagerViewModel}"
-    mc:Ignorable="d"
     x:Class="ShrlAlgoToolkit.RevitAddins.RvView.ViewManagerView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:assists="clr-namespace:ShrlAlgoToolkit.Mvvm.Assists;assembly=ShrlAlgoToolkit.Mvvm"
     xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:converters="clr-namespace:ShrlAlgoToolkit.Mvvm.Converters;assembly=ShrlAlgoToolkit.Mvvm"
@@ -15,18 +10,23 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:rvView="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvView"
     xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="视图管理"
+    Width="800"
+    Height="450"
+    d:DataContext="{d:DesignInstance Type=local:ViewManagerViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <converters:SearchValueConverter x:Key="SearchValueConverter" />
-            <converters:EnumItemsSourceAndConverter Type="{x:Type rvView:UserViewDetailLevel}" x:Key="DetailLevelConverter" />
-            <converters:EnumItemsSourceAndConverter Type="{x:Type rvView:UserViewType}" x:Key="ViewTypeConverter" />
-            <converters:EnumItemsSourceAndConverter Type="{x:Type rvView:UserDisplayStyle}" x:Key="DisplayStyleConverter" />
-            <converters:EnumItemsSourceAndConverter Type="{x:Type rvView:UserViewDiscipline}" x:Key="ViewDisciplineConverter" />
-            <assists:BindingProxy Data="{Binding ElementName=ViewDataGrid}" x:Key="ViewDataGridProxy" />
+            <converters:EnumItemsSourceAndConverter x:Key="DetailLevelConverter" Type="{x:Type rvView:UserViewDetailLevel}" />
+            <converters:EnumItemsSourceAndConverter x:Key="ViewTypeConverter" Type="{x:Type rvView:UserViewType}" />
+            <converters:EnumItemsSourceAndConverter x:Key="DisplayStyleConverter" Type="{x:Type rvView:UserDisplayStyle}" />
+            <converters:EnumItemsSourceAndConverter x:Key="ViewDisciplineConverter" Type="{x:Type rvView:UserViewDiscipline}" />
+            <assists:BindingProxy x:Key="ViewDataGridProxy" Data="{Binding ElementName=ViewDataGrid}" />
 
         </ResourceDictionary>
     </Window.Resources>
@@ -35,19 +35,19 @@
         Columns="*,Auto,Auto"
         Rows="*,Auto">
         <DataGrid
+            x:Name="ViewDataGrid"
+            Grid.Row="0"
+            Grid.Column="0"
+            Grid.ColumnSpan="3"
+            Height="380"
+            d:ItemsSource="{d:SampleData}"
             AutoGenerateColumns="False"
             CanUserAddRows="False"
             EnableRowVirtualization="False"
             FrozenColumnCount="2"
-            Grid.Column="0"
-            Grid.ColumnSpan="3"
-            Grid.Row="0"
             GridLinesVisibility="All"
-            Height="380"
             ItemsSource="{Binding FilteredList}"
-            SelectionMode="Extended"
-            d:ItemsSource="{d:SampleData}"
-            x:Name="ViewDataGrid">
+            SelectionMode="Extended">
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
                     <!--<b:InvokeCommandAction Command="{Binding DataContext.UpdateExecuteCommand, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" CommandParameter="{Binding SelectedItems, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DataGrid}}" />-->
@@ -135,9 +135,9 @@
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock
                                     HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
                                     IsEnabled="{Binding IsScaleEditable}"
-                                    Text="1:"
-                                    VerticalAlignment="Center" />
+                                    Text="1:" />
                                 <!--<TextBox IsEnabled="{Binding IsScaleEditable}" Text="{Binding Scale, StringFormat={}1：{0}}" />-->
                                 <TextBox IsEnabled="{Binding IsScaleEditable}" Text="{Binding Scale, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                             </StackPanel>
@@ -235,25 +235,25 @@
             </DataGrid.Columns>
         </DataGrid>
         <TextBox
-            Cursor="IBeam"
-            Grid.Column="0"
+            x:Name="TbSearch"
             Grid.Row="1"
-            Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}"
-            ui:InputAssist.Placeholder="搜索视图"
-            x:Name="TbSearch" />
+            Grid.Column="0"
+            ui:InputAssist.PlaceholderText="搜索视图"
+            Cursor="IBeam"
+            Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" />
         <Button
+            Grid.Row="1"
+            Grid.Column="1"
+            ui:ControlAssist.Icon="{ui:Icon SymbolValue=Search}"
             Command="{Binding SearchCommand}"
             Content="搜索"
-            Grid.Column="1"
-            Grid.Row="1"
-            IsDefault="True"
-            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=Search}" />
+            IsDefault="True" />
         <Button
-            Command="{Binding ConfirmCommand}"
-            Content="应用"
-            Grid.Column="2"
             Grid.Row="1"
-            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=Edit}" />
+            Grid.Column="2"
+            ui:ControlAssist.Icon="{ui:Icon SymbolValue=Edit}"
+            Command="{Binding ConfirmCommand}"
+            Content="应用" />
 
     </ui:Grid>
 </ui:NeoWindow>