Browse Source

签名选中-BUG修复

liyijie 1 year ago
parent
commit
3261a9f801
1 changed files with 8 additions and 3 deletions
  1. 8 3
      PDF Office/ViewModels/FillAndSign/FillAndSignContentViewModel.cs

+ 8 - 3
PDF Office/ViewModels/FillAndSign/FillAndSignContentViewModel.cs

@@ -1525,12 +1525,13 @@ namespace PDF_Master.ViewModels.FillAndSign
 
         private void PDFViewer_AnnotEditHandler(object sender, List<AnnotEditEvent> e)
         {
-            bool isDifferen = false;
+            bool IsSign = false;
             if (e != null && e.Count > 0)
             {
+                int i = 0;
                 Dictionary<int, List<int>> selectAnnotDicts = new Dictionary<int, List<int>>();
 
-                for (int i = 0; i < e.Count; i++)
+                for ( i = 0; i < e.Count; i++)
                 {
                     AnnotEditEvent editEvent = e[i];
                     int pageindex = editEvent.PageIndex;
@@ -1576,6 +1577,7 @@ namespace PDF_Master.ViewModels.FillAndSign
                                     if (Shape == "Sign")
                                     {
                                         viewContentViewModel.AnnotSignatures.Add(new Tuple<int, int>(pageindex, annotindex));
+                                        continue;
                                     }
                                     else
                                     {
@@ -1585,6 +1587,9 @@ namespace PDF_Master.ViewModels.FillAndSign
                                 }
                                
                             }
+                            if (editEvent.EditAnnotArgs.EventType == AnnotArgsType.AnnotFreehand&&i==0) {
+                                PDFViewer.SelectAnnotation(pageindex, annotindex);
+                            }
                             //else
                             //{
                             //    foreach (var point in viewContentViewModel.FillAndSign)
@@ -1604,7 +1609,7 @@ namespace PDF_Master.ViewModels.FillAndSign
                             break;
                     }
                 }
-                if (selectAnnotDicts.Count > 1)
+                if (i>1)
                 {
                     PDFViewer.SelectAnnotation(selectAnnotDicts);
                 }