大量更新

2025-12-23 21:35:54 +08:00
parent cd4733ee01
commit ceccab9abb
211 changed files with 9439 additions and 6578 deletions
--- a/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyProcessorView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyProcessorView.xaml
@@ -1,21 +1,21 @@
 <ui:NeoWindow
-    Height="600"
-    Icon="{DynamicResource RevitIcon}"
-    MinHeight="400"
-    MinWidth="380"
-    Title="族复用"
-    Width="380"
-    d:DataContext="{d:DesignInstance Type=local:FamilyProcessorViewModel}"
-    mc:Ignorable="d"
    x:Class="ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyProcessorView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:drawing="clr-namespace:System.Drawing;assembly=System.Drawing"
    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
    xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvFamily"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="族复用"
+    Width="380"
+    Height="600"
+    MinWidth="380"
+    MinHeight="400"
+    d:DataContext="{d:DesignInstance Type=local:FamilyProcessorViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
    <Window.Resources>
        <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
    </Window.Resources>
@@ -26,14 +26,14 @@
                Columns="*,*"
                Rows="*,Auto,Auto,Auto">
                <DataGrid
+                    x:Name="FamilySaveDg"
+                    Grid.ColumnSpan="2"
+                    d:ItemsSource="{d:SampleData}"
                    AutoGenerateColumns="False"
                    CanUserAddRows="False"
-                    Grid.ColumnSpan="2"
                    IsReadOnly="True"
                    ItemsSource="{Binding FamilyCollection}"
-                    SelectionMode="Extended"
-                    d:ItemsSource="{d:SampleData}"
-                    x:Name="FamilySaveDg">
+                    SelectionMode="Extended">
                    <!--<ui:DataGrid.RowHeaderTemplate>
                        <DataTemplate>
                            <Grid Width="35">
@@ -43,17 +43,17 @@
                    </ui:DataGrid.RowHeaderTemplate>-->
                    <DataGrid.Columns>
                        <DataGridCheckBoxColumn
+                            Width="60"
                            Binding="{Binding IsSelected, Mode=OneWayToSource, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}"
                            ElementStyle="{StaticResource DataGridCheckBoxStyle}"
-                            Header="选择"
-                            Width="60" />
+                            Header="选择" />
                        <DataGridTextColumn Binding="{Binding FamilyCategory.Name}" Header="族类别" />
                        <DataGridTextColumn Binding="{Binding Name}" Header="族名称" />
                    </DataGrid.Columns>
                </DataGrid>
                <GroupBox
-                    Grid.Column="1"
                    Grid.Row="1"
+                    Grid.Column="1"
                    Header="保存选项">
                    <StackPanel>
                        <RadioButton Content="覆盖存在文件" IsChecked="{Binding IsOverride, UpdateSourceTrigger=PropertyChanged}" />
@@ -61,29 +61,29 @@
                    </StackPanel>
                </GroupBox>
                <StackPanel
-                    Grid.Column="0"
                    Grid.Row="1"
+                    Grid.Column="0"
                    VerticalAlignment="Center">
                    <CheckBox Content="添加族类别文件夹" IsChecked="{Binding CreateCategoryFolder}" />
                    <CheckBox Content="文件名添加族类别" IsChecked="{Binding AddCategoryPrefix}" />
                    <CheckBox Content="以三维为默认视图" IsChecked="{Binding View3dAsDefault}" />
                </StackPanel>
                <TextBox
+                    ui:InputAssist.PlaceholderText="保存路径"
                    Text="{Binding PathToSaveFamily}"
-                    TextOptions.TextFormattingMode="Display"
-                    ui:InputAssist.Placeholder="保存路径" />
+                    TextOptions.TextFormattingMode="Display" />
                <Button
+                    HorizontalAlignment="Stretch"
+                    ui:ControlAssist.Icon="{ui:Icon '&#xEADF;',
+                                                    FontFamily={StaticResource BoxIcons}}"
                    Command="{Binding SelectDirectoryCommand}"
                    Content="路径选择"
-                    Cursor="Hand"
-                    HorizontalAlignment="Stretch"
-                    ui:ButtonAssist.Icon="{ui:Icon '&#xEADF;',
-                                                   FontFamily={StaticResource BoxIcons}}" />
+                    Cursor="Hand" />
                <ComboBox
+                    ui:InputAssist.PlaceholderText="导出的项目文件"
                    DisplayMemberPath="Title"
                    ItemsSource="{Binding SourceDocsList}"
-                    SelectedItem="{Binding SourceDoc, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                    ui:SelectorAssist.Placeholder="导出的项目文件">
+                    SelectedItem="{Binding SourceDoc, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                    <!--<i:Interaction.Triggers>
             <i:EventTrigger EventName="SelectionChanged">
                 <i:InvokeCommandAction Command="{Binding GetFamiliesCommand}" CommandParameter="{Binding}" />
@@ -91,12 +91,12 @@
         </i:Interaction.Triggers>-->
                </ComboBox>
                <Button
+                    HorizontalAlignment="Stretch"
+                    ui:ControlAssist.Icon="{ui:Icon Glyph=&#xEACE;,
+                                                    FontFamily={StaticResource BoxIcons}}"
                    Command="{Binding SaveFamiliesCommand}"
                    CommandParameter="{Binding SelectedItems, ElementName=FamilySaveDg}"
-                    Content="导出保存"
-                    HorizontalAlignment="Stretch"
-                    ui:ButtonAssist.Icon="{ui:Icon Glyph=&#xEACE;,
-                                                   FontFamily={StaticResource BoxIcons}}" />
+                    Content="导出保存" />
            </ui:Grid>
        </TabItem>
        <TabItem Header="传递族">
@@ -105,14 +105,14 @@
                Columns="*,Auto"
                Rows="*,Auto,Auto">
                <DataGrid
+                    x:Name="familyTransmitDg"
+                    Grid.ColumnSpan="2"
+                    d:ItemsSource="{d:SampleData}"
                    AutoGenerateColumns="False"
                    CanUserAddRows="False"
-                    Grid.ColumnSpan="2"
                    IsReadOnly="True"
                    ItemsSource="{Binding FamilyCollection}"
-                    SelectionMode="Extended"
-                    d:ItemsSource="{d:SampleData}"
-                    x:Name="familyTransmitDg">
+                    SelectionMode="Extended">
                    <!--<ui:DataGrid.RowHeaderTemplate>
                        <DataTemplate>
                            <Grid Width="35">
@@ -122,18 +122,18 @@
                    </ui:DataGrid.RowHeaderTemplate>-->
                    <DataGrid.Columns>
                        <DataGridCheckBoxColumn
+                            Width="60"
                            Binding="{Binding IsSelected, Mode=OneWayToSource, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}"
                            ElementStyle="{StaticResource DataGridCheckBoxStyle}"
-                            Header="选择"
-                            Width="60" />
+                            Header="选择" />
                        <DataGridTextColumn Binding="{Binding FamilyCategory.Name}" Header="族类别" />
                        <DataGridTextColumn Binding="{Binding Name}" Header="族名称" />
                    </DataGrid.Columns>
                </DataGrid>
                <ComboBox
-                    DisplayMemberPath="Title"
-                    Grid.Column="0"
                    Grid.Row="1"
+                    Grid.Column="0"
+                    DisplayMemberPath="Title"
                    ItemsSource="{Binding SourceDocsList, Mode=TwoWay}"
                    SelectedItem="{Binding SourceDoc, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                    Text="源文档">
@@ -144,28 +144,28 @@
                        </i:Interaction.Triggers>-->
                </ComboBox>
                <Button
+                    Grid.Row="1"
+                    Grid.Column="1"
                    Command="{Binding TransmitFamilyCommand}"
                    CommandParameter="{Binding SelectedItems, ElementName=familyTransmitDg}"
                    Content="&#xEA84;"
                    FontFamily="{StaticResource BoxIcons}"
-                    Grid.Column="1"
-                    Grid.Row="1"
                    ToolTip="传递" />
                <ComboBox
-                    DisplayMemberPath="Title"
-                    Grid.Column="0"
                    Grid.Row="2"
+                    Grid.Column="0"
+                    DisplayMemberPath="Title"
                    ItemsSource="{Binding TargetDocsList, Mode=TwoWay}"
                    SelectedItem="{Binding TargetDoc, UpdateSourceTrigger=PropertyChanged}"
                    Text="目标文档" />

                <Button
+                    Grid.Row="2"
+                    Grid.Column="1"
                    Command="{Binding CancelCommand}"
                    CommandParameter="{Binding RelativeSource={RelativeSource AncestorType={x:Type Window}, Mode=FindAncestor}}"
                    Content="&#xEC84;"
                    FontFamily="{StaticResource BoxIcons}"
-                    Grid.Column="1"
-                    Grid.Row="2"
                    ToolTip="关闭" />
            </ui:Grid>
        </TabItem>