PDFPageedit(iOS)-页面编辑插入之后和超出页面无法重置问题

ComPDFKit_Tools/ComPDFKit_Tools/DocsEditor/PDFPageEditInsert/Control/CPDFPDFInsertViewController.m

@@ -462,6 +462,7 @@
         case 2:
         {
             self.pdfInsertType = CPDFPDFInsertTypeBefore;
+            self.pageModel.pageIndex = [self.locationTextField.text intValue]-1;
             if ([self.locationTextField.text isEqual:@""]) {
                 self.saveButton.userInteractionEnabled = NO;
                 [self.saveButton setTitleColor:[UIColor grayColor] forState:UIControlStateNormal];
@@ -474,6 +475,7 @@
         case 3:
         {
             self.pdfInsertType = CPDFPDFInsertTypeAfter;
+            self.pageModel.pageIndex = [self.locationTextField.text intValue];
             if ([self.locationTextField.text isEqual:@""]) {
                 self.saveButton.userInteractionEnabled = NO;
                 [self.saveButton setTitleColor:[UIColor grayColor] forState:UIControlStateNormal];
@@ -548,12 +550,13 @@
     
     if (pageIndex > self.currentPageCout) {
         [self popoverWarning];
-    }
-    self.pageModel.pageIndex = pageIndex-1;
-    if (self.pdfInsertType == CPDFPDFInsertTypeBefore) {
-        self.pageModel.pageIndex = self.pageModel.pageIndex - 1;
-    } else if (self.pdfInsertType == CPDFPDFInsertTypeAfter) {
-        self.pageModel.pageIndex = self.pageModel.pageIndex + 1;
+    } else {
+        self.pageModel.pageIndex = pageIndex-1;
+        if (self.pdfInsertType == CPDFPDFInsertTypeBefore) {
+            self.pageModel.pageIndex = self.pageModel.pageIndex - 1;
+        } else if (self.pdfInsertType == CPDFPDFInsertTypeAfter) {
+            self.pageModel.pageIndex = self.pageModel.pageIndex + 1;
+        }
     }
 }
 

ComPDFKit_Tools/ComPDFKit_Tools/DocsEditor/PDFPageEditInsert/Control/CPDFPageInsertViewController.m

@@ -49,7 +49,7 @@
 
 - (NSArray *)dataArray {
     if (!_dataArray) {
-        NSArray *dataArray = @[NSLocalizedString(@"Page Size", nil), NSLocalizedString(@"Page Direction", nil), NSLocalizedString(@"Isert TO", nil),NSLocalizedString(@"First Page", nil), NSLocalizedString(@"Last Page", nil), NSLocalizedString(@"Insert Before Specifiled Page", nil), NSLocalizedString(@"Please Enter a Page", nil), NSLocalizedString(@"Insert After Specifiled Page", nil)];
+        NSArray *dataArray = @[NSLocalizedString(@"Page Size", nil), NSLocalizedString(@"Page Direction", nil), NSLocalizedString(@"Insert To", nil),NSLocalizedString(@"First Page", nil), NSLocalizedString(@"Last Page", nil), NSLocalizedString(@"Insert Before Specifiled Page", nil), NSLocalizedString(@"Please Enter a Page", nil), NSLocalizedString(@"Insert After Specifiled Page", nil)];
         _dataArray = dataArray;
     }
     return _dataArray;
@@ -525,6 +525,7 @@
         case 2:
         {
             self.pageInsertType = CPDFPageInsertTypeBefore;
+            self.pageModel.pageIndex = [self.locationTextField.text intValue]-1;
             if ([self.locationTextField.text isEqual:@""]) {
                 self.saveButton.userInteractionEnabled = NO;
                 [self.saveButton setTitleColor:[UIColor grayColor] forState:UIControlStateNormal];
@@ -537,6 +538,7 @@
         case 3:
         {
             self.pageInsertType = CPDFPageInsertTypeAfter;
+            self.pageModel.pageIndex = [self.locationTextField.text intValue];
             if ([self.locationTextField.text isEqual:@""]) {
                 self.saveButton.userInteractionEnabled = NO;
                 [self.saveButton setTitleColor:[UIColor grayColor] forState:UIControlStateNormal];
@@ -563,13 +565,14 @@
     
     if (pageIndex > self.currentPageCout) {
         [self popoverWarning];
-    }
-    
-    self.pageModel.pageIndex = pageIndex-1;
-    if (self.pageInsertType == CPDFPageInsertTypeBefore) {
-        self.pageModel.pageIndex = self.pageModel.pageIndex-1;
-    } else if (self.pageInsertType == CPDFPageInsertTypeAfter) {
-        self.pageModel.pageIndex = self.pageModel.pageIndex+1;
+        self.pageModel.pageIndex = 0;
+    } else {
+        self.pageModel.pageIndex = pageIndex-1;
+        if (self.pageInsertType == CPDFPageInsertTypeBefore) {
+            self.pageModel.pageIndex = self.pageModel.pageIndex-1;
+        } else if (self.pageInsertType == CPDFPageInsertTypeAfter) {
+            self.pageModel.pageIndex = self.pageModel.pageIndex+1;
+        }
     }
 }
 

ComPDFKit_Tools/ComPDFKit_Tools/Forms/PDFFormProperties/Controller/CPDFFormRadioButtonViewController.m

@@ -31,10 +31,10 @@
 
 @property (nonatomic, strong) CPDFColorSelectView * borderColorView;
 @property (nonatomic, strong) CPDFColorSelectView * backGroundColorView;
-@property (nonatomic, strong)CPDFColorSelectView * colorSelectView;
-@property (nonatomic, strong)CPDFFormSwitchView * selectDefaultSwitchView;
-@property (nonatomic, strong)CPDFFormSwitchView * hideFormSwitchView;
-@property (nonatomic, strong)CPDFFormArrowStyleView * arrowStyleView;
+@property (nonatomic, strong) CPDFColorSelectView * colorSelectView;
+@property (nonatomic, strong) CPDFFormSwitchView * selectDefaultSwitchView;
+@property (nonatomic, strong) CPDFFormSwitchView * hideFormSwitchView;
+@property (nonatomic, strong) CPDFFormArrowStyleView * arrowStyleView;
 
 @property (nonatomic, strong) CAnnotationManage * annotManage;