提交

ArchivesCenter4 (Package)/ArchivesCenter4 (Package).wapproj

@@ -64,6 +64,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.1.240916" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.1.240916" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240916" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.1.240916" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250205002" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.2" />

ArchivesCenter4/ArchivesCenter4.csproj

@@ -35,6 +35,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.1.240916" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.1.240916" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240916" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.1.240916" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250205002" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.2" />

ArchivesCenter4/people.xaml

@@ -32,32 +32,32 @@
                         <AppBarButton Icon="Delete" Label="删除" IsEnabled="False"/>
                         <AppBarButton Icon="Refresh" Label="刷新"/>
                     </CommandBar>
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="auto"/>
-                                <RowDefinition Height="auto"/>
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="auto"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-                            <PersonPicture Grid.Column="0" Grid.Row="0" Margin="0,16,16,0"/>
+                    <Grid Grid.Row="1">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="auto"/>
+                            <RowDefinition Height="auto"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <PersonPicture Grid.Column="0" Grid.Row="0" Margin="0,16,16,0"/>
                         <TextBlock Grid.Column="1" Grid.Row="0" Margin="0,16,16,0" Style="{StaticResource HeaderTextBlockStyle}" Text="姓名" VerticalAlignment="Center"/>
                     </Grid>
 
-                    <ScrollViewer Grid.Row="3" VerticalScrollBarVisibility="Visible" Margin="0,16,0,0">
-                        <Grid HorizontalAlignment="Center">
+                    <ScrollViewer Grid.Row="2" VerticalScrollBarVisibility="Visible" Margin="0,16,0,0" >
+                        <Grid HorizontalAlignment="Stretch">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="auto"/>
                                 <RowDefinition Height="auto"/>
+                                <RowDefinition Height="auto"/>
+                                <RowDefinition Height="auto"/>
+                                <RowDefinition Height="auto"/>
+                                <RowDefinition Height="auto"/>
                             </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="auto"/>
-                                <ColumnDefinition Width="auto"/>
-                            </Grid.ColumnDefinitions>
 
 
-                            <Grid Grid.Row="0" Grid.Column="0" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="0,36,16,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" Width="400">
+                            <Grid Grid.Row="0" Grid.Column="0" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="48,36,48,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="auto"/>
                                     <RowDefinition Height="auto"/>
@@ -113,7 +113,7 @@
                             </Grid>
 
 
-                            <Grid Grid.Row="0" Grid.Column="1" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="0,36,16,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" Width="400">
+                            <Grid Grid.Row="1" Grid.Column="1" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="48,0,48,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="auto"/>
                                     <RowDefinition Height="auto"/>
@@ -181,7 +181,7 @@
                             </Grid>
 
 
-                            <Grid Grid.Row="1" Grid.Column="0" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="0,0,16,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" Width="400">
+                            <Grid Grid.Row="2" Grid.Column="0" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="48,0,48,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="auto"/>
                                     <RowDefinition Height="auto"/>
@@ -203,6 +203,26 @@
                                     <RowDefinition Height="auto"/>
                                     <RowDefinition Height="auto"/>
                                     <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
                                 </Grid.RowDefinitions>
                                 <TextBlock Grid.Row="0" Margin="16,16,12,16" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource SubtitleTextBlockStyle}" Text="社会关系"/>
 
@@ -252,18 +272,55 @@
 
                                 <TextBlock Grid.Row="15" Margin="16,0,16,8" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource BaseTextBlockStyle}" Text="毕业高校"/>
                                 <TextBox Grid.Row="16" Margin="16,0,16,16" TextWrapping="Wrap"/>
+
+                                <TextBlock Grid.Row="17" Margin="16,0,16,8" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource BaseTextBlockStyle}" Text="研究生单位"/>
+                                <TextBox Grid.Row="18" Margin="16,0,16,16" TextWrapping="Wrap"/>
+
+                                <TextBlock Grid.Row="19" Margin="16,0,16,8" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource BaseTextBlockStyle}" Text="工作单位和职位"/>
+                                <TextBox Grid.Row="20" Margin="16,0,16,16" TextWrapping="Wrap"/>
+
+                                <TextBlock Grid.Row="21" Margin="16,0,16,8" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource BaseTextBlockStyle}" Text="备注"/>
+                                <TextBox Grid.Row="22" Margin="16,0,16,16" TextWrapping="Wrap"/>
                             </Grid>
 
 
-                            <Grid Grid.Row="1" Grid.Column="1" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="0,0,16,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" Width="400">
+                            <Grid Grid.Row="3" Grid.Column="1" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="48,0,48,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="auto"/>
                                     <RowDefinition Height="auto"/>
                                     <RowDefinition Height="auto"/>
                                     <RowDefinition Height="auto"/>
                                     <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
                                 </Grid.RowDefinitions>
                                 <TextBlock Grid.Row="0" Margin="16,16,12,16" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource SubtitleTextBlockStyle}" Text="联系方式"/>
+
+                                <TextBlock Grid.Row="1" Margin="16,0,16,8" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource BaseTextBlockStyle}" Text="电话号码"/>
+                                <TextBox Grid.Row="2" Margin="16,0,16,16" TextWrapping="Wrap"/>
+
+                                <TextBlock Grid.Row="3" Margin="16,0,16,8" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource BaseTextBlockStyle}" Text="电子邮件地址"/>
+                                <TextBox Grid.Row="4" Margin="16,0,16,16" TextWrapping="Wrap"/>
+
+                                <TextBlock Grid.Row="5" Margin="16,0,16,8" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource BaseTextBlockStyle}" Text="电子邮件地址"/>
+                                <TextBox Grid.Row="6" Margin="16,0,16,16" TextWrapping="Wrap"/>
+
+                                <TextBlock Grid.Row="7" Margin="16,0,16,8" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource BaseTextBlockStyle}" Text="微信号"/>
+                                <TextBox Grid.Row="8" Margin="16,0,16,16" TextWrapping="Wrap"/>
+
+                                <TextBlock Grid.Row="9" Margin="16,0,16,8" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource BaseTextBlockStyle}" Text="QQ号"/>
+                                <TextBox Grid.Row="10" Margin="16,0,16,16" TextWrapping="Wrap"/>
+
+                                <TextBlock Grid.Row="11" Margin="16,0,16,8" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource BaseTextBlockStyle}" Text="其他联系方式"/>
+                                <TextBox Grid.Row="12" Margin="16,0,16,16" TextWrapping="Wrap"/>
                             </Grid>
                         </Grid>
                     </ScrollViewer>

ArchivesCenter4/setting.xaml

@@ -6,6 +6,7 @@
     xmlns:local="using:ArchivesCenter4"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <Grid>
@@ -91,6 +92,19 @@
                         <ColumnDefinition Width="auto"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
+                    <toolkit:SettingsCard Description="Select which app theme to display" Header="App theme">
+                        <toolkit:SettingsCard.HeaderIcon>
+                            <FontIcon Glyph="&#xE790;" />
+                        </toolkit:SettingsCard.HeaderIcon>
+                        <ComboBox
+        x:Name="themeMode"
+        AutomationProperties.AutomationId="themeModeComboBox"
+        SelectionChanged="themeMode_SelectionChanged">
+                            <ComboBoxItem Content="Light" Tag="Light" />
+                            <ComboBoxItem Content="Dark" Tag="Dark" />
+                            <ComboBoxItem Content="Use system setting" Tag="Default" />
+                        </ComboBox>
+                    </toolkit:SettingsCard>
                     <TextBlock Grid.Column="0" Text="欢迎标题" Margin="16,16,12,16" HorizontalAlignment="Center" VerticalAlignment="Center" Style="{StaticResource BodyTextBlockStyle}"/>
                     <TextBox x:Name="SwelcomeTitleBox" Grid.Column="1" Margin="0,16,16,16" VerticalAlignment="Center" HorizontalAlignment="Right" Width="200" TextChanged="SwelcomeTitleBox_TextChanged"/>
                 </Grid>