Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterCSVDialogViewModel.cs

@@ -110,7 +110,9 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         public DelegateCommand<object> CmbPageTextChanged { get; set; }
 
-        public DelegateCommand<object> SetCustomPageRangeCommand { get; set; }
+        public DelegateCommand SetCustomPageRangeCommand { get; set; }
+
+        
 
         public DelegateCommand BatchConverterCommand { get; set; }
 
@@ -124,12 +126,41 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             RadioButtonCommand = new DelegateCommand<string>(radiobutton);
             CmbPageSelectionChanged = new DelegateCommand<object>(CmbPageSelectionChangedEvent);
             CmbPageTextChanged = new DelegateCommand<object>(CmbPageTextChangedEvent);
+            SetCustomPageRangeCommand = new DelegateCommand(SetCustomPageRange);
             BatchConverterCommand = new DelegateCommand(BatchConverter);
             dialogs = dialogService;
         }
 
         #region 逻辑函数
 
+        public void SetCustomPageRange()
+        {
+            if (PageRangeSelectIndex=="4")
+            {
+                
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "","确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+                   
+                }
+            }
+        }
+
         private void CmbPageSelectionChangedEvent(object e)
         {
             ///这里采用的是将预览UI控件传递过来的方式，为下下策
@@ -223,6 +254,30 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         private  void converter()
         {
+            if (PageRangeSelectIndex == "4")
+            {
+
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+
+                }
+            }
             if (ConverterCSVModel.IsCustomFileName) 
             {
                 System.Windows.Forms.SaveFileDialog sfd = new System.Windows.Forms.SaveFileDialog();

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterExcelDialogViewModel.cs

@@ -111,6 +111,8 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         public DelegateCommand BatchConverterCommand { get; set; }
 
+        public DelegateCommand SetCustomPageRangeCommand { get; set; }
+
         #endregion
 
         public ConverterExcelDialogViewModel(IDialogService dialogService)
@@ -118,12 +120,41 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             CancelCommand = new DelegateCommand(cancel);
             ConverterCommnad = new DelegateCommand(converter);
             RadioButtonCommand = new DelegateCommand<string>(radiobutton);
+            SetCustomPageRangeCommand = new DelegateCommand(SetCustomPageRange);
             CmbPageSelectionChanged = new DelegateCommand<object>(CmbPageSelectionChangedEvent);
             CmbPageTextChanged = new DelegateCommand<object>(CmbPageTextChangedEvent);
             BatchConverterCommand = new DelegateCommand(BatchConverter);
             dialogs = dialogService;
         }
         #region 逻辑函数
+
+        public void SetCustomPageRange()
+        {
+            if (PageRangeSelectIndex == "4")
+            {
+
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+
+                }
+            }
+        }
         private void cancel()
         {
             RequestClose.Invoke(new DialogResult(ButtonResult.Cancel));
@@ -131,6 +162,30 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         private void converter()
         {
+            if (PageRangeSelectIndex == "4")
+            {
+
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+
+                }
+            }
             System.Windows.Forms.SaveFileDialog sfd = new System.Windows.Forms.SaveFileDialog();
             /*
              *设置这个对话框的起始保存路径

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterHTMLDialogViewModel.cs

@@ -125,6 +125,8 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         public DelegateCommand<object> CmbPageTextChanged { get; set; }
 
+        public DelegateCommand SetCustomPageRangeCommand { get; set; }
+
         public DelegateCommand BatchConverterCommand { get; set; }
         #endregion
 
@@ -135,11 +137,40 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             ConverterCommnad = new DelegateCommand(converter);
             CmbPageSelectionChanged = new DelegateCommand<object>(CmbPageSelectionChangedEvent);
             CmbPageTextChanged = new DelegateCommand<object>(CmbPageTextChangedEvent);
+            SetCustomPageRangeCommand = new DelegateCommand(SetCustomPageRange);
             BatchConverterCommand = new DelegateCommand(BatchConverter);
             dialogs = dialogService;
 
         }
         #region 逻辑函数
+        public void SetCustomPageRange()
+        {
+            if (PageRangeSelectIndex == "4")
+            {
+
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+
+                }
+            }
+        }
+
         private void cancel()
         {
             RequestClose.Invoke(new DialogResult(ButtonResult.Cancel));
@@ -147,7 +178,30 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         private void converter()
         {
+            if (PageRangeSelectIndex == "4")
+            {
+
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
 
+                }
+            }
             System.Windows.Forms.SaveFileDialog sfd = new System.Windows.Forms.SaveFileDialog();
             /*
              *设置这个对话框的起始保存路径

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterImgDialogViewModel.cs

@@ -161,6 +161,8 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         public DelegateCommand<object> CmbPageTextChanged { get; set; }
 
+        public DelegateCommand SetCustomPageRangeCommand { get; set; }
+
         public DelegateCommand BatchConverterCommand { get; set; }
         
         #endregion
@@ -172,6 +174,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             ConverterCommnad = new DelegateCommand(converter);
             CmbPageSelectionChanged = new DelegateCommand<object>(CmbPageSelectionChangedEvent);
             CmbPageTextChanged = new DelegateCommand<object>(CmbPageTextChangedEvent);
+            SetCustomPageRangeCommand = new DelegateCommand(SetCustomPageRange);
             BatchConverterCommand = new DelegateCommand(BatchConverter);
             SetImageTypeOrigin();
             SetImageDPIOrigin();
@@ -179,6 +182,34 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
         }
 
         #region 逻辑函数
+
+        public void SetCustomPageRange()
+        {
+            if (PageRangeSelectIndex == "4")
+            {
+
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+
+                }
+            }
+        }
         /// <summary>
         /// 根据下拉框选项，选择不同的图片类型
         /// </summary>
@@ -258,7 +289,30 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         private void converter()
         {
+            if (PageRangeSelectIndex == "4")
+            {
 
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+
+                }
+            }
             FolderBrowserDialog dlg = new FolderBrowserDialog();
             if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterPPTDialogViewModel.cs

@@ -126,6 +126,8 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         public DelegateCommand<object> CmbPageTextChanged { get; set; }
 
+        public DelegateCommand SetCustomPageRangeCommand { get; set; }
+
         public DelegateCommand BatchConverterCommand { get; set; }
         #endregion
 
@@ -135,11 +137,41 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             ConverterCommnad = new DelegateCommand(converter);
             CmbPageSelectionChanged = new DelegateCommand<object>(CmbPageSelectionChangedEvent);
             CmbPageTextChanged = new DelegateCommand<object>(CmbPageTextChangedEvent);
+            SetCustomPageRangeCommand = new DelegateCommand(SetCustomPageRange);
             BatchConverterCommand = new DelegateCommand(BatchConverter);
             dialogs = dialogService;
             IntString();
         }
         #region 逻辑函数
+        public void SetCustomPageRange()
+        {
+            if (PageRangeSelectIndex == "4")
+            {
+
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+
+                }
+            }
+        }
+
+
         private void cancel()
         {
             RequestClose.Invoke(new DialogResult(ButtonResult.Cancel));
@@ -147,6 +179,30 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         private void converter()
         {
+            if (PageRangeSelectIndex == "4")
+            {
+
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+
+                }
+            }
             System.Windows.Forms.SaveFileDialog sfd = new System.Windows.Forms.SaveFileDialog();
             /*
              *设置这个对话框的起始保存路径

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterRTFDialogViewModel.cs

@@ -124,6 +124,8 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         public DelegateCommand<object> CmbPageTextChanged { get; set; }
 
+        public DelegateCommand SetCustomPageRangeCommand { get; set; }
+
         public DelegateCommand BatchConverterCommand { get; set; }
         #endregion
 
@@ -133,12 +135,41 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             ConverterCommnad = new DelegateCommand(converter);
             CmbPageSelectionChanged = new DelegateCommand<object>(CmbPageSelectionChangedEvent);
             CmbPageTextChanged = new DelegateCommand<object>(CmbPageTextChangedEvent);
+            SetCustomPageRangeCommand = new DelegateCommand(SetCustomPageRange);
+
             BatchConverterCommand = new DelegateCommand(BatchConverter);
             dialogs = dialogService;
             IntString();
         }
 
         #region 逻辑函数
+        public void SetCustomPageRange()
+        {
+            if (PageRangeSelectIndex == "4")
+            {
+
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+
+                }
+            }
+        }
         private void cancel()
         {
             RequestClose.Invoke(new DialogResult(ButtonResult.Cancel));
@@ -146,6 +177,30 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         private void converter()
         {
+            if (PageRangeSelectIndex == "4")
+            {
+
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+
+                }
+            }
             System.Windows.Forms.SaveFileDialog sfd = new System.Windows.Forms.SaveFileDialog();
             /*
              *设置这个对话框的起始保存路径

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterTextDialogViewModel.cs

@@ -126,6 +126,8 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         public DelegateCommand<object> CmbPageTextChanged { get; set; }
 
+        public DelegateCommand SetCustomPageRangeCommand { get; set; }
+
         public DelegateCommand BatchConverterCommand { get; set; }
         #endregion
 
@@ -136,10 +138,38 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             ConverterCommnad = new DelegateCommand(converter);
             CmbPageSelectionChanged = new DelegateCommand<object>(CmbPageSelectionChangedEvent);
             CmbPageTextChanged = new DelegateCommand<object>(CmbPageTextChangedEvent);
+            SetCustomPageRangeCommand = new DelegateCommand(SetCustomPageRange);
             BatchConverterCommand = new DelegateCommand(BatchConverter);
             dialogs = dialogService;
         }
         #region 逻辑函数
+        public void SetCustomPageRange()
+        {
+            if (PageRangeSelectIndex == "4")
+            {
+
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+
+                }
+            }
+        }
         private void cancel()
         {
             RequestClose.Invoke(new DialogResult(ButtonResult.Cancel));
@@ -147,6 +177,30 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         private  void converter()
         {
+            if (PageRangeSelectIndex == "4")
+            {
+
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+
+                }
+            }
             System.Windows.Forms.SaveFileDialog sfd = new System.Windows.Forms.SaveFileDialog();
             /*
              *设置这个对话框的起始保存路径

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterWordDialogViewModel.cs

@@ -129,6 +129,9 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
         public DelegateCommand<object> CmbPageTextChanged { get; set; }
 
         public DelegateCommand BatchConverterCommand { get; set; }
+
+        public DelegateCommand SetCustomPageRangeCommand { get; set; }
+
         #endregion
 
         public ConverterWordDialogViewModel(IDialogService dialogService)
@@ -138,11 +141,40 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             RadioButtonCommand = new DelegateCommand<string>(radiobutton);
             CmbPageSelectionChanged = new DelegateCommand<object>(CmbPageSelectionChangedEvent);
             CmbPageTextChanged = new DelegateCommand<object>(CmbPageTextChangedEvent);
+            SetCustomPageRangeCommand = new DelegateCommand(SetCustomPageRange);
             BatchConverterCommand = new DelegateCommand(BatchConverter);
             dialogs = dialogService;
             IntString();
         }
         #region 逻辑函数
+        public void SetCustomPageRange()
+        {
+            if (PageRangeSelectIndex == "4")
+            {
+
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+
+                }
+            }
+        }
+
         private void cancel()
         {
             RequestClose.Invoke(new DialogResult(ButtonResult.Cancel));
@@ -150,6 +182,30 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
 
         private void converter()
         {
+            if (PageRangeSelectIndex == "4")
+            {
+
+                List<int> PageIndexLists = new List<int>();
+                if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
+                { //TODO
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("页面范围输入错误", "", "确定");
+                    if (alertsMessage.result == ContentResult.Ok)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        //this.eventAggregator.GetEvent<DeleteWatermarkEvent>().Publish(new EnumDeleteUnicode
+                        //{
+                        //    Unicode = Unicode,
+                        //    Status = EnumDelete.StatusCreate
+                        //});
+                        return;
+                    }
+
+                }
+            }
             System.Windows.Forms.SaveFileDialog sfd = new System.Windows.Forms.SaveFileDialog();
             /*
              *设置这个对话框的起始保存路径

PDF Office/Views/Dialog/ConverterDialogs/ConverterCSVDialog.xaml

@@ -80,7 +80,7 @@
                                         <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                     </i:EventTrigger>
                                     <i:KeyTrigger FiredOn="KeyDown" Key="Return">
-                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" CommandParameter="{Binding ElementName=PageRangeComboBox}"></i:InvokeCommandAction>
+                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
                                     </i:KeyTrigger>
                                 </i:Interaction.Triggers>
                             </cus:WritableComboBox>

PDF Office/Views/Dialog/ConverterDialogs/ConverterExcelDialog.xaml

@@ -78,6 +78,9 @@
                                         <i:EventTrigger EventName="TextChanged">
                                             <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                         </i:EventTrigger>
+                                        <i:KeyTrigger FiredOn="KeyDown" Key="Return">
+                                            <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
+                                        </i:KeyTrigger>
                                     </i:Interaction.Triggers>
                                 </cus:WritableComboBox>
                             </StackPanel>

PDF Office/Views/Dialog/ConverterDialogs/ConverterHTMLDialog.xaml

@@ -51,6 +51,9 @@
                                     <i:EventTrigger EventName="TextChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                     </i:EventTrigger>
+                                    <i:KeyTrigger FiredOn="KeyDown" Key="Return">
+                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
+                                    </i:KeyTrigger>
                                 </i:Interaction.Triggers>
                             </cus:WritableComboBox>
                         </StackPanel>

PDF Office/Views/Dialog/ConverterDialogs/ConverterImgDialog.xaml

@@ -79,6 +79,9 @@
                                     <i:EventTrigger EventName="TextChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                     </i:EventTrigger>
+                                    <i:KeyTrigger FiredOn="KeyDown" Key="Return">
+                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
+                                    </i:KeyTrigger>
                                 </i:Interaction.Triggers>
                             </cus:WritableComboBox>
                         </StackPanel>

PDF Office/Views/Dialog/ConverterDialogs/ConverterPPTDialog.xaml

@@ -51,6 +51,9 @@
                                     <i:EventTrigger EventName="TextChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                     </i:EventTrigger>
+                                    <i:KeyTrigger FiredOn="KeyDown" Key="Return">
+                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
+                                    </i:KeyTrigger>
                                 </i:Interaction.Triggers>
                             </cus:WritableComboBox>
                         </StackPanel>

PDF Office/Views/Dialog/ConverterDialogs/ConverterRTFDialog.xaml

@@ -51,6 +51,9 @@
                                     <i:EventTrigger EventName="TextChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                     </i:EventTrigger>
+                                    <i:KeyTrigger FiredOn="KeyDown" Key="Return">
+                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
+                                    </i:KeyTrigger>
                                 </i:Interaction.Triggers>
                             </cus:WritableComboBox>
                         </StackPanel>

PDF Office/Views/Dialog/ConverterDialogs/ConverterTextDialog.xaml

@@ -51,6 +51,9 @@
                                     <i:EventTrigger EventName="TextChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                     </i:EventTrigger>
+                                    <i:KeyTrigger FiredOn="KeyDown" Key="Return">
+                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
+                                    </i:KeyTrigger>
                                 </i:Interaction.Triggers>
                             </cus:WritableComboBox>
                         </StackPanel>

PDF Office/Views/Dialog/ConverterDialogs/ConverterWordDialog.xaml

@@ -65,6 +65,9 @@
                                         <i:EventTrigger EventName="TextChanged">
                                             <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                         </i:EventTrigger>
+                                        <i:KeyTrigger FiredOn="KeyDown" Key="Return">
+                                            <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
+                                        </i:KeyTrigger>
                                     </i:Interaction.Triggers>
                                 </cus:WritableComboBox>
                             </StackPanel>