整理

2025-08-20 12:10:35 +08:00
parent fcd306b0f7
commit 955a01f564
962 changed files with 7893 additions and 127784 deletions
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesView.xaml
@@ -1,4 +1,4 @@
-<ui:FluentWindowEx
+<ui:NeoWindow
    Height="500"
    MinHeight="500"
    Title="铺贴"
@@ -10,44 +10,44 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
-    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:AutoGrid ChildMargin="5" Columns="*">
-        <ui:TextBoxEx
+    <ui:Grid ChildMargin="5" Columns="*">
+        <TextBox
            InputMethod.IsInputMethodEnabled="False"
-            Prefix="砖长："
-            Suffix="mm"
+            ui:InputAssist.Prefix="砖长："
+            ui:InputAssist.Suffix="mm"
            Text="{Binding PavementLength, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}"
            x:Name="TbPavementLength" />
-        <ui:TextBoxEx
+        <TextBox
            InputMethod.IsInputMethodEnabled="False"
-            Prefix="砖宽："
-            Suffix="mm"
+            ui:InputAssist.Prefix="砖宽："
+            ui:InputAssist.Suffix="mm"
            Text="{Binding PavementWidth, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}"
            x:Name="TbPavementWidth" />
-        <ui:TextBoxEx
+        <TextBox
            InputMethod.IsInputMethodEnabled="False"
-            Prefix="砖缝："
-            Suffix="mm"
+            ui:InputAssist.Prefix="砖缝："
+            ui:InputAssist.Suffix="mm"
            Text="{Binding PavementGap, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}"
            x:Name="TbPavementGap" />
-        <ui:TextBoxEx
+        <TextBox
            InputMethod.IsInputMethodEnabled="False"
-            Prefix="砖厚："
-            Suffix="mm"
+            ui:InputAssist.Prefix="砖厚："
+            ui:InputAssist.Suffix="mm"
            Text="{Binding PavementThickness, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}"
            x:Name="TbPavementThickness" />
-        <ui:TextBoxEx
+        <TextBox
            InputMethod.IsInputMethodEnabled="False"
-            Prefix="墙砖底标高："
-            Suffix="mm"
+            ui:InputAssist.Prefix="墙砖底标高："
+            ui:InputAssist.Suffix="mm"
            Text="{Binding WallBaseOffset, StringFormat={}{0:F2}, UpdateSourceTrigger=PropertyChanged}"
            x:Name="TbPavementBaseOffset" />
-        <ui:TextBoxEx
-            Prefix="铺砖名(类型名)："
+        <TextBox
+            ui:InputAssist.Prefix="铺砖名(类型名)："
            Text="{Binding PanelName, UpdateSourceTrigger=PropertyChanged}"
            x:Name="TbPavementName" />
        <GroupBox Grid.Row="1" Header="铺设方式">
@@ -63,5 +63,5 @@
            HorizontalAlignment="Stretch"
            IsEnabled="{Binding HasErrors, Mode=OneWay, Converter={StaticResource InvertBooleanConverter}, UpdateSourceTrigger=PropertyChanged}"
            x:Name="BtnByFace" />
-    </ui:AutoGrid>
-</ui:FluentWindowEx>
+    </ui:Grid>
+</ui:NeoWindow>
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsView.xaml
@@ -1,4 +1,4 @@
-<ui:FluentWindowEx
+<ui:NeoWindow
    Height="220"
    Title="开洞设置"
    Width="200"
@@ -10,20 +10,20 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
    xmlns:rvCivil1="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
-    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:AutoGrid
+    <ui:Grid
        ChildHorizontalAlignment="Stretch"
        ChildMargin="5"
        Columns="*"
        RowHeight="*"
        Rows="Auto,Auto,Auto">
-        <ui:TextBoxEx
-            Prefix="向外延伸距离："
-            Suffix="mm"
+        <TextBox
+            ui:InputAssist.Prefix="向外延伸距离："
+            ui:InputAssist.Suffix="mm"
            Text="{Binding Distance, StringFormat={}{0:N2}}" />
        <CheckBox
            Content="添加套管"
@@ -40,6 +40,6 @@
            Content="开洞"
            HorizontalAlignment="Stretch"
            ToolTip="选择添加套管则使用套管开洞"
-            ui:AutoGrid.RowHeightOverride="Auto" />
-    </ui:AutoGrid>
-</ui:FluentWindowEx>
+            ui:Grid.RowHeightOverride="Auto" />
+    </ui:Grid>
+</ui:NeoWindow>
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/FloorFinishesView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/FloorFinishesView.xaml
@@ -1,4 +1,4 @@
-<ui:FluentWindowEx
+<ui:NeoWindow
    Height="500"
    MinHeight="500"
    MinWidth="275"
@@ -12,7 +12,7 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
-    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" />
@@ -21,7 +21,7 @@
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>-->
    </Window.Resources>
-    <ui:AutoGrid
+    <ui:Grid
        ChildMargin="5"
        Columns="*"
        Rows="Auto,*,Auto,Auto">
@@ -41,16 +41,16 @@
                SelectedValue="{Binding SelectedFloorType, UpdateSourceTrigger=PropertyChanged}"
                x:Name="LbFloorType" />
        </GroupBox>
-        <ui:TextBox
+        <TextBox
            Grid.Row="2"
            InputMethod.IsInputMethodEnabled="False"
-            PlaceholderText="楼板偏移"
-            Text="{Binding FloorOffset, StringFormat=\{0:N2\}, UpdateSourceTrigger=PropertyChanged}" />
+            ui:InputAssist.Placeholder="楼板偏移"
+            Text="{Binding FloorOffset, StringFormat={}{0:N2}, UpdateSourceTrigger=PropertyChanged}" />
        <!--<TextBox
                Grid.Row="2"
                InputMethod.IsInputMethodEnabled="False"
                md:HintAssist.Hint="楼板偏移"
-                md:TextFieldAssist.SuffixText="mm">
+                md:TextFieldAssist.ui:InputAssist.SuffixText="mm">
                <TextBox.Text>
                    <Binding
                        Path="FloorOffset"
@@ -65,12 +65,12 @@
                    </Binding>
                </TextBox.Text>
            </TextBox>-->
-        <ui:Button
+        <Button
            Command="{Binding PlaceFloorCommand}"
            Content="布置"
            Grid.Row="3"
            HorizontalAlignment="Stretch"
-            Icon="{ui:FontIcon Glyph=&#xeab9;,
+            ui:ButtonAssist.Icon="{ui:FontIcon Glyph=&#xeab9;,
                               FontFamily={StaticResource BoxIcons}}" />
-    </ui:AutoGrid>
-</ui:FluentWindowEx>
+    </ui:Grid>
+</ui:NeoWindow>
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectView.xaml
@@ -1,4 +1,4 @@
-<ui:FluentWindowEx
+<ui:NeoWindow
    Height="600"
    MinHeight="600"
    Title="土建构件连接"
@@ -10,7 +10,7 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
-    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>
@@ -19,7 +19,7 @@
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>
    </Window.Resources>
-    <ui:AutoGrid
+    <ui:Grid
        ChildMargin="5"
        Columns="*"
        Rows="*,Auto,Auto">
@@ -86,5 +86,5 @@
            Grid.Row="2"
            HorizontalAlignment="Stretch"
            ToolTip="相交的图元才会被修改" />
-    </ui:AutoGrid>
-</ui:FluentWindowEx>
+    </ui:Grid>
+</ui:NeoWindow>
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectView.xaml.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectView.xaml.cs
@@ -1,11 +1,11 @@
-using WPFluent.Controls;
+using NeoUI.Controls;

 namespace ShrlAlgoToolkit.RevitAddins.RvCivil
 {
    /// <summary>
    ///     ResolveCivilConnectView.xaml 的交互逻辑
    /// </summary>
-    public partial class ResolveCivilConnectView : FluentWindowEx
+    public partial class ResolveCivilConnectView : NeoWindow
    {
        public ResolveCivilConnectView()
        {
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesView.xaml
@@ -1,4 +1,4 @@
-<ui:FluentWindowEx
+<ui:NeoWindow
    Height="500"
    MinHeight="300"
    Title="墙饰面"
@@ -10,7 +10,7 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
-    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>
@@ -19,7 +19,7 @@
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>
    </Window.Resources>
-    <ui:AutoGrid
+    <ui:Grid
        ChildMargin="5"
        Columns="*"
        Rows="*,Auto,Auto,Auto,Auto">
@@ -33,18 +33,18 @@
                SelectedValue="{Binding SelectedWallType, UpdateSourceTrigger=PropertyChanged}"
                x:Name="CbbWallTypes" />
        </GroupBox>
-        <ui:TextBoxEx
+        <TextBox
            Grid.Row="1"
            InputMethod.IsInputMethodEnabled="False"
-            Prefix="饰面总高度："
-            Suffix="mm"
+            ui:InputAssist.Prefix="饰面总高度："
+            ui:InputAssist.Suffix="mm"
            Text="{Binding WallHeight, StringFormat=\{0:F2\}, UpdateSourceTrigger=PropertyChanged}"
            x:Name="TbWallHeight" />
-        <ui:TextBoxEx
+        <TextBox
            Grid.Row="2"
            InputMethod.IsInputMethodEnabled="False"
-            Prefix="饰面底部离地高度："
-            Suffix="mm"
+            ui:InputAssist.Prefix="饰面底部离地高度："
+            ui:InputAssist.Suffix="mm"
            Text="{Binding WallBaseOffset, StringFormat=\{0:F2\}, UpdateSourceTrigger=PropertyChanged}"
            x:Name="TbWallBase" />
        <ComboBox
@@ -64,5 +64,5 @@
            HorizontalAlignment="Stretch"
            VerticalAlignment="Center"
            x:Name="BtnPlace" />
-    </ui:AutoGrid>
-</ui:FluentWindowEx>
+    </ui:Grid>
+</ui:NeoWindow>