注释-重复添加图行

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

@@ -298,8 +298,8 @@ namespace PDF_Master.ViewModels.Tools
                     annotArgs = GetArrowLine(tag);
                     break;
 
-                case "Stamp"://图章
-                             //付费锁
+                case "Stamp"://图章
+                             //付费锁
                     if (!App.IsLogin)
                     {
                         dialogs.ShowDialog(DialogNames.IAPCompareDialog);
@@ -313,8 +313,8 @@ namespace PDF_Master.ViewModels.Tools
                     annotArgs = GetImage();
                     break;
 
-                case "Signature"://签名
-                                 //付费锁
+                case "Signature"://签名
+                                 //付费锁
                     if (!App.IsLogin)
                     {
                         dialogs.ShowDialog(DialogNames.IAPCompareDialog);
@@ -324,8 +324,8 @@ namespace PDF_Master.ViewModels.Tools
                     PDFViewer.SetMouseMode(MouseModes.PanTool);//清空其他注释
                     break;
 
-                case "Link"://链接
-                            //付费锁
+                case "Link"://链接
+                            //付费锁
                     if (!App.IsLogin)
                     {
                         dialogs.ShowDialog(DialogNames.IAPCompareDialog);
@@ -423,8 +423,7 @@ namespace PDF_Master.ViewModels.Tools
                             //viewContentViewModel.IsPropertyOpen = true;
                             //return linkArgs;
                         }
-                    }
-
+                    }
                 }
             }
             AddToPropertyPanel("LinkAnnotProperty", "Link", selectedArgs, annotAttribEvent);
@@ -938,8 +937,7 @@ namespace PDF_Master.ViewModels.Tools
                         defaultAnnot.NoteText = string.Empty;
                         defaultAnnot.Opacity = 1;
                         SettingHelper.SetAnnotDefaultProperty(defaultAnnot);
-                        Settings.Default.Save();
-                       
+                        Settings.Default.Save();
                     }
 
                     stickyAnnotArgs.Transparency = defaultAnnot.Opacity;
@@ -957,7 +955,6 @@ namespace PDF_Master.ViewModels.Tools
 
                 if (stickyAnnotArgs != null)
                 {
-                    
                     selectedArgs = new List<AnnotHandlerEventArgs>();
                     selectedArgs.Add(stickyAnnotArgs);
                 }
@@ -1047,14 +1044,16 @@ namespace PDF_Master.ViewModels.Tools
                 if (squareArgs != null)
                 {
                     selectedArgs = new List<AnnotHandlerEventArgs>();
-                    selectedArgs.Add(squareArgs);
-                    //CreateAnnotFromSelectPageText(squareArgs);
-                    AnnotHandlerEventArgs annotHandler = CreateAnnotFromSelectPageText(squareArgs);
-                    if (annotHandler is SquareAnnotArgs annotArgs)
-                    {
-                        selectedArgs.Clear();
-                        selectedArgs.Add(annotArgs);
-                        PropertyPanel.IsSelectedTextAddShape = true;
+                    selectedArgs.Add(squareArgs);
+                    if (StrAnnotToolChecked == "Rect")
+                    {
+                        AnnotHandlerEventArgs annotHandler = CreateAnnotFromSelectPageText(squareArgs);
+                        if (annotHandler is SquareAnnotArgs annotArgs)
+                        {
+                            selectedArgs.Clear();
+                            selectedArgs.Add(annotArgs);
+                            PropertyPanel.IsSelectedTextAddShape = true;
+                        }
                     }
                 }
             }
@@ -1142,13 +1141,16 @@ namespace PDF_Master.ViewModels.Tools
                 {
                     selectedArgs = new List<AnnotHandlerEventArgs>();
                     selectedArgs.Add(circleAnnotArgs);
-                    AnnotHandlerEventArgs annotHandler = CreateAnnotFromSelectPageText(circleAnnotArgs);
-                    if (annotHandler is CircleAnnotArgs annotArgs)
-                    {
-                        selectedArgs.Clear();
-                        selectedArgs.Add(annotArgs);
-                        PropertyPanel.IsSelectedTextAddShape = true;
-                    }
+                    if (StrAnnotToolChecked == "Rect")
+                    {
+                        AnnotHandlerEventArgs annotHandler = CreateAnnotFromSelectPageText(circleAnnotArgs);
+                        if (annotHandler is CircleAnnotArgs annotArgs)
+                        {
+                            selectedArgs.Clear();
+                            selectedArgs.Add(annotArgs);
+                            PropertyPanel.IsSelectedTextAddShape = true;
+                        }
+                    }
                 }
             }
             else