Browse Source

注释-已选中注释工具的前提下,选中页面已经添加的图章注释时,右侧属性面板显示空状态(不自动收起)

OYXH\oyxh 1 year ago
parent
commit
407b9e8345

+ 6 - 0
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Command.cs

@@ -157,6 +157,12 @@ namespace PDF_Master.ViewModels.Tools
                 //PropertyPanel.IsSharpAnnotSelected = true;
                 //PropertyPanel.IsFreeHandSelected = true;
                 //PDFViewer.ClearSelectAnnots();
+
+                if(StrAnnotToolChecked== "Stamp")
+                {
+                    GetStamp();
+                    //PDFViewer.SetMouseMode(MouseModes.None);
+                }
                 //BOTA所有列表都需要响应 单击阅读页取消多选
                 if (viewContentViewModel.OpenBOTA == true)
                 {

+ 9 - 1
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Function.cs

@@ -1329,7 +1329,7 @@ namespace PDF_Master.ViewModels.Tools
             if (stampAnnotArgs != null)
                 stampAnnotArgsList.Add(stampAnnotArgs);
 
-            if (string.IsNullOrEmpty(StrAnnotToolChecked) || StrAnnotToolChecked != "Stamp")
+            if (string.IsNullOrEmpty(StrAnnotToolChecked))
             {
                 if (IsNoSelectMenu)
                 {
@@ -1337,8 +1337,16 @@ namespace PDF_Master.ViewModels.Tools
                     return stampAnnotArgs;
                 }
                 viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+                
                 return stampAnnotArgs;
             }
+            //已选中注释工具的前提下,选中页面已经添加的图章注释时,右侧属性面板显示空状态(不自动收起)
+            if (StrAnnotToolChecked != "Stamp" && string.IsNullOrEmpty(StrAnnotToolChecked)==false)
+            {
+                viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+                ShowPropertyPanel(true);
+                return stampAnnotArgs;
+            }
             AddToPropertyPanel("StampAnnotProperty", null, stampAnnotArgsList);
             return stampAnnotArgs;
         }