注释-形状注释优化

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

@@ -109,6 +109,7 @@ namespace PDF_Master.ViewModels.Tools
                 //不禁止取消选中注释
                 PDFViewer.DisableClearSelectAnnot(false);
 
+                PropertyPanel.IsSharpAnnotSelected = true;
                 //PDFViewer.ClearSelectAnnots();
                 //BOTA所有列表都需要响应 单击阅读页取消多选
                 if (viewContentViewModel.OpenBOTA == true)
@@ -368,7 +369,7 @@ namespace PDF_Master.ViewModels.Tools
             if (e == null)
             {
                 //PDFViewer.DisableClearSelectAnnot(false);
-
+                PropertyPanel.IsSharpAnnotSelected = true;
                 if (string.IsNullOrWhiteSpace(StrAnnotToolChecked))
                 {
                     //PDFViewer.ClearSelectAnnots();
@@ -414,9 +415,10 @@ namespace PDF_Master.ViewModels.Tools
                         {
                             CurrentSelectedAnnot = annot;
                             //未选注释工具-形状注释，选中形状注释，属性面板不显示（矩形、圆、线、箭头）
-                            if (e.AnnotItemsList[0].EventType == AnnotArgsType.AnnotSquare ||
+                            if (StrAnnotToolChecked!= "Rect"
+                                && (e.AnnotItemsList[0].EventType == AnnotArgsType.AnnotSquare ||
                             e.AnnotItemsList[0].EventType == AnnotArgsType.AnnotCircle ||
-                             e.AnnotItemsList[0].EventType == AnnotArgsType.AnnotLine)
+                             e.AnnotItemsList[0].EventType == AnnotArgsType.AnnotLine))
                             {
                                 PropertyPanel.IsSharpAnnotSelected = false;
                             }