其他-页面范围，转档-自测bug

PDF Office/Model/Dialog/ConverterDialogs/ConverterDialogsModel.cs

@@ -34,7 +34,7 @@ namespace PDF_Office.Model.Dialog.ConverterDialogs
         /// <summary>
         /// 页面信息
         /// </summary>
-        public string PageRange = "1,3-4,10";
+        public string PageRange = "";
 
         /// <summary>
         /// 文档密码;

PDF Office/SDKLisence.xml

@@ -1,6 +1,6 @@
 <Lisences
-	devKey = "BK8BcXWm+YbGRpEONe43pEJXhshAiAwWoBQgwlEUnxFBkCVal4AYW01RnbuwHCdkktvy9sAYs/SUflLR+KOMayg6z2TE2G3OhIXf95sN8k1sk947zrPGeHPtHx7gMaurYrscLDAumvtymhg4rMTg7XFKfBtchlAi0bE+wPTsqa8="
-  devSecret = "mG0c3O3Mzeu5dkZJW3gpqq9uA7o7EGQveSC38Q8TK4iYSXB8erGstkUyaynN7k8ocNCYAAzc9CPxiym2TlqeSUWpLOaOv47bs7x+UqfQzn9hrp9sGpqfp0B228KI+IMTu4aGVjtYuk+Uxs/kosIBwyVLBY93oKLBB8UJg4t07605BGbaBKUlDopA0iGq1HSnRAJhqHxGgIZ+m3BxAFwgabp2OdkT7I9klGmA/4KertEmsKlSJ3WFqmDWhwfT73yCYDNQpuarUAQxiS1PJu8kUw=="
+	devKey = "sTHSivIW4YnZQavIYDLVw4vaFcN5DQTUtRGrVyv5p9aeaHX3GirG/MBxl6Wy9TJbNOwR4CU6LPjHmGe3Po3OtBCPqIRheam9+LomScw3AvoUTHFlG1134e2J4enF43WJQ6PyOnjwZqsG1kUdlBPNztkoPzDAE2pQKgZWf6V2i34="
+    devSecret = "mG0c3O3Mzeu5dkZJW3gpqq9uA7o7EGQveSC38Q8TK4gQurxTxGuBlGAhs0P1mD3X3bHT+AHfcLiymaqE4DY7kTFHoPs9I3tl5ErS+BHdzHRhrp9sGpqfp0B228KI+IMTu4aGVjtYuk+Uxs/kosIBw1367/WkJ00tM7U7tttD6cfaiHpW8pgW2aur3AxuQIBBLuJD5gcmNxTYW3KA32JLG8alfyXjKFVS3gka9bngvwfZ7GuNXybjKlmz1tnN6iVHpnbSj+xOHhWEperY4HHrSg=="
 	userKey = "iBPRM/Tz8b6Z1G2GQt52X7hiNCGfVYXztnPjalgrgARvqfKV6lFNH8QeScTzBRYI8GGFpwelfgh790Kd9JmL7V4adI1jCiFHUT2DLT7QucxY5Nkgys2aJItQS482Ck2G2Xf8gNgojxYxRt65o/MEzkj93foj8qIdfHagXsSorSs="
 	userSecret="mG0c3O3Mzeu5dkZJW3gpqq9uA7o7EGQveSC38Q8TK4ivEHOmPIqbfhpDnKKj+7Ymj2rXQvfZRmke06HMV+3tt064G64WjPW8+EbGCNZaAh1hrp9sGpqfp0B228KI+IMTu4aGVjtYuk+Uxs/kosIBw1FKJi6HYB+DuugQyaqI2prfej861QnJrU4s2T/npZK/"
 	ConverterDevKey="ErjZKxcU3SPvUohGZo0CBgy0XdkAsZqUYqCTbfn1AYsCQ6mxCucx61UPqLT7MDQ0n+5/oKnWY9SSk8Xv5pJtYYHD87HRdYNG+QNCaoPGHulyfVxGllmzU71U7WjflfZBFvhg/UQOFiz3OsAVKz4k2YkXPzQgNaS3glym42PVpj4="

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

@@ -179,9 +179,16 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             FolderBrowserDialog dlg = new FolderBrowserDialog();
             if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {
-                ConverterCSVModel.OutputPath =dlg.SelectedPath.Trim();
+                ConverterCSVModel.OutputPath = dlg.SelectedPath.Trim();
             }
+            else { return; }
             HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref ConverterCSVModel.PageRange, PageRangeText, true, CurrentPageIndex);
+            if (ConverterCSVModel.PageRange == "")
+            {
+                Trace.WriteLine("输入不对");
+                MessageBoxEx.Show("输入不对");
+                return;
+            }
             char[] enumerationSeparator = new char[] { ',' };
             char[] rangeSeparator = new char[] { '-' };
             if (!CommonHelper.GetPagesInRange(ref ConverterCSVModel.PageIndexLists, ConverterCSVModel.PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))

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

@@ -87,11 +87,22 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             {
                 ConverterExcelModel.OutputPath = dlg.SelectedPath.Trim();
             }
+            else
+            {
+                return;
+            }
             HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref ConverterExcelModel.PageRange, PageRangeText, true, CurrentPageIndex);
+            if (ConverterExcelModel.PageRange == "")
+            {
+                Trace.WriteLine("输入不对");
+                MessageBoxEx.Show("输入不对");
+                return;
+            }
             char[] enumerationSeparator = new char[] { ',' };
             char[] rangeSeparator = new char[] { '-' };
             if (!CommonHelper.GetPagesInRange(ref ConverterExcelModel.PageIndexLists, ConverterExcelModel.PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
             { //TODO
+
                 Trace.WriteLine("输入不对");
                 MessageBoxEx.Show("输入不对");
                 return;

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

@@ -84,12 +84,22 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             {
                 ConverterHTMLModel.OutputPath = dlg.SelectedPath.Trim();
             }
+            else {
+                return;
+            }
          
             HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref ConverterHTMLModel.PageRange, PageRangeText, true, CurrentPageIndex);
+            if (ConverterHTMLModel.PageRange == "")
+            {
+                Trace.WriteLine("输入不对");
+                MessageBoxEx.Show("输入不对");
+                return;
+            }
             char[] enumerationSeparator = new char[] { ',' };
             char[] rangeSeparator = new char[] { '-' };
             if (!CommonHelper.GetPagesInRange(ref ConverterHTMLModel.PageIndexLists, ConverterHTMLModel.PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
             { //TODO
+
                 Trace.WriteLine("输入不对");
                 MessageBoxEx.Show("输入不对");
                 return;

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

@@ -210,16 +210,26 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             {
                 ConverterImgModel.OutputPath = dlg.SelectedPath.Trim();
             }
+            else
+            {
+                return;
+            }
             HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref ConverterImgModel.PageRange, PageRangeText, true, CurrentPageIndex);
+            if (ConverterImgModel.PageRange == "")
+            {
+                Trace.WriteLine("输入不对");
+                MessageBoxEx.Show("输入不对");
+                return;
+            }
             char[] enumerationSeparator = new char[] { ',' };
             char[] rangeSeparator = new char[] { '-' };
             if (!CommonHelper.GetPagesInRange(ref ConverterImgModel.PageIndexLists, ConverterImgModel.PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
             { //TODO
+
                 Trace.WriteLine("输入不对");
                 MessageBoxEx.Show("输入不对");
                 return;
             }
-
             DialogParameters value = new DialogParameters();
             value.Add(ParameterNames.ConverterType, "Img");
             value.Add(ParameterNames.ConverterTypeModel, ConverterImgModel);

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

@@ -83,16 +83,26 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             {
                 ConverterPPTModel.OutputPath = dlg.SelectedPath.Trim();
             }
+            else
+            {
+                return;
+            }
             HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref ConverterPPTModel.PageRange, PageRangeText, true, CurrentPageIndex);
+            if (ConverterPPTModel.PageRange == "")
+            {
+                Trace.WriteLine("输入不对");
+                MessageBoxEx.Show("输入不对");
+                return;
+            }
             char[] enumerationSeparator = new char[] { ',' };
             char[] rangeSeparator = new char[] { '-' };
             if (!CommonHelper.GetPagesInRange(ref ConverterPPTModel.PageIndexLists, ConverterPPTModel.PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
             { //TODO
+
                 Trace.WriteLine("输入不对");
                 MessageBoxEx.Show("输入不对");
                 return;
             }
-            
             DialogParameters value = new DialogParameters();
             value.Add(ParameterNames.ConverterType, "PPT");
             value.Add(ParameterNames.ConverterTypeModel, ConverterPPTModel);

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

@@ -82,11 +82,23 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             {
                 ConverterRTFModel.OutputPath = dlg.SelectedPath.Trim();
             }
+            else
+            {
+                return;
+            }
             HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref ConverterRTFModel.PageRange, PageRangeText, true, CurrentPageIndex);
+            if (ConverterRTFModel.PageRange == "")
+            {
+                Trace.WriteLine("输入不对");
+                MessageBoxEx.Show("输入不对");
+                return;
+            }
+
             char[] enumerationSeparator = new char[] { ',' };
             char[] rangeSeparator = new char[] { '-' };
             if (!CommonHelper.GetPagesInRange(ref ConverterRTFModel.PageIndexLists, ConverterRTFModel.PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
             { //TODO
+
                 Trace.WriteLine("输入不对");
                 MessageBoxEx.Show("输入不对");
                 return;

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

@@ -84,11 +84,22 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             {
                 ConverterTextModel.OutputPath = dlg.SelectedPath.Trim();
             }
+            else
+            {
+                return;
+            }
             HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref ConverterTextModel.PageRange, PageRangeText,true, CurrentPageIndex);
+            if (ConverterTextModel.PageRange == "")
+            {
+                Trace.WriteLine("输入不对");
+                MessageBoxEx.Show("输入不对");
+                return;
+            }
             char[] enumerationSeparator = new char[] { ',' };
             char[] rangeSeparator = new char[] { '-' };
             if (!CommonHelper.GetPagesInRange(ref ConverterTextModel.PageIndexLists, ConverterTextModel.PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
             { //TODO
+
                 Trace.WriteLine("输入不对");
                 MessageBoxEx.Show("输入不对");
                 return;

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

@@ -85,15 +85,26 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             {
                 ConverterWordModel.OutputPath = dlg.SelectedPath.Trim();
             }
+            else
+            {
+                return;
+            }
             HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref ConverterWordModel.PageRange, PageRangeText, true, CurrentPageIndex);
+            if (ConverterWordModel.PageRange == "")
+            {
+                Trace.WriteLine("输入不对");
+                MessageBoxEx.Show("输入不对");
+                return;
+            }
             char[] enumerationSeparator = new char[] { ',' };
             char[] rangeSeparator = new char[] { '-' };
             if (!CommonHelper.GetPagesInRange(ref ConverterWordModel.PageIndexLists, ConverterWordModel.PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
             { //TODO
+
+                Trace.WriteLine("输入不对");
                 MessageBoxEx.Show("输入不对");
                 return;
             }
-            
             DialogParameters value = new DialogParameters();
             value.Add(ParameterNames.ConverterType, "Word");
             value.Add(ParameterNames.ConverterTypeModel, ConverterWordModel);

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageConverter/HomePageConverterDialogViewModel.cs

@@ -347,6 +347,12 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                         break;
                 }
                 document.Release();
+                if (!result) {
+                    PDFDataTable.Rows[fileNamesIndex]["FileState"] = "转档出错";
+                    PDFCurrentDataTable.Rows[fileNamesIndex]["FileState"] = "转档出错";
+                    fileNamesIndex++;
+                    continue;
+                }
                 PDFDataTable.Rows[fileNamesIndex]["FileState"] = "完成";
                 PDFCurrentDataTable.Rows[fileNamesIndex]["FileState"] = "完成";
                 fileNamesIndex++;

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageConverter/HomePageConverterExcelViewModel.cs

@@ -25,7 +25,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
         public HomePageConverterExcelViewModel()
         {
             RadioButtonCommand = new DelegateCommand<string>(radiobutton);
-            homePageConverterDialogViewModel.ConverterExcelModel.excelOption = ConverterExcelModel.ExcelOptions();
+            
         }
         #region 逻辑函数
         private void radiobutton(string e)
@@ -61,6 +61,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             if (homePageConverterVM != null)
             {
                 homePageConverterDialogViewModel = homePageConverterVM;
+                homePageConverterDialogViewModel.ConverterExcelModel.excelOption = ConverterExcelModel.ExcelOptions();
             }
         }
 

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBates/HomePageBatesDialog.xaml.cs

@@ -179,8 +179,6 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.H
                             viewModel.updateListview("待确定");
                         }
                     }
-
-
                 }
                 viewModel.PDFCurrentDataTable.Rows[index]["FilePageRangeText"] = writableComboBox.Text;
             }