整理

ShrlAlgoToolkit.RevitAddins/RvMEP/CableLayoutView.xaml

@@ -1,4 +1,4 @@
-<ui:FluentWindowEx
+<ui:NeoWindow
     Height="200"
     MinWidth="220"
     Title="线缆布置"
@@ -11,32 +11,32 @@
     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/WPFluent"
+    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Window.Resources>
         <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
     </Window.Resources>
     <ui:StackPanel Margin="5" Spacing="5">
-        <ui:ComboBoxEx
+        <ComboBox
             ItemTemplate="{StaticResource MultiDisplayMemberPath}"
             ItemsSource="{Binding Specifications}"
-            PlaceholderText="线缆型号"
+            ui:InputAssist.Placeholder="线缆型号"
             SelectedItem="{Binding SelectedConduitType, UpdateSourceTrigger=PropertyChanged}">
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
                     <b:InvokeCommandAction Command="{Binding SelectionTypeCommand}" />
                 </b:EventTrigger>
             </b:Interaction.Triggers>
-        </ui:ComboBoxEx>
-        <ui:ComboBoxEx
+        </ComboBox>
+        <ComboBox
             DisplayMemberPath="Key"
             ItemsSource="{Binding Sizes}"
-            PlaceholderText="线缆线径"
+            ui:InputAssist.Placeholder="线缆线径"
             SelectedValue="{Binding Size, UpdateSourceTrigger=PropertyChanged}"
             SelectedValuePath="Value" />
-        <ui:TextBox
+        <TextBox
             InputMethod.IsInputMethodEnabled="False"
-            PlaceholderText="线缆数量"
+            ui:InputAssist.Placeholder="线缆数量"
             Text="{Binding Count, UpdateSourceTrigger=PropertyChanged}" />
         <Button Content="布置" HorizontalAlignment="Stretch">
             <b:Interaction.Triggers>
@@ -46,4 +46,4 @@
             </b:Interaction.Triggers>
         </Button>
     </ui:StackPanel>
-</ui:FluentWindowEx>
+</ui:NeoWindow>