소스 검색

页面编辑-优化 显示页码文案、输入框 逻辑

OYXH\oyxh 1 년 전
부모
커밋
65499493c8
2개의 변경된 파일6개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      PDF Office/Model/PageEdit/PageEditItem.cs
  2. 5 0
      PDF Office/ViewModels/PageEdit/PageEditContentViewModel.cs

+ 1 - 1
PDF Office/Model/PageEdit/PageEditItem.cs

@@ -60,7 +60,7 @@ namespace PDF_Master.Model.PageEdit
                 //再设置Size时 同步更新文件尺寸大小,以及设置页面方向
                 double width = CommonHelper.GetUnitsFromPageSize(value.Width);
                 double height = CommonHelper.GetUnitsFromPageSize(value.Height);
-                this.PageSize = $"{width.ToString("F0")}mm*{height.ToString("F0")} mm";
+                this.PageSize = $"{width.ToString("F0")}x{height.ToString("F0")}mm";
 
                 if (value.Width < value.Height)
                 {

+ 5 - 0
PDF Office/ViewModels/PageEdit/PageEditContentViewModel.cs

@@ -1359,6 +1359,8 @@ namespace PDF_Master.ViewModels.PageEdit
                 var result = CommonHelper.GetPagesInRange(ref TargetPageIndexs, (args.OriginalSource as TextBox).Text, PDFViewer.Document.PageCount, new char[] { ',', ',' }, new char[] { '-' });
                 if (!result)
                 {
+                    ListSelectedIndex = -1;
+                    TbPageRange = string.Empty;
                     AlertsMessage alertsMessage = new AlertsMessage();
                     alertsMessage.ShowDialog("", App.MainPageLoader.GetString("PageRangeWarning"), App.ServiceLoader.GetString("Text_ok"));
                     return;
@@ -1400,8 +1402,11 @@ namespace PDF_Master.ViewModels.PageEdit
             var result = CommonHelper.GetPagesInRange(ref TargetPageIndexs, (args.OriginalSource as TextBox).Text, PDFViewer.Document.PageCount, new char[] { ',', ',' }, new char[] { '-' });
             if (!result)
             {
+                ListSelectedIndex = -1;
+                TbPageRange = string.Empty;
                 AlertsMessage alertsMessage = new AlertsMessage();
                 alertsMessage.ShowDialog("", App.MainPageLoader.GetString("PageRangeWarning"), App.ServiceLoader.GetString("Text_ok"));
+              
                 return;
             }