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

PDF Office/ViewModels/PropertyPanel/AnnotPanel/StampAnnotPropertyViewModel.cs

@@ -300,6 +300,7 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
                 Args.ImageWidth = stamp.ImageSource.PixelWidth;
             }
             Args.Type = stamp.Type;
+            PDFViewer.ClearSelectAnnots();
             PDFViewer.SetMouseMode(MouseModes.AnnotCreate);
             PDFViewer.SetToolParam(Args);
         }

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

@@ -1191,14 +1191,16 @@ namespace PDF_Master.ViewModels.Tools
                 IsPasteShape = false;
                 if (isMultiple && selectAnnotDicts.Count >= 1)
                 {
+                    PDFViewer.DisableClearSelectAnnot(false);
                     PDFViewer.ClearSelectAnnots();
 
                     if (StrAnnotToolChecked != "Signature")
                     {
-                        PDFViewer.DisableClearSelectAnnot(false);
+                        PDFViewer.DisableClearSelectAnnot(true);
                         PDFViewer.SelectAnnotation(selectAnnotDicts);
                         //禁止取消选中注释
-                        PDFViewer.DisableClearSelectAnnot(true);
+                        PDFViewer.DisableClearSelectAnnot(false);
+
                     }
                 }
                 //MultipleSelectionAnnot(e);