【页面编辑】插入修复bug

PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditInsertPageSizeItemView.swift

@@ -76,12 +76,23 @@ class KMPageEditInsertPageSizeItemView: KMPageEditBaseItemView {
                 }
             }
             if let state = self.customVC?.state, state == .Checked {
-                return self.selectedPageSize
+                let width = KMPageEditTools.convertSize(with: KMPageSizeUint(rawValue: self.currentUnit)!, to: .mm, value: self.customSize.width)
+                let height = KMPageEditTools.convertSize(with: KMPageSizeUint(rawValue: self.currentUnit)!, to: .mm, value: self.customSize.height)
+                var size = NSZeroSize
+                if let _value = Float(width) {
+                    size.width = CGFloat(_value)
+                }
+                if let _value = Float(height) {
+                    size.height = CGFloat(_value)
+                }
+                return size
             }
             return NSZeroSize
         }
     }
     
+    private var currentUnit: String = "mm"
+    
     override func initSubviews() {
         super.initSubviews()
         
@@ -329,8 +340,9 @@ extension KMPageEditInsertPageSizeItemView: KMSelectPopButtonDelegate {
             if let idx = self.customComboVC?.indexOfSelectedItem {
                 callback(5, max(0, idx))
                 
-                let fromUnit: String = self.customComboVC!.stringValue
+                let fromUnit: String = self.currentUnit
                 let toUnit: String = KMPageEditTools.getAllPageSizeUnit()[idx]
+                self.currentUnit = toUnit
                 
                 var width: CGFloat = 0
                 if let data = self.cwTextField?.stringValue, let _value = Float(data) {

PDF Office/PDF Master/Class/PDFTools/PageEdit/Window/KMPageEditInsertCustomPageWindowController.swift

@@ -102,7 +102,12 @@ class KMPageEditInsertCustomPageWindowController: KMBaseWindowController {
                     
                 }
             } else if (index == 2) { /// 标准[下拉框]
-                
+                let size = self.pageSizeView.getPageSize
+                if (size.width > size.height) {
+                    self.directionView.switchDirection(isHor: true)
+                } else {
+                    self.directionView.switchDirection(isHor: false)
+                }
             } else if (index == 3) { /// 自定义[宽度]
                 let size = self.pageSizeView.getCustomSize
                 if (size.width > size.height) {