填写与签名-Bug

PDF Office/ViewModels/FillAndSign/FillAndSignContentViewModel.cs

@@ -58,7 +58,7 @@ namespace PDF_Office.ViewModels.FillAndSign
     public class FillAndSignContentViewModel : BindableBase, INavigationAware
     {
         #region 
-        private CPDFViewer PDFViewer;
+        public CPDFViewer PDFViewer;
         private AnnotPropertyPanel propertyPanel = new AnnotPropertyPanel();
         private ViewContentViewModel viewContentViewModel;
         private bool isRightMenuAddAnnot = false;
@@ -94,7 +94,7 @@ namespace PDF_Office.ViewModels.FillAndSign
 
         public DelegateCommand<object> FreeTextAglin_MenuCommand { get; set; }
         #region Command
-        public DelegateCommand<RoutedEventArgs> CheckCommand { get; set; }
+        public DelegateCommand<object> CheckCommand { get; set; }
 
         /// <summary>
         /// 按钮名称和属性面板映射字典
@@ -111,7 +111,7 @@ namespace PDF_Office.ViewModels.FillAndSign
             regions = regionManager;
             this.events = events;
             Unicode = App.mainWindowViewModel.SelectedItem.Unicode;
-            CheckCommand = new DelegateCommand<RoutedEventArgs>(CheckedEvent);
+            CheckCommand = new DelegateCommand<object>(CheckedEvent);
             ToolExpandDict.Add("Freetext", AnnotArgsType.AnnotFreeText);
             InitDictionary();
             AnnotDefaultValue_MenuCommand = new DelegateCommand<object>(AnnotDefaultValues_Menu);
@@ -387,10 +387,10 @@ namespace PDF_Office.ViewModels.FillAndSign
             }
             return Annot;
         }
-        private void CheckedEvent(RoutedEventArgs e)
+        private void CheckedEvent(object e)
         {
 
-            var control = e.OriginalSource as Control;
+            var control = e as Control;
         
             IsEdit = false;
             

PDF Office/Views/FillAndSign/FillAndSignContent.xaml.cs

@@ -1,4 +1,7 @@
-using System;
+using ComPDFKitViewer.PdfViewer;
+using PDF_Office.ViewModels.Dialog.ConverterDialogs;
+using PDF_Office.ViewModels.FillAndSign;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -25,11 +28,15 @@ namespace PDF_Office.Views.FillAndSign
             InitializeComponent();
         }
 
-        private void RbtnTick_Click(object sender, RoutedEventArgs e)
+
+        private void RbtnTick_Click(object sender, MouseButtonEventArgs e)
         {
             var a = sender as RadioButton;
-            if (a.IsChecked == true) {
+            if (a.IsChecked == true)
+            {
                 a.IsChecked = false;
+                ((FillAndSignContentViewModel)this.DataContext).PDFViewer.SetMouseMode(MouseModes.PanTool);
+                e.Handled = true;
             }
             else { a.IsChecked = true; }
         }