优化

ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryView.xaml

@@ -41,10 +41,13 @@
             FontFamily="{StaticResource BoxIcons}"
             Grid.Row="0"
             HorizontalAlignment="Stretch"
-            ui:ButtonAssist.Icon="{ui:FontIcon Glyph=,
-                               FontFamily={StaticResource BoxIcons}}"
             Margin="5"
-            ToolTip="{Binding FamilyPath, Mode=OneWay, StringFormat=族目录：{}{0}}" />
+            ToolTip="{Binding FamilyPath, Mode=OneWay, StringFormat=族目录：{}{0}}" >
+            <ui:ButtonAssist.Icon>
+                <ui:IconElement Glyph="&#xEADF;"
+                   FontFamily="{StaticResource BoxIcons}"/>
+            </ui:ButtonAssist.Icon>
+        </Button>
         <TreeView
             Grid.Row="1"
             ItemsSource="{Binding FolderTreeViewItems}"
@@ -76,7 +79,7 @@
                 </i:EventTrigger>
             </i:Interaction.Triggers>
         </TextBox>
-        <ui:ListView
+        <ListView
             Grid.Column="2"
             Grid.Row="1"
             Grid.RowSpan="2"
@@ -122,7 +125,7 @@
                         </GridViewColumn>
                     </GridView>
                 </ListView.View>-->
-            <ui:ListView.ItemContainerStyle>
+            <ListView.ItemContainerStyle>
                 <Style TargetType="{x:Type ListViewItem}">
                     <Setter Property="Template">
                         <Setter.Value>
@@ -152,13 +155,13 @@
                         </Setter.Value>
                     </Setter>
                 </Style>
-            </ui:ListView.ItemContainerStyle>
-            <ui:ListView.ItemsPanel>
+            </ListView.ItemContainerStyle>
+            <ListView.ItemsPanel>
                 <ItemsPanelTemplate>
                     <WrapPanel Width="{Binding (FrameworkElement.ActualWidth), RelativeSource={RelativeSource AncestorType={x:Type ScrollContentPresenter}}}" />
                 </ItemsPanelTemplate>
-            </ui:ListView.ItemsPanel>
-            <ui:ListView.ItemTemplate>
+            </ListView.ItemsPanel>
+            <ListView.ItemTemplate>
                 <DataTemplate>
                     <ui:Card Padding="0">
                         <Grid Height="210" Width="170">
@@ -189,14 +192,14 @@
                                     </Style>
                                 </StackPanel.Style>
                                 <Button
-                                    Appearance="Primary"
+                                    ui:ButtonAssist.AppearanceType="Primary"
                                     Command="{Binding DataContext.ImportFamilyCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}, Mode=FindAncestor}}"
                                     CommandParameter="{Binding}"
                                     Content="&#xEDB7;载入"
                                     FontFamily="{StaticResource BoxIcons}"
                                     ToolTip="将族载入到当前项目" />
                                 <Button
-                                    Appearance="Primary"
+                                    ui:ButtonAssist.AppearanceType="Primary"
                                     Command="{Binding DataContext.LocationFamilyFileCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}, Mode=FindAncestor}}"
                                     CommandParameter="{Binding}"
                                     Content="&#xEA90;定位"
@@ -216,8 +219,8 @@
                         </Grid>
                     </ui:Card>
                 </DataTemplate>
-            </ui:ListView.ItemTemplate>
-            <ui:ListView.Template>
+            </ListView.ItemTemplate>
+            <ListView.Template>
                 <ControlTemplate TargetType="{x:Type ListView}">
                     <ScrollViewer
                         HorizontalScrollBarVisibility="Disabled"
@@ -231,15 +234,15 @@
                         <WrapPanel IsItemsHost="True" ScrollViewer.CanContentScroll="True" />
                     </ScrollViewer>
                 </ControlTemplate>
-            </ui:ListView.Template>
-        </ui:ListView>
+            </ListView.Template>
+        </ListView>
         <GridSplitter
             Grid.Column="3"
             Grid.Row="1"
             HorizontalAlignment="Center"
             ShowsPreview="True"
             Width="1" />
-        <ui:DataGrid
+        <DataGrid
             AutoGenerateColumns="False"
             CanUserAddRows="False"
             Grid.Column="4"
@@ -248,11 +251,11 @@
             ItemsSource="{Binding SelectedItem.Parameters, ElementName=CbbSymbols, Mode=TwoWay}"
             Margin="5"
             d:ItemsSource="{d:SampleData}">
-            <ui:DataGrid.Columns>
+            <DataGrid.Columns>
                 <DataGridTextColumn Binding="{Binding Name}" Header="属性名" />
                 <DataGridTextColumn Binding="{Binding Value}" Header="属性值" />
-            </ui:DataGrid.Columns>
-        </ui:DataGrid>
+            </DataGrid.Columns>
+        </DataGrid>
         <!--<StackPanel
                 Grid.Row="1"
                 Grid.Column="2"
@@ -301,11 +304,12 @@
             Grid.Row="2"
             Margin="5"
             Text="{Binding FamilyCount, Mode=OneWay, StringFormat=共计{}{0}个}" />
-        <ui:InfoBar
+        <ui:Alert
             Grid.Column="2"
             Grid.Row="2"
-            IsOpen="{Binding ActiveSnackbar}"
             Message="{Binding Message}" />
+        <!--IsOpen="{Binding ActiveSnackbar}"-->
+
         <TextBlock
             Grid.Column="4"
             Grid.Row="2"

ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryViewModel.cs

@@ -68,7 +68,7 @@ public partial class FamilyLibraryViewModel : ObservableObject
     private bool activeSnackbar;
 
     [ObservableProperty]
-    private NeoUI.Controls.InfoBar messageQueue = new();
+    private NeoUI.Controls.Alert messageQueue = new();
 
     [ObservableProperty]
     private string message;