Benjamin sisko 2 months ago
parent
commit
c011b8e4b9

+ 0 - 14
ArchivesCenter4/ArchivesCenter4.csproj

@@ -17,10 +17,8 @@
   <ItemGroup>
   <ItemGroup>
     <None Remove="account.xaml" />
     <None Remove="account.xaml" />
     <None Remove="backup.xaml" />
     <None Remove="backup.xaml" />
-    <None Remove="help.xaml" />
     <None Remove="log.xaml" />
     <None Remove="log.xaml" />
     <None Remove="people.xaml" />
     <None Remove="people.xaml" />
-    <None Remove="search.xaml" />
     <None Remove="setting.xaml" />
     <None Remove="setting.xaml" />
     <None Remove="sfl.xaml" />
     <None Remove="sfl.xaml" />
     <None Remove="sfp.xaml" />
     <None Remove="sfp.xaml" />
@@ -86,12 +84,6 @@
     </Page>
     </Page>
   </ItemGroup>
   </ItemGroup>
 
 
-  <ItemGroup>
-    <Page Update="help.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-
   <ItemGroup>
   <ItemGroup>
     <Page Update="log.xaml">
     <Page Update="log.xaml">
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>
@@ -104,12 +96,6 @@
     </Page>
     </Page>
   </ItemGroup>
   </ItemGroup>
 
 
-  <ItemGroup>
-    <Page Update="search.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-
   <ItemGroup>
   <ItemGroup>
     <Page Update="start.xaml">
     <Page Update="start.xaml">
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>

+ 0 - 1
ArchivesCenter4/MainWindow.xaml

@@ -40,7 +40,6 @@
             <NavigationView.FooterMenuItems>
             <NavigationView.FooterMenuItems>
                 <NavigationViewItem Content="账户" Icon="Contact" />
                 <NavigationViewItem Content="账户" Icon="Contact" />
                 <NavigationViewItem Content="备份" Icon="Clock" />
                 <NavigationViewItem Content="备份" Icon="Clock" />
-                <NavigationViewItem Content="帮助" Icon="Help" />
                 <NavigationViewItem Content="设置" Icon="Setting" />
                 <NavigationViewItem Content="设置" Icon="Setting" />
             </NavigationView.FooterMenuItems>
             </NavigationView.FooterMenuItems>
             <Frame x:Name="contentFrame"/>
             <Frame x:Name="contentFrame"/>

+ 0 - 8
ArchivesCenter4/MainWindow.xaml.cs

@@ -34,11 +34,6 @@ namespace ArchivesCenter4
             this.AppWindow.SetIcon("ms-appx:///Assets/icons8_omnichannel.ico");
             this.AppWindow.SetIcon("ms-appx:///Assets/icons8_omnichannel.ico");
         }
         }
 
 
-        private start start = null;
-        private search search = null;
-        private people people = null;
-        private log log = null;
-
         private async void nvSample_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
         private async void nvSample_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
         {
         {
             var selecteditem = (NavigationViewItem)args.SelectedItem;
             var selecteditem = (NavigationViewItem)args.SelectedItem;
@@ -66,9 +61,6 @@ namespace ArchivesCenter4
                 case "±¸·Ý":
                 case "±¸·Ý":
                     contentFrame.Navigate(typeof(backup), null, new EntranceNavigationTransitionInfo());
                     contentFrame.Navigate(typeof(backup), null, new EntranceNavigationTransitionInfo());
                     break;
                     break;
-                case "°ïÖú":
-                    contentFrame.Navigate(typeof(help), null, new EntranceNavigationTransitionInfo());
-                    break;
                 case "ÉèÖÃ":
                 case "ÉèÖÃ":
                     contentFrame.Navigate(typeof(setting), null, new EntranceNavigationTransitionInfo());
                     contentFrame.Navigate(typeof(setting), null, new EntranceNavigationTransitionInfo());
                     break;
                     break;

+ 0 - 15
ArchivesCenter4/help.xaml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Page
-    x:Class="ArchivesCenter4.help"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:ArchivesCenter4"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-    <Grid>
-
-    </Grid>
-</Page>

+ 0 - 31
ArchivesCenter4/help.xaml.cs

@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace ArchivesCenter4
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class help : Page
-    {
-        public help()
-        {
-            this.InitializeComponent();
-        }
-    }
-}

+ 2 - 2
ArchivesCenter4/people.xaml

@@ -83,10 +83,10 @@
                                 </Grid.RowDefinitions>
                                 </Grid.RowDefinitions>
                                 <TextBlock Grid.Row="0" Margin="16,16,12,16" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource SubtitleTextBlockStyle}" Text="基本信息"/>
                                 <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="姓名" TextWrapping="Wrap"/>
+                                <TextBlock Grid.Row="1" x:Name="PName" Margin="16,0,16,8" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource BaseTextBlockStyle}" Text="姓名" TextWrapping="Wrap"/>
                                 <TextBox Grid.Row="2" Margin="16,0,16,16"/>
                                 <TextBox Grid.Row="2" Margin="16,0,16,16"/>
 
 
-                                <TextBlock Grid.Row="3" Margin="16,0,16,8" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource BaseTextBlockStyle}" Text="性别"/>
+                                <TextBlock Grid.Row="3" x:Name="PGender" Margin="16,0,16,8" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource BaseTextBlockStyle}" Text="性别"/>
                                 <ComboBox Grid.Row="4" Margin="16,0,16,16" MinWidth="150">
                                 <ComboBox Grid.Row="4" Margin="16,0,16,16" MinWidth="150">
                                     <ComboBoxItem Content="男"/>
                                     <ComboBoxItem Content="男"/>
                                     <ComboBoxItem Content="女"/>
                                     <ComboBoxItem Content="女"/>

+ 0 - 15
ArchivesCenter4/search.xaml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Page
-    x:Class="ArchivesCenter4.search"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:ArchivesCenter4"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-    <Grid>
-
-    </Grid>
-</Page>

+ 0 - 31
ArchivesCenter4/search.xaml.cs

@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace ArchivesCenter4
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class search : Page
-    {
-        public search()
-        {
-            this.InitializeComponent();
-        }
-    }
-}

+ 38 - 4
ArchivesCenter4/setting.xaml

@@ -32,9 +32,15 @@
                     <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>
                 </Grid.RowDefinitions>
                 
                 
-                <TextBlock Grid.Row="0" Text="账户" HorizontalAlignment="Left" Style="{StaticResource BodyStrongTextBlockStyle}" Margin="36,0,0,8"/>
+                <TextBlock Grid.Row="0" Text="账户" HorizontalAlignment="Left" Style="{StaticResource BodyStrongTextBlockStyle}" Margin="36,16,0,8"/>
                 <Grid Grid.Row="1" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="36,0,36,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
                 <Grid Grid.Row="1" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="36,0,36,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
                     <Grid.ColumnDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto"/>
                         <ColumnDefinition Width="auto"/>
@@ -58,7 +64,7 @@
                     <InfoBar Grid.Row="1" Grid.ColumnSpan="3" IsOpen="True" Severity="Warning" Title="注意!" Message="请谨慎修改用户账户密码,以免丢失账户所有权。" Margin="16,0,16,16" IsClosable="False"/>
                     <InfoBar Grid.Row="1" Grid.ColumnSpan="3" IsOpen="True" Severity="Warning" Title="注意!" Message="请谨慎修改用户账户密码,以免丢失账户所有权。" Margin="16,0,16,16" IsClosable="False"/>
                 </Grid>
                 </Grid>
                 
                 
-                <TextBlock Grid.Row="3" Text="数据库" HorizontalAlignment="Left" Style="{StaticResource BodyStrongTextBlockStyle}" Margin="36,0,0,8"/>
+                <TextBlock Grid.Row="3" Text="数据库" HorizontalAlignment="Left" Style="{StaticResource BodyStrongTextBlockStyle}" Margin="36,16,0,8"/>
                 <Grid Grid.Row="4" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="36,0,36,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
                 <Grid Grid.Row="4" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="36,0,36,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
                     <Grid.ColumnDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto"/>
                         <ColumnDefinition Width="auto"/>
@@ -90,7 +96,7 @@
                     <InfoBar Grid.Row="1" Grid.ColumnSpan="3" IsOpen="True" Severity="Warning" Title="注意!" Message="请谨慎修改数据库密码。" Margin="16,0,16,16" IsClosable="False"/>
                     <InfoBar Grid.Row="1" Grid.ColumnSpan="3" IsOpen="True" Severity="Warning" Title="注意!" Message="请谨慎修改数据库密码。" Margin="16,0,16,16" IsClosable="False"/>
                 </Grid>
                 </Grid>
 
 
-                <TextBlock Grid.Row="7" Text="外观" HorizontalAlignment="Left" Style="{StaticResource BodyStrongTextBlockStyle}" Margin="36,0,0,8"/>
+                <TextBlock Grid.Row="7" Text="外观" HorizontalAlignment="Left" Style="{StaticResource BodyStrongTextBlockStyle}" Margin="36,16,0,8"/>
                 <Grid Grid.Row="8" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="36,0,36,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
                 <Grid Grid.Row="8" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="36,0,36,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
                     <Grid.ColumnDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto"/>
                         <ColumnDefinition Width="auto"/>
@@ -100,7 +106,7 @@
                     <TextBox x:Name="SwelcomeTitleBox" Grid.Column="1" Margin="0,16,16,16" VerticalAlignment="Center" HorizontalAlignment="Right" Width="200" TextChanged="SwelcomeTitleBox_TextChanged"/>
                     <TextBox x:Name="SwelcomeTitleBox" Grid.Column="1" Margin="0,16,16,16" VerticalAlignment="Center" HorizontalAlignment="Right" Width="200" TextChanged="SwelcomeTitleBox_TextChanged"/>
                 </Grid>
                 </Grid>
 
 
-                <TextBlock Grid.Row="9" Text="候选项" HorizontalAlignment="Left" Style="{StaticResource BodyStrongTextBlockStyle}" Margin="36,0,0,8"/>
+                <TextBlock Grid.Row="9" Text="候选项" HorizontalAlignment="Left" Style="{StaticResource BodyStrongTextBlockStyle}" Margin="36,16,0,8"/>
                 
                 
                 <Grid Grid.Row="10" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="36,0,36,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
                 <Grid Grid.Row="10" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="36,0,36,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
                     <Grid.ColumnDefinitions>
                     <Grid.ColumnDefinitions>
@@ -137,6 +143,34 @@
                     <TextBlock Grid.Column="0" Text="“籍贯”候选项" Margin="16,16,12,16" HorizontalAlignment="Center" VerticalAlignment="Center" Style="{StaticResource BodyTextBlockStyle}"/>
                     <TextBlock Grid.Column="0" Text="“籍贯”候选项" Margin="16,16,12,16" HorizontalAlignment="Center" VerticalAlignment="Center" Style="{StaticResource BodyTextBlockStyle}"/>
                     <TextBox x:Name="SbPBox" Grid.Column="1" Margin="0,16,16,16" TextWrapping="Wrap" AcceptsReturn="True" HorizontalAlignment="Right" Width="400" TextChanged="SbPBox_TextChanged"/>
                     <TextBox x:Name="SbPBox" Grid.Column="1" Margin="0,16,16,16" TextWrapping="Wrap" AcceptsReturn="True" HorizontalAlignment="Right" Width="400" TextChanged="SbPBox_TextChanged"/>
                 </Grid>
                 </Grid>
+
+                <TextBlock Grid.Row="14" Text="帮助" HorizontalAlignment="Left" Style="{StaticResource BodyStrongTextBlockStyle}" Margin="36,16,0,8"/>
+                <Grid Grid.Row="15" Margin="36,0,36,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition Width="auto"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                    </Grid.RowDefinitions>
+                    <FontIcon Grid.Column="0" Grid.Row="0" Glyph="&#xE71B;" />
+                    <HyperlinkButton Grid.Column="1" Grid.Row="0" Content="LYKNS 官网" NavigateUri="https://www.lykns.com.cn/"/>
+                    <FontIcon Grid.Column="0" Grid.Row="1" Glyph="&#xE71B;" />
+                    <HyperlinkButton Grid.Column="1" Grid.Row="1" Content="LYKNS 开发人员网络" NavigateUri="https://www.lykns.com.cn/dev/"/>
+                    <FontIcon Grid.Column="0" Grid.Row="2" Glyph="&#xE71B;" />
+                    <HyperlinkButton Grid.Column="1" Grid.Row="2" Content="Archives Center 4 开源页面" NavigateUri="https://dev.lykns.com.cn/CaptB/ArchivesCenter4"/>
+                    <FontIcon Grid.Column="0" Grid.Row="3" Glyph="&#xE71B;" />
+                    <HyperlinkButton Grid.Column="1" Grid.Row="3" Content="LYKNS 支持" NavigateUri="https://survey.lykns.com.cn/s/z1saEu"/>
+                </Grid>
+
+                <TextBlock Grid.Row="16" Text="关于此应用" HorizontalAlignment="Left" Style="{StaticResource BodyStrongTextBlockStyle}" Margin="36,16,0,8"/>
+                <TextBlock Grid.Row="17" Text="LYKNS Archives Center 4.8.9.5" Style="{StaticResource BodyTextBlockStyle}" Margin="36,0,0,0"/>
+                <TextBlock Grid.Row="18" Text="© 2025 LYKNS 开发人员网络. 保留部分权利." Style="{StaticResource BodyTextBlockStyle}" Margin="36,0,0,0"/>
+                <HyperlinkButton Grid.Row="19" Content="LYKNS 隐私政策" NavigateUri="https://www.lykns.com.cn/help/privacy-policy/" Margin="36,0,0,0"/>
+                <HyperlinkButton Grid.Row="20" Content="LYKNS 软件许可条款" NavigateUri="lhttps://www.lykns.com.cn/help/软件许可条款/" Margin="36,0,0,36"/>
             </Grid>
             </Grid>
         </ScrollViewer>
         </ScrollViewer>
     </Grid>
     </Grid>