Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

PDF Office/PDF Master.csproj

@@ -2413,7 +2413,6 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="ChatGPTAI\" />
     <Folder Include="Views\Edit\" />
     <Folder Include="x64\DocumentAILib\" />
   </ItemGroup>

PDF Office/ViewModels/PageEdit/PageEditContentViewModel.cs

@@ -2944,6 +2944,7 @@ namespace PDF_Master.ViewModels.PageEdit
                 GetSourceItems(true);
 
                 // 暂时 bota 和页面编辑不联动，切换后，是重新获取数据，不会获得之前的状态
+                IsShowPageSize = false;
                 ShowedPageSize = Visibility.Visible;
                 HidePageSize = Visibility.Collapsed;
 

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Command.cs

@@ -346,15 +346,19 @@ namespace PDF_Master.ViewModels.Tools
 
                 case AnnotArgsType.AnnotFreeText:
                     //根据状态设置对应的界面
-                    if (e.IsAnnotCreateReset)
-                    {
-                        GetFreetext();
-                    }
-                    else
-                    {
-                        GetFreetext(e.AnnotItemsList);
-                    }
+                    //if (e.IsAnnotCreateReset)
+                    //{
+                    //    GetFreetext();
+                    //}
+                    //else
+                    //{
+                    //    GetFreetext(e.AnnotItemsList);
+                    //}
 
+                    //暂时不根据状态设置对应的界面，需要拿到数据
+                    //文本注释 （字体大小样式）修改属性后，点击阅读页会置原
+                    //先这样操作，若有问题再改回来
+                    GetFreetext(e.AnnotItemsList);
                     break;
 
                 case AnnotArgsType.AnnotSquare:

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Function.cs

@@ -740,7 +740,7 @@ namespace PDF_Master.ViewModels.Tools
                         defaultAnnot.BackgroundColor = Colors.White;
                         defaultAnnot.Opacity = 1;
                         defaultAnnot.FontFamily = Settings.Default.AppProperties.Annotate.TextFontFamaily;
-                        defaultAnnot.FontSize = 14;
+                        defaultAnnot.FontSize = 12;
                         defaultAnnot.TextAlign = TextAlignment.Left;
                         defaultAnnot.Thickness = 0;
                         defaultAnnot.NoteText = string.Empty;