其他-bug

PDF Office/ViewModels/HomePanel/PDFTools/QuickToolsContentViewModel.cs

@@ -115,7 +115,7 @@ namespace PDF_Office.ViewModels.HomePanel.PDFTools
                     case PDFFnType.Split:
 
                         viewer.InitDocument(dlg.FileName);
-                        CheckPassword(viewer);
+                        if (!CheckPassword(viewer)) {return;}
                         DialogParameters splitvalue = new DialogParameters();
                         splitvalue.Add(ParameterNames.PDFViewer, viewer);
                         splitvalue.Add(ParameterNames.FilePath, dlg.FileName);
@@ -124,7 +124,7 @@ namespace PDF_Office.ViewModels.HomePanel.PDFTools
 
                     case PDFFnType.Extract:
                         viewer.InitDocument(dlg.FileName);
-                        CheckPassword(viewer);
+                        if (!CheckPassword(viewer)) {return;}
                         DialogParameters extractvalue = new DialogParameters();
                         extractvalue.Add(ParameterNames.PDFViewer, viewer);
                         extractvalue.Add(ParameterNames.FilePath, dlg.FileName);
@@ -133,7 +133,7 @@ namespace PDF_Office.ViewModels.HomePanel.PDFTools
 
                     case PDFFnType.Insert:
                         viewer.InitDocument(dlg.FileName);
-                        CheckPassword(viewer);
+                        if (!CheckPassword(viewer)) {return;}
                         DialogParameters insertvalue = new DialogParameters();
                         insertvalue.Add(ParameterNames.PDFViewer, viewer);
                         insertvalue.Add(ParameterNames.FilePath, dlg.FileName);
@@ -157,7 +157,7 @@ namespace PDF_Office.ViewModels.HomePanel.PDFTools
 
                     case PDFFnType.Print:
                         viewer.InitDocument(dlg.FileName);
-                        CheckPassword(viewer);
+                        if (!CheckPassword(viewer)) {return;}
                         DialogParameters printvalue = new DialogParameters();
                         printvalue.Add(ParameterNames.PDFViewer, viewer);
                         printvalue.Add(ParameterNames.FilePath, dlg.FileName);
@@ -272,7 +272,7 @@ namespace PDF_Office.ViewModels.HomePanel.PDFTools
         }
         //
         //
-        private void CheckPassword(CPDFViewer viewer) {
+        private bool CheckPassword(CPDFViewer viewer) {
             if (viewer.Document.IsLocked)
             {
                 DialogParameters value = new DialogParameters();
@@ -286,15 +286,17 @@ namespace PDF_Office.ViewModels.HomePanel.PDFTools
                             viewer.Tag = e.Parameters.GetValue<string>(ParameterNames.PassWord).ToString();
                         }
                     }
+                    
                 });
 
                 if (viewer.Document.IsLocked)
                 {
                     //未成功解密文档时，释放Document对象，返回
                     viewer.Document.Release();
-                    return;
+                    return false;
                 }
             }
+            return true;
         }
 
         private void Expend()

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageConverter/HomePageConverterExcel.xaml

@@ -16,7 +16,7 @@
                 <RadioButton Margin="0,10,0,0" Name="OnlyTableRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=OnlyTableRadioBtn,Path=Name}">
                     <TextBlock Text="只提取表格"/>
                 </RadioButton>
-                <ComboBox Name="OnlyTableComboBox" Margin="0,8,0,0" Width="228" Height="28.55" IsEnabled="{Binding ElementName=OnlyTableRadioBtn,Path=IsChecked}" SelectionChanged="OnlyTableComboBox_SelectionChanged">
+                <ComboBox Name="OnlyTableComboBox" Margin="0,8,0,0" Width="228" Height="28.55" IsEnabled="{Binding ElementName=OnlyTableRadioBtn,Path=IsChecked}" SelectedIndex="0" SelectionChanged="OnlyTableComboBox_SelectionChanged">
                     <ComboBoxItem Content="支持一个表格提取到单独的工作表"/>
                     <ComboBoxItem Content="支持按页面提取表格到单独的工作表"/>
                     <ComboBoxItem Content="支持将所有表格提取到一个工作表"/>