فهرست منبع

页面编辑-显示页面大小 优化更改

OYXH\oyxh 1 سال پیش
والد
کامیت
403695d726
2فایلهای تغییر یافته به همراه26 افزوده شده و 10 حذف شده
  1. 16 5
      PDF Office/ViewModels/PageEdit/PageEditContentViewModel.cs
  2. 10 5
      PDF Office/Views/PageEdit/PageEditContent.xaml.cs

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

@@ -383,6 +383,7 @@ namespace PDF_Master.ViewModels.PageEdit
         /// </summary>
         private bool IsSelectFormSelf = false;
 
+        public bool IsShowPageSize = false;
         public string Txt = Properties.Resources.txtex;
         public string Word = Properties.Resources.wordex;
         public string Ppt = Properties.Resources.pptex;
@@ -2421,7 +2422,7 @@ namespace PDF_Master.ViewModels.PageEdit
             for (int i = 0; i < PageEditItems.Count; i++)
             {
                 PageEditItems[i].PageNumber = i + 1;
-                PageEditItems[i].ShowPageSize = ShowedPageSize == Visibility.Collapsed ? true : false;
+                PageEditItems[i].ShowPageSize = IsShowPageSize;
                 if (IsBOTAThumb == Visibility.Visible)
                 {
                     PageEditItems[i].FontSize = 12;
@@ -2545,19 +2546,20 @@ namespace PDF_Master.ViewModels.PageEdit
         /// <param name="show">是或否</param>
         private void ShowPageSize()
         {
-            bool show = true;
             if (ShowedPageSize == Visibility.Visible)
             {
-                show = true;
+                IsShowPageSize = true;
                 ShowedPageSize = Visibility.Collapsed;
                 HidePageSize = Visibility.Visible;
             }
             else
             {
-                show = false;
+                IsShowPageSize = false;
                 HidePageSize = Visibility.Collapsed;
                 ShowedPageSize = Visibility.Visible;
             }
+            ListSelectedIndex = -1;
+            selectedPageList.Clear();
             RefreshPageNum();
             //for (int i = 0; i < PageEditItems.Count; i++)
             //{
@@ -2899,7 +2901,16 @@ namespace PDF_Master.ViewModels.PageEdit
                     //NotifyUIToRefresh();
                 }
 
-                ShowedPageSize = Visibility.Visible;
+                if (IsShowPageSize)
+                {
+                    ShowedPageSize = Visibility.Visible;
+                    HidePageSize = Visibility.Collapsed;
+                }
+                else
+                {
+                    ShowedPageSize = Visibility.Collapsed;
+                    HidePageSize = Visibility.Visible;
+                }
 
                 //每次进入页面编辑都刷新item个数,缩略图删减时,可以更新item
                 //需要留意大文档性能

+ 10 - 5
PDF Office/Views/PageEdit/PageEditContent.xaml.cs

@@ -141,18 +141,23 @@ namespace PDF_Master.Views.PageEdit
             //加入loaded判断,避免显示前频繁进入该事件,影响BOTA切换事件
             if (this.IsLoaded)
             {
-                viewModel.ShowedPageSize = Visibility.Visible;
-                viewModel.HidePageSize = Visibility.Collapsed;
-
+                if (viewModel.IsShowPageSize)
+                {
+                    viewModel.ShowedPageSize = Visibility.Visible;
+                    viewModel.HidePageSize = Visibility.Collapsed;
+                }
+                else
+                {
+                    viewModel.ShowedPageSize = Visibility.Collapsed;
+                    viewModel.HidePageSize = Visibility.Visible;
+                }
                 //BOTA缩略图里 插入子项时,刷新子项大小
                 if (GridBOTAHeader.Visibility == Visibility.Visible && e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add)
                 {
-                  
                     ItemSuitAcutalWidth(this.ActualWidth);
                 }
                 if (GridBOTAHeader.Visibility != Visibility.Visible)
                 {
-                   
                     //页面编辑模式下,页面总数变化后用于通知BOTA面板进行数据集刷新
                     //只需要页面编辑通知缩略图,不需要缩略图通知页面编辑,因为现在每次导航进去时都会刷新item个数
                     eventor.GetEvent<PageEditNotifyEvent>().Publish(new PageEditNotifyEventArgs(unicode, NotifyType.PageCountChanged));