Jelajahi Sumber

BOTA注释列表,附注换行

OYXH\oyxh 1 tahun lalu
induk
melakukan
87c3d48443
1 mengubah file dengan 8 tambahan dan 12 penghapusan
  1. 8 12
      PDF Office/Views/BOTA/AnnotationListItem.xaml.cs

+ 8 - 12
PDF Office/Views/BOTA/AnnotationListItem.xaml.cs

@@ -391,7 +391,6 @@ namespace PDF_Master.Views.BOTA
                             BtnAnnotFreeText.Visibility = Visibility.Visible;
                             //TxbContent.Foreground = new SolidColorBrush(freeTextAnnotArgs.FontColor);
                         }
-                        //BOTA - 注释,MVP不处理高亮 / 下划线 / 删除线的样式,只显示文字
                         //文本注释、便签、链接、表格不支持添加附注
                         TxbMarkupContent.Text = Regex.Replace(data.Content, "[\r\n]", " ");
                         TxbMarkupContent.Text = "";
@@ -403,11 +402,10 @@ namespace PDF_Master.Views.BOTA
                             BtnHighlight.Visibility = Visibility.Visible;
                             PathHighlight.Background = new SolidColorBrush(textHighlightAnnotArgs.Color);
                             //PathHighlight.Opacity = textHighlightAnnotArgs.Transparency;
-                            //BOTA - 注释,MVP不处理高亮 / 下划线 / 删除线的样式,只显示文字
                             //文本注释、便签、链接、表格不支持添加附注
                             //高亮、下划线、删除线,不是文本注释
                             TxbContent.Text = Regex.Replace(data.MarkupContent, "[\r\n]", " ");
-                            TxbMarkupContent.Text = Regex.Replace(data.Content, "[\r\n]", " ");
+                            TxbMarkupContent.Text = data.Content;
                         }
 
                         break;
@@ -431,7 +429,7 @@ namespace PDF_Master.Views.BOTA
                         }
                         if (string.IsNullOrEmpty(data.Content) == false)
                         {
-                            TxbMarkupContent.Text = Regex.Replace(data.Content, "[\r\n]", " ");
+                            TxbMarkupContent.Text = data.Content;
                         }
 
                         break;
@@ -468,7 +466,7 @@ namespace PDF_Master.Views.BOTA
                         {
                             TxbContent.Text = Regex.Replace(data.Content, "[\r\n]", " ");
                             TxbContent.Text = "";
-                            TxbMarkupContent.Text = Regex.Replace(data.Content, "[\r\n]", " ");
+                            TxbMarkupContent.Text = data.Content;
                         }
                         break;
 
@@ -478,12 +476,11 @@ namespace PDF_Master.Views.BOTA
                             BtnAnnotStrikeout.Visibility = Visibility.Visible;
 
                             PathStrikeoutyColor.Fill = new SolidColorBrush(textStrikeoutAnnotArgs.Color);
-                            //BOTA - 注释,MVP不处理高亮 / 下划线 / 删除线的样式,只显示文字
                             //文本注释、便签、链接、表格不支持添加附注
 
                             //高亮、下划线、删除线,不是文本注释
                             TxbContent.Text = Regex.Replace(data.MarkupContent, "[\r\n]", " ");
-                            TxbMarkupContent.Text = Regex.Replace(data.Content, "[\r\n]", " ");
+                            TxbMarkupContent.Text = data.Content;
                         }
 
                         #region to do
@@ -525,12 +522,11 @@ namespace PDF_Master.Views.BOTA
                             BtnUnderLine.Visibility = Visibility.Visible;
                             RectangleUnderline.Fill = new SolidColorBrush(textUnderlineAnnotArgs.Color);
                         }
-                        //BOTA - 注释,MVP不处理高亮 / 下划线 / 删除线的样式,只显示文字
                         //文本注释、便签、链接、表格不支持添加附注
 
                         //高亮、下划线、删除线,不是文本注释
                         TxbContent.Text = Regex.Replace(data.MarkupContent, "[\r\n]", " ");
-                        TxbMarkupContent.Text = Regex.Replace(data.Content, "[\r\n]", " ");
+                        TxbMarkupContent.Text = data.Content;
                         //TxbMarkupContent.Text = "";
 
                         #region TO DO
@@ -571,7 +567,7 @@ namespace PDF_Master.Views.BOTA
                             }
                             if (string.IsNullOrEmpty(data.Content) == false)
                             {
-                                TxbMarkupContent.Text = Regex.Replace(data.Content, "[\r\n]", " ");
+                                TxbMarkupContent.Text = data.Content;
                             }
                         }
 
@@ -592,7 +588,7 @@ namespace PDF_Master.Views.BOTA
                         }
                         if (string.IsNullOrEmpty(data.Content) == false)
                         {
-                            TxbMarkupContent.Text = Regex.Replace(data.Content, "[\r\n]", " ");
+                            TxbMarkupContent.Text = data.Content;
                         }
                         break;
 
@@ -611,7 +607,7 @@ namespace PDF_Master.Views.BOTA
                         }
                         if (string.IsNullOrEmpty(data.Content) == false)
                         {
-                            TxbMarkupContent.Text = Regex.Replace(data.Content, "[\r\n]", " ");
+                            TxbMarkupContent.Text = data.Content;
                         }
                         break;