综合-注释列表、书签列表bug

PDF Office/ViewModels/PropertyPanel/ViewModular/ReadModeContentViewModel.cs

@@ -282,6 +282,7 @@ namespace PDF_Office.ViewModels.PropertyPanel.ViewModular
                             else if (pagenum > PDFViewer.Document.PageCount)
                             {
                                 pagenum = PDFViewer.Document.PageCount;
+                                pagenum = PDFViewer.CurrentIndex+1;
                             }
 
                             PDFViewer.GoToPage(pagenum - 1);

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

@@ -726,6 +726,11 @@ namespace PDF_Office.ViewModels.Tools
 
         #region 菜单
 
+        /// <summary>
+        /// 选择文本、图片，右键菜单
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void AnnotToolMenu_Click(object sender, RoutedEventArgs e)
         {
             if (sender is MenuItem clickMenu && clickMenu.CommandParameter is AnnotCommandArgs)

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -159,7 +159,7 @@ namespace PDF_Office.ViewModels.Tools
         }
 
         /// <summary>
-        /// 右键菜单-添加注释
+        /// 空白处-右键菜单-添加注释
         /// </summary>
         /// <param name="sender"></param>
         private void AddAnnotation_Click(object sender)
@@ -420,7 +420,7 @@ namespace PDF_Office.ViewModels.Tools
             {
                 if (item is MenuItem menuItem)
                 {
-                    menuItem.Click -= PageDisplay_Click;
+                    menuItem.Click -= ToolMode_Click;
                     menuItem.Click += ToolMode_Click;
                 }
             }
@@ -433,14 +433,14 @@ namespace PDF_Office.ViewModels.Tools
                 switch (menuItem.Tag.ToString())
                 {
                     case "default":
-                        PDFViewer.SetMouseMode(MouseModes.None);
+                        PDFViewer.SetMouseMode(MouseModes.PanTool);
                         //viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
                         BtnHandIsChecked = true;
                         ShowPropertyPanel(false);
                         break;
 
                     case "roll":
-                        PDFViewer.SetMouseMode(MouseModes.PanTool);
+                        PDFViewer.SetMouseMode(MouseModes.None);
                         //viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
                         BtnHandIsChecked = true;
                         ShowPropertyPanel(false);

PDF Office/Views/BOTA/BookmarkContent.xaml

@@ -147,7 +147,7 @@
                 VirtualizingPanel.CacheLength="1"
                 VirtualizingPanel.CacheLengthUnit="Page"
                 VirtualizingPanel.IsVirtualizing="True"
-                VirtualizingPanel.ScrollUnit="Pixel">
+                VirtualizingPanel.ScrollUnit="Pixel" SelectionChanged="BookMarkListView_SelectionChanged">
                 <ListView.ItemsPanel>
                     <ItemsPanelTemplate>
                         <VirtualizingStackPanel Margin="-5,0,0,0" Background="Transparent" />

PDF Office/Views/BOTA/BookmarkContent.xaml.cs

@@ -92,10 +92,11 @@ namespace PDF_Office.Views.BOTA
                     MenuItem rename = contextMenu.Items[0] as MenuItem;
                     MenuItem editPageIndex = contextMenu.Items[1] as MenuItem;
                     MenuItem del = contextMenu.Items[2] as MenuItem;
-                    if (BookMarkListView.SelectedItems.Count > 1)
+                    if (isSelects)
                     {
                         rename.IsEnabled = false;
                         editPageIndex.IsEnabled = false;
+                        isSelects = false;
                     }
                     else
                     {
@@ -114,6 +115,17 @@ namespace PDF_Office.Views.BOTA
             }
         }
 
+        private bool isSelects = false;
+
+        private void BookMarkListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var a1 = (sender as ListView).SelectedItems.Count;
+            if (a1 > 1)
+            {
+                isSelects = true;
+            }
+        }
+
         /// <summary>
         /// ListViewItem双击时选中状态
         /// </summary>