注释-多选属性面板的显示

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

@@ -140,7 +140,8 @@ namespace PDF_Master.ViewModels.Tools
         #endregion 事件绑定和解绑
 
         #region 与触发事件调用相关的函数
-        public StickyAnnotArgs GetCurrentAnnot { get; set; }
+        public StickyAnnotArgs GetCurrentAnnot { get; set; }
+
         //鼠标左键双击注释
         private void PDFViewer_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
@@ -690,7 +691,17 @@ namespace PDF_Master.ViewModels.Tools
                         //框选注释
                         PropertyPanel.annotlists = e.AnnotItemsList;
                         viewContentViewModel.IsMultiSelected = true;
-                        viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+                        //viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+                       
+
+                        #region MVP 在对多选注释做处理
+                        bool isDifferentAnnotTyle = AnnotTransfer.IsDifferentTypeAnnots(e.AnnotItemsList);
+                        if (isDifferentAnnotTyle)
+                            viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+                        else
+                            GetSelectedAnnots(e);
+                        #endregion MVP 在对多选注释做处理
+
                         if (viewContentViewModel.mainViewModel.IsBookMode)
                         {
                             ShowPropertyPanel(false);
@@ -699,14 +710,6 @@ namespace PDF_Master.ViewModels.Tools
                         {
                             ShowPropertyPanel(true);
                         }
-
-                        #region MVP 在对多选注释做处理
-                        //bool isDifferentAnnotTyle = AnnotTransfer.IsDifferentTypeAnnots(e.AnnotItemsList);
-                        //if (isDifferentAnnotTyle)
-                        //    viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
-                        //else
-                        //    GetSelectedAnnots(e);
-                        #endregion MVP 在对多选注释做处理
                     }
                 }
             }