优化样式

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="处理日志">

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}" />

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;
 

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>

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>