From cd4733ee01f7b3a06ddab4e95c52a00861f8c8d0 Mon Sep 17 00:00:00 2001
From: GG Z <903524121@qq.com>
Date: Wed, 15 Oct 2025 19:54:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrfxFontFixer/MainWindow.xaml                  | 6 +++++-
 NeoUI/NeoUI/Controls/DataGrid.xaml             | 8 +++++---
 ShrlAlgo.Addin.Test/RevitAddin.cs              | 2 --
 ShrlAlgo.Addin.Test/ShrlAlgo.Addin.Test.csproj | 3 +--
 WebUITest/WebUITest.csproj                     | 1 +
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/DrfxFontFixer/MainWindow.xaml b/DrfxFontFixer/MainWindow.xaml
index 8f6df15..2fe34a7 100644
--- a/DrfxFontFixer/MainWindow.xaml
+++ b/DrfxFontFixer/MainWindow.xaml
@@ -34,7 +34,10 @@
                 Content="清空处理列表"
                 x:Name="ClearListButton" />
         </n:FlexibleRowPanel>
-        <n:FlexibleRowPanel Grid.ColumnSpan="2" Grid.Row="2">
+        <n:FlexibleRowPanel
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Grid.Row="2">
             <TextBox n:FlexibleRowPanel.Span="2" x:Name="OutputPath" />
             <Button
                 Click="BrowserOutputPathButton_Click"
@@ -48,6 +51,7 @@
         </n:FlexibleRowPanel>
         <GroupBox
             FontWeight="Bold"
+            Grid.Column="0"
             Grid.ColumnSpan="2"
             Grid.Row="3"
             Header="处理日志">
diff --git a/NeoUI/NeoUI/Controls/DataGrid.xaml b/NeoUI/NeoUI/Controls/DataGrid.xaml
index 45dc686..b5cade1 100644
--- a/NeoUI/NeoUI/Controls/DataGrid.xaml
+++ b/NeoUI/NeoUI/Controls/DataGrid.xaml
@@ -343,11 +343,13 @@
                                 Grid.Column="1"
                                 ItemsPanel="{TemplateBinding ItemsPanel}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <!--  默认样式绑定失败  -->
                             <DataGridDetailsPresenter
                                 Grid.Row="1"
                                 Grid.Column="1"
                                 SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
                                 Visibility="{TemplateBinding DetailsVisibility}" />
+                            <!--  默认样式绑定失败  -->
                             <DataGridRowHeader
                                 Grid.Row="0"
                                 Grid.RowSpan="2"
@@ -374,6 +376,7 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsNewItem" Value="True">
+                <!--  默认样式绑定失败  -->
                 <Setter Property="Margin" Value="{Binding NewItemMargin, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DataGrid}}}" />
             </Trigger>
         </Style.Triggers>
@@ -483,12 +486,12 @@
                                             Focusable="False"
                                             Style="{DynamicResource {ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle,
                                                                                           TypeInTargetAssembly={x:Type DataGrid}}}"
-                                            Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DataGrid}}}" />
+                                            Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
                                         <DataGridColumnHeadersPresenter
                                             x:Name="PART_ColumnHeadersPresenter"
                                             Grid.Row="0"
                                             Grid.Column="1"
-                                            Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DataGrid}}}" />
+                                            Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
                                         <ScrollContentPresenter
                                             x:Name="PART_ScrollContentPresenter"
                                             Grid.Row="1"
@@ -544,7 +547,6 @@
         <Setter Property="ColumnHeaderStyle" Value="{StaticResource DefaultDataGridColumnHeaderStyle}" />
         <Setter Property="DropLocationIndicatorStyle" Value="{StaticResource DefaultDataGridDropLocationIndicatorStyle}" />
         <Setter Property="RowHeaderStyle" Value="{StaticResource DefaultDataGridRowHeaderStyle}" />
-
         <Setter Property="Background" Value="{DynamicResource BackgroundLayoutBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource TextPrimaryBrush}" />
         <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource BorderNormalBrush}" />
diff --git a/ShrlAlgo.Addin.Test/RevitAddin.cs b/ShrlAlgo.Addin.Test/RevitAddin.cs
index 010a548..007045c 100644
--- a/ShrlAlgo.Addin.Test/RevitAddin.cs
+++ b/ShrlAlgo.Addin.Test/RevitAddin.cs
@@ -12,8 +12,6 @@ using ShrlAlgoToolkit.Core.Assists;
 using ShrlAlgoToolkit.Revit.Assists;
 using ShrlAlgoToolkit.Revit.Extensions;
 
-using Math = System.Math;
-
 
 namespace ShrlAlgo.Addin.Test;
 
diff --git a/ShrlAlgo.Addin.Test/ShrlAlgo.Addin.Test.csproj b/ShrlAlgo.Addin.Test/ShrlAlgo.Addin.Test.csproj
index 1ea58ea..7949f3f 100644
--- a/ShrlAlgo.Addin.Test/ShrlAlgo.Addin.Test.csproj
+++ b/ShrlAlgo.Addin.Test/ShrlAlgo.Addin.Test.csproj
@@ -8,9 +8,8 @@
 		<UseWPF>true</UseWPF>
 		<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
 		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-		<!--<PlatformTarget>x64</PlatformTarget>-->
+		<PlatformTarget>x64</PlatformTarget>
         <ImplicitUsings>enable</ImplicitUsings>
-        <!--<Platforms>x64</Platforms>-->
         <AppendPlatformToOutputPath>false</AppendPlatformToOutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
diff --git a/WebUITest/WebUITest.csproj b/WebUITest/WebUITest.csproj
index 7ff16b8..94e2f0f 100644
--- a/WebUITest/WebUITest.csproj
+++ b/WebUITest/WebUITest.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <OutputType>WinExe</OutputType>
+    <PlatformTarget>x64</PlatformTarget>
     <!--<OutputType>Library</OutputType>-->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>True</UseWPF>